From 7badb09ba1355b330d64cc656154061d99019dcd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 24 Apr 2023 13:39:59 -0700 Subject: [PATCH 1/2] Timeticket Approval Queue schema updates for payroll updates. --- hasura/metadata/tables.yaml | 80 +++++++++---------- .../down.sql | 5 ++ .../up.sql | 1 + .../down.sql | 2 + .../up.sql | 1 + .../down.sql | 4 + .../up.sql | 2 + .../down.sql | 1 + .../up.sql | 5 ++ 9 files changed, 61 insertions(+), 40 deletions(-) create mode 100644 hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/down.sql create mode 100644 hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/up.sql create mode 100644 hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/down.sql create mode 100644 hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/up.sql create mode 100644 hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/down.sql create mode 100644 hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/up.sql create mode 100644 hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/down.sql create mode 100644 hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/up.sql diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 22d75a0e8..88ae01972 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -5231,14 +5231,9 @@ - name: job using: foreign_key_constraint_on: jobid - array_relationships: - - name: tt_approval_queues + - name: tt_approval_queue using: - foreign_key_constraint_on: - column: timeticketid - table: - name: tt_approval_queue - schema: public + foreign_key_constraint_on: ttapprovalqueueid insert_permissions: - role: user permission: @@ -5268,6 +5263,7 @@ - memo - productivehrs - rate + - ttapprovalqueueid - updated_at select_permissions: - role: user @@ -5289,6 +5285,7 @@ - memo - productivehrs - rate + - ttapprovalqueueid - updated_at filter: bodyshop: @@ -5319,6 +5316,7 @@ - memo - productivehrs - rate + - ttapprovalqueueid - updated_at filter: bodyshop: @@ -5442,12 +5440,17 @@ - name: job using: foreign_key_constraint_on: jobid - - name: timeticket - using: - foreign_key_constraint_on: timeticketid - name: user using: foreign_key_constraint_on: approved_by + array_relationships: + - name: timetickets + using: + foreign_key_constraint_on: + column: ttapprovalqueueid + table: + name: timetickets + schema: public insert_permissions: - role: user permission: @@ -5461,44 +5464,42 @@ authid: _eq: X-Hasura-User-Id columns: - - id - - created_at - - updated_at - - bodyshopid - - jobid - - employeeid - - timeticketid - - approved_by - - approved_at - actualhrs - - productivehrs - - rate - - flat_rate + - approved_at + - approved_by + - bodyshopid - ciecacode - cost_center + - created_at - date + - employeeid + - flat_rate + - id + - jobid - memo + - productivehrs + - rate + - updated_at select_permissions: - role: user permission: columns: - - flat_rate - - date - actualhrs - - productivehrs - - rate + - approved_at - approved_by + - bodyshopid - ciecacode - cost_center - - memo - - approved_at - created_at - - updated_at - - bodyshopid + - date - employeeid + - flat_rate - id - jobid - - timeticketid + - memo + - productivehrs + - rate + - updated_at filter: bodyshop: associations: @@ -5513,23 +5514,22 @@ - role: user permission: columns: - - flat_rate - - date - actualhrs - - productivehrs - - rate + - approved_at - approved_by + - bodyshopid - ciecacode - cost_center - - memo - - approved_at - created_at - - updated_at - - bodyshopid + - date - employeeid + - flat_rate - id - jobid - - timeticketid + - memo + - productivehrs + - rate + - updated_at filter: bodyshop: associations: diff --git a/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/down.sql b/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/down.sql new file mode 100644 index 000000000..a2dbe0ff4 --- /dev/null +++ b/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/down.sql @@ -0,0 +1,5 @@ +alter table "public"."tt_approval_queue" + add constraint "tt_approval_queue_timeticketid_fkey" + foreign key ("timeticketid") + references "public"."timetickets" + ("id") on update cascade on delete cascade; diff --git a/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/up.sql b/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/up.sql new file mode 100644 index 000000000..ddf34694b --- /dev/null +++ b/hasura/migrations/1682368676356_delete_fk_public_tt_approval_queue_tt_approval_queue_timeticketid_fkey/up.sql @@ -0,0 +1 @@ +alter table "public"."tt_approval_queue" drop constraint "tt_approval_queue_timeticketid_fkey"; diff --git a/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/down.sql b/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/down.sql new file mode 100644 index 000000000..ddc0ccf6a --- /dev/null +++ b/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/down.sql @@ -0,0 +1,2 @@ +alter table "public"."tt_approval_queue" alter column "timeticketid" drop not null; +alter table "public"."tt_approval_queue" add column "timeticketid" uuid; diff --git a/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/up.sql b/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/up.sql new file mode 100644 index 000000000..a4f1fb404 --- /dev/null +++ b/hasura/migrations/1682368690845_alter_table_public_tt_approval_queue_drop_column_timeticketid/up.sql @@ -0,0 +1 @@ +alter table "public"."tt_approval_queue" drop column "timeticketid" cascade; diff --git a/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/down.sql b/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/down.sql new file mode 100644 index 000000000..7d798cd10 --- /dev/null +++ b/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/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"."timetickets" add column "ttapprovalqueueid" uuid +-- null; diff --git a/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/up.sql b/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/up.sql new file mode 100644 index 000000000..6abe210fb --- /dev/null +++ b/hasura/migrations/1682368713148_alter_table_public_timetickets_add_column_ttapprovalqueueid/up.sql @@ -0,0 +1,2 @@ +alter table "public"."timetickets" add column "ttapprovalqueueid" uuid + null; diff --git a/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/down.sql b/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/down.sql new file mode 100644 index 000000000..f82be7184 --- /dev/null +++ b/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/down.sql @@ -0,0 +1 @@ +alter table "public"."timetickets" drop constraint "timetickets_ttapprovalqueueid_fkey"; diff --git a/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/up.sql b/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/up.sql new file mode 100644 index 000000000..66d66161e --- /dev/null +++ b/hasura/migrations/1682368739851_set_fk_public_timetickets_ttapprovalqueueid/up.sql @@ -0,0 +1,5 @@ +alter table "public"."timetickets" + add constraint "timetickets_ttapprovalqueueid_fkey" + foreign key ("ttapprovalqueueid") + references "public"."tt_approval_queue" + ("id") on update cascade on delete set null; From 57b27f73c37711b99b2b558c288100857c73fefd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 24 Apr 2023 14:45:08 -0700 Subject: [PATCH 2/2] Added a search filter for greater than 3 characters. --- .../global-search/global-search.component.jsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx index 3b4b0f62c..a80e04954 100644 --- a/client/src/components/global-search/global-search.component.jsx +++ b/client/src/components/global-search/global-search.component.jsx @@ -8,7 +8,7 @@ import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import AlertComponent from "../alert/alert.component"; import OwnerNameDisplay, { - OwnerNameDisplayFunction + OwnerNameDisplayFunction, } from "../owner-name-display/owner-name-display.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; export default function GlobalSearch() { @@ -18,11 +18,18 @@ export default function GlobalSearch() { useLazyQuery(GLOBAL_SEARCH_QUERY); const executeSearch = (v) => { - if (v && v.variables.search && v.variables.search !== "") callSearch(v); + if ( + v && + v.variables.search && + v.variables.search !== "" && + v.variables.search.length >= 3 + ) + callSearch(v); }; const debouncedExecuteSearch = _.debounce(executeSearch, 750); const handleSearch = (value) => { + console.log("Handle Search"); debouncedExecuteSearch({ variables: { search: value } }); }; @@ -177,6 +184,7 @@ export default function GlobalSearch() { { history.push(opt.label.props.to);