Merge pull request #6139 from bcgov/feat/6028

feat(6028): display distinct labels for actioned requests

Author: junminahn

app/app/api/tasks/[id]/start/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { BadRequestResponse, OkResponse } from '@/core/responses';
-import { TaskStatus } from '@/prisma/client';
+import { TaskStatus, TaskType } from '@/prisma/client';
 import { objectId } from '@/validation-schemas';
 
 const pathParamSchema = z.object({
@@ -33,6 +33,18 @@ export const POST = apiHandler(async ({ pathParams, session }) => {
     },
   });
 
+  if (result.type === TaskType.REVIEW_PRIVATE_CLOUD_REQUEST || result.type === TaskType.REVIEW_PUBLIC_CLOUD_REQUEST) {
+    if (result.data && result.data['requestId']) {
+      const updateData = { where: { id: result.data['requestId'] }, data: { actioned: true } };
+
+      if (result.type === TaskType.REVIEW_PRIVATE_CLOUD_REQUEST) {
+        await prisma.privateCloudRequest.update(updateData);
+      } else if (result.type === TaskType.REVIEW_PUBLIC_CLOUD_REQUEST) {
+        await prisma.publicCloudRequest.update(updateData);
+      }
+    }
+  }
+
   if (!result) {
     return BadRequestResponse('invalid task');
   }

app/components/form/PrivateCloudActiveRequestBox.tsx

@@ -25,7 +25,7 @@ export default function PrivateCloudActiveRequestBox({
 }: {
   request: Pick<
     PrivateCloudRequestDetail,
-    'id' | 'licencePlate' | 'active' | 'type' | 'licencePlate' | 'decisionStatus' | 'createdByEmail'
+    'id' | 'licencePlate' | 'active' | 'actioned' | 'type' | 'licencePlate' | 'decisionStatus' | 'createdByEmail'
   >;
   className?: string;
   showCount?: boolean;
@@ -78,8 +78,13 @@ export default function PrivateCloudActiveRequestBox({
 
   switch (request.decisionStatus) {
     case DecisionStatus.PENDING:
-      decisionColor = 'blue';
-      decisionText = 'Reviewing';
+      if (request.actioned) {
+        decisionColor = 'blue';
+        decisionText = 'Reviewing';
+      } else {
+        decisionColor = 'gray';
+        decisionText = 'Submitted';
+      }
       DecisionIcon = IconHourglass;
       break;
     case DecisionStatus.APPROVED:

app/components/form/PublicCloudActiveRequestBox.tsx

@@ -23,7 +23,7 @@ export default function PublicCloudActiveRequestBox({
 }: {
   request: Pick<
     PublicCloudRequestDetail,
-    'id' | 'licencePlate' | 'active' | 'type' | 'licencePlate' | 'decisionStatus' | 'createdByEmail'
+    'id' | 'licencePlate' | 'active' | 'actioned' | 'type' | 'licencePlate' | 'decisionStatus' | 'createdByEmail'
   >;
   className?: string;
 }) {
@@ -71,8 +71,13 @@ export default function PublicCloudActiveRequestBox({
 
   switch (request.decisionStatus) {
     case DecisionStatus.PENDING:
-      decisionColor = 'blue';
-      decisionText = 'Reviewing';
+      if (request.actioned) {
+        decisionColor = 'blue';
+        decisionText = 'Reviewing';
+      } else {
+        decisionColor = 'gray';
+        decisionText = 'Submitted';
+      }
 
       if (inEmouProcess && initialBillingSearch?.data.length) {
         const initialBilling = initialBillingSearch.data[0];

app/components/private-cloud/RequestBadge.tsx

@@ -11,7 +11,7 @@ export default function RequestBadge({
 }: {
   data: Pick<
     PrivateCloudRequestDetailDecorated,
-    'licencePlate' | 'type' | 'decisionStatus' | 'decisionData' | 'active'
+    'licencePlate' | 'type' | 'decisionStatus' | 'decisionData' | 'active' | 'actioned'
   >;
   className?: string;
 }) {
@@ -30,9 +30,11 @@ export default function RequestBadge({
       break;
   }
 
+  let status: string = data.decisionStatus;
   switch (data.decisionStatus) {
     case DecisionStatus.PENDING:
       decisionColor = 'gray';
+      status = data.actioned ? 'Reviewing' : 'Submitted';
       break;
     case DecisionStatus.APPROVED:
     case DecisionStatus.AUTO_APPROVED:
@@ -57,7 +59,7 @@ export default function RequestBadge({
         {data.active ? 'ACTIVE' : 'CLOSED'}
       </Badge>
       <Badge color={decisionColor} radius="sm" className="ml-1">
-        {data.decisionStatus}
+        {status}
       </Badge>
       {data.decisionData.isTest && (
         <Badge color="yellow" radius="sm" className="ml-1">

app/components/public-cloud/RequestBadge.tsx

@@ -8,7 +8,10 @@ export default function RequestBadge({
   data,
   className,
 }: {
-  data: Pick<PublicCloudRequestDetailDecorated, 'licencePlate' | 'type' | 'decisionStatus' | 'decisionData' | 'active'>;
+  data: Pick<
+    PublicCloudRequestDetailDecorated,
+    'licencePlate' | 'type' | 'decisionStatus' | 'decisionData' | 'active' | 'actioned'
+  >;
   className?: string;
 }) {
   let typeColor = 'gray';
@@ -26,9 +29,11 @@ export default function RequestBadge({
       break;
   }
 
+  let status: string = data.decisionStatus;
   switch (data.decisionStatus) {
     case DecisionStatus.PENDING:
       decisionColor = 'gray';
+      status = data.actioned ? 'Reviewing' : 'Submitted';
       break;
     case DecisionStatus.APPROVED:
     case DecisionStatus.AUTO_APPROVED:
@@ -52,7 +57,7 @@ export default function RequestBadge({
         {data.active ? 'ACTIVE' : 'CLOSED'}
       </Badge>
       <Badge color={decisionColor} radius="sm" className="ml-1">
-        {data.decisionStatus}
+        {status}
       </Badge>
     </div>
   );

app/helpers/mock-resources/private-cloud-request.ts

@@ -90,6 +90,7 @@ export function createSamplePrivateCloudRequest(args?: {
     decisionComment: faker.lorem.sentence(),
     quotaUpgradeResourceDetailList: [],
     active: true,
+    actioned: true,
     createdAt: new Date(),
     updatedAt: new Date(),
     cancelledAt: null,

app/helpers/mock-resources/public-cloud-request.ts

@@ -113,6 +113,7 @@ export function createSamplePublicCloudRequest(args?: {
     requestComment: faker.lorem.sentence(),
     decisionComment: faker.lorem.sentence(),
     active: true,
+    actioned: true,
     createdAt: new Date(),
     updatedAt: new Date(),
     decisionDate: new Date(),

app/prisma/schema.prisma

@@ -89,6 +89,7 @@ model PrivateCloudRequest {
   quotaJustification             String?
   type                           RequestType
   decisionStatus                 DecisionStatus
+  actioned                       Boolean?                        @default(false)
   isQuotaChanged                 Boolean?                        @default(false)
   requestComment                 String?
   decisionComment                String?
@@ -252,6 +253,7 @@ model PublicCloudRequest {
   decisionMaker      User?                   @relation("decisionMaker", fields: [decisionMakerEmail], references: [email])
   type               PublicCloudRequestType
   decisionStatus     DecisionStatus
+  actioned           Boolean?                @default(false)
   requestComment     String?
   decisionComment    String?
   active             Boolean                 @default(true)