Merged in test-beta (pull request #1355)

[DO NOT MERGE] - 3/15/2024 - Beta Release

Approved-by: Allan Carr

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -1,5 +1,5 @@
 import {useMutation, useQuery} from "@apollo/client";
-import {Button, Form, Popconfirm, Space, Divider} from "antd";
+import {Button, Form, Popconfirm, Space} from "antd";
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React, {useState} from "react";
@@ -203,7 +203,7 @@ export function BillDetailEditcontainer({setPartsOrderContext, insertAuditTrail,
                         layout="vertical"
                     >
                         <BillFormContainer form={form} billEdit disabled={exported}/>
-                        <Divider orientation="left">{t("general.labels.media")}</Divider>
+
                         {bodyshop.uselocalmediaserver ? (
                             <JobsDocumentsLocalGallery
                                 job={{id: data ? data.bills_by_pk.jobid : null}}

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -173,11 +173,7 @@ export function BillDetailEditReturn({
                 </Form>
             </Modal>
             <Button
-                disabled={
-                    data.bills_by_pk.is_credit_memo ||
-                    data.bills_by_pk.isinhouse ||
-                    disabled
-                }
+                disabled={data.bills_by_pk.is_credit_memo || disabled}
                 onClick={() => {
                     setOpen(true);
                 }}

client/src/components/bill-form/bill-form.component.jsx

@@ -492,11 +492,10 @@ export function BillFormComponent({
                     billEdit={billEdit}
                 />
             )}
-            <Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
-                {t("documents.labels.upload")}
-            </Divider>
+
             <Form.Item
                 name="upload"
+                label="Upload"
                 style={{display: billEdit ? "none" : null}}
                 valuePropName="fileList"
                 getValueFromEvent={(e) => {

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -60,10 +60,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                     text: t("courtesycars.status.in"),
                     value: "courtesycars.status.in",
                 },
-                {
-                    text: t("courtesycars.status.inservice"),
-                    value: "courtesycars.status.inservice",
-                },
                 {
                     text: t("courtesycars.status.out"),
                     value: "courtesycars.status.out",
@@ -77,7 +73,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                     value: "courtesycars.status.leasereturn",
                 },
             ],
-            onFilter: (value, record) => record.status === value,
+            onFilter: (value, record) => value.includes(record.status),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             render: (text, record) => {
@@ -180,7 +176,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             title: t("courtesycars.fields.fuel"),
             dataIndex: "fuel",
             key: "fuel",
-            sorter: (a, b) => a.fuel - b.fuel,
+            sorter: (a, b) => alphaSort(a.fuel, b.fuel),
             sortOrder:
                 state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
             render: (text, record) => {
@@ -189,14 +185,12 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                         return t("courtesycars.labels.fuel.full");
                     case 88:
                         return t("courtesycars.labels.fuel.78");
-                    case 75:
-                        return t("courtesycars.labels.fuel.34");
                     case 63:
                         return t("courtesycars.labels.fuel.58");
                     case 50:
                         return t("courtesycars.labels.fuel.12");
                     case 38:
-                        return t("courtesycars.labels.fuel.38");
+                        return t("courtesycars.labels.fuel.34");
                     case 25:
                         return t("courtesycars.labels.fuel.14");
                     case 13:

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -19,7 +19,7 @@ export default function JobLifecycleDashboardComponent({data, bodyshop, ...cardP
                 setLoading(true);
                 const response = await axios.post("/job/lifecycle", {
                     jobids: data.job_lifecycle.map(x => x.id),
-                    statuses: bodyshop.md_ro_statuses
+                    statuses: bodyshop.md_order_statuses
                 });
                 setLifecycleData(response.data.durations);
                 setLoading(false);

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -23,6 +23,7 @@ export function JobEmployeeAssignments({
                                            jobRO,
                                            body,
                                            refinish,
+
                                            prep,
                                            csr,
                                            handleAdd,
@@ -77,7 +78,7 @@ export function JobEmployeeAssignments({
                             setVisibility(false);
                         }}
                     >
-                        {t("allocations.actions.assign")}
+                        Assign
                     </Button>
                     <Button onClick={() => setVisibility(false)}>Close</Button>
                 </Space>

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -44,13 +44,13 @@ export function JobEmployeeAssignmentsContainer({
         });
         if (refetch) refetch();
 
-        if (!!!result.errors) {
-            insertAuditTrail({
-                jobid: job.id,
-                operation: AuditTrailMapping.jobassignmentchange(operation, name),
-                type: "jobassignmentchange",
-            });
-        } else {
+        insertAuditTrail({
+            jobid: job.id,
+            operation: AuditTrailMapping.jobassignmentchange(operation, name),
+        type: "jobassignmentchange",
+    });
+
+        if (!!result.errors) {
             notification["error"]({
                 message: t("jobs.errors.assigning", {
                     message: JSON.stringify(result.errors),
@@ -68,19 +68,17 @@ export function JobEmployeeAssignmentsContainer({
             variables: {jobId: job.id, job: {[empAssignment]: null}},
         });
 
-        if (!!!result.errors) {
-            insertAuditTrail({
-                jobid: job.id,
-                operation: AuditTrailMapping.jobassignmentremoved(operation),
-                type: "jobassignmentremoved",
-            });
-        } else {
+        if (!!result.errors) {
             notification["error"]({
                 message: t("jobs.errors.assigning", {
                     message: JSON.stringify(result.errors),
                 }),
             });
         }
+        insertAuditTrail({
+            jobid: job.id,
+            operation: AuditTrailMapping.jobassignmentremoved(operation),
+        type: "jobassignmentremoved",});
         setLoading(false);
     };
 

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -82,7 +82,7 @@ export default function JobReconciliationBillsTable({
                 state.sortedInfo.order,
 
             render: (text, record) => (
-                <Checkbox  checked={record.bill.is_credit_memo}/>
+                <Checkbox disabled checked={record.bill.is_credit_memo}/>
             ),
         },
     ];

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -97,11 +97,7 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                                 job.scheduled_in ? (
                                     <Tag>
-                                        <Link
-                                            to={`/manage/schedule?date=${dayjs(
-                                                job.scheduled_in
-                                            ).format("YYYY-MM-DD")}`}
-                                        >
+                                        <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format('YYYY-MM-DD')}`}>
                                             <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                                         </Link>
                                     </Tag>
@@ -135,20 +131,20 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                             <DataLabel label={t("jobs.labels.contracts")}>
                                 {job.cccontracts.map((c, index) => (
                                     <Space wrap>
-                                        <Link
-                                            key={c.id}
-                                            to={`/manage/courtesycars/contracts/${c.id}`}
-                                        >
-                                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
-                                            {index !== job.cccontracts.length - 1 ? "," : null}
-                                        </Link>
+                                    <Link
+                                        key={c.id}
+                                        to={`/manage/courtesycars/contracts/${c.id}`}
+                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}{index !== job.cccontracts.length - 1 ? "," : null}
+                                    </Link>
                                     </Space>
                                 ))}
                             </DataLabel>
                         )}
+
                         <DataLabel label={t("jobs.fields.production_vars.note")}>
                             <ProductionListColumnProductionNote record={job}/>
                         </DataLabel>
+
                         <Space wrap>
                             {job.special_coverage_policy && (
                                 <Tag color="tomato">
@@ -221,12 +217,6 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.owner?.tax_number || ""}
                             </DataLabel>
                         )}
-                        <DataLabel
-                            label={t("owners.fields.note")}
-                            valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
-                        >
-                            {job.owner?.note || ""}
-                        </DataLabel>
                     </div>
                 </Card>
             </Col>

client/src/components/production-list-columns/production-list-columns.data.js

@@ -301,7 +301,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
       onFilter: (value, record) =>
         value.includes(record.special_coverage_policy),
       render: (text, record) => (
-        <Checkbox checked={record.special_coverage_policy} />
+        <Checkbox disabled checked={record.special_coverage_policy} />
       ),
     },
 

client/src/graphql/jobs.queries.js

@@ -708,7 +708,6 @@ export const GET_JOB_BY_PK = gql`
             other_amount_payable
             owner {
                 id
-                note
                 ownr_fn
                 ownr_ln
                 ownr_co_nm

client/src/pages/bills/bills.page.component.jsx

@@ -125,7 +125,9 @@ export function BillsListPage({
             sortOrder:
                 state.sortedInfo.columnKey === "is_credit_memo" &&
                 state.sortedInfo.order,
-            render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
+            render: (text, record) => (
+                <Checkbox disabled checked={record.is_credit_memo}/>
+            ),
         },
         {
             title: t("bills.fields.exported"),
@@ -134,7 +136,7 @@ export function BillsListPage({
             sorter: (a, b) => a.exported - b.exported,
             sortOrder:
                 state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
-            render: (text, record) => <Checkbox  checked={record.exported}/>,
+            render: (text, record) => <Checkbox disabled checked={record.exported}/>,
         },
         {
             title: t("general.labels.actions"),

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -162,7 +162,9 @@ sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
         { text: "False", value: false },
       ],
       onFilter: (value, record) => record.successful === value,
-        render: (text, record) => <Checkbox checked={record.successful} />,
+            render: (text, record) => (
+                <Checkbox disabled checked={record.successful}/>
+            ),
         },
         {
             title: t("general.labels.message"),

client/src/translations/en_us/common.json

@@ -1148,7 +1148,6 @@
         "loadingshop": "Loading shop data...",
         "loggingin": "Authorizing...",
         "markedexported": "Manually marked as exported.",
-        "media": "Media",
         "message": "Message",
         "monday": "Monday",
         "na": "N/A",

hasura/metadata/tables.yaml

@@ -569,13 +569,6 @@
           table:
             name: parts_orders
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: billid
-          table:
-            name: tasks
-            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -825,13 +818,6 @@
           table:
             name: inventory
             schema: public
-    - name: ioevents
-      using:
-        foreign_key_constraint_on:
-          column: bodyshopid
-          table:
-            name: ioevents
-            schema: public
     - name: jobs
       using:
         foreign_key_constraint_on:
@@ -860,13 +846,6 @@
           table:
             name: phonebook
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: bodyshopid
-          table:
-            name: tasks
-            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:
@@ -2696,13 +2675,6 @@
 - table:
     name: ioevents
     schema: public
-  object_relationships:
-    - name: bodyshop
-      using:
-        foreign_key_constraint_on: bodyshopid
-    - name: user
-      using:
-        foreign_key_constraint_on: useremail
 - table:
     name: job_ar_schema
     schema: public
@@ -2852,13 +2824,6 @@
           table:
             name: parts_order_lines
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: joblineid
-          table:
-            name: tasks
-            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -3346,13 +3311,6 @@
           table:
             name: scoreboard
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: jobid
-          table:
-            name: tasks
-            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:
@@ -5050,13 +5008,6 @@
           table:
             name: parts_order_lines
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: partsorderid
-          table:
-            name: tasks
-            schema: public
   insert_permissions:
     - role: user
       permission:
@@ -5672,128 +5623,6 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
-- table:
-    name: tasks
-    schema: public
-  object_relationships:
-    - name: bill
-      using:
-        foreign_key_constraint_on: billid
-    - name: bodyshop
-      using:
-        foreign_key_constraint_on: bodyshopid
-    - name: job
-      using:
-        foreign_key_constraint_on: jobid
-    - name: jobline
-      using:
-        foreign_key_constraint_on: joblineid
-    - name: parts_order
-      using:
-        foreign_key_constraint_on: partsorderid
-    - name: user
-      using:
-        foreign_key_constraint_on: assigned_to
-    - name: userByCreatedBy
-      using:
-        foreign_key_constraint_on: created_by
-  insert_permissions:
-    - role: user
-      permission:
-        check:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
-        columns:
-          - completed
-          - deleted
-          - priority
-          - assigned_to
-          - created_by
-          - description
-          - title
-          - completed_at
-          - created_at
-          - deleted_at
-          - due_date
-          - remind_at
-          - updated_at
-          - billid
-          - bodyshopid
-          - id
-          - jobid
-          - joblineid
-          - partsorderid
-  select_permissions:
-    - role: user
-      permission:
-        columns:
-          - completed
-          - deleted
-          - priority
-          - assigned_to
-          - created_by
-          - description
-          - title
-          - completed_at
-          - created_at
-          - deleted_at
-          - due_date
-          - remind_at
-          - updated_at
-          - billid
-          - bodyshopid
-          - id
-          - jobid
-          - joblineid
-          - partsorderid
-        filter:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
-  update_permissions:
-    - role: user
-      permission:
-        columns:
-          - completed
-          - deleted
-          - priority
-          - assigned_to
-          - created_by
-          - description
-          - title
-          - completed_at
-          - created_at
-          - deleted_at
-          - due_date
-          - remind_at
-          - updated_at
-          - billid
-          - bodyshopid
-          - id
-          - jobid
-          - joblineid
-          - partsorderid
-        filter:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
-        check: null
 - table:
     name: timetickets
     schema: public
@@ -6177,13 +6006,6 @@
           table:
             name: exportlog
             schema: public
-    - name: ioevents
-      using:
-        foreign_key_constraint_on:
-          column: useremail
-          table:
-            name: ioevents
-            schema: public
     - name: messages
       using:
         foreign_key_constraint_on:
@@ -6212,20 +6034,6 @@
           table:
             name: parts_orders
             schema: public
-    - name: tasks
-      using:
-        foreign_key_constraint_on:
-          column: assigned_to
-          table:
-            name: tasks
-            schema: public
-    - name: tasksByCreatedBy
-      using:
-        foreign_key_constraint_on:
-          column: created_by
-          table:
-            name: tasks
-            schema: public
     - name: timetickets
       using:
         foreign_key_constraint_on:

hasura/migrations/1710532848432_create_table_public_tasks/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."tasks";

hasura/migrations/1710532848432_create_table_public_tasks/up.sql

@@ -1,18 +0,0 @@
-CREATE TABLE "public"."tasks" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "title" text NOT NULL, "description" Text, "deleted" boolean NOT NULL DEFAULT false, "deleted_at" timestamptz, "due_date" timestamptz, "created_by" text NOT NULL, "assigned_to" Text, "completed" boolean NOT NULL DEFAULT false, "completed_at" timestamptz, "remind_at" timestamptz, "priority" numeric, "bodyshopid" UUID NOT NULL, "jobid" UUID NOT NULL, "joblineid" UUID, "partsorderid" UUID, "billid" UUID, PRIMARY KEY ("id") , FOREIGN KEY ("created_by") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("assigned_to") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE cascade ON DELETE cascade, FOREIGN KEY ("joblineid") REFERENCES "public"."joblines"("id") ON UPDATE set null ON DELETE set null, FOREIGN KEY ("partsorderid") REFERENCES "public"."parts_orders"("id") ON UPDATE set null ON DELETE set null, FOREIGN KEY ("billid") REFERENCES "public"."bills"("id") ON UPDATE set null ON DELETE set null);
-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_tasks_updated_at"
-BEFORE UPDATE ON "public"."tasks"
-FOR EACH ROW
-EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
-COMMENT ON TRIGGER "set_public_tasks_updated_at" ON "public"."tasks" 
-IS 'trigger to set value of column "updated_at" to current timestamp on row update';
-CREATE EXTENSION IF NOT EXISTS pgcrypto;