From a3ad52982175b786acde2291428cb5302eeb99ba Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Mon, 21 Apr 2025 22:13:04 +0200
Subject: [PATCH] Merge deprecations with main

---
 .gitignore                                    |   1 +
 .../components/global-admin.hbs               |  30 ++-
 .../components/modal/update-pages-remote.hbs  |  20 +-
 .../components/modal/update-pages-remote.js   |   2 +-
 .../{templates => }/components/page-admin.hbs |  72 +++---
 .../topic-landing-page-info.hbs               |   4 +-
 .../admin-plugins-landing-pages.js            | 218 +++++++++---------
 .../templates/admin-plugins-landing-pages.hbs |  30 +--
 plugin.rb                                     |   5 +-
 9 files changed, 198 insertions(+), 184 deletions(-)
 rename assets/javascripts/discourse/{templates => }/components/global-admin.hbs (69%)
 rename assets/javascripts/discourse/{templates => }/components/page-admin.hbs (75%)

diff --git a/.gitignore b/.gitignore
index 6f1b7c9..df42a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 node_modules
 /gems
 /autogenerated
+.DS_Store
diff --git a/assets/javascripts/discourse/templates/components/global-admin.hbs b/assets/javascripts/discourse/components/global-admin.hbs
similarity index 69%
rename from assets/javascripts/discourse/templates/components/global-admin.hbs
rename to assets/javascripts/discourse/components/global-admin.hbs
index 568fa8a..ffad4dd 100644
--- a/assets/javascripts/discourse/templates/components/global-admin.hbs
+++ b/assets/javascripts/discourse/components/global-admin.hbs
@@ -4,16 +4,16 @@
   </div>
 
   <div class="buttons">
-    {{#if resultIcon}}
-      {{d-icon resultIcon}}
+    {{#if this.resultIcon}}
+      {{d-icon this.resultIcon}}
     {{/if}}
 
-    {{conditional-loading-spinner condition=updatingGlobal size="small"}}
+    {{conditional-loading-spinner condition=this.updatingGlobal size="small"}}
 
     {{d-button
       action=(action "destroyGlobal")
       label="admin.landing_pages.destroy"
-      disabled=updatingGlobal
+      disabled=this.updatingGlobal
       icon="xmark"
     }}
 
@@ -21,7 +21,7 @@
       action=(action "saveGlobal")
       label="admin.landing_pages.save"
       class="btn-primary"
-      disabled=updatingGlobal
+      disabled=this.updatingGlobal
       icon="floppy-disk"
     }}
   </div>
@@ -33,7 +33,7 @@
       {{i18n "admin.landing_pages.global.scripts.label"}}
     </label>
 
-    {{value-list values=scripts inputType="array"}}
+    {{value-list values=this.scripts inputType="array"}}
 
     <div class="control-instructions">
       {{{i18n "admin.landing_pages.global.scripts.description"}}}
@@ -49,11 +49,14 @@
       {{{i18n "admin.landing_pages.global.header.description"}}}
     </div>
 
-    <JsonEditor @content={{jsonHeader}} />
-    {{#if jsonHeaderError}}
+    <JsonEditor @content={{this.jsonHeader}} />
+    {{#if this.jsonHeaderError}}
       <span class="validation-error">
         {{d-icon "xmark"}}
-        {{i18n "admin.landing_pages.global.header.error" error=jsonHeaderError}}
+        {{i18n
+          "admin.landing_pages.global.header.error"
+          error=this.jsonHeaderError
+        }}
       </span>
     {{/if}}
   </div>
@@ -67,11 +70,14 @@
       {{{i18n "admin.landing_pages.global.footer.description"}}}
     </div>
 
-    <JsonEditor @content={{jsonFooter}} />
-    {{#if jsonFooterError}}
+    <JsonEditor @content={{this.jsonFooter}} />
+    {{#if this.jsonFooterError}}
       <span class="validation-error">
         {{d-icon "xmark"}}
-        {{i18n "admin.landing_pages.global.footer.error" error=jsonFooterError}}
+        {{i18n
+          "admin.landing_pages.global.footer.error"
+          error=this.jsonFooterError
+        }}
       </span>
     {{/if}}
   </div>
diff --git a/assets/javascripts/discourse/components/modal/update-pages-remote.hbs b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
index 3890df8..64ac88f 100644
--- a/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
+++ b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
@@ -6,17 +6,17 @@
   <:body>
     <div class="url">
       <div class="label">{{i18n "admin.landing_pages.remote.url"}}</div>
-      <Input @value={{buffered.url}} placeholder={{urlPlaceholder}} />
+      <Input @value={{this.buffered.url}} placeholder={{urlPlaceholder}} />
     </div>
 
     <div class="branch">
       <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
-      <Input @value={{buffered.branch}} placeholder="main" />
+      <Input @value={{this.buffered.branch}} placeholder="main" />
     </div>
 
     <div class="check-private">
       <label>
-        <Input @type="checkbox" @checked={{buffered.private}} />
+        <Input @type="checkbox" @checked={{this.buffered.private}} />
         {{i18n "admin.landing_pages.remote.private"}}
       </label>
     </div>
@@ -24,7 +24,7 @@
     {{#if showPublicKey}}
       <div class="public-key">
         <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
-        <Textarea readonly={{true}} @value={{buffered.public_key}} />
+        <Textarea readonly={{true}} @value={{this.buffered.public_key}} />
       </div>
     {{/if}}
   </:body>
@@ -32,30 +32,30 @@
   <:footer>
     <DButton
       @action={{action "update"}}
-      @disabled={{updateDisabled}}
+      @disabled={{this.updateDisabled}}
       class="btn btn-primary"
       @label="admin.landing_pages.remote.update"
     />
 
     <DButton
       @action={{action "reset"}}
-      @disabled={{resetDisabled}}
+      @disabled={{this.resetDisabled}}
       class="btn btn-danger"
       @label="admin.landing_pages.remote.reset"
     />
 
     <DButton
       @action={{action "test"}}
-      @disabled={{testDisabled}}
+      @disabled={{this.testDisabled}}
       class="btn btn-test"
       @label="admin.landing_pages.remote.test"
     />
 
-    {{#if loading}}
+    {{#if this.loading}}
       {{loading-spinner size="small"}}
     {{else}}
-      {{#if testIcon}}
-        {{d-icon testIcon (hash class=tested)}}
+      {{#if this.testIcon}}
+        {{d-icon this.testIcon (hash class=this.tested)}}
       {{/if}}
     {{/if}}
 
diff --git a/assets/javascripts/discourse/components/modal/update-pages-remote.js b/assets/javascripts/discourse/components/modal/update-pages-remote.js
index 63b77e7..b21fe3f 100644
--- a/assets/javascripts/discourse/components/modal/update-pages-remote.js
+++ b/assets/javascripts/discourse/components/modal/update-pages-remote.js
@@ -39,7 +39,7 @@ export default Component.extend(bufferedProperty("model.remote"), {
 
   @discourseComputed("tested")
   testIcon(tested) {
-    return tested === "success" ? "check" : tested === "error" ? "times" : null;
+    return tested === "success" ? "check" : tested === "error" ? "xmark" : null;
   },
 
   @observes("buffered.hasChanges")
diff --git a/assets/javascripts/discourse/templates/components/page-admin.hbs b/assets/javascripts/discourse/components/page-admin.hbs
similarity index 75%
rename from assets/javascripts/discourse/templates/components/page-admin.hbs
rename to assets/javascripts/discourse/components/page-admin.hbs
index b5808b1..a702a68 100644
--- a/assets/javascripts/discourse/templates/components/page-admin.hbs
+++ b/assets/javascripts/discourse/components/page-admin.hbs
@@ -1,8 +1,8 @@
 <div class="page-controls">
   <div class="page-list-container">
     <ComboBox
-      @value={{page.id}}
-      @content={{pages}}
+      @value={{this.page.id}}
+      @content={{this.pages}}
       @onChange={{action "changePage"}}
       class="page-select"
       @options={{hash none="admin.landing_pages.page.select"}}
@@ -17,12 +17,12 @@
   </div>
 </div>
 
-{{#if page}}
+{{#if this.page}}
   <div class="page-header">
     <div class="page-name">
       <span>
-        {{#if page.name}}
-          {{page.name}}
+        {{#if this.page.name}}
+          {{this.page.name}}
         {{else}}
           {{i18n "admin.landing_pages.page.name.label"}}
         {{/if}}
@@ -30,28 +30,28 @@
     </div>
 
     <div class="buttons">
-      {{#if resultMessage}}
-        <span class="{{resultMessage.style}}">
-          {{d-icon resultMessage.icon}}
-          {{{resultMessage.text}}}
+      {{#if this.resultMessage}}
+        <span class="{{this.resultMessage.style}}">
+          {{d-icon this.resultMessage.icon}}
+          {{{this.resultMessage.text}}}
         </span>
       {{/if}}
 
-      {{conditional-loading-spinner condition=updatingPage size="small"}}
+      {{conditional-loading-spinner condition=this.updatingPage size="small"}}
 
-      {{#if page.id}}
+      {{#if this.page.id}}
         <DButton
           @action={{action "exportPage"}}
           @label="admin.landing_pages.page.export"
-          @href={{page.exportUrl}}
-          @disabled={{updatingPage}}
+          @href={{this.page.exportUrl}}
+          @disabled={{this.updatingPage}}
           @icon="upload"
         />
 
         <DButton
           @action={{action "destroyPage"}}
           @label="admin.landing_pages.destroy"
-          @disabled={{updatingPage}}
+          @disabled={{this.updatingPage}}
           @icon="xmark"
         />
       {{/if}}
@@ -60,14 +60,14 @@
         @action={{action "savePage"}}
         @label="admin.landing_pages.save"
         class="btn-primary"
-        @disabled={{updatingPage}}
+        @disabled={{this.updatingPage}}
         @icon="floppy-disk"
       />
     </div>
 
     <div class="page-url">
-      <a href="{{pageUrl}}" target="_blank">
-        {{pageUrl}}
+      <a href="{{this.pageUrl}}" target="_blank">
+        {{this.pageUrl}}
         {{d-icon "up-right-from-square"}}
       </a>
     </div>
@@ -79,7 +79,7 @@
         {{i18n "admin.landing_pages.page.name.label"}}
       </label>
 
-      <Input @value={{page.name}} class="page-name" />
+      <Input @value={{this.page.name}} class="page-name" />
 
       <div class="control-instructions">
         {{i18n "admin.landing_pages.page.name.instructions"}}
@@ -92,8 +92,8 @@
       </label>
 
       <Input
-        @value={{readonly pagePath}}
-        disabled={{hasParent}}
+        @value={{readonly this.pagePath}}
+        disabled={{this.hasParent}}
         onInput={{action "onChangePath" value="target.value"}}
         class="page-path"
       />
@@ -109,8 +109,8 @@
       </label>
 
       <ComboBox
-        @value={{page.parent_id}}
-        @content={{pages}}
+        @value={{this.page.parent_id}}
+        @content={{this.pages}}
         @onChange={{action "onChangeParent"}}
         class="page-select page-parent"
         @options={{hash none="admin.landing_pages.page.select"}}
@@ -127,11 +127,11 @@
       </label>
 
       <ComboBox
-        @content={{menus}}
-        @value={{page.menu}}
+        @content={{this.menus}}
+        @value={{this.page.menu}}
         @valueProperty="name"
         @nameProperty="name"
-        @onChange={{action (mut page.menu)}}
+        @onChange={{action (mut this.page.menu)}}
         class="menu-select"
         @options={{hash none="admin.landing_pages.page.menu.select"}}
       />
@@ -149,9 +149,9 @@
       </label>
 
       <ComboBox
-        @content={{themes}}
-        @value={{page.theme_id}}
-        @onChange={{action (mut page.theme_id)}}
+        @content={{this.themes}}
+        @value={{this.page.theme_id}}
+        @onChange={{action (mut this.page.theme_id)}}
         @class="theme-select"
         @options={{hash none="admin.landing_pages.page.theme.select"}}
       />
@@ -168,10 +168,10 @@
 
       <GroupChooser
         @class="group-select"
-        @content={{groups}}
-        @value={{page.group_ids}}
+        @content={{this.groups}}
+        @value={{this.page.group_ids}}
         @labelProperty="name"
-        @onChange={{action (mut page.group_ids)}}
+        @onChange={{action (mut this.page.group_ids)}}
       />
 
       <div class="control-instructions">
@@ -186,11 +186,11 @@
 
       <CategoryChooser
         @class="category-select"
-        @value={{page.category_id}}
-        @onChange={{action (mut page.category_id)}}
+        @value={{this.page.category_id}}
+        @onChange={{action (mut this.page.category_id)}}
         @options={{hash
           clearable=true
-          disabled=hasParent
+          disabled=this.hasParent
           none="admin.landing_pages.page.category.select"
         }}
       />
@@ -211,8 +211,8 @@
     </div>
 
     <AceEditor
-      @content={{page.body}}
-      @onChange={{fn (mut page.body)}}
+      @content={{this.page.body}}
+      @onChange={{fn (mut this.page.body)}}
       @mode="html"
     />
   </div>
diff --git a/assets/javascripts/discourse/connectors/topic-category/topic-landing-page-info.hbs b/assets/javascripts/discourse/connectors/topic-category/topic-landing-page-info.hbs
index aef68dd..ea360bd 100644
--- a/assets/javascripts/discourse/connectors/topic-category/topic-landing-page-info.hbs
+++ b/assets/javascripts/discourse/connectors/topic-category/topic-landing-page-info.hbs
@@ -1,6 +1,6 @@
-{{#if topic.landing_page_url}}
+{{#if @outletArgs.topic.landing_page_url}}
   <a
-    href="/{{topic.landing_page_url}}"
+    href="/{{@outletArgs.topic.landing_page_url}}"
     title="{{i18n 'topic.landing_page.link'}}"
     class="landing-page-url"
     target="_blank"
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js b/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js
index 0d89966..3378186 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js
+++ b/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js
@@ -7,6 +7,7 @@ import { gt, not, notEmpty, or } from "@ember/object/computed";
 import { extractError } from "discourse/lib/ajax-error";
 import { ajax } from "discourse/lib/ajax";
 import I18n from "I18n";
+import { action } from "@ember/object";
 
 const statusIcons = {
   error: "exclamation-triangle",
@@ -113,128 +114,131 @@ export default Controller.extend({
     return showGlobal ? `${rootUrl}` : `${rootUrl}`;
   },
 
-  actions: {
-    importPages() {
-      this.modal.show(ImportPages).then((result) => {
-        if (result?.page) {
+  @action
+  importPages() {
+    this.modal.show(ImportPages).then((result) => {
+      if (result?.page) {
+        this.setProperties({
+          pages: result.pages,
+          resultMessages: {
+            type: "success",
+            messages: [
+              I18n.t("admin.landing_pages.imported.x_pages", { count: 1 }),
+            ],
+          },
+        });
+      }
+    });
+  },
+
+  @action
+  updateRemote() {
+    this.modal
+      .show(UpdatePagesRemote, { model: { remote: this.remote } })
+      .then((result) => {
+        if (result?.remote) {
           this.setProperties({
-            pages: result.pages,
-            resultMessages: {
-              type: "success",
-              messages: [
-                I18n.t("admin.landing_pages.imported.x_pages", { count: 1 }),
-              ],
-            },
+            remote: result.remote,
+            pagesNotFetched: true,
           });
         }
       });
-    },
-
-    updateRemote() {
-      this.modal
-        .show(UpdatePagesRemote, { model: { remote: this.remote } })
-        .then((result) => {
-          if (result?.remote) {
-            this.setProperties({
-              remote: result.remote,
-              pagesNotFetched: true,
-            });
-          }
+  },
+
+  @action
+  pullFromRemote() {
+    this.set("pullingFromRemote", true);
+
+    ajax("/landing/remote/pages")
+      .then((result) => {
+        const pages = result.pages;
+        const menus = result.menus;
+        const global = result.global;
+        const report = result.report;
+
+        this.setProperties({
+          pages,
+          menus,
+          global,
         });
-    },
 
-    pullFromRemote() {
-      this.set("pullingFromRemote", true);
+        if (report.errors.length) {
+          this.set("resultMessages", {
+            type: "error",
+            messages: result.report.errors,
+          });
+        } else {
+          let imported = report.imported;
+          let messages = [];
+
+          ["scripts", "menus", "assets", "pages"].forEach((listType) => {
+            if (imported[listType].length) {
+              messages.push(
+                I18n.t(`admin.landing_pages.imported.x_${listType}`, {
+                  count: imported[listType].length,
+                })
+              );
+            }
+          });
 
-      ajax("/landing/remote/pages")
-        .then((result) => {
-          const pages = result.pages;
-          const menus = result.menus;
-          const global = result.global;
-          const report = result.report;
+          ["footer", "header"].forEach((boolType) => {
+            if (imported[boolType]) {
+              messages.push(I18n.t(`admin.landing_pages.imported.${boolType}`));
+            }
+          });
 
           this.setProperties({
-            pages,
-            menus,
-            global,
+            resultMessages: { type: "success", messages },
+            pagesNotFetched: false,
           });
 
-          if (report.errors.length) {
-            this.set("resultMessages", {
-              type: "error",
-              messages: result.report.errors,
-            });
-          } else {
-            let imported = report.imported;
-            let messages = [];
-
-            ["scripts", "menus", "assets", "pages"].forEach((listType) => {
-              if (imported[listType].length) {
-                messages.push(
-                  I18n.t(`admin.landing_pages.imported.x_${listType}`, {
-                    count: imported[listType].length,
-                  })
-                );
-              }
-            });
-
-            ["footer", "header"].forEach((boolType) => {
-              if (imported[boolType]) {
-                messages.push(
-                  I18n.t(`admin.landing_pages.imported.${boolType}`)
-                );
-              }
-            });
-
-            this.setProperties({
-              resultMessages: { type: "success", messages },
-              pagesNotFetched: false,
-            });
-
-            this.send("commitsBehind");
-          }
-        })
-        .catch((error) => {
-          this.set("resultMessages", {
-            type: "error",
-            messages: [extractError(error)],
-          });
-        })
-        .finally(() => {
-          this.set("pullingFromRemote", false);
-        });
-    },
-
-    commitsBehind() {
-      this.set("fetchingCommits", true);
-
-      ajax("/landing/remote/commits-behind")
-        .then((result) => {
-          if (!result.failed) {
-            this.set("commitsBehind", result.commits_behind);
-          }
-        })
-        .finally(() => {
-          this.set("fetchingCommits", false);
+          this.send("commitsBehind");
+        }
+      })
+      .catch((error) => {
+        this.set("resultMessages", {
+          type: "error",
+          messages: [extractError(error)],
         });
-    },
+      })
+      .finally(() => {
+        this.set("pullingFromRemote", false);
+      });
+  },
 
-    updatePages(pages) {
-      this.set("pages", pages);
-    },
+  @action
+  commitsBehind() {
+    this.set("fetchingCommits", true);
 
-    toggleShowPages() {
-      this.setProperties({
-        showPages: true,
-        showGlobal: false,
+    ajax("/landing/remote/commits-behind")
+      .then((result) => {
+        if (!result.failed) {
+          this.set("commitsBehind", result.commits_behind);
+        }
+      })
+      .finally(() => {
+        this.set("fetchingCommits", false);
       });
-    },
+  },
 
-    toggleShowGlobal() {
-      this.setProperties({
-        showPages: false,
-        showGlobal: true,
-      });
-    },
+  @action
+  updatePages(pages) {
+    this.set("pages", pages);
+  },
+
+  @action
+  toggleShowPages() {
+    this.setProperties({
+      showPages: true,
+      showGlobal: false,
+    });
+  },
+
+  @action
+  toggleShowGlobal() {
+    this.setProperties({
+      showPages: false,
+      showGlobal: true,
+    });
   },
 });
diff --git a/assets/javascripts/discourse/templates/admin-plugins-landing-pages.hbs b/assets/javascripts/discourse/templates/admin-plugins-landing-pages.hbs
index a186ebd..b4c14b8 100644
--- a/assets/javascripts/discourse/templates/admin-plugins-landing-pages.hbs
+++ b/assets/javascripts/discourse/templates/admin-plugins-landing-pages.hbs
@@ -18,12 +18,12 @@
   </div>
 
   <div class="buttons">
-    {{#if pullingFromRemote}}
+    {{#if this.pullingFromRemote}}
       {{loading-spinner size="small"}}
-    {{else if showCommitsBehind}}
+    {{else if this.showCommitsBehind}}
       {{i18n
         "admin.landing_pages.remote.repository.x_commits_behind"
-        count=commitsBehind
+        count=this.commitsBehind
       }}
     {{/if}}
 
@@ -33,7 +33,7 @@
       @title="admin.landing_pages.remote.pull.description"
       @icon="arrow-down"
       class="pull"
-      @disabled={{pullDisabled}}
+      @disabled={{this.pullDisabled}}
     />
 
     <DButton
@@ -54,10 +54,10 @@
   </div>
 </div>
 
-<div class="page-message {{messages.status}}">
-  {{#if hasMessages}}
+<div class="page-message {{this.messages.status}}">
+  {{#if this.hasMessages}}
     <div class="messages">
-      {{#each messages.items as |item|}}
+      {{#each this.messages.items as |item|}}
         <div class="message-block">
           {{d-icon item.icon}}
           <span>{{item.text}}</span>
@@ -69,20 +69,20 @@
   <div class="message-block">
     {{d-icon "circle-question"}}
 
-    <a href={{documentationUrl}} target="_blank">
+    <a href={{this.documentationUrl}} target="_blank">
       {{i18n "admin.landing_pages.documentation"}}
     </a>
   </div>
 </div>
 
-{{#if showGlobal}}
-  <GlobalAdmin @global={{global}} />
-{{else if showPages}}
+{{#if this.showGlobal}}
+  <GlobalAdmin @global={{this.global}} />
+{{else if this.showPages}}
   <PageAdmin
-    @pages={{pages}}
-    @themes={{themes}}
-    @groups={{groups}}
-    @menus={{menus}}
+    @pages={{this.pages}}
+    @themes={{this.themes}}
+    @groups={{this.groups}}
+    @menus={{this.menus}}
     @updatePages={{action "updatePages"}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/plugin.rb b/plugin.rb
index d3209fb..22bc10e 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -92,7 +92,10 @@
   end
 
   full_path = "#{Rails.root}/plugins/discourse-landing-pages/assets/stylesheets/page/page.scss"
-  Stylesheet::Importer.plugin_assets["landing_page"] = Set[full_path]
+  Stylesheet::Importer.plugin_assets["landing_page"] = {
+    plugin_path: self.path,
+    stylesheets: Set[full_path],
+  }
 
   add_to_class(:category, :landing_page_id) do
     (LandingPages::Cache.new(LandingPages::CATEGORY_IDS_KEY).read || {}).transform_keys(&:to_i)[