Merged in release/2022-04-15 (pull request #446)

release/2022-04-15

Approved-by: Patrick Fic

client/src/components/partner-ping/partner-ping.component.jsx

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setPartnerVersion } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-
+import {store} from '../../redux/store'
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -18,7 +18,7 @@ export default connect(
   mapDispatchToProps
 )(PartnerPingComponent);
 
-export function PartnerPingComponent({ bodyshop, setPartnerVersion }) {
+export function PartnerPingComponent({ bodyshop,  }) {
   useEffect(() => {
     // Create an scoped async function in the hook
 
@@ -30,7 +30,7 @@ export function PartnerPingComponent({ bodyshop, setPartnerVersion }) {
   return <></>;
 }
 
-export async function checkPartnerStatus(bodyshop, checkAcctPath = false) {
+export async function checkPartnerStatus(bodyshop) {
   if (!bodyshop) return;
   try {
     //if (process.env.NODE_ENV === "development") return;
@@ -38,7 +38,8 @@ export async function checkPartnerStatus(bodyshop, checkAcctPath = false) {
     // const {
     //   appver, //qbpath
     // } = PartnerResponse.data;
-    setPartnerVersion(PartnerResponse.data);
+    console.log(PartnerResponse.data)
+    store.dispatch(setPartnerVersion(PartnerResponse.data));
     // if (
     //   checkAcctPath &&
     //   !qbpath &&

client/src/components/vendors-form/vendors-form.container.jsx

@@ -39,13 +39,18 @@ function VendorsFormContainer({ refetch, bodyshop }) {
   const [insertvendor] = useMutation(INSERT_NEW_VENDOR);
   const [deleteVendor] = useMutation(DELETE_VENDOR);
 
-  const handleDelete = () => {
+  const handleDelete = async () => {
     setFormLoading(true);
-    deleteVendor({
+    const result = await deleteVendor({
       variables: { id: selectedvendor },
       refetchQueries: ["QUERY_ALL_VENDORS"],
-    })
+    });
-      .then((r) => {
+    console.log(result);
+    if (result.errors) {
+      notification["error"]({
+        message: t("vendors.errors.deleting"),
+      });
+    } else {
       notification["success"]({
         message: t("vendors.successes.deleted"),
       });
@@ -55,14 +60,9 @@ function VendorsFormContainer({ refetch, bodyshop }) {
         refetch().then((r) => {
           form.resetFields();
         });
+    }
+
     setFormLoading(false);
-      })
-      .catch((error) => {
-        notification["error"]({
-          message: t("vendors.errors.deleting"),
-        });
-        setFormLoading(false);
-      });
   };
 
   const handleFinish = async (values) => {

client/src/pages/jobs-available/jobs-available.page.container.jsx

@@ -48,10 +48,12 @@ export function JobsAvailablePageContainer({
             </Link>
           }
         />
+        {!partnerVersion && (
           <AlertComponent
             type="warning"
             message={t("general.messages.partnernotrunning")}
           />
+        )}
         <JobsAvailableTableContainer />
       </div>
     </RbacWrapper>

hasura/metadata/network.yaml

@@ -0,0 +1 @@
+{}

hasura/metadata/tables.yaml

@@ -804,6 +804,7 @@
           - appt_colors
           - appt_length
           - attach_pdf_to_email
+          - bill_allow_post_to_closed
           - bill_tax_rates
           - cdk_configuration
           - cdk_dealerid
@@ -895,6 +896,7 @@
           - appt_colors
           - appt_length
           - attach_pdf_to_email
+          - bill_allow_post_to_closed
           - bill_tax_rates
           - cdk_configuration
           - city
@@ -2688,6 +2690,7 @@
           - asgn_date
           - asgn_no
           - asgn_type
+          - auto_add_ats
           - ca_bc_pvrt
           - ca_customer_gst
           - ca_gst_registrant
@@ -2847,6 +2850,7 @@
           - policy_no
           - production_vars
           - queued_for_parts
+          - rate_ats
           - rate_la1
           - rate_la2
           - rate_la3
@@ -2948,6 +2952,7 @@
           - asgn_date
           - asgn_no
           - asgn_type
+          - auto_add_ats
           - ca_bc_pvrt
           - ca_customer_gst
           - ca_gst_registrant
@@ -3107,6 +3112,7 @@
           - policy_no
           - production_vars
           - queued_for_parts
+          - rate_ats
           - rate_la1
           - rate_la2
           - rate_la3
@@ -3218,6 +3224,7 @@
           - asgn_date
           - asgn_no
           - asgn_type
+          - auto_add_ats
           - ca_bc_pvrt
           - ca_customer_gst
           - ca_gst_registrant
@@ -3377,6 +3384,7 @@
           - policy_no
           - production_vars
           - queued_for_parts
+          - rate_ats
           - rate_la1
           - rate_la2
           - rate_la3

hasura/migrations/1649892095049_alter_table_public_bodyshops_add_column_bill_allow_post_to_closed/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"."bodyshops" add column "bill_allow_post_to_closed" boolean
+--  not null default 'false';

hasura/migrations/1649892095049_alter_table_public_bodyshops_add_column_bill_allow_post_to_closed/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "bill_allow_post_to_closed" boolean
+ not null default 'false';

hasura/migrations/1649892415070_alter_table_public_jobs_add_column_auto_add_ats/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 "auto_add_ats" boolean
+--  null default 'false';

hasura/migrations/1649892415070_alter_table_public_jobs_add_column_auto_add_ats/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "auto_add_ats" boolean
+ null default 'false';

hasura/migrations/1649892458433_alter_table_public_jobs_add_column_rate_ats/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 "rate_ats" numeric
+--  null;

hasura/migrations/1649892458433_alter_table_public_jobs_add_column_rate_ats/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "rate_ats" numeric
+ null;