DEV: Restructure file locations

- Colocate components / connectors
- Move admin UI files to `admin/assets` so they are only served to admins

.discourse-compatibility

@@ -1,7 +1,2 @@
-< 3.5.0.beta8-dev: e51aad3bfd41cf2cb9557e025e833122a9f6c892
-< 3.5.0.beta5-dev: bd9af0b9a577bfd2c01cc8b81a782a4e8b81b9c5
-< 3.5.0.beta1-dev: 6ceba62e985223c269782c4bc9a1bdc4a5adba28
-< 3.4.0.beta2-dev: 7685ebf396c93e8accc5a76a81fcec4384a73fa3
-< 3.4.0.beta1-dev: da38a4c053b68d7076db4441cfe86b473979945d
-< 3.3.0.beta1-dev: 062efc8a547c19474eaeefae464837d63a5e5fb3
 3.1.999: 30c49eb50d6d16fcf82bace3da0e1972b7b220c0
+

.eslintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint");

.npmrc

@@ -1,2 +0,0 @@
-engine-strict = true
-auto-install-peers = false

Gemfile.lock

@@ -1,102 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    ast (2.4.2)
-      base64
+    json (2.6.3)
-      benchmark (>= 0.3)
+    language_server-protocol (3.17.0.3)
-      bigdecimal
+    parallel (1.23.0)
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+    parser (3.2.2.4)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    ast (2.4.3)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    drb (2.2.3)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    json (2.12.2)
-    language_server-protocol (3.17.0.5)
-    lint_roller (1.1.0)
-    logger (1.7.0)
-    minitest (5.25.5)
-    parallel (1.27.0)
-    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
-    prism (1.4.0)
+    racc (1.7.3)
-    racc (1.8.1)
-    rack (3.1.16)
     rainbow (3.1.1)
-    regexp_parser (2.10.0)
+    regexp_parser (2.8.2)
-    rubocop (1.75.8)
+    rexml (3.2.6)
+    rubocop (1.57.2)
       json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
