IO-2589 Allow Company Only for Customer Creation

IO-2520 Adjust to imexshopid instead of shopname & prettify

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -19,10 +19,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_ln")}
           name={["owner", "data", "ownr_ln"]}
           rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
               //message: t("general.validation.required"),
-            },
+            }),
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -31,10 +34,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_fn")}
           name={["owner", "data", "ownr_fn"]}
           rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
               //message: t("general.validation.required"),
-            },
+            }),
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -51,6 +57,17 @@ export default function JobsCreateOwnerInfoNewComponent() {
         <Form.Item
           label={t("owners.fields.ownr_co_nm")}
           name={["owner", "data", "ownr_co_nm"]}
+          rules={[
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_ln"]) ||
+                  !getFieldValue(["owner", "data", "ownr_fn"]) ||
+                  getFieldValue(["owner", "data", "ownr_ln"]) === "" ||
+                  getFieldValue(["owner", "data", "ownr_fn"]) === ""),
+              //message: t("general.validation.required"),
+            }),
+          ]}
         >
           <Input disabled={!state.owner.new} />
         </Form.Item>

server/data/kaizen.js

@@ -29,17 +29,24 @@ const ftpSetup = {
   password: process.env.KAIZEN_PASSWORD,
   debug: (message, ...data) => logger.log(message, "DEBUG", "api", null, data),
   algorithms: {
-    serverHostKey: ["ssh-rsa", "ssh-dss"],
+    serverHostKey: [
+      "ssh-rsa",
+      "ssh-dss",
+      "rsa-sha2-256",
+      "rsa-sha2-512",
+      "ecdsa-sha2-nistp256",
+      "ecdsa-sha2-nistp384",
+    ],
   },
 };
 
 exports.default = async (req, res) => {
   //Query for the List of Bodyshop Clients.
   logger.log("kaizen-start", "DEBUG", "api", null, null);
-  const kaizenShopsNames = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
+  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
 
   const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
-    shopname: kaizenShopsNames,
+    imexshopid: kaizenShopsIDs,
   });
 
   const specificShopIds = req.body.bodyshopIds; // ['uuid]

server/graphql-client/queries.js

@@ -1739,8 +1739,8 @@ exports.GET_ENTEGRAL_SHOPS = `query GET_ENTEGRAL_SHOPS {
   }
 }`;
 
-exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($shopname: [String]) {
-  bodyshops(where: {shopname: {_in: $shopname}}){
+exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($imexshopid: [String]) {
+  bodyshops(where: {imexshopid: {_in: $imexshopid}}){
       id
       shopname
       address1