Merged in release/2024-11-01 (pull request #1874)

Release/2024-11-01 IO-3012 IO-3009 IO 3010
2024-10-31 17:07:31 +00:00
parent a715fccd47 d4adc4c1aa
commit dba41e7732
8 changed files with 88 additions and 105 deletions
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -2,11 +2,11 @@ import { DatePicker } from "antd";
 import PropTypes from "prop-types";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import dayjs from "../../utils/day";
-import { fuzzyMatchDate } from "./formats.js";
+import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
-import { connect } from "react-redux";
+import dayjs from "../../utils/day";
+import { fuzzyMatchDate } from "./formats.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -28,7 +28,6 @@ const DateTimePicker = ({

  const handleChange = useCallback(
    (newDate) => {
-      if (!newDate) return;
      if (onChange) {
        onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
      }
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -144,7 +144,7 @@ function TaskListComponent({
    title: t("tasks.fields.created_by"),
    dataIndex: "created_by",
    key: "created_by",
-    width: "10%",
+    width: "8%",
    defaultSortOrder: "descend",
    sorter: true,
    sortOrder: sortcolumn === "created_by" && sortorder,
@@ -166,65 +166,70 @@ function TaskListComponent({
    });
  }

-  if (showRo) {
-    columns.push({
-      title: t("tasks.fields.job.ro_number"),
-      dataIndex: ["job", "ro_number"],
-      key: "job.ro_number",
-      width: "8%",
-      render: (text, record) =>
-        record.job ? (
-          <Link to={`/manage/jobs/${record.job.id}?tab=tasks`}>{record.job.ro_number || t("general.labels.na")}</Link>
-        ) : (
-          t("general.labels.na")
-        )
-    });
-  }
+  columns.push({
+    title: t("tasks.fields.related_items"),
+    key: "related_items",
+    width: "12%",
+    render: (text, record) => {
+      const items = [];
+
+      // Job
+      if (showRo && record.job) {
+        items.push(
+          <Link key="job" to={`/manage/jobs/${record.job.id}?tab=tasks`}>
+            {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
+          </Link>
+        );
+      }
+      if (showRo && !record.job) {
+        items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
+      }
+
+      // Jobline
+      if (record.jobline?.line_desc) {
+        items.push(
+          <span key="jobline">
+            {t("tasks.fields.jobline")}: {record.jobline.line_desc}
+          </span>
+        );
+      }
+
+      // Parts Order
+      if (record.parts_order) {
+        const { order_number, vendor } = record.parts_order;
+        const partsOrderText =
+          order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
+        items.push(
+          <Link
+            key="parts_order"
+            to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}
+          >
+            {t("tasks.fields.parts_order")}: {partsOrderText}
+          </Link>
+        );
+      }
+
+      // Bill
+      if (record.bill) {
+        const { invoice_number, vendor } = record.bill;
+        const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
+        items.push(
+          <Link key="bill" to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
+            {t("tasks.fields.bill")}: {billText}
+          </Link>
+        );
+      }
+
+      return items.length > 0 ? <Space direction="vertical">{items}</Space> : null;
+    }
+  });

  columns.push(
-    {
-      title: t("tasks.fields.jobline"),
-      dataIndex: ["jobline", "id"],
-      key: "jobline.id",
-      width: "8%",
-      render: (text, record) => record?.jobline?.line_desc || ""
-    },
-    {
-      title: t("tasks.fields.parts_order"),
-      dataIndex: ["parts_order", "id"],
-      key: "part_order.id",
-      width: "8%",
-      render: (text, record) =>
-        record.parts_order ? (
-          <Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
-            {record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
-              ? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
-              : t("general.labels.na")}
-          </Link>
-        ) : (
-          ""
-        )
-    },
-    {
-      title: t("tasks.fields.bill"),
-      dataIndex: ["bill", "id"],
-      key: "bill.id",
-      width: "10%",
-      render: (text, record) =>
-        record.bill ? (
-          <Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
-            {record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
-              ? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
-              : t("general.labels.na")}
-          </Link>
-        ) : (
-          ""
-        )
-    },
    {
      title: t("tasks.fields.title"),
      dataIndex: "title",
      key: "title",
+      minWidth: "20%",
      sorter: true,
      sortOrder: sortcolumn === "title" && sortorder
    },
@@ -258,7 +263,7 @@ function TaskListComponent({
    {
      title: t("tasks.fields.actions"),
      key: "toggleCompleted",
-      width: "5%",
+      width: "8%",
      render: (text, record) => (
        <Space direction="horizontal">
          <Button
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -145,7 +145,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
  ) {
    timetickets(
      where: { date: { _gte: $start, _lte: $end }, cost_center: { _neq: "timetickets.labels.shift" } }
-      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
@@ -180,7 +179,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
    }
    fixedperiod: timetickets(
      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: { _neq: "timetickets.labels.shift" } }
-      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -3204,6 +3204,7 @@
          "medium": "Medium"
        },
        "priority": "Priority",
+        "related_items": "Related Items",
        "remind_at": "Remind At",
        "title": "Title"
      },
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -3204,6 +3204,7 @@
          "medium": ""
        },
        "priority": "",
+        "related_items": "",
        "remind_at": "",
        "title": ""
      },
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -3204,6 +3204,7 @@
          "medium": ""
        },
        "priority": "",
+        "related_items": "",
        "remind_at": "",
        "title": ""
      },
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -69,7 +69,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          jobline:
            job:
@@ -180,7 +179,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -387,7 +385,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -504,7 +501,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bill:
            job:
@@ -671,7 +667,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          _and:
            - job:
@@ -1285,7 +1280,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          courtesycar:
            bodyshop:
@@ -1526,7 +1520,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -1786,7 +1779,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -1920,7 +1912,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          _or:
            - job:
@@ -2105,7 +2096,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          employee_team:
            bodyshop:
@@ -2268,7 +2258,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          employee:
            bodyshop:
@@ -2449,7 +2438,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -2696,7 +2684,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -2808,7 +2795,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          conversation:
            bodyshop:
@@ -3123,7 +3109,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          job:
            bodyshop:
@@ -4232,7 +4217,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -4248,41 +4232,41 @@
        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
+            - alt_transport
+            - v_model_desc
+            - clm_no
+            - v_make_desc
+            - date_next_contact
+            - status
+            - employee_csr
+            - actual_in
+            - v_model_yr
+            - comment
+            - job_totals
+            - ownr_fn
+            - v_color
+            - ca_gst_registrant
            - 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
@@ -4295,6 +4279,12 @@
        - name: event-secret
          value_from_env: EVENT_SECRET
      request_transform:
+        body:
+          action: transform
+          template: |-
+            {
+              "data": {{$body?.event?.data?.new}}
+            }
        method: POST
        query_params: {}
        template_engine: Kriti
@@ -4496,7 +4486,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          conversation:
            bodyshop:
@@ -4670,7 +4659,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          job:
            bodyshop:
@@ -4805,7 +4793,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -5110,7 +5097,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          parts_order:
            job:
@@ -5243,7 +5229,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          job:
            bodyshop:
@@ -5419,7 +5404,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          job:
            bodyshop:
@@ -5559,7 +5543,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -5670,7 +5653,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          _or:
            - parentjob_rel:
@@ -5760,7 +5742,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          job:
            bodyshop:
@@ -6045,7 +6026,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -6541,7 +6521,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
@@ -6698,7 +6677,6 @@
  delete_permissions:
    - role: user
      permission:
-        backend_only: false
        filter:
          bodyshop:
            associations:
--- a/server/job/job-updated.js
+++ b/server/job/job-updated.js
@@ -3,7 +3,7 @@ const { isObject } = require("lodash");
 const jobUpdated = async (req, res) => {
  const { ioRedis, logger, ioHelpers } = req;

-  if (!req?.body?.event?.data?.new || !isObject(req?.body?.event?.data?.new)) {
+  if (!req?.body?.data || !isObject(req.body.data)) {
    logger.log("job-update-error", "ERROR", req.user?.email, null, {
      message: `Malformed Job Update request sent from Hasura`,
      body: req?.body
@@ -22,7 +22,7 @@ const jobUpdated = async (req, res) => {
  //   jobid: req?.body?.event?.data?.new?.id
  // });

-  const updatedJob = req.body.event.data.new;
+  const updatedJob = req.body.data;
  const bodyshopID = updatedJob.shopid;

  // Emit the job-updated event only to the room corresponding to the bodyshop