Added feature flags to server config #334

kdb-bot/src/bot_data/model/server_config.py

@@ -1,3 +1,4 @@
+import json
 from datetime import datetime
 
 from cpl_core.configuration import ConfigurationModelABC
@@ -236,6 +237,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `HelpVoiceChannelId`,
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
+                    `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
                     {self._message_delete_timer},
@@ -251,6 +253,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {self._help_voice_channel_id},
                     {self._team_channel_id},
                     {self._login_message_channel_id},
+                    '{json.dumps(self._feature_flags)}',
                     {self._server.id}
                 );
             """
@@ -274,6 +277,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `HelpVoiceChannelId` = {self._help_voice_channel_id},
                 `TeamChannelId` = {self._team_channel_id},
                 `LoginMessageChannelId` = {self._login_message_channel_id},
+                `FeatureFlags` = '{json.dumps(self._feature_flags)}',
                 `ServerId` = {self._server.id}
                 WHERE `Id` = {self._id};
             """

kdb-bot/src/bot_graphql/model/query.gql

@@ -40,4 +40,5 @@ type Query {
     technicianConfig: TechnicianConfig
 
     guilds(filter: GuildFilter): [Guild]
+    possibleFeatureFlags: [String]
 }

kdb-bot/src/bot_graphql/model/serverConfig.gql

@@ -13,6 +13,7 @@ type ServerConfig implements TableWithHistoryQuery {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    featureFlags: [FeatureFlag]
 
     afkChannelIds: [String]
     moderatorRoleIds: [String]
@@ -41,6 +42,7 @@ type ServerConfigHistory implements HistoryTableQuery {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    featureFlags: [FeatureFlag]
 
     serverId: ID
 
@@ -87,6 +89,7 @@ input ServerConfigInput {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    featureFlags: [FeatureFlagInput]
 
     afkChannelIds: [String]
     moderatorRoleIds: [String]

kdb-bot/src/bot_graphql/mutations/server_config_mutation.py

@@ -82,6 +82,11 @@ class ServerConfigMutation(QueryABC):
             if "loginMessageChannelId" in input
             else server_config.login_message_channel_id
         )
+        server_config.feature_flags = (
+            dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
+            if "featureFlags" in input
+            else server_config.feature_flags
+        )
         server_config.afk_channel_ids = (
             List(int).extend([int(x) for x in input["afkChannelIds"]])
             if "afkChannelIds" in input

kdb-bot/src/bot_graphql/queries/server_config_query.py

@@ -23,6 +23,10 @@ class ServerConfigQuery(DataQueryWithHistoryABC):
         self.set_field("helpVoiceChannelId", lambda config, *_: config.help_voice_channel_id)
         self.set_field("teamChannelId", lambda config, *_: config.team_channel_id)
         self.set_field("loginMessageChannelId", lambda config, *_: config.login_message_channel_id)
+        self.set_field(
+            "featureFlags",
+            lambda config, *_: [{"key": x, "value": config.feature_flags[x]} for x in config.feature_flags],
+        )
         self.set_field("afkChannelIds", lambda config, *_: config.afk_channel_ids)
         self.set_field(
             "moderatorRoleIds",

kdb-bot/src/bot_graphql/query.py

@@ -1,5 +1,6 @@
 from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
@@ -75,6 +76,7 @@ class Query(QueryABC):
         self.set_field("guilds", self._resolve_guilds)
         self.set_field("achievementAttributes", lambda x, *_: achievement_service.get_attributes())
         self.set_field("achievementOperators", lambda x, *_: achievement_service.get_operators())
+        self.set_field("possibleFeatureFlags", lambda x, *_: [e.value for e in FeatureFlagsEnum])
 
     def _resolve_guilds(self, *_, filter=None):
         if filter is None or "id" not in filter:

kdb-web/src/app/models/config/server-config.model.ts

@@ -1,4 +1,5 @@
 import { DataWithHistory } from "../data/data.model";
+import { FeatureFlag } from "./feature-flags.model";
 
 export interface ServerConfig extends DataWithHistory {
   id?: number;
@@ -15,6 +16,7 @@ export interface ServerConfig extends DataWithHistory {
   helpVoiceChannelId?: string;
   teamChannelId?: string;
   loginMessageChannelId?: string;
+  featureFlags: FeatureFlag[];
   afkChannelIds: string[];
   moderatorRoleIds: string[];
   adminRoleIds: string[];

kdb-web/src/app/models/graphql/mutations.model.ts

@@ -211,6 +211,7 @@ export class Mutations {
       $helpVoiceChannelId: String,
       $teamChannelId: String,
       $loginMessageChannelId: String,
+      $featureFlags: [FeatureFlagInput],
       $afkChannelIds: [String],
       $moderatorRoleIds: [String],
       $adminRoleIds: [String]
@@ -218,21 +219,22 @@ export class Mutations {
       serverConfig {
         updateServerConfig(input: {
             id: $id,
-            messageDeleteTimer: $messageDeleteTimer
+            messageDeleteTimer: $messageDeleteTimer,
-            notificationChatId: $notificationChatId
+            notificationChatId: $notificationChatId,
-            maxVoiceStateHours: $maxVoiceStateHours
+            maxVoiceStateHours: $maxVoiceStateHours,
-            xpPerMessage: $xpPerMessage
+            xpPerMessage: $xpPerMessage,
-            xpPerReaction: $xpPerReaction
+            xpPerReaction: $xpPerReaction,
-            maxMessageXpPerHour: $maxMessageXpPerHour
+            maxMessageXpPerHour: $maxMessageXpPerHour,
-            xpPerOntimeHour: $xpPerOntimeHour
+            xpPerOntimeHour: $xpPerOntimeHour,
-            xpPerEventParticipation: $xpPerEventParticipation
+            xpPerEventParticipation: $xpPerEventParticipation,
-            xpPerAchievement: $xpPerAchievement
+            xpPerAchievement: $xpPerAchievement,
-            afkCommandChannelId: $afkCommandChannelId
+            afkCommandChannelId: $afkCommandChannelId,
-            helpVoiceChannelId: $helpVoiceChannelId
+            helpVoiceChannelId: $helpVoiceChannelId,
-            teamChannelId: $teamChannelId
+            teamChannelId: $teamChannelId,
-            loginMessageChannelId: $loginMessageChannelId
+            loginMessageChannelId: $loginMessageChannelId,
-            afkChannelIds: $afkChannelIds
+            featureFlags: $featureFlags,
-            moderatorRoleIds: $moderatorRoleIds
+            afkChannelIds: $afkChannelIds,
+            moderatorRoleIds: $moderatorRoleIds,
             adminRoleIds: $adminRoleIds
           }) {
           id
@@ -249,6 +251,10 @@ export class Mutations {
           helpVoiceChannelId
           teamChannelId
           loginMessageChannelId
+          featureFlags {
+            key
+            value
+          }
           afkChannelIds
           moderatorRoleIds
           adminRoleIds

kdb-web/src/app/models/graphql/queries.model.ts

@@ -385,6 +385,10 @@ export class Queries {
           helpVoiceChannelId
           teamChannelId
           loginMessageChannelId
+          featureFlags {
+            key
+            value
+          }
           afkChannelIds
           moderatorRoleIds
           adminRoleIds

kdb-web/src/app/models/graphql/query.model.ts

@@ -59,3 +59,8 @@ export interface AutoRoleRuleQuery {
   autoRoleRules: AutoRoleRule[];
 }
 
+
+export interface PossibleFeatureFlagsQuery {
+  possibleFeatureFlags: string[];
+}
+

kdb-web/src/app/modules/admin/settings/components/settings/settings.component.html

@@ -163,9 +163,7 @@
     <div class="content-divider"></div>
     <app-config-list translationKey="admin.settings.bot.ping_urls" [(data)]="config.pingURLs"></app-config-list>
     <app-config-list translationKey="admin.settings.bot.technician_ids" [(data)]="config.technicianIds"></app-config-list>
-
     <app-feature-flag-list [(data)]="config.featureFlags"></app-feature-flag-list>
-    <div class="content-divider"></div>
 
     <div class="content-row">
       <button pButton icon="pi pi-save" label="{{'common.save' | translate}}" class="btn login-form-submit-btn"

kdb-web/src/app/modules/shared/components/feature-flag-list/feature-flag-list.component.html

@@ -19,7 +19,7 @@
             <td style="flex: 3;">
               <p-cellEditor>
                 <ng-template pTemplate="input">
-                  <input class="table-edit-input" pInputText type="text" [(ngModel)]="value.value.key">
+                  <p-dropdown class="table-edit-input" [options]="featureFlags" [(ngModel)]="value.value.key"></p-dropdown>
                 </ng-template>
                 <ng-template pTemplate="output">
                   {{value.value.key}}
@@ -52,3 +52,4 @@
     </div>
   </div>
 </div>
+<div class="content-divider"></div>

kdb-web/src/app/modules/shared/components/feature-flag-list/feature-flag-list.component.ts

@@ -1,19 +1,31 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 import { ConfigListComponent } from "../config-list/config-list.component";
 import { Table } from "primeng/table";
+import { PossibleFeatureFlagsQuery } from "../../../../models/graphql/query.model";
+import { DataService } from "../../../../services/data/data.service";
 
 @Component({
   selector: "app-feature-flag-list",
   templateUrl: "./feature-flag-list.component.html",
   styleUrls: ["./feature-flag-list.component.scss"]
 })
-export class FeatureFlagListComponent extends ConfigListComponent {
+export class FeatureFlagListComponent extends ConfigListComponent implements OnInit {
-  options: boolean[] = [true, false];
+  featureFlags: string[] = [];
 
-  constructor() {
+
+  constructor(
+    private dataService: DataService
+  ) {
     super();
   }
 
+  ngOnInit() {
+    this.dataService.query<PossibleFeatureFlagsQuery>("{possibleFeatureFlags}"
+    ).subscribe(data => {
+      this.featureFlags = data.possibleFeatureFlags;
+    });
+  }
+
   override addNew(table: Table) {
     const id = Math.max.apply(Math, this.internal_data.map(value => {
       return value.id ?? 0;

kdb-web/src/app/modules/view/server/config/components/config/config.component.html

@@ -113,6 +113,7 @@
     <app-config-list translationKey="view.server.config.bot.afk_channels" [(data)]="config.afkChannelIds"></app-config-list>
     <app-config-list translationKey="view.server.config.bot.moderator_roles" [(data)]="config.moderatorRoleIds"></app-config-list>
     <app-config-list translationKey="view.server.config.bot.admin_roles" [(data)]="config.adminRoleIds"></app-config-list>
+    <app-feature-flag-list [(data)]="config.featureFlags"></app-feature-flag-list>
 
     <div class="content-row">
       <button pButton icon="pi pi-save" label="{{'common.save' | translate}}" class="btn login-form-submit-btn"

kdb-web/src/app/modules/view/server/config/components/config/config.component.ts

@@ -16,7 +16,6 @@ import { AuthService } from "../../../../../../services/auth/auth.service";
 import { ServerConfig } from "../../../../../../models/config/server-config.model";
 import { Server } from "../../../../../../models/data/server.model";
 import { ActivatedRoute } from "@angular/router";
-import { Table } from "primeng/table";
 
 type AFKChannelId = {
   id: number;
@@ -31,6 +30,7 @@ type AFKChannelId = {
 export class ConfigComponent implements OnInit {
   config: ServerConfig = {
     messageDeleteTimer: 0,
+    featureFlags: [],
     afkChannelIds: [],
     moderatorRoleIds: [],
     adminRoleIds: []
@@ -101,6 +101,7 @@ export class ConfigComponent implements OnInit {
         helpVoiceChannelId: this.config.helpVoiceChannelId,
         teamChannelId: this.config.teamChannelId,
         loginMessageChannelId: this.config.loginMessageChannelId,
+        featureFlags: this.config.featureFlags,
         afkChannelIds: this.config.afkChannelIds,
         moderatorRoleIds: this.config.moderatorRoleIds,
         adminRoleIds: this.config.adminRoleIds
@@ -110,7 +111,7 @@ export class ConfigComponent implements OnInit {
       return throwError(err);
     })).subscribe(result => {
       this.spinner.hideSpinner();
-      this.toastService.success(this.translate.instant("view.server.config.message.server#_config_create"), this.translate.instant("view.server.config.message.server_config_create_d"));
+      this.toastService.success(this.translate.instant("view.server.config.message.server_config_create"), this.translate.instant("view.server.config.message.server_config_create_d"));
     });
   }
 }