IO-3366 Shop General Field Validators

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -10,12 +10,9 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
-
-export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
-
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
+export function JobPartsQueueCount({ bodyshop, parts, style }) {
   const partsStatus = useMemo(() => {
     if (!parts) return null;
     return parts.reduce(
@@ -38,34 +35,35 @@ export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT
   }, [bodyshop, parts]);
 
   if (!parts) return null;
+
   return (
-    <Row>
-      <Col {...defaultColLayout}>
+    <Row style={style}>
+      <Col span={4}>
         <Tooltip title="Total">
           <Tag>{partsStatus.total}</Tag>
         </Tooltip>
       </Col>
-      <Col {...defaultColLayout}>
+      <Col span={4}>
         <Tooltip title="No Status">
           <Tag color="gold">{partsStatus["null"]}</Tag>
         </Tooltip>
       </Col>
-      <Col {...defaultColLayout}>
+      <Col span={4}>
         <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
           <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
         </Tooltip>
       </Col>
-      <Col {...defaultColLayout}>
+      <Col span={4}>
         <Tooltip title={bodyshop.md_order_statuses.default_received}>
           <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
         </Tooltip>
       </Col>
-      <Col {...defaultColLayout}>
+      <Col span={4}>
         <Tooltip title={bodyshop.md_order_statuses.default_returned}>
           <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
         </Tooltip>
       </Col>
-      <Col {...defaultColLayout}>
+      <Col span={4}>
         <Tooltip title={bodyshop.md_order_statuses.default_bo}>
           <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
         </Tooltip>

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -233,7 +233,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

client/src/components/shop-info/shop-info.general.component.jsx

@@ -1183,7 +1183,17 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                   {fields.map((field, index) => (
                     <Form.Item key={field.key}>
                       <LayoutFormRow noDivider>
-                        <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                        <Form.Item
+                          label={t("general.labels.label")}
+                          key={`${index}label`}
+                          name={[field.name, "label"]}
+                          rules={[
+                            {
+                              required: true
+                              //message: t("general.validation.required"),
+                            }
+                          ]}
+                        >
                           <Input />
                         </Form.Item>
                         <Form.Item
@@ -1294,7 +1304,17 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                 {fields.map((field, index) => (
                   <Form.Item key={field.key}>
                     <LayoutFormRow noDivider>
-                      <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                      <Form.Item
+                        label={t("general.labels.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
                         <Input />
                       </Form.Item>
                       <Form.Item
@@ -1483,15 +1503,31 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                 {fields.map((field, index) => (
                   <Form.Item key={field.key}>
                     <LayoutFormRow noDivider>
-                      <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                      <Form.Item
+                        label={t("general.labels.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
                         <Input />
                       </Form.Item>
                       <Form.Item
                         label={t("bodyshop.labels.md_to_emails_emails")}
                         key={`${index}emails`}
                         name={[field.name, "emails"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
                       >
-                        <Select mode="tags" tokenSeparators={[",", ";"]} />
+                        <FormItemEmail email={form.getFieldValue([field.name, "emails"])} />
                       </Form.Item>
 
                       <Space>

client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx

@@ -147,7 +147,7 @@ export function SimplifiedPartsJobsListComponent({
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js

@@ -88,7 +88,7 @@ const partsManagementDeprovisioning = async (req, res) => {
   const { logger } = req;
   const { shopId } = req.body;
 
-  if (process.env.NODE_ENV === "production" || process.env.HOSTNAME?.endsWith("compute.internal")) {
+  if (process.env.NODE_ENV === "production") {
     return res.status(403).json({ error: "Deprovisioning not allowed in production environment." });
   }
 

server/routes/intergrationRoutes.js

@@ -1,6 +1,5 @@
 const express = require("express");
 const router = express.Router();
-const logger = require("../../server/utils/logger");
 
 // Pull secrets from env
 const { VSSTA_INTEGRATION_SECRET, PARTS_MANAGEMENT_INTEGRATION_SECRET } = process.env;
@@ -12,7 +11,7 @@ if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.len
 
   router.post("/vssta", vsstaMiddleware, vsstaIntegration);
 } else {
-  logger.logger.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
+  console.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
 }
 
 // Only load Parts Management routes if that secret is set
@@ -46,17 +45,14 @@ if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_
   );
 
   // Deprovisioning route
-  if (process.env.NODE_ENV !== "production" && !process.env.HOSTNAME?.endsWith("compute.internal")) {
-    logger.logger.warn("Parts Management Deprovisioning route has been loaded.");
-    router.post("/parts-management/deprovision", partsManagementIntegrationMiddleware, partsManagementDeprovisioning);
-  }
+  router.post("/parts-management/deprovision", partsManagementIntegrationMiddleware, partsManagementDeprovisioning);
 
   /**
    * Route to handle Parts Management Provisioning
    */
   router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
 } else {
-  logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
+  console.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
 }
 
 module.exports = router;