Add index to audit trail.

client/src/firebase/firebase.utils.js

@@ -4,6 +4,8 @@ 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);
@@ -86,6 +88,18 @@ 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;",

client/src/translations/en_us/common.json

@@ -2417,7 +2417,6 @@
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
 				"job_costing_ro": "Job Costing",
-				"job_lifecycle_ro": "Job Lifecycle",
 				"job_notes": "Job Notes",
 				"key_tag": "Key Tag",
 				"labels": {
@@ -2676,8 +2675,6 @@
 				"job_costing_ro_date_summary": "Job Costing by RO - Summary",
 				"job_costing_ro_estimator": "Job Costing by Estimator",
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
-				"job_lifecycle_date_detail": "Job Lifecycle by Date - Detail",
-				"job_lifecycle_date_summary": "Job Lifecycle by Date - Summary",
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",

client/src/translations/es/common.json

@@ -2417,7 +2417,6 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
-				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2676,8 +2675,6 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
-				"job_lifecycle_date_detail": "",
-				"job_lifecycle_date_summary": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",

client/src/translations/fr/common.json

@@ -2417,7 +2417,6 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
-				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {
@@ -2676,8 +2675,6 @@
 				"job_costing_ro_date_summary": "",
 				"job_costing_ro_estimator": "",
 				"job_costing_ro_ins_co": "",
-				"job_lifecycle_date_detail": "",
-				"job_lifecycle_date_summary": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
 				"jobs_reconcile": "",

client/src/utils/TemplateConstants.js

@@ -514,14 +514,6 @@ export const TemplateList = (type, context) => {
             group: "financial",
             dms: true,
           },
-          job_lifecycle_ro: {
-            title: i18n.t("printcenter.jobs.job_lifecycle_ro"),
-            description: "",
-            subject: i18n.t("printcenter.jobs.job_lifecycle_ro"),
-            key: "job_lifecycle_ro",
-            disabled: false,
-            group: "post",
-          },
         }
       : {}),
     ...(!type || type === "job_special"
@@ -2056,30 +2048,6 @@ export const TemplateList = (type, context) => {
             datedisable: true,
             group: "customers",
           },
-          job_lifecycle_date_detail: {
-            title: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
-            subject: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
-            key: "job_lifecycle_date_detail",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-            group: "jobs",
-          },
-          job_lifecycle_date_summary: {
-            title: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
-            subject: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
-            key: "job_lifecycle_date_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-            group: "jobs",
-          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/metadata/tables.yaml

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

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql

@@ -0,0 +1,4 @@
+-- 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

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

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql

@@ -0,0 +1,4 @@
+-- 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

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

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql

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

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql

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

hasura/migrations/1710520583458_alter_table_public_ioevents_add_column_env/down.sql

@@ -0,0 +1,4 @@
+-- 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

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

hasura/migrations/1710520629475_create_index_ioevents_useremail/down.sql

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

hasura/migrations/1710520629475_create_index_ioevents_useremail/up.sql

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

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/down.sql

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

hasura/migrations/1710520654372_set_fk_public_ioevents_useremail/up.sql

@@ -0,0 +1,5 @@
+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

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

hasura/migrations/1710520693899_set_fk_public_ioevents_bodyshopid/up.sql

@@ -0,0 +1,5 @@
+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

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

hasura/migrations/1710523428339_create_index_idx_audit_trail_type/up.sql

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

server/ioevent/ioevent.js

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