Fix update requested and updated showing at the same time

bcgov · Feb 21, 2025 · d7d600d · d7d600d
1 parent aa09715
commit d7d600d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/submit-api/src/submit_api/services/package.py b/submit-api/src/submit_api/services/package.py
@@ -228,6 +228,8 @@ def _update_package_status(package_id, session, package=None):
     def _update_items_status(items, status, session):
         """Update status of all items in the package."""
         for item in items:
+            if item.status in [ItemStatus.PASSED_CONSULTATION_CHECK]:
+                continue
             item.status = status
             session.add(item)
         session.flush()
@@ -338,6 +340,8 @@ def _resubmit_package(cls, package, session):
                                 if request.status != UpdateRequestStatus.ACCEPTED.value]
         if not open_update_requests:
             raise BadRequestError("Cannot resubmit a package that has no open update requests")
+        if package.completed_on:
+            raise BadRequestError("Cannot resubmit a package that has been completed")
         cls._update_items_status(
             package.items, ItemStatus.SUBMITTED.value, session)
         cls._update_package_status(package.id, session, package)

diff --git a/submit-web/src/components/PackageStatusChip/PackageStatusChipStack.tsx b/submit-web/src/components/PackageStatusChip/PackageStatusChipStack.tsx
@@ -63,7 +63,7 @@ export const PackageStatusChipStack = ({
         {status.map((value) => (
           <PackageStatusChip key={value} status={value} />
         ))}
-        <When condition={isUpdateRequested}>
+        <When condition={isUpdateRequested && !isUpdated}>
           <PackageStatusChip
             status={NON_CANONICAL_PACKAGE_STATUS.UPDATE_REQUESTED}
           />

diff --git a/submit-web/src/components/SubmissionStatusChip/index.tsx b/submit-web/src/components/SubmissionStatusChip/index.tsx
@@ -236,7 +236,7 @@ export const SubmissionStatusChipStack = ({
         alignItems={"flex-end"}
       >
         {!hideStatus && status && <SubmissionStatusChip status={status} />}
-        {isUpdateRequested && (
+        {isUpdateRequested && !isUpdated && (
           <SubmissionStatusChip
             status={NON_CANONICAL_SUBMISSION_STATUS.UPDATE_REQUESTED}
           />