From eaf9bdab9113bfaf4453d79d052669a6a1b845cd Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Mon, 14 Dec 2020 11:25:27 +0100 Subject: [PATCH 1/3] feat(COMPASS-4530): Increase default max time ms to 1 minute and add spaces to the field label --- src/components/query-bar/query-bar.jsx | 10 ++++++++-- src/components/query-option/query-option.less | 2 +- src/constants/query-bar-store.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/query-bar/query-bar.jsx b/src/components/query-bar/query-bar.jsx index aa9be90..d1aea12 100644 --- a/src/components/query-bar/query-bar.jsx +++ b/src/components/query-bar/query-bar.jsx @@ -18,6 +18,9 @@ import QUERY_PROPERTIES from 'constants/query-properties'; import styles from './query-bar.less'; +/** + * @type {Record} + */ const OPTION_DEFINITION = { filter: { type: 'document', @@ -51,8 +54,9 @@ const OPTION_DEFINITION = { link: 'https://docs.mongodb.com/manual/reference/method/cursor.limit/' }, maxTimeMS: { + label: 'Max Time MS', type: 'numeric', - placeholder: '5000', + placeholder: '60000', link: 'https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/' }, sample: { @@ -210,9 +214,11 @@ class QueryBar extends Component { const value = OPTION_DEFINITION[option].type === 'boolean' ? this.props[option] : this.props[`${option}String`]; + const label = OPTION_DEFINITION[option].label || option; + return ( Date: Mon, 14 Dec 2020 12:50:32 +0100 Subject: [PATCH 2/3] fix: Update assertion for the max time ms --- test/renderer/query-changed-store.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/renderer/query-changed-store.spec.js b/test/renderer/query-changed-store.spec.js index 3def7cb..bd8491d 100644 --- a/test/renderer/query-changed-store.spec.js +++ b/test/renderer/query-changed-store.spec.js @@ -75,7 +75,7 @@ describe('QueryChangedStore [Store]', function() { expect(state.project).to.be.deep.equal(null); expect(state.collation).to.be.deep.equal(null); expect(state.sample).to.be.false; - expect(state.maxTimeMS).to.be.equal(5000); + expect(state.maxTimeMS).to.be.equal(60000); done(); }); From aecff7df883bfa03c90c14ccf286811ca356bfb9 Mon Sep 17 00:00:00 2001 From: Sergey Petushkov Date: Mon, 14 Dec 2020 16:41:36 +0100 Subject: [PATCH 3/3] chore(deps): Update query parser dev dependency --- package-lock.json | 44 ++++++++++++++++++++++++++------------------ package.json | 4 ++-- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a1b5d6..94c4a03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5308,18 +5308,18 @@ "dev": true }, "ejson-shell-parser": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/ejson-shell-parser/-/ejson-shell-parser-0.0.2.tgz", - "integrity": "sha512-86NVl8AP2sDF43LHkPQCUCbER02Dyg3TqTAJ8OHk4lmSdKxD+wG1XRCatfKnLEU+HhFxSACLmHPNeqdRzaDtlw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ejson-shell-parser/-/ejson-shell-parser-1.0.2.tgz", + "integrity": "sha512-cXuXDWSrwsNovV8d1wNDvCifiqsj8vk1EyfusI5pWMTvTSVb195z2GMBQ6bgeoVv0or7yCV6aokLBU2aOIWwog==", "dev": true, "requires": { - "acorn": "^7.1.0" + "acorn": "^7.4.0" }, "dependencies": { "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true } } @@ -14598,31 +14598,39 @@ "dev": true }, "mongodb-query-parser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-2.1.1.tgz", - "integrity": "sha512-stPZItpFDzQIYIPIh2aX1Aj+HLJcROtPAAJoOX3K7GgnQxV9cApFIB4dt1/NyuYtqIO4uwbazu68+nkV/+G1GA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/mongodb-query-parser/-/mongodb-query-parser-2.2.0.tgz", + "integrity": "sha512-5erPxPLR5l3dvkneNckI7J9ShmtwTxsHVjiYb3xha5M3PBcslY6maAVVzgbfpRMUIfdP0aju/ae9h1Vii6w4cw==", "dev": true, "requires": { "bson": "^4.0.3", "debug": "^4.1.1", - "ejson-shell-parser": "0.0.2", + "ejson-shell-parser": "^1.0.2", "is-json": "^2.0.1", "javascript-stringify": "^2.0.1", "lodash": "^4.17.15", "lru-cache": "^5.1.1", "mongodb-extended-json": "^1.10.2", - "mongodb-language-model": "^1.6.1", - "ms": "^2.1.2" + "mongodb-language-model": "^1.6.1" }, "dependencies": { "bson": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.0.3.tgz", - "integrity": "sha512-7uBjjxwOSuGLmoqGI1UXWpDGc0K2WjR7dC6iaOg4iriNZo6M2EEBb8co4dEPJ5ArYCebPMie0ecgX0TWF+ZUrQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.2.2.tgz", + "integrity": "sha512-9fX257PVHAUpiRGmY3356RVWKQxLA73BgjA/x5MGuJkTEMeG7yzjuBrsiFB67EXRJnFVKrbJY9t/M+oElKYktQ==", "dev": true, "requires": { - "buffer": "^5.1.0", - "long": "^4.0.0" + "buffer": "^5.6.0" + } + }, + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, "lru-cache": { diff --git a/package.json b/package.json index 858a886..7f9f463 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "mongodb-connection-model": "^14.5.1", "mongodb-data-service": "^16.5.2", "mongodb-js-precommit": "^2.2.0", - "mongodb-query-parser": "^2.1.1", + "mongodb-query-parser": "^2.2.0", "mongodb-reflux-store": "^0.0.1", "mongodb-schema": "^8.2.5", "ms": "^2.1.2", @@ -159,4 +159,4 @@ "lodash": "^4.17.15", "mongodb-query-util": "^0.2.1" } -} \ No newline at end of file +}