From 83f71888222539891aa77facc42258792faef7aa Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Nov 2020 08:10:34 -0800 Subject: [PATCH] Fixed refresh all. Fixed Updating Methods. Removed Jira Widget. --- dev-app-update.yml => Xdev-app-update.yml | 0 electron/main.js | 30 +++++----- public/index.html | 4 +- .../jobs-list-item.molecule.jsx | 11 ++-- .../jobs-list-item/jobs-list-item.styles.scss | 8 ++- .../reporting-dates.molecule.jsx | 4 +- .../shop-settings-form.molecule.jsx | 2 +- .../jobs-list-latest.organism.jsx | 59 ++++++++++--------- 8 files changed, 68 insertions(+), 50 deletions(-) rename dev-app-update.yml => Xdev-app-update.yml (100%) diff --git a/dev-app-update.yml b/Xdev-app-update.yml similarity index 100% rename from dev-app-update.yml rename to Xdev-app-update.yml diff --git a/electron/main.js b/electron/main.js index de809a8..f8f6d25 100644 --- a/electron/main.js +++ b/electron/main.js @@ -249,12 +249,13 @@ function createTray() { // autoUpdater.on("checking-for-update", () => { // log.log("Checking for update..."); // }); -// autoUpdater.on("update-available", (ev, info) => { -// log.log("Update available."); -// }); -// autoUpdater.on("update-not-available", (ev, info) => { -// log.log("Update not available."); -// }); +autoUpdater.on("update-available", (ev) => { + log.log("Update available.", ev); + mainWindow.webContents.send(ipcTypes.app.toRenderer.updateAvailable, ev); +}); +autoUpdater.on("update-not-available", (ev) => { + log.log("Update not available.", ev); +}); autoUpdater.on("error", (ev, err) => { log.log("Error in auto-updater.", ev, err); @@ -327,15 +328,16 @@ autoUpdater.on("update-downloaded", (ev, info) => { async function checkForUpdates() { try { log.info("Checking for updates."); - const result = await autoUpdater.checkForUpdates(); - const { updateInfo } = result; + //const result = await + autoUpdater.checkForUpdates(); + // const { updateInfo } = result; - if (updateInfo.version !== app.getVersion()) { - mainWindow.webContents.send( - ipcTypes.app.toRenderer.updateAvailable, - updateInfo - ); - } + // if (updateInfo.version !== app.getVersion()) { + // mainWindow.webContents.send( + // ipcTypes.app.toRenderer.updateAvailable, + // updateInfo + // ); + // } } catch (error) { log.error("Error while checking for update", error); } diff --git a/public/index.html b/public/index.html index 3ef2c51..e861641 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,9 @@ - + { setSelectedJobId(jobId); @@ -29,9 +30,11 @@ export function JobsListItemMolecule({ console.log("Refresh")} + onClick={() => { + refetch(); + }} > -
Refresh
+
Refresh All
 ); return ( diff --git a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss index 5d8d5ae..37e3ea6 100644 --- a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss +++ b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss @@ -23,8 +23,12 @@ padding: 0.1rem !important; margin: 0; border-bottom: 0.8rem solid #f0f0f0 !important; - display: flex; - align-items: center; + &-content { + width: 100%; + display: flex; + justify-content: center; + } + cursor: pointer; &:hover { background-color: #e6f7ff; diff --git a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx index 8e70573..e1b59ce 100644 --- a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx +++ b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx @@ -36,6 +36,9 @@ export function ReportingDatesMolecule({ queryReportingData }) { diff --git a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx index 6b1e54a..bb3baad 100644 --- a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx +++ b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx @@ -62,7 +62,7 @@ export default function ShopSettingsFormMolecule({ form, saveLoading }) { { - fetchMore({ - variables: { - offset: limit * page, - }, - updateQuery: (prev, { fetchMoreResult }) => { - if (!fetchMoreResult) { - console.log("No more results. Fetch More was empty."); - setState({ ...state, hasMore: false }); - return prev; - } + fetchMore && + fetchMore({ + variables: { + offset: limit * page, + }, + updateQuery: (prev, { fetchMoreResult }) => { + if (!fetchMoreResult) { + console.log("No more results. Fetch More was empty."); + setState({ ...state, hasMore: false }); + return prev; + } - const newCache = Object.assign({}, prev, { - jobs: [...prev.jobs, ...fetchMoreResult.jobs], - }); + const newCache = Object.assign({}, prev, { + jobs: [...prev.jobs, ...fetchMoreResult.jobs], + }); - if ( - newCache.jobs.length >= data && - data.jobs_aggregate.aggregate.count - ) { - console.log("No more results."); - setState({ ...state, hasMore: false }); - } + if ( + newCache.jobs.length >= data && + data.jobs_aggregate.aggregate.count + ) { + console.log("No more results."); + setState({ ...state, hasMore: false }); + } - return newCache; - }, - }); + return newCache; + }, + }); }; if (error) @@ -81,7 +82,9 @@ export default function JobsTableOrganism() { } + renderItem={(item) => ( + + )} > {loading && state.hasMore && (
@@ -92,9 +95,11 @@ export default function JobsTableOrganism() {
- {`${data ? data.jobs.length : 0} jobs loaded. ${ - data ? data.jobs_aggregate.aggregate.count : 0 - } total jobs.`} +
+ {`${data ? data.jobs.length : 0} jobs loaded. ${ + data ? data.jobs_aggregate.aggregate.count : 0 + } total jobs.`} +
); }