fix

Author: lucasgoral

package-lock.json

@@ -34,23 +34,23 @@
     "@fastify/static": "8.2.0",
     "@fastify/vite": "8.2.0",
     "@hookform/resolvers": "5.2.1",
-    "@sentry/node": "10.8.0",
-    "@sentry/react": "10.8.0",
-    "@sentry/vite-plugin": "4.2.0",
-    "@ui5/webcomponents": "2.13.3",
-    "@ui5/webcomponents-fiori": "2.13.3",
-    "@ui5/webcomponents-icons": "2.13.3",
-    "@ui5/webcomponents-react": "2.13.2",
-    "@ui5/webcomponents-react-charts": "2.13.2",
+    "@sentry/node": "10.10.0",
+    "@sentry/react": "10.10.0",
+    "@sentry/vite-plugin": "4.3.0",
+    "@ui5/webcomponents": "2.14.0",
+    "@ui5/webcomponents-fiori": "2.14.0",
+    "@ui5/webcomponents-icons": "2.14.0",
+    "@ui5/webcomponents-react": "2.14.0",
+    "@ui5/webcomponents-react-charts": "2.14.0",
     "@xyflow/react": "12.8.4",
     "clsx": "2.1.1",
     "dagre": "0.8.5",
-    "dotenv": "17.2.1",
-    "fastify": "5.5.0",
+    "dotenv": "17.2.2",
+    "fastify": "5.6.0",
     "fastify-plugin": "5.0.1",
     "graphql": "16.11.0",
     "graphql-config": "5.1.5",
-    "i18next": "25.4.2",
+    "i18next": "25.5.2",
     "javascript-time-ago": "2.5.11",
     "js-yaml": "4.1.0",
     "react": "19.1.1",
@@ -67,18 +67,18 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.34.0",
+    "@eslint/js": "9.35.0",
     "@graphql-codegen/cli": "5.0.7",
     "@graphql-codegen/client-preset": "4.8.3",
     "@types/dagre": "0.7.53",
     "@types/js-yaml": "4.0.9",
-    "@types/node": "22.18.0",
+    "@types/node": "22.18.1",
     "@types/react": "19.1.12",
     "@types/react-dom": "19.1.9",
     "@types/react-syntax-highlighter": "15.5.13",
-    "@ui5/webcomponents-cypress-commands": "2.13.2",
+    "@ui5/webcomponents-cypress-commands": "2.14.0",
     "@vitejs/plugin-react": "5.0.2",
-    "@vitest/eslint-plugin": "1.3.5",
+    "@vitest/eslint-plugin": "1.3.9",
     "cypress": "15.1.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
@@ -94,8 +94,8 @@
     "prettier": "3.6.2",
     "tsx": "4.20.5",
     "typescript": "5.9.2",
-    "typescript-eslint": "8.41.0",
-    "vite": "6.3.5",
+    "typescript-eslint": "8.42.0",
+    "vite": "7.1.5",
     "vitest": "3.2.4"
   }
 }

package.json

@@ -93,6 +93,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.",

public/locales/en.json

@@ -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();
 
@@ -132,8 +138,19 @@ export const ComponentsSelection: React.FC<ComponentsSelectionProps> = ({ compon
                       value={component.selectedVersion}
                       disabled={!component.isSelected || providerDisabled}
                       aria-label={`${component.name} version`}
+                      valueState={component.isSelected && !component.selectedVersion ? 'Negative' : 'None'}
+                      valueStateMessage={
+                        component.isSelected && !component.selectedVersion ? (
+                          <span>{t('ComponentsSelection.chooseVersion')}</span>
+                        ) : undefined
+                      }
                       onChange={handleVersionChange}
                     >
+                      {!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 +172,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/ComponentsSelection.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/ControlPlanesListMenu.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,24 @@ 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: { name?: string; namespace?: string }) => {
+      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 +117,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 +127,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
                 <ControlPlanesListMenu
                   setDialogDeleteWsIsOpen={setDialogDeleteWsIsOpen}
                   setIsCreateManagedControlPlaneWizardOpen={setIsCreateManagedControlPlaneWizardOpen}
+                  setInitialTemplateName={setInitialTemplateName}
                 />
               </FlexBox>
             </div>
@@ -168,6 +188,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
         setIsOpen={setIsCreateManagedControlPlaneWizardOpen}
         projectName={projectNamespace}
         workspaceName={workspaceName}
+        initialTemplateName={initialTemplateName}
         isEditMode={true}
       />
     </>

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

@@ -1,3 +1,9 @@
+.affixRow {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
 .input {
   width: 100%;
   margin-bottom: 2rem;