From 382d5c14520f6ae32c9ca832d6cc2633597c1487 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 27 Nov 2020 16:27:51 -0800 Subject: [PATCH] Added new date selectors RPS-64 --- WIP Changelog.txt | 9 +- package-lock.json | 123 ++++++------------ package.json | 6 +- .../reporting-dates.molecule.jsx | 12 ++ 4 files changed, 59 insertions(+), 91 deletions(-) diff --git a/WIP Changelog.txt b/WIP Changelog.txt index 905956d..aa3d5ac 100644 --- a/WIP Changelog.txt +++ b/WIP Changelog.txt @@ -1,8 +1,7 @@ New Features: -- Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen. -- Added ability to filter for jobs with no close date on job search. +- Added 'This Quarter' and 'Last Quarter' date quick select. +- Bug Fixes: -- Added better error handling on reporting for jobs that did not have a group set. -- Added a confirmation on changes to shop settings to indicate that a restart is required for them to take effect. -- Added auto update download for users who are not seeing progress during update download. \ No newline at end of file +- Added automatic job refresh on new import for estimate detail screen. +- Fixed an issue where more jobs would not be fetched in the list view in certain scenarios. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f8116da..1cc2268 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "imexrps", - "version": "1.0.11", + "version": "1.0.13", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -54,9 +54,9 @@ } }, "@apollo/client": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.2.7.tgz", - "integrity": "sha512-4G80jvBLqenCFUhwkHAAHi2ox6Ygq35BkE38yxammqykZm6KE3tVlcEKGOZi0jpiuGJPC6LIQ0d1gtI8ADPtmg==", + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.2.9.tgz", + "integrity": "sha512-AUvYITKhJNfRNU/Cf8t/N628ADdVah1+l9Qtjd09IwScRfDGvbBTkHMAgcb6hl7vuBVqGwQRq6fPKzHgWRlisg==", "requires": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", @@ -1329,9 +1329,9 @@ "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, "@ctrl/tinycolor": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.1.7.tgz", - "integrity": "sha512-/0C6fjXbCwu22k8mMsKRSAo9zgu61d2p75Or9IuIC0Vu5CWN88t2QHK93LhNnxnqHWf5SFwFU28w9cKfTmnfvg==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.2.0.tgz", + "integrity": "sha512-cP1tbXA1qJp/er2CJaO+Pbe38p7RlhV9WytUxUe79xj++Q6s/jKVvzJ9U2dF9f1/lZAdG+j94A38CsNR+uW4gw==" }, "@develar/schema-utils": { "version": "2.6.5", @@ -3408,9 +3408,9 @@ } }, "antd": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/antd/-/antd-4.8.4.tgz", - "integrity": "sha512-7GlxN/WxJ3cE32echN+6cNgLkwtgU5/4UB1YSzhtENWH1cO8PHIJ+t1/Ba3tfa/BwWUHvA7ku/sKACwptqtw1g==", + "version": "4.8.6", + "resolved": "https://registry.npmjs.org/antd/-/antd-4.8.6.tgz", + "integrity": "sha512-UhpODlcsUhBKgXulr8OmG9mEdFSSfk3hTq1lfO1HETxaOOEFnd3nSLiGCpELTGAUH9mlQPvoL+ccSXs/Q/9Zbw==", "requires": { "@ant-design/colors": "^5.0.0", "@ant-design/css-animation": "^1.7.2", @@ -3423,7 +3423,6 @@ "lodash": "^4.17.20", "moment": "^2.25.3", "omit.js": "^2.0.2", - "raf": "^3.4.1", "rc-animate": "~3.1.0", "rc-cascader": "~1.4.0", "rc-checkbox": "~2.3.0", @@ -3431,15 +3430,15 @@ "rc-dialog": "~8.4.0", "rc-drawer": "~4.1.0", "rc-dropdown": "~3.2.0", - "rc-field-form": "~1.15.0", + "rc-field-form": "~1.17.0", "rc-image": "~4.0.0", "rc-input-number": "~6.1.0", "rc-mentions": "~1.5.0", "rc-menu": "~8.10.0", - "rc-motion": "^2.2.0", + "rc-motion": "^2.4.0", "rc-notification": "~4.5.2", "rc-pagination": "~3.1.0", - "rc-picker": "~2.3.0", + "rc-picker": "~2.4.1", "rc-progress": "~3.1.0", "rc-rate": "~2.9.0", "rc-resize-observer": "^0.2.3", @@ -13062,56 +13061,15 @@ } }, "nucleus-nodejs": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nucleus-nodejs/-/nucleus-nodejs-3.0.6.tgz", - "integrity": "sha512-IpgQqBlU9QZebPAfQadSODQmoHPsSABAlkTNFtuO8tKv+072NQKeKN+1CUxY8Xe9WpyOhLjFuBGQE3TpC81Dcg==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/nucleus-nodejs/-/nucleus-nodejs-3.0.7.tgz", + "integrity": "sha512-nw9oDzRpujrh8R4yBlU5ITLHyg7x/DANXmUlte/IvZm6AtfJbvSMtDn1CUdXBfja1ZtbOQe8BPmI/489agnGjg==", "requires": { - "arch": "^2.1.1", - "conf": "^6.1.0", + "arch": "^2.2.0", + "conf": "^7.1.2", "node-machine-id": "^1.1.12", "os-locale": "^4.0.0", "ws": "^7.1.2" - }, - "dependencies": { - "conf": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz", - "integrity": "sha512-GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ==", - "optional": true, - "requires": { - "ajv": "^6.10.2", - "debounce-fn": "^3.0.1", - "dot-prop": "^5.0.0", - "env-paths": "^2.2.0", - "json-schema-typed": "^7.0.1", - "make-dir": "^3.0.0", - "onetime": "^5.1.0", - "pkg-up": "^3.0.1", - "semver": "^6.2.0", - "write-file-atomic": "^3.0.0" - } - }, - "debounce-fn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz", - "integrity": "sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q==", - "optional": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "optional": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "optional": true - } } }, "num2fraction": { @@ -15293,9 +15251,9 @@ } }, "rc-field-form": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.15.1.tgz", - "integrity": "sha512-V3Kfryynig7JJichGq/L8yFHpBzmWybWBtI2KjLPCX5S7nibIQPa0J8JNiHmN5kS73apjhKx1do6L7E0EILJ6Q==", + "version": "1.17.2", + "resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.17.2.tgz", + "integrity": "sha512-+pufRy5x4G5yHxQ3k1nhgQqyqerPVJQ2jaLGojHjNpmZ2Si20o1KniMLsZxe6X8dfq4ePmH6M3IngfDnS+CrMA==", "requires": { "@babel/runtime": "^7.8.4", "async-validator": "^3.0.3", @@ -15338,9 +15296,9 @@ } }, "rc-menu": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-8.10.0.tgz", - "integrity": "sha512-mafcLoKtVlH9HDW52NmwenQ9vjvgxtR46NfYAexJEIUTZ9Ze2veZUkEKjhOJlzrUHEYtCoNslpqyy4iVN08Glw==", + "version": "8.10.1", + "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-8.10.1.tgz", + "integrity": "sha512-HmTOLPkSrz5RcdDopD4+nI95YXR2DzdSq9ek3NX2EVgD1UHknlp1QAEJ5MompYdAqdtOspJUqgM/zNt0iQALOw==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -15348,15 +15306,15 @@ "omit.js": "^2.0.0", "rc-motion": "^2.0.1", "rc-trigger": "^5.1.2", - "rc-util": "^5.0.1", + "rc-util": "^5.5.0", "resize-observer-polyfill": "^1.5.0", "shallowequal": "^1.1.0" } }, "rc-motion": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.3.4.tgz", - "integrity": "sha512-La9JjfM58Vrwds1wM9OAkRTWsGeVqNnftI1YFti2WtaA2Ernk2vjbVio9hGbzhF0EvGrEvrzS96Mx/6lGT6Z0w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.4.1.tgz", + "integrity": "sha512-TWLvymfMu8SngPx5MDH8dQ0D2RYbluNTfam4hY/dNNx9RQ3WtGuZ/GXHi2ymLMzH+UNd6EEFYkOuR5JTTtm8Xg==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -15384,9 +15342,9 @@ } }, "rc-picker": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.3.4.tgz", - "integrity": "sha512-UdeqTzR9E5KHOGMjWfsMpE3VU+3VR3J5/wMrwuIRmL8orv9Tm+Gew3NPfs7djcuTrfnu+hL+lwCWp7VftZcSng==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.4.3.tgz", + "integrity": "sha512-tOIHslTQKpoGNmbpp6YOBwS39dQSvtAuhOm3bWCkkc4jCqUqeR/velCwqefZX1BX4+t1gUMc1dIia9XvOKrEkg==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.1", @@ -15443,9 +15401,9 @@ } }, "rc-slider": { - "version": "9.6.3", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.6.3.tgz", - "integrity": "sha512-qLEDQ6FKPDmzWgF7WQ8otf41z53YKSgiSeoec50H1IMz7xLwwXX9+luDYI08br3x8i6u8jIZtggN5RD1ftKnhw==", + "version": "9.6.4", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.6.4.tgz", + "integrity": "sha512-TgmfOh1Jj9fHsW2eDeldFy4mOKwyHn4krl4K6gqbXhGFND7jVRdfA0m7TDUx3gGeX7A17fM1QZymMO/NRJmoLw==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -15475,9 +15433,9 @@ } }, "rc-table": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.11.2.tgz", - "integrity": "sha512-srOWkqgDQU6OA+gpc4MsaZXFw6TRC9NizbytvFCAg+Ra06cOVnD+MVYimAnjM9GeTPHgU+yc17xr/VkUYCRbYQ==", + "version": "7.11.3", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.11.3.tgz", + "integrity": "sha512-YyZry1CdqUrcH7MmWtLQZVvVZWbmTEbI5m650AZ+zYw4D5VF701samkMYl5z/H9yQFr+ugvDtXcya+e3vwRkMQ==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -15487,13 +15445,12 @@ } }, "rc-tabs": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-11.7.1.tgz", - "integrity": "sha512-ZLQ5ou70j32GKcOKRZvd5JQZOJhcDy62dr9kqiWDvt6g5v8LkpxIGAc0dWtCWOEWkO/QezwuNqWufMborkfrnQ==", + "version": "11.7.2", + "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-11.7.2.tgz", + "integrity": "sha512-2M/XE4TdecnjsDylJSs49OmjJuDuix3VmSiNaPd50PMqFc+dc4fEof3J8/ad12enicVOcsH4BEQEms//Kn4DBw==", "requires": { "@babel/runtime": "^7.11.2", "classnames": "2.x", - "raf": "^3.4.1", "rc-dropdown": "^3.1.3", "rc-menu": "^8.6.1", "rc-resize-observer": "^0.2.1", diff --git a/package.json b/package.json index 631a7d0..8b3782b 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "main": "electron/main.js", "homepage": "./", "dependencies": { - "@apollo/client": "^3.2.4", - "antd": "^4.8.4", + "@apollo/client": "^3.2.9", + "antd": "^4.8.6", "apollo-link-logger": "^2.0.0", "chokidar": "^3.4.2", "dbffile": "^1.4.3", @@ -25,7 +25,7 @@ "logrocket": "^1.0.14", "moment": "^2.29.1", "node-sass": "^4.14.1", - "nucleus-nodejs": "^3.0.6", + "nucleus-nodejs": "^3.0.7", "query-string": "^6.13.6", "react": "^17.0.1", "react-dom": "^17.0.1", diff --git a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx index e1b59ce..d9fc424 100644 --- a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx +++ b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx @@ -36,6 +36,7 @@ export function ReportingDatesMolecule({ queryReportingData }) {