IO-2381 Disabled Cancel Appt Button

client/src/components/job-at-change/schedule-event.component.jsx

@@ -29,11 +29,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -208,46 +208,56 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
-        <Popover
-          trigger="click"
-          disabled={event.arrived}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={({ lost_sale_reason }) => {
-                handleCancel({ id: event.id, lost_sale_reason });
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
-              >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button htmlType="submit">
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
+        {event.arrived ? (
           <Button
             // onClick={() => handleCancel(event.id)}
             disabled={event.arrived}
           >
             {t("appointments.actions.cancel")}
           </Button>
-        </Popover>
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={event.arrived}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={({ lost_sale_reason }) => {
+                  handleCancel({ id: event.id, lost_sale_reason });
+                }}
+              >
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button htmlType="submit">
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            <Button
+              // onClick={() => handleCancel(event.id)}
+              disabled={event.arrived}
+            >
+              {t("appointments.actions.cancel")}
+            </Button>
+          </Popover>
+        )}
+
         {event.isintake ? (
           <Button
             disabled={event.arrived}

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

@@ -137,63 +137,67 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
-        <Popover
-          trigger="click"
-          disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
-          content={
-            <Form
-              layout="vertical"
-              onFinish={async ({ lost_sale_reason }) => {
-                const jobUpdate = await cancelAllAppointments({
-                  variables: {
-                    jobid: job.id,
-                    job: {
-                      date_scheduled: null,
-                      scheduled_in: null,
-                      scheduled_completion: null,
-                      lost_sale_reason,
-                      status: bodyshop.md_ro_statuses.default_imported,
+        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
+          t("menus.jobsactions.cancelallappointments")
+        ) : (
+          <Popover
+            trigger="click"
+            disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
+            content={
+              <Form
+                layout="vertical"
+                onFinish={async ({ lost_sale_reason }) => {
+                  const jobUpdate = await cancelAllAppointments({
+                    variables: {
+                      jobid: job.id,
+                      job: {
+                        date_scheduled: null,
+                        scheduled_in: null,
+                        scheduled_completion: null,
+                        lost_sale_reason,
+                        status: bodyshop.md_ro_statuses.default_imported,
+                      },
                     },
-                  },
-                });
-                if (!jobUpdate.errors) {
-                  notification["success"]({
-                    message: t("appointments.successes.canceled"),
                   });
-                  return;
-                }
-              }}
-            >
-              <Form.Item
-                name="lost_sale_reason"
-                label={t("jobs.fields.lost_sale_reason")}
-                rules={[
-                  {
-                    required: true,
-                    //message: t("general.validation.required"),
-                  },
-                ]}
+                  if (!jobUpdate.errors) {
+                    notification["success"]({
+                      message: t("appointments.successes.canceled"),
+                    });
+                    return;
+                  }
+                }}
               >
-                <Select
-                  options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
-                    label: lsr,
-                    value: lsr,
-                  }))}
-                />
-              </Form.Item>
-              <Button
-                htmlType="submit"
-                disabled={
-                  job.status !== bodyshop.md_ro_statuses.default_scheduled
-                }
-              >
-                {t("appointments.actions.cancel")}
-              </Button>
-            </Form>
-          }
-        >
-          {t("menus.jobsactions.cancelallappointments")}
-        </Popover>
+                <Form.Item
+                  name="lost_sale_reason"
+                  label={t("jobs.fields.lost_sale_reason")}
+                  rules={[
+                    {
+                      required: true,
+                      //message: t("general.validation.required"),
+                    },
+                  ]}
+                >
+                  <Select
+                    options={bodyshop.md_lost_sale_reasons.map((lsr) => ({
+                      label: lsr,
+                      value: lsr,
+                    }))}
+                  />
+                </Form.Item>
+                <Button
+                  htmlType="submit"
+                  disabled={
+                    job.status !== bodyshop.md_ro_statuses.default_scheduled
+                  }
+                >
+                  {t("appointments.actions.cancel")}
+                </Button>
+              </Form>
+            }
+          >
+            {t("menus.jobsactions.cancelallappointments")}
+          </Popover>
+        )}
       </Menu.Item>
       <Menu.Item
         disabled={

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

@@ -6,7 +6,6 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -16,15 +15,6 @@ const mapStateToProps = createStructuredSelector({
 function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
-  
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -36,9 +26,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.vehicle"),
@@ -59,17 +46,11 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -79,9 +60,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -102,7 +80,6 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
         scroll={{ x: true }}
         rowKey="id"
         dataSource={owner.jobs}
-        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

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

@@ -6,9 +6,8 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, statusSort } from "../../utils/sorters";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -17,14 +16,6 @@ const mapStateToProps = createStructuredSelector({
 export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" },
-  });
-
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-  };
 
   const columns = [
     {
@@ -37,9 +28,6 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
           {record.ro_number || t("general.labels.na")}
         </Link>
       ),
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.owner"),
@@ -55,17 +43,11 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.clm_no"),
       dataIndex: "clm_no",
       key: "clm_no",
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
     },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
       key: "status",
-      sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
-      sortOrder:
-        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
 
     {
@@ -75,9 +57,6 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       render: (text, record) => (
         <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
       ),
-      sorter: (a, b) => a.clm_total - b.clm_total,
-      sortOrder:
-        state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
     },
   ];
 
@@ -97,7 +76,6 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
         rowKey="id"
         scroll={{ x: true }}
         dataSource={vehicle.jobs}
-        onChange={handleTableChange}
         rowSelection={{
           onSelect: (record, selected, selectedRows) => {
             setSelectedJobs(selectedRows ? selectedRows.map((i) => i.id) : []);

client/src/graphql/owners.queries.js

@@ -69,7 +69,7 @@ export const QUERY_OWNER_BY_ID = gql`
       preferred_contact
       note
       tax_number
-      jobs(order_by: { date_open: desc }) {
+      jobs {
         id
         ro_number
         clm_no

client/src/graphql/vehicles.queries.js

@@ -28,10 +28,11 @@ export const QUERY_VEHICLE_BY_ID = gql`
       updated_at
       trim_color
       notes
-      jobs(order_by: { date_open: desc }) {
+      jobs {
         id
         ro_number
         ownr_fn
+
         ownr_ln
         owner {
           id