@orchestrator-ui/orchestrator-ui-components 1.9.0 → 1.11.0

package/src/pages/metadata/WfoWorkflowsPage.tsx

@@ -198,13 +198,15 @@ export const WfoWorkflowsPage = () => {
         workflowsResponse: WorkflowsResponse,
     ): WorkflowListExportItem[] => {
         const { workflows } = workflowsResponse;
-        return workflows.map((workflow) => ({
-            ...workflow,
-            productTags: getConcatenatedResult(workflow.products, [
-                'tag',
-                'name',
-            ]),
-        }));
+        return workflows.map(
+            ({ name, target, description, createdAt, products }) => ({
+                name,
+                target,
+                description,
+                createdAt,
+                productTags: getConcatenatedResult(products, ['tag']),
+            }),
+        );
     };
 
     return (

package/src/pages/processes/WfoStartProcessPage.tsx

@@ -28,7 +28,7 @@ import {
 } from '@/types';
 import { FormNotCompleteResponse } from '@/types/forms';
 
-import UserInputFormWizard from '../../components/WfoForms/UserInputFormWizard';
+import UserInputFormWizardDeprecated from '../../components/WfoForms/UserInputFormWizardDeprecated';
 import { WfoProcessDetail } from './WfoProcessDetail';
 
 type StartCreateWorkflowPayload = {
@@ -215,7 +215,7 @@ export const WfoStartProcessPage = ({
                 <EuiHorizontalRule />
                 {(hasError && <WfoError />) ||
                     (stepUserInput && (
-                        <UserInputFormWizard
+                        <UserInputFormWizardDeprecated
                             stepUserInput={stepUserInput}
                             validSubmit={submit}
                             cancel={() =>

package/src/rtk/api.ts

@@ -21,6 +21,12 @@ export enum CacheTags {
     subscriptionList = 'subscriptionList',
 }
 
+export enum HttpStatus {
+    FormNotComplete = 510,
+    BadGateway = 502,
+    BadRequest = 400,
+}
+
 type ExtraOptions = {
     baseQueryType?: BaseQueryTypes;
     apiName?: string;
@@ -34,6 +40,20 @@ export const prepareHeaders = async (headers: Headers) => {
     return headers;
 };
 
+export const handlePromiseErrorWithCallback = <T>(
+    promise: Promise<unknown>,
+    status: number,
+    callbackAction: (json: T) => void,
+) => {
+    return promise.catch((err) => {
+        if (err.data && err.status === status) {
+            callbackAction(err.data);
+        } else {
+            throw err;
+        }
+    });
+};
+
 export const orchestratorApi = createApi({
     reducerPath: 'orchestratorApi',
     baseQuery: (args, api, extraOptions: ExtraOptions) => {

package/src/rtk/endpoints/customers.ts

@@ -3,25 +3,50 @@ import { Customer, CustomersResult } from '@/types';
 import { orchestratorApi } from '../api';
 
 const customersQuery = `query Customers {
-  customers(first: 1000000, after: 0) {
-      page {
-          fullname
-          customerId
-          shortcode
-      }
-  }
+    customers(first: 1000000, after: 0) {
+        page {
+            fullname
+            customerId
+            shortcode
+        }
+    }
+}`;
+
+const customerQuery = `query Customer(
+        $customerId: String!
+        $first: Int!
+    ) {
+        customers(
+            first: $first
+            filterBy: [{field: "customerId", value: $customerId}]
+        ) {
+            page {
+                customerId
+                fullname
+                shortcode
+          }
+        }
 }`;
 
 const customersApi = orchestratorApi.injectEndpoints({
     endpoints: (build) => ({
         getCustomers: build.query<Customer[], void>({
             query: () => ({ document: customersQuery }),
-            transformResponse: (response: CustomersResult): Customer[] => {
-                const customers = response?.customers?.page || [];
-                return customers;
-            },
+            transformResponse: (response: CustomersResult): Customer[] =>
+                response?.customers?.page || [],
+        }),
+        getCustomer: build.query<Customer[], { customerIds: string[] }>({
+            query: ({ customerIds }) => ({
+                document: customerQuery,
+                variables: {
+                    customerId: customerIds.join('|'),
+                    first: customerIds.length,
+                },
+            }),
+            transformResponse: (response: CustomersResult): Customer[] =>
+                response?.customers?.page || [],
         }),
     }),
 });
 
-export const { useGetCustomersQuery } = customersApi;
+export const { useGetCustomersQuery, useGetCustomerQuery } = customersApi;

package/src/rtk/endpoints/subscriptionDetail.ts

@@ -8,7 +8,7 @@ import {
 export const subscriptionDetailQuery = `
     query SubscriptionDetail($subscriptionId: String!) {
         subscriptions(
-            filterBy: { value: $subscriptionId, field: "subscriptionId" }
+            filterBy: { field: "subscriptionId", value: $subscriptionId }
         ) {
             page {
                 subscriptionId
@@ -36,6 +36,11 @@ export const subscriptionDetailQuery = `
                     customerId
                     shortcode
                 }
+                customerDescriptions {
+                    subscriptionId
+                    description
+                    customerId
+                }
                 productBlockInstances {
                     id
                     ownerSubscriptionId

package/src/rtk/slices/orchestratorComponentOverride.ts

@@ -2,14 +2,23 @@ import { ReactNode } from 'react';
 
 import { Slice, createSlice } from '@reduxjs/toolkit';
 
-import { FieldValue } from '@/types';
+import { FieldValue, SubscriptionDetail } from '@/types';
 
 export type ValueOverrideFunction = (fieldValue: FieldValue) => ReactNode;
 export type ValueOverrideConfiguration = Record<string, ValueOverrideFunction>;
 
+export type WfoSubscriptionDetailGeneralConfiguration = {
+    id: string;
+    node: ReactNode;
+};
+
 export type OrchestratorComponentOverride = {
     subscriptionDetail?: {
         valueOverrides?: ValueOverrideConfiguration;
+        generalSectionConfigurationOverride?: (
+            defaultSections: WfoSubscriptionDetailGeneralConfiguration[],
+            subscriptionDetail: SubscriptionDetail,
+        ) => WfoSubscriptionDetailGeneralConfiguration[];
     };
 };
 

package/src/types/types.ts

@@ -8,7 +8,7 @@ type GenericResponse = { [key: string]: unknown };
 
 export type FieldValue = {
     field: string;
-    value: string | number | boolean;
+    value: string | number | boolean | null;
 };
 
 export enum EngineStatus {
@@ -421,6 +421,12 @@ export type SubscriptionDropdownOption = {
     status: SubscriptionStatus;
 };
 
+export type CustomerDescriptions = {
+    subscriptionId: string;
+    description: string;
+    customerId: string;
+};
+
 export type SubscriptionDetail = {
     subscriptionId: string;
     description: string;
@@ -447,6 +453,8 @@ export type SubscriptionDetail = {
 
     customerId?: string | null;
     customer?: Customer;
+    customerDescriptions: CustomerDescriptions[];
+
     externalServices?: ExternalService[];
 
     processes: GraphQlSinglePage<SubscriptionDetailProcess>;

package/src/utils/index.ts

@@ -1,11 +1,12 @@
 export * from './csvDownload';
 export * from './date';
 export * from './environmentVariables';
-export * from './getStatusBadgeColor';
-export * from './getTypedFieldFromObject';
-export * from './uuid';
-export * from './strings';
 export * from './getProductNamesFromProcess';
 export * from './getQueryVariablesForExport';
+export * from './getStatusBadgeColor';
+export * from './getTypedFieldFromObject';
 export * from './onlyUnique';
+export * from './uuid';
 export * from './resultFlattener';
+export * from './strings';
+export * from './toOptionalArrayEntry';

package/src/utils/toOptionalArrayEntry.spec.ts

@@ -0,0 +1,17 @@
+import { toOptionalArrayEntry } from './toOptionalArrayEntry';
+
+describe('toOptionalArrayEntry', () => {
+    const testInput = { testField: 'testValue' };
+
+    it('returns an array with the data if ', () => {
+        const result = toOptionalArrayEntry(testInput, true);
+
+        expect(result).toEqual([testInput]);
+    });
+
+    it('returns an empty array if the condition is false', () => {
+        const result = toOptionalArrayEntry(testInput, false);
+
+        expect(result).toEqual([]);
+    });
+});

package/src/utils/toOptionalArrayEntry.ts

@@ -0,0 +1,4 @@
+export const toOptionalArrayEntry = <T>(
+    data: T,
+    condition: boolean,
+): [T] | [] => (condition ? [data] : []);