From dceb72bc69cd1df03f48867febb0e0531f72bc8f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 1 Nov 2019 13:06:50 -0400 Subject: [PATCH] FIX: Move `makeArray` to discourse-common --- .../javascripts/admin/components/admin-report-chart.js.es6 | 2 +- .../admin/components/admin-report-stacked-chart.js.es6 | 2 +- .../javascripts/admin/components/admin-report-table.js.es6 | 2 +- .../javascripts/admin/components/admin-report.js.es6 | 2 +- app/assets/javascripts/admin/components/value-list.js.es6 | 2 +- .../admin/controllers/admin-customize-themes-show.js.es6 | 2 +- .../admin/controllers/admin-dashboard-general.js.es6 | 2 +- app/assets/javascripts/admin/models/report.js.es6 | 2 +- app/assets/javascripts/discourse-common/lib/helpers.js.es6 | 7 +++++++ app/assets/javascripts/discourse/lib/utilities.js.es6 | 7 ------- .../discourse/widgets/private-message-map.js.es6 | 2 +- .../select-kit/components/category-selector.js.es6 | 2 +- .../select-kit/components/mini-tag-chooser.js.es6 | 3 ++- .../components/multi-select/multi-select-header.js.es6 | 2 +- .../javascripts/select-kit/components/tag-chooser.js.es6 | 2 +- .../javascripts/select-kit/components/tag-drop.js.es6 | 2 +- app/assets/javascripts/select-kit/mixins/events.js.es6 | 2 +- 17 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js.es6 index a64a2e3479..172fec1780 100644 --- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { debounce } from "@ember/runloop"; import { schedule } from "@ember/runloop"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 index d233d131e2..99d4e7ceb6 100644 --- a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { debounce } from "@ember/runloop"; import { schedule } from "@ember/runloop"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js.es6 index 7cba55bf3a..38e00c8ab8 100644 --- a/app/assets/javascripts/admin/components/admin-report-table.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-table.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { alias } from "@ember/object/computed"; import Component from "@ember/component"; import computed from "ember-addons/ember-computed-decorators"; diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js.es6 index d7ddfc2151..db06feecfc 100644 --- a/app/assets/javascripts/admin/components/admin-report.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed"; import EmberObject from "@ember/object"; import { next } from "@ember/runloop"; diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6 index 5ab15aa63e..31ef93932e 100644 --- a/app/assets/javascripts/admin/components/value-list.js.es6 +++ b/app/assets/javascripts/admin/components/value-list.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { empty, alias } from "@ember/object/computed"; import Component from "@ember/component"; import { on } from "ember-addons/ember-computed-decorators"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 index c554586f6a..d4622e21d8 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { empty, notEmpty, match } from "@ember/object/computed"; import Controller from "@ember/controller"; import { default as computed } from "ember-addons/ember-computed-decorators"; diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 index da78555f07..727b6d717d 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { inject } from "@ember/controller"; import Controller from "@ember/controller"; import { setting } from "discourse/lib/computed"; diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6 index 4416e1e9f3..37c495e06f 100644 --- a/app/assets/javascripts/admin/models/report.js.es6 +++ b/app/assets/javascripts/admin/models/report.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { isEmpty } from "@ember/utils"; import EmberObject from "@ember/object"; import { escapeExpression } from "discourse/lib/utilities"; diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6 index 1ed602b468..17bdee941d 100644 --- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 +++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6 @@ -1,5 +1,12 @@ import { get } from "@ember/object"; +export function makeArray(obj) { + if (obj === null || obj === undefined) { + return []; + } + return Array.isArray(obj) ? obj : [obj]; +} + export function htmlHelper(fn) { return Ember.Helper.helper(function(...args) { args = diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index eac6471bc7..599c3a4965 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -3,13 +3,6 @@ import toMarkdown from "discourse/lib/to-markdown"; const homepageSelector = "meta[name=discourse_current_homepage]"; -export function makeArray(obj) { - if (obj === null || obj === undefined) { - return []; - } - return Array.isArray(obj) ? obj : [obj]; -} - export function translateSize(size) { switch (size) { case "tiny": diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 index 02a4ae32d1..62be57b150 100644 --- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 +++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { createWidget } from "discourse/widgets/widget"; import { h } from "virtual-dom"; import { avatarFor, avatarImg } from "discourse/widgets/post"; diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6 index 17e138e361..f000f00782 100644 --- a/app/assets/javascripts/select-kit/components/category-selector.js.es6 +++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6 @@ -1,5 +1,5 @@ import { get } from "@ember/object"; -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import MultiSelectComponent from "select-kit/components/multi-select"; import Category from "discourse/models/category"; diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index fce15e2f00..c32e15e19a 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -3,7 +3,8 @@ import ComboBox from "select-kit/components/combo-box"; import TagsMixin from "select-kit/mixins/tags"; import { default as computed } from "ember-addons/ember-computed-decorators"; import renderTag from "discourse/lib/render-tag"; -import { escapeExpression, makeArray } from "discourse/lib/utilities"; +import { escapeExpression } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { iconHTML } from "discourse-common/lib/icon-library"; import { get } from "@ember/object"; import { isEmpty } from "@ember/utils"; diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 index e53746cbfe..b16ed0c290 100644 --- a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 +++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { on } from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators"; import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header"; diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 index b218df9a25..3e92b80a88 100644 --- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 @@ -2,7 +2,7 @@ import MultiSelectComponent from "select-kit/components/multi-select"; import TagsMixin from "select-kit/mixins/tags"; import renderTag from "discourse/lib/render-tag"; import computed from "ember-addons/ember-computed-decorators"; -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; const { get, run } = Ember; export default MultiSelectComponent.extend(TagsMixin, { diff --git a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 index d173c60bb0..66958c3452 100644 --- a/app/assets/javascripts/select-kit/components/tag-drop.js.es6 +++ b/app/assets/javascripts/select-kit/components/tag-drop.js.es6 @@ -1,4 +1,4 @@ -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import ComboBoxComponent from "select-kit/components/combo-box"; import DiscourseURL from "discourse/lib/url"; import TagsMixin from "select-kit/mixins/tags"; diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6 index d369445c9c..739d0925e3 100644 --- a/app/assets/javascripts/select-kit/mixins/events.js.es6 +++ b/app/assets/javascripts/select-kit/mixins/events.js.es6 @@ -1,5 +1,5 @@ import { get } from "@ember/object"; -import { makeArray } from "discourse/lib/utilities"; +import { makeArray } from "discourse-common/lib/helpers"; import { isEmpty } from "@ember/utils"; import { throttle } from "@ember/runloop"; import { schedule } from "@ember/runloop";