From ebc381aa3bca05857f826a38c9884c7992c8889f Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Mon, 8 May 2017 14:18:00 -0300 Subject: [PATCH 1/8] Fixes removing rooms from roomPick type of settings Close #6646 --- packages/rocketchat-ui-admin/client/admin.coffee | 5 ++++- packages/rocketchat-ui-admin/client/admin.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-ui-admin/client/admin.coffee b/packages/rocketchat-ui-admin/client/admin.coffee index 3abde676b3a3..5f86c8d750b9 100644 --- a/packages/rocketchat-ui-admin/client/admin.coffee +++ b/packages/rocketchat-ui-admin/client/admin.coffee @@ -19,7 +19,10 @@ setFieldValue = (settingId, value, type, editor) -> if editor is 'color' new jscolor(input) - + when 'roomPick' + selectedRooms = Template.instance().selectedRooms.get() + selectedRooms[settingId] = value + Template.instance().selectedRooms.set(selectedRooms) else input.val(value).change() 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}} From 11d1871750f6deb4bac332578b4f8dd337014c7a Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Wed, 10 May 2017 22:28:35 -0300 Subject: [PATCH 2/8] Fix saving/resetting roomPick settings --- .../.npm/package/npm-shrinkwrap.json | 195 ++++++++++++++---- .../server/methods/saveSetting.js | 2 +- .../rocketchat-ui-admin/client/admin.coffee | 8 +- 3 files changed, 166 insertions(+), 39 deletions(-) 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 c931564c628f..758f6534013b 100644 --- a/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json @@ -30,6 +30,11 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "from": "arrify@>=1.0.1 <2.0.0" }, + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "from": "ascli@>=1.0.0 <2.0.0" + }, "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", @@ -52,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": { @@ -60,6 +65,11 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "from": "aws4@>=1.2.1 <2.0.0" }, + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "from": "balanced-match@>=0.4.1 <0.5.0" + }, "base64url": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", @@ -75,6 +85,11 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "from": "boom@>=2.0.0 <3.0.0" }, + "brace-expansion": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", + "from": "brace-expansion@>=1.1.7 <2.0.0" + }, "buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -85,6 +100,16 @@ "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", "from": "buffer-shims@>=1.0.0 <1.1.0" }, + "bytebuffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", + "from": "bytebuffer@>=5.0.0 <6.0.0" + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "from": "camelcase@>=2.0.1 <3.0.0" + }, "capture-stack-trace": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", @@ -100,11 +125,26 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "from": "chalk@>=1.1.1 <2.0.0" }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "from": "cliui@>=3.0.3 <4.0.0" + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "from": "co@>=4.6.0 <5.0.0" }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "from": "code-point-at@>=1.0.0 <2.0.0" + }, + "colour": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", + "from": "colour@>=0.7.1 <0.8.0" + }, "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", @@ -115,6 +155,11 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "from": "commander@>=2.9.0 <3.0.0" }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "from": "concat-map@0.0.1" + }, "concat-stream": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", @@ -122,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": { @@ -147,6 +192,11 @@ } } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "from": "decamelize@>=1.1.1 <2.0.0" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -202,6 +252,11 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", "from": "form-data@>=2.1.1 <2.2.0" }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "from": "fs.realpath@>=1.0.0 <2.0.0" + }, "generate-function": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", @@ -224,6 +279,11 @@ } } }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "from": "glob@>=7.0.5 <8.0.0" + }, "google-auth-library": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz", @@ -262,8 +322,8 @@ "from": "graceful-readlink@>=1.0.0" }, "grpc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.3.0.tgz", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.3.1.tgz", "from": "grpc@>=1.1.0 <2.0.0", "dependencies": { "node-pre-gyp": { @@ -511,8 +571,8 @@ } }, "extend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "from": "extend@>=3.0.0 <3.1.0" }, "forever-agent": { @@ -538,8 +598,8 @@ "from": "har-validator@>=4.2.1 <4.3.0", "dependencies": { "ajv": { - "version": "4.11.7", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.7.tgz", + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", "from": "ajv@>=4.9.1 <5.0.0", "dependencies": { "co": { @@ -879,8 +939,8 @@ "from": "tar-pack@>=3.4.0 <4.0.0", "dependencies": { "debug": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.5.tgz", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz", "from": "debug@>=2.2.0 <3.0.0", "dependencies": { "ms": { @@ -903,7 +963,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "from": "inherits@>=2.0.0 <2.1.0" + "from": "inherits@>=2.0.1 <2.1.0" } } }, @@ -946,7 +1006,7 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "from": "once@>=1.3.3 <2.0.0", + "from": "once@>=1.0.0 <2.0.0", "dependencies": { "wrappy": { "version": "1.0.2", @@ -973,7 +1033,7 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "from": "inherits@>=2.0.0 <2.1.0" + "from": "inherits@>=2.0.1 <2.1.0" }, "isarray": { "version": "1.0.0", @@ -1043,16 +1103,31 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "from": "http-signature@>=1.1.0 <1.2.0" }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "from": "inflight@>=1.0.4 <2.0.0" + }, "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "from": "inherits@>=2.0.3 <3.0.0" }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "from": "invert-kv@>=1.0.0 <2.0.0" + }, "is": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", "from": "is@>=3.0.1 <4.0.0" }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0" + }, "is-my-json-valid": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", @@ -1064,8 +1139,8 @@ "from": "is-property@>=1.0.0 <2.0.0" }, "is-stream-ended": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.0.tgz", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz", "from": "is-stream-ended@>=0.1.0 <0.2.0" }, "is-typedarray": { @@ -1140,6 +1215,11 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", "from": "jws@>=3.1.4 <4.0.0" }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "from": "lcid@>=1.0.0 <2.0.0" + }, "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", @@ -1158,7 +1238,7 @@ "long": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "from": "long@>=3.2.0 <4.0.0" + "from": "long@>=3.0.0 <4.0.0" }, "methmeth": { "version": "1.1.0", @@ -1180,6 +1260,11 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", "from": "mime-types@>=2.1.7 <2.2.0" }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "from": "minimatch@>=3.0.2 <4.0.0" + }, "modelo": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.0.tgz", @@ -1195,6 +1280,11 @@ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz", "from": "node-forge@>=0.7.1 <0.8.0" }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "from": "number-is-nan@>=1.0.0 <2.0.0" + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -1210,6 +1300,21 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", "from": "once@>=1.3.0 <1.4.0" }, + "optjs": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", + "from": "optjs@>=3.2.2 <3.3.0" + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "from": "os-locale@>=1.4.0 <2.0.0" + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "from": "path-is-absolute@>=1.0.0 <2.0.0" + }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", @@ -1236,9 +1341,9 @@ "from": "propprop@>=0.3.1 <0.4.0" }, "protobufjs": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.7.3.tgz", - "from": "protobufjs@>=6.7.0 <7.0.0" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", + "from": "protobufjs@>=5.0.0 <6.0.0" }, "punycode": { "version": "1.4.1", @@ -1267,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": { @@ -1308,16 +1413,9 @@ "from": "sntp@>=1.0.0 <2.0.0" }, "split-array-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.0.tgz", - "from": "split-array-stream@>=1.0.0 <2.0.0", - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "from": "async@>=1.4.0 <2.0.0" - } - } + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", + "from": "split-array-stream@>=1.0.0 <2.0.0" }, "sshpk": { "version": "1.13.0", @@ -1332,8 +1430,8 @@ } }, "stream-events": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.1.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz", "from": "stream-events@>=1.0.1 <2.0.0" }, "stream-shift": { @@ -1346,6 +1444,11 @@ "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.0.tgz", "from": "string-format-obj@>=1.1.0 <2.0.0" }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "from": "string-width@>=1.0.1 <2.0.0" + }, "string_decoder": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz", @@ -1362,9 +1465,9 @@ "from": "strip-ansi@>=3.0.0 <4.0.0" }, "stubs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-1.1.2.tgz", - "from": "stubs@>=1.1.0 <2.0.0" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "from": "stubs@>=3.0.0 <4.0.0" }, "supports-color": { "version": "2.0.0", @@ -1398,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": { @@ -1411,6 +1514,16 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", "from": "verror@1.3.6" }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "from": "window-size@>=0.1.4 <0.2.0" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "from": "wrap-ansi@>=2.0.0 <3.0.0" + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1420,6 +1533,16 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "from": "xtend@>=4.0.0 <5.0.0" + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "from": "y18n@>=3.2.0 <4.0.0" + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "from": "yargs@>=3.10.0 <4.0.0" } } } diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index 2c0402317bf7..ddee10054583 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -20,7 +20,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.coffee b/packages/rocketchat-ui-admin/client/admin.coffee index 5f86c8d750b9..9ca4269d86cf 100644 --- a/packages/rocketchat-ui-admin/client/admin.coffee +++ b/packages/rocketchat-ui-admin/client/admin.coffee @@ -23,6 +23,10 @@ setFieldValue = (settingId, value, type, editor) -> selectedRooms = Template.instance().selectedRooms.get() selectedRooms[settingId] = value Template.instance().selectedRooms.set(selectedRooms) + TempSettings.update {_id: settingId}, + $set: + value: value + changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) isnt JSON.stringify(value) else input.val(value).change() @@ -460,7 +464,7 @@ Template.admin.events TempSettings.update {_id: this.id}, $set: value: value - changed: RocketChat.settings.collectionPrivate.findOne(this.id).value isnt value + changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(this.id).value) isnt JSON.stringify(value) event.currentTarget.value = '' event.currentTarget.focus() @@ -474,7 +478,7 @@ Template.admin.events TempSettings.update {_id: settingId}, $set: value: value - changed: RocketChat.settings.collectionPrivate.findOne(settingId).value isnt value + changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) isnt JSON.stringify(value) Template.admin.onRendered -> Tracker.afterFlush -> From c74f1dae95dc92a5676b09abb14531301181fd33 Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Wed, 17 May 2017 16:13:30 -0300 Subject: [PATCH 3/8] Re-merging conflicted files --- packages/rocketchat-ui-admin/client/admin.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 21568e61fd05..45ad44edc710 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': + let selectedRooms = Template.instance().selectedRooms.get(); + selectedRooms[settingId] = value; + Template.instance().selectedRooms.set(selectedRooms); + TempSettings.update({ _id: settingId }, { $set: { value: value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) isnt 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 } }); } From ce393a1673b201c59ce3dd41b08ebf1730689eaa Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Wed, 17 May 2017 16:19:10 -0300 Subject: [PATCH 4/8] fix errors --- .../.npm/package/npm-shrinkwrap.json | 40 +++++++++---------- packages/rocketchat-ui-admin/client/admin.js | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) 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 758f6534013b..439a556c2aa4 100644 --- a/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json +++ b/packages/rocketchat-google-natural-language/.npm/package/npm-shrinkwrap.json @@ -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": { diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 45ad44edc710..aacf8dab988e 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -30,7 +30,7 @@ const setFieldValue = function(settingId, value, type, editor) { let selectedRooms = Template.instance().selectedRooms.get(); selectedRooms[settingId] = value; Template.instance().selectedRooms.set(selectedRooms); - TempSettings.update({ _id: settingId }, { $set: { value: value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) isnt JSON.stringify(value) } }); + TempSettings.update({ _id: settingId }, { $set: { value: value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) !== JSON.stringify(value) } }); break; default: input.val(value).change(); From c20a0de87f107844df2f8d0c7cb2fb409b953905 Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Wed, 17 May 2017 16:25:57 -0300 Subject: [PATCH 5/8] Update admin.js Use property shorthand --- packages/rocketchat-ui-admin/client/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index aacf8dab988e..885791bc40bc 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -30,7 +30,7 @@ const setFieldValue = function(settingId, value, type, editor) { let selectedRooms = Template.instance().selectedRooms.get(); selectedRooms[settingId] = value; Template.instance().selectedRooms.set(selectedRooms); - TempSettings.update({ _id: settingId }, { $set: { value: value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) !== JSON.stringify(value) } }); + TempSettings.update({ _id: settingId }, { $set: { value, changed: JSON.stringify(RocketChat.settings.collectionPrivate.findOne(settingId).value) !== JSON.stringify(value) } }); break; default: input.val(value).change(); From 5a5b7dd5a0fe81c4dff8622d276f4a0765157ace Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Wed, 17 May 2017 16:26:36 -0300 Subject: [PATCH 6/8] Update admin.js Use const instead of let --- packages/rocketchat-ui-admin/client/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-admin/client/admin.js b/packages/rocketchat-ui-admin/client/admin.js index 885791bc40bc..fa88dc1ce799 100644 --- a/packages/rocketchat-ui-admin/client/admin.js +++ b/packages/rocketchat-ui-admin/client/admin.js @@ -27,7 +27,7 @@ const setFieldValue = function(settingId, value, type, editor) { } break; case 'roomPick': - let selectedRooms = Template.instance().selectedRooms.get(); + 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) } }); From d5ee916bef37bcce797acbc668b16ac08a23b565 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 17 May 2017 17:23:58 -0300 Subject: [PATCH 7/8] Fix ESLint error --- packages/rocketchat-lib/server/methods/saveSetting.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index ddee10054583..85ca5486d4f9 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -1,3 +1,5 @@ +/* eslint new-cap: false */ + Meteor.methods({ saveSetting(_id, value, editor) { if (Meteor.userId() === null) { From 378d469c27ba2edacc05158713c77f089cdb8e9e Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 17 May 2017 18:07:52 -0300 Subject: [PATCH 8/8] Fix ESLint setting --- packages/rocketchat-lib/server/methods/saveSetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index 85ca5486d4f9..963876864e31 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -1,4 +1,4 @@ -/* eslint new-cap: false */ +/* eslint new-cap: 0 */ Meteor.methods({ saveSetting(_id, value, editor) {