IO-2669 Next Contact Formating

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

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,7 +1,6 @@
 import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
 import { Checkbox, Space, Tooltip } from "antd";
 import i18n from "i18next";
-import moment from "moment";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
@@ -190,17 +189,12 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         state.sortedInfo.columnKey === "date_next_contact" &&
         state.sortedInfo.order,
       render: (text, record) => (
-        <span
-          style={{
-            color:
-              record.date_next_contact &&
-              moment(record.date_next_contact).isBefore(moment())
-                ? "red"
-                : "",
-          }}
-        >
-          <ProductionListDate record={record} field="date_next_contact" time />
-        </span>
+        <ProductionListDate
+          record={record}
+          field="date_next_contact"
+          pastIndicator
+          time
+        />
       ),
     },
     {

client/src/firebase/firebase.utils.js

@@ -4,8 +4,6 @@ import { getAuth, updatePassword, updateProfile } from "firebase/auth";
 import { getFirestore } from "firebase/firestore";
 import { getMessaging, getToken, onMessage } from "firebase/messaging";
 import { store } from "../redux/store";
-import axios from "axios";
-import { checkBeta } from "../utils/handleBeta";
 
 const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -88,18 +86,6 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
       null,
     ...additionalParams,
   };
-  axios.post("/ioevent", {
-    useremail:
-      (state.user && state.user.currentUser && state.user.currentUser.email) ||
-      null,
-    bodyshopid:
-      (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
-    operationName: eventName,
-    variables: additionalParams,
-    dbevent: false,
-    env: checkBeta() ? "beta" : "master",
-  });
-
   // console.log(
   //   "%c[Analytics]",
   //   "background-color: green ;font-weight:bold;",

hasura/metadata/tables.yaml

@@ -4200,7 +4200,7 @@
         interval_sec: 10
         num_retries: 0
         timeout_sec: 60
-      webhook: https://worktest.home.irony.online
+      webhook_from_env: HASURA_API_URL
       headers:
         - name: event-secret
           value_from_env: EVENT_SECRET

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."ioevents" add column "useremail" text
---  not null;

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" add column "useremail" text;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."ioevents" add column "bodyshopid" uuid
---  null;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."ioevents" add column "bodyshopid" uuid
- null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" alter column "useremail" set not null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" alter column "useremail" drop not null;

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."ioevents" add column "env" text
---  null;

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."ioevents" add column "env" text
- null;

hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."ioevents_useremail";

hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "ioevents_useremail" on
-  "public"."ioevents" using btree ("useremail");

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" drop constraint "ioevents_useremail_fkey";

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql

@@ -1,5 +0,0 @@
-alter table "public"."ioevents"
-  add constraint "ioevents_useremail_fkey"
-  foreign key ("useremail")
-  references "public"."users"
-  ("email") on update set null on delete set null;

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/down.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" drop constraint "ioevents_bodyshopid_fkey";

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql

@@ -1,5 +0,0 @@
-alter table "public"."ioevents"
-  add constraint "ioevents_bodyshopid_fkey"
-  foreign key ("bodyshopid")
-  references "public"."bodyshops"
-  ("id") on update set null on delete set null;

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_audit_trail_type";

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/up.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_audit_trail_type" on
-  "public"."audit_trail" using btree ("type");

server/ioevent/ioevent.js

@@ -11,40 +11,27 @@ require("dotenv").config({
 });
 
 exports.default = async (req, res) => {
-  const {
-    useremail,
-    bodyshopid,
-    operationName,
-    variables,
-    env,
-    time,
-    dbevent,
-    user,
-  } = req.body;
+  const { operationName, time, dbevent, user, imexshopid } = req.body;
 
   try {
-    await client.request(queries.INSERT_IOEVENT, {
-      event: {
-        operationname: operationName,
-        time,
-        dbevent,
-        env,
-        variables,
-        bodyshopid,
-        useremail,
-      },
-    });
-    res.sendStatus(200);
-  } catch (error) {
-    logger.log("ioevent-error", "trace", user, null, {
-      operationname: operationName,
+    // await client.request(queries.INSERT_IOEVENT, {
+    //   event: {
+    //     operationname: operationName,
+    //     time,
+    //     dbevent,
+    //   },
+    // });
+    console.log("IOEVENT", operationName, time, dbevent, user, imexshopid);
+    logger.log("ioevent", "trace", user, null, {
+      imexshopid,
+      operationName,
       time,
       dbevent,
-      env,
-      variables,
-      bodyshopid,
-      useremail,
     });
+
     res.sendStatus(200);
+  } catch (error) {
+    console.log("error", error);
+    res.status(400).send(error);
   }
 };