Spiegel von
https://github.com/paviliondev/discourse-custom-wizard.git
synchronisiert 2024-11-09 20:02:54 +01:00
Apply to javascripts/discourse
Dieser Commit ist enthalten in:
Ursprung
cb930a27bb
Commit
9c17957b43
19 geänderte Dateien mit 48 neuen und 47 gelöschten Zeilen
|
@ -1,6 +1,7 @@
|
|||
import Component from "@ember/component";
|
||||
import discourseComputed, { observes } from "discourse-common/utils/decorators";
|
||||
import { or, alias } from "@ember/object/computed";
|
||||
import { alias, or } from "@ember/object/computed";
|
||||
import I18n from "I18n";
|
||||
|
||||
const generateContent = function (array, type) {
|
||||
return array.map((key) => ({
|
||||
|
@ -66,16 +67,16 @@ export default Component.extend({
|
|||
"field.serializers"
|
||||
)
|
||||
saveDisabled(saving) {
|
||||
if (saving) return true;
|
||||
if (saving) {return true;}
|
||||
|
||||
const originalField = this.originalField;
|
||||
if (!originalField) return false;
|
||||
if (!originalField) {return false;}
|
||||
|
||||
return ["name", "klass", "type", "serializers"].every((attr) => {
|
||||
let current = this.get(attr);
|
||||
let original = originalField[attr];
|
||||
|
||||
if (!current) return false;
|
||||
if (!current) {return false;}
|
||||
|
||||
if (attr == "serializers") {
|
||||
return this.compareArrays(current, original);
|
||||
|
|
|
@ -7,7 +7,7 @@ export default Component.extend({
|
|||
@discourseComputed("showAdvanced")
|
||||
toggleClass(showAdvanced) {
|
||||
let classes = "btn";
|
||||
if (showAdvanced) classes += " btn-primary";
|
||||
if (showAdvanced) {classes += " btn-primary";}
|
||||
return classes;
|
||||
},
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { default as discourseComputed } from "discourse-common/utils/decorators";
|
||||
import { equal, empty, or, and } from "@ember/object/computed";
|
||||
import { and, empty, equal, or } from "@ember/object/computed";
|
||||
import { generateName, selectKitContent } from "../lib/wizard";
|
||||
import { computed } from "@ember/object";
|
||||
import wizardSchema from "../lib/wizard-schema";
|
||||
|
@ -92,7 +92,7 @@ export default Component.extend(UndoChanges, {
|
|||
|
||||
@discourseComputed("apis", "action.api")
|
||||
availableEndpoints(apis, api) {
|
||||
if (!api) return [];
|
||||
if (!api) {return [];}
|
||||
return apis.find((a) => a.name === api).endpoints;
|
||||
},
|
||||
});
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { default as discourseComputed } from "discourse-common/utils/decorators";
|
||||
import { equal, or, alias } from "@ember/object/computed";
|
||||
import { alias, equal, or } from "@ember/object/computed";
|
||||
import { computed } from "@ember/object";
|
||||
import { selectKitContent } from "../lib/wizard";
|
||||
import UndoChanges from "../mixins/undo-changes";
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
import {
|
||||
default as discourseComputed,
|
||||
on,
|
||||
observes,
|
||||
on,
|
||||
} from "discourse-common/utils/decorators";
|
||||
import { generateName } from "../lib/wizard";
|
||||
import {
|
||||
default as wizardSchema,
|
||||
setWizardDefaults,
|
||||
default as wizardSchema,
|
||||
} from "../lib/wizard-schema";
|
||||
import { notEmpty } from "@ember/object/computed";
|
||||
import { scheduleOnce, bind } from "@ember/runloop";
|
||||
import { bind, scheduleOnce } from "@ember/runloop";
|
||||
import EmberObject from "@ember/object";
|
||||
import Component from "@ember/component";
|
||||
import { A } from "@ember/array";
|
||||
|
@ -53,7 +53,7 @@ export default Component.extend({
|
|||
"items.@each.title"
|
||||
)
|
||||
links(current, items) {
|
||||
if (!items) return;
|
||||
if (!items) {return;}
|
||||
|
||||
return items.map((item) => {
|
||||
if (item) {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import { computed, set } from "@ember/object";
|
||||
import { alias, equal, or, not } from "@ember/object/computed";
|
||||
import { alias, equal, not, or } from "@ember/object/computed";
|
||||
import {
|
||||
newPair,
|
||||
connectorContent,
|
||||
inputTypesContent,
|
||||
defaultSelectionType,
|
||||
defaultConnector,
|
||||
defaultSelectionType,
|
||||
inputTypesContent,
|
||||
newPair,
|
||||
} from "../lib/wizard-mapper";
|
||||
import Component from "@ember/component";
|
||||
import { observes } from "discourse-common/utils/decorators";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { connectorContent } from "../lib/wizard-mapper";
|
||||
import { gt, or, alias } from "@ember/object/computed";
|
||||
import { alias, gt, or } from "@ember/object/computed";
|
||||
import { computed, observes } from "@ember/object";
|
||||
import Component from "@ember/component";
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { alias, or, gt } from "@ember/object/computed";
|
||||
import { alias, gt, or } from "@ember/object/computed";
|
||||
import { computed } from "@ember/object";
|
||||
import {
|
||||
default as discourseComputed,
|
||||
|
@ -7,7 +7,7 @@ import {
|
|||
} from "discourse-common/utils/decorators";
|
||||
import { getOwner } from "discourse-common/lib/get-owner";
|
||||
import { defaultSelectionType, selectionTypes } from "../lib/wizard-mapper";
|
||||
import { snakeCase, generateName, userProperties } from "../lib/wizard";
|
||||
import { generateName, snakeCase, userProperties } from "../lib/wizard";
|
||||
import Component from "@ember/component";
|
||||
import { bind, later } from "@ember/runloop";
|
||||
import I18n from "I18n";
|
||||
|
@ -135,7 +135,7 @@ export default Component.extend({
|
|||
},
|
||||
|
||||
documentClick(e) {
|
||||
if (this._state == "destroying") return;
|
||||
if (this._state == "destroying") {return;}
|
||||
let $target = $(e.target);
|
||||
|
||||
if (!$target.parents(".type-selector").length && this.showTypes) {
|
||||
|
@ -275,11 +275,11 @@ export default Component.extend({
|
|||
|
||||
optionEnabled(type) {
|
||||
const options = this.options;
|
||||
if (!options) return false;
|
||||
if (!options) {return false;}
|
||||
|
||||
const option = options[type];
|
||||
if (option === true) return true;
|
||||
if (typeof option !== "string") return false;
|
||||
if (option === true) {return true;}
|
||||
if (typeof option !== "string") {return false;}
|
||||
|
||||
return option.split(",").filter((option) => {
|
||||
return [this.selectorType, this.inputType].indexOf(option) !== -1;
|
||||
|
|
|
@ -19,7 +19,7 @@ export default Component.extend({
|
|||
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
if (!this.validations) return;
|
||||
if (!this.validations) {return;}
|
||||
|
||||
if (!this.field.validations) {
|
||||
const validations = {};
|
||||
|
|
|
@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax";
|
|||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
import CustomWizardApi from "../models/custom-wizard-api";
|
||||
import { default as discourseComputed } from "discourse-common/utils/decorators";
|
||||
import { not, and, equal } from "@ember/object/computed";
|
||||
import { and, equal, not } from "@ember/object/computed";
|
||||
import { selectKitContent } from "../lib/wizard";
|
||||
import Controller from "@ember/controller";
|
||||
import I18n from "I18n";
|
||||
|
@ -64,8 +64,8 @@ export default Controller.extend({
|
|||
threeLeggedOauth
|
||||
) {
|
||||
if (saveDisabled || !authType || !tokenUrl || !clientId || !clientSecret)
|
||||
return true;
|
||||
if (threeLeggedOauth) return !authUrl;
|
||||
{return true;}
|
||||
if (threeLeggedOauth) {return !authUrl;}
|
||||
return false;
|
||||
},
|
||||
|
||||
|
@ -149,13 +149,13 @@ export default Controller.extend({
|
|||
let refreshList = false;
|
||||
let error;
|
||||
|
||||
if (!name || !authType) return;
|
||||
if (!name || !authType) {return;}
|
||||
|
||||
let data = {
|
||||
auth_type: authType,
|
||||
};
|
||||
|
||||
if (api.title) data["title"] = api.title;
|
||||
if (api.title) {data["title"] = api.title;}
|
||||
|
||||
const originalTitle = this.get("api.originalTitle");
|
||||
if (api.get("isNew") || (originalTitle && api.title !== originalTitle)) {
|
||||
|
@ -232,7 +232,7 @@ export default Controller.extend({
|
|||
|
||||
remove() {
|
||||
const name = this.get("api.name");
|
||||
if (!name) return;
|
||||
if (!name) {return;}
|
||||
|
||||
this.set("updating", true);
|
||||
|
||||
|
@ -250,7 +250,7 @@ export default Controller.extend({
|
|||
|
||||
clearLogs() {
|
||||
const name = this.get("api.name");
|
||||
if (!name) return;
|
||||
if (!name) {return;}
|
||||
|
||||
ajax(`/admin/wizards/api/${name.underscore()}/logs`, {
|
||||
type: "DELETE",
|
||||
|
|
|
@ -13,7 +13,7 @@ export default Controller.extend({
|
|||
logs: [],
|
||||
|
||||
loadLogs() {
|
||||
if (!this.canLoadMore) return;
|
||||
if (!this.canLoadMore) {return;}
|
||||
|
||||
this.set("refreshing", true);
|
||||
|
||||
|
|
|
@ -3,13 +3,13 @@ import {
|
|||
observes,
|
||||
on,
|
||||
} from "discourse-common/utils/decorators";
|
||||
import { notEmpty, alias } from "@ember/object/computed";
|
||||
import { alias, notEmpty } from "@ember/object/computed";
|
||||
import showModal from "discourse/lib/show-modal";
|
||||
import { generateId, wizardFieldList } from "../lib/wizard";
|
||||
import { buildProperties } from "../lib/wizard-json";
|
||||
import { dasherize } from "@ember/string";
|
||||
import EmberObject from "@ember/object";
|
||||
import { scheduleOnce, later } from "@ember/runloop";
|
||||
import { later, scheduleOnce } from "@ember/runloop";
|
||||
import Controller from "@ember/controller";
|
||||
import copyText from "discourse/lib/copy-text";
|
||||
import CustomWizard from "../models/custom-wizard";
|
||||
|
|
|
@ -6,7 +6,7 @@ export default {
|
|||
initialize(container) {
|
||||
const siteSettings = container.lookup("site-settings:main");
|
||||
|
||||
if (!siteSettings.custom_wizard_enabled) return;
|
||||
if (!siteSettings.custom_wizard_enabled) {return;}
|
||||
|
||||
const existing = DiscourseURL.routeTo;
|
||||
DiscourseURL.routeTo = function (path, opts) {
|
||||
|
|
|
@ -8,7 +8,7 @@ export default {
|
|||
const messageBus = container.lookup("message-bus:main");
|
||||
const siteSettings = container.lookup("site-settings:main");
|
||||
|
||||
if (!siteSettings.custom_wizard_enabled || !messageBus) return;
|
||||
if (!siteSettings.custom_wizard_enabled || !messageBus) {return;}
|
||||
|
||||
messageBus.subscribe("/redirect_to_wizard", function (wizardId) {
|
||||
const wizardUrl = window.location.origin + "/w/" + wizardId;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { listProperties, camelCase, snakeCase } from "../lib/wizard";
|
||||
import { camelCase, listProperties, snakeCase } from "../lib/wizard";
|
||||
import wizardSchema from "../lib/wizard-schema";
|
||||
import EmberObject from "@ember/object";
|
||||
import { A } from "@ember/array";
|
||||
|
|
|
@ -43,13 +43,13 @@ function defaultConnector(connectorType, inputType, options = {}) {
|
|||
return defaultInputType(options);
|
||||
}
|
||||
if (connectorType === "pair") {
|
||||
if (inputType === "conditional") return "equal";
|
||||
if (inputType === "association") return "association";
|
||||
if (inputType === "validation") return "equal";
|
||||
if (inputType === "conditional") {return "equal";}
|
||||
if (inputType === "association") {return "association";}
|
||||
if (inputType === "validation") {return "equal";}
|
||||
}
|
||||
if (connectorType === "output") {
|
||||
if (inputType === "conditional") return "then";
|
||||
if (inputType === "assignment") return "set";
|
||||
if (inputType === "conditional") {return "then";}
|
||||
if (inputType === "assignment") {return "set";}
|
||||
}
|
||||
return "equal";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { set, get } from "@ember/object";
|
||||
import { get, set } from "@ember/object";
|
||||
|
||||
const wizard = {
|
||||
basic: {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { listProperties } from "../lib/wizard";
|
||||
import { default as wizardSchema } from "../lib/wizard-schema";
|
||||
import { set, get } from "@ember/object";
|
||||
import { get, set } from "@ember/object";
|
||||
import Mixin from "@ember/object/mixin";
|
||||
import { observes } from "discourse-common/utils/decorators";
|
||||
import { deepEqual } from "discourse-common/lib/object";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { ajax } from "discourse/lib/ajax";
|
||||
import EmberObject from "@ember/object";
|
||||
import { buildProperties, present, mapped } from "../lib/wizard-json";
|
||||
import { listProperties, camelCase, snakeCase } from "../lib/wizard";
|
||||
import { buildProperties, mapped, present } from "../lib/wizard-json";
|
||||
import { camelCase, listProperties, snakeCase } from "../lib/wizard";
|
||||
import wizardSchema from "../lib/wizard-schema";
|
||||
import { Promise } from "rsvp";
|
||||
import { popupAjaxError } from "discourse/lib/ajax-error";
|
||||
|
@ -132,7 +132,7 @@ const CustomWizard = EmberObject.extend({
|
|||
},
|
||||
|
||||
buildMappedJson(inputs) {
|
||||
if (!inputs || !inputs.length) return false;
|
||||
if (!inputs || !inputs.length) {return false;}
|
||||
|
||||
let result = [];
|
||||
|
||||
|
|
Laden …
In neuem Issue referenzieren