From 83019f326138c54ce2ef5834bd895876a2ee92f1 Mon Sep 17 00:00:00 2001 From: Thomas Kurz Date: Wed, 25 Apr 2018 16:35:48 +0200 Subject: [PATCH 1/6] should fix the issue that suggestions are still displayed even if search is already triggered --- packages/rocketchat-search/client/search/search.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-search/client/search/search.js b/packages/rocketchat-search/client/search/search.js index b13d453294237..165e5cc828e3a 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); + } } }); }; From 08ab999f34c8e52ea181eacc43fd3b17d81f6347 Mon Sep 17 00:00:00 2001 From: Thomas Kurz Date: Wed, 25 Apr 2018 23:00:13 +0200 Subject: [PATCH 2/6] add link to chatpal.io to the admin ui --- packages/chatpal-search/client/template/admin.html | 1 + packages/rocketchat-i18n/i18n/de.i18n.json | 3 ++- packages/rocketchat-i18n/i18n/en.i18n.json | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/chatpal-search/client/template/admin.html b/packages/chatpal-search/client/template/admin.html index 5235c4c4993a5..d59a982a6b231 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/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index e1887e1df11d7..cd75b051b4423 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 1be995d494897..839cae58a6945 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -429,6 +429,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", @@ -2341,4 +2342,4 @@ "your_message_optional": "your message (optional)", "Your_password_is_wrong": "Your password is wrong!", "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices" -} \ No newline at end of file +} From 6bee3371848820f320808352e061e790cf0da6fe Mon Sep 17 00:00:00 2001 From: Thomas Kurz Date: Wed, 25 Apr 2018 23:08:34 +0200 Subject: [PATCH 3/6] remove unsed icon and change icon size in order to fix firefox display issue --- 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 - 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 packages/chatpal-search/server/asset/chatpal-logo-icon-lightblue.svg diff --git a/packages/chatpal-search/package.js b/packages/chatpal-search/package.js index 4c340c4416584..6ab0bb2c35dc6 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 bdd8d83274540..6d30666f538bc 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 7a13ff8dc8ba7..0000000000000 --- 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 db2c834140fe8..add37dbca2712 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')); From 01dfdfa8592990bb94af9d77f24c75d41c922a75 Mon Sep 17 00:00:00 2001 From: Thomas Kurz Date: Fri, 27 Apr 2018 09:09:01 +0200 Subject: [PATCH 4/6] should fix the issue with the event trigger for search providers --- packages/rocketchat-lib/server/functions/deleteMessage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js index 9111557397d1c..93d997bb1585f 100644 --- a/packages/rocketchat-lib/server/functions/deleteMessage.js +++ b/packages/rocketchat-lib/server/functions/deleteMessage.js @@ -25,7 +25,7 @@ RocketChat.deleteMessage = function(message, user) { } Meteor.defer(function() { - RocketChat.callbacks.run('afterDeleteMessage', deletedMsg); + RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message.id }); }); } From a7b48977c80a6e6ba631901a2d4ea996286c1dad Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 27 Apr 2018 10:10:35 -0300 Subject: [PATCH 5/6] Update deleteMessage.js --- packages/rocketchat-lib/server/functions/deleteMessage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js index 93d997bb1585f..cff043c77eab6 100644 --- a/packages/rocketchat-lib/server/functions/deleteMessage.js +++ b/packages/rocketchat-lib/server/functions/deleteMessage.js @@ -25,7 +25,7 @@ RocketChat.deleteMessage = function(message, user) { } Meteor.defer(function() { - RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message.id }); + RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message._id }); }); } From 035e883438feeb9a09354076ed61ba94f1dff2de Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 27 Apr 2018 12:05:22 -0300 Subject: [PATCH 6/6] Always call afterDeleteMessage calback --- packages/rocketchat-lib/server/functions/deleteMessage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js index cff043c77eab6..eb7d85cac91de 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 || { _id: message._id }); - }); } + 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 } });