From 52cf4f3d1f5827fc04a960a09f710ba4cdd04178 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 5 Sep 2024 11:27:51 -0700 Subject: [PATCH 1/7] IO-2893 Enhance disable of editing of tickets Signed-off-by: Allan Carr --- .../time-ticket-list.component.jsx | 77 ++++++------------- 1 file changed, 25 insertions(+), 52 deletions(-) diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 11ec514fe..b7265ca2b 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -12,7 +12,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter"; import { onlyUnique } from "../../utils/arrayHelper"; import dayjs from "../../utils/day"; import { alphaSort, dateSort } from "../../utils/sorters"; -import RbacWrapper, { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component"; +import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component"; import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component"; const mapStateToProps = createStructuredSelector({ @@ -52,6 +52,10 @@ export function TimeTicketList({ splitKey: bodyshop.imexshopid }); + const canEditCommittedTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:editcommitted" }); + const canEditTimeTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:edit" }); + const canEditShiftTickets = HasRbacAccess({ bodyshop, authLevel, action: "timetickets:shiftedit" }); + const totals = useMemo(() => { if (timetickets) return timetickets.reduce( @@ -65,6 +69,18 @@ export function TimeTicketList({ return { productivehrs: 0, actualhrs: 0 }; }, [timetickets]); + const isDisabled = (record) => { + if (disabled === true || !record.id) return true; + + const isShiftTicket = !record.ciecacode; + const isCommitted = record.committed_at; + if (isShiftTicket) { + return !(canEditShiftTickets && (!isCommitted || canEditCommittedTimeTickets)); + } + + return !(canEditTimeTickets && (!isCommitted || canEditCommittedTimeTickets)); + }; + const columns = [ ...(Enhanced_Payroll.treatment === "on" ? [ @@ -241,59 +257,16 @@ export function TimeTicketList({ )} {!techConsole && ( - { - return
; + - - - - + + )} ) From 1fd595d0dec5a97cbebc20de02266a009c065929 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 5 Sep 2024 11:42:11 -0700 Subject: [PATCH 2/7] IO-2902 Duplicate RBAC Items Signed-off-by: Allan Carr --- .../shop-info/shop-info.rbac.component.jsx | 50 +++++-------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx index 8291c9c4f..5bd59d346 100644 --- a/client/src/components/shop-info/shop-info.rbac.component.jsx +++ b/client/src/components/shop-info/shop-info.rbac.component.jsx @@ -255,6 +255,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) { > + + + - - - - - - - )} - - , - - ]:[]} Date: Thu, 5 Sep 2024 11:44:26 -0700 Subject: [PATCH 3/7] IO-2902 Fix prettier formatting Signed-off-by: Allan Carr --- .../shop-info/shop-info.rbac.component.jsx | 656 +++++++++--------- 1 file changed, 332 insertions(+), 324 deletions(-) diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx index 5bd59d346..a058e5f61 100644 --- a/client/src/components/shop-info/shop-info.rbac.component.jsx +++ b/client/src/components/shop-info/shop-info.rbac.component.jsx @@ -30,219 +30,226 @@ export function ShopInfoRbacComponent({ form, bodyshop }) { return ( - {...HasFeatureAccess({ featureName: "export", bodyshop }) ? [ - - - , - - - , - - - , - - - - ]:[]} - {...HasFeatureAccess({ featureName: "bills", bodyshop }) ? [ - - - , - - - , - - - , - - - , - - - - ]:[]} - - {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) ? [ - - - , - - - , - - - , - - - , - - - , - - - - ]:[]} - {...HasFeatureAccess({ featureName: "csi", bodyshop }) ? [ - - - , - - - - ]:[]} + {...HasFeatureAccess({ featureName: "export", bodyshop }) + ? [ + + + , + + + , + + + , + + + + ] + : []} + {...HasFeatureAccess({ featureName: "bills", bodyshop }) + ? [ + + + , + + + , + + + , + + + , + + + + ] + : []} + {...HasFeatureAccess({ featureName: "courtesycars", bodyshop }) + ? [ + + + , + + + , + + + , + + + , + + + , + + + + ] + : []} + {...HasFeatureAccess({ featureName: "csi", bodyshop }) + ? [ + + + , + + + + ] + : []} )} - {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) ? [ - - - , - - - , - - - , - - - , - - - , - - - , - - - , - - - , - - - - ]:[]} + {...HasFeatureAccess({ featureName: "timetickets", bodyshop }) + ? [ + + + , + + + , + + + , + + + , + + + , + + + , + + + , + + + , + + + + ] + : []} )} - Date: Thu, 5 Sep 2024 16:18:49 -0700 Subject: [PATCH 4/7] IO-2904 Production Board Visual Subtotal Signed-off-by: Allan Carr --- .../production-board-kanban-card.component.jsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx index 798f7f7ec..77e7f3c0d 100644 --- a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx @@ -6,11 +6,11 @@ import { PauseCircleOutlined } from "@ant-design/icons"; import { Card, Col, Row, Space, Tooltip } from "antd"; +import Dinero from "dinero.js"; import React, { useMemo } from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; import { DateTimeFormatter } from "../../utils/DateFormatter"; -import Dinero from "dinero.js"; import ProductionAlert from "../production-list-columns/production-list-columns.alert.component"; import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component"; @@ -18,8 +18,8 @@ import ProductionSubletsManageComponent from "../production-sublets-manage/produ import dayjs from "../../utils/day"; -import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component"; +import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; const cardColor = (ssbuckets, totalHrs) => { const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs)); @@ -213,21 +213,13 @@ const EstimatorToolTip = ({ metadata, cardSettings }) => { }; const SubtotalTooltip = ({ metadata, cardSettings, t }) => { - const amount = metadata?.job_totals?.totals?.subtotal?.amount; - const dineroAmount = amount ? Dinero({ amount: parseInt(amount * 100) }).toFormat("0,0.00") : null; + const dineroAmount = Dinero(metadata?.job_totals?.totals?.subtotal ?? Dinero()).toFormat(); return ( cardSettings?.subtotal && ( - - {!!amount ? ( - {`${t("production.statistics.currency_symbol")}${dineroAmount}`} - ) : ( -   - )} + + {dineroAmount} ) From 1f2040d97ceee73714ad2da60a3a0f2ea3e8ecbe Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Sep 2024 13:32:48 -0700 Subject: [PATCH 5/7] IO-2907 Updated CI to update Jira #1. --- .circleci/config.yml | 66 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a902a03b3..cd54e727e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,7 @@ orbs: aws-s3: circleci/aws-s3@4.0.0 aws-cli: circleci/aws-cli@4.0 eb: circleci/aws-elastic-beanstalk@2.0.1 + jira: circleci/jira@2.1.0 jobs: imex-api-deploy: docker: @@ -18,6 +19,11 @@ jobs: eb status --verbose eb deploy eb status + - jira/notify: + environment: Production (ImEX) - API + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> imex-hasura-migrate: docker: @@ -37,7 +43,11 @@ jobs: hasura migrate apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> - + - jira/notify: + environment: Production (ImEX) - Hasura + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> imex-app-build: docker: - image: cimg/node:18.18.2 @@ -62,6 +72,7 @@ jobs: to: "s3://imex-online-production/" arguments: "--exclude '*.map'" + imex-app-beta-build: docker: - image: cimg/node:18.18.2 @@ -86,6 +97,11 @@ jobs: from: dist to: "s3://imex-online-beta/" arguments: "--exclude '*.map'" + - jira/notify: + environment: Production (ImEX) - Front End + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> rome-api-deploy: docker: @@ -99,7 +115,11 @@ jobs: eb status --verbose eb deploy eb status - + - jira/notify: + environment: Production (Rome) - API + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> rome-hasura-migrate: docker: - image: cimg/node:18.18.2 @@ -118,7 +138,11 @@ jobs: hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> - + - jira/notify: + environment: Production (Rome) - Hasura + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> rome-app-build: docker: - image: cimg/node:18.18.2 @@ -143,6 +167,11 @@ jobs: from: dist to: "s3://rome-online-production/" arguments: "--exclude '*.map'" + - jira/notify: + environment: Production (Rome) - Front End + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> promanager-app-build: docker: @@ -168,6 +197,11 @@ jobs: from: dist to: "s3://promanager-production/" arguments: "--exclude '*.map'" + - jira/notify: + environment: Production (ProManager) - Front End + environment_type: production + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> test-rome-hasura-migrate: docker: @@ -187,6 +221,11 @@ jobs: hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> + - jira/notify: + environment: Test (Rome) - Hasura + environment_type: testing + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> test-rome-app-build: docker: @@ -212,6 +251,11 @@ jobs: from: dist to: "s3://rome-online-test/" arguments: "--exclude '*.map'" + - jira/notify: + environment: Test (Rome) - Front End + environment_type: testing + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> test-promanager-app-build: docker: @@ -237,6 +281,11 @@ jobs: from: dist to: "s3://promanager-testing/" arguments: "--exclude '*.map'" + - jira/notify: + environment: Test (ProManager) - Front End + environment_type: testing + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> test-hasura-migrate: docker: @@ -256,6 +305,11 @@ jobs: hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> + - jira/notify: + environment: Test (ImEX) - Hasura + environment_type: testing + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> imex-test-app-build: docker: @@ -302,7 +356,11 @@ jobs: from: dist to: "s3://imex-online-test-beta/" arguments: "--exclude '*.map'" - + - jira/notify: + environment: Test (ImEX) - Front End + environment_type: testing + pipeline_id: << pipeline.id >> + pipeline_number: << pipeline.number >> admin-app-build: docker: From 2701bbd501682dd3bc6d74ce1a4a1b91c582cc82 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Sep 2024 13:43:58 -0700 Subject: [PATCH 6/7] IO-2907 Resolve Hasura on CI and improve Jira notify. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd54e727e..49be77599 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: - run: name: Execute migration command: | - npm install hasura-cli -g + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash hasura migrate apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.imex.online/ --admin-secret << parameters.secret >> @@ -134,7 +134,7 @@ jobs: - run: name: Execute migration command: | - npm install hasura-cli -g + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >> @@ -217,7 +217,7 @@ jobs: - run: name: Execute migration command: | - npm install hasura-cli -g + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >> @@ -301,7 +301,7 @@ jobs: - run: name: Execute migration command: | - npm install hasura-cli -g + curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >> From bc6f05acbc0467487477d9da7650fa1f5d677a38 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Sep 2024 13:55:53 -0700 Subject: [PATCH 7/7] IO-2907 change CI step to deploy instead of build --- .circleci/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 49be77599..4f35873a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,6 +22,7 @@ jobs: - jira/notify: environment: Production (ImEX) - API environment_type: production + job_type: deployment pipeline_id: << pipeline.id >> pipeline_number: << pipeline.number >> @@ -47,6 +48,7 @@ jobs: environment: Production (ImEX) - Hasura environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> imex-app-build: docker: @@ -101,6 +103,7 @@ jobs: environment: Production (ImEX) - Front End environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> rome-api-deploy: @@ -119,6 +122,7 @@ jobs: environment: Production (Rome) - API environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> rome-hasura-migrate: docker: @@ -142,6 +146,7 @@ jobs: environment: Production (Rome) - Hasura environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> rome-app-build: docker: @@ -171,6 +176,7 @@ jobs: environment: Production (Rome) - Front End environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> promanager-app-build: @@ -201,6 +207,7 @@ jobs: environment: Production (ProManager) - Front End environment_type: production pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> test-rome-hasura-migrate: @@ -225,6 +232,7 @@ jobs: environment: Test (Rome) - Hasura environment_type: testing pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> test-rome-app-build: @@ -255,6 +263,7 @@ jobs: environment: Test (Rome) - Front End environment_type: testing pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> test-promanager-app-build: @@ -285,6 +294,7 @@ jobs: environment: Test (ProManager) - Front End environment_type: testing pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> test-hasura-migrate: @@ -309,6 +319,7 @@ jobs: environment: Test (ImEX) - Hasura environment_type: testing pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> imex-test-app-build: @@ -360,6 +371,7 @@ jobs: environment: Test (ImEX) - Front End environment_type: testing pipeline_id: << pipeline.id >> + job_type: deployment pipeline_number: << pipeline.number >> admin-app-build: