Merged in feature/IO-3255-simplified-part-management (pull request #2552)

feature/IO-3255-simplified-parts-management -Extra checks

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

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

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") {
+  if (process.env.NODE_ENV === "production" || process.env.HOSTNAME?.endsWith("compute.internal")) {
     return res.status(403).json({ error: "Deprovisioning not allowed in production environment." });
   }
 

server/routes/intergrationRoutes.js

@@ -1,5 +1,6 @@
 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;
@@ -11,7 +12,7 @@ if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.len
 
   router.post("/vssta", vsstaMiddleware, vsstaIntegration);
 } else {
-  console.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
+  logger.logger.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
 }
 
 // Only load Parts Management routes if that secret is set
@@ -45,14 +46,17 @@ if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_
   );
 
   // Deprovisioning route
-  router.post("/parts-management/deprovision", partsManagementIntegrationMiddleware, partsManagementDeprovisioning);
+  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);
+  }
 
   /**
    * Route to handle Parts Management Provisioning
    */
   router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
 } else {
-  console.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
+  logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
 }
 
 module.exports = router;