+      language_server-protocol (>= 3.17.0)
-      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.30.0)
-      parser (>= 3.3.7.2)
+      parser (>= 3.2.1.0)
-      prism (~> 1.4)
+    rubocop-capybara (2.19.0)
-    rubocop-capybara (2.22.1)
+      rubocop (~> 1.41)
-      lint_roller (~> 1.1)
+    rubocop-discourse (3.4.0)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (>= 1.1.0)
-    rubocop-discourse (3.12.1)
+      rubocop-rspec (>= 2.0.0)
-      activesupport (>= 6.1)
+    rubocop-factory_bot (2.24.0)
-      lint_roller (>= 1.1.0)
+      rubocop (~> 1.33)
-      rubocop (>= 1.73.2)
+    rubocop-rspec (2.25.0)
-      rubocop-capybara (>= 2.22.0)
+      rubocop (~> 1.40)
-      rubocop-factory_bot (>= 2.27.0)
+      rubocop-capybara (~> 2.17)
-      rubocop-rails (>= 2.30.3)
+      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec (>= 3.0.1)
-      rubocop-rspec_rails (>= 2.31.0)
-    rubocop-factory_bot (2.27.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.32.0)
-      activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
-      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.6.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
-    securerandom (0.4.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    tzinfo (2.0.6)
+    unicode-display_width (2.5.0)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
 
 PLATFORMS
-  ruby
+  arm64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   rubocop-discourse
   syntax_tree
 
 BUNDLED WITH
-   2.6.9
+   2.4.21

README.md

@@ -1,8 +1,5 @@
 # Official Discourse Advertising Plugin
 
-> [!IMPORTANT]
-> This plugin has now been bundled into Discourse core. See: https://meta.discourse.org/t/bundling-more-popular-plugins-with-discourse-core/373574
-
 Official Plugin Topic & Documentation: https://meta.discourse.org/t/official-advertising-ad-plugin-for-discourse/33734
 
 This is the official Discourse advertising plugin.  It allows advertisements to be served by supported advertising platforms for users with a Discourse forum.

admin/assets/javascripts/admin/components/house-ads-category-selector.gjs

@@ -1,7 +0,0 @@
-import CategorySelector from "select-kit/components/category-selector";
-
-export default class HouseAdsCategorySelector extends CategorySelector {
-  get value() {
-    return this.selectedCategories.map((c) => c.id);
-  }
-}

admin/assets/javascripts/admin/components/house-ads-chooser.js

@@ -1,33 +0,0 @@
-import { computed } from "@ember/object";
-import { classNames } from "@ember-decorators/component";
-import { makeArray } from "discourse/lib/helpers";
-import MultiSelectComponent from "select-kit/components/multi-select";
-
-@classNames("house-ads-chooser")
-export default class HouseAdsChooser extends MultiSelectComponent {
-  filterable = true;
-  filterPlaceholder = "admin.adplugin.house_ads.filter_placeholder";
-  tokenSeparator = "|";
-  allowCreate = false;
-  allowAny = false;
-  settingValue = "";
-  valueAttribute = null;
-  nameProperty = null;
-
-  @computed("settingValue")
-  get value() {
-    return this.settingValue
-      .toString()
-      .split(this.tokenSeparator)
-      .filter(Boolean);
-  }
-
-  computeValues() {
-    return this.settingValue.split(this.tokenSeparator).filter(Boolean);
-  }
-
-  @computed("choices")
-  get content() {
-    return makeArray(this.choices);
-  }
-}

admin/assets/javascripts/admin/components/house-ads-list-setting.gjs

@@ -1,34 +0,0 @@
-import { action } from "@ember/object";
-import { mapBy } from "@ember/object/computed";
-import { classNames } from "@ember-decorators/component";
-import DButton from "discourse/components/d-button";
-import { makeArray } from "discourse/lib/helpers";
-import HouseAdsChooser from "./house-ads-chooser";
-import HouseAdsSetting from "./house-ads-setting";
-
-@classNames("house-ads-setting house-ads-list-setting")
-export default class HouseAdsListSetting extends HouseAdsSetting {
-  @mapBy("allAds", "name") adNames;
-
-  @action
-  changeAdValue(value) {
-    const settingValue = makeArray(value).join("|");
-    this.set("adValue", settingValue);
-  }
-
-  <template>
-    <label for={{this.name}}>{{this.title}}</label>
-    <HouseAdsChooser
-      @settingValue={{this.adValue}}
-      @choices={{this.adNames}}
-      @onChange={{this.changeAdValue}}
-    />
-    <div class="setting-controls">
-      {{#if this.changed}}
-        <DButton class="ok" @action={{action "save"}} @icon="check" />
-        <DButton class="cancel" @action={{action "cancel"}} @icon="xmark" />
-      {{/if}}
-    </div>
-    <p class="help">{{this.help}}</p>
-  </template>
-}

admin/assets/javascripts/admin/components/house-ads-setting.gjs

@@ -1,72 +0,0 @@
-import Component from "@ember/component";
-import { action } from "@ember/object";
-import { classNames } from "@ember-decorators/component";
-import DButton from "discourse/components/d-button";
-import TextField from "discourse/components/text-field";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { i18n as computedI18n, propertyNotEqual } from "discourse/lib/computed";
-import { i18n } from "discourse-i18n";
-
-@classNames("house-ads-setting")
-export default class HouseAdsSetting extends Component {
-  adValue = "";
-  saving = false;
-  savingStatus = "";
-
-  @computedI18n("name", "admin.adplugin.house_ads.%@.title") title;
-  @computedI18n("name", "admin.adplugin.house_ads.%@.description") help;
-  @propertyNotEqual("adValue", "value") changed;
-
-  init() {
-    super.init(...arguments);
-    this.set("adValue", this.get("value"));
-  }
-
-  @action
-  save() {
-    if (!this.get("saving")) {
-      this.setProperties({
-        saving: true,
-        savingStatus: i18n("saving"),
-      });
-
-      ajax(`/admin/plugins/pluginad/house_settings/${this.get("name")}.json`, {
-        type: "PUT",
-        data: { value: this.get("adValue") },
-      })
-        .then(() => {
-          const adSettings = this.get("adSettings");
-          adSettings.set(this.get("name"), this.get("adValue"));
-          this.setProperties({
-            value: this.get("adValue"),
-            savingStatus: i18n("saved"),
-          });
-        })
-        .catch(popupAjaxError)
-        .finally(() => {
-          this.setProperties({
-            saving: false,
-            savingStatus: "",
-          });
-        });
-    }
-  }
-
-  @action
-  cancel() {
-    this.set("adValue", this.get("value"));
-  }
-
-  <template>
-    <label for={{this.name}}>{{this.title}}</label>
-    <TextField @value={{this.adValue}} @classNames="house-ads-text-input" />
-    <div class="setting-controls">
-      {{#if this.changed}}
-        <DButton class="ok" @action={{action "save"}} @icon="check" />
-        <DButton class="cancel" @action={{action "cancel"}} @icon="xmark" />
-      {{/if}}
-    </div>
-    <p class="help">{{this.help}}</p>
-  </template>
-}

admin/assets/javascripts/admin/components/modal/preview.gjs

@@ -1,18 +0,0 @@
-import { htmlSafe } from "@ember/template";
-import DModal from "discourse/components/d-modal";
-import { i18n } from "discourse-i18n";
-
-const Preview = <template>
-  <DModal
-    @closeModal={{@closeModal}}
-    @title={{i18n "admin.adplugin.house_ads.preview"}}
-  >
-    <:body>
-      <div class="house-ad-preview">
-        {{htmlSafe @model.html}}
-      </div>
-    </:body>
-  </DModal>
-</template>;
-
-export default Preview;

admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-index.js

@@ -1,9 +0,0 @@
-import Controller, { inject as controller } from "@ember/controller";
-import { alias } from "@ember/object/computed";
-
-export default class AdminPluginsHouseAdsIndexController extends Controller {
-  @controller("adminPlugins.houseAds") adminPluginsHouseAds;
-
-  @alias("adminPluginsHouseAds.model") houseAds;
-  @alias("adminPluginsHouseAds.houseAdsSettings") adSettings;
-}

admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-show.js

@@ -1,156 +0,0 @@
-import { tracked } from "@glimmer/tracking";
-import Controller, { inject as controller } from "@ember/controller";
-import EmberObject, { action } from "@ember/object";
-import { service } from "@ember/service";
-import { TrackedObject } from "@ember-compat/tracked-built-ins";
-import { observes } from "@ember-decorators/object";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import Category from "discourse/models/category";
-import { i18n } from "discourse-i18n";
-import Preview from "../components/modal/preview";
-
-export default class adminPluginsHouseAdsShow extends Controller {
-  @service router;
-  @service modal;
-
-  @controller("adminPlugins.houseAds") houseAdsController;
-
-  @tracked selectedCategories = [];
-  @tracked selectedGroups = [];
-  @tracked saving = false;
-  @tracked savingStatus = "";
-  @tracked buffered;
-
-  @observes("model")
-  modelChanged() {
-    this.buffered = new TrackedObject({ ...this.model });
-    this.selectedCategories = this.model.categories || [];
-    this.selectedGroups = this.model.group_ids || [];
-  }
-
-  get disabledSave() {
-    for (const key in this.buffered) {
-      // we don't want to compare the categories array
-      if (key !== "categories" && this.buffered[key] !== this.model[key]) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @action
-  async save() {
-    if (!this.saving) {
-      this.saving = true;
-      this.savingStatus = i18n("saving");
-      const data = {};
-      const newRecord = !this.buffered.id;
-      if (!newRecord) {
-        data.id = this.buffered.id;
-      }
-      data.name = this.buffered.name;
-      data.html = this.buffered.html;
-      data.visible_to_logged_in_users =
-        this.buffered.visible_to_logged_in_users;
-      data.visible_to_anons = this.buffered.visible_to_anons;
-      data.category_ids = this.buffered.category_ids;
-      data.group_ids = this.buffered.group_ids;
-      try {
-        const ajaxData = await ajax(
-          newRecord
-            ? `/admin/plugins/pluginad/house_creatives`
-            : `/admin/plugins/pluginad/house_creatives/${this.buffered.id}`,
-          {
-            type: newRecord ? "POST" : "PUT",
-            data,
-          }
-        );
-        this.savingStatus = i18n("saved");
-        const houseAds = this.houseAdsController.model;
-        if (newRecord) {
-          this.buffered.id = ajaxData.house_ad.id;
-          if (!houseAds.includes(this.buffered)) {
-            houseAds.pushObject(EmberObject.create(this.buffered));
-          }
-          this.router.transitionTo(
-            "adminPlugins.houseAds.show",
-            this.buffered.id
-          );
-        } else {
-          houseAds
-            .find((ad) => ad.id === this.buffered.id)
-            .setProperties(this.buffered);
-        }
-      } catch (error) {
-        popupAjaxError(error);
-      } finally {
-        this.set("model", this.buffered);
-        this.saving = false;
-        this.savingStatus = "";
-      }
-    }
-  }
-
-  @action
-  setCategoryIds(categoryArray) {
-    this.selectedCategories = categoryArray;
-    this.buffered.category_ids = categoryArray.map((c) => c.id);
-    this.setCategoriesForBuffered();
-  }
-
-  @action
-  setGroupIds(groupIds) {
-    this.selectedGroups = groupIds;
-    this.buffered.group_ids = groupIds.map((id) => id);
-  }
-
-  @action
-  cancel() {
-    this.buffered = new TrackedObject({ ...this.model });
-    this.selectedCategories = this.model.categories || [];
-    this.selectedGroups = this.model.group_ids || [];
-    this.setCategoriesForBuffered();
-  }
-
-  @action
-  async destroy() {
-    if (!this.buffered.id) {
-      this.router.transitionTo("adminPlugins.houseAds.index");
-      return;
-    }
-    try {
-      await ajax(
-        `/admin/plugins/pluginad/house_creatives/${this.buffered.id}`,
-        {
-          type: "DELETE",
-        }
-      );
-      this.houseAdsController.model.removeObject(
-        this.houseAdsController.model.findBy("id", this.buffered.id)
-      );
-      this.router.transitionTo("adminPlugins.houseAds.index");
-    } catch (error) {
-      popupAjaxError(error);
-    }
-  }
-
-  @action
-  openPreview() {
-    this.modal.show(Preview, {
-      model: {
-        html: this.buffered.html,
-      },
-    });
-  }
-
-  setCategoriesForBuffered() {
-    // we need to fetch the categories because the serializer is not being used
-    // to attach the category object to the house ads
-    this.buffered.categories = this.buffered.category_ids
-      ? this.buffered.category_ids.map((categoryId) =>
-          Category.findById(categoryId)
-        )
-      : [];
-  }
-}

admin/assets/javascripts/admin/controllers/admin-plugins-house-ads.js

@@ -1,5 +0,0 @@
-import Controller from "@ember/controller";
-
-export default class AdminPluginsHouseAdsController extends Controller {
-  loadingAds = true;
-}

admin/assets/javascripts/admin/routes/admin-plugins-house-ads-index.js

@@ -1,12 +0,0 @@
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DiscourseRoute from "discourse/routes/discourse";
-
-export default class AdminPluginsHouseAdsIndex extends DiscourseRoute {
-  @service router;
-
-  @action
-  moreSettings() {
-    this.router.transitionTo("adminSiteSettingsCategory", "ad_plugin");
-  }
-}

admin/assets/javascripts/admin/routes/admin-plugins-house-ads-show.js

@@ -1,23 +0,0 @@
-import { TrackedObject } from "@ember-compat/tracked-built-ins";
-import DiscourseRoute from "discourse/routes/discourse";
-import { i18n } from "discourse-i18n";
-
-export default class AdminPluginsHouseAdsShow extends DiscourseRoute {
-  model(params) {
-    if (params.ad_id === "new") {
-      return new TrackedObject({
-        name: i18n("admin.adplugin.house_ads.new_name"),
-        html: "",
-        visible_to_logged_in_users: true,
-        visible_to_anons: true,
-      });
-    } else {
-      return new TrackedObject(
-        this.modelFor("adminPlugins.houseAds").findBy(
-          "id",
-          parseInt(params.ad_id, 10)
-        )
-      );
-    }
-  }
-}

admin/assets/javascripts/admin/templates/plugins-house-ads-index.gjs

@@ -1,62 +0,0 @@
-import { LinkTo } from "@ember/routing";
-import RouteTemplate from "ember-route-template";
-import DButton from "discourse/components/d-button";
-import routeAction from "discourse/helpers/route-action";
-import { i18n } from "discourse-i18n";
-import HouseAdsListSetting from "../components/house-ads-list-setting";
-
-export default RouteTemplate(
-  <template>
-    <section class="house-ads-settings content-body">
-      <div>{{i18n "admin.adplugin.house_ads.description"}}</div>
-
-      {{#if @controller.houseAds.length}}
-        <form class="form-horizontal">
-          <HouseAdsListSetting
-            @name="topic_list_top"
-            @value={{@controller.adSettings.topic_list_top}}
-            @allAds={{@controller.houseAds}}
-            @adSettings={{@controller.adSettings}}
-          />
-          <HouseAdsListSetting
-            @name="topic_above_post_stream"
-            @value={{@controller.adSettings.topic_above_post_stream}}
-            @allAds={{@controller.houseAds}}
-            @adSettings={{@controller.adSettings}}
-          />
-          <HouseAdsListSetting
-            @name="topic_above_suggested"
-            @value={{@controller.adSettings.topic_above_suggested}}
-            @allAds={{@controller.houseAds}}
-            @adSettings={{@controller.adSettings}}
-          />
-          <HouseAdsListSetting
-            @name="post_bottom"
-            @value={{@controller.adSettings.post_bottom}}
-            @allAds={{@controller.houseAds}}
-            @adSettings={{@controller.adSettings}}
-          />
-          <HouseAdsListSetting
-            @name="topic_list_between"
-            @value={{@controller.adSettings.topic_list_between}}
-            @allAds={{@controller.houseAds}}
-            @adSettings={{@controller.adSettings}}
-          />
-
-          <DButton
-            @label="admin.adplugin.house_ads.more_settings"
-            @icon="gear"
-            @action={{routeAction "moreSettings"}}
-            class="btn-default"
-          />
-        </form>
-      {{else}}
-        <p>
-          {{#LinkTo route="adminPlugins.houseAds.show" model="new"}}
-            {{i18n "admin.adplugin.house_ads.get_started"}}
-          {{/LinkTo}}
-        </p>
-      {{/if}}
-    </section>
-  </template>
-);

admin/assets/javascripts/admin/templates/plugins-house-ads-show.gjs

@@ -1,97 +0,0 @@
-import { Input } from "@ember/component";
-import { fn, hash } from "@ember/helper";
-import RouteTemplate from "ember-route-template";
-import AceEditor from "discourse/components/ace-editor";
-import DButton from "discourse/components/d-button";
-import TextField from "discourse/components/text-field";
-import { i18n } from "discourse-i18n";
-import GroupChooser from "select-kit/components/group-chooser";
-import HouseAdsCategorySelector from "../components/house-ads-category-selector";
-
-export default RouteTemplate(
-  <template>
-    <section class="edit-house-ad content-body">
-      <h1><TextField
-          @value={{@controller.buffered.name}}
-          class="house-ad-name"
-        /></h1>
-      <div class="controls">
-        <AceEditor
-          @content={{@controller.buffered.html}}
-          @onChange={{fn (mut @controller.buffered.html)}}
-          @mode="html"
-        />
-      </div>
-      <div class="controls">
-        <div class="visibility-settings">
-          <div>
-            <Input
-              @type="checkbox"
-              @checked={{@controller.buffered.visible_to_logged_in_users}}
-              class="visible-to-logged-in-checkbox"
-            />
-            <span>{{i18n
-                "admin.adplugin.house_ads.show_to_logged_in_users"
-              }}</span>
-          </div>
-
-          <div>
-            <Input
-              class="visible-to-anonymous-checkbox"
-              @type="checkbox"
-              @checked={{@controller.buffered.visible_to_anons}}
-            />
-            <span>{{i18n "admin.adplugin.house_ads.show_to_anons"}}</span>
-          </div>
-
-          <HouseAdsCategorySelector
-            @categories={{@controller.site.categories}}
-            @selectedCategories={{@controller.selectedCategories}}
-            @onChange={{@controller.setCategoryIds}}
-            @options={{hash allowAny=true}}
-            class="house-ads-categories"
-          />
-          <div class="description">
-            {{i18n "admin.adplugin.house_ads.category_chooser_description"}}
-          </div>
-
-          <GroupChooser
-            @content={{@controller.site.groups}}
-            @onChange={{@controller.setGroupIds}}
-            @value={{@controller.selectedGroups}}
-            class="banner-groups"
-          />
-          <div class="description">
-            {{i18n "admin.adplugin.house_ads.group_chooser_description"}}
-          </div>
-        </div>
-
-        <DButton
-          @action={{@controller.save}}
-          @disabled={{@controller.disabledSave}}
-          @label="admin.adplugin.house_ads.save"
-          class="btn-primary save-button"
-        />
-
-        {{#if @controller.saving}}
-          {{@controller.savingStatus}}
-        {{else}}
-          {{#unless @controller.disabledSave}}
-            <DButton @action={{@controller.cancel}} @label="cancel" />
-          {{/unless}}
-        {{/if}}
-
-        <DButton
-          @action={{@controller.openPreview}}
-          @label="admin.adplugin.house_ads.preview"
-        />
-
-        <DButton
-          @action={{@controller.destroy}}
-          @label="admin.adplugin.house_ads.delete"
-          class="btn-danger delete-button"
-        />
-      </div>
-    </section>
-  </template>
-);

admin/assets/javascripts/admin/templates/plugins-house-ads.gjs

@@ -1,43 +0,0 @@
-import { LinkTo } from "@ember/routing";
-import RouteTemplate from "ember-route-template";
-import icon from "discourse/helpers/d-icon";
-import { i18n } from "discourse-i18n";
-
-export default RouteTemplate(
-  <template>
-    <div class="adplugin-mgmt">
-      <h1>{{i18n "admin.adplugin.house_ads.title"}}</h1>
-      {{#if @controller.model.length}}
-        <div class="content-list">
-          <div class="house-ads-actions">
-            <LinkTo
-              @route="adminPlugins.houseAds.show"
-              @model="new"
-              class="btn btn-primary"
-            >
-              {{icon "plus"}}
-              <span>{{i18n "admin.adplugin.house_ads.new"}}</span>
-            </LinkTo>
-            <LinkTo
-              @route="adminPlugins.houseAds.index"
-              class="btn btn-default"
-            >
-              {{icon "gear"}}
-              <span>{{i18n "admin.adplugin.house_ads.settings"}}</span>
-            </LinkTo>
-          </div>
-          <ul class="house-ads-list">
-            {{#each @controller.model as |ad|}}
-              <li class="house-ads-list-item">
-                {{#LinkTo route="adminPlugins.houseAds.show" model=ad.id}}
-                  {{ad.name}}
-                {{/LinkTo}}
-              </li>
-            {{/each}}
-          </ul>
-        </div>
-      {{/if}}
-      {{outlet}}
-    </div>
-  </template>
-);

admin/assets/javascripts/discourse/components/house-ads-chooser.js

@@ -0,0 +1,42 @@
+import Ember from "ember";
+import MultiSelectComponent from "select-kit/components/multi-select";
+const { makeArray } = Ember;
+import { computed } from "@ember/object";
+
+export default MultiSelectComponent.extend({
+  classNames: ["house-ads-chooser"],
+  filterable: true,
+  filterPlaceholder: "admin.adplugin.house_ads.filter_placeholder",
+  tokenSeparator: "|",
+  allowCreate: false,
+  allowAny: false,
+  settingValue: "",
+  valueAttribute: null,
+  nameProperty: null,
+
+  value: computed("settingValue", function () {
+    return this.settingValue
+      .toString()
+      .split(this.tokenSeparator)
+      .filter(Boolean);
+  }),
+
+  // TODO: kept for legacy, remove when Discourse is 2.5
+  mutateValues(values) {
+    this.set("settingValue", values.join(this.tokenSeparator));
+  },
+  computeValues() {
+    return this.settingValue.split(this.tokenSeparator).filter(Boolean);
+  },
+
+  content: computed("choices", function () {
+    return makeArray(this.choices);
+  }),
+
+  actions: {
+    onChange(value) {
+      const settingValue = makeArray(value).join(this.tokenSeparator);
+      this.attrs.onChange && this.attrs.onChange(settingValue);
+    },
+  },
+});

admin/assets/javascripts/discourse/components/house-ads-list-setting.hbs

@@ -0,0 +1,13 @@
+<label for={{name}}>{{title}}</label>
+{{house-ads-chooser
+  settingValue=adValue
+  choices=adNames
+  onChange=(action (mut adValue))
+}}
+<div class="setting-controls">
+  {{#if changed}}
+    <DButton class="ok" @action={{action "save"}} @icon="check" />
+    <DButton class="cancel" @action={{action "cancel"}} @icon="times" />
+  {{/if}}
+</div>
+<p class="help">{{help}}</p>

admin/assets/javascripts/discourse/components/house-ads-list-setting.js

@@ -0,0 +1,7 @@
+import { mapBy } from "@ember/object/computed";
+import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting";
+
+export default HouseAdsSetting.extend({
+  classNames: "house-ads-setting house-ads-list-setting",
+  adNames: mapBy("allAds", "name"),
+});

admin/assets/javascripts/discourse/components/house-ads-setting.hbs

@@ -0,0 +1,9 @@
+<label for={{name}}>{{title}}</label>
+<TextField @value={{adValue}} @classNames="house-ads-text-input" />
+<div class="setting-controls">
+  {{#if changed}}
+    <DButton class="ok" @action={{action "save"}} @icon="check" />
+    <DButton class="cancel" @action={{action "cancel"}} @icon="times" />
+  {{/if}}
+</div>
+<p class="help">{{help}}</p>

admin/assets/javascripts/discourse/components/house-ads-setting.js

@@ -0,0 +1,58 @@
+import Component from "@ember/component";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { i18n, propertyNotEqual } from "discourse/lib/computed";
+import I18n from "I18n";
+
+export default Component.extend({
+  classNames: "house-ads-setting",
+  adValue: "",
+  saving: false,
+  savingStatus: "",
+  title: i18n("name", "admin.adplugin.house_ads.%@.title"),
+  help: i18n("name", "admin.adplugin.house_ads.%@.description"),
+  changed: propertyNotEqual("adValue", "value"),
+
+  init() {
+    this._super(...arguments);
+    this.set("adValue", this.get("value"));
+  },
+
+  actions: {
+    save() {
+      if (!this.get("saving")) {
+        this.setProperties({
+          saving: true,
+          savingStatus: I18n.t("saving"),
+        });
+
+        ajax(
+          `/admin/plugins/pluginad/house_settings/${this.get("name")}.json`,
+          {
+            type: "PUT",
+            data: { value: this.get("adValue") },
+          }
+        )
+          .then(() => {
+            const adSettings = this.get("adSettings");
+            adSettings.set(this.get("name"), this.get("adValue"));
+            this.setProperties({
+              value: this.get("adValue"),
+              savingStatus: I18n.t("saved"),
+            });
+          })
+          .catch(popupAjaxError)
+          .finally(() => {
+            this.setProperties({
+              saving: false,
+              savingStatus: "",
+            });
+          });
+      }
+    },
+
+    cancel() {
+      this.set("adValue", this.get("value"));
+    },
+  },
+});

admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-index.js

@@ -0,0 +1,8 @@
+import Controller, { inject as controller } from "@ember/controller";
+import { alias } from "@ember/object/computed";
+
+export default Controller.extend({
+  adminPluginsHouseAds: controller("adminPlugins.houseAds"),
+  houseAds: alias("adminPluginsHouseAds.model"),
+  adSettings: alias("adminPluginsHouseAds.houseAdsSettings"),
+});

admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js

@@ -0,0 +1,113 @@
+import Controller, { inject as controller } from "@ember/controller";
+import { not, or } from "@ember/object/computed";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { propertyNotEqual } from "discourse/lib/computed";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import I18n from "I18n";
+
+export default Controller.extend(bufferedProperty("model"), {
+  adminPluginsHouseAds: controller("adminPlugins.houseAds"),
+
+  saving: false,
+  savingStatus: "",
+
+  nameDirty: propertyNotEqual("buffered.name", "model.name"),
+  htmlDirty: propertyNotEqual("buffered.html", "model.html"),
+  visibleToAnonsDirty: propertyNotEqual(
+    "buffered.visible_to_anons",
+    "model.visible_to_anons"
+  ),
+  visibleToLoggedInDirty: propertyNotEqual(
+    "buffered.visible_to_logged_in_users",
+    "model.visible_to_logged_in_users"
+  ),
+  dirty: or(
+    "nameDirty",
+    "htmlDirty",
+    "visibleToLoggedInDirty",
+    "visibleToAnonsDirty"
+  ),
+  disableSave: not("dirty"),
+
+  actions: {
+    save() {
+      if (!this.get("saving")) {
+        this.setProperties({
+          saving: true,
+          savingStatus: I18n.t("saving"),
+        });
+
+        const data = {},
+          buffered = this.get("buffered"),
+          newRecord = !buffered.get("id");
+
+        if (!newRecord) {
+          data.id = buffered.get("id");
+        }
+        data.name = buffered.get("name");
+        data.html = buffered.get("html");
+        data.visible_to_logged_in_users = buffered.get(
+          "visible_to_logged_in_users"
+        );
+        data.visible_to_anons = buffered.get("visible_to_anons");
+
+        ajax(
+          newRecord
+            ? `/admin/plugins/pluginad/house_creatives`
+            : `/admin/plugins/pluginad/house_creatives/${buffered.get("id")}`,
+          {
+            type: newRecord ? "POST" : "PUT",
+            data,
+          }
+        )
+          .then((ajaxData) => {
+            this.commitBuffer();
+            this.set("savingStatus", I18n.t("saved"));
+            if (newRecord) {
+              const model = this.get("model");
+              model.set("id", ajaxData.house_ad.id);
+              const houseAds = this.get("adminPluginsHouseAds.model");
+              if (!houseAds.includes(model)) {
+                houseAds.pushObject(model);
+              }
+              this.transitionToRoute(
+                "adminPlugins.houseAds.show",
+                model.get("id")
+              );
+            }
+          })
+          .catch(popupAjaxError)
+          .finally(() => {
+            this.setProperties({
+              saving: false,
+              savingStatus: "",
+            });
+          });
+      }
+    },
+
+    cancel() {
+      this.rollbackBuffer();
+    },
+
+    destroy() {
+      const houseAds = this.get("adminPluginsHouseAds.model");
+      const model = this.get("model");
+
+      if (!model.get("id")) {
+        this.transitionToRoute("adminPlugins.houseAds.index");
+        return;
+      }
+
+      ajax(`/admin/plugins/pluginad/house_creatives/${model.get("id")}`, {
+        type: "DELETE",
+      })
+        .then(() => {
+          houseAds.removeObject(model);
+          this.transitionToRoute("adminPlugins.houseAds.index");
+        })
+        .catch(popupAjaxError);
+    },
+  },
+});

admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads.js

@@ -0,0 +1,5 @@
+import Controller from "@ember/controller";
+
+export default Controller.extend({
+  loadingAds: true,
+});

admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-index.js

@@ -0,0 +1,9 @@
+import { action } from "@ember/object";
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default DiscourseRoute.extend({
+  @action
+  moreSettings() {
+    this.transitionTo("adminSiteSettingsCategory", "ad_plugin");
+  },
+});

admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js

@@ -0,0 +1,21 @@
+import EmberObject from "@ember/object";
+import DiscourseRoute from "discourse/routes/discourse";
+import I18n from "I18n";
+
+export default DiscourseRoute.extend({
+  model(params) {
+    if (params.ad_id === "new") {
+      return EmberObject.create({
+        name: I18n.t("admin.adplugin.house_ads.new_name"),
+        html: "",
+        visible_to_logged_in_users: true,
+        visible_to_anons: true,
+      });
+    } else {
+      return this.modelFor("adminPlugins.houseAds").findBy(
+        "id",
+        parseInt(params.ad_id, 10)
+      );
+    }
+  },
+});