Merged in feature/IO-2902-Duplicate-RBAC-Items (pull request #1686)

IO-2902 Duplicate RBAC Items

Approved-by: Dave Richer

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

@@ -30,7 +30,8 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        {...HasFeatureAccess({ featureName: "export", bodyshop }) ? [
+        {...HasFeatureAccess({ featureName: "export", bodyshop })
+          ? [
               <Form.Item
                 label={t("bodyshop.fields.rbac.accounting.exportlog")}
                 rules={[
@@ -79,8 +80,10 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
               >
                 <InputNumber />
               </Form.Item>
-        ]:[]}
+            ]
-        {...HasFeatureAccess({ featureName: "bills", bodyshop }) ? [
+          : []}
+        {...HasFeatureAccess({ featureName: "bills", bodyshop })
+          ? [
               <Form.Item
                 label={t("bodyshop.fields.rbac.bills.delete")}
                 rules={[
@@ -141,9 +144,10 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
               >
                 <InputNumber />
               </Form.Item>
-        ]:[]}
+            ]
-
+          : []}
-        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) ? [
+        {...HasFeatureAccess({ featureName: "courtesycars", bodyshop })
+          ? [
               <Form.Item
                 label={t("bodyshop.fields.rbac.contracts.create")}
                 rules={[
@@ -216,8 +220,10 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
               >
                 <InputNumber />
               </Form.Item>
-        ]:[]}
+            ]
-        {...HasFeatureAccess({ featureName: "csi", bodyshop }) ? [
+          : []}
+        {...HasFeatureAccess({ featureName: "csi", bodyshop })
+          ? [
               <Form.Item
                 label={t("bodyshop.fields.rbac.csi.export")}
                 rules={[
@@ -242,7 +248,8 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
               >
                 <InputNumber />
               </Form.Item>
-        ]:[]}
+            ]
+          : []}
         <Form.Item
           label={t("bodyshop.fields.rbac.employees.page")}
           rules={[
@@ -255,6 +262,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.employee_teams.page")}
+          rules={[
+            {
+              required: true
+              //message: t("general.validation.required"),
+            }
+          ]}
+          name={["md_rbac", "employee_teams:page"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.jobs.admin")}
           rules={[
@@ -435,31 +454,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.employees.page")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_rbac", "employees:page"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.employee_teams.page")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_rbac", "employee_teams:page"]}
-        >
-          <InputNumber />
-        </Form.Item>
-
         <Form.Item
           label={t("bodyshop.fields.rbac.payments.enter")}
           rules={[
@@ -522,7 +516,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("bodyshop.fields.rbac.production.list")}
           rules={[
@@ -561,7 +554,8 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-        {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) ? [
+        {...HasFeatureAccess({ featureName: "timetickets", bodyshop })
+          ? [
               <Form.Item
                 label={t("bodyshop.fields.rbac.shiftclock.view")}
                 rules={[
@@ -669,20 +663,9 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
                 name={["md_rbac", "timetickets:list"]}
               >
                 <InputNumber />
-          </Form.Item>,
-          <Form.Item
-            label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-            name={["md_rbac", "timetickets:shiftedit"]}
-          >
-            <InputNumber />
               </Form.Item>
-        ]:[]}
+            ]
+          : []}
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.vendors")}
           rules={[
@@ -757,7 +740,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
             <InputNumber />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("bodyshop.fields.rbac.users.editaccess")}
           rules={[