IO-2936 Scoreboard AsOfToday

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/production-board-kanban/production-board-kanban.container.jsx

@@ -1,12 +1,8 @@
-import React, { useEffect, useMemo, useRef } from "react";
+import React, { useEffect, useMemo } from "react";
 import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
-} from "../../graphql/jobs.queries";
+import { QUERY_JOBS_IN_PRODUCTION, SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
 import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
@@ -16,9 +12,7 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
-  const fired = useRef(false); // useRef to keep track of whether the subscription fired
-
+function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
   const combinedStatuses = useMemo(
     () => [
       ...bodyshop.md_ro_statuses.production_statuses,
@@ -34,12 +28,9 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
     onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
   });
 
-  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
-    {
-      onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
-    }
-  );
+  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
+    onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+  });
 
   const { loading: associationSettingsLoading, data: associationSettings } = useQuery(QUERY_KANBAN_SETTINGS, {
     variables: { email: currentUser.email },
@@ -49,15 +40,10 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
   // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));
 
   useEffect(() => {
-    if (!updatedJobs) {
-      return;
+    if (updatedJobs && data) {
+      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
     }
-    if (!fired.current) {
-      fired.current = true;
-      return;
-    }
-    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
-  }, [updatedJobs, refetch]);
+  }, [updatedJobs, data, refetch]);
 
   const filteredAssociationSettings = useMemo(() => {
     return associationSettings?.associations[0] || null;

client/src/components/production-list-table/production-list-table.container.jsx

@@ -4,13 +4,12 @@ import {
   QUERY_EXACT_JOB_IN_PRODUCTION,
   QUERY_EXACT_JOBS_IN_PRODUCTION,
   QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
+  SUBSCRIPTION_JOBS_IN_PRODUCTION
 } from "../../graphql/jobs.queries";
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 
-export default function ProductionListTableContainer({ subscriptionType = "direct" }) {
+export default function ProductionListTableContainer() {
   const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
     pollInterval: 3600000,
     fetchPolicy: "network-only",
@@ -18,9 +17,7 @@ export default function ProductionListTableContainer({ subscriptionType = "direc
   });
   const client = useApolloClient();
   const [joblist, setJoblist] = useState([]);
-  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
-  );
+  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION);
 
   useEffect(() => {
     if (!(data && data.jobs)) return;

client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js

@@ -4,7 +4,7 @@ export const CalculateWorkingDaysThisMonth = () => dayjs().endOf("month").busine
 
 export const CalculateWorkingDaysInPeriod = (start, end) => dayjs(end).businessDiff(dayjs(start));
 
-export const CalculateWorkingDaysAsOfToday = () => dayjs().businessDaysInMonth().length;
+export const CalculateWorkingDaysAsOfToday = () => dayjs().endOf("day").businessDiff(dayjs().startOf("month"));
 
 export const CalculateWorkingDaysLastMonth = () =>
   dayjs().subtract(1, "month").endOf("month").businessDaysInMonth().length;

client/src/graphql/jobs.queries.js

@@ -2461,14 +2461,6 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
     }
   }
 `;
-export const SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW = gql`
-  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW {
-    jobs: jobs_inproduction {
-      id
-      updated_at
-    }
-  }
-`;
 
 export const QUERY_JOBS_IN_PRODUCTION = gql`
   query QUERY_JOBS_IN_PRODUCTION {

client/src/pages/production-board/production-board.component.jsx

@@ -1,26 +1,6 @@
 import React from "react";
 import ProductionBoardKanbanContainer from "../../components/production-board-kanban/production-board-kanban.container";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardComponent);
 
-export function ProductionBoardComponent({ bodyshop }) {
-  const {
-    treatments: { Production_Use_View }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Production_Use_View"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
-  return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;
+export default function ProductionBoardComponent() {
+  return <ProductionBoardKanbanContainer />;
 }

client/src/pages/production-list/production-list.component.jsx

@@ -2,31 +2,11 @@ import React from "react";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ProductionListComponent);
-
-export function ProductionListComponent({ bodyshop }) {
-  const {
-    treatments: { Production_Use_View }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Production_Use_View"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
+export default function ProductionListComponent() {
   return (
     <>
       <NoteUpsertModal />
-      <ProductionListTable subscriptionType={Production_Use_View.treatment} />
+      <ProductionListTable />
     </>
   );
 }

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

@@ -36,8 +36,7 @@ export function* openChatByPhone({ payload }) {
       data: { conversations }
     } = yield client.query({
       query: CONVERSATION_ID_BY_PHONE,
-      variables: { phone: p.number },
-      fetchPolicy: 'no-cache'
+      variables: { phone: p.number }
     });
 
     if (conversations.length === 0) {

hasura/metadata/tables.yaml

@@ -918,7 +918,6 @@
           - bill_tax_rates
           - cdk_configuration
           - cdk_dealerid
-          - chatterid
           - city
           - claimscorpid
           - convenient_company
@@ -940,7 +939,6 @@
           - inhousevendorid
           - insurance_vendor_id
           - intakechecklist
-          - intellipay_config
           - jc_hourly_rates
           - jobsizelimit
           - last_name_first
@@ -1042,7 +1040,6 @@
           - inhousevendorid
           - insurance_vendor_id
           - intakechecklist
-          - intellipay_config
           - jc_hourly_rates
           - last_name_first
           - localmediaserverhttp
@@ -4243,63 +4240,6 @@
                 - active:
                     _eq: true
   event_triggers:
-    - name: job_modified
-      definition:
-        enable_manual: false
-        update:
-          columns:
-            - clm_no
-            - v_make_desc
-            - date_next_contact
-            - status
-            - employee_csr
-            - employee_prep
-            - clm_total
-            - suspended
-            - employee_body
-            - ro_number
-            - actual_in
-            - ownr_co_nm
-            - v_model_yr
-            - comment
-            - job_totals
-            - v_vin
-            - ownr_fn
-            - scheduled_completion
-            - special_coverage_policy
-            - v_color
-            - ca_gst_registrant
-            - scheduled_delivery
-            - actual_delivery
-            - actual_completion
-            - kanbanparent
-            - est_ct_fn
-            - employee_refinish
-            - ownr_ph1
-            - date_last_contacted
-            - alt_transport
-            - inproduction
-            - est_ct_ln
-            - production_vars
-            - category
-            - v_model_desc
-            - date_invoiced
-            - est_co_nm
-            - ownr_ln
-      retry_conf:
-        interval_sec: 10
-        num_retries: 0
-        timeout_sec: 60
-      webhook_from_env: HASURA_API_URL
-      headers:
-        - name: event-secret
-          value_from_env: EVENT_SECRET
-      request_transform:
-        method: POST
-        query_params: {}
-        template_engine: Kriti
-        url: '{{$base_url}}/job/job-updated'
-        version: 2
     - name: job_status_transition
       definition:
         enable_manual: true
@@ -4359,35 +4299,6 @@
         template_engine: Kriti
         url: '{{$base_url}}/opensearch'
         version: 2
-- table:
-    name: jobs_inproduction
-    schema: public
-  object_relationships:
-    - name: bodyshop
-      using:
-        manual_configuration:
-          column_mapping:
-            shopid: id
-          insertion_order: null
-          remote_table:
-            name: bodyshops
-            schema: public
-  select_permissions:
-    - role: user
-      permission:
-        columns:
-          - id
-          - shopid
-          - updated_at
-        filter:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
 - table:
     name: masterdata
     schema: public

hasura/migrations/1726773072213_run_sql_migration/down.sql

@@ -1,11 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE
--- OR REPLACE VIEW "public"."jobs_inproduction" AS
--- SELECT
---   j.id,
---   j.updated_at
--- FROM
---   jobs j
--- WHERE
--- j.inproduction=true;

hasura/migrations/1726773072213_run_sql_migration/up.sql

@@ -1,9 +0,0 @@
-CREATE
-OR REPLACE VIEW "public"."jobs_inproduction" AS
-SELECT
-  j.id,
-  j.updated_at
-FROM
-  jobs j
-WHERE
-j.inproduction=true;

hasura/migrations/1726773316245_run_sql_migration/down.sql

@@ -1,8 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
---  SELECT j.id,
---     j.updated_at,
---     j.shopid
---    FROM jobs j
---   WHERE (j.inproduction = true);

hasura/migrations/1726773316245_run_sql_migration/up.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
- SELECT j.id,
-    j.updated_at,
-    j.shopid
-   FROM jobs j
-  WHERE (j.inproduction = true);

hasura/migrations/1726773326353_run_sql_migration/down.sql

@@ -1,8 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
---  SELECT j.id,
---     j.updated_at,
---     j.shopid
---    FROM jobs j
---   WHERE (j.inproduction = true);

hasura/migrations/1726773326353_run_sql_migration/up.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
- SELECT j.id,
-    j.updated_at,
-    j.shopid
-   FROM jobs j
-  WHERE (j.inproduction = true);

hasura/migrations/1726775434726_run_sql_migration/down.sql

@@ -1,3 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;

hasura/migrations/1726775434726_run_sql_migration/up.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;

hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_inproduction_true_cast" on
-  "public"."jobs" using btree ("inproduction");

hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql

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