bump version

Stable candidate

assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6

@@ -12,12 +12,15 @@ import { alias } from "@ember/object/computed";
 import Site from "discourse/models/site";
 import { uploadIcon } from "discourse/lib/uploads";
 import { dasherize } from "@ember/string";
-import showModal from "discourse/lib/show-modal";
+import InsertHyperlink from "discourse/components/modal/insert-hyperlink";
+import { inject as service } from "@ember/service";
 
 const IMAGE_MARKDOWN_REGEX =
   /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g;
 
 export default ComposerEditor.extend({
+  modal: service(),
+
   classNameBindings: ["fieldClass"],
   allowUpload: true,
   showLink: false,
@@ -197,10 +200,8 @@ export default ComposerEditor.extend({
       if (this._lastSel) {
         linkText = this._lastSel.value;
       }
-
+      this.modal.show(InsertHyperlink, {
-      showModal("insert-hyperlink").setProperties({
+        model: { linkText, toolbarEvent },
-        linkText,
-        toolbarEvent,
       });
     },
 

assets/javascripts/wizard/models/custom.js.es6

@@ -0,0 +1,166 @@
+import { default as computed } from "discourse-common/utils/decorators";
+import getUrl from "discourse-common/lib/get-url";
+import WizardField from "wizard/models/wizard-field";
+import { ajax } from "wizard/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import Step from "wizard/models/step";
+import EmberObject from "@ember/object";
+import Site from "./site";
+
+const CustomWizard = EmberObject.extend({
+  @computed("steps.length")
+  totalSteps: (length) => length,
+
+  skip() {
+    if (this.required && !this.completed && this.permitted) {
+      return;
+    }
+    CustomWizard.skip(this.id);
+  },
+
+  restart() {
+    CustomWizard.restart(this.id);
+  },
+});
+
+CustomWizard.reopenClass({
+  skip(wizardId) {
+    ajax({ url: `/w/${wizardId}/skip`, type: "PUT" })
+      .then((result) => {
+        CustomWizard.finished(result);
+      })
+      .catch(popupAjaxError);
+  },
+
+  restart(wizardId) {
+    ajax({ url: `/w/${wizardId}/skip`, type: "PUT" })
+      .then(() => {
+        window.location.href = `/w/${wizardId}`;
+      })
+      .catch(popupAjaxError);
+  },
+
+  restart(wizardId) {
+    ajax({ url: `/w/${wizardId}/skip`, type: "PUT" }).then(() => {
+      window.location.href = `/w/${wizardId}`;
+    });
+  },
+
+  finished(result) {
+    let url = "/";
+    if (result.redirect_on_complete) {
+      url = result.redirect_on_complete;
+    }
+    window.location.href = getUrl(url);
+  },
+
+  build(wizardJson) {
+    if (!wizardJson) {
+      return null;
+    }
+
+    if (!wizardJson.completed && wizardJson.steps) {
+      wizardJson.steps = wizardJson.steps
+        .map((step) => {
+          const stepObj = Step.create(step);
+
+          stepObj.fields.sort((a, b) => {
+            return parseFloat(a.number) - parseFloat(b.number);
+          });
+
+          let tabindex = 1;
+          stepObj.fields.forEach((f) => {
+            f.tabindex = tabindex;
+
+            if (["date_time"].includes(f.type)) {
+              tabindex = tabindex + 2;
+            } else {
+              tabindex++;
+            }
+          });
+
+          stepObj.fields = stepObj.fields.map((f) => WizardField.create(f));
+
+          return stepObj;
+        })
+        .sort((a, b) => {
+          return parseFloat(a.index) - parseFloat(b.index);
+        });
+    }
+
+    if (wizardJson.categories) {
+      let subcatMap = {};
+      let categoriesById = {};
+      let categories = wizardJson.categories.map((c) => {
+        if (c.parent_category_id) {
+          subcatMap[c.parent_category_id] =
+            subcatMap[c.parent_category_id] || [];
+          subcatMap[c.parent_category_id].push(c.id);
+        }
+        return (categoriesById[c.id] = EmberObject.create(c));
+      });
+
+      // Associate the categories with their parents
+      categories.forEach((c) => {
+        let subcategoryIds = subcatMap[c.get("id")];
+        if (subcategoryIds) {
+          c.set(
+            "subcategories",
+            subcategoryIds.map((id) => categoriesById[id])
+          );
+        }
+        if (c.get("parent_category_id")) {
+          c.set("parentCategory", categoriesById[c.get("parent_category_id")]);
+        }
+      });
+
+      Site.currentProp("categoriesList", categories);
+      Site.currentProp("sortedCategories", categories);
+      Site.currentProp("listByActivity", categories);
+      Site.currentProp("categoriesById", categoriesById);
+      Site.currentProp(
+        "uncategorized_category_id",
+        wizardJson.uncategorized_category_id
+      );
+    }
+
+    return CustomWizard.create(wizardJson);
+  },
+});
+
+export function findCustomWizard(wizardId, params = {}) {
+  let url = `/w/${wizardId}`;
+
+  let paramKeys = Object.keys(params).filter((k) => {
+    if (k === "wizard_id") {
+      return false;
+    }
+    return !!params[k];
+  });
+
+  if (paramKeys.length) {
+    url += "?";
+    paramKeys.forEach((k, i) => {
+      if (i > 0) {
+        url += "&";
+      }
+      url += `${k}=${params[k]}`;
+    });
+  }
+
+  return ajax({ url, cache: false, dataType: "json" }).then((result) => {
+    return CustomWizard.build(result);
+  });
+}
+
+let _wizard_store;
+
+export function updateCachedWizard(wizard) {
+  _wizard_store = wizard;
+}
+
+export function getCachedWizard() {
+  return _wizard_store;
+}
+
+export default CustomWizard;

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.4.16
+# version: 2.4.17
 # 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