feat(4276): add cancel operations for private/public clouds #4641
Conversation
| billingId String @db.ObjectId | ||
| billing Billing @relation("billing", fields: [billingId], references: [id]) | ||
| billingId String? @db.ObjectId | ||
| billing Billing? @relation("billing", fields: [billingId], references: [id]) |
There was a problem hiding this comment.
should billingId and billing itself be optional for already created product?
There was a problem hiding this comment.
The error occurs because the billingId field in decisionData can be null, but Prisma's upsert method expects it to be a string, StringFieldUpdateOperationsInput, or undefined. To fix this, I ensured billingId is either a valid string or undefined before passing it to the upsert operation. This error propagates to almost every code block that handles public cloud billing. I had to make billing and billingId optional. This changes didn't break the code even after pulling live data from dev environment.
| @@ -12,10 +12,12 @@ import { | |||
| IconMoneybag, | |||
| IconReceipt2, | |||
| } from '@tabler/icons-react'; | |||
| import { useSession } from 'next-auth/react'; | |||
| import { useEffect, useState } from 'react'; | |||
There was a problem hiding this comment.
doesn't look like it is used
| @@ -62,18 +62,18 @@ export const GET = apiHandler(async ({ pathParams, queryParams, session }) => { | |||
| return BadRequestResponse('invalid account coding'); | |||
| } | |||
|
|
|||
| product = req.decisionData; | |||
| product = req.decisionData as Product; | |||
There was a problem hiding this comment.
do we really need this cast here?
There was a problem hiding this comment.
This has been removed
| } | ||
|
|
||
| const canDownloadMou = | ||
| session.permissions.downloadBillingMou || | ||
| product.members.some( | ||
| product?.members.some( |
There was a problem hiding this comment.
do we need this check here? Product is checked on line 50
There was a problem hiding this comment.
This has been removed
| (member) => | ||
| member.userId === session.user.id && | ||
| arraysIntersect(member.roles, [PublicCloudProductMemberRole.BILLING_VIEWER]), | ||
| ); | ||
|
|
||
| if (!canDownloadMou) { | ||
| if (!canDownloadMou || !product) { |
There was a problem hiding this comment.
same here, product is checked on line 50
There was a problem hiding this comment.
This has been removed
| (doc.type === RequestType.DELETE || doc.type === RequestType.EDIT || doc.type === RequestType.CREATE); | ||
|
|
||
| const canEdit = (canReview && doc.type !== RequestType.DELETE) || canCancel; | ||
|
|
There was a problem hiding this comment.
I don 't think that a user can edit own request
There was a problem hiding this comment.
I don't understand this comment. A user can edit own request, I made sure that the exact same requester is able to edit their request. The canEdit has to be true for the decisionStatus prop to be editable in the public cloud request.
There was a problem hiding this comment.
@Kolezhanchik please review the recent changes
There was a problem hiding this comment.
still user can't edit own request, only admin can
|
The ability to cancel requests is available for all operations (CREATE, EDIT, DELETE) in both Private and Public Clouds, and is not limited to just CREATE requests. At any point during the provisioning cycle or after the provisioning cycle, particularly for the Public Cloud, active requests of any type can be cancelled.