From 522a9a3fdb16454741c4622596876bda5425b221 Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 12:04:14 -0800 Subject: [PATCH 1/9] Remove Failed consultation check --- .../migrations/versions/357e22a9cf8f_.py | 34 +++++++++++++++++++ .../src/submit_api/enums/item_status.py | 1 - submit-api/src/submit_api/models/package.py | 1 - .../src/submit_api/models/queries/package.py | 6 ---- submit-api/src/submit_api/schemas/item.py | 4 --- submit-api/src/submit_api/schemas/package.py | 4 --- .../services/consultation_record_service.py | 2 +- .../components/PackageStatusChip/index.tsx | 2 +- .../components/SubmissionStatusChip/index.tsx | 2 +- submit-web/src/models/Package.ts | 2 +- 10 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 submit-api/migrations/versions/357e22a9cf8f_.py diff --git a/submit-api/migrations/versions/357e22a9cf8f_.py b/submit-api/migrations/versions/357e22a9cf8f_.py new file mode 100644 index 00000000..8d645d8d --- /dev/null +++ b/submit-api/migrations/versions/357e22a9cf8f_.py @@ -0,0 +1,34 @@ +"""Remove FAILED_CONSULTATION_CHECK status from package and item + +Revision ID: 357e22a9cf8f +Revises: 705145d0cf36 +Create Date: 2025-02-24 11:44:48.187230 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '357e22a9cf8f' +down_revision = '705145d0cf36' +branch_labels = None +depends_on = None + + +def upgrade(): + op.execute( + "UPDATE packages SET status = array_append(status, 'UNDER_CONSULTATION_CHECK') WHERE 'FAILED_CONSULTATION_CHECK' = ANY(status);") + op.execute("UPDATE packages SET status = array_remove(status, 'FAILED_CONSULTATION_CHECK') WHERE 'FAILED_CONSULTATION_CHECK' = ANY(status);") + op.execute("UPDATE items SET status = 'UNDER_CONSULTATION_CHECK' WHERE status = 'FAILED_CONSULTATION_CHECK';") + + op.execute("ALTER TYPE packagestatus RENAME VALUE 'AWAITING_MANAGER_REVIEW' TO 'AWAITING_MANAGER_APPROVAL';") + op.execute("ALTER TYPE itemstatus RENAME VALUE 'AWAITING_MANAGER_REVIEW' TO 'AWAITING_MANAGER_APPROVAL';") + op.execute("ALTER TYPE packagestatus RENAME VALUE 'CC_AWAITING_MANAGER_REVIEW' TO 'CC_AWAITING_MANAGER_APPROVAL';") + op.execute("ALTER TYPE itemstatus RENAME VALUE 'CC_AWAITING_MANAGER_REVIEW' TO 'CC_AWAITING_MANAGER_APPROVAL';") + op.execute("ALTER TYPE packagestatus RENAME VALUE 'MP_AWAITING_MANAGER_REVIEW' TO 'MP_AWAITING_MANAGER_APPROVAL';") + op.execute("ALTER TYPE itemstatus RENAME VALUE 'MP_AWAITING_MANAGER_REVIEW' TO 'MP_AWAITING_MANAGER_APPROVAL';") + + +def downgrade(): + pass diff --git a/submit-api/src/submit_api/enums/item_status.py b/submit-api/src/submit_api/enums/item_status.py index 1dc59e3b..703b3aa6 100644 --- a/submit-api/src/submit_api/enums/item_status.py +++ b/submit-api/src/submit_api/enums/item_status.py @@ -15,7 +15,6 @@ class ItemStatus(enum.Enum): COMPLETED = 'COMPLETED' SUBMITTED = 'SUBMITTED' PASSED_CONSULTATION_CHECK = 'PASSED_CONSULTATION_CHECK' - FAILED_CONSULTATION_CHECK = 'FAILED_CONSULTATION_CHECK' UNDER_REVIEW = 'UNDER_REVIEW' UNDER_CONSULTATION_CHECK = 'UNDER_CONSULTATION_CHECK' REVIEW_REJECTED = 'REVIEW_REJECTED' diff --git a/submit-api/src/submit_api/models/package.py b/submit-api/src/submit_api/models/package.py index 7a060403..2044961e 100644 --- a/submit-api/src/submit_api/models/package.py +++ b/submit-api/src/submit_api/models/package.py @@ -28,7 +28,6 @@ class PackageStatus(enum.Enum): PASSED_CONSULTATION_CHECK = 'PASSED_CONSULTATION_CHECK' UNDER_REVIEW = 'UNDER_REVIEW' UNDER_CONSULTATION_CHECK = 'UNDER_CONSULTATION_CHECK' - FAILED_CONSULTATION_CHECK = 'FAILED_CONSULTATION_CHECK' REVIEW_REJECTED = 'REVIEW_REJECTED' CREATED = 'CREATED' AWAITING_MANAGER_REVIEW = 'AWAITING_MANAGER_REVIEW' diff --git a/submit-api/src/submit_api/models/queries/package.py b/submit-api/src/submit_api/models/queries/package.py index 594296a8..9594ca2f 100644 --- a/submit-api/src/submit_api/models/queries/package.py +++ b/submit-api/src/submit_api/models/queries/package.py @@ -49,12 +49,6 @@ def _add_passed_consultation_check(cls, aggregated_statuses: set, statuses: list if any(status == ItemStatus.PASSED_CONSULTATION_CHECK.value for status in statuses): aggregated_statuses.add(PackageStatus.PASSED_CONSULTATION_CHECK.value) - @classmethod - def _add_failed_consultation_check(cls, aggregated_statuses: set, statuses: list[str]): - """Find packages that failed consultation check""" - if any(status == ItemStatus.FAILED_CONSULTATION_CHECK.value for status in statuses): - aggregated_statuses.add(PackageStatus.FAILED_CONSULTATION_CHECK.value) - @classmethod def _add_review_rejected(cls, aggregated_statuses: set, statuses: list[str]): """Find packages that have been rejected during review""" diff --git a/submit-api/src/submit_api/schemas/item.py b/submit-api/src/submit_api/schemas/item.py index f41a3322..c2bdea92 100644 --- a/submit-api/src/submit_api/schemas/item.py +++ b/submit-api/src/submit_api/schemas/item.py @@ -103,10 +103,6 @@ def get_item_status(status, user_type): UserType.PROPONENT: ItemStatus.COMPLETED.value, UserType.STAFF: '' }, - ItemStatus.FAILED_CONSULTATION_CHECK.value: { - UserType.PROPONENT: '', - UserType.STAFF: ItemStatus.FAILED_CONSULTATION_CHECK.value - }, ItemStatus.CC_AWAITING_MANAGER_REVIEW.value: { UserType.PROPONENT: ItemStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: ItemStatus.AWAITING_MANAGER_REVIEW.value diff --git a/submit-api/src/submit_api/schemas/package.py b/submit-api/src/submit_api/schemas/package.py index ed0962ab..e8daf14d 100644 --- a/submit-api/src/submit_api/schemas/package.py +++ b/submit-api/src/submit_api/schemas/package.py @@ -212,10 +212,6 @@ def get_package_status(status, user_type, version_obj): UserType.PROPONENT: PackageStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: PackageStatus.UNDER_CONSULTATION_CHECK.value }, - PackageStatus.FAILED_CONSULTATION_CHECK.value: { - UserType.PROPONENT: '', - UserType.STAFF: PackageStatus.FAILED_CONSULTATION_CHECK.value - }, PackageStatus.CC_AWAITING_MANAGER_REVIEW.value: { UserType.PROPONENT: PackageStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: PackageStatus.AWAITING_MANAGER_REVIEW.value diff --git a/submit-api/src/submit_api/services/consultation_record_service.py b/submit-api/src/submit_api/services/consultation_record_service.py index 039a57e5..65d0b16b 100644 --- a/submit-api/src/submit_api/services/consultation_record_service.py +++ b/submit-api/src/submit_api/services/consultation_record_service.py @@ -55,7 +55,6 @@ def approve_consultation_record(cls, item, session): @classmethod def reject_consultation_record(cls, item, session): """Reject consultation record.""" - cls._update_submissions_status(item, SubmissionStatus.REJECTED, session) update_request_data = cls._prepare_update_request_data(item) cls._create_update_request(update_request_data, session) package = Package.find_by_id(item.package_id) @@ -66,6 +65,7 @@ def reject_consultation_record(cls, item, session): actor_id=TokenInfo.get_id(), session=session ) + item.status = ItemStatus.UNDER_CONSULTATION_CHECK.value session.add(item) session.flush() return item diff --git a/submit-web/src/components/PackageStatusChip/index.tsx b/submit-web/src/components/PackageStatusChip/index.tsx index 399f6d91..8d02a9a4 100644 --- a/submit-web/src/components/PackageStatusChip/index.tsx +++ b/submit-web/src/components/PackageStatusChip/index.tsx @@ -103,7 +103,7 @@ const statusStyles: Record< height: "24px", width: "185px", }, - label: "Awaiting Manager Review", + label: "Awaiting Manager Approval", }, PASSED_CONSULTATION_CHECK: { sx: { diff --git a/submit-web/src/components/SubmissionStatusChip/index.tsx b/submit-web/src/components/SubmissionStatusChip/index.tsx index 85b820b6..9a31fb95 100644 --- a/submit-web/src/components/SubmissionStatusChip/index.tsx +++ b/submit-web/src/components/SubmissionStatusChip/index.tsx @@ -79,7 +79,7 @@ const statusStyles: Record = { height: "24px", width: "185px", }, - label: "Awaiting Manager Review", + label: "Awaiting Manager Approval", }, PASSED_CONSULTATION_CHECK: { sx: { diff --git a/submit-web/src/models/Package.ts b/submit-web/src/models/Package.ts index ac5fe905..bb24b57b 100644 --- a/submit-web/src/models/Package.ts +++ b/submit-web/src/models/Package.ts @@ -94,7 +94,7 @@ export const PACKAGE_STATUS: Record< }, AWAITING_MANAGER_REVIEW: { value: "AWAITING_MANAGER_REVIEW", - label: "Awaiting Manager Review", + label: "Awaiting Manager Approval", }, FAILED_CONSULTATION_CHECK: { value: "FAILED_CONSULTATION_CHECK", From 2d578b27c45ac38c5711edca842303a9f14c36ff Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 12:05:07 -0800 Subject: [PATCH 2/9] Rename AWAITING_MANAGER_REVIEW to AWAITING_MANAGER_APPROVAL --- submit-api/src/submit_api/enums/item_status.py | 6 +++--- submit-api/src/submit_api/models/package.py | 6 +++--- submit-api/src/submit_api/models/queries/package.py | 8 ++++---- submit-api/src/submit_api/schemas/item.py | 6 +++--- submit-api/src/submit_api/schemas/package.py | 6 +++--- submit-api/src/submit_api/services/submission_review.py | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/submit-api/src/submit_api/enums/item_status.py b/submit-api/src/submit_api/enums/item_status.py index 703b3aa6..21b9d1e7 100644 --- a/submit-api/src/submit_api/enums/item_status.py +++ b/submit-api/src/submit_api/enums/item_status.py @@ -21,7 +21,7 @@ class ItemStatus(enum.Enum): APPROVED = 'APPROVED' ACCEPTED = 'ACCEPTED' SATISFIED = 'SATISFIED' - AWAITING_MANAGER_REVIEW = 'AWAITING_MANAGER_REVIEW' - CC_AWAITING_MANAGER_REVIEW = 'CC_AWAITING_MANAGER_REVIEW' - MP_AWAITING_MANAGER_REVIEW = 'MP_AWAITING_MANAGER_REVIEW' + AWAITING_MANAGER_APPROVAL = 'AWAITING_MANAGER_APPROVAL' + CC_AWAITING_MANAGER_APPROVAL = 'CC_AWAITING_MANAGER_APPROVAL' + MP_AWAITING_MANAGER_APPROVAL = 'MP_AWAITING_MANAGER_APPROVAL' REVISION_REQUIRED = 'REVISION_REQUIRED' diff --git a/submit-api/src/submit_api/models/package.py b/submit-api/src/submit_api/models/package.py index 2044961e..739d7e8e 100644 --- a/submit-api/src/submit_api/models/package.py +++ b/submit-api/src/submit_api/models/package.py @@ -30,9 +30,9 @@ class PackageStatus(enum.Enum): UNDER_CONSULTATION_CHECK = 'UNDER_CONSULTATION_CHECK' REVIEW_REJECTED = 'REVIEW_REJECTED' CREATED = 'CREATED' - AWAITING_MANAGER_REVIEW = 'AWAITING_MANAGER_REVIEW' - CC_AWAITING_MANAGER_REVIEW = 'CC_AWAITING_MANAGER_REVIEW' - MP_AWAITING_MANAGER_REVIEW = 'MP_AWAITING_MANAGER_REVIEW' + AWAITING_MANAGER_APPROVAL = 'AWAITING_MANAGER_APPROVAL' + CC_AWAITING_MANAGER_APPROVAL = 'CC_AWAITING_MANAGER_APPROVAL' + MP_AWAITING_MANAGER_APPROVAL = 'MP_AWAITING_MANAGER_APPROVAL' REVISION_REQUIRED = 'REVISION_REQUIRED' diff --git a/submit-api/src/submit_api/models/queries/package.py b/submit-api/src/submit_api/models/queries/package.py index 9594ca2f..de4c9af0 100644 --- a/submit-api/src/submit_api/models/queries/package.py +++ b/submit-api/src/submit_api/models/queries/package.py @@ -86,14 +86,14 @@ def add_awaiting_manager_review(cls, aggregated_statuses: set, statuses: list[st @classmethod def _add_awaiting_cc_manager_review(cls, aggregated_statuses: set, statuses: list[str]): """Find packages that have been rejected during review""" - if any(status == ItemStatus.CC_AWAITING_MANAGER_REVIEW.value for status in statuses): - aggregated_statuses.add(PackageStatus.CC_AWAITING_MANAGER_REVIEW.value) + if any(status == ItemStatus.CC_AWAITING_MANAGER_APPROVAL.value for status in statuses): + aggregated_statuses.add(PackageStatus.CC_AWAITING_MANAGER_APPROVAL.value) @classmethod def _add_awaiting_mp_manager_review(cls, aggregated_statuses: set, statuses: list[str]): """Find packages that have been rejected during review""" - if any(status == ItemStatus.MP_AWAITING_MANAGER_REVIEW.value for status in statuses): - aggregated_statuses.add(PackageStatus.MP_AWAITING_MANAGER_REVIEW.value) + if any(status == ItemStatus.MP_AWAITING_MANAGER_APPROVAL.value for status in statuses): + aggregated_statuses.add(PackageStatus.MP_AWAITING_MANAGER_APPROVAL.value) @classmethod def aggregate_item_statuses(cls, items: list): diff --git a/submit-api/src/submit_api/schemas/item.py b/submit-api/src/submit_api/schemas/item.py index c2bdea92..46caf31a 100644 --- a/submit-api/src/submit_api/schemas/item.py +++ b/submit-api/src/submit_api/schemas/item.py @@ -105,11 +105,11 @@ def get_item_status(status, user_type): }, ItemStatus.CC_AWAITING_MANAGER_REVIEW.value: { UserType.PROPONENT: ItemStatus.UNDER_CONSULTATION_CHECK.value, - UserType.STAFF: ItemStatus.AWAITING_MANAGER_REVIEW.value + UserType.STAFF: ItemStatus.AWAITING_MANAGER_APPROVAL.value }, - ItemStatus.MP_AWAITING_MANAGER_REVIEW.value: { + ItemStatus.MP_AWAITING_MANAGER_APPROVAL.value: { UserType.PROPONENT: ItemStatus.UNDER_REVIEW.value, - UserType.STAFF: ItemStatus.AWAITING_MANAGER_REVIEW.value + UserType.STAFF: ItemStatus.AWAITING_MANAGER_APPROVAL.value }, ItemStatus.REVIEW_REJECTED.value: { UserType.PROPONENT: ItemStatus.REVISION_REQUIRED.value, diff --git a/submit-api/src/submit_api/schemas/package.py b/submit-api/src/submit_api/schemas/package.py index e8daf14d..9128901d 100644 --- a/submit-api/src/submit_api/schemas/package.py +++ b/submit-api/src/submit_api/schemas/package.py @@ -214,11 +214,11 @@ def get_package_status(status, user_type, version_obj): }, PackageStatus.CC_AWAITING_MANAGER_REVIEW.value: { UserType.PROPONENT: PackageStatus.UNDER_CONSULTATION_CHECK.value, - UserType.STAFF: PackageStatus.AWAITING_MANAGER_REVIEW.value + UserType.STAFF: PackageStatus.AWAITING_MANAGER_APPROVAL.value }, - PackageStatus.MP_AWAITING_MANAGER_REVIEW.value: { + PackageStatus.MP_AWAITING_MANAGER_APPROVAL.value: { UserType.PROPONENT: PackageStatus.UNDER_REVIEW.value, - UserType.STAFF: PackageStatus.AWAITING_MANAGER_REVIEW.value + UserType.STAFF: PackageStatus.AWAITING_MANAGER_APPROVAL.value }, PackageStatus.REVIEW_REJECTED.value: { UserType.PROPONENT: PackageStatus.REVISION_REQUIRED.value, diff --git a/submit-api/src/submit_api/services/submission_review.py b/submit-api/src/submit_api/services/submission_review.py index 3919c132..d6c6890c 100644 --- a/submit-api/src/submit_api/services/submission_review.py +++ b/submit-api/src/submit_api/services/submission_review.py @@ -138,9 +138,9 @@ def send_recommendation_to_manager(cls, item_id, session): def _get_awaiting_manager_review_status(cls, item): """Get the status of the item awaiting manager review.""" if item.type.name == SubmissionItemType.MANAGEMENT_PLAN_FORM.value: - return ItemStatus.MP_AWAITING_MANAGER_REVIEW + return ItemStatus.MP_AWAITING_MANAGER_APPROVAL if item.type.name == SubmissionItemType.CONSULTATION_RECORD.value: - return ItemStatus.CC_AWAITING_MANAGER_REVIEW + return ItemStatus.CC_AWAITING_MANAGER_APPROVAL raise UnprocessableEntityError("Item type is not supported.") @classmethod From f3de009cbb29348d58e28bc2e3397423689f928c Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 12:05:40 -0800 Subject: [PATCH 3/9] Rename AWAITING_MANAGER_REVIEW in frontend --- submit-web/src/components/PackageStatusChip/index.tsx | 2 +- submit-web/src/components/SubmissionStatusChip/index.tsx | 2 +- submit-web/src/models/Package.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submit-web/src/components/PackageStatusChip/index.tsx b/submit-web/src/components/PackageStatusChip/index.tsx index 8d02a9a4..fa8edf82 100644 --- a/submit-web/src/components/PackageStatusChip/index.tsx +++ b/submit-web/src/components/PackageStatusChip/index.tsx @@ -95,7 +95,7 @@ const statusStyles: Record< }, label: "New", }, - AWAITING_MANAGER_REVIEW: { + AWAITING_MANAGER_APPROVAL: { sx: { borderRadius: 1, border: `1px solid #F18A15`, diff --git a/submit-web/src/components/SubmissionStatusChip/index.tsx b/submit-web/src/components/SubmissionStatusChip/index.tsx index 9a31fb95..4dd4720d 100644 --- a/submit-web/src/components/SubmissionStatusChip/index.tsx +++ b/submit-web/src/components/SubmissionStatusChip/index.tsx @@ -71,7 +71,7 @@ const statusStyles: Record = { height: "24px", }, }, - AWAITING_MANAGER_REVIEW: { + AWAITING_MANAGER_APPROVAL: { sx: { borderRadius: 1, border: `1px solid #F18A15`, diff --git a/submit-web/src/models/Package.ts b/submit-web/src/models/Package.ts index bb24b57b..847b0ba2 100644 --- a/submit-web/src/models/Package.ts +++ b/submit-web/src/models/Package.ts @@ -32,7 +32,7 @@ export type PackageStatus = | "NEW_SUBMISSION" | "UNDER_CONSULTATION_CHECK" | "PASSED_CONSULTATION_CHECK" - | "AWAITING_MANAGER_REVIEW" + | "AWAITING_MANAGER_APPROVAL" | "FAILED_CONSULTATION_CHECK" | "CREATED"; @@ -92,8 +92,8 @@ export const PACKAGE_STATUS: Record< value: "SATISFIED", label: "Satisfied", }, - AWAITING_MANAGER_REVIEW: { - value: "AWAITING_MANAGER_REVIEW", + AWAITING_MANAGER_APPROVAL: { + value: "AWAITING_MANAGER_APPROVAL", label: "Awaiting Manager Approval", }, FAILED_CONSULTATION_CHECK: { From dfba1ef3b09596e82f8aab7af9be5fe7bca34f62 Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 12:09:02 -0800 Subject: [PATCH 4/9] invalidate package versions after review --- submit-web/src/hooks/api/useItems.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/submit-web/src/hooks/api/useItems.ts b/submit-web/src/hooks/api/useItems.ts index 4b8f2719..05c8d533 100644 --- a/submit-web/src/hooks/api/useItems.ts +++ b/submit-web/src/hooks/api/useItems.ts @@ -115,6 +115,9 @@ export const useSaveSubmissionReview = ({ queryClient.invalidateQueries({ queryKey: [QUERY_KEY.ACCOUNT_PROJECT, accountProjectId], }); + queryClient.invalidateQueries({ + queryKey: [QUERY_KEY.PACKAGE_VERSIONS], + }); queryClient.removeQueries({ queryKey: [QUERY_KEY.ACCOUNT_PROJECTS], }); From d7669aac0c735127a5cc2e3d07ab6abc9e81351e Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 13:08:41 -0800 Subject: [PATCH 5/9] Remove cache on version group --- submit-api/src/submit_api/schemas/item.py | 2 +- submit-api/src/submit_api/schemas/package.py | 2 +- submit-web/src/components/PackageStatusChip/index.tsx | 2 +- submit-web/src/components/SubmissionStatusChip/index.tsx | 2 +- submit-web/src/hooks/api/usePackages.ts | 7 +------ 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/submit-api/src/submit_api/schemas/item.py b/submit-api/src/submit_api/schemas/item.py index 46caf31a..52dfe1ed 100644 --- a/submit-api/src/submit_api/schemas/item.py +++ b/submit-api/src/submit_api/schemas/item.py @@ -103,7 +103,7 @@ def get_item_status(status, user_type): UserType.PROPONENT: ItemStatus.COMPLETED.value, UserType.STAFF: '' }, - ItemStatus.CC_AWAITING_MANAGER_REVIEW.value: { + ItemStatus.CC_AWAITING_MANAGER_APPROVAL.value: { UserType.PROPONENT: ItemStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: ItemStatus.AWAITING_MANAGER_APPROVAL.value }, diff --git a/submit-api/src/submit_api/schemas/package.py b/submit-api/src/submit_api/schemas/package.py index 9128901d..e2a37c67 100644 --- a/submit-api/src/submit_api/schemas/package.py +++ b/submit-api/src/submit_api/schemas/package.py @@ -212,7 +212,7 @@ def get_package_status(status, user_type, version_obj): UserType.PROPONENT: PackageStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: PackageStatus.UNDER_CONSULTATION_CHECK.value }, - PackageStatus.CC_AWAITING_MANAGER_REVIEW.value: { + PackageStatus.CC_AWAITING_MANAGER_APPROVAL.value: { UserType.PROPONENT: PackageStatus.UNDER_CONSULTATION_CHECK.value, UserType.STAFF: PackageStatus.AWAITING_MANAGER_APPROVAL.value }, diff --git a/submit-web/src/components/PackageStatusChip/index.tsx b/submit-web/src/components/PackageStatusChip/index.tsx index fa8edf82..041840cb 100644 --- a/submit-web/src/components/PackageStatusChip/index.tsx +++ b/submit-web/src/components/PackageStatusChip/index.tsx @@ -101,7 +101,7 @@ const statusStyles: Record< border: `1px solid #F18A15`, background: "#FFDEB8", height: "24px", - width: "185px", + width: "196px", }, label: "Awaiting Manager Approval", }, diff --git a/submit-web/src/components/SubmissionStatusChip/index.tsx b/submit-web/src/components/SubmissionStatusChip/index.tsx index 4dd4720d..09892769 100644 --- a/submit-web/src/components/SubmissionStatusChip/index.tsx +++ b/submit-web/src/components/SubmissionStatusChip/index.tsx @@ -77,7 +77,7 @@ const statusStyles: Record = { border: `1px solid #F18A15`, background: "#FFDEB8", height: "24px", - width: "185px", + width: "196px", }, label: "Awaiting Manager Approval", }, diff --git a/submit-web/src/hooks/api/usePackages.ts b/submit-web/src/hooks/api/usePackages.ts index 98aac914..7a728b74 100644 --- a/submit-web/src/hooks/api/usePackages.ts +++ b/submit-web/src/hooks/api/usePackages.ts @@ -135,7 +135,6 @@ export const getPackageVersionsByOriginalPackageIdQueryOptions = ({ queryKey: [QUERY_KEY.PACKAGE_VERSIONS, originalPackageId], queryFn: () => getPackageVersionsByOriginalPackageId({ originalPackageId }), enabled: enabled && Boolean(originalPackageId), - ...defaultUseQueryOptions, }); export const useGetPackageVersionsByOriginalPackageId = ({ @@ -209,11 +208,7 @@ const createPackageUpdateRequest = ({ }); }; -const acceptUpdateRequest = ({ - packageId, -}: { - packageId: number; -}) => { +const acceptUpdateRequest = ({ packageId }: { packageId: number }) => { return submitRequest({ url: `/staff/packages/${packageId}/update-request`, method: "patch", From 4551a9dcbfdbe1f28e2c502123b00bca0a5faa07 Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 13:10:33 -0800 Subject: [PATCH 6/9] remove unused import --- .../src/submit_api/services/consultation_record_service.py | 1 - 1 file changed, 1 deletion(-) diff --git a/submit-api/src/submit_api/services/consultation_record_service.py b/submit-api/src/submit_api/services/consultation_record_service.py index 65d0b16b..e19812d5 100644 --- a/submit-api/src/submit_api/services/consultation_record_service.py +++ b/submit-api/src/submit_api/services/consultation_record_service.py @@ -8,7 +8,6 @@ from submit_api.models import UpdateRequest, Package from submit_api.models import PackageMetadata, SubmissionReviewEntry from submit_api.models.package_metadata import PackageMetadataFields -from submit_api.models.submission import SubmissionStatus from submit_api.models.submission_review import SubmissionReview from submit_api.models.submission_review_entry import SubmissionReviewEntryType from submit_api.models.update_request import UpdateRequestType From 811b291ba2cfa423ad7bd38745181f3db6b02ab4 Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 13:18:58 -0800 Subject: [PATCH 7/9] update migration to remove array_append --- submit-api/migrations/versions/357e22a9cf8f_.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/submit-api/migrations/versions/357e22a9cf8f_.py b/submit-api/migrations/versions/357e22a9cf8f_.py index 8d645d8d..0446f0d5 100644 --- a/submit-api/migrations/versions/357e22a9cf8f_.py +++ b/submit-api/migrations/versions/357e22a9cf8f_.py @@ -17,8 +17,6 @@ def upgrade(): - op.execute( - "UPDATE packages SET status = array_append(status, 'UNDER_CONSULTATION_CHECK') WHERE 'FAILED_CONSULTATION_CHECK' = ANY(status);") op.execute("UPDATE packages SET status = array_remove(status, 'FAILED_CONSULTATION_CHECK') WHERE 'FAILED_CONSULTATION_CHECK' = ANY(status);") op.execute("UPDATE items SET status = 'UNDER_CONSULTATION_CHECK' WHERE status = 'FAILED_CONSULTATION_CHECK';") From c63562a5f622d5bb7f3b1559a97f867847a18f66 Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 13:21:35 -0800 Subject: [PATCH 8/9] update migration to remove array operations --- submit-api/migrations/versions/357e22a9cf8f_.py | 1 - 1 file changed, 1 deletion(-) diff --git a/submit-api/migrations/versions/357e22a9cf8f_.py b/submit-api/migrations/versions/357e22a9cf8f_.py index 0446f0d5..6c09b0f8 100644 --- a/submit-api/migrations/versions/357e22a9cf8f_.py +++ b/submit-api/migrations/versions/357e22a9cf8f_.py @@ -17,7 +17,6 @@ def upgrade(): - op.execute("UPDATE packages SET status = array_remove(status, 'FAILED_CONSULTATION_CHECK') WHERE 'FAILED_CONSULTATION_CHECK' = ANY(status);") op.execute("UPDATE items SET status = 'UNDER_CONSULTATION_CHECK' WHERE status = 'FAILED_CONSULTATION_CHECK';") op.execute("ALTER TYPE packagestatus RENAME VALUE 'AWAITING_MANAGER_REVIEW' TO 'AWAITING_MANAGER_APPROVAL';") From 6547ae0f739ab2c2de1b537ddccd0e873e05762a Mon Sep 17 00:00:00 2001 From: Jad Date: Mon, 24 Feb 2025 13:25:06 -0800 Subject: [PATCH 9/9] Remove changing status in migration --- submit-api/migrations/versions/357e22a9cf8f_.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/submit-api/migrations/versions/357e22a9cf8f_.py b/submit-api/migrations/versions/357e22a9cf8f_.py index 6c09b0f8..a55ef166 100644 --- a/submit-api/migrations/versions/357e22a9cf8f_.py +++ b/submit-api/migrations/versions/357e22a9cf8f_.py @@ -17,8 +17,6 @@ def upgrade(): - op.execute("UPDATE items SET status = 'UNDER_CONSULTATION_CHECK' WHERE status = 'FAILED_CONSULTATION_CHECK';") - op.execute("ALTER TYPE packagestatus RENAME VALUE 'AWAITING_MANAGER_REVIEW' TO 'AWAITING_MANAGER_APPROVAL';") op.execute("ALTER TYPE itemstatus RENAME VALUE 'AWAITING_MANAGER_REVIEW' TO 'AWAITING_MANAGER_APPROVAL';") op.execute("ALTER TYPE packagestatus RENAME VALUE 'CC_AWAITING_MANAGER_REVIEW' TO 'CC_AWAITING_MANAGER_APPROVAL';")