From ac08dfac45c6110d848d021ee06fec86c610a4bd Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Sep 2020 14:53:44 -0400 Subject: [PATCH] FIX: Ember has deprecated `isVisible` in newer versions --- .../javascripts/admin/components/admin-report.js | 6 +++--- .../components/private-message-glyph.hbs | 16 +++++++++------- .../mini-tag-chooser/selected-collection.js | 10 +++++++--- .../addon/components/period-chooser.js | 3 ++- .../components/select-kit/errors-collection.js | 5 +++-- .../select-kit/select-kit-collection.js | 5 +++-- .../select-kit/addon/components/tag-drop.js | 8 ++++---- 7 files changed, 31 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js index cafa605230d..b5e81f7f05d 100644 --- a/app/assets/javascripts/admin/components/admin-report.js +++ b/app/assets/javascripts/admin/components/admin-report.js @@ -1,7 +1,7 @@ import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { makeArray } from "discourse-common/lib/helpers"; -import { alias, or, and, equal, notEmpty, not } from "@ember/object/computed"; +import { alias, or, and, equal, notEmpty } from "@ember/object/computed"; import EmberObject, { computed, action } from "@ember/object"; import { next } from "@ember/runloop"; import Component from "@ember/component"; @@ -43,7 +43,8 @@ function collapseWeekly(data, average) { export default Component.extend({ classNameBindings: [ - "isVisible", + "isHidden:hidden", + "isHidden::is-visible", "isEnabled", "isLoading", "dasherizedDataSourceName", @@ -67,7 +68,6 @@ export default Component.extend({ showDatesOptions: alias("model.dates_filtering"), showRefresh: or("showDatesOptions", "model.available_filters.length"), shouldDisplayTrend: and("showTrend", "model.prev_period"), - isVisible: not("isHidden"), init() { this._super(...arguments); diff --git a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs index a51a16661d5..833900625cf 100644 --- a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs @@ -1,11 +1,13 @@ -{{#if href}} - +{{#if isVisible}} + {{#if href}} + + + {{d-icon "envelope" class="private-message-glyph"}} + + + {{else}} {{d-icon "envelope" class="private-message-glyph"}} - -{{else}} - - {{d-icon "envelope" class="private-message-glyph"}} - + {{/if}} {{/if}} diff --git a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js index 60bee0dcb9d..bb9fbac778d 100644 --- a/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js +++ b/app/assets/javascripts/select-kit/addon/components/mini-tag-chooser/selected-collection.js @@ -1,12 +1,16 @@ import Component from "@ember/component"; import { computed } from "@ember/object"; -import { reads, notEmpty } from "@ember/object/computed"; +import { reads, empty } from "@ember/object/computed"; import layout from "select-kit/templates/components/mini-tag-chooser/selected-collection"; export default Component.extend({ layout, - classNames: ["mini-tag-chooser-selected-collection", "selected-tags"], - isVisible: notEmpty("selectedTags.[]"), + classNames: [ + "mini-tag-chooser-selected-collection", + "selected-tags", + "shouldHide:hidden", + ], + shouldHide: empty("selectedTags.[]"), selectedTags: reads("collection.content.selectedTags.[]"), highlightedTag: reads("collection.content.highlightedTag"), diff --git a/app/assets/javascripts/select-kit/addon/components/period-chooser.js b/app/assets/javascripts/select-kit/addon/components/period-chooser.js index 4c07c9725a8..b117b0f06c0 100644 --- a/app/assets/javascripts/select-kit/addon/components/period-chooser.js +++ b/app/assets/javascripts/select-kit/addon/components/period-chooser.js @@ -3,11 +3,12 @@ import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-bo export default DropdownSelectBoxComponent.extend({ classNames: ["period-chooser"], + classNameBindings: ["showPeriods::hidden"], content: oneWay("site.periods"), value: readOnly("period"), - isVisible: readOnly("showPeriods"), valueProperty: null, nameProperty: null, + showPeriods: true, modifyComponentForRow() { return "period-chooser/period-chooser-row"; diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js index 589db64208d..f299f38e772 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit/errors-collection.js @@ -1,10 +1,11 @@ import Component from "@ember/component"; -import { notEmpty } from "@ember/object/computed"; +import { empty } from "@ember/object/computed"; import layout from "select-kit/templates/components/select-kit/errors-collection"; export default Component.extend({ layout, classNames: ["select-kit-errors-collection"], + classNameBindings: ["shouldHide:hidden"], tagName: "ul", - isVisible: notEmpty("collection.content"), + shouldHide: empty("collection.content"), }); diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js index 93b3559d7ed..1ba82c202ce 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-collection.js @@ -1,10 +1,11 @@ import Component from "@ember/component"; -import { notEmpty } from "@ember/object/computed"; +import { empty } from "@ember/object/computed"; import layout from "select-kit/templates/components/select-kit/select-kit-collection"; export default Component.extend({ layout, classNames: ["select-kit-collection"], + classNameBindings: ["shouldHide:hidden"], tagName: "ul", - isVisible: notEmpty("collection"), + shouldHide: empty("collection"), }); diff --git a/app/assets/javascripts/select-kit/addon/components/tag-drop.js b/app/assets/javascripts/select-kit/addon/components/tag-drop.js index fca6ed21751..af12e9b97f5 100644 --- a/app/assets/javascripts/select-kit/addon/components/tag-drop.js +++ b/app/assets/javascripts/select-kit/addon/components/tag-drop.js @@ -15,7 +15,7 @@ export const NONE_TAG_ID = "none"; export default ComboBoxComponent.extend(TagsMixin, { pluginApiIdentifiers: ["tag-drop"], - classNameBindings: ["categoryStyle", "tagClass"], + classNameBindings: ["categoryStyle", "tagClass", "shouldHide:hidden"], classNames: ["tag-drop"], value: readOnly("tagId"), tagName: "li", @@ -24,12 +24,12 @@ export default ComboBoxComponent.extend(TagsMixin, { categoryStyle: setting("category_style"), maxTagSearchResults: setting("max_tag_search_results"), sortTagsAlphabetically: setting("tags_sort_alphabetically"), - isVisible: computed("showFilterByTag", "content.[]", function () { + shouldHide: computed("showFilterByTag", "content.[]", function () { if (this.showFilterByTag && !isEmpty(this.content)) { - return true; + return false; } - return false; + return true; }), selectKitOptions: {