diff --git a/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json index e171621ad42f..439a556c2aa4 100644 --- a/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json @@ -57,7 +57,7 @@ }, "aws-sign2": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "resolved": "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", "from": "aws-sign2@>=0.6.0 <0.7.0" }, "aws4": { @@ -167,7 +167,7 @@ }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "from": "core-util-is@>=1.0.0 <1.1.0" }, "create-error-class": { @@ -322,8 +322,8 @@ "from": "graceful-readlink@>=1.0.0" }, "grpc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.3.1.tgz", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.3.2.tgz", "from": "grpc@>=1.1.0 <2.0.0", "dependencies": { "node-pre-gyp": { @@ -373,8 +373,8 @@ } }, "npmlog": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", "from": "npmlog@>=4.0.2 <5.0.0", "dependencies": { "are-we-there-yet": { @@ -439,7 +439,7 @@ "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "from": "gauge@>=2.7.1 <2.8.0", + "from": "gauge@>=2.7.3 <2.8.0", "dependencies": { "aproba": { "version": "1.1.1", @@ -498,8 +498,8 @@ } }, "wide-align": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "from": "wide-align@>=1.1.0 <2.0.0" } } @@ -517,8 +517,8 @@ "from": "rc@>=1.1.7 <2.0.0", "dependencies": { "deep-extend": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", "from": "deep-extend@>=0.4.0 <0.5.0" }, "ini": { @@ -855,14 +855,14 @@ "from": "inherits@>=2.0.0 <3.0.0" }, "minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "from": "minimatch@>=3.0.0 <4.0.0", "dependencies": { "brace-expansion": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "from": "brace-expansion@>=1.0.0 <2.0.0", + "from": "brace-expansion@>=1.1.7 <2.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", @@ -963,7 +963,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "from": "inherits@>=2.0.1 <2.1.0" + "from": "inherits@>=2.0.0 <2.1.0" } } }, @@ -978,14 +978,14 @@ "from": "inherits@>=2.0.0 <3.0.0" }, "minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "from": "minimatch@>=3.0.0 <4.0.0", "dependencies": { "brace-expansion": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "from": "brace-expansion@>=1.0.0 <2.0.0", + "from": "brace-expansion@>=1.1.7 <2.0.0", "dependencies": { "balanced-match": { "version": "0.4.2", @@ -1006,7 +1006,7 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "from": "once@>=1.0.0 <2.0.0", + "from": "once@>=1.3.3 <2.0.0", "dependencies": { "wrappy": { "version": "1.0.2", @@ -1033,7 +1033,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "from": "inherits@>=2.0.1 <2.1.0" + "from": "inherits@>=2.0.0 <2.1.0" }, "isarray": { "version": "1.0.0", @@ -1246,8 +1246,8 @@ "from": "methmeth@>=1.1.0 <2.0.0" }, "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", "from": "mime@>=1.2.11 <2.0.0" }, "mime-db": { @@ -1372,7 +1372,7 @@ "dependencies": { "caseless": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "resolved": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", "from": "caseless@>=0.11.0 <0.12.0" }, "har-validator": { @@ -1501,7 +1501,7 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "from": "util-deprecate@>=1.0.1 <1.1.0" }, "uuid": { diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index 2c0402317bf7..963876864e31 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -1,3 +1,5 @@ +/* eslint new-cap: 0 */ + Meteor.methods({ saveSetting(_id, value, editor) { if (Meteor.userId() === null) { @@ -20,7 +22,7 @@ Meteor.methods({ //Verify the value is what it should be switch (setting.type) { case 'roomPick': - check(value, [Object]); + check(value, Match.OneOf([Object], '')); break; case 'boolean': check(value, Boolean); diff --git a/packages/rocketchat-ui-admin/client/admin.html b/packages/rocketchat-ui-admin/client/admin.html index 38a6a2b1e078..e7f3cbd8bd24 100644 --- a/packages/rocketchat-ui-admin/client/admin.html +++ b/packages/rocketchat-ui-admin/client/admin.html @@ -179,7 +179,7 @@

{{> inputAutocomplete settings=autocompleteRoom id=_id name=_id class="search autocomplete" autocomplete="off" disabled=isDisabled.disabled}} diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 21568e61fd05..fa88dc1ce799 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -26,6 +26,12 @@ const setFieldValue = function(settingId, value, type, editor) { new jscolor(input); //eslint-disable-line } break; + case 'roomPick': + const selectedRooms = Template.instance().selectedRooms.get(); + selectedRooms[settingId] = value; + Template.instance().selectedRooms.set(selectedRooms); + TempSettings.update({ _id: settingId }, { $set: { value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) !== JSON.stringify(value) } }); + break; default: input.val(value).change(); } @@ -533,7 +539,7 @@ Template.admin.events({ selectedRooms[this.id] = (selectedRooms[this.id] || []).concat(doc); instance.selectedRooms.set(selectedRooms); const value = selectedRooms[this.id]; - TempSettings.update({ _id: this.id }, { $set: { value, changed: RocketChat.settings.collectionPrivate.findOne(this.id).value !== value }}); + TempSettings.update({ _id: this.id }, { $set: { value }}); event.currentTarget.value = ''; event.currentTarget.focus(); }, @@ -548,8 +554,7 @@ Template.admin.events({ const value = selectedRooms[settingId]; TempSettings.update({ _id: settingId }, { $set: { - value, - changed: RocketChat.settings.collectionPrivate.findOne(settingId).value !== value + value } }); }