IO-2724 Resolve tech console showing 2 drawers on production board.

IO-2894 Null check

client/src/components/production-list-table/production-list-table.component.jsx

@@ -1,23 +1,23 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import { SyncOutlined } from "@ant-design/icons";
-import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
+import _ from "lodash";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import Prompt from "../../utils/prompt.js";
+import AlertComponent from "../alert/alert.component.jsx";
 import ProductionListColumnsAdd from "../production-list-columns/production-list-columns.add.component";
 import ProductionListColumns from "../production-list-columns/production-list-columns.data";
 import ProductionListDetail from "../production-list-detail/production-list-detail.component";
+import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { SyncOutlined } from "@ant-design/icons";
-import Prompt from "../../utils/prompt.js";
-import _ from "lodash";
-import AlertComponent from "../alert/alert.component.jsx";
-import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,7 +43,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
   const initialStateRef = useRef(
     (bodyshop.production_config &&
       bodyshop.production_config.find((p) => p.name === defaultView)?.columns.tableState) ||
-      bodyshop.production_config[0]?.columns.tableState || {
+      (bodyshop.production_config && bodyshop.production_config[0]?.columns.tableState) || {
         sortedInfo: {},
         filteredInfo: { text: "" }
       }

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -206,76 +206,98 @@ export function TimeTicketList({
                 return null;
               }
             }
-          },
+          }
-  
         ]),
-        {
+    {
-          title: t("timetickets.fields.created_by"),
+      title: t("timetickets.fields.created_by"),
-          dataIndex: "created_by",
+      dataIndex: "created_by",
-          key: "created_by",
+      key: "created_by",
-          sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
-          sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
-          render: (text, record) => record.created_by
+      render: (text, record) => record.created_by
-        },
+    },
-        // {
+    // {
-        //   title: "Pay",
+    //   title: "Pay",
-        //   dataIndex: "pay",
+    //   dataIndex: "pay",
-        //   key: "pay",
+    //   key: "pay",
-        //   render: (text, record) =>
+    //   render: (text, record) =>
-        //     Dinero({ amount: Math.round(record.rate * 100) })
+    //     Dinero({ amount: Math.round(record.rate * 100) })
-        //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+    //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
-        //       .toFormat("$0.00"),
+    //       .toFormat("$0.00"),
-        // },
+    // },
-        {
+    {
-          title: t("general.labels.actions"),
+      title: t("general.labels.actions"),
-          dataIndex: "actions",
+      dataIndex: "actions",
-          key: "actions",
+      key: "actions",
-          render: (text, record) => (
+      render: (text, record) => (
-            <Space wrap>
+        <Space wrap>
-              {techConsole && (
+          {techConsole && (
-                <TimeTicketEnterButton
+            <TimeTicketEnterButton
-                  actions={{ refetch }}
+              actions={{ refetch }}
-                  context={{ id: record.id, timeticket: record }}
+              context={{ id: record.id, timeticket: record }}
-                  disabled={!record.job || disabled}
+              disabled={!record.job || disabled}
-                >
+            >
-                  <EditFilled />
+              <EditFilled />
-                </TimeTicketEnterButton>
+            </TimeTicketEnterButton>
-              )}
+          )}
-              {!techConsole && (
+          {!techConsole && (
-                <RbacWrapper
+            <RbacWrapper
-                  action="timetickets:edit"
+              action="timetickets:edit"
-                  noauth={() => {
+              noauth={() => {
-                    return <div />;
+                return <div />;
-                  }}
+              }}
-                >
+            >
-                  <TimeTicketEnterButton
+              <TimeTicketEnterButton
-                    actions={{ refetch }}
+                actions={{ refetch }}
-                    context={{
+                context={{
-                      id: record.id,
+                  id: record.id,
-                      timeticket: record
+                  timeticket: record
-                    }}
+                }}
-                    disabled={
+                disabled={
-                      HasRbacAccess({
+                  record.ciecacode
-                        bodyshop,
+                    ? record.committed_at
-                        authLevel: authLevel,
+                      ? HasRbacAccess({
-                        action: "timetickets:editcommitted"
+                          bodyshop,
-                      }) &&
+                          authLevel: authLevel,
-                      HasRbacAccess({
+                          action: "timetickets:editcommitted"
-                        bodyshop,
+                        }) &&
-                        authLevel: authLevel,
+                        HasRbacAccess({
-                        action: "timetickets:shiftedit"
+                          bodyshop,
-                      })
+                          authLevel: authLevel,
+                          action: "timetickets:edit"
+                        })
+                      : HasRbacAccess({
+                          bodyshop,
+                          authLevel: authLevel,
+                          action: "timetickets:edit"
+                        })
+                    : record.committed_at
+                      ? HasRbacAccess({
+                          bodyshop,
+                          authLevel: authLevel,
+                          action: "timetickets:editcommitted"
+                        }) &&
+                        HasRbacAccess({
+                          bodyshop,
+                          authLevel: authLevel,
+                          action: "timetickets:shiftedit"
+                        })
+                      : HasRbacAccess({
+                            bodyshop,
+                            authLevel: authLevel,
+                            action: "timetickets:shiftedit"
+                          })
                         ? disabled
                         : !record.jobid
-                    }
+                }
-                  >
+              >
-                    <EditFilled />
+                <EditFilled />
-                  </TimeTicketEnterButton>
+              </TimeTicketEnterButton>
-                </RbacWrapper>
+            </RbacWrapper>
-              )}
+          )}
-            </Space>
+        </Space>
-          )
+      )
-        }
+    }
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

