@orchestrator-ui/orchestrator-ui-components 4.2.0 → 5.1.0

package/src/pages/metadata/WfoTasksPage.tsx

@@ -128,33 +128,18 @@ export const WfoTasksPage = () => {
             columnType: ColumnType.DATA,
             label: t('description'),
             width: '700px',
-            renderData: (value, row) =>
-                value ? (
-                    <WfoMetadataDescriptionField
-                        onSave={(updatedNote) =>
-                            updateWorkflow({
-                                id: row.workflowId,
-                                description: updatedNote,
-                            })
-                        }
-                        description={value}
-                    />
-                ) : null,
+            renderData: (value, row) => (
+                <WfoMetadataDescriptionField
+                    onSave={(updatedNote) =>
+                        updateWorkflow({
+                            id: row.workflowId,
+                            description: updatedNote,
+                        })
+                    }
+                    description={value}
+                />
+            ),
         },
-
-        // description: {
-        //     columnType: ColumnType.DATA,
-        //     label: t('description'),
-        //     width: '450px',
-        //     renderData: (value, row) =>
-        //         value ? (
-        //             <WfoWorkflowDescriptionField
-        //                 workflow_id={row.workflowId}
-        //                 description={value}
-        //             />
-        //         ) : null,
-        // },
-
         target: {
             columnType: ColumnType.DATA,
             label: t('target'),

package/src/pages/metadata/WfoWorkflowsPage.tsx

@@ -131,18 +131,17 @@ export const WfoWorkflowsPage = () => {
             columnType: ColumnType.DATA,
             label: t('description'),
             width: '700px',
-            renderData: (value, row) =>
-                value ? (
-                    <WfoMetadataDescriptionField
-                        onSave={(updatedNote) =>
-                            updateWorkflow({
-                                id: row.workflowId,
-                                description: updatedNote,
-                            })
-                        }
-                        description={value}
-                    />
-                ) : null,
+            renderData: (value, row) => (
+                <WfoMetadataDescriptionField
+                    onSave={(updatedNote) =>
+                        updateWorkflow({
+                            id: row.workflowId,
+                            description: updatedNote,
+                        })
+                    }
+                    description={value}
+                />
+            ),
         },
         target: {
             columnType: ColumnType.DATA,

package/src/rtk/endpoints/index.ts

@@ -18,3 +18,4 @@ export * from './subscriptionList';
 export * from './subscriptionListSummary';
 export * from './subscriptionsDropdownOptions';
 export * from './forms';
+export * from './formFields';

package/src/rtk/endpoints/metadata/tasks.ts

@@ -18,13 +18,14 @@ query MetadataWorkflows(
         after: $after
         sortBy: $sortBy
         query: $query
-        filterBy: { field: "target", value: "SYSTEM" }
+        filterBy: { field: "isTask", value: "true" }
     ) {
         page {
             workflowId
             name
             description
             target
+            isTask
             products {
                 tag
             }
@@ -50,7 +51,7 @@ export type TasksResponse = {
 const tasksApi = orchestratorApi.injectEndpoints({
     endpoints: (builder) => ({
         getTasks: builder.query<
-            TasksResponse,
+            TasksResponse | undefined,
             GraphqlQueryVariables<TaskDefinition>
         >({
             query: (variables) => ({
@@ -58,8 +59,12 @@ const tasksApi = orchestratorApi.injectEndpoints({
                 variables,
             }),
             transformResponse: (
-                response: TaskDefinitionsResult,
-            ): TasksResponse => {
+                response: TaskDefinitionsResult | undefined,
+            ): TasksResponse | undefined => {
+                if (!response) {
+                    return undefined;
+                }
+
                 const tasks = response.workflows.page || [];
                 const pageInfo = response.workflows.pageInfo || {};
 

package/src/rtk/endpoints/metadata/workflows.ts

@@ -42,6 +42,7 @@ query MetadataWorkflows(
             name
             description
             target
+            isTask
             products {
                 tag
             }
@@ -76,7 +77,7 @@ export type WorkflowsResponse = {
 const workflowsApi = orchestratorApi.injectEndpoints({
     endpoints: (builder) => ({
         getWorkflows: builder.query<
-            WorkflowsResponse,
+            WorkflowsResponse | undefined,
             GraphqlQueryVariables<WorkflowDefinition>
         >({
             query: (variables) => ({
@@ -84,10 +85,14 @@ const workflowsApi = orchestratorApi.injectEndpoints({
                 variables,
             }),
             transformResponse: (
-                response: WorkflowDefinitionsResult,
-            ): WorkflowsResponse => {
-                const workflows = response.workflows.page || [];
-                const pageInfo = response.workflows.pageInfo || {};
+                response: WorkflowDefinitionsResult | undefined,
+            ): WorkflowsResponse | undefined => {
+                if (!response) {
+                    return undefined;
+                }
+
+                const workflows = response?.workflows.page || [];
+                const pageInfo = response?.workflows.pageInfo || {};
 
                 return {
                     workflows,

package/src/rtk/endpoints/startOptions.ts

@@ -16,6 +16,7 @@ const workflowOptionsQuery = `
                     productType
                     productId
                     name
+                    tag
                 }
             }
         }
@@ -24,7 +25,7 @@ const workflowOptionsQuery = `
 
 const taskOptionsQuery = `
     query StartOptions {
-        workflows(first: 1000000, after: 0, filterBy: [{ field: "target", value: "${WorkflowTarget.SYSTEM}"}]) {
+        workflows(first: 1000000, after: 0, filterBy: [{ field: "isTask", value: "true"}]) {
             page {
                 name
                 description
@@ -38,6 +39,7 @@ type WorkflowOption = {
     productName: ProductDefinition['name'];
     productId: ProductDefinition['productId'];
     productType: ProductDefinition['productType'];
+    productTag: ProductDefinition['tag'];
 };
 
 type WorkflowOptionsResult = StartOptionsResult<{
@@ -46,6 +48,7 @@ type WorkflowOptionsResult = StartOptionsResult<{
         name: ProductDefinition['name'];
         productId: ProductDefinition['productId'];
         productType: ProductDefinition['productType'];
+        tag: ProductDefinition['tag'];
     }[];
 }>;
 
@@ -65,9 +68,11 @@ const startButtonOptionsApi = orchestratorApi.injectEndpoints({
             query: () => ({
                 document: workflowOptionsQuery,
             }),
-            transformResponse: (response: WorkflowOptionsResult) => {
+            transformResponse: (
+                response: WorkflowOptionsResult | undefined,
+            ) => {
                 const startOptions: WorkflowOption[] = [];
-                const workflows = response.workflows?.page || [];
+                const workflows = response?.workflows?.page || [];
                 workflows.forEach((workflow) => {
                     const workflowName = workflow.name;
                     workflow.products.forEach((product) => {
@@ -76,6 +81,7 @@ const startButtonOptionsApi = orchestratorApi.injectEndpoints({
                             productName: product.name,
                             productId: product.productId,
                             productType: product.productType,
+                            productTag: product.tag,
                         });
                     });
                 });

package/src/types/types.ts

@@ -144,6 +144,7 @@ export enum WorkflowTarget {
     MODIFY = 'modify',
     TERMINATE = 'terminate',
     SYSTEM = 'system',
+    VALIDATE = 'validate',
 }
 
 export type Process = {
@@ -258,8 +259,9 @@ export interface Step {
 export interface WorkflowDefinition {
     workflowId: string;
     name: string;
-    description?: string;
+    description: string;
     target: WorkflowTarget;
+    isTask: boolean;
     products: Pick<ProductDefinition, 'tag' | 'productId' | 'name'>[];
     createdAt: string;
 }
@@ -267,8 +269,9 @@ export interface WorkflowDefinition {
 export interface TaskDefinition {
     workflowId: string;
     name: string;
-    description?: string;
+    description: string;
     target: WorkflowTarget;
+    isTask: boolean;
     products: Pick<ProductDefinition, 'tag' | 'productId' | 'name'>[];
     createdAt: string;
 }
@@ -514,7 +517,7 @@ export type SubscriptionDetail = {
 
     externalServices?: ExternalService[];
 
-    processes: GraphQlSinglePage<SubscriptionDetailProcess>;
+    processes?: GraphQlSinglePage<SubscriptionDetailProcess>;
 };
 
 export type SubscriptionDetailProcess = Pick<
@@ -600,6 +603,7 @@ export type SubscriptionActions = {
     modify: SubscriptionAction[];
     terminate: SubscriptionAction[];
     system: SubscriptionAction[];
+    validate: SubscriptionAction[];
 };
 
 export enum CacheTagType {