@orchestrator-ui/orchestrator-ui-components 3.2.0 → 3.3.1

package/src/icons/heroicons/WfoSquareStack3dStack.tsx

@@ -0,0 +1,27 @@
+import React, { FC } from 'react';
+
+import { WfoIconProps } from '@/icons';
+
+import { withWfoHeroIconsWrapper } from './WfoHeroIconsWrapper';
+
+const WfoSquareStack3dStackSvg: FC<WfoIconProps> = ({
+    width = 20,
+    height = 20,
+    color = 'currentColor',
+}) => (
+    <svg
+        width={width}
+        height={height}
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 24 24"
+        fill={color}
+    >
+        <path d="M11.644 1.59a.75.75 0 0 1 .712 0l9.75 5.25a.75.75 0 0 1 0 1.32l-9.75 5.25a.75.75 0 0 1-.712 0l-9.75-5.25a.75.75 0 0 1 0-1.32l9.75-5.25Z" />
+        <path d="m3.265 10.602 7.668 4.129a2.25 2.25 0 0 0 2.134 0l7.668-4.13 1.37.739a.75.75 0 0 1 0 1.32l-9.75 5.25a.75.75 0 0 1-.71 0l-9.75-5.25a.75.75 0 0 1 0-1.32l1.37-.738Z" />
+        <path d="m10.933 19.231-7.668-4.13-1.37.739a.75.75 0 0 0 0 1.32l9.75 5.25c.221.12.489.12.71 0l9.75-5.25a.75.75 0 0 0 0-1.32l-1.37-.738-7.668 4.13a2.25 2.25 0 0 1-2.134-.001Z" />
+    </svg>
+);
+
+export const WfoSquareStack3dStack = withWfoHeroIconsWrapper(
+    WfoSquareStack3dStackSvg,
+);

package/src/icons/heroicons/index.ts

@@ -4,3 +4,4 @@ export * from './WfoArrowDown';
 export * from './WfoArrowsUpDown';
 export * from './WfoArrowUp';
 export * from './WfoWrench';
+export * from './WfoSquareStack3dStack';

package/src/messages/en-GB.json

@@ -24,8 +24,7 @@
         "resetToDefault": "Reset to default",
         "savePreferences": "Save preferences",
         "numberOfRows": "Number of rows",
-        "tableSettings": "Table settings",
-        "openMenu": "Open menu"
+        "tableSettings": "Table settings"
     },
     "common": {
         "product": "Product",
@@ -168,10 +167,11 @@
         "resourceTypes": {
             "type": "Resource type",
             "description": "Resource type description",
-            "resourceId": "Resource ID",
+            "resourceId": "ID",
             "usedInProductBlocks": "Used in product blocks"
         },
         "workflows": {
+            "workflowId": "ID",
             "name": "Workflow",
             "description": "Workflow description",
             "target": "Target",
@@ -179,6 +179,7 @@
             "createdAt": "Created"
         },
         "tasks": {
+            "workflowId": "ID",
             "name": "Task",
             "description": "Task description",
             "target": "Target",
@@ -428,5 +429,11 @@
             "headerTitle": "Total number of products",
             "listTitle": "Total number of product instances"
         }
+    },
+    "hamburgerMenu": {
+        "openMenu": "Open menu",
+        "support": "Support",
+        "softwareVersions": "Software Versions",
+        "logout": "Logout"
     }
 }

package/src/messages/nl-NL.json

@@ -168,7 +168,7 @@
         "resourceTypes": {
             "type": "Resource type",
             "description": "Resource type beschrijving",
-            "resourceId": "Resource ID",
+            "resourceId": "ID",
             "usedInProductBlocks": "Gebruikt in product blocks"
         },
         "workflows": {
@@ -428,5 +428,10 @@
             "headerTitle": "Totaal aantal producten",
             "listTitle": "Totaal aantal productinstanties"
         }
+    },
+    "hamburgerMenu": {
+        "support": "Support",
+        "softwareVersions": "Software Versies",
+        "logout": "Logout"
     }
 }

package/src/pages/metadata/WfoTasksPage.tsx

