From b5a8e2b04017d8e93a9a7b049c074e9e91aaf58b Mon Sep 17 00:00:00 2001 From: Thomas Kurz Date: Fri, 27 Apr 2018 18:35:10 +0200 Subject: [PATCH] Regression: Various search provider fixes (#10591) * should fix the issue that suggestions are still displayed even if search is already triggered * add link to chatpal.io to the admin ui * remove unsed icon and change icon size in order to fix firefox display issue * should fix the issue with the event trigger for search providers * Update deleteMessage.js * Always call afterDeleteMessage calback --- .../chatpal-search/client/template/admin.html | 1 + packages/chatpal-search/package.js | 1 - .../server/asset/chatpal-logo-icon-darkblue.svg | 2 +- .../server/asset/chatpal-logo-icon-lightblue.svg | 15 --------------- packages/chatpal-search/server/asset/config.js | 1 - packages/rocketchat-i18n/i18n/de.i18n.json | 3 ++- packages/rocketchat-i18n/i18n/en.i18n.json | 1 + .../server/functions/deleteMessage.js | 8 ++++---- .../rocketchat-search/client/search/search.js | 4 +++- 9 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg diff --git a/packages/chatpal-search/client/template/admin.html b/packages/chatpal-search/client/template/admin.html index 5235c4c4993a..d59a982a6b23 100644 --- a/packages/chatpal-search/client/template/admin.html +++ b/packages/chatpal-search/client/template/admin.html @@ -11,6 +11,7 @@ {{#unless isAdmin}}

{{_ "You_are_not_authorized_to_view_this_page"}}

{{else}} +

{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}

diff --git a/packages/chatpal-search/package.js b/packages/chatpal-search/package.js index 4c340c441658..6ab0bb2c35dc 100644 --- a/packages/chatpal-search/package.js +++ b/packages/chatpal-search/package.js @@ -17,7 +17,6 @@ Package.onUse(function(api) { ]); api.addFiles('server/asset/chatpal-enter.svg', 'server', {isAsset:true}); - api.addFiles('server/asset/chatpal-logo-icon-lightblue.svg', 'server', {isAsset:true}); api.addFiles('server/asset/chatpal-logo-icon-darkblue.svg', 'server', {isAsset:true}); api.addFiles([ diff --git a/packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg b/packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg index bdd8d8327454..6d30666f538b 100644 --- a/packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg +++ b/packages/chatpal-search/server/asset/chatpal-logo-icon-darkblue.svg @@ -1,5 +1,5 @@ - + diff --git a/packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg b/packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg deleted file mode 100644 index 7a13ff8dc8ba..000000000000 --- a/packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/chatpal-search/server/asset/config.js b/packages/chatpal-search/server/asset/config.js index db2c834140fe..add37dbca271 100644 --- a/packages/chatpal-search/server/asset/config.js +++ b/packages/chatpal-search/server/asset/config.js @@ -1,5 +1,4 @@ /* globals Inject */ Inject.rawBody('chatpal-enter', Assets.getText('server/asset/chatpal-enter.svg')); -Inject.rawBody('chatpal-logo-icon-lightblue', Assets.getText('server/asset/chatpal-logo-icon-lightblue.svg')); Inject.rawBody('chatpal-logo-icon-darkblue', Assets.getText('server/asset/chatpal-logo-icon-darkblue.svg')); diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index e1887e1df11d..cd75b051b442 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -429,6 +429,7 @@ "Chatpal_ERROR_username_already_exists": "Benutzername existiert bereits", "Chatpal_created_key_successfully": "API-Key erfolgreich erstellt", "Chatpal_run_search": "Suche", + "Chatpal_Get_more_information_about_chatpal_on_our_website": "Finden Sie mehr über Chatpal heraus, unter http://chatpal.io!", "CDN_PREFIX": "CDN-Präfix", "Certificates_and_Keys": "Zertifikate und Schlüssel", "Change_Room_Type": "Ändere den Typ des Raums", @@ -2343,4 +2344,4 @@ "your_message_optional": "Ihre optionale Nachricht", "Your_password_is_wrong": "Falsches Passwort", "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet." -} \ No newline at end of file +} diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index bc2d5f18ebf9..ac0942786afc 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -432,6 +432,7 @@ "Chatpal_ERROR_username_already_exists": "Username already exists", "Chatpal_created_key_successfully": "API-Key created successfully", "Chatpal_run_search": "Search", + "Chatpal_Get_more_information_about_chatpal_on_our_website": "Get more information about Chatpal on http://chatpal.io!", "CDN_PREFIX": "CDN Prefix", "Certificates_and_Keys": "Certificates and Keys", "Change_Room_Type": "Changing the Room Type", diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js index 9111557397d1..eb7d85cac91d 100644 --- a/packages/rocketchat-lib/server/functions/deleteMessage.js +++ b/packages/rocketchat-lib/server/functions/deleteMessage.js @@ -23,12 +23,12 @@ RocketChat.deleteMessage = function(message, user) { if (message.file && message.file._id) { FileUpload.getStore('Uploads').deleteById(message.file._id); } - - Meteor.defer(function() { - RocketChat.callbacks.run('afterDeleteMessage', deletedMsg); - }); } + Meteor.defer(function() { + RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message._id }); + }); + // update last message if (RocketChat.settings.get('Store_Last_Message')) { const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } }); diff --git a/packages/rocketchat-search/client/search/search.js b/packages/rocketchat-search/client/search/search.js index b13d45329423..165e5cc828e3 100644 --- a/packages/rocketchat-search/client/search/search.js +++ b/packages/rocketchat-search/client/search/search.js @@ -67,7 +67,9 @@ Template.RocketSearch.onCreated(function() { //TODO what should happen } else { this.suggestionActive.set(undefined); - this.suggestions.set(result); + if (value !== this.scope.text.get()) { + this.suggestions.set(result); + } } }); };