Minor bug fixes & Rome CI

.circleci/config.yml

@@ -132,7 +132,7 @@ jobs:
           name: Install Dependencies
           command: npm i
 
-      - run: npm run build:rome
+      - run: npm run build:production:rome
 
       - aws-cli/setup:
           aws_access_key_id: AWS_ACCESS_KEY_ID
@@ -144,6 +144,31 @@ jobs:
           to: "s3://rome-online-production/"
           arguments: "--exclude '*.map'"
 
+  promanager-app-build:
+    docker:
+      - image: cimg/node:18.18.2
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:production:promanager
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://promanager-production/"
+          arguments: "--exclude '*.map'"
+
   test-rome-hasura-migrate:
     docker:
       - image: cimg/node:18.18.2
@@ -188,6 +213,31 @@ jobs:
           to: "s3://rome-online-test/"
           arguments: "--exclude '*.map'"
 
+  test-promanager-app-build:
+    docker:
+      - image: cimg/node:18.18.2
+
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:test:promanager
+
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
+      - aws-s3/sync:
+          from: dist
+          to: "s3://promanager-testing/"
+          arguments: "--exclude '*.map'"
+
   test-hasura-migrate:
     docker:
       - image: cimg/node:18.18.2
@@ -307,16 +357,16 @@ workflows:
       - rome-api-deploy:
           filters:
             branches:
-              only: rome/master
+              only: master-AIO
       - rome-app-build:
           filters:
             branches:
-              only: rome/master
+              only: master-AIO
       - rome-hasura-migrate:
           secret: ${HASURA_PROD_SECRET}
           filters:
             branches:
-              only: rome/master
+              only: master-AIO
       - imex-test-app-build:
           filters:
             branches:
@@ -334,6 +384,14 @@ workflows:
           filters:
             branches:
               only: test-AIO
