From 51a32de45eec731c63b19155caff88794a4732d2 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 23 Oct 2024 10:07:24 +0100
Subject: [PATCH] DEV: Modernize uppy-backup-uploader component (#29342)

- remove uppy mixin
- convert to glimmer component
- use gjs authoring format
- move to admin bundle
---
 .../addon/components/uppy-backup-uploader.gjs | 59 +++++++++++++++++++
 .../app/components/uppy-backup-uploader.hbs   | 14 -----
 .../app/components/uppy-backup-uploader.js    | 40 -------------
 3 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100644 app/assets/javascripts/admin/addon/components/uppy-backup-uploader.gjs
 delete mode 100644 app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
 delete mode 100644 app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js

diff --git a/app/assets/javascripts/admin/addon/components/uppy-backup-uploader.gjs b/app/assets/javascripts/admin/addon/components/uppy-backup-uploader.gjs
new file mode 100644
index 00000000000..81aa2669a65
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/uppy-backup-uploader.gjs
@@ -0,0 +1,59 @@
+import Component from "@glimmer/component";
+import { getOwner } from "@ember/owner";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import { service } from "@ember/service";
+import UppyUpload from "discourse/lib/uppy/uppy-upload";
+import i18n from "discourse-common/helpers/i18n";
+
+export default class UppyBackupUploader extends Component {
+  @service siteSettings;
+
+  uppyUpload = new UppyUpload(getOwner(this), {
+    id: "uppy-backup-uploader",
+    type: "backup",
+    uploadRootPath: "/admin/backups",
+    uploadUrl: "/admin/backups/upload",
+
+    // local backups
+    useChunkedUploads: this.args.localBackupStorage,
+
+    // direct s3 backups
+    useMultipartUploadsIfAvailable:
+      !this.args.localBackupStorage &&
+      this.siteSettings.enable_direct_s3_uploads,
+
+    validateUploadedFilesOptions: { skipValidation: true },
+
+    uploadDone: (responseData) => {
+      this.args.done(responseData.file_name);
+    },
+  });
+
+  get uploadButtonText() {
+    return this.uppyUpload.uploading
+      ? i18n("admin.backups.upload.uploading_progress", {
+          progress: this.uppyUpload.uploadProgress,
+        })
+      : i18n("admin.backups.upload.label");
+  }
+
+  <template>
+    <span>
+      <label
+        class="btn btn-small btn-primary admin-backups-upload"
+        disabled={{this.uppyUpload.uploading}}
+        title={{i18n "admin.backups.upload.title"}}
+        ...attributes
+      >
+        {{this.uploadButtonText}}
+        <input
+          {{didInsert this.uppyUpload.setup}}
+          class="hidden-upload-field"
+          disabled={{this.uppyUpload.uploading}}
+          type="file"
+          accept=".gz"
+        />
+      </label>
+    </span>
+  </template>
+}
diff --git a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
deleted file mode 100644
index 6f8190e9777..00000000000
--- a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-<label
-  class="btn btn-small btn-primary admin-backups-upload"
-  disabled={{this.uploading}}
-  title={{i18n "admin.backups.upload.title"}}
-  ...attributes
->
-  {{this.uploadButtonText}}
-  <input
-    class="hidden-upload-field"
-    disabled={{this.uploading}}
-    type="file"
-    accept=".gz"
-  />
-</label>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js
deleted file mode 100644
index edc8b83f776..00000000000
--- a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import Component from "@ember/component";
-import { alias } from "@ember/object/computed";
-import { tagName } from "@ember-decorators/component";
-import UppyUploadMixin from "discourse/mixins/uppy-upload";
-import discourseComputed from "discourse-common/utils/decorators";
-import I18n from "discourse-i18n";
-
-@tagName("span")
-export default class UppyBackupUploader extends Component.extend(
-  UppyUploadMixin
-) {
-  id = "uppy-backup-uploader";
-  type = "backup";
-  uploadRootPath = "/admin/backups";
-  uploadUrl = "/admin/backups/upload";
-
-  // local backups
-  @alias("localBackupStorage") useChunkedUploads;
-
-  // direct s3 backups
-  @discourseComputed("localBackupStorage")
-  useMultipartUploadsIfAvailable(localBackupStorage) {
-    return !localBackupStorage && this.siteSettings.enable_direct_s3_uploads;
-  }
-
-  @discourseComputed("uploading", "uploadProgress")
-  uploadButtonText(uploading, progress) {
-    return uploading
-      ? I18n.t("admin.backups.upload.uploading_progress", { progress })
-      : I18n.t("admin.backups.upload.label");
-  }
-
-  validateUploadedFilesOptions() {
-    return { skipValidation: true };
-  }
-
-  uploadDone(responseData) {
-    this.done(responseData.file_name);
-  }
-}