Merged in release/2022-07-29 (pull request #546)

release/2022-07-29

Approved-by: Patrick Fic

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -144,11 +144,26 @@ export function JobLinesComponent({
       filters: [
         {
           text: t("jobs.labels.partsfilter"),
-          value: ["PAN", "PAP", "PAL", "PAA", "PAS", "PASL"],
+          value: [
+            "PAN",
+            "PAC",
+            "PAR",
+            "PAL",
+            "PAA",
+            "PAM",
+            "PAP",
+            "PAS",
+            "PASL",
+            "PAG",
+          ],
         },
         {
           text: t("joblines.fields.part_types.PAN"),
-          value: ["PAN", "PAP"],
+          value: ["PAN"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAP"),
+          value: ["PAP"],
         },
         {
           text: t("joblines.fields.part_types.PAL"),
@@ -158,9 +173,29 @@ export function JobLinesComponent({
           text: t("joblines.fields.part_types.PAA"),
           value: ["PAA"],
         },
+        {
+          text: t("joblines.fields.part_types.PAG"),
+          value: ["PAG"],
+        },
         {
           text: t("joblines.fields.part_types.PAS"),
-          value: ["PAS", "PASL"],
+          value: ["PAS"],
+        },
+        {
+          text: t("joblines.fields.part_types.PASL"),
+          value: ["PASL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAC"),
+          value: ["PAC"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAR"),
+          value: ["PAR"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAM"),
+          value: ["PAM"],
         },
       ],
       onFilter: (value, record) => value.includes(record.part_type),
@@ -346,7 +381,11 @@ export function JobLinesComponent({
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    setState((state) => ({
+      ...state,
+      filteredInfo: filters,
+      sortedInfo: sorter,
+    }));
   };
 
   const handleMark = (e) => {
@@ -482,9 +521,10 @@ export function JobLinesComponent({
             </Button>
             <Button
               onClick={() => {
-                setState({
+                setState((state) => ({
                   ...state,
                   filteredInfo: {
+                    ...state.filteredInfo,
                     part_type: [
                       "PAN",
                       "PAC",
@@ -498,7 +538,7 @@ export function JobLinesComponent({
                       "PAG",
                     ],
                   },
-                });
+                }));
               }}
             >
               <FilterFilled /> {t("jobs.actions.filterpartsonly")}

client/src/redux/store.js

@@ -17,7 +17,9 @@ const sentryReduxEnhancer = Sentry.createReduxEnhancer({
 const sagaMiddleWare = createSagaMiddleware();
 
 const reduxSyncConfig = {
-  whitelist: ["ADD_RECENT_ITEM", "SET_SHOP_DETAILS"],
+  whitelist: [
+    "ADD_RECENT_ITEM", //"SET_SHOP_DETAILS"
+  ],
 };
 
 const middlewares = [

client/src/redux/user/user.sagas.js

@@ -269,7 +269,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
   try {
     const userEmail = yield select((state) => state.user.currentUser.email);
     try {
-      console.log("Setting shop timezone.");
+      //console.log("Setting shop timezone.");
       // moment.tz.setDefault(payload.timezone);
     } catch (error) {
       console.log(error);