+      - test-promanager-app-build:
+          filters:
+            branches:
+              only: test-AIO
+      - promanager-app-build:
+          filters:
+            branches:
+              only: master-AIO
       - test-rome-hasura-migrate:
           secret: ${HASURA_ROME_TEST_SECRET}
           filters:

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -118,8 +118,8 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             {job?.cccontracts?.length > 0 && (
               <DataLabel label={t("jobs.labels.contracts")}>
                 {job.cccontracts.map((c, index) => (
-                  <Space wrap>
+                  <Space key={c.id} wrap>
-                    <Link key={c.id} to={`/manage/courtesycars/contracts/${c.id}`}>
+                    <Link  to={`/manage/courtesycars/contracts/${c.id}`}>
                       {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
                       {index !== job.cccontracts.length - 1 ? "," : null}
                     </Link>

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

@@ -4019,30 +4019,38 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         rome: <ShopInfoResponsibilitycentersTaxesComponent form={form} />
       })}
 
-      <Form.Item
+      {InstanceRenderManager({
-        label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
+        rome: (
-        rules={[
+          <>
-          {
+            <Form.Item
-            required: true
+              label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
-            //message: t("general.validation.required"),
+              rules={[
-          }
+                {
-        ]}
+                  required: true
-        name={["md_responsibility_centers", "taxes", "itemexemptcode"]}
+                  //message: t("general.validation.required"),
-      >
+                }
-        <Input />
+              ]}
-      </Form.Item>
+              name={["md_responsibility_centers", "taxes", "itemexemptcode"]}
-      <Form.Item
+            >
-        label={t("bodyshop.fields.responsibilitycenters.invoiceexemptcode")}
+              <Input />
-        rules={[
+            </Form.Item>
-          {
+            <Form.Item
-            required: true
+              label={t("bodyshop.fields.responsibilitycenters.invoiceexemptcode")}
-            //message: t("general.validation.required"),
+              rules={[
-          }
+                {
-        ]}
+                  required: true
-        name={["md_responsibility_centers", "taxes", "invoiceexemptcode"]}
+                  //message: t("general.validation.required"),
-      >
+                }
-        <Input />
+              ]}
-      </Form.Item>
+              name={["md_responsibility_centers", "taxes", "invoiceexemptcode"]}
+            >
+              <Input />
+            </Form.Item>
+          </>
+        ),
+        promanager: "USE_ROME"
+      })}
+
       {/*<LayoutFormRow id="local_tax">*/}
       {/*  <Form.Item*/}
       {/*    label={t("bodyshop.fields.responsibilitycenters.local_tax")}*/}

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -207,74 +207,75 @@ export function TimeTicketList({
               }
             }
           },
-          {
+  
-            title: t("timetickets.fields.created_by"),
+        ]),
-            dataIndex: "created_by",
+        {
-            key: "created_by",
+          title: t("timetickets.fields.created_by"),
-            sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+          dataIndex: "created_by",
-            sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+          key: "created_by",
-            render: (text, record) => record.created_by
+          sorter: (a, b) => alphaSort(a.created_by, b.created_by),
-          },
+          sortOrder: state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
-          // {
+          render: (text, record) => record.created_by
-          //   title: "Pay",
+        },
-          //   dataIndex: "pay",
+        // {
-          //   key: "pay",
+        //   title: "Pay",
-          //   render: (text, record) =>
+        //   dataIndex: "pay",
-          //     Dinero({ amount: Math.round(record.rate * 100) })
+        //   key: "pay",
-          //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
+        //   render: (text, record) =>
-          //       .toFormat("$0.00"),
+        //     Dinero({ amount: Math.round(record.rate * 100) })
-          // },
+        //       .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
-          {
+        //       .toFormat("$0.00"),
-            title: t("general.labels.actions"),
+        // },
-            dataIndex: "actions",
+        {
-            key: "actions",
+          title: t("general.labels.actions"),
-            render: (text, record) => (
+          dataIndex: "actions",
-              <Space wrap>
+          key: "actions",
-                {techConsole && (
+          render: (text, record) => (
+            <Space wrap>
+              {techConsole && (
+                <TimeTicketEnterButton
+                  actions={{ refetch }}
+                  context={{ id: record.id, timeticket: record }}
+                  disabled={!record.job || disabled}
+                >
+                  <EditFilled />
+                </TimeTicketEnterButton>
+              )}
+              {!techConsole && (
+                <RbacWrapper
+                  action="timetickets:edit"
+                  noauth={() => {
+                    return <div />;
+                  }}
+                >
                   <TimeTicketEnterButton
                     actions={{ refetch }}
-                    context={{ id: record.id, timeticket: record }}
+                    context={{
-                    disabled={!record.job || disabled}
+                      id: record.id,
+                      timeticket: record
+                    }}
+                    disabled={
+                      HasRbacAccess({
+                        bodyshop,
+                        authLevel: authLevel,
+                        action: "timetickets:editcommitted"
+                      }) &&
+                      HasRbacAccess({
+                        bodyshop,
+                        authLevel: authLevel,
+                        action: "timetickets:shiftedit"
+                      })
+                        ? disabled
+                        : !record.jobid
+                    }
                   >
                     <EditFilled />
                   </TimeTicketEnterButton>
-                )}
+                </RbacWrapper>
-                {!techConsole && (
+              )}
-                  <RbacWrapper
+            </Space>
-                    action="timetickets:edit"
+          )
-                    noauth={() => {
+        }
-                      return <div />;
-                    }}
-                  >
-                    <TimeTicketEnterButton
-                      actions={{ refetch }}
-                      context={{
-                        id: record.id,
-                        timeticket: record
-                      }}
-                      disabled={
-                        HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:editcommitted"
-                        }) &&
-                        HasRbacAccess({
-                          bodyshop,
-                          authLevel: authLevel,
-                          action: "timetickets:shiftedit"
-                        })
-                          ? disabled
-                          : !record.jobid
-                      }
-                    >
-                      <EditFilled />
-                    </TimeTicketEnterButton>
-                  </RbacWrapper>
-                )}
-              </Space>
-            )
-          }
-        ])
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -60,8 +60,8 @@ export function TimeTicketModalComponent({
               {item.cost_center === "timetickets.labels.shift"
                 ? t(item.cost_center)
                 : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
-                  ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                  : item.cost_center}
+                : item.cost_center}
             </Select.Option>
           ))}
       </Select>
@@ -215,14 +215,6 @@ export function TimeTicketModalComponent({
               >
                 <InputNumber precision={1} />
               </Form.Item>
-              {
-                // <TimeTicketCalculatorComponent
-                //     jobid={form.getFieldValue("jobid")}
-                //     setProductiveHours={(productivehrs) =>
-                //         form.setFieldsValue({productivehrs})
-                //     }
-                // />
-              }
             </>
           )}
         </Form.Item>