Resolve error on multiple conversations found saga.

Fix search select issues.

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -8,15 +8,23 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  searchingForConversation: searchingForConversation,
 });
 
 const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
 });
 
-export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({
+  bodyshop,
+  searchingForConversation,
+  phone,
+  jobid,
+  openChatByPhone,
+}) {
   const { t } = useTranslation();
   if (!phone) return <></>;
 
@@ -29,7 +37,7 @@ export function ChatOpenButton({ bodyshop, phone, jobid, openChatByPhone }) {
       onClick={(e) => {
         e.stopPropagation();
         const p = parsePhoneNumber(phone, "CA");
-
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
           openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid });
         } else {

client/src/components/production-list-table/production-list-print.component.jsx

@@ -55,25 +55,27 @@ export function ProductionListPrint({ bodyshop }) {
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_technician_one")}
           >
-            {bodyshop.employees.map((e) => (
-              <Menu.Item
-                key={e.id}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_technician_one.key,
-                      variables: { id: e.id },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e.first_name} {e.last_name}
-              </Menu.Item>
-            ))}
+            {bodyshop.employees
+              .filter((e) => e.active)
+              .map((e) => (
+                <Menu.Item
+                  key={e.id}
+                  onClick={async () => {
+                    setLoading(true);
+                    await GenerateDocument(
+                      {
+                        name: production_by_technician_one.key,
+                        variables: { id: e.id },
+                      },
+                      {},
+                      "p"
+                    );
+                    setLoading(false);
+                  }}
+                >
+                  {e.first_name} {e.last_name}
+                </Menu.Item>
+              ))}
           </Menu.SubMenu>
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_category_one")}

client/src/redux/messaging/messaging.reducer.js

@@ -6,6 +6,7 @@ const INITIAL_STATE = {
   isSending: false,
   error: null,
   message: null,
+  searchingForConversation: false,
 };
 
 const messagingReducer = (state = INITIAL_STATE, action) => {
@@ -17,10 +18,16 @@ const messagingReducer = (state = INITIAL_STATE, action) => {
         ...state,
         visible: !state.visible,
       };
+    case MessagingActionTypes.OPEN_CHAT_BY_PHONE:
+      return {
+        ...state,
+        searchingForConversation: true,
+      };
     case MessagingActionTypes.SET_SELECTED_CONVERSATION:
       return {
         ...state,
         visible: true,
+        searchingForConversation: false,
         selectedConversationId: action.payload,
       };
     case MessagingActionTypes.SEND_MESSAGE:

client/src/redux/messaging/messaging.sagas.js

@@ -4,7 +4,7 @@ import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   CONVERSATION_ID_BY_PHONE,
-  CREATE_CONVERSATION
+  CREATE_CONVERSATION,
 } from "../../graphql/conversations.queries";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import client from "../../utils/GraphQLClient";
@@ -12,7 +12,7 @@ import { selectBodyshop } from "../user/user.selectors";
 import {
   sendMessageFailure,
   sendMessageSuccess,
-  setSelectedConversation
+  setSelectedConversation,
 } from "./messaging.actions";
 import MessagingActionTypes from "./messaging.types";
 
@@ -79,6 +79,7 @@ export function* openChatByPhone({ payload }) {
         });
     } else {
       console.log("ERROR: Multiple conversations found. ");
+      yield put(setSelectedConversation(null));
     }
   } catch (error) {
     console.log("Error in sendMessage saga.", error);

client/src/redux/messaging/messaging.selectors.js

@@ -26,3 +26,8 @@ export const selectMessage = createSelector(
   [selectMessaging],
   (messaging) => messaging.message
 );
+
+export const searchingForConversation = createSelector(
+  [selectMessaging],
+  (messaging) => messaging.searchingForConversation
+);

hasura/metadata/tables.yaml

@@ -3274,6 +3274,7 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
           - cieca_pft
           - cieca_stl
           - cieca_ttl
@@ -3542,6 +3543,7 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
           - cieca_pft
           - cieca_stl
           - cieca_ttl
@@ -3821,6 +3823,7 @@
           - cat_no
           - category
           - cieca_pfl
+          - cieca_pfo
           - cieca_pft
           - cieca_stl
           - cieca_ttl
@@ -4073,12 +4076,7 @@
   event_triggers:
     - name: job_status_transition
       definition:
-        enable_manual: false
-        insert:
-          columns: '*'
-        update:
-          columns:
-            - status
+        enable_manual: true
       retry_conf:
         interval_sec: 10
         num_retries: 0
@@ -4094,23 +4092,7 @@
         version: 2
     - name: jobs_arms
       definition:
-        enable_manual: false
-        update:
-          columns:
-            - actual_delivery
-            - scheduled_delivery
-            - scheduled_completion
-            - actual_completion
-            - date_scheduled
-            - inproduction
-            - clm_total
-            - suspended
-            - job_totals
-            - converted
-            - employee_body
-            - ro_number
-            - actual_in
-            - scheduled_in
+        enable_manual: true
       retry_conf:
         interval_sec: 10
         num_retries: 0

hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/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"."jobs" add column "cieca_pfo" jsonb
+--  null default jsonb_build_object();

hasura/migrations/1695757361064_alter_table_public_jobs_add_column_cieca_pfo/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pfo" jsonb
+ null default jsonb_build_object();

server/data/claimscorp.js

@@ -67,7 +67,7 @@ exports.default = async (req, res) => {
         );
 
         const claimsCorpObject = {
-          ClaimsCorpExport: {
+          DataFeed: {
             ShopID: bodyshops_by_pk.claimscorpid,
             ShopName: bodyshops_by_pk.shopname,
             RO: jobs.map((j) =>
@@ -100,7 +100,7 @@ exports.default = async (req, res) => {
           .end({ allowEmptyTags: true });
 
         allxmlsToUpload.push({
-          count: claimsCorpObject.ClaimsCorpExport.RO.length,
+          count: claimsCorpObject.DataFeed.RO.length,
           xml: ret,
           filename: `${bodyshop.claimscorpid}-MIS-${moment().format(
             "YYYYMMDDTHHMMss"