Added additional precuations for users that do not exist and verified auth access.

electron/decoder/decoder.js

@@ -29,9 +29,12 @@ async function DecodeEstimate(filePath) {
     returnValue = { ERROR: "Vehicle mileage is less than 20,000kms." };
   } else if (!accepted_ins_co.includes(job.INS_CO_NM)) {
     returnValue = {
-      ERROR: `Insurance Company Name is not valid for RPS. (${job.INS_CO_NM})`,
+      ERROR: `Insurance Company Name is not valid for RPS. (${
+        job.INS_CO_NM || "No name set"
+      })`,
     };
-  } else if (!job.clm_no) {
+  } else if (!job.CLM_NO) {
+    log.info("Job ignored. No claim #. " + job.clm_no);
     returnValue = {
       ERROR: `An unique claim number must be set for all jobs sent to RPS.`,
     };

electron/main.js

@@ -44,6 +44,7 @@ var menu = Menu.buildFromTemplate([
         label: "Clear Settings",
         click() {
           store.reset("filePaths");
+          mainWindow.webContents.session.clearStorageData();
         },
       },
       {

firebase/functions/index.js

@@ -7,7 +7,7 @@ exports.processSignUp = functions.auth.user().onCreate((user) => {
   // Check if user meets role criteria:
   // Your custom logic here: to decide what roles and other `x-hasura-*` should the user get
   let customClaims;
-  if (user.email && user.email.indexOf("@thinkimex.com") !== -1) {
+  if (user.email && user.email.indexOf("@admin.imex.online") !== -1) {
     customClaims = {
       "https://hasura.io/jwt/claims": {
         "x-hasura-default-role": "admin",

src/components/atoms/delete-job/delete-job.atom.jsx

@@ -0,0 +1,46 @@
+import { DeleteFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { Button, message, Popconfirm } from "antd";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { DELETE_JOB } from "../../../graphql/jobs.queries";
+import { setSelectedJobId } from "../../../redux/application/application.actions";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  setSelectedJobId: (id) => dispatch(setSelectedJobId(id)),
+});
+export function DeleteJobAtom({ setSelectedJobId, jobId }) {
+  const [deleteJob] = useMutation(DELETE_JOB);
+  const [loading, setLoading] = useState(false);
+  const handleDelete = async () => {
+    setLoading(true);
+    const result = await deleteJob({
+      variables: { jobId: jobId },
+    });
+
+    if (result.errors) {
+      message.error(result.errors.toString());
+    } else {
+      message.success("Job deleted.");
+      setSelectedJobId(null);
+    }
+    setLoading(false);
+  };
+
+  return (
+    <div>
+      <Popconfirm
+        title="Are you sure you want to delete this job? This cannot be undone."
+        onConfirm={handleDelete}
+      >
+        <Button loading={loading}>
+          <DeleteFilled />
+        </Button>
+      </Popconfirm>
+    </div>
+  );
+}
+export default connect(mapStateToProps, mapDispatchToProps)(DeleteJobAtom);

src/components/organisms/jobs-detail/jobs-detail.organism.jsx

@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { QUERY_JOB_BY_PK } from "../../../graphql/jobs.queries";
 import { setSelectedJobTargetPc } from "../../../redux/application/application.actions";
 import { selectSelectedJobId } from "../../../redux/application/application.selectors";
+import { DeleteJobAtom } from "../../atoms/delete-job/delete-job.atom";
 import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
 import JobsPartsGraphAtom from "../../atoms/jobs-parts-graph/jobs-parts-graph.atom";
 import JobsDetailDescriptionMolecule from "../../molecules/jobs-detail-description/jobs-detail-description.molecule";
@@ -77,6 +78,7 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) {
           loading={loading}
         />
       </div>
+      <DeleteJobAtom jobId={data ? data.jobs_by_pk.id : null} />
     </div>
   );
 }

src/components/pages/jobs/jobs.page.jsx

@@ -1,4 +1,4 @@
-import { Col, Row, Tabs } from "antd";
+import { Col, Row, Tabs, Grid } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,10 +10,27 @@ const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({});
 
 export function JobsPage() {
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const bpoints = {
+    xs: { l: 12, r: 12 },
+    sm: { l: 10, r: 14 },
+    md: { l: 10, r: 14 },
+    lg: { l: 8, r: 16 },
+    xl: { l: 6, r: 18 },
+    xxl: { l: 5, r: 19 },
+  };
+
+  const selectedSpans = selectedBreakpoint
+    ? bpoints[selectedBreakpoint[0]]
+    : { l: 18, r: 6 };
+
   return (
     <div style={{ height: "100%" }}>
       <Row gutter={[16, 16]} style={{ height: "100%" }}>
-        <Col span={6} style={{ height: "100%" }}>
+        <Col span={selectedSpans.l} style={{ height: "100%" }}>
           <Tabs defaultActiveKey="latest" style={{ height: "100%" }}>
             <Tabs.TabPane key="latest" tab="Latest" style={{ height: "100%" }}>
               <JobsListOrganism />
@@ -23,7 +40,7 @@ export function JobsPage() {
             </Tabs.TabPane>
           </Tabs>
         </Col>
-        <Col span={18} style={{ height: "100%" }}>
+        <Col span={selectedSpans.r} style={{ height: "100%" }}>
           <JobsDetailOrganism />
         </Col>
       </Row>

src/components/pages/routes/routes.page.jsx

@@ -6,14 +6,26 @@ import { createStructuredSelector } from "reselect";
 import SiderMenuOrganism from "../../organisms/sider-menu/sider-menu.organism";
 import Jobs from "../jobs/jobs.page";
 import SettingsPage from "../settings/settings.page";
-
-const mapStateToProps = createStructuredSelector({});
+import { selectBodyshop } from "../../../redux/user/user.selectors";
+import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
+const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop });
 const mapDispatchToProps = (dispatch) => ({});
 
-export function RoutesPage() {
+export function RoutesPage({ bodyshop }) {
+  if (bodyshop === false)
+    return (
+      <ErrorResultAtom
+        title="No shop access"
+        errorMessage="You do not currently have access to any shop. Please reach out to technical support."
+      />
+    );
   return (
     <Layout style={{ background: "#fff", height: "100vh" }} hasSider>
-      <Layout.Sider style={{ background: "#fff" }} collapsible>
+      <Layout.Sider
+        style={{ background: "#fff" }}
+        collapsible
+        defaultCollapsed="true"
+      >
         <SiderMenuOrganism />
       </Layout.Sider>
       <Layout style={{ background: "#fff" }}>

src/components/pages/sign-in/sign-in.page.jsx

@@ -2,7 +2,6 @@ import { LockOutlined, UserOutlined } from "@ant-design/icons";
 import { Alert, Button, Form, Input, Typography } from "antd";
 import React from "react";
 import { connect } from "react-redux";
-import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ImEXOnlineLogo from "../../../assets/logo192.png";
 import { emailSignInStart } from "../../../redux/user/user.actions";
@@ -58,9 +57,6 @@ export function SignInPage({ emailSignInStart, signInError, loginLoading }) {
           Login
         </Button>
       </Form>
-      <Link to={"/resetpassword"}>
-        <Button>Reset Password</Button>
-      </Link>
     </div>
   );
 }

src/graphql/jobs.queries.js

@@ -172,3 +172,11 @@ export const UPDATE_JOB = gql`
     }
   }
 `;
+
+export const DELETE_JOB = gql`
+  mutation DELETE_JOB($jobId: uuid!) {
+    delete_jobs_by_pk(id: $jobId) {
+      id
+    }
+  }
+`;

src/redux/user/user.sagas.js

@@ -36,17 +36,19 @@ export function* signInWithEmail({ payload: { email, password } }) {
       mutation: UPSERT_USER,
       variables: { authEmail: user.email, authToken: user.uid },
     });
-    console.log("function*signInWithEmail -> result", result);
-
-    yield put(
-      signInSuccess({
-        uid: user.uid,
-        email: user.email,
-        displayName: user.displayName,
-        photoURL: user.photoURL,
-        authorized: true,
-      })
-    );
+    if (!result.errors) {
+      yield put(
+        signInSuccess({
+          uid: user.uid,
+          email: user.email,
+          displayName: user.displayName,
+          photoURL: user.photoURL,
+          authorized: true,
+        })
+      );
+    } else {
+      yield put(signInFailure(JSON.stringify(result.errors)));
+    }
   } catch (error) {
     yield put(signInFailure(error));
   }
@@ -100,6 +102,7 @@ export function* updateUserDetails(userDetails) {
   } catch (error) {
     //yield put(signOutFailure(error.message));
     //TODO error handling
+    console.log(error);
   }
 }
 
@@ -111,13 +114,17 @@ export function* signInSuccessSaga({ payload }) {
   //Query for the Correct Bodyshop
 
   const shop = yield client.query({ query: QUERY_BODYSHOP });
-
-  yield put(setBodyshop(shop.data.bodyshops[0]));
-  ipcRenderer.send(
-    ipcTypes.default.app.toMain.setAcceptableInsCoNm,
-    shop.data.bodyshops[0].accepted_ins_co
-  );
-  ipcRenderer.send(ipcTypes.default.fileWatcher.toMain.start);
+  if (shop.data.bodyshops.length > 0) {
+    yield put(setBodyshop(shop.data.bodyshops[0]));
+    ipcRenderer.send(
+      ipcTypes.default.app.toMain.setAcceptableInsCoNm,
+      shop.data.bodyshops[0].accepted_ins_co
+    );
+    ipcRenderer.send(ipcTypes.default.fileWatcher.toMain.start);
+  } else {
+    console.log("No bodyshop has been associated.");
+    yield put(setBodyshop(false));
+  }
   // LogRocket.identify(payload.email);
   // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
   // yield logImEXEvent("redux_sign_in_success");