IO-2892 Correct Cron Trigger

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

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

@@ -1,6 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Checkbox, Space, Table } from "antd";
+import dayjs from "../../utils/day";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,10 +10,10 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectAuthLevel, selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
-import dayjs from "../../utils/day";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
+import RbacWrapper, { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -52,10 +52,6 @@ export function TimeTicketList({
     splitKey: bodyshop.imexshopid
   });
 
-  const canEditCommittedTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:editcommitted" });
-  const canEditTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:edit" });
-  const canEditShiftTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:shiftedit" });
-
   const totals = useMemo(() => {
     if (timetickets)
       return timetickets.reduce(
@@ -69,18 +65,6 @@ export function TimeTicketList({
     return { productivehrs: 0, actualhrs: 0 };
   }, [timetickets]);
 
-  const isDisabled = (record) => {
-    if (disabled === true || !record.id) return true;
-
-    const isShiftTicket = !record.ciecacode;
-    const isCommitted = record.committed_at;
-    if (isShiftTicket) {
-      return !(canEditShiftTickets && (!isCommitted || canEditCommittedTimeTickets));
-    }
-    
-    return !(canEditTimeTickets && (!isCommitted || canEditCommittedTimeTickets));
-  };
-
   const columns = [
     ...(Enhanced_Payroll.treatment === "on"
       ? [
@@ -222,55 +206,76 @@ export function TimeTicketList({
                 return null;
               }
             }
-          }
+          },
+  
         ]),
-    {
-      title: t("timetickets.fields.created_by"),
-      dataIndex: "created_by",
-      key: "created_by",
-      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
-      sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
-      render: (text, record) => record.created_by
-    },
-    // {
-    //   title: "Pay",
-    //   dataIndex: "pay",
-    //   key: "pay",
-    //   render: (text, record) =>
-    //     Dinero({ amount: Math.round(record.rate * 100) })
-    //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
-    //       .toFormat("$0.00"),
-    // },
-    {
-      title: t("general.labels.actions"),
-      dataIndex: "actions",
-      key: "actions",
-      render: (text, record) => (
-        <Space wrap>
-          {techConsole && (
-            <TimeTicketEnterButton
-              actions={{ refetch }}
-              context={{ id: record.id, timeticket: record }}
-              disabled={!record.job || disabled}
-            >
-              <EditFilled />
-            </TimeTicketEnterButton>
-          )}
-          {!techConsole && (
-            <TimeTicketEnterButton
-              actions={{ refetch }}
-              context={{
-                id: record.id,
-                timeticket: record
-              }}
-              disabled={isDisabled(record)}
-            >
-              <EditFilled />
-            </TimeTicketEnterButton>
-          )}
-        </Space>
-      )
-    }
+        {
+          title: t("timetickets.fields.created_by"),
+          dataIndex: "created_by",
+          key: "created_by",
+          sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+          sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+          render: (text, record) => record.created_by
+        },
+        // {
+        //   title: "Pay",
+        //   dataIndex: "pay",
+        //   key: "pay",
+        //   render: (text, record) =>
+        //     Dinero({ amount: Math.round(record.rate * 100) })
+        //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+        //       .toFormat("$0.00"),
+        // },
+        {
+          title: t("general.labels.actions"),
+          dataIndex: "actions",
+          key: "actions",
+          render: (text, record) => (
+            <Space wrap>
+              {techConsole && (
+                <TimeTicketEnterButton
+                  actions={{ refetch }}
+                  context={{ id: record.id, timeticket: record }}
+                  disabled={!record.job || disabled}
+                >
+                  <EditFilled />
+                </TimeTicketEnterButton>
+              )}
+              {!techConsole && (
+                <RbacWrapper
+                  action="timetickets:edit"
+                  noauth={() => {
+                    return <div />;
+                  }}
+                >
+                  <TimeTicketEnterButton
+                    actions={{ refetch }}
+                    context={{
+                      id: record.id,
+                      timeticket: record
+                    }}
+                    disabled={
+                      HasRbacAccess({
+                        bodyshop,
+                        authLevel: authLevel,
+                        action: "timetickets:editcommitted"
+                      }) &&
+                      HasRbacAccess({
+                        bodyshop,
+                        authLevel: authLevel,
+                        action: "timetickets:shiftedit"
+                      })
+                        ? disabled
+                        : !record.jobid
+                    }
+                  >
+                    <EditFilled />
+                  </TimeTicketEnterButton>
+                </RbacWrapper>
+              )}
+            </Space>
+          )
+        }
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

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);