Merge pull request #5887 from bcgov/fix/5881

fix(5881): remove Gold DR cluster from creation UI

Author: junminahn

app/app/analytics/private-cloud/ActiveProducts.tsx

@@ -1,6 +1,6 @@
 import { useSnapshot } from 'valtio';
 import LineChartCard from '@/components/analytics/LineChartCard';
-import { clusters } from '@/constants';
+import { clustersWithoutDR } from '@/constants';
 import { downloadPrivateCloudActiveProducts } from '@/services/backend/analytics/private-cloud';
 import { ActiveProduct } from '@/types/analytics-private';
 import { formatDate } from '@/utils/js/date';
@@ -19,7 +19,7 @@ export default function ActiveProducts({ data }: { data: ActiveProduct[] }) {
         startDate,
       )} to ${formatDate(endDate)}.`}
       chartData={data}
-      categories={['All Clusters'].concat(pageSnapshot.clusters?.length ? pageSnapshot.clusters : clusters)}
+      categories={['All Clusters'].concat(pageSnapshot.clusters?.length ? pageSnapshot.clusters : clustersWithoutDR)}
       onExport={() => downloadPrivateCloudActiveProducts({ data: { ...pageSnapshot } })}
     />
   );

app/app/analytics/private-cloud/FilterPanel.tsx

@@ -2,7 +2,7 @@ import { useSnapshot } from 'valtio';
 import FormDateRangePicker from '@/components/generic/select/FormDateRangePicker';
 import FormMultiSelect from '@/components/generic/select/FormMultiSelect';
 import FormUserPicker from '@/components/generic/select/FormUserPicker';
-import { clusters, ministryOptions } from '@/constants';
+import { clustersWithoutDR, ministryOptions } from '@/constants';
 import { Cluster, Ministry } from '@/prisma/client';
 import { pageState } from './state';
 
@@ -36,7 +36,7 @@ export default function FilterPanel() {
           name="cluster"
           label="Cluster"
           value={pageSnapshot.clusters ?? []}
-          data={clusters.map((v) => ({ label: v, value: v }))}
+          data={clustersWithoutDR.map((v) => ({ label: v, value: v }))}
           onChange={(value) => (pageState.clusters = value as Cluster[])}
         />
       </div>

app/app/analytics/private-cloud/MinistryDistribution.tsx

@@ -1,6 +1,6 @@
 import { useSnapshot } from 'valtio';
 import MultipleDoughnutChartCard from '@/components/analytics/MultipleDoughnutChartCard';
-import { clusters } from '@/constants';
+import { clustersWithoutDR } from '@/constants';
 import { mapClusterData, transformMinistryData } from '@/helpers/ministry-data';
 import { downloadPrivateCloudMinistryDistribution } from '@/services/backend/analytics/private-cloud';
 import type { MinistryDistribution } from '@/types/analytics-private';
@@ -9,7 +9,7 @@ import { pageState } from './state';
 
 export default function MinistryDistribution({ data }: { data: MinistryDistribution[][] }) {
   const pageSnapshot = useSnapshot(pageState);
-  const selectedClusters = pageSnapshot.clusters?.length ? pageSnapshot.clusters : clusters;
+  const selectedClusters = pageSnapshot.clusters?.length ? pageSnapshot.clusters : clustersWithoutDR;
   const allClusterData = transformMinistryData(data[0]);
   const startDate = pageSnapshot.dates?.[0] ?? new Date('2023-04-01T00:00:00.000Z');
   const endDate = pageSnapshot.dates?.[1] ?? new Date();

app/app/api/private-cloud/products/_operations/create.ts

@@ -3,7 +3,7 @@ import prisma from '@/core/prisma';
 import { OkResponse, UnauthorizedResponse } from '@/core/responses';
 import generateLicencePlate from '@/helpers/licence-plate';
 import { sendRequestNatsMessage } from '@/helpers/nats-message';
-import { DecisionStatus, ProjectStatus, RequestType, EventType, TaskType } from '@/prisma/client';
+import { DecisionStatus, ProjectStatus, RequestType, EventType, TaskType, Cluster } from '@/prisma/client';
 import { sendCreateRequestEmails, sendRequestApprovalEmails } from '@/services/ches/private-cloud';
 import { createEvent, models, privateCloudRequestDetailInclude, tasks } from '@/services/db';
 import { PrivateCloudCreateRequestBody } from '@/validation-schemas/private-cloud';
@@ -41,6 +41,8 @@ export default async function createOp({ session, body }: { session: Session; bo
     ...rest
   } = body;
 
+  if (rest.cluster === Cluster.GOLDDR) rest.cluster = Cluster.GOLD;
+
   const productData = {
     ...rest,
     licencePlate,

app/app/private-cloud/requests/all/FilterPanel.tsx

@@ -1,6 +1,6 @@
 import { useSnapshot } from 'valtio';
 import FormMultiSelect from '@/components/generic/select/FormMultiSelect';
-import { ministryOptions, clusters } from '@/constants';
+import { ministryOptions, clustersWithoutDR } from '@/constants';
 import { Cluster, DecisionStatus, Ministry, Prisma, RequestType } from '@/prisma/client';
 import { pageState } from './state';
 
@@ -24,7 +24,7 @@ export default function FilterPanel() {
         name="cluster"
         label="Cluster"
         value={pageSnapshot.clusters ?? []}
-        data={[...clusters.map((v) => ({ label: v, value: v }))]}
+        data={[...clustersWithoutDR.map((v) => ({ label: v, value: v }))]}
         onChange={(value) => {
           pageState.clusters = value as Cluster[];
           pageState.page = 1;

app/components/form/ProjectDescriptionPrivate.tsx

@@ -10,7 +10,7 @@ import MailLink from '@/components/generic/button/MailLink';
 import HookFormTextarea from '@/components/generic/input/HookFormTextarea';
 import FormSelect from '@/components/generic/select/FormSelect';
 import HookFormSingleSelect from '@/components/generic/select/HookFormSingleSelect';
-import { clusters, ministryOptions, privateCloudTeamEmail } from '@/constants';
+import { clustersWithoutDR, ministryOptions, privateCloudTeamEmail } from '@/constants';
 import { cn } from '@/utils/js';
 import HookFormTextInput from '../generic/input/HookFormTextInput';
 
@@ -30,15 +30,15 @@ export default function ProjectDescriptionPrivate({
     formState: { errors },
   } = useFormContext();
 
-  const [clustersList, setClustersList] = useState(clusters);
+  const [clustersList, setClustersList] = useState(clustersWithoutDR);
 
   const { data: session } = useSession({
     required: true,
   });
 
   useEffect(() => {
     if (session && !session?.permissions.viewAllPrivateCloudProducts) {
-      setClustersList(clusters.filter((cluster) => cluster.indexOf('LAB') === -1));
+      setClustersList(clustersWithoutDR.filter((cluster) => cluster.indexOf('LAB') === -1));
     }
   }, [session, setClustersList]);
 

app/constants/private-cloud.ts

@@ -3,6 +3,7 @@ import { productSorts } from './common';
 
 export const privateCloudProductMemberRoles = Object.values(PrivateCloudProductMemberRole);
 export const clusters = Object.values(Cluster);
+export const clustersWithoutDR = Object.values(Cluster).filter((cluster) => cluster !== 'GOLDDR');
 
 export const clusterNames = [
   {

app/services/db/analytics/private-cloud/active-products.ts

@@ -1,5 +1,5 @@
 import _uniq from 'lodash-es/uniq';
-import { clusters } from '@/constants';
+import { clustersWithoutDR } from '@/constants';
 import prisma from '@/core/prisma';
 import { Cluster, RequestType, DecisionStatus } from '@/prisma/client';
 import { dateToShortDateString, shortDateStringToDate } from '@/utils/js';
@@ -80,7 +80,7 @@ async function productsCreatedPerMonth(
 export async function getActiveProducts({
   licencePlatesList,
   dateFilter = {},
-  clustersOptions = clusters,
+  clustersOptions = clustersWithoutDR,
 }: {
   licencePlatesList: string[];
   dateFilter?: Record<string, any>;

app/services/db/analytics/private-cloud/ministry-distributions.ts

@@ -1,4 +1,4 @@
-import { clusters } from '@/constants';
+import { clustersWithoutDR } from '@/constants';
 import prisma from '@/core/prisma';
 import { Prisma } from '@/prisma/client';
 
@@ -48,7 +48,7 @@ export async function getMinistryDistributions({
 
   const result = await Promise.all([
     getAggByCluster(licencePlatesList, undefined, dateFilter),
-    ...clusters.map((cluster) => getAggByCluster(licencePlatesList, cluster, dateFilter)),
+    ...clustersWithoutDR.map((cluster) => getAggByCluster(licencePlatesList, cluster, dateFilter)),
   ]);
 
   return result;