From 7232a6e5a9287018a85ba622223aed3481b8db51 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 23 May 2018 18:25:58 +0200 Subject: [PATCH] FIX: do not show composer actions if irrelevant --- .../select-kit/components/composer-actions.js.es6 | 3 ++- test/javascripts/acceptance/composer-actions-test.js.es6 | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 index ff587c2bdc9..5a3479f751a 100644 --- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 +++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6 @@ -28,6 +28,7 @@ export default DropdownSelectBoxComponent.extend({ allowInitialValueMutation: false, allowAutoSelectFirst: false, showFullTitle: false, + isHidden: Ember.computed.empty("content"), didReceiveAttrs() { this._super(); @@ -68,7 +69,7 @@ export default DropdownSelectBoxComponent.extend({ content(options, canWhisper, action) { let items = []; - if (action !== CREATE_TOPIC && action !== CREATE_SHARED_DRAFT) { + if (action !== CREATE_TOPIC && action !== CREATE_SHARED_DRAFT && _topicSnapshot) { items.push({ name: I18n.t("composer.composer_actions.reply_as_new_topic.label"), description: I18n.t("composer.composer_actions.reply_as_new_topic.desc"), diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6 index 291c1cb5993..690696cf0c3 100644 --- a/test/javascripts/acceptance/composer-actions-test.js.es6 +++ b/test/javascripts/acceptance/composer-actions-test.js.es6 @@ -104,6 +104,15 @@ QUnit.test('shared draft', async assert => { assert.ok(find('#reply-control.composing-shared-draft').length === 1); }); +QUnit.test('hide component if no content', async assert => { + const composerActions = selectKit('.composer-actions'); + + await visit('/u/eviltrout/messages'); + await click('.new-private-message'); + + assert.ok(composerActions.el().hasClass("is-hidden")); +}); + QUnit.test('interactions', async assert => { const composerActions = selectKit('.composer-actions'); const quote = 'Life is like riding a bicycle.';