DEV: Use settings area param instead

Author: keegangeorge

admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-features-edit.js

@@ -1,12 +1,26 @@
+import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
+import SiteSetting from "admin/models/site-setting";
 
 export default class AdminPluginsShowDiscourseAiFeaturesEdit extends DiscourseRoute {
   async model(params) {
     const allFeatures = this.modelFor(
       "adminPlugins.show.discourse-ai-features"
     );
     const id = parseInt(params.id, 10);
+    const currentFeature = allFeatures.find((feature) => feature.id === id);
 
-    return allFeatures.find((feature) => feature.id === id);
+    const { site_settings } = await ajax("/admin/config/site_settings.json", {
+      data: {
+        filter_area: `ai-features/${currentFeature.ref}`,
+        plugin: "discourse-ai",
+        category: "discourse_ai",
+      }
+    });
+
+
+    currentFeature.feature_settings = site_settings.map((setting) => SiteSetting.create(setting));
+
+    return currentFeature;
   }
 }

app/controllers/discourse_ai/admin/ai_features_controller.rb

@@ -14,24 +14,6 @@ def edit
         render json: serialize_feature(DiscourseAi::Features.find_feature_by_id(params[:id].to_i))
       end
 
-      def update
-        raise Discourse::InvalidParameters.new(:id) if params[:id].blank?
-        raise Discourse::InvalidParameters.new(:ai_feature) if params[:ai_feature].blank?
-        if params[:ai_feature][:persona_id].blank?
-          raise Discourse::InvalidParameters.new(:persona_id)
-        end
-        raise Discourse::InvalidParameters.new(:enabled) if params[:ai_feature][:enabled].nil?
-
-        feature = DiscourseAi::Features.find_feature_by_id(params[:id].to_i)
-        enable_value = params[:ai_feature][:enabled]
-        persona_id = params[:ai_feature][:persona_id]
-
-        SiteSetting.set_and_log(feature[:enable_setting][:name], enable_value, guardian.user)
-        SiteSetting.set_and_log(feature[:persona_setting][:name], persona_id, guardian.user)
-
-        render json: serialize_feature(DiscourseAi::Features.find_feature_by_id(params[:id].to_i))
-      end
-
       private
 
       def serialize_features(features)

assets/javascripts/discourse/admin/models/ai-feature.js

@@ -10,7 +10,6 @@ export default class AiFeature extends RestModel {
       "enable_setting",
       "persona",
       "persona_setting",
-      "additional_settings"
     );
   }
 }

assets/javascripts/discourse/components/ai-feature-editor.gjs

@@ -1,104 +1,16 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
-import { eq } from "truth-helpers";
 import BackButton from "discourse/components/back-button";
-import Form from "discourse/components/form";
-import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import getURL from "discourse/lib/get-url";
-import discourseLater from "discourse/lib/later";
-import { i18n } from "discourse-i18n";
 import SiteSettingComponent from "admin/components/site-setting";
-import SiteSetting from "admin/models/site-setting";
 
 export default class AiFeatureEditor extends Component {
   @service toasts;
   @service currentUser;
   @service router;
 
-  @tracked settings = null;
-  @tracked isLoading = false;
-  @tracked isSaving = false;
-
-  constructor() {
-    super(...arguments);
-    this.#loadSettings();
-  }
-
-  get formData() {
-    return {
-      enabled: this.args.model.enable_setting?.value,
-      persona_id: this.args.model.persona?.id,
-      additional_settings: this.args.model.additional_settings,
-    };
-  }
-
-  @action
-  async save(formData) {
-    this.isSaving = true;
-
-    try {
-      this.args.model.save({
-        enabled: formData.enabled,
-        persona_id: parseInt(formData.persona_id, 10),
-      });
-
-      this.toasts.success({
-        data: {
-          message: i18n("discourse_ai.features.editor.saved", {
-            feature_name: this.args.model.name,
-          }),
-        },
-        duration: 2000,
-      });
-
-      discourseLater(() => {
-        this.router.transitionTo(
-          "adminPlugins.show.discourse-ai-features.index"
-        );
-      }, 500);
-    } catch (error) {
-      popupAjaxError(error);
-    } finally {
-      this.isSaving = false;
-    }
-  }
-
-  get personasHint() {
-    return i18n("discourse_ai.features.editor.persona_help", {
-      config_url: getURL("/admin/plugins/discourse-ai/ai-personas"),
-    });
-  }
-
-  async #loadSettings() {
-    this.isLoading = true;
-
-    try {
-      const result = await ajax("/admin/config/site_settings.json", {
-        data: {
-          filter_area: `ai-features/${this.args.model.ref}`,
-          plugin: "discourse-ai",
-          category: "discourse_ai",
-        },
-      });
-
-      const settings = result.site_settings;
-      const settingsMap = settings.map((setting) =>
-        SiteSetting.create(setting)
-      );
-
-      this.settings = settingsMap;
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.warn(`Failed to load settings with error: ${error}`);
-    } finally {
-      this.isLoading = false;
-    }
-  }
-
   <template>
     <BackButton
       @route="adminPlugins.show.discourse-ai-features"
