From fa7e0a107b1be3c8350cf7c0bde591bd399ae95c Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Fri, 17 Jan 2025 10:13:41 -0800
Subject: [PATCH] hotfix/AdditionalProductFruitsIds - Add additional IDs for
 product fruits

---
 .../job-detail-lines/job-lines.component.jsx  |   4 +-
 .../owner-find-modal.container.jsx            |   6 +-
 hasura/migrations/1620771761757_Init/up.sql   | 130 +++++++++---------
 .../1620771761757_Init/up.sql                 | 130 +++++++++---------
 4 files changed, 138 insertions(+), 132 deletions(-)

diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index a774bac6b..455caefd6 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -519,6 +519,7 @@ export function JobLinesComponent({
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
             <Button
+              id="job-lines-order-parts-button"
               disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
               onClick={() => {
                 setPartsOrderContext({
@@ -541,6 +542,7 @@ export function JobLinesComponent({
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
             <Button
+              id="job-lines-filter-parts-only-button"
               onClick={() => {
                 setState((state) => ({
                   ...state,
@@ -554,7 +556,7 @@ export function JobLinesComponent({
               <FilterFilled /> {t("jobs.actions.filterpartsonly")}
             </Button>
             <Dropdown menu={markMenu} trigger={["click"]}>
-              <Button>{t("jobs.actions.mark")}</Button>
+              <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
             <Button
               disabled={jobRO || technician}
diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index 67451f10d..b208e6058 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -38,7 +38,11 @@ export default function OwnerFindModalContainer({
   }, [callSearchowners, modalProps.open, owner]);
 
   return (
-    <Modal title={t("owners.labels.existing_owners")} width={"80%"} {...modalProps}>
+    <Modal
+      title={<span id="owner-find-modal-title">{t("owners.labels.existing_owners")}</span>}
+      width={"80%"}
+      {...modalProps}
+    >
       {loading ? <LoadingSpinner /> : null}
       {error ? <AlertComponent message={error.message} type="error" /> : null}
       {owner ? (
diff --git a/hasura/migrations/1620771761757_Init/up.sql b/hasura/migrations/1620771761757_Init/up.sql
index 3b608100b..0bdef8e89 100644
--- a/hasura/migrations/1620771761757_Init/up.sql
+++ b/hasura/migrations/1620771761757_Init/up.sql
@@ -39,50 +39,50 @@ END;
 $$;
 CREATE FUNCTION public.assign_ro_number() RETURNS trigger
     LANGUAGE plpgsql
-    AS $$
-      begin
-        IF NEW.converted = true and (new.ro_number is null or new.ro_number = '') THEN
-           UPDATE counters
-	SET count = count + 1 where shopid=new.shopid AND countertype = 'ronum'
-	RETURNING concat(prefix,count) into new.ro_number;
-        END IF;
-        RETURN NEW;
-      END;
+    AS $$
+      begin
+        IF NEW.converted = true and (new.ro_number is null or new.ro_number = '') THEN
+           UPDATE counters
+	SET count = count + 1 where shopid=new.shopid AND countertype = 'ronum'
+	RETURNING concat(prefix,count) into new.ro_number;
+        END IF;
+        RETURN NEW;
+      END;
   $$;
 CREATE FUNCTION public.audit_trigger() RETURNS trigger
     LANGUAGE plpgsql SECURITY DEFINER
-    AS $$
- DECLARE
- shopid uuid ;
- email text;
-        BEGIN
- select b.id, u.email INTO shopid, email from users u join associations a on u.email = a.useremail join bodyshops b on b.id = a.shopid where u.authid = current_setting('hasura.user', 't')::jsonb->>'x-hasura-user-id' and a.active = true;
-                IF      TG_OP = 'INSERT'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, new_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(NEW), NEW.id, shopid, email);
-                        RETURN NEW;
-                ELSIF   TG_OP = 'UPDATE'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, new_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP,
-                                      json_diff(to_jsonb(OLD), to_jsonb(NEW))   ,  json_diff(to_jsonb(NEW), to_jsonb(OLD)), OLD.id,  shopid, email);
-                        RETURN NEW;
-                ELSIF   TG_OP = 'DELETE'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(OLD), OLD.ID,  shopid, email);
-                        RETURN OLD;
-                END IF;
-        END;
+    AS $$
+ DECLARE
+ shopid uuid ;
+ email text;
+        BEGIN
+ select b.id, u.email INTO shopid, email from users u join associations a on u.email = a.useremail join bodyshops b on b.id = a.shopid where u.authid = current_setting('hasura.user', 't')::jsonb->>'x-hasura-user-id' and a.active = true;
+                IF      TG_OP = 'INSERT'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, new_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(NEW), NEW.id, shopid, email);
+                        RETURN NEW;
+                ELSIF   TG_OP = 'UPDATE'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, new_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP,
+                                      json_diff(to_jsonb(OLD), to_jsonb(NEW))   ,  json_diff(to_jsonb(NEW), to_jsonb(OLD)), OLD.id,  shopid, email);
+                        RETURN NEW;
+                ELSIF   TG_OP = 'DELETE'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(OLD), OLD.ID,  shopid, email);
+                        RETURN OLD;
+                END IF;
+        END;
 $$;
 CREATE FUNCTION public.json_diff(l jsonb, r jsonb) RETURNS jsonb
     LANGUAGE sql
-    AS $$
-    SELECT jsonb_object_agg(a.key, a.value) FROM
-        ( SELECT key, value FROM jsonb_each(l) ) a LEFT OUTER JOIN
-        ( SELECT key, value FROM jsonb_each(r) ) b ON a.key = b.key
-    WHERE a.value != b.value OR b.key IS NULL;
+    AS $$
+    SELECT jsonb_object_agg(a.key, a.value) FROM
+        ( SELECT key, value FROM jsonb_each(l) ) a LEFT OUTER JOIN
+        ( SELECT key, value FROM jsonb_each(r) ) b ON a.key = b.key
+    WHERE a.value != b.value OR b.key IS NULL;
 $$;
 CREATE TABLE public.bills (
     id uuid DEFAULT public.gen_random_uuid() NOT NULL,
@@ -211,33 +211,33 @@ CREATE TABLE public.exportlog (
 );
 CREATE FUNCTION public.search_exportlog(search text) RETURNS SETOF public.exportlog
     LANGUAGE plpgsql STABLE
-    AS $$ BEGIN IF search = '' THEN RETURN query
-SELECT
-  *
-FROM
-  exportlog e;
-  ELSE RETURN query
-SELECT
-  e.*
-FROM
-  exportlog e
-  LEFT JOIN jobs j on j.id = e.jobid
-LEFT JOIN payments p 
-    ON p.id = e.paymentid
-LEFT JOIN bills b
-    ON e.billid = b.id
-WHERE
-  (
-    j.ro_number ILIKE '%' || search || '%'
-    OR b.invoice_number ILIKE '%' || search || '%'
-    OR p.paymentnum ILIKE '%' || search || '%'
-    OR e.useremail ILIKE '%' || search || '%'
-  )
-  AND (e.jobid = j.id
-  or e.paymentid = p.id
- or e.billid = b.id)
-;
-END IF;
+    AS $$ BEGIN IF search = '' THEN RETURN query
+SELECT
+  *
+FROM
+  exportlog e;
+  ELSE RETURN query
+SELECT
+  e.*
+FROM
+  exportlog e
+  LEFT JOIN jobs j on j.id = e.jobid
+LEFT JOIN payments p 
+    ON p.id = e.paymentid
+LEFT JOIN bills b
+    ON e.billid = b.id
+WHERE
+  (
+    j.ro_number ILIKE '%' || search || '%'
+    OR b.invoice_number ILIKE '%' || search || '%'
+    OR p.paymentnum ILIKE '%' || search || '%'
+    OR e.useremail ILIKE '%' || search || '%'
+  )
+  AND (e.jobid = j.id
+  or e.paymentid = p.id
+ or e.billid = b.id)
+;
+END IF;
 END $$;
 CREATE TABLE public.jobs (
     id uuid DEFAULT public.gen_random_uuid() NOT NULL,
diff --git a/hasura/migrations_backup/1620771761757_Init/up.sql b/hasura/migrations_backup/1620771761757_Init/up.sql
index 3b608100b..0bdef8e89 100644
--- a/hasura/migrations_backup/1620771761757_Init/up.sql
+++ b/hasura/migrations_backup/1620771761757_Init/up.sql
@@ -39,50 +39,50 @@ END;
 $$;
 CREATE FUNCTION public.assign_ro_number() RETURNS trigger
     LANGUAGE plpgsql
-    AS $$
-      begin
-        IF NEW.converted = true and (new.ro_number is null or new.ro_number = '') THEN
-           UPDATE counters
-	SET count = count + 1 where shopid=new.shopid AND countertype = 'ronum'
-	RETURNING concat(prefix,count) into new.ro_number;
-        END IF;
-        RETURN NEW;
-      END;
+    AS $$
+      begin
+        IF NEW.converted = true and (new.ro_number is null or new.ro_number = '') THEN
+           UPDATE counters
+	SET count = count + 1 where shopid=new.shopid AND countertype = 'ronum'
+	RETURNING concat(prefix,count) into new.ro_number;
+        END IF;
+        RETURN NEW;
+      END;
   $$;
 CREATE FUNCTION public.audit_trigger() RETURNS trigger
     LANGUAGE plpgsql SECURITY DEFINER
-    AS $$
- DECLARE
- shopid uuid ;
- email text;
-        BEGIN
- select b.id, u.email INTO shopid, email from users u join associations a on u.email = a.useremail join bodyshops b on b.id = a.shopid where u.authid = current_setting('hasura.user', 't')::jsonb->>'x-hasura-user-id' and a.active = true;
-                IF      TG_OP = 'INSERT'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, new_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(NEW), NEW.id, shopid, email);
-                        RETURN NEW;
-                ELSIF   TG_OP = 'UPDATE'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, new_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP,
-                                      json_diff(to_jsonb(OLD), to_jsonb(NEW))   ,  json_diff(to_jsonb(NEW), to_jsonb(OLD)), OLD.id,  shopid, email);
-                        RETURN NEW;
-                ELSIF   TG_OP = 'DELETE'
-                THEN
-                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, recordid, bodyshopid, useremail)
-                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(OLD), OLD.ID,  shopid, email);
-                        RETURN OLD;
-                END IF;
-        END;
+    AS $$
+ DECLARE
+ shopid uuid ;
+ email text;
+        BEGIN
+ select b.id, u.email INTO shopid, email from users u join associations a on u.email = a.useremail join bodyshops b on b.id = a.shopid where u.authid = current_setting('hasura.user', 't')::jsonb->>'x-hasura-user-id' and a.active = true;
+                IF      TG_OP = 'INSERT'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, new_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(NEW), NEW.id, shopid, email);
+                        RETURN NEW;
+                ELSIF   TG_OP = 'UPDATE'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, new_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP,
+                                      json_diff(to_jsonb(OLD), to_jsonb(NEW))   ,  json_diff(to_jsonb(NEW), to_jsonb(OLD)), OLD.id,  shopid, email);
+                        RETURN NEW;
+                ELSIF   TG_OP = 'DELETE'
+                THEN
+                        INSERT INTO public.audit_trail (tabname, schemaname, operation, old_val, recordid, bodyshopid, useremail)
+                                VALUES (TG_RELNAME, TG_TABLE_SCHEMA, TG_OP, row_to_json(OLD), OLD.ID,  shopid, email);
+                        RETURN OLD;
+                END IF;
+        END;
 $$;
 CREATE FUNCTION public.json_diff(l jsonb, r jsonb) RETURNS jsonb
     LANGUAGE sql
-    AS $$
-    SELECT jsonb_object_agg(a.key, a.value) FROM
-        ( SELECT key, value FROM jsonb_each(l) ) a LEFT OUTER JOIN
-        ( SELECT key, value FROM jsonb_each(r) ) b ON a.key = b.key
-    WHERE a.value != b.value OR b.key IS NULL;
+    AS $$
+    SELECT jsonb_object_agg(a.key, a.value) FROM
+        ( SELECT key, value FROM jsonb_each(l) ) a LEFT OUTER JOIN
+        ( SELECT key, value FROM jsonb_each(r) ) b ON a.key = b.key
+    WHERE a.value != b.value OR b.key IS NULL;
 $$;
 CREATE TABLE public.bills (
     id uuid DEFAULT public.gen_random_uuid() NOT NULL,
@@ -211,33 +211,33 @@ CREATE TABLE public.exportlog (
 );
 CREATE FUNCTION public.search_exportlog(search text) RETURNS SETOF public.exportlog
     LANGUAGE plpgsql STABLE
-    AS $$ BEGIN IF search = '' THEN RETURN query
-SELECT
-  *
-FROM
-  exportlog e;
-  ELSE RETURN query
-SELECT
-  e.*
-FROM
-  exportlog e
-  LEFT JOIN jobs j on j.id = e.jobid
-LEFT JOIN payments p 
-    ON p.id = e.paymentid
-LEFT JOIN bills b
-    ON e.billid = b.id
-WHERE
-  (
-    j.ro_number ILIKE '%' || search || '%'
-    OR b.invoice_number ILIKE '%' || search || '%'
-    OR p.paymentnum ILIKE '%' || search || '%'
-    OR e.useremail ILIKE '%' || search || '%'
-  )
-  AND (e.jobid = j.id
-  or e.paymentid = p.id
- or e.billid = b.id)
-;
-END IF;
+    AS $$ BEGIN IF search = '' THEN RETURN query
+SELECT
+  *
+FROM
+  exportlog e;
+  ELSE RETURN query
+SELECT
+  e.*
+FROM
+  exportlog e
+  LEFT JOIN jobs j on j.id = e.jobid
+LEFT JOIN payments p 
+    ON p.id = e.paymentid
+LEFT JOIN bills b
+    ON e.billid = b.id
+WHERE
+  (
+    j.ro_number ILIKE '%' || search || '%'
+    OR b.invoice_number ILIKE '%' || search || '%'
+    OR p.paymentnum ILIKE '%' || search || '%'
+    OR e.useremail ILIKE '%' || search || '%'
+  )
+  AND (e.jobid = j.id
+  or e.paymentid = p.id
+ or e.billid = b.id)
+;
+END IF;
 END $$;
 CREATE TABLE public.jobs (
     id uuid DEFAULT public.gen_random_uuid() NOT NULL,