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,6 +4019,9 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         rome: <ShopInfoResponsibilitycentersTaxesComponent form={form} />
       })}
 
+      {InstanceRenderManager({
+        rome: (
+          <>
             <Form.Item
               label={t("bodyshop.fields.responsibilitycenters.itemexemptcode")}
               rules={[
@@ -4043,6 +4046,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             >
               <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,6 +207,8 @@ export function TimeTicketList({
               }
             }
           },
+  
+        ]),
         {
           title: t("timetickets.fields.created_by"),
           dataIndex: "created_by",
@@ -274,7 +276,6 @@ export function TimeTicketList({
             </Space>
           )
         }
-        ])
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

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

@@ -215,14 +215,6 @@ export function TimeTicketModalComponent({
               >
                 <InputNumber precision={1} />
               </Form.Item>
-              {
-                // <TimeTicketCalculatorComponent
-                //     jobid={form.getFieldValue("jobid")}
-                //     setProductiveHours={(productivehrs) =>
-                //         form.setFieldsValue({productivehrs})
-                //     }
-                // />
-              }
             </>
           )}
         </Form.Item>