@@ -6,6 +6,7 @@ import { EuiBadgeGroup } from '@elastic/eui';
 
 import {
     PATH_METADATA_PRODUCTS,
+    WfoFirstPartUUID,
     WfoWorkflowTargetBadge,
     getPageIndexChangeHandler,
     getPageSizeChangeHandler,
@@ -37,6 +38,7 @@ import { mapRtkErrorToWfoError } from '@/rtk/utils';
 import type { GraphqlQueryVariables, TaskDefinition } from '@/types';
 import { BadgeType, SortOrder } from '@/types';
 import {
+    getConcatenatedResult,
     getQueryUrl,
     getQueryVariablesForExport,
     onlyUnique,
@@ -56,7 +58,7 @@ import {
 
 export type TaskListItem = Pick<
     TaskDefinition,
-    'name' | 'description' | 'target' | 'createdAt'
+    'workflowId' | 'name' | 'description' | 'target' | 'createdAt'
 > & {
     productTags: string[];
 };
@@ -99,6 +101,14 @@ export const WfoTasksPage = () => {
         });
 
     const tableColumns: WfoAdvancedTableColumnConfig<TaskListItem> = {
+        workflowId: {
+            columnType: ColumnType.DATA,
+            label: t('workflowId'),
+            width: '90px',
+            renderData: (value) => <WfoFirstPartUUID UUID={value} />,
+            renderDetails: (value) => value,
+            renderTooltip: (value) => value,
+        },
         name: {
             columnType: ColumnType.DATA,
             label: t('name'),
@@ -221,16 +231,21 @@ export const WfoTasksPage = () => {
     ): TaskListExportItem[] => {
         const { tasks } = tasksResponse;
         return tasks.map(
-            ({ name, target, description, createdAt, products }) => {
-                const uniqueProducts = products
-                    .map((product) => product.tag)
-                    .filter(onlyUnique);
+            ({
+                workflowId,
+                name,
+                target,
+                description,
+                createdAt,
+                products,
+            }) => {
                 return {
+                    workflowId,
                     name,
                     target,
                     description,
                     createdAt,
-                    productTags: uniqueProducts.join(' - '),
+                    productTags: getConcatenatedResult(products, ['tag']),
                 };
             },
         );

package/src/pages/metadata/WfoWorkflowsPage.tsx

@@ -7,6 +7,7 @@ import { EuiBadgeGroup } from '@elastic/eui';
 import {
     PATH_METADATA_PRODUCTS,
     WfoDataSorting,
+    WfoFirstPartUUID,
     getPageIndexChangeHandler,
     getPageSizeChangeHandler,
 } from '@/components';
@@ -62,7 +63,7 @@ import {
 
 export type WorkflowListItem = Pick<
     WorkflowDefinition,
-    'name' | 'description' | 'target' | 'createdAt'
+    'workflowId' | 'name' | 'description' | 'target' | 'createdAt'
 > & {
     productTags: string[];
 };
@@ -105,6 +106,14 @@ export const WfoWorkflowsPage = () => {
         });
 
     const tableColumns: WfoAdvancedTableColumnConfig<WorkflowListItem> = {
+        workflowId: {
+            columnType: ColumnType.DATA,
+            label: t('workflowId'),
+            width: '90px',
+            renderData: (value) => <WfoFirstPartUUID UUID={value} />,
+            renderDetails: (value) => value,
+            renderTooltip: (value) => value,
+        },
         name: {
             columnType: ColumnType.DATA,
             label: t('name'),
@@ -228,7 +237,15 @@ export const WfoWorkflowsPage = () => {
     ): WorkflowListExportItem[] => {
         const { workflows } = workflowsResponse;
         return workflows.map(
-            ({ name, target, description, createdAt, products }) => ({
+            ({
+                workflowId,
+                name,
+                target,
+                description,
+                createdAt,
+                products,
+            }) => ({
+                workflowId,
                 name,
                 target,
                 description,

package/src/pages/metadata/taskListObjectMapper.ts

@@ -6,12 +6,13 @@ export const mapTaskDefinitionToTaskListItem = (
     tasks: TaskDefinition[],
 ): TaskListItem[] =>
     tasks.map((taskDefinition) => {
-        const { name, target, description, createdAt, products } =
+        const { workflowId, name, target, description, createdAt, products } =
             taskDefinition;
 
         const productTags = products.map((product) => product.tag);
 
         return {
+            workflowId,
             name,
             description,
             target,

package/src/pages/metadata/workflowListObjectMapper.ts

@@ -6,12 +6,12 @@ export const mapWorkflowDefinitionToWorkflowListItem = (
     workflows: WorkflowDefinition[],
 ): WorkflowListItem[] =>
     workflows.map((workflowDefinition) => {
-        const { name, target, description, createdAt, products } =
+        const { workflowId, name, target, description, createdAt, products } =
             workflowDefinition;
-
         const productTags = products.map((product) => product.tag);
 
         return {
+            workflowId,
             name,
             description,
             target,

package/src/rtk/endpoints/customerDescriptions.ts

@@ -0,0 +1,54 @@
+import { CUSTOMER_DESCRIPTION_ENDPOINT } from '@/configuration';
+import { BaseQueryTypes, orchestratorApi } from '@/rtk';
+import { CustomerDescriptions } from '@/types';
+
+const customerDescriptionsApi = orchestratorApi.injectEndpoints({
+    endpoints: (build) => ({
+        setCustomerDescription: build.mutation<
+            null,
+            Pick<
+                CustomerDescriptions,
+                'description' | 'customerId' | 'subscriptionId'
+            >
+        >({
+            query: (customerDescription) => ({
+                url: `${CUSTOMER_DESCRIPTION_ENDPOINT}`,
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: {
+                    customer_id: customerDescription.customerId,
+                    subscription_id: customerDescription.subscriptionId,
+                    description: customerDescription.description,
+                },
+            }),
+            extraOptions: {
+                baseQueryType: BaseQueryTypes.fetch,
+            },
+        }),
+        updateCustomerDescription: build.mutation<null, CustomerDescriptions>({
+            query: (customerDescription) => ({
+                url: `${CUSTOMER_DESCRIPTION_ENDPOINT}`,
+                method: 'PUT',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: {
+                    id: customerDescription.id,
+                    customer_id: customerDescription.customerId,
+                    subscription_id: customerDescription.subscriptionId,
+                    description: customerDescription.description,
+                },
+            }),
+            extraOptions: {
+                baseQueryType: BaseQueryTypes.fetch,
+            },
+        }),
+    }),
+});
+
+export const {
+    useSetCustomerDescriptionMutation,
+    useUpdateCustomerDescriptionMutation,
+} = customerDescriptionsApi;

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

@@ -21,6 +21,7 @@ query MetadataWorkflows(
         filterBy: { field: "target", value: "SYSTEM" }
     ) {
         page {
+            workflowId
             name
             description
             target

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

@@ -36,6 +36,7 @@ query MetadataWorkflows(
         filterBy: { field: "target", value: "CREATE|MODIFY|TERMINATE" }
     ) {
         page {
+            workflowId
             name
             description
             target

package/src/rtk/endpoints/subscriptionDetail.ts

@@ -36,6 +36,7 @@ fragment SubscriptionDetail on SubscriptionInterface {
         shortcode
     }
     customerDescriptions {
+        id
         subscriptionId
         description
         customerId

package/src/rtk/endpoints/versions.ts

@@ -0,0 +1,27 @@
+import { orchestratorApi } from '../api';
+
+const versionsQuery = `
+    query Versions {
+        version {
+            applicationVersions
+        }
+    }
+`;
+
+export type VersionsResponse = {
+    version: {
+        applicationVersions: [string];
+    };
+};
+
+const versionsApi = orchestratorApi.injectEndpoints({
+    endpoints: (build) => ({
+        getVersions: build.query<VersionsResponse, void>({
+            query: () => ({
+                document: versionsQuery,
+            }),
+        }),
+    }),
+});
+
+export const { useGetVersionsQuery } = versionsApi;

package/src/types/types.ts

@@ -251,6 +251,7 @@ export interface Step {
 }
 
 export interface WorkflowDefinition {
+    workflowId: string;
     name: string;
     description?: string;
     target: WorkflowTarget;
@@ -259,6 +260,7 @@ export interface WorkflowDefinition {
 }
 
 export interface TaskDefinition {
+    workflowId: string;
     name: string;
     description?: string;
     target: WorkflowTarget;
@@ -461,6 +463,7 @@ export type SubscriptionDropdownOption = {
 };
 
 export type CustomerDescriptions = {
+    id: string;
     subscriptionId: string;
     description: string;
     customerId: string;

package/src/utils/getDefaultTableConfig.ts

@@ -58,10 +58,19 @@ export const getDefaultTableConfig = <T>(storageKey: string) => {
             return getTableConfig<T>(productColumns as (keyof T)[]);
 
         case METADATA_WORKFLOWS_TABLE_LOCAL_STORAGE_KEY:
-        case METADATA_TASKS_TABLE_LOCAL_STORAGE_KEY:
-            const workflowColumns: (keyof WorkflowDefinition)[] = ['createdAt'];
+            const workflowColumns: (keyof WorkflowDefinition)[] = [
+                'workflowId',
+                'createdAt',
+            ];
             return getTableConfig<T>(workflowColumns as (keyof T)[]);
 
+        case METADATA_TASKS_TABLE_LOCAL_STORAGE_KEY:
+            const taskColumns: (keyof WorkflowDefinition)[] = [
+                'workflowId',
+                'createdAt',
+            ];
+            return getTableConfig<T>(taskColumns as (keyof T)[]);
+
         case ACTIVE_PROCESSES_LIST_TABLE_LOCAL_STORAGE_KEY:
             const activeProcessColumns: (keyof ProcessListItem)[] = [
                 'productName',