From 9d2a8284f797ee39e8a8f718a3ea89912c8683da Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 26 Nov 2020 09:55:29 -0800 Subject: [PATCH 1/5] Version update with changelog. --- electron/changelog.json | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/electron/changelog.json b/electron/changelog.json index 98e7f9d..78afc03 100644 --- a/electron/changelog.json +++ b/electron/changelog.json @@ -18,5 +18,10 @@ "title": "Release Notes for 1.0.12", "date": "11/26/2020", "notes": "New Features: \n- Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen.\n- Added ability to filter for jobs with no close date on job search.\n\nBug Fixes: \n- Added better error handling on reporting for jobs that did not have a group set.\n- Added a confirmation on changes to shop settings to indicate that a restart is required for them to take effect.\n- Added auto update download for users who are not seeing progress during update download." + }, + "1.0.13": { + "title": "Release Notes for 1.0.13", + "date": "TBD", + "notes": "" } } diff --git a/package.json b/package.json index 3c8703c..631a7d0 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "ImEX RPS", "author": "ImEX Systems Inc. ", "description": "ImEX RPS", - "version": "1.0.12", + "version": "1.0.13", "main": "electron/main.js", "homepage": "./", "dependencies": { From f240dc6ccbf13aba8b264325789ca662da059108 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 27 Nov 2020 15:20:12 -0800 Subject: [PATCH 2/5] Resolve issue where unable to scroll further after updating record RPS-65. --- src/App/App.styles.scss | 5 ++ .../jobs-list-latest.organism.jsx | 53 ++++++--------- .../jobs-list-search.organism.jsx | 68 +++++++------------ src/graphql/jobs.queries.js | 1 + src/ipc/ipc-renderer-handler.js | 2 +- 5 files changed, 55 insertions(+), 74 deletions(-) diff --git a/src/App/App.styles.scss b/src/App/App.styles.scss index dc2299e..85a5aee 100644 --- a/src/App/App.styles.scss +++ b/src/App/App.styles.scss @@ -66,12 +66,17 @@ body { // } .jobs-list-container { height: 100%; + display: flex; + flex-direction: column; + // padding-bottom: 10px; } .jobs-list-infinite-container { overflow-y: auto; overflow-x: hidden; height: 100%; + flex: 1; + padding-bottom: 30px; } //Required for the tab with infinite loading diff --git a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx index 6fce11f..9772d10 100644 --- a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx +++ b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx @@ -1,6 +1,5 @@ -import { SyncOutlined } from "@ant-design/icons"; import { useQuery } from "@apollo/client"; -import { Dropdown, List, Menu, Spin } from "antd"; +import { List } from "antd"; import React, { useState } from "react"; import InfiniteScroll from "react-infinite-scroller"; import { QUERY_ALL_JOBS_PAGINATED } from "../../../graphql/jobs.queries"; @@ -22,21 +21,14 @@ export default function JobsTableOrganism() { } ); - const menu = ( - - refetch()}> - - Reload - - - ); - - const handleInfiniteOnLoad = (page) => { - fetchMore && - fetchMore({ + const handleInfiniteOnLoad = async (page) => { + console.log("Fetching more records!", page, fetchMore); + if (fetchMore) { + await fetchMore({ variables: { offset: limit * page, }, + updateQuery: (prev, { fetchMoreResult }) => { if (!fetchMoreResult) { console.log("No more results. Fetch More was empty."); @@ -49,8 +41,8 @@ export default function JobsTableOrganism() { }); if ( - newCache.jobs.length >= data && - data.jobs_aggregate.aggregate.count + newCache.jobs.length >= + (data && data.jobs_aggregate.aggregate.count) ) { console.log("No more results."); setState({ ...state, hasMore: false }); @@ -59,6 +51,11 @@ export default function JobsTableOrganism() { return newCache; }, }); + // if (data.jobs.length >= data.jobs_aggregate.aggregate.count) { + // console.log("No more results."); + // setState({ ...state, hasMore: false }); + // } + } }; if (error) @@ -77,22 +74,16 @@ export default function JobsTableOrganism() { loadMore={handleInfiniteOnLoad} hasMore={!loading && state.hasMore} useWindow={false} + threshold={30} > - - ( - - )} - > - {loading && state.hasMore && ( -
- -
- )} - - + ( + + )} + >
diff --git a/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx index 7731a5c..69a315a 100644 --- a/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx +++ b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx @@ -1,6 +1,5 @@ -import { SyncOutlined } from "@ant-design/icons"; import { useLazyQuery } from "@apollo/client"; -import { Dropdown, List, Menu, Spin } from "antd"; +import { List, Spin } from "antd"; import React, { useState } from "react"; import InfiniteScroll from "react-infinite-scroller"; import { SEARCH_JOBS_PAGINATED } from "../../../graphql/jobs.queries"; @@ -8,37 +7,26 @@ import ErrorResultAtom from "../../atoms/error-result/error-result.atom"; import JobsListItemMolecule from "../../molecules/jobs-list-item/jobs-list-item.molecule"; import JobsSearchFieldsMolecule from "../../molecules/jobs-search-fields/jobs-search-fields.molecule"; - - const limit = 20; export default function JobsTableOrganism() { const [state, setState] = useState({ hasMore: true }); - const [ - callSearch, - { loading, error, data, refetch, fetchMore }, - ] = useLazyQuery(SEARCH_JOBS_PAGINATED, { - variables: { - offset: 0, - limit: limit, - }, - }); - - const menu = ( - - refetch()}> - - Reload - - + const [callSearch, { loading, error, data, fetchMore }] = useLazyQuery( + SEARCH_JOBS_PAGINATED, + { + variables: { + offset: 0, + limit: limit, + }, + } ); - const handleInfiniteOnLoad = (page) => { + const handleInfiniteOnLoad = async (page) => { if (fetchMore) { // ipcRenderer.send(ipcTypes.default.app.toMain.track, { // event: "FETCH_MORE_JOBS", // }); - fetchMore({ + await fetchMore({ variables: { offset: limit * page, }, @@ -50,12 +38,12 @@ export default function JobsTableOrganism() { } const newCache = Object.assign({}, prev, { - jobs: [...prev.search_jobs, ...fetchMoreResult.search_jobs], + search_jobs: [...prev.search_jobs, ...fetchMoreResult.search_jobs], }); if ( - newCache.jobs.length >= data && - data.search_jobs_aggregate.aggregate.count + newCache.search_jobs.length >= + (data && data.search_jobs_aggregate.aggregate.count) ) { console.log("No more results."); setState({ ...state, hasMore: false }); @@ -84,25 +72,21 @@ export default function JobsTableOrganism() { loadMore={handleInfiniteOnLoad} hasMore={!loading && state.hasMore} useWindow={false} + threshold={30} > - - } - > - {loading && state.hasMore && ( -
- -
- )} - - + } + > + {loading && state.hasMore && ( +
+ +
+ )} +
- {`${data ? data.search_jobs.length : 0} jobs loaded. ${ - data ? data.search_jobs_aggregate.aggregate.count : 0 - } total jobs.`} ); } diff --git a/src/graphql/jobs.queries.js b/src/graphql/jobs.queries.js index ddc342b..6c35e10 100644 --- a/src/graphql/jobs.queries.js +++ b/src/graphql/jobs.queries.js @@ -66,6 +66,7 @@ export const SEARCH_JOBS_PAGINATED = gql` } search_jobs_aggregate( args: { enddate: $endDate, search: $search, startdate: $startDate } + where: { close_date: { _is_null: $closeDateIsNull } } ) { aggregate { count(distinct: true) diff --git a/src/ipc/ipc-renderer-handler.js b/src/ipc/ipc-renderer-handler.js index 1d47322..e2e6a81 100644 --- a/src/ipc/ipc-renderer-handler.js +++ b/src/ipc/ipc-renderer-handler.js @@ -53,7 +53,7 @@ ipcRenderer.on( ipcRenderer.on( ipcTypes.default.estimate.toRenderer.estimateDecodeSuccess, async (event, obj) => { - console.log("obj", obj); + await UpsertEstimate(obj); } ); From 4b27a92b8ad3872ae721ce9ea4bb872696daf3bf Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 27 Nov 2020 16:07:24 -0800 Subject: [PATCH 3/5] Added refetch query for shown estimate RPS-68 --- src/ipc/ipc-estimate-utils.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ipc/ipc-estimate-utils.js b/src/ipc/ipc-estimate-utils.js index 864a6cd..3c85b23 100644 --- a/src/ipc/ipc-estimate-utils.js +++ b/src/ipc/ipc-estimate-utils.js @@ -47,11 +47,12 @@ export async function UpsertEstimate(job) { }); delete job.joblines; delete job.group; //Added to preserve group already set in the system RPS-49. - + logger.info("Attemping to update job."); await client.mutate({ mutation: UPDATE_JOB, variables: { jobId: existingJobs.data.jobs[0].id, job: job }, + refetchQueries: ["QUERY_JOB_BY_PK"], }); logger.info("Job updated succesfully."); } else { @@ -62,7 +63,7 @@ export async function UpsertEstimate(job) { variables: { job: { ...job, bodyshopid: shopId }, }, - refetchQueries: ["QUERY_ALL_JOBS_PAGINATED"], + refetchQueries: ["QUERY_ALL_JOBS_PAGINATED", "QUERY_JOB_BY_PK"], }); logger.info("Job inserted succesfully."); } From 382d5c14520f6ae32c9ca832d6cc2633597c1487 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 27 Nov 2020 16:27:51 -0800 Subject: [PATCH 4/5] 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 }) { From 76296b7a3615ca7cefa8337b2fbd57b036f3ff00 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 15 Dec 2020 09:21:04 -0800 Subject: [PATCH 5/5] Package updated for 1.0.13 --- WIP Changelog.txt | 1 - electron/changelog.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WIP Changelog.txt b/WIP Changelog.txt index aa3d5ac..f94a939 100644 --- a/WIP Changelog.txt +++ b/WIP Changelog.txt @@ -1,6 +1,5 @@ New Features: - Added 'This Quarter' and 'Last Quarter' date quick select. -- Bug Fixes: - Added automatic job refresh on new import for estimate detail screen. diff --git a/electron/changelog.json b/electron/changelog.json index 78afc03..31b63f0 100644 --- a/electron/changelog.json +++ b/electron/changelog.json @@ -21,7 +21,7 @@ }, "1.0.13": { "title": "Release Notes for 1.0.13", - "date": "TBD", - "notes": "" + "date": "11/30/2020", + "notes": "New Features: \n- Added 'This Quarter' and 'Last Quarter' date quick select.\n\nBug Fixes: \n- Added automatic job refresh on new import for estimate detail screen.\n- Fixed an issue where more jobs would not be fetched in the list view in certain scenarios." } }