PR changes

Author: Hubert-Szczepanski-SAP

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

@@ -22,7 +22,7 @@ import IllustrationMessageType from '@ui5/webcomponents-fiori/dist/types/Illustr
 import styles from './WorkspacesList.module.css';
 import { ControlPlanesListMenu } from '../ControlPlanesListMenu.tsx';
 import { CreateManagedControlPlaneWizardContainer } from '../../Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx';
-import { useDeleteWorkspace } from '../../../hooks/useDeleteWorkspace.tsx';
+import { useDeleteWorkspace } from '../../../hooks/useDeleteWorkspace.ts';
 
 interface Props {
   projectName: string;

src/components/Dialogs/CreateWorkspaceDialogContainer.cy.tsx

@@ -3,15 +3,13 @@ import { useCreateWorkspace, CreateWorkspaceParams } from '../../hooks/useCreate
 import { useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding';
 
 describe('CreateWorkspaceDialogContainer', () => {
-  let createWorkspacePayload: Omit<CreateWorkspaceParams, 'namespace'> | null = null;
+  let createWorkspacePayload: CreateWorkspaceParams | null = null;
 
   const fakeUseCreateWorkspace: typeof useCreateWorkspace = () => ({
-    createWorkspace: async (data: Omit<CreateWorkspaceParams, 'namespace'>): Promise<boolean> => {
+    createWorkspace: async (data: CreateWorkspaceParams): Promise<void> => {
       createWorkspacePayload = data;
-      return true;
     },
     isLoading: false,
-    errorDialogRef: { current: null },
   });
 
   const fakeUseAuthOnboarding = (() => ({
@@ -41,6 +39,7 @@ describe('CreateWorkspaceDialogContainer', () => {
       name: 'test-workspace',
       displayName: 'Test Workspace Display Name',
       chargingTarget: '12345678-1234-1234-1234-123456789abc',
+      chargingTargetType: 'btp',
       members: [
         {
           name: '[email protected]',
@@ -127,11 +126,10 @@ describe('CreateWorkspaceDialogContainer', () => {
 
   it('should not close dialog when creation fails', () => {
     const failingUseCreateWorkspace: typeof useCreateWorkspace = () => ({
-      createWorkspace: async (): Promise<boolean> => {
-        return false; // Simulate failure
+      createWorkspace: async (): Promise<void> => {
+        throw new Error('Creation failed'); // Simulate failure by throwing error
       },
       isLoading: false,
-      errorDialogRef: { current: null },
     });
 
     const setIsOpen = cy.stub();

src/components/Dialogs/CreateWorkspaceDialogContainer.tsx

@@ -1,14 +1,16 @@
-import { useCallback, useEffect, useMemo } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { CreateProjectWorkspaceDialog, OnCreatePayload } from './CreateProjectWorkspaceDialog.tsx';
 import { projectnameToNamespace } from '../../utils';
-import { useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding.tsx';
+import { useAuthOnboarding as _useAuthOnboarding } from '../../spaces/onboarding/auth/AuthContextOnboarding.tsx';
 import { Member, MemberRoles } from '../../lib/api/types/shared/members.ts';
 import { useTranslation } from 'react-i18next';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { createProjectWorkspaceSchema } from '../../lib/api/validations/schemas.ts';
 import { ComponentsListItem } from '../../lib/api/types/crate/createManagedControlPlane.ts';
-import { useCreateWorkspace } from '../../hooks/useCreateWorkspace.tsx';
+import { useCreateWorkspace as _useCreateWorkspace } from '../../hooks/useCreateWorkspace.ts';
+import { APIError } from '../../lib/api/error.ts';
+import { ErrorDialogHandle } from '../Shared/ErrorMessageBox.tsx';
 
 export type CreateDialogProps = {
   name: string;
@@ -23,14 +25,14 @@ export function CreateWorkspaceDialogContainer({
   isOpen,
   setIsOpen,
   project = '',
-  useCreateWorkspace: useCreateWorkspaceHook = useCreateWorkspace,
-  useAuthOnboarding: useAuthOnboardingHook = useAuthOnboarding,
+  useCreateWorkspace: useCreateWorkspaceHook = _useCreateWorkspace,
+  useAuthOnboarding: useAuthOnboardingHook = _useAuthOnboarding,
 }: {
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
   project?: string;
-  useCreateWorkspace?: typeof useCreateWorkspace;
-  useAuthOnboarding?: typeof useAuthOnboarding;
+  useCreateWorkspace?: typeof _useCreateWorkspace;
+  useAuthOnboarding?: typeof _useAuthOnboarding;
 }) {
   const { t } = useTranslation();
   const validationSchemaProjectWorkspace = useMemo(() => createProjectWorkspaceSchema(t), [t]);
@@ -56,7 +58,8 @@ export function CreateWorkspaceDialogContainer({
   const username = user?.email;
   const namespace = projectnameToNamespace(project);
 
-  const { createWorkspace, errorDialogRef } = useCreateWorkspaceHook(project, namespace);
+  const { createWorkspace } = useCreateWorkspaceHook(project, namespace);
+  const errorDialogRef = useRef<ErrorDialogHandle>(null);
 
   const clearForm = useCallback(() => {
     resetField('name');
@@ -78,20 +81,28 @@ export function CreateWorkspaceDialogContainer({
     name,
     displayName,
     chargingTarget,
+    chargingTargetType,
     members,
   }: OnCreatePayload): Promise<boolean> => {
-    const success = await createWorkspace({
-      name,
-      displayName,
-      chargingTarget,
-      members,
-    });
-
-    if (success) {
+    try {
+      await createWorkspace({
+        name,
+        displayName,
+        chargingTarget,
+        chargingTargetType,
+        members,
+      });
       setIsOpen(false);
+      return true;
+    } catch (e) {
+      console.error(e);
+      if (e instanceof APIError) {
+        if (errorDialogRef.current) {
+          errorDialogRef.current.showErrorDialog(`${e.message}: ${JSON.stringify(e.info)}`);
+        }
+      }
+      return false;
     }
-
-    return success;
   };
 
   return (

src/hooks/useCreateWorkspace.spec.tsx renamed to src/hooks/useCreateWorkspace.spec.ts

@@ -54,13 +54,11 @@ describe('useCreateWorkspace', () => {
     const renderHookResult = renderHook(() => useCreateWorkspace('test-project', 'test-project--ns'));
     const { createWorkspace } = renderHookResult.result.current;
 
-    let result: boolean = false;
     await act(async () => {
-      result = await createWorkspace(mockWorkspaceData);
+      await createWorkspace(mockWorkspaceData);
     });
 
     // ASSERT
-    expect(result).toBe(true);
     expect(fetchMock).toHaveBeenCalledTimes(1);
 
     const call = fetchMock.mock.calls[0];
@@ -88,7 +86,7 @@ describe('useCreateWorkspace', () => {
     expect(parsedBody.spec.members[0].name).toBe('[email protected]');
   });
 
-  it('should return false on API error', async () => {
+  it('should throw error on API failure', async () => {
     // ARRANGE
     fetchMock.mockRejectedValue(new Error('API Error'));
 
@@ -103,12 +101,9 @@ describe('useCreateWorkspace', () => {
     const renderHookResult = renderHook(() => useCreateWorkspace('test-project', 'test-project--ns'));
     const { createWorkspace } = renderHookResult.result.current;
 
-    let result: boolean = true;
+    // ASSERT
     await act(async () => {
-      result = await createWorkspace(mockWorkspaceData);
+      await expect(createWorkspace(mockWorkspaceData)).rejects.toThrow('API Error');
     });
-
-    // ASSERT
-    expect(result).toBe(false);
   });
 });

src/hooks/useCreateWorkspace.ts

@@ -0,0 +1,49 @@
+import { useCallback } from 'react';
+import { useApiResourceMutation, useRevalidateApiResource } from '../lib/api/useApiResource';
+import { CreateWorkspace, CreateWorkspaceResource, CreateWorkspaceType } from '../lib/api/types/crate/createWorkspace';
+import { ListWorkspaces } from '../lib/api/types/crate/listWorkspaces';
+import { useToast } from '../context/ToastContext';
+import { Member } from '../lib/api/types/shared/members';
+import { useTranslation } from 'react-i18next';
+
+export interface CreateWorkspaceParams {
+  name: string;
+  displayName?: string;
+  chargingTarget?: string;
+  chargingTargetType?: string;
+  members: Member[];
+}
+
+export function useCreateWorkspace(projectName: string, namespace: string) {
+  const { t } = useTranslation();
+  const toast = useToast();
+
+  const { trigger } = useApiResourceMutation<CreateWorkspaceType>(CreateWorkspaceResource(namespace));
+  const revalidate = useRevalidateApiResource(ListWorkspaces(projectName));
+
+  const createWorkspace = useCallback(
+    async ({
+      name,
+      displayName,
+      chargingTarget,
+      chargingTargetType,
+      members,
+    }: CreateWorkspaceParams): Promise<void> => {
+      await trigger(
+        CreateWorkspace(name, namespace, {
+          displayName,
+          chargingTarget,
+          chargingTargetType,
+          members,
+        }),
+      );
+      await revalidate();
+      toast.show(t('CreateWorkspaceDialog.toastMessage'));
+    },
+    [trigger, revalidate, toast, t, namespace],
+  );
+
+  return {
+    createWorkspace,
+  };
+}