client/src/pages/tech-lookup/tech-lookup.container.jsx

@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import RbacWrapperComponent from "../../components/rbac-wrapper/rbac-wrapper.component";
 import TechLookupJobsList from "../../components/tech-lookup-jobs-list/tech-lookup-jobs-list.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
 
 export default function TechLookupContainer() {
   const { t } = useTranslation();
@@ -20,6 +21,7 @@ export default function TechLookupContainer() {
   return (
     <div>
       <RbacWrapperComponent action="jobs:list-active">
+        <TechLookupJobsDrawer />
         <TechLookupJobsList />
       </RbacWrapperComponent>
     </div>

client/src/pages/tech/tech.page.component.jsx

@@ -9,7 +9,6 @@ import ErrorBoundary from "../../components/error-boundary/error-boundary.compon
 import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import TechHeader from "../../components/tech-header/tech-header.component";
-import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
 import TechSider from "../../components/tech-sider/tech-sider.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
@@ -68,7 +67,7 @@ export function TechPage({ technician }) {
       <Layout>
         <UpdateAlert />
         <TechHeader />
-        <TechLookupJobsDrawer />
+
         <TaskUpsertModalContainer />
         <Content className="tech-content-container">
           <ErrorBoundary>

hasura/metadata/cron_triggers.yaml

@@ -1,3 +1,19 @@
+- name: AutoHouse Data Pump
+  webhook: '{{HASURA_API_URL}}/data/ah'
+  schedule: 0 6 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+- name: Claimscorp Data Pump
+  webhook: '{{HASURA_API_URL}}/data/cc'
+  schedule: 30 6 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
 - name: Kaizen Data Pump
   webhook: '{{HASURA_API_URL}}/data/kaizen'
   schedule: 30 5 * * *

server/data/autohouse.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("autohouse-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_AUTOHOUSE_SHOPS);

server/data/claimscorp.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("claimscorp-start", "DEBUG", "api", null, null);
   const { bodyshops } = await client.request(queries.GET_CLAIMSCORP_SHOPS);

server/data/kaizen.js

@@ -31,6 +31,12 @@ const ftpSetup = {
 };
 
 exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+
   //Query for the List of Bodyshop Clients.
   logger.log("kaizen-start", "DEBUG", "api", null, null);
   const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];