@@ -109,62 +21,12 @@ export default class AiFeatureEditor extends Component {
       <p>{{@model.description}}</p>
     </section>
 
-    {{!-- <Form
-      @onSubmit={{this.save}}
-      @data={{this.formData}}
-      class="form-horizontal ai-feature-editor"
-      as |form|
-    >
-      {{#if (eq @model.enable_setting.type "bool")}}
-        <form.Field
-          @name="enabled"
-          @title={{i18n "discourse_ai.features.editor.enable_setting"}}
-          @tooltip={{i18n
-            "discourse_ai.features.editor.enable_setting_help"
-            [email protected]_setting.name
-          }}
-          @validation="required"
-          @type="boolean"
-          as |field|
-        >
-          <field.Toggle />
-        </form.Field>
-      {{/if}}
-
-      <form.Field
-        @name="persona_id"
-        @title={{i18n "discourse_ai.features.editor.persona"}}
-        @format="large"
-        @helpText={{htmlSafe this.personasHint}}
-        @validation="required"
-        as |field|
-      >
-        <field.Select @includeNone={{false}} as |select|>
-          {{#each this.currentUser.ai_enabled_personas as |persona|}}
-            <select.Option @value={{persona.id}}>
-              {{persona.name}}
-            </select.Option>
-          {{/each}}
-        </field.Select>
-      </form.Field>
-
-      <form.Actions>
-        <form.Submit
-          @label="discourse_ai.features.editor.save"
-          @disabled={{this.isSaving}}
-        />
-      </form.Actions>
-    </Form> --}}
-
-    <section class="ai-feature-editor__advanced-settings">
-      <h3>{{i18n "discourse_ai.features.editor.advanced_settings"}}</h3>
-      {{#unless this.isLoading}}
-        {{#each this.settings as |setting|}}
-          <div>
-            <SiteSettingComponent @setting={{setting}} />
-          </div>
-        {{/each}}
-      {{/unless}}
+    <section class="ai-feature-editor">
+      {{#each @model.feature_settings as |setting|}}
+        <div>
+          <SiteSettingComponent @setting={{setting}} />
+        </div>
+      {{/each}}
     </section>
   </template>
 }

assets/stylesheets/common/ai-features.scss

@@ -31,9 +31,10 @@
   }
 }
 
-.ai-feature-editor__advanced-settings {
-  margin-block: 1rem;
-  padding-block: 1rem;
+.ai-feature-editor {
+  &__header {
+    border-bottom: 1px solid var(--primary-low);
+  }
 
   .setting {
     margin-block: 1.5rem;

config/locales/server.en.yml

@@ -81,11 +81,12 @@ en:
     ai_embeddings_semantic_search_hyde_model: "Model used to expand keywords to get better results during a semantic search"
     ai_embeddings_per_post_enabled: Generate embeddings for each post
 
-    ai_summarization_enabled: "Enable the topic summarization module."
-    ai_summarization_model: "Model to use for summarization."
+    ai_summarization_enabled: "Enable the summarize feature"
+    ai_summarization_model: "Model to use for summarization"
+    ai_summarization_persona: "Persona to use for summarize feature"
     ai_custom_summarization_allowed_groups: "Groups allowed to use create new summaries."
     ai_pm_summarization_allowed_groups: "Groups allowed to create and view summaries in PMs."
-    ai_summary_gists_enabled: "Generate brief summaries of latest replies in topics automatically."
+    ai_summary_gists_enabled: "Generate brief summaries of latest replies in topics automatically"
     ai_summary_gists_allowed_groups: "Groups allowed to see gists in the hot topics list."
     ai_summary_backfill_maximum_topics_per_hour: "Number of topic summaries to backfill per hour."
 
@@ -104,6 +105,7 @@ en:
     ai_google_custom_search_api_key: "API key for the Google Custom Search API see: https://developers.google.com/custom-search"
     ai_google_custom_search_cx: "CX for Google Custom Search API"
 
+    ai_discord_search_enabled: "Enables the Discord search feature"
     ai_discord_app_id: "The ID of the Discord application you would like to connect Discord search to"
     ai_discord_app_public_key: "The public key of the Discord application you would like to connect Discord search to"
     ai_discord_search_mode: "Select the search mode to use for Discord search"

config/routes.rb

@@ -112,7 +112,7 @@
     end
 
     resources :ai_features,
-              only: %i[index edit update],
+              only: %i[index edit],
               path: "ai-features",
               controller: "discourse_ai/admin/ai_features"
   end

config/settings.yml

@@ -234,7 +234,6 @@ discourse_ai:
     default: false
     client: true
     validator: "DiscourseAi::Configuration::LlmDependencyValidator"
-    hidden: true
     area: "ai-features/summarization"
   ai_summarization_model:
     default: ""
@@ -260,7 +259,6 @@ discourse_ai:
     hidden: true
   ai_summary_gists_enabled:
     default: false
-    hidden: true
     area: "ai-features/gists"
   ai_summary_gists_persona:
     default: "-12"
@@ -294,6 +292,7 @@ discourse_ai:
   ai_bot_enabled:
     default: false
     client: true
+    area: "ai-features/discoveries"
   ai_bot_enable_chat_warning:
     default: false
     client: true

lib/features.rb

@@ -57,14 +57,6 @@ def self.features
             value: SiteSetting.get(feature[:enable_setting_name]),
             type: SiteSetting.type_supervisor.get_type(feature[:enable_setting_name]),
           },
-          additional_settings:
-            (feature[:additional_settings] || []).map do |setting_name|
-              {
-                name: setting_name,
-                value: SiteSetting.get(setting_name),
-                type: SiteSetting.type_supervisor.get_type(setting_name),
-              }
-            end,
         }
       end
     end