Templates loaded from file onboardingAPI TBD

Author: Hubert-Szczepanski-SAP

public/locales/en.json

@@ -87,6 +87,9 @@
     "menuDownload": "Download",
     "menuCopy": "Copy to clipboard"
   },
+  "ComponentsSelection": {
+    "chooseVersion": "Please select version"
+  },
   "IllustratedBanner": {
     "titleMessage": "No Managed Control Planes found",
     "subtitleMessage": "Get started by creating your first Managed Control Plane.",

src/components/ComponentsSelection/ComponentsSelection.tsx

@@ -22,13 +22,19 @@ import { Infobox } from '../Ui/Infobox/Infobox.tsx';
 import { useTranslation } from 'react-i18next';
 import { ComponentsListItem } from '../../lib/api/types/crate/createManagedControlPlane.ts';
 import { getSelectedComponents } from './ComponentsSelectionContainer.tsx';
+import IllustratedError from '../Shared/IllustratedError.tsx';
 
 export interface ComponentsSelectionProps {
   componentsList: ComponentsListItem[];
   setComponentsList: (components: ComponentsListItem[]) => void;
+  templateDefaultsError?: string;
 }
 
-export const ComponentsSelection: React.FC<ComponentsSelectionProps> = ({ componentsList, setComponentsList }) => {
+export const ComponentsSelection: React.FC<ComponentsSelectionProps> = ({
+  componentsList,
+  setComponentsList,
+  templateDefaultsError,
+}) => {
   const [searchTerm, setSearchTerm] = useState('');
   const { t } = useTranslation();
 
@@ -133,7 +139,23 @@ export const ComponentsSelection: React.FC<ComponentsSelectionProps> = ({ compon
                       disabled={!component.isSelected || providerDisabled}
                       aria-label={`${component.name} version`}
                       onChange={handleVersionChange}
+                      valueState={component.isSelected && !component.selectedVersion ? 'Negative' : 'None'}
+                      valueStateMessage={
+                        component.isSelected && !component.selectedVersion ? (
+                          <span>{t('ComponentsSelection.chooseVersion')}</span>
+                        ) : undefined
+                      }
                     >
+                      {!component.selectedVersion && (
+                        <Option
+                          key="__placeholder"
+                          data-version=""
+                          data-name={component.name}
+                          selected
+                        >
+                          {t('ComponentsSelection.chooseVersion')}
+                        </Option>
+                      )}
                       {component.versions.map((version) => (
                         <Option
                           key={version}
@@ -155,7 +177,14 @@ export const ComponentsSelection: React.FC<ComponentsSelectionProps> = ({ compon
             </Infobox>
           )}
         </div>
+
         <div data-layout-span="XL4 L4 M4 S4">
+          {templateDefaultsError ? (
+            <div style={{ marginBottom: 8 }}>
+              <IllustratedError title={templateDefaultsError} compact />
+            </div>
+          ) : null}
+
           {selectedComponents.length > 0 ? (
             <List headerText={t('componentsSelection.selectedComponents')}>
               {selectedComponents.map((component) => (

src/components/ComponentsSelection/ComponentsSelectionContainer.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { ComponentsSelection } from './ComponentsSelection.tsx';
 
 import IllustratedError from '../Shared/IllustratedError.tsx';
@@ -9,10 +9,12 @@ import { useApiResource } from '../../lib/api/useApiResource.ts';
 import Loading from '../Shared/Loading.tsx';
 import { ComponentsListItem, removeComponents } from '../../lib/api/types/crate/createManagedControlPlane.ts';
 import { useTranslation } from 'react-i18next';
+import { ManagedControlPlaneTemplate } from '../../lib/api/types/templates/mcpTemplate.ts';
 
 export interface ComponentsSelectionProps {
   componentsList: ComponentsListItem[];
   setComponentsList: (components: ComponentsListItem[]) => void;
+  managedControlPlaneTemplate?: ManagedControlPlaneTemplate;
 }
 
 /**
@@ -33,10 +35,13 @@ export const getSelectedComponents = (components: ComponentsListItem[]) => {
 export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> = ({
   setComponentsList,
   componentsList,
+  managedControlPlaneTemplate,
 }) => {
   const { data: availableManagedComponentsListData, error, isLoading } = useApiResource(ListManagedComponents());
   const { t } = useTranslation();
   const initialized = useRef(false);
+  const [templateDefaultsError, setTemplateDefaultsError] = useState<string | null>(null);
+  const defaultComponents = managedControlPlaneTemplate?.spec?.spec?.components?.defaultComponents ?? [];
 
   useEffect(() => {
     if (
@@ -50,19 +55,68 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
     const newComponentsList = availableManagedComponentsListData.items
       .map((item) => {
         const versions = sortVersions(item.status.versions);
+        const template = defaultComponents.find((dc) => dc.name === item.metadata.name);
+        const templateVersion = template?.version;
+        const selectedVersion = template
+          ? (templateVersion && versions.includes(templateVersion) ? templateVersion : '')
+          : (versions[0] ?? '');
         return {
           name: item.metadata.name,
           versions,
-          selectedVersion: versions[0] ?? '',
-          isSelected: false,
+          selectedVersion,
+          isSelected: !!template,
           documentationUrl: '',
         };
       })
       .filter((component) => !removeComponents.find((item) => item === component.name));
 
     setComponentsList(newComponentsList);
     initialized.current = true;
-  }, [availableManagedComponentsListData, setComponentsList]);
+  }, [availableManagedComponentsListData, setComponentsList, defaultComponents]);
+
+  useEffect(() => {
+    const items = availableManagedComponentsListData?.items ?? [];
+    if (items.length === 0 || !defaultComponents.length) {
+      setTemplateDefaultsError(null);
+      return;
+    }
+
+    const errs: string[] = [];
+    defaultComponents.forEach((dc: any) => {
+      if (!dc?.name) return;
+      const item = items.find((it) => it.metadata.name === dc.name);
+      if (!item) {
+        errs.push(`Component "${dc.name}" from template is not available.`);
+        return;
+      }
+      const versions: string[] = Array.isArray(item.status?.versions) ? item.status.versions : [];
+      if (dc.version && !versions.includes(dc.version)) {
+        errs.push(`Component "${dc.name}" version "${dc.version}" from template is not available.`);
+      }
+    });
+
+    setTemplateDefaultsError(errs.length ? errs.join('\n') : null);
+  }, [availableManagedComponentsListData, defaultComponents]);
+
+  useEffect(() => {
+    if (!initialized.current) return;
+    if (!defaultComponents?.length) return;
+    if (!componentsList?.length) return;
+
+    const anySelected = componentsList.some((c) => c.isSelected);
+    if (anySelected) return;
+
+    const updated = componentsList.map((c) => {
+      const template = defaultComponents.find((dc) => dc.name === c.name);
+      if (!template) return c;
+      const templateVersion = template.version;
+      const selectedVersion =
+        templateVersion && Array.isArray(c.versions) && c.versions.includes(templateVersion) ? templateVersion : '';
+      return { ...c, isSelected: true, selectedVersion };
+    });
+
+    setComponentsList(updated);
+  }, [defaultComponents, componentsList, setComponentsList]);
 
   if (isLoading) {
     return <Loading />;
@@ -77,5 +131,11 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
     return <IllustratedError title={t('componentsSelection.cannotLoad')} compact={true} />;
   }
 
-  return <ComponentsSelection componentsList={componentsList} setComponentsList={setComponentsList} />;
+  return (
+    <ComponentsSelection
+      componentsList={componentsList}
+      setComponentsList={setComponentsList}
+      templateDefaultsError={templateDefaultsError || undefined}
+    />
+  );
 };

src/components/ControlPlanes/ControlPlanesListMenu.tsx

@@ -5,21 +5,27 @@ import '@ui5/webcomponents-icons/dist/copy';
 import '@ui5/webcomponents-icons/dist/accept';
 
 import { useTranslation } from 'react-i18next';
+import { ManagedControlPlaneTemplate } from '../../lib/api/types/templates/mcpTemplate.ts';
 
 type ControlPlanesListMenuProps = {
   setDialogDeleteWsIsOpen: Dispatch<SetStateAction<boolean>>;
   setIsCreateManagedControlPlaneWizardOpen: Dispatch<SetStateAction<boolean>>;
+  setInitialTemplateName: Dispatch<SetStateAction<string | undefined>>;
 };
 
 export const ControlPlanesListMenu: FC<ControlPlanesListMenuProps> = ({
   setDialogDeleteWsIsOpen,
   setIsCreateManagedControlPlaneWizardOpen,
+  setInitialTemplateName, 
 }) => {
   const popoverRef = useRef<MenuDomRef>(null);
   const [open, setOpen] = useState(false);
 
   const { t } = useTranslation();
 
+  // Here we will pass template list from OnboardingAPI
+  const allTemplates: ManagedControlPlaneTemplate[] = [];
+
   const handleOpenerClick = (e: Ui5CustomEvent<ButtonDomRef, ButtonClickEventDetail>) => {
     if (popoverRef.current && e.currentTarget) {
       popoverRef.current.opener = e.currentTarget as HTMLElement;
@@ -34,14 +40,20 @@ export const ControlPlanesListMenu: FC<ControlPlanesListMenuProps> = ({
         ref={popoverRef}
         open={open}
         onItemClick={(event) => {
-          const action = (event.detail.item as HTMLElement).dataset.action;
+          const item = event.detail.item as HTMLElement;
+          const action = item.dataset.action;
           if (action === 'newManagedControlPlane') {
+            setInitialTemplateName(undefined);
+            setIsCreateManagedControlPlaneWizardOpen(true);
+          }
+          if (action === 'newManagedControlPlaneWithTemplate') {
+            const tplName = item.dataset.templateName || undefined;
+            setInitialTemplateName(tplName);
             setIsCreateManagedControlPlaneWizardOpen(true);
           }
           if (action === 'deleteWorkspace') {
             setDialogDeleteWsIsOpen(true);
           }
-
           setOpen(false);
         }}
       >
@@ -51,6 +63,17 @@ export const ControlPlanesListMenu: FC<ControlPlanesListMenuProps> = ({
           data-action="newManagedControlPlane"
           icon="add"
         />
+        {allTemplates.map((tpl) => (
+          <MenuItem
+            key={`tpl-${tpl.metadata.name}`}
+            text={tpl.metadata.name}
+            title={tpl.metadata.descriptionText || ''}
+            data-action="newManagedControlPlaneWithTemplate"
+            data-template-name={tpl.metadata.name}
+            icon="document-text"
+          />
+        ))}
+
         <MenuItem
           key={'delete'}
           text={t('ControlPlaneListToolbar.deleteWorkspace')}

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

@@ -5,7 +5,7 @@ import '@ui5/webcomponents-icons/dist/delete';
 import { CopyButton } from '../../Shared/CopyButton.tsx';
 import { ControlPlaneCard } from '../ControlPlaneCard/ControlPlaneCard.tsx';
 import { ListWorkspacesType, isWorkspaceReady } from '../../../lib/api/types/crate/listWorkspaces.ts';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { MembersAvatarView } from './MembersAvatarView.tsx';
 import { DeleteWorkspaceResource, DeleteWorkspaceType } from '../../../lib/api/types/crate/deleteWorkspace.ts';
 import { useApiResourceMutation, useApiResource } from '../../../lib/api/useApiResource.ts';
@@ -32,6 +32,7 @@ interface Props {
 
 export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Props) {
   const [isCreateManagedControlPlaneWizardOpen, setIsCreateManagedControlPlaneWizardOpen] = useState(false);
+  const [initialTemplateName, setInitialTemplateName] = useState<string | undefined>(undefined);
   const workspaceName = workspace.metadata.name;
   const workspaceDisplayName = workspace.metadata.annotations?.[DISPLAY_NAME_ANNOTATION] || '';
   const showDisplayName = workspaceDisplayName.length > 0;
@@ -68,6 +69,22 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
     return null;
   }
 
+  const uniqueMembers = useMemo(() => {
+    const seenKeys = new Set<string>();
+    const fallbackNamespace = workspace.status?.namespace ?? '';
+
+    return (workspace.spec.members ?? []).filter((member: any) => {
+      const memberNamespace = member?.namespace ?? fallbackNamespace;
+      const memberName = String(member?.name ?? '').trim().toLowerCase();
+      if (!memberName) return false;
+
+      const dedupeKey = `${memberNamespace}::${memberName}`;
+      if (seenKeys.has(dedupeKey)) return false;
+      seenKeys.add(dedupeKey);
+      return true;
+    });
+  }, [workspace.spec.members, workspace.status?.namespace]);
+
   return (
     <>
       <ObjectPageSection
@@ -98,7 +115,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
 
               <CopyButton text={workspace.status?.namespace || '-'} style={{ justifyContent: 'start' }} />
 
-              <MembersAvatarView members={workspace.spec.members} project={projectName} workspace={workspaceName} />
+              <MembersAvatarView members={uniqueMembers} project={projectName} workspace={workspaceName} />
               <FlexBox justifyContent={'SpaceBetween'} gap={10}>
                 <YamlViewButtonWithLoader
                   workspaceName={workspace.metadata.namespace}
@@ -108,6 +125,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
                 <ControlPlanesListMenu
                   setDialogDeleteWsIsOpen={setDialogDeleteWsIsOpen}
                   setIsCreateManagedControlPlaneWizardOpen={setIsCreateManagedControlPlaneWizardOpen}
+                  setInitialTemplateName={setInitialTemplateName}
                 />
               </FlexBox>
             </div>
@@ -168,6 +186,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
         setIsOpen={setIsCreateManagedControlPlaneWizardOpen}
         projectName={projectNamespace}
         workspaceName={workspaceName}
+        initialTemplateName={initialTemplateName}
       />
     </>
   );