From 6d8463265cb76eebab12b1801e5aaa6714237f8a Mon Sep 17 00:00:00 2001 From: swtmply Date: Tue, 6 Jun 2023 02:07:30 +0800 Subject: [PATCH 01/25] IO-2317 Messaging screen on mobile --- .../chat-conversation-title.component.jsx | 23 +++++++++++++++++-- .../chat-popup/chat-popup.component.jsx | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx index 1503bf46f..9fb9776a3 100644 --- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx +++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx @@ -1,14 +1,31 @@ -import { Space } from "antd"; +import { Space, Button, Col } from "antd"; import React from "react"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component"; import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component"; import ChatLabelComponent from "../chat-label/chat-label.component"; import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container"; +import { connect } from "react-redux"; +import { setSelectedConversation } from "../../redux/messaging/messaging.actions"; +import { LeftOutlined } from "@ant-design/icons"; -export default function ChatConversationTitle({ conversation }) { +const mapDispatchToProps = (dispatch) => ({ + setSelectedConversation: (conversationId) => + dispatch(setSelectedConversation(conversationId)), +}); + +function ChatConversationTitle({ conversation, setSelectedConversation }) { return ( + + + {conversation && conversation.phone_num} @@ -23,3 +40,5 @@ export default function ChatConversationTitle({ conversation }) { ); } + +export default connect(null, mapDispatchToProps)(ChatConversationTitle); diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx index 1c80d7c4c..45b2a332f 100644 --- a/client/src/components/chat-popup/chat-popup.component.jsx +++ b/client/src/components/chat-popup/chat-popup.component.jsx @@ -112,7 +112,7 @@ export function ChatPopupComponent({ /> - + {loading ? ( ) : ( From 6d5dbf3145d3e4b12087ad1aaf7f2c79a4ab8e9f Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 5 Jun 2023 17:13:31 -0700 Subject: [PATCH 02/25] IO-2281 Hover Row Color --- client/src/App/App.styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss index b57e94677..ddf87ac42 100644 --- a/client/src/App/App.styles.scss +++ b/client/src/App/App.styles.scss @@ -145,7 +145,7 @@ //Update row highlighting on production board. .ant-table-tbody > tr.ant-table-row:hover > td { - background: #eaeaea !important; + background: #e7f3ff !important; } .job-line-manual { From 5a3ddfad0fb23b9b10c08f098848b8d160046faf Mon Sep 17 00:00:00 2001 From: swtmply Date: Tue, 6 Jun 2023 22:20:22 +0800 Subject: [PATCH 03/25] IO-2280 fixed query params in shop config --- client/src/components/header/header.component.jsx | 4 +++- client/src/components/shop-info/shop-info.component.jsx | 4 +++- client/src/pages/shop/shop.page.component.jsx | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index 1ed3f526d..f0edf82d2 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -311,7 +311,9 @@ function Header({ icon={} > }> - {t("menus.header.shop_config")} + + {t("menus.header.shop_config")} + }> {t("menus.header.dashboard")} diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx index efabb6d5b..8803500ef 100644 --- a/client/src/components/shop-info/shop-info.component.jsx +++ b/client/src/components/shop-info/shop-info.component.jsx @@ -52,7 +52,9 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) { - history.push({ search: `?tab=${search.tab}&subtab=${key}` }) + history.push({ + search: `?tab=${search.tab}&subtab=${key}`, + }) } > diff --git a/client/src/pages/shop/shop.page.component.jsx b/client/src/pages/shop/shop.page.component.jsx index 47107be43..de6b267d5 100644 --- a/client/src/pages/shop/shop.page.component.jsx +++ b/client/src/pages/shop/shop.page.component.jsx @@ -40,6 +40,10 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) { ]); }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]); + useEffect(() => { + if (!search.tab) history.push({ search: "?tab=info" }); + }, [history, search]); + return ( Date: Tue, 6 Jun 2023 22:39:39 +0800 Subject: [PATCH 04/25] IO-2311 fixed tile height --- .../chat-conversation-list.component.jsx | 97 +++++++++++-------- 1 file changed, 59 insertions(+), 38 deletions(-) diff --git a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx index ffc087ae2..e9afdc83d 100644 --- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx +++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx @@ -7,7 +7,12 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele import { TimeAgoFormatter } from "../../utils/DateFormatter"; import PhoneFormatter from "../../utils/PhoneFormatter"; import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; -import { List as VirtualizedList, AutoSizer } from "react-virtualized"; +import { + List as VirtualizedList, + AutoSizer, + CellMeasurerCache, + CellMeasurer, +} from "react-virtualized"; import "./chat-conversation-list.styles.scss"; @@ -33,48 +38,64 @@ function ChatConversationListComponent({ [] ); - const rowRenderer = ({ index, key, style }) => { + const cache = new CellMeasurerCache({ + fixedWidth: true, + defaultHeight: 60, + }); + + const rowRenderer = ({ index, key, style, parent }) => { const item = conversationList[index]; return ( - setSelectedConversation(item.id)} - className={`chat-list-item ${ - item.id === selectedConversation - ? "chat-list-selected-conversation" - : null - }`} - style={style} + cache={cache} + parent={parent} + columnIndex={0} + rowIndex={index} > -
- {item.label &&
{item.label}
} - {item.job_conversations.length > 0 ? ( -
- {item.job_conversations.map((j, idx) => ( -
- -
- ))} -
- ) : ( - {item.phone_num} - )} -
-
-
- {item.job_conversations.length > 0 - ? item.job_conversations.map((j, idx) => ( - - {j.job.ro_number} - - )) - : null} + setSelectedConversation(item.id)} + className={`chat-list-item ${ + item.id === selectedConversation + ? "chat-list-selected-conversation" + : null + }`} + style={style} + > +
+ {item.label &&
{item.label}
} + {item.job_conversations.length > 0 ? ( +
+ {item.job_conversations.map((j, idx) => ( +
+ +
+ ))} +
+ ) : ( + {item.phone_num} + )}
- {item.updated_at} -
- - +
+
+ {item.job_conversations.length > 0 + ? item.job_conversations.map((j, idx) => ( + + {j.job.ro_number} + + )) + : null} +
+ {item.updated_at} +
+ + + ); }; @@ -86,7 +107,7 @@ function ChatConversationListComponent({ height={height} width={width} rowCount={conversationList.length} - rowHeight={60} + rowHeight={cache.rowHeight} rowRenderer={rowRenderer} onScroll={({ scrollTop, scrollHeight, clientHeight }) => { if (scrollTop + clientHeight === scrollHeight) { From 33af544deda0c1ccc84e8d62813fe4afc00fbf91 Mon Sep 17 00:00:00 2001 From: swtmply Date: Tue, 6 Jun 2023 22:47:20 +0800 Subject: [PATCH 05/25] IO-2322 added search function to insurance dropdown --- .../jobs-convert-button/jobs-convert-button.component.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index b48deb3b5..6e469cb57 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -108,7 +108,12 @@ export function JobsConvertButton({ }, ]} > - { + return option.value.toLowerCase().includes(input.toLowerCase()); + }} + > {bodyshop.md_ins_cos.map((s, i) => ( {s.name} From 371e148e0909b881565b5b99484261e67dc8a020 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:18:44 -0700 Subject: [PATCH 06/25] IO-2278 Track parts dispatch relationships. --- hasura/metadata/tables.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index b86dd17fb..4b1d4d27a 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -2690,6 +2690,13 @@ table: name: inventory schema: public + - name: parts_dispatch_lines + using: + foreign_key_constraint_on: + column: joblineid + table: + name: parts_dispatch_lines + schema: public - name: parts_order_lines using: foreign_key_constraint_on: @@ -3131,6 +3138,13 @@ table: name: notes schema: public + - name: parts_dispatches + using: + foreign_key_constraint_on: + column: jobid + table: + name: parts_dispatch + schema: public - name: parts_orders using: foreign_key_constraint_on: @@ -4556,6 +4570,20 @@ template_engine: Kriti url: '{{$base_url}}/opensearch' version: 2 +- table: + name: parts_dispatch + schema: public + object_relationships: + - name: job + using: + foreign_key_constraint_on: jobid +- table: + name: parts_dispatch_lines + schema: public + object_relationships: + - name: jobline + using: + foreign_key_constraint_on: joblineid - table: name: parts_order_lines schema: public From 1f9c4e92f1f1a41d93b0a503e33f3564834e5849 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:21:40 -0700 Subject: [PATCH 07/25] IO-2278 Add parts dispatch relationship. --- .../down.sql | 1 + .../up.sql | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/down.sql create mode 100644 hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/up.sql diff --git a/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/down.sql b/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/down.sql new file mode 100644 index 000000000..ce1f733b9 --- /dev/null +++ b/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/down.sql @@ -0,0 +1 @@ +alter table "public"."parts_dispatch_lines" drop constraint "parts_dispatch_lines_partsdispatchid_fkey"; diff --git a/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/up.sql b/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/up.sql new file mode 100644 index 000000000..b0503febb --- /dev/null +++ b/hasura/migrations/1686082869359_set_fk_public_parts_dispatch_lines_partsdispatchid/up.sql @@ -0,0 +1,5 @@ +alter table "public"."parts_dispatch_lines" + add constraint "parts_dispatch_lines_partsdispatchid_fkey" + foreign key ("partsdispatchid") + references "public"."parts_dispatch" + ("id") on update cascade on delete cascade; From c4c11528b936e827953e70e6e0030a568bfc94c3 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:22:51 -0700 Subject: [PATCH 08/25] IO-2278 Add relationship tracking to parts dispatch. --- hasura/metadata/tables.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 4b1d4d27a..9aa3b196e 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -4577,6 +4577,14 @@ - name: job using: foreign_key_constraint_on: jobid + array_relationships: + - name: parts_dispatch_lines + using: + foreign_key_constraint_on: + column: partsdispatchid + table: + name: parts_dispatch_lines + schema: public - table: name: parts_dispatch_lines schema: public @@ -4584,6 +4592,9 @@ - name: jobline using: foreign_key_constraint_on: joblineid + - name: parts_dispatch + using: + foreign_key_constraint_on: partsdispatchid - table: name: parts_order_lines schema: public From c45c3b4037e642284195f9a25608a9da16b14355 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:33:03 -0700 Subject: [PATCH 09/25] IO-2278 Add permissions for parts dispatch. --- hasura/metadata/tables.yaml | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 9aa3b196e..952644a60 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -4585,6 +4585,73 @@ table: name: parts_dispatch_lines schema: public + insert_permissions: + - role: user + permission: + check: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + columns: + - id + - created_at + - updated_at + - jobid + - number + - employeeid + - dispatched_at + - dispatched_by + select_permissions: + - role: user + permission: + columns: + - number + - dispatched_by + - created_at + - dispatched_at + - updated_at + - employeeid + - id + - jobid + filter: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + update_permissions: + - role: user + permission: + columns: + - number + - dispatched_by + - created_at + - dispatched_at + - updated_at + - employeeid + - id + - jobid + filter: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + check: null - table: name: parts_dispatch_lines schema: public From 86e14967caf568f352ac8d807af07b56c8a262ef Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:38:51 -0700 Subject: [PATCH 10/25] IO-2278 Additional permission for dispatch lines. --- hasura/metadata/tables.yaml | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 952644a60..111374fb5 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -4662,6 +4662,73 @@ - name: parts_dispatch using: foreign_key_constraint_on: partsdispatchid + insert_permissions: + - role: user + permission: + check: + parts_dispatch: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + columns: + - id + - created_at + - updated_at + - partsdispatchid + - joblineid + - quantity + - accepted_at + select_permissions: + - role: user + permission: + columns: + - quantity + - accepted_at + - created_at + - updated_at + - id + - joblineid + - partsdispatchid + filter: + parts_dispatch: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + update_permissions: + - role: user + permission: + columns: + - id + - created_at + - updated_at + - partsdispatchid + - joblineid + - quantity + - accepted_at + filter: + parts_dispatch: + job: + bodyshop: + associations: + _and: + - user: + authid: + _eq: X-Hasura-User-Id + - active: + _eq: true + check: null - table: name: parts_order_lines schema: public From 50230e9f50be6389c644dd31340fa22e0f378eb2 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 6 Jun 2023 13:41:38 -0700 Subject: [PATCH 11/25] IO-2278 adjust schema for parts dispatch. --- .../down.sql | 1 + .../up.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/down.sql create mode 100644 hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/up.sql diff --git a/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/down.sql b/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/down.sql new file mode 100644 index 000000000..b88b44672 --- /dev/null +++ b/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/down.sql @@ -0,0 +1 @@ +alter table "public"."parts_dispatch_lines" alter column "accepted_at" set not null; diff --git a/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/up.sql b/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/up.sql new file mode 100644 index 000000000..723108120 --- /dev/null +++ b/hasura/migrations/1686084082349_alter_table_public_parts_dispatch_lines_alter_column_accepted_at/up.sql @@ -0,0 +1 @@ +alter table "public"."parts_dispatch_lines" alter column "accepted_at" drop not null; From daa763105678d29c2862fc0072384ea420f7974c Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 7 Jun 2023 11:23:00 -0700 Subject: [PATCH 12/25] Integration IO-2278 schema changes made on wrong branch. --- .../down.sql | 1 + .../up.sql | 18 ++++++++++++++++++ .../down.sql | 1 + .../up.sql | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 hasura/migrations/1685561607407_create_table_public_parts_dispatch/down.sql create mode 100644 hasura/migrations/1685561607407_create_table_public_parts_dispatch/up.sql create mode 100644 hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/down.sql create mode 100644 hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/up.sql diff --git a/hasura/migrations/1685561607407_create_table_public_parts_dispatch/down.sql b/hasura/migrations/1685561607407_create_table_public_parts_dispatch/down.sql new file mode 100644 index 000000000..42325ddf5 --- /dev/null +++ b/hasura/migrations/1685561607407_create_table_public_parts_dispatch/down.sql @@ -0,0 +1 @@ +DROP TABLE "public"."parts_dispatch"; diff --git a/hasura/migrations/1685561607407_create_table_public_parts_dispatch/up.sql b/hasura/migrations/1685561607407_create_table_public_parts_dispatch/up.sql new file mode 100644 index 000000000..d8c7c2729 --- /dev/null +++ b/hasura/migrations/1685561607407_create_table_public_parts_dispatch/up.sql @@ -0,0 +1,18 @@ +CREATE TABLE "public"."parts_dispatch" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "jobid" uuid NOT NULL, "number" serial NOT NULL, "employeeid" uuid NOT NULL, "dispatched_at" timestamptz NOT NULL, "dispatched_by" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE cascade ON DELETE cascade); +CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"() +RETURNS TRIGGER AS $$ +DECLARE + _new record; +BEGIN + _new := NEW; + _new."updated_at" = NOW(); + RETURN _new; +END; +$$ LANGUAGE plpgsql; +CREATE TRIGGER "set_public_parts_dispatch_updated_at" +BEFORE UPDATE ON "public"."parts_dispatch" +FOR EACH ROW +EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"(); +COMMENT ON TRIGGER "set_public_parts_dispatch_updated_at" ON "public"."parts_dispatch" +IS 'trigger to set value of column "updated_at" to current timestamp on row update'; +CREATE EXTENSION IF NOT EXISTS pgcrypto; diff --git a/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/down.sql b/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/down.sql new file mode 100644 index 000000000..a12867253 --- /dev/null +++ b/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/down.sql @@ -0,0 +1 @@ +DROP TABLE "public"."parts_dispatch_lines"; diff --git a/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/up.sql b/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/up.sql new file mode 100644 index 000000000..5146e2c7e --- /dev/null +++ b/hasura/migrations/1685561715531_create_table_public_parts_dispatch_lines/up.sql @@ -0,0 +1,18 @@ +CREATE TABLE "public"."parts_dispatch_lines" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "partsdispatchid" UUID NOT NULL, "joblineid" uuid NOT NULL, "quantity" numeric NOT NULL DEFAULT 1, "accepted_at" timestamptz NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("joblineid") REFERENCES "public"."joblines"("id") ON UPDATE cascade ON DELETE cascade); +CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"() +RETURNS TRIGGER AS $$ +DECLARE + _new record; +BEGIN + _new := NEW; + _new."updated_at" = NOW(); + RETURN _new; +END; +$$ LANGUAGE plpgsql; +CREATE TRIGGER "set_public_parts_dispatch_lines_updated_at" +BEFORE UPDATE ON "public"."parts_dispatch_lines" +FOR EACH ROW +EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"(); +COMMENT ON TRIGGER "set_public_parts_dispatch_lines_updated_at" ON "public"."parts_dispatch_lines" +IS 'trigger to set value of column "updated_at" to current timestamp on row update'; +CREATE EXTENSION IF NOT EXISTS pgcrypto; From b791f9846f2af7df2136bb344511f66bcff67b6d Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 7 Jun 2023 12:03:17 -0700 Subject: [PATCH 13/25] IO-2329 Change update alert to be permanent. --- .../update-alert/update-alert.component.jsx | 73 +++++++++++++++++++ .../pages/manage/manage.page.component.jsx | 2 + .../pages/manage/manage.page.container.jsx | 2 +- client/src/pages/tech/tech.page.component.jsx | 3 + client/src/pages/tech/tech.page.container.jsx | 2 +- .../redux/application/application.actions.js | 5 ++ .../redux/application/application.reducer.js | 6 ++ .../application/application.selectors.js | 4 + .../redux/application/application.types.js | 1 + client/src/translations/en_us/common.json | 2 +- client/src/utils/RegisterSw.js | 4 + 11 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 client/src/components/update-alert/update-alert.component.jsx diff --git a/client/src/components/update-alert/update-alert.component.jsx b/client/src/components/update-alert/update-alert.component.jsx new file mode 100644 index 000000000..59febd90c --- /dev/null +++ b/client/src/components/update-alert/update-alert.component.jsx @@ -0,0 +1,73 @@ +import { Alert, Button, Space } from "antd"; +import i18n from "i18next"; +import React from "react"; +import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; +import { selectUpdateAvailable } from "../../redux/application/application.selectors"; +import { AlertOutlined } from "@ant-design/icons"; +import { useTranslation } from "react-i18next"; +import { setUpdateAvailable } from "../../redux/application/application.actions"; +import { store } from "../../redux/store"; +import * as serviceWorkerRegistration from "../../serviceWorkerRegistration"; + +let globalRegistration; + +const mapStateToProps = createStructuredSelector({ + updateAvailable: selectUpdateAvailable, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect(mapStateToProps, mapDispatchToProps)(UpdateAlert); + +export function UpdateAlert({ updateAvailable }) { + const { t } = useTranslation(); + if (!updateAvailable) return null; + return ( + } + description={t("general.messages.newversionmessage")} + closable={false} + type="warning" + action={ + + + + + } + /> + ); +} + +const onServiceWorkerUpdate = (registration) => { + console.log("onServiceWorkerUpdate", registration); + globalRegistration = registration; + store.dispatch(setUpdateAvailable(true)); +}; +store.dispatch(setUpdateAvailable(true)); + +serviceWorkerRegistration.register({ onUpdate: onServiceWorkerUpdate }); diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx index f8ed14fcd..bd63cd011 100644 --- a/client/src/pages/manage/manage.page.component.jsx +++ b/client/src/pages/manage/manage.page.component.jsx @@ -25,6 +25,7 @@ import { import * as Sentry from "@sentry/react"; import "./manage.page.styles.scss"; +import UpdateAlert from "../../components/update-alert/update-alert.component"; const ManageRootPage = lazy(() => import("../manage-root/manage-root.page.container") @@ -394,6 +395,7 @@ export function Manage({ match, conflict, bodyshop }) { <> + diff --git a/client/src/pages/manage/manage.page.container.jsx b/client/src/pages/manage/manage.page.container.jsx index 75f4da328..04505ce2a 100644 --- a/client/src/pages/manage/manage.page.container.jsx +++ b/client/src/pages/manage/manage.page.container.jsx @@ -6,7 +6,7 @@ import AlertComponent from "../../components/alert/alert.component"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries"; import { setBodyshop } from "../../redux/user/user.actions"; -import "../../utils/RegisterSw"; +//import "../../utils/RegisterSw"; import ManagePage from "./manage.page.component"; const mapDispatchToProps = (dispatch) => ({ diff --git a/client/src/pages/tech/tech.page.component.jsx b/client/src/pages/tech/tech.page.component.jsx index f7639a473..50219f72d 100644 --- a/client/src/pages/tech/tech.page.component.jsx +++ b/client/src/pages/tech/tech.page.component.jsx @@ -12,6 +12,7 @@ import TechSider from "../../components/tech-sider/tech-sider.component"; import { selectTechnician } from "../../redux/tech/tech.selectors"; import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component"; import "./tech.page.styles.scss"; +import UpdateAlert from "../../components/update-alert/update-alert.component"; const TimeTicketModalContainer = lazy(() => import("../../components/time-ticket-modal/time-ticket-modal.container") ); @@ -56,7 +57,9 @@ export function TechPage({ technician, match }) { {technician ? null : } + + ({ type: ApplicationActionTypes.SET_PROBLEM_JOBS, payload: problemJobs, }); + +export const setUpdateAvailable = (isUpdateAvailable) => ({ + type: ApplicationActionTypes.SET_UPDATE_AVAILABLE, + payload: isUpdateAvailable, +}); diff --git a/client/src/redux/application/application.reducer.js b/client/src/redux/application/application.reducer.js index 95579574a..0b428209b 100644 --- a/client/src/redux/application/application.reducer.js +++ b/client/src/redux/application/application.reducer.js @@ -3,6 +3,7 @@ import ApplicationActionTypes from "./application.types"; const INITIAL_STATE = { loading: false, online: true, + updateAvailable: false, breadcrumbs: [], recentItems: [], selectedHeader: "home", @@ -18,6 +19,11 @@ const INITIAL_STATE = { const applicationReducer = (state = INITIAL_STATE, action) => { switch (action.type) { + case ApplicationActionTypes.SET_UPDATE_AVAILABLE: + return { + ...state, + updateAvailable: action.payload, + }; case ApplicationActionTypes.SET_SELECTED_HEADER: return { ...state, diff --git a/client/src/redux/application/application.selectors.js b/client/src/redux/application/application.selectors.js index cb5e2c679..e9b293d62 100644 --- a/client/src/redux/application/application.selectors.js +++ b/client/src/redux/application/application.selectors.js @@ -48,3 +48,7 @@ export const selectProblemJobs = createSelector( [selectApplication], (application) => application.problemJobs ); +export const selectUpdateAvailable = createSelector( + [selectApplication], + (application) => application.updateAvailable +); diff --git a/client/src/redux/application/application.types.js b/client/src/redux/application/application.types.js index 1e047bb82..9b95dd6ee 100644 --- a/client/src/redux/application/application.types.js +++ b/client/src/redux/application/application.types.js @@ -12,5 +12,6 @@ const ApplicationActionTypes = { SET_ONLINE_STATUS: "SET_ONLINE_STATUS", INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL", SET_PROBLEM_JOBS: "SET_PROBLEM_JOBS", + SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE" }; export default ApplicationActionTypes; diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index b93d0c0a4..b857ca7c8 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1118,7 +1118,7 @@ }, "messages": { "exception": "$t(titles.app) has encountered an error. Please try again. If the problem persists, please submit a support ticket or contact us.", - "newversionmessage": "Click refresh below to update to the latest available version of ImEX Online. Please make sure all other tabs and windows are closed.", + "newversionmessage": "Click refresh to update to the latest available version of ImEX Online. Please make sure all other tabs and windows are closed.", "newversiontitle": "New version of ImEX Online Available", "noacctfilepath": "There is no accounting file path set. You will not be able to export any items.", "nofeatureaccess": "You do not have access to this feature of ImEX Online. Please contact support to request a license for this feature.", diff --git a/client/src/utils/RegisterSw.js b/client/src/utils/RegisterSw.js index 8b2477b8e..0b3bce09c 100644 --- a/client/src/utils/RegisterSw.js +++ b/client/src/utils/RegisterSw.js @@ -3,6 +3,7 @@ import { Button, notification, Space } from "antd"; import i18n from "i18next"; import React from "react"; import * as serviceWorkerRegistration from "../serviceWorkerRegistration"; +import { store } from "../redux/store"; const onServiceWorkerUpdate = (registration) => { console.log("onServiceWorkerUpdate", registration); @@ -33,6 +34,9 @@ const onServiceWorkerUpdate = (registration) => { ); + + store.dispatch() + notification.open({ icon: , message: i18n.t("general.messages.newversiontitle"), From 2be0f3de094865be294b2faf4cd187b6a206a88f Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 7 Jun 2023 12:05:55 -0700 Subject: [PATCH 14/25] IO-2329 Remove testing statement. --- client/src/components/update-alert/update-alert.component.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/update-alert/update-alert.component.jsx b/client/src/components/update-alert/update-alert.component.jsx index 59febd90c..fcd64cabc 100644 --- a/client/src/components/update-alert/update-alert.component.jsx +++ b/client/src/components/update-alert/update-alert.component.jsx @@ -68,6 +68,5 @@ const onServiceWorkerUpdate = (registration) => { globalRegistration = registration; store.dispatch(setUpdateAvailable(true)); }; -store.dispatch(setUpdateAvailable(true)); serviceWorkerRegistration.register({ onUpdate: onServiceWorkerUpdate }); From 046d104bfa6ef323c0b3a91877907e9c8e6fe014 Mon Sep 17 00:00:00 2001 From: swtmply Date: Fri, 9 Jun 2023 01:04:59 +0800 Subject: [PATCH 15/25] IO-2208 removed subscriptions to the message --- .../chat-conversation-list.component.jsx | 7 -- .../chat-popup/chat-popup.component.jsx | 64 ++++--------------- client/src/graphql/conversations.queries.js | 44 ------------- yarn.lock | 11 +--- 4 files changed, 17 insertions(+), 109 deletions(-) diff --git a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx index ffc087ae2..907f8d5db 100644 --- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx +++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx @@ -24,15 +24,8 @@ function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, - subscribeToMoreConversations, loadMoreConversations, }) { - useEffect( - () => subscribeToMoreConversations(), - // eslint-disable-next-line react-hooks/exhaustive-deps - [] - ); - const rowRenderer = ({ index, key, style }) => { const item = conversationList[index]; diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx index 1c80d7c4c..c179fe4b5 100644 --- a/client/src/components/chat-popup/chat-popup.component.jsx +++ b/client/src/components/chat-popup/chat-popup.component.jsx @@ -4,7 +4,7 @@ import { ShrinkOutlined, SyncOutlined, } from "@ant-design/icons"; -import { useLazyQuery, useSubscription } from "@apollo/client"; +import { useLazyQuery, useQuery } from "@apollo/client"; import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd"; import React, { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -13,7 +13,7 @@ import { createStructuredSelector } from "reselect"; import { CONVERSATION_LIST_QUERY, CONVERSATION_LIST_SUBSCRIPTION, - UNREAD_CONVERSATION_COUNT_SUBSCRIPTION, + UNREAD_CONVERSATION_COUNT, } from "../../graphql/conversations.queries"; import { toggleChatVisible } from "../../redux/messaging/messaging.actions"; import { @@ -42,19 +42,20 @@ export function ChatPopupComponent({ const { t } = useTranslation(); const [pollInterval, setpollInterval] = useState(0); - const { data: unreadData } = useSubscription( - UNREAD_CONVERSATION_COUNT_SUBSCRIPTION - ); - - const [ - getConversations, - { loading, data, called, refetch, fetchMore, subscribeToMore }, - ] = useLazyQuery(CONVERSATION_LIST_QUERY, { + const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, { fetchPolicy: "network-only", nextFetchPolicy: "network-only", - skip: !chatVisible, + ...(pollInterval > 0 ? { pollInterval } : {}), }); + const [getConversations, { loading, data, refetch, fetchMore }] = + useLazyQuery(CONVERSATION_LIST_QUERY, { + fetchPolicy: "network-only", + nextFetchPolicy: "network-only", + skip: !chatVisible, + ...(pollInterval > 0 ? { pollInterval } : {}), + }); + const fcmToken = sessionStorage.getItem("fcmtoken"); useEffect(() => { @@ -66,13 +67,13 @@ export function ChatPopupComponent({ }, [fcmToken]); useEffect(() => { - if (called && chatVisible) + if (chatVisible) getConversations({ variables: { offset: 0, }, }); - }, [chatVisible, called, getConversations]); + }, [chatVisible, getConversations]); const loadMoreConversations = useCallback(() => { if (data) @@ -119,43 +120,6 @@ export function ChatPopupComponent({ - subscribeToMore({ - document: CONVERSATION_LIST_SUBSCRIPTION, - variables: { offset: 0 }, - updateQuery: (prev, { subscriptionData }) => { - if ( - !subscriptionData.data || - subscriptionData.data.conversations.length === 0 - ) - return prev; - - let conversations = [...prev.conversations]; - const newConversations = - subscriptionData.data.conversations; - - for (const conversation of newConversations) { - const index = conversations.findIndex( - (prevConversation) => - prevConversation.id === conversation.id - ); - - if (index !== -1) { - conversations.splice(index, 1); - conversations.unshift(conversation); - - continue; - } - - conversations.unshift(conversation); - } - - return Object.assign({}, prev, { - conversations: conversations, - }); - }, - }) - } /> )} diff --git a/client/src/graphql/conversations.queries.js b/client/src/graphql/conversations.queries.js index f9feb3f2f..315ba1a5d 100644 --- a/client/src/graphql/conversations.queries.js +++ b/client/src/graphql/conversations.queries.js @@ -1,37 +1,5 @@ import { gql } from "@apollo/client"; -export const CONVERSATION_LIST_SUBSCRIPTION = gql` - subscription CONVERSATION_LIST_SUBSCRIPTION($offset: Int!) { - conversations( - order_by: { updated_at: desc } - limit: 1 - offset: $offset - where: { archived: { _eq: false } } - ) { - phone_num - id - updated_at - unreadcnt - messages_aggregate( - where: { read: { _eq: false }, isoutbound: { _eq: false } } - ) { - aggregate { - count - } - } - job_conversations { - job { - id - ro_number - ownr_fn - ownr_ln - ownr_co_nm - } - } - } - } -`; - export const UNREAD_CONVERSATION_COUNT = gql` query UNREAD_CONVERSATION_COUNT { messages_aggregate( @@ -44,18 +12,6 @@ export const UNREAD_CONVERSATION_COUNT = gql` } `; -export const UNREAD_CONVERSATION_COUNT_SUBSCRIPTION = gql` - subscription UNREAD_CONVERSATION_COUNT_SUBSCRIPTION { - messages_aggregate( - where: { read: { _eq: false }, isoutbound: { _eq: false } } - ) { - aggregate { - count - } - } - } -`; - export const CONVERSATION_LIST_QUERY = gql` query CONVERSATION_LIST_QUERY($offset: Int!) { conversations( diff --git a/yarn.lock b/yarn.lock index 9659256b2..3226438a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4312,14 +4312,9 @@ tslib@^1.11.1: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.1, tslib@^2.1.0: - -tslib@^2.3.1, tslib@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + version "2.5.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" + integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== tslib@^2.3.1, tslib@^2.5.0: version "2.5.0" From be259317f95f6c1396fe0be40040beb8649c867c Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 8 Jun 2023 11:13:35 -0700 Subject: [PATCH 16/25] Update payables posting label. --- .../dms-allocations-summary-ap.component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx index 1da53e3ba..54651544d 100644 --- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx +++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx @@ -66,7 +66,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) { key: "status", }, { - title: t("jobs.fields.ro_number"), + title: t("bills.fields.invoice_number"), dataIndex: ["Posting", "Reference"], key: "reference", }, From 307c77b30c3c4da5ac2a67545011c08f510dc7c2 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 8 Jun 2023 15:43:21 -0700 Subject: [PATCH 17/25] Remove failing CI components. --- .../chat-conversation-list.component.jsx | 14 +++++++------- .../components/chat-popup/chat-popup.component.jsx | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx index 08972fb89..0642884c1 100644 --- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx +++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx @@ -1,18 +1,18 @@ import { Badge, List, Tag } from "antd"; -import React, { useEffect } from "react"; +import React from "react"; import { connect } from "react-redux"; +import { + AutoSizer, + CellMeasurer, + CellMeasurerCache, + List as VirtualizedList, +} from "react-virtualized"; import { createStructuredSelector } from "reselect"; import { setSelectedConversation } from "../../redux/messaging/messaging.actions"; import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors"; import { TimeAgoFormatter } from "../../utils/DateFormatter"; import PhoneFormatter from "../../utils/PhoneFormatter"; import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; -import { - List as VirtualizedList, - AutoSizer, - CellMeasurerCache, - CellMeasurer, -} from "react-virtualized"; import "./chat-conversation-list.styles.scss"; diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx index 92ee5d828..58065cd76 100644 --- a/client/src/components/chat-popup/chat-popup.component.jsx +++ b/client/src/components/chat-popup/chat-popup.component.jsx @@ -12,7 +12,6 @@ import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { CONVERSATION_LIST_QUERY, - CONVERSATION_LIST_SUBSCRIPTION, UNREAD_CONVERSATION_COUNT, } from "../../graphql/conversations.queries"; import { toggleChatVisible } from "../../redux/messaging/messaging.actions"; From 6262b3ff8304da58408d6e1901730331271ba104 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 8 Jun 2023 16:00:47 -0700 Subject: [PATCH 18/25] Revert changes for IO-2311 IO-2317. --- .../chat-conversation-title.component.jsx | 23 ++----------------- .../chat-popup/chat-popup.component.jsx | 2 +- .../jobs-convert-button.component.jsx | 7 +----- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx index 9fb9776a3..1503bf46f 100644 --- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx +++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx @@ -1,31 +1,14 @@ -import { Space, Button, Col } from "antd"; +import { Space } from "antd"; import React from "react"; import PhoneNumberFormatter from "../../utils/PhoneFormatter"; import ChatArchiveButton from "../chat-archive-button/chat-archive-button.component"; import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conversation-title-tags.component"; import ChatLabelComponent from "../chat-label/chat-label.component"; import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container"; -import { connect } from "react-redux"; -import { setSelectedConversation } from "../../redux/messaging/messaging.actions"; -import { LeftOutlined } from "@ant-design/icons"; -const mapDispatchToProps = (dispatch) => ({ - setSelectedConversation: (conversationId) => - dispatch(setSelectedConversation(conversationId)), -}); - -function ChatConversationTitle({ conversation, setSelectedConversation }) { +export default function ChatConversationTitle({ conversation }) { return ( - - - {conversation && conversation.phone_num} @@ -40,5 +23,3 @@ function ChatConversationTitle({ conversation, setSelectedConversation }) { ); } - -export default connect(null, mapDispatchToProps)(ChatConversationTitle); diff --git a/client/src/components/chat-popup/chat-popup.component.jsx b/client/src/components/chat-popup/chat-popup.component.jsx index 58065cd76..6d582bdab 100644 --- a/client/src/components/chat-popup/chat-popup.component.jsx +++ b/client/src/components/chat-popup/chat-popup.component.jsx @@ -112,7 +112,7 @@ export function ChatPopupComponent({ /> - + {loading ? ( ) : ( diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index 6e469cb57..b48deb3b5 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -108,12 +108,7 @@ export function JobsConvertButton({ }, ]} > - {bodyshop.md_ins_cos.map((s, i) => ( {s.name} From f440a2b022675a8d27656d4bb3f50234a6775b6c Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 8 Jun 2023 16:18:12 -0700 Subject: [PATCH 19/25] Improve update alert on mobile devices. --- .../update-alert/update-alert.component.jsx | 66 ++++++++++--------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/client/src/components/update-alert/update-alert.component.jsx b/client/src/components/update-alert/update-alert.component.jsx index fcd64cabc..f0b11520e 100644 --- a/client/src/components/update-alert/update-alert.component.jsx +++ b/client/src/components/update-alert/update-alert.component.jsx @@ -1,4 +1,4 @@ -import { Alert, Button, Space } from "antd"; +import { Alert, Button, Col, Row, Space } from "antd"; import i18n from "i18next"; import React from "react"; import { connect } from "react-redux"; @@ -28,37 +28,43 @@ export function UpdateAlert({ updateAvailable }) { message={t("general.messages.newversiontitle")} showIcon icon={} - description={t("general.messages.newversionmessage")} + description={ + + + {t("general.messages.newversionmessage")} + + + + + + + + + } closable={false} type="warning" - action={ - - - - - } /> ); } From b1c5bbb01f6bfd53fc730042de36f679f9641ad7 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 9 Jun 2023 11:28:22 -0700 Subject: [PATCH 20/25] Change FK relaitonship. --- .../down.sql | 5 +++++ .../up.sql | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/down.sql create mode 100644 hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/up.sql diff --git a/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/down.sql b/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/down.sql new file mode 100644 index 000000000..1dfd23a52 --- /dev/null +++ b/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/down.sql @@ -0,0 +1,5 @@ +alter table "public"."job_conversations" drop constraint "job_conversations_conversationid_fkey", + add constraint "job_conversations_conversationid_fkey" + foreign key ("conversationid") + references "public"."conversations" + ("id") on update restrict on delete restrict; diff --git a/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/up.sql b/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/up.sql new file mode 100644 index 000000000..524d765ed --- /dev/null +++ b/hasura/migrations/1686335272144_set_fk_public_job_conversations_conversationid/up.sql @@ -0,0 +1,5 @@ +alter table "public"."job_conversations" drop constraint "job_conversations_conversationid_fkey", + add constraint "job_conversations_conversationid_fkey" + foreign key ("conversationid") + references "public"."conversations" + ("id") on update cascade on delete cascade; From 3812a0650ed97e7702fe7d52a6d9799f6778af83 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 9 Jun 2023 15:11:14 -0700 Subject: [PATCH 21/25] Global search improvements. --- server/opensearch/os-handler.js | 56 +++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 1266e6a6c..0bc72170c 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -86,6 +86,7 @@ async function OpenSearchUpdateHandler(req, res) { "v_model_yr", "v_make_desc", "v_model_desc", + "v_vin", ]); document.bodyshopid = req.body.event.data.new.shopid; break; @@ -139,7 +140,7 @@ async function OpenSearchUpdateHandler(req, res) { "exported_at", "invoice_number", "is_credit_memo", - "total" + "total", ]), ...bill.bills_by_pk, bodyshopid: bill.bills_by_pk.job.shopid, @@ -244,17 +245,54 @@ async function OpensearchSearchHandler(req, res) { bool: { must: [ { - multi_match: { - query: search, - type: "phrase_prefix", - //fields: ["*"], - // fuzziness: "5", - //prefix_length: 2, + match: { + bodyshopid: assocs.associations[0].shopid, }, }, { - match: { - bodyshopid: assocs.associations[0].shopid, + bool: { + should: [ + { + multi_match: { + query: search, + type: "cross_fields", + fields: ["*ownr_fn", "*ownr_ln"], + }, + }, + { + multi_match: { + query: search, + type: "most_fields", + fields: [ + "*v_model_yr", + "*v_make_desc^2", + "*v_model_desc^3", + ], + }, + }, + { + query_string: { + query: `*${search}*`, + + fields: [ + "*ro_number^20", + "*clm_no^14", + "*v_vin^12", + "*plate_no^12", + "*ownr_ln^10", + "transactionid^10", + "paymentnum^10", + "invoice_number^10", + "*ownr_fn^8", + "*ownr_co_nm^8", + "*ownr_ph1^8", + "*ownr_ph2^8", + "*", + ], + }, + }, + ], + minimum_should_match: 1, }, }, ], From 31b4f4e561fe8db3ff1ea927e959d648d9c0f1f0 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 13 Jun 2023 16:23:23 -0700 Subject: [PATCH 22/25] IO-2336 Job Search Query and Autocomplete Query Update queries to include ownr_co_nm --- client/src/graphql/jobs.queries.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 9619d5173..9a226c831 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1219,10 +1219,10 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql` query ACTIVE_JOBS_FOR_AUTOCOMPLETE($statuses: [String!]!) { jobs(where: { status: { _in: $statuses } }) { id + ownr_co_nm ownr_fn ownr_ln ro_number - vehicleid v_make_desc v_model_desc @@ -1250,6 +1250,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql` } ) { id + ownr_co_nm ownr_fn ownr_ln ro_number @@ -1266,6 +1267,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql` query SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE($id: uuid!) { jobs_by_pk(id: $id) { id + ownr_co_nm ownr_fn ownr_ln ro_number @@ -1284,6 +1286,7 @@ export const SEARCH_FOR_JOBS = gql` search_jobs(args: { search: $search }, limit: 25) { id ro_number + ownr_co_nm ownr_fn ownr_ln } From 5d2bdc7ee18ae266adcad6c9f04cc8fd53add7cb Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 15 Jun 2023 15:24:24 -0700 Subject: [PATCH 23/25] IO-2338 Selection Color Overrides nth-child color --- client/src/App/App.styles.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss index ddf87ac42..50e656895 100644 --- a/client/src/App/App.styles.scss +++ b/client/src/App/App.styles.scss @@ -148,6 +148,10 @@ background: #e7f3ff !important; } +.ant-table-tbody > tr.ant-table-row-selected > td { + background: #e6f7ff !important; +} + .job-line-manual { color: tomato; font-style: italic; From fee5bee569e8cb40314e4b346c3850eff771aac6 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 20 Jun 2023 10:03:49 -0700 Subject: [PATCH 24/25] IO-2340 CDK New Unsold Vehicle Option Exports with no Delivery Date or In-Service Date --- .../components/dms-post-form/dms-post-form.component.jsx | 7 +++++++ client/src/pages/dms/dms.container.jsx | 6 +++--- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + server/cdk/cdk-job-export.js | 8 ++++++-- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx index c9043d050..e40b90286 100644 --- a/client/src/components/dms-post-form/dms-post-form.component.jsx +++ b/client/src/components/dms-post-form/dms-post-form.component.jsx @@ -11,6 +11,7 @@ import { Select, Space, Statistic, + Switch, Typography, } from "antd"; import Dinero from "dinero.js"; @@ -183,6 +184,12 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { + + +
)} diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx index 9fcfd491e..75c26287b 100644 --- a/client/src/pages/dms/dms.container.jsx +++ b/client/src/pages/dms/dms.container.jsx @@ -13,7 +13,7 @@ import queryString from "query-string"; import React, { useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; -import { useHistory, useLocation, Link } from "react-router-dom"; +import { Link, useHistory, useLocation } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import SocketIO from "socket.io-client"; import AlertComponent from "../../components/alert/alert.component"; @@ -22,6 +22,7 @@ import DmsCustomerSelector from "../../components/dms-customer-selector/dms-cust import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component"; import DmsPostForm from "../../components/dms-post-form/dms-post-form.component"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; +import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component"; import { auth } from "../../firebase/firebase.utils"; import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries"; import { @@ -29,7 +30,6 @@ import { setSelectedHeader, } from "../../redux/application/application.actions"; import { selectBodyshop } from "../../redux/user/user.selectors"; -import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -45,7 +45,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer); export const socket = SocketIO( process.env.NODE_ENV === "production" ? process.env.REACT_APP_AXIOS_BASE_API_URL - : window.location.origin, + : window.location.origin, //"http://localhost:4000" for dev testing, { path: "/ws", withCredentials: true, diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index b857ca7c8..9a1f09d9c 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1451,6 +1451,7 @@ "dms_make": "DMS Make", "dms_model": "DMS Model", "dms_wip_acctnumber": "Cost WIP DMS Acct #", + "dms_unsold": "New, Unsold Vehicle", "id": "DMS ID", "inservicedate": "In Service Date", "journal": "Journal #", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index ff3efbd30..52857b75f 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1451,6 +1451,7 @@ "dms_make": "", "dms_model": "", "dms_wip_acctnumber": "", + "dms_unsold": "", "id": "", "inservicedate": "", "journal": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index c8fc9ee4a..9105279ef 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1451,6 +1451,7 @@ "dms_make": "", "dms_model": "", "dms_wip_acctnumber": "", + "dms_unsold": "", "id": "", "inservicedate": "", "journal": "", diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index c20a899a1..117fc5bdc 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -717,7 +717,9 @@ async function InsertDmsVehicle(socket) { dealer: { dealerNumber: socket.JobData.bodyshop.cdk_dealerid, ...(socket.txEnvelope.inservicedate && { - inServiceDate: moment(socket.txEnvelope.inservicedate) + inServiceDate: socket.txEnvelope.dms_unsold === true + ? "" + : moment(socket.txEnvelope.inservicedate) //.tz(socket.JobData.bodyshop.timezone) .startOf("day") .toISOString(), @@ -726,7 +728,9 @@ async function InsertDmsVehicle(socket) { }, manufacturer: {}, vehicle: { - deliveryDate: moment() + deliveryDate: socket.txEnvelope.dms_unsold === true + ? "" + : moment() // .tz(socket.JobData.bodyshop.timezone) .format("YYYYMMDD"), licensePlateNo: From bd7d8068df926a65f97891311778b0b1fd8a08ab Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 22 Jun 2023 15:38:18 -0700 Subject: [PATCH 25/25] IO-2340 CDK New Unsold Vehicle adjustments --- .../dms-post-form/dms-post-form.component.jsx | 3 +- client/src/pages/dms/dms.container.jsx | 3 +- server/cdk/cdk-job-export.js | 48 +++++++++++-------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx index e40b90286..e1358e989 100644 --- a/client/src/components/dms-post-form/dms-post-form.component.jsx +++ b/client/src/components/dms-post-form/dms-post-form.component.jsx @@ -187,8 +187,9 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { - + diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx index 75c26287b..77c670e60 100644 --- a/client/src/pages/dms/dms.container.jsx +++ b/client/src/pages/dms/dms.container.jsx @@ -45,7 +45,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer); export const socket = SocketIO( process.env.NODE_ENV === "production" ? process.env.REACT_APP_AXIOS_BASE_API_URL - : window.location.origin, //"http://localhost:4000" for dev testing, + : window.location.origin, + // "http://localhost:4000", // for dev testing, { path: "/ws", withCredentials: true, diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 117fc5bdc..5fee6b30d 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -717,22 +717,24 @@ async function InsertDmsVehicle(socket) { dealer: { dealerNumber: socket.JobData.bodyshop.cdk_dealerid, ...(socket.txEnvelope.inservicedate && { - inServiceDate: socket.txEnvelope.dms_unsold === true - ? "" - : moment(socket.txEnvelope.inservicedate) - //.tz(socket.JobData.bodyshop.timezone) - .startOf("day") - .toISOString(), + inServiceDate: + socket.txEnvelope.dms_unsold === true + ? "" + : moment(socket.txEnvelope.inservicedate) + //.tz(socket.JobData.bodyshop.timezone) + .startOf("day") + .toISOString(), }), vehicleId: socket.DMSVid.vehiclesVehId, }, manufacturer: {}, vehicle: { - deliveryDate: socket.txEnvelope.dms_unsold === true - ? "" - : moment() - // .tz(socket.JobData.bodyshop.timezone) - .format("YYYYMMDD"), + deliveryDate: + socket.txEnvelope.dms_unsold === true + ? "" + : moment() + // .tz(socket.JobData.bodyshop.timezone) + .format("YYYYMMDD"), licensePlateNo: socket.JobData.plate_no === null ? null @@ -864,19 +866,25 @@ async function UpdateDmsVehicle(socket) { ...socket.DMSVeh.dealer, ...((socket.txEnvelope.inservicedate || socket.DMSVeh.dealer.inServiceDate) && { - inServiceDate: moment( - socket.DMSVeh.dealer.inServiceDate || - socket.txEnvelope.inservicedate - ) - // .tz(socket.JobData.bodyshop.timezone) - .toISOString(), + inServiceDate: + socket.txEnvelope.dms_unsold === true + ? "" + : moment( + socket.DMSVeh.dealer.inServiceDate || + socket.txEnvelope.inservicedate + ) + // .tz(socket.JobData.bodyshop.timezone) + .toISOString(), }), }, vehicle: { ...socket.DMSVeh.vehicle, - deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate) - //.tz(socket.JobData.bodyshop.timezone) - .toISOString(), + deliveryDate: + socket.txEnvelope.dms_unsold === true + ? "" + : moment(socket.DMSVeh.vehicle.deliveryDate) + //.tz(socket.JobData.bodyshop.timezone) + .toISOString(), }, owners: ids, },