Merge pull request #298 from paviliondev/three_four_deprecations

angusmcleod · web-flow · commit ebf44a67da20 · 2025-02-13T11:02:20.000+01:00
COMPATIBILITY: Fontawesome 6 icon upgrade and new composer support
diff --git a/assets/javascripts/discourse/components/custom-field-input.hbs b/assets/javascripts/discourse/components/custom-field-input.hbs
@@ -41,19 +41,19 @@
     {{/if}}
     {{d-button
       action=(action "destroy")
-      icon="trash-alt"
+      icon="trash-can"
       class="destroy"
       disabled=this.destroyDisabled
     }}
     {{d-button
-      icon="save"
+      icon="floppy-disk"
       action=(action "save")
       disabled=this.saveDisabled
       class="save"
     }}
     {{d-button
       action=(action "close")
-      icon="times"
+      icon="xmark"
       disabled=this.closeDisabled
     }}
   </td>
@@ -78,7 +78,7 @@
     </td>
   {{else}}
     <td class="actions">
-      {{d-button action=(action "edit") icon="pencil-alt"}}
+      {{d-button action=(action "edit") icon="pencil"}}
     </td>
   {{/if}}
 {{/if}}
diff --git a/assets/javascripts/discourse/components/custom-field-input.js b/assets/javascripts/discourse/components/custom-field-input.js
@@ -118,7 +118,7 @@ export default Component.extend({
         if (result.success) {
           this.set("field.edit", false);
         } else {
-          this.set("saveIcon", "times");
+          this.set("saveIcon", "xmark");
         }
         setTimeout(() => {
           if (this.isDestroyed) {
diff --git a/assets/javascripts/discourse/components/custom-wizard-composer-editor.hbs b/assets/javascripts/discourse/components/custom-wizard-composer-editor.hbs
@@ -15,6 +15,7 @@
     @wizardComposer={{true}}
     @fieldId={{this.field.id}}
     @disabled={{this.disableTextarea}}
+    @onSetup={{this.setupEditor}}
     @outletArgs={{hash composer=this.composer editorType="composer"}}
   />
 
diff --git a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js
@@ -32,12 +32,18 @@ export default class CustomWizardComposerEditor extends ComposerEditor {
     this.uppyComposerUpload.editorInputClass = `.${dasherize(
       this.field.type
     )}-${dasherize(this.field.id)} .d-editor-input`;
-    this.uppyComposerUpload.composerModel = this.composer;
+    this.uppyComposerUpload.composerModel = this.composer.model;
     if (!this.currentUser) {
       this.currentUser = {};
     }
   }
 
+  @bind
+  setupEditor(textManipulation) {
+    textManipulation.placeholder.composer = this.composer;
+    super.setupEditor(textManipulation);
+  }
+
   @discourseComputed
   allowedFileTypes() {
     return this.siteSettings.authorized_extensions
diff --git a/assets/javascripts/discourse/components/custom-wizard-date-time-input.hbs b/assets/javascripts/discourse/components/custom-wizard-date-time-input.hbs
@@ -26,5 +26,5 @@
 {{/if}}
 
 {{#if this.clearable}}
-  {{d-button class="clear-date-time" icon="times" action=(action "onClear")}}
+  {{d-button class="clear-date-time" icon="xmark" action=(action "onClear")}}
 {{/if}}
diff --git a/assets/javascripts/discourse/components/custom-wizard-field-composer.js b/assets/javascripts/discourse/components/custom-wizard-field-composer.js
@@ -18,15 +18,18 @@ export default Component.extend({
       "composer",
       EmberObject.create({
         loading: false,
-        reply: this.get("field.value") || "",
+        model: {
+          reply: this.get("field.value") || "",
+        },
         afterRefresh: () => {},
+        allowUpload: true,
       })
     );
   },
 
-  @observes("composer.reply")
+  @observes("composer.model.reply")
   setField() {
-    this.set("field.value", this.get("composer.reply"));
+    this.set("field.value", this.get("composer.model.reply"));
   },
 
   @computed("showPreview")
diff --git a/assets/javascripts/discourse/components/wizard-links.hbs b/assets/javascripts/discourse/components/wizard-links.hbs
@@ -29,7 +29,7 @@
         {{d-button
           action=(action "remove")
           actionParam=link.id
-          icon="times"
+          icon="xmark"
           class="remove"
         }}
       </div>
diff --git a/assets/javascripts/discourse/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/components/wizard-mapper-input.hbs
@@ -54,5 +54,5 @@
 {{/if}}
 
 <a role="button" class="remove-input" {{action this.remove this.input}}>
-  {{d-icon "times"}}
+  {{d-icon "xmark"}}
 </a>
diff --git a/assets/javascripts/discourse/components/wizard-mapper-pair.hbs b/assets/javascripts/discourse/components/wizard-mapper-pair.hbs
@@ -39,5 +39,5 @@
     role="button"
     {{action this.removePair this.pair}}
     class="remove-pair"
-  >{{d-icon "times"}}</a>
+  >{{d-icon "xmark"}}</a>
 {{/if}}
diff --git a/assets/javascripts/discourse/components/wizard-message.hbs b/assets/javascripts/discourse/components/wizard-message.hbs
@@ -17,7 +17,7 @@
 
 {{#if this.showDocumentation}}
   <div class="message-block">
-    {{d-icon "question-circle"}}
+    {{d-icon "circle-question"}}
 
     <a href={{this.url}} target="_blank" rel="noopener noreferrer">
       {{this.documentation}}
diff --git a/assets/javascripts/discourse/components/wizard-message.js b/assets/javascripts/discourse/components/wizard-message.js
@@ -4,10 +4,10 @@ import { default as discourseComputed } from "discourse-common/utils/decorators"
 import I18n from "I18n";
 
 const icons = {
-  error: "times-circle",
-  success: "check-circle",
+  error: "circle-xmark",
+  success: "circle-check",
   warn: "exclamation-circle",
-  info: "info-circle",
+  info: "circle-info",
 };
 
 export default Component.extend({
@@ -18,7 +18,7 @@ export default Component.extend({
 
   @discourseComputed("type")
   icon(type) {
-    return icons[type] || "info-circle";
+    return icons[type] || "circle-info";
   },
 
   @discourseComputed("key", "component", "opts")
diff --git a/assets/javascripts/discourse/components/wizard-subscription-badge.js b/assets/javascripts/discourse/components/wizard-subscription-badge.js
@@ -7,7 +7,7 @@ import I18n from "I18n";
 export default class WizardSubscriptionBadge extends Component {
   @service subscription;
   @tracked updating = false;
-  @tracked updateIcon = "sync";
+  @tracked updateIcon = "arrows-rotate";
   basePath = "/admin/plugins/subscription-client";
 
   @computed("subscription.subscriptionType")
@@ -39,7 +39,7 @@ export default class WizardSubscriptionBadge extends Component {
     this.updating = true;
     this.updateIcon = null;
     this.subscription.updateSubscriptionStatus().finally(() => {
-      this.updateIcon = "sync";
+      this.updateIcon = "arrows-rotate";
       this.updating = false;
     });
   }
diff --git a/assets/javascripts/discourse/components/wizard-subscription-container.js b/assets/javascripts/discourse/components/wizard-subscription-container.js
@@ -7,7 +7,7 @@ export default class WizardSubscriptionContainer extends Component {
 
   @computed("subscription.subscribed")
   get subscribedIcon() {
-    return this.subscription.subscribed ? "check" : "times";
+    return this.subscription.subscribed ? "check" : "xmark";
   }
 
   @computed("subscription.subscribed")
diff --git a/assets/javascripts/discourse/components/wizard-table-field.hbs b/assets/javascripts/discourse/components/wizard-table-field.hbs
@@ -29,7 +29,7 @@
   {{/if}}
 
   {{#if this.isComposerPreview}}
-    {{d-icon "comment-alt"}}
+    {{d-icon "message"}}
     <span class="wizard-table-composer-text">
       {{i18n "admin.wizard.submissions.composer_preview"}}:
       {{this.value.value}}
@@ -69,7 +69,7 @@
       </span>
     {{else}}
       <span class="wizard-table-icon-item checkbox-false">
-        {{d-icon "times"}}{{this.value.value}}
+        {{d-icon "xmark"}}{{this.value.value}}
       </span>
     {{/if}}
   {{/if}}
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-api-show.js b/assets/javascripts/discourse/controllers/admin-wizards-api-show.js
@@ -213,7 +213,7 @@ export default Controller.extend({
           if (result.success) {
             this.send("afterSave", result.api.name);
           } else {
-            this.set("responseIcon", "times");
+            this.set("responseIcon", "xmark");
           }
         })
         .finally(() => this.set("updating", false));
diff --git a/assets/javascripts/discourse/controllers/admin-wizards-manager.js b/assets/javascripts/discourse/controllers/admin-wizards-manager.js
@@ -11,7 +11,7 @@ export default Controller.extend({
   messageUrl:
     "https://pavilion.tech/products/discourse-custom-wizard-plugin/documentation/wizard-manager",
   messageKey: "info",
-  messageIcon: "info-circle",
+  messageIcon: "circle-info",
   messageClass: "info",
   importDisabled: empty("file"),
   exportWizards: A(),
@@ -45,7 +45,7 @@ export default Controller.extend({
       "admin.wizard.manager.imported"
     )}</span>`;
     return {
-      icon: "check-circle",
+      icon: "circle-check",
       html,
     };
   },
@@ -56,14 +56,14 @@ export default Controller.extend({
       "admin.wizard.manager.destroyed"
     )}</span>`;
     return {
-      icon: "check-circle",
+      icon: "circle-check",
       html,
     };
   },
 
   buildFailureItem(failure) {
     return {
-      icon: "times-circle",
+      icon: "circle-xmark",
       html: `${failure.id}: ${failure.messages}`,
     };
   },
diff --git a/assets/javascripts/discourse/mixins/undo-changes.js b/assets/javascripts/discourse/mixins/undo-changes.js
@@ -15,7 +15,7 @@ export default Mixin.create({
 
     this.setProperties({
       originalObject: JSON.parse(JSON.stringify(obj)),
-      undoIcon: obj.isNew ? "times" : "undo",
+      undoIcon: obj.isNew ? "xmark" : "undo",
       undoKey: `admin.wizard.${obj.isNew ? "clear" : "undo"}`,
     });
   },
diff --git a/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-api-show.hbs
@@ -158,7 +158,7 @@
               {{d-button
                 action=(action "removeParam")
                 actionParam=param
-                icon="times"
+                icon="xmark"
               }}
             </div>
           {{/each}}
@@ -277,7 +277,7 @@
                   {{d-button
                     action=(action "removeEndpoint")
                     actionParam=endpoint
-                    icon="times"
+                    icon="xmark"
                     class="remove-endpoint"
                   }}
                 </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-logs-show.hbs
@@ -7,7 +7,7 @@
     <div class="controls">
       {{d-button
         label="refresh"
-        icon="sync"
+        icon="arrows-rotate"
         action=(action "refresh")
         class="refresh"
       }}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-manager.hbs b/assets/javascripts/discourse/templates/admin-wizards-manager.hbs
@@ -5,7 +5,7 @@
     {{#if this.filename}}
       <div class="filename">
         <a role="button" {{action "clearFile"}}>
-          {{d-icon "times"}}
+          {{d-icon "xmark"}}
         </a>
         <span>{{this.filename}}</span>
       </div>
diff --git a/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-submissions-show.hbs
@@ -6,7 +6,7 @@
 
     <div class="controls">
       {{d-button
-        icon="sliders-h"
+        icon="sliders"
         label="admin.wizard.edit_columns"
         action=(action "showEditColumnsModal")
         class="btn-default open-edit-columns-btn download-link"
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs
@@ -229,14 +229,14 @@
 
     {{#unless this.creating}}
       <button {{action "remove"}} class="btn btn-danger remove" type="button">
-        {{d-icon "far-trash-alt"}}{{i18n "admin.wizard.remove"}}
+        {{d-icon "far-trash-can"}}{{i18n "admin.wizard.remove"}}
       </button>
     {{/unless}}
 
     {{conditional-loading-spinner condition=this.saving size="small"}}
 
     {{#if this.error}}
-      <span class="error">{{d-icon "times"}}{{this.error}}</span>
+      <span class="error">{{d-icon "xmark"}}{{this.error}}</span>
     {{/if}}
   </div>
 {{/if}}
diff --git a/plugin.rb b/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.10.1
+# version: 2.11.0
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech
@@ -22,14 +22,10 @@
   register_svg_icon "far-calendar"
   register_svg_icon "chevron-right"
   register_svg_icon "chevron-left"
-  register_svg_icon "save"
-  register_svg_icon "sliders-h"
   register_svg_icon "calendar"
   register_svg_icon "check"
-  register_svg_icon "times"
   register_svg_icon "clock"
   register_svg_icon "link"
-  register_svg_icon "comment-alt"
   register_svg_icon "far-life-ring"
   register_svg_icon "arrow-right"
   register_svg_icon "bolt"

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export default Component.extend({`
`118`	`118`	`if (result.success) {`
`119`	`119`	`this.set("field.edit", false);`
`120`	`120`	`} else {`
`121`		`- this.set("saveIcon", "times");`
	`121`	`+ this.set("saveIcon", "xmark");`
`122`	`122`	`}`
`123`	`123`	`setTimeout(() => {`
`124`	`124`	`if (this.isDestroyed) {`