From 9941412c151cfca4bce44bd5a605ba30a708f8b9 Mon Sep 17 00:00:00 2001
From: Pablo Cabido <cabidop@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:42:53 +0200
Subject: [PATCH 1/3] Updated deprecated remote modal and allowed to reset its
 configuration

---
 .../components/modal/update-pages-remote.hbs  |  64 +++++++
 .../modal/update-pages-remote.js.es6          | 129 ++++++++++++++
 .../admin-plugins-landing-pages.js.es6        |  22 ++-
 .../controllers/update-pages-remote.js.es6    | 168 ------------------
 .../templates/modal/update-pages-remote.hbs   |  53 ------
 config/locales/client.en.yml                  |   1 +
 6 files changed, 204 insertions(+), 233 deletions(-)
 create mode 100644 assets/javascripts/discourse/components/modal/update-pages-remote.hbs
 create mode 100644 assets/javascripts/discourse/components/modal/update-pages-remote.js.es6
 delete mode 100644 assets/javascripts/discourse/controllers/update-pages-remote.js.es6
 delete mode 100644 assets/javascripts/discourse/templates/modal/update-pages-remote.hbs

diff --git a/assets/javascripts/discourse/components/modal/update-pages-remote.hbs b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
new file mode 100644
index 0000000..4a8795b
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
@@ -0,0 +1,64 @@
+<DModal
+  class="update-pages-remote"
+  @title={{i18n "admin.landing_pages.remote.title"}}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    <div class="repo">
+      <div class="label">{{i18n "admin.landing_pages.remote.url"}}</div>
+      <Input @value={{buffered.url}} placeholder={{urlPlaceholder}} />
+    </div>
+
+    <div class="branch">
+      <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
+      <Input @value={{buffered.branch}} placeholder="main" />
+    </div>
+
+    <div class="check-private">
+      <label>
+        <Input @type="checkbox" @checked={{buffered.private}} />
+        {{i18n "admin.landing_pages.remote.private"}}
+      </label>
+    </div>
+
+    {{#if showPublicKey}}
+      <div class="public-key">
+        <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
+        <Textarea readonly={{true}} @value={{buffered.public_key}} />
+      </div>
+    {{/if}}
+  </:body>
+
+  <:footer>
+    <DButton
+      @action={{action "update"}}
+      @disabled={{updateDisabled}}
+      class="btn btn-primary"
+      @label="admin.landing_pages.remote.update"
+    />
+
+    <DButton
+      @action={{action "reset"}}
+      @disabled={{resetDisabled}}
+      class="btn btn-danger"
+      @label="admin.landing_pages.remote.reset"
+    />
+
+    <DButton
+      @action={{action "test"}}
+      @disabled={{testDisabled}}
+      class="btn btn-test"
+      @label="admin.landing_pages.remote.test"
+    />
+
+    {{#if loading}}
+      {{loading-spinner size="small"}}
+    {{else}}
+      {{#if testIcon}}
+        {{d-icon testIcon}}
+      {{/if}}
+    {{/if}}
+
+    <DModalCancel @close={{@closeModal}} />
+  </:footer>
+</DModal>
\ No newline at end of file
diff --git a/assets/javascripts/discourse/components/modal/update-pages-remote.js.es6 b/assets/javascripts/discourse/components/modal/update-pages-remote.js.es6
new file mode 100644
index 0000000..63b77e7
--- /dev/null
+++ b/assets/javascripts/discourse/components/modal/update-pages-remote.js.es6
@@ -0,0 +1,129 @@
+import Component from "@ember/component";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
+import { and, or } from "@ember/object/computed";
+import { action } from "@ember/object";
+
+export default Component.extend(bufferedProperty("model.remote"), {
+  keyGenUrl: "/admin/themes/generate_key_pair",
+  remoteUrl: "/landing/remote",
+  httpsPlaceholder: "https://github.com/org/repo",
+  sshPlaceholder: "git@github.com:org/repo.git",
+  showPublicKey: and("buffered.private", "buffered.public_key"),
+  testing: false,
+  updating: false,
+  resetting: false,
+  loading: or("testing", "updating", "resetting"),
+
+  @discourseComputed("tested", "loading")
+  updateDisabled(tested, loading) {
+    return tested !== "success" || loading;
+  },
+
+  @discourseComputed("buffered.connected", "loading")
+  resetDisabled(connected, loading) {
+    return !connected || loading;
+  },
+
+  @discourseComputed("buffered.url", "loading")
+  testDisabled(url, loading) {
+    return !url || loading;
+  },
+
+  @discourseComputed("buffered.private")
+  urlPlaceholder(isPrivate) {
+    return isPrivate ? this.sshPlaceholder : this.httpsPlaceholder;
+  },
+
+  @discourseComputed("tested")
+  testIcon(tested) {
+    return tested === "success" ? "check" : tested === "error" ? "times" : null;
+  },
+
+  @observes("buffered.hasChanges")
+  remoteChanged() {
+    this.set("tested", null);
+  },
+
+  @observes("buffered.private")
+  privateWasChecked() {
+    if (
+      this.buffered.get("private") &&
+      !this.buffered.get("public_key") &&
+      !this._keyLoading
+    ) {
+      this.set("_keyLoading", true);
+
+      ajax(this.keyGenUrl, { type: "POST" })
+        .then((result) => {
+          this.buffered.setProperties({
+            private_key: result.private_key,
+            public_key: result.public_key,
+          });
+        })
+        .catch(popupAjaxError)
+        .finally(() => this.set("_keyLoading", false));
+    }
+  },
+
+  buildData() {
+    this.commitBuffer();
+    const remote = this.model.remote;
+    return {
+      remote: {
+        url: remote.url,
+        branch: remote.branch,
+        ...(remote.private && { private_key: remote.private_key }),
+        ...(remote.private && { public_key: remote.public_key }),
+      },
+    };
+  },
+
+  @action
+  test() {
+    this.set("testing", true);
+
+    ajax(this.remoteUrl + "/test", {
+      type: "POST",
+      data: this.buildData(),
+    })
+      .then((result) => {
+        this.set("tested", result.success ? "success" : "error");
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("testing", false));
+  },
+
+  @action
+  update() {
+    this.set("updating", true);
+
+    ajax(this.remoteUrl, {
+      type: "PUT",
+      data: this.buildData(),
+    })
+      .then((result) => {
+        this.closeModal(result);
+        this.set("model.remote", {});
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("updating", false));
+  },
+
+  @action
+  reset() {
+    this.set("resetting", true);
+
+    ajax(this.remoteUrl, {
+      type: "DELETE",
+    })
+      .then(() => {
+        this.closeModal({ remote: {} });
+        this.set("model.remote", {});
+      })
+      .catch(popupAjaxError)
+      .finally(() => this.set("resetting", false));
+  },
+});
diff --git a/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js.es6
index ca56da6..639e4eb 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-landing-pages.js.es6
@@ -1,11 +1,11 @@
 import LandingPage from "../models/landing-page";
 import ImportPages from "../components/modal/import-pages";
+import UpdatePagesRemote from "../components/modal/update-pages-remote";
 import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
 import discourseComputed from "discourse-common/utils/decorators";
 import { gt, not, notEmpty, or } from "@ember/object/computed";
 import { extractError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
 import { ajax } from "discourse/lib/ajax";
 import I18n from "I18n";
 
@@ -152,18 +152,16 @@ export default Controller.extend({
     },
 
     updateRemote() {
-      const controller = showModal("update-pages-remote", {
-        model: {
-          remote: this.remote,
-          buffered: JSON.parse(JSON.stringify(this.remote)),
-        },
-      });
-      controller.set("afterUpdate", (result) => {
-        this.setProperties({
-          remote: result.remote,
-          pagesNotFetched: true,
+      this.modal
+        .show(UpdatePagesRemote, { model: { remote: this.remote } })
+        .then((result) => {
+          if (result?.remote) {
+            this.setProperties({
+              remote: result.remote,
+              pagesNotFetched: true,
+            });
+          }
         });
-      });
     },
 
     pullFromRemote() {
diff --git a/assets/javascripts/discourse/controllers/update-pages-remote.js.es6 b/assets/javascripts/discourse/controllers/update-pages-remote.js.es6
deleted file mode 100644
index 36a9432..0000000
--- a/assets/javascripts/discourse/controllers/update-pages-remote.js.es6
+++ /dev/null
@@ -1,168 +0,0 @@
-import Controller from "@ember/controller";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
-import { and } from "@ember/object/computed";
-
-export default Controller.extend({
-  keyGenUrl: "/admin/themes/generate_key_pair",
-  remoteUrl: "/landing/remote",
-  urlPlaceholder: "https://github.com/paviliondev/pages",
-  showPublicKey: and("model.remote.private", "model.remote.public_key"),
-  tested: false,
-  remoteChanged: false,
-  updating: false,
-
-  @observes(
-    "model.remote.url",
-    "model.remote.branch",
-    "model.remote.private",
-    "model.remote.public_key",
-    "model.remote.private_key"
-  )
-  remoteUpdated() {
-    const model = this.model;
-    if (!model) {
-      return;
-    }
-
-    const remote = model.remote;
-    const buffered = model.buffered;
-
-    let remoteChanged = false;
-
-    if (remote && buffered) {
-      remoteChanged = [
-        "url",
-        "branch",
-        "private",
-        "public_key",
-        "private_key",
-      ].some((k) => {
-        return buffered[k] !== remote[k];
-      });
-    }
-
-    this.setProperties({
-      remoteChanged,
-      buffered: remote,
-      tested: this.tested && !remoteChanged,
-    });
-  },
-
-  @discourseComputed(
-    "remoteChanged",
-    "updating",
-    "tested",
-    "testing",
-    "connected"
-  )
-  updateDisabled(remoteChanged, updating, tested, testing, connected) {
-    return !remoteChanged || updating || !tested || testing || !connected;
-  },
-
-  @discourseComputed("testing", "model.remote.url")
-  testDisabled(testing, url) {
-    return testing || !url;
-  },
-
-  @discourseComputed("tested", "connected")
-  testStatus(tested, connected) {
-    if (!tested) {
-      return null;
-    }
-    return connected ? "success" : "failed";
-  },
-
-  @discourseComputed("connected")
-  testIcon(connected) {
-    return connected ? "check" : "times";
-  },
-
-  @observes("model.remote.private")
-  privateWasChecked() {
-    const model = this.model;
-    if (!model || !model.remote) {
-      return;
-    }
-
-    const remote = model.remote;
-
-    remote.private
-      ? this.set("urlPlaceholder", "git@github.com:paviliondev/pages.git")
-      : this.set(
-          "urlPlaceholder",
-          "https://github.com/paviliondev/pavilion-landing-pages"
-        );
-
-    if (remote.private && !remote.public_key && !this._keyLoading) {
-      this._keyLoading = true;
-      ajax(this.keyGenUrl, { type: "POST" })
-        .then((pair) => {
-          remote.setProperties({
-            private_key: pair.private_key,
-            public_key: pair.public_key,
-          });
-        })
-        .catch(popupAjaxError)
-        .finally(() => {
-          this._keyLoading = false;
-        });
-    }
-  },
-
-  buildData() {
-    const remote = this.model.remote;
-
-    let data = {
-      remote: {
-        url: remote.url,
-        branch: remote.branch,
-      },
-    };
-
-    if (remote.private) {
-      data.remote.private_key = remote.private_key;
-      data.remote.public_key = remote.public_key;
-    }
-
-    return data;
-  },
-
-  actions: {
-    test() {
-      this.set("testing", true);
-
-      ajax(this.remoteUrl + "/test", {
-        type: "POST",
-        data: this.buildData(),
-      })
-        .then((result) => {
-          this.set("connected", !!result.success);
-        })
-        .catch(popupAjaxError)
-        .finally(() =>
-          this.setProperties({
-            testing: false,
-            tested: true,
-          })
-        );
-    },
-
-    update() {
-      this.set("updating", true);
-
-      ajax(this.remoteUrl, {
-        type: "PUT",
-        data: this.buildData(),
-      })
-        .then((result) => {
-          this.afterUpdate(result);
-          this.send("closeModal");
-          this.set("model", null);
-        })
-        .catch(popupAjaxError)
-        .finally(() => this.set("updating", false));
-    },
-  },
-});
diff --git a/assets/javascripts/discourse/templates/modal/update-pages-remote.hbs b/assets/javascripts/discourse/templates/modal/update-pages-remote.hbs
deleted file mode 100644
index bf15ae3..0000000
--- a/assets/javascripts/discourse/templates/modal/update-pages-remote.hbs
+++ /dev/null
@@ -1,53 +0,0 @@
-{{#d-modal-body
-  class="update-pages-remote" title="admin.landing_pages.remote.title"
-}}
-  <div class="repo">
-    <div class="label">{{i18n "admin.landing_pages.remote.url"}}</div>
-    {{input value=model.remote.url placeholder=urlPlaceholder}}
-  </div>
-
-  <div class="branch">
-    <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
-    {{input value=model.remote.branch placeholder="master"}}
-  </div>
-
-  <div class="check-private">
-    <label>
-      {{input type="checkbox" checked=model.remote.private}}
-      {{i18n "admin.landing_pages.remote.private"}}
-    </label>
-  </div>
-
-  {{#if showPublicKey}}
-    <div class="public-key">
-      <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
-      {{textarea readonly=true value=model.remote.public_key}}
-    </div>
-  {{/if}}
-{{/d-modal-body}}
-
-<div class="modal-footer {{testStatus}}">
-  {{d-button
-    action=(action "update")
-    disabled=updateDisabled
-    class="btn btn-primary"
-    label="admin.landing_pages.remote.update"
-  }}
-
-  {{d-button
-    action="test"
-    class="btn btn-test"
-    disabled=testDisabled
-    label="admin.landing_pages.remote.test"
-  }}
-
-  {{#if testing}}
-    {{loading-spinner size="small"}}
-  {{else}}
-    {{#if tested}}
-      {{d-icon testIcon}}
-    {{/if}}
-  {{/if}}
-
-  {{d-modal-cancel close=(route-action "closeModal")}}
-</div>
\ No newline at end of file
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7c5cff9..2818a12 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -71,6 +71,7 @@ en:
           test: "Test Connection"
           private: "Repository is private"
           update: "Update"
+          reset: "Reset"
           
         import:
           title: "Import Pages"

From 5bf8d85ca28855212cfa4c018f75963f3d648286 Mon Sep 17 00:00:00 2001
From: Pablo Cabido <cabidop@users.noreply.github.com>
Date: Wed, 27 Sep 2023 16:45:15 +0200
Subject: [PATCH 2/3] Addressed PR comments

---
 .../components/modal/update-pages-remote.hbs   |  2 +-
 assets/stylesheets/landing-pages-admin.scss    | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/assets/javascripts/discourse/components/modal/update-pages-remote.hbs b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
index 4a8795b..67fed16 100644
--- a/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
+++ b/assets/javascripts/discourse/components/modal/update-pages-remote.hbs
@@ -55,7 +55,7 @@
       {{loading-spinner size="small"}}
     {{else}}
       {{#if testIcon}}
-        {{d-icon testIcon}}
+        {{d-icon testIcon (hash class=tested)}}
       {{/if}}
     {{/if}}
 
diff --git a/assets/stylesheets/landing-pages-admin.scss b/assets/stylesheets/landing-pages-admin.scss
index 9dcaa18..df84411 100644
--- a/assets/stylesheets/landing-pages-admin.scss
+++ b/assets/stylesheets/landing-pages-admin.scss
@@ -211,7 +211,7 @@
   }
 }
 
-.update-pages-remote-modal {
+.update-pages-remote {
   .modal-inner-container {
     min-width: 450px;
   }
@@ -227,26 +227,14 @@
 
     > .d-icon {
       margin-left: 5px;
-    }
 
-    &.success {
-      .d-icon {
+      &.success {
         color: $success;
       }
 
-      a {
-        color: $secondary;
-      }
-    }
-
-    &.failed {
-      .d-icon {
+      &.error {
         color: $danger;
       }
-
-      a {
-        color: $secondary;
-      }
     }
 
     a.d-modal-cancel {

From 04ca1a59ade25f5ca86a4ae9e3f5f05e7db3fca9 Mon Sep 17 00:00:00 2001
From: Pablo Cabido <cabidop@users.noreply.github.com>
Date: Thu, 28 Sep 2023 17:16:38 +0200
Subject: [PATCH 3/3] Fixed broken CSS for updated remote model

---
 assets/stylesheets/landing-pages-admin.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/stylesheets/landing-pages-admin.scss b/assets/stylesheets/landing-pages-admin.scss
index df84411..d3cb1f6 100644
--- a/assets/stylesheets/landing-pages-admin.scss
+++ b/assets/stylesheets/landing-pages-admin.scss
@@ -237,7 +237,7 @@
       }
     }
 
-    a.d-modal-cancel {
+    .d-modal-cancel {
       margin-left: auto;
     }
   }