Merge branch 'main' into spike/css-modules

Author: lucasgoral

cypress/support/component.tsx

@@ -22,7 +22,7 @@ import { mount } from 'cypress/react';
 import './commands';
 import { FrontendConfigContext } from '../../src/context/FrontendConfigContext';
 import { mockedFrontendConfig } from '../../src/utils/testing';
-
+import { ToastProvider } from '../../src/context/ToastContext.tsx';
 // Augment the Cypress namespace to include type definitions for
 // your custom command.
 // Alternatively, can be defined in cypress/support/component.d.ts
@@ -36,12 +36,15 @@ declare global {
   }
 }
 
-
 Cypress.Commands.add('mount', (component, options) => {
-  return mount(<ThemeProvider>
-    <FrontendConfigContext value={mockedFrontendConfig}>
-      {component}
-    </FrontendConfigContext>
-  </ThemeProvider>, options);
+  return mount(
+    <ThemeProvider>
+      <ToastProvider>
+        <FrontendConfigContext value={mockedFrontendConfig}>
+          {component}
+        </FrontendConfigContext>
+      </ToastProvider>
+    </ThemeProvider>,
+    options,
+  );
 });
-

package-lock.json

@@ -27,6 +27,13 @@
     "tableHeaderSynced": "Synced",
     "tableHeaderReady": "Ready"
   },
+  "ProvidersConfig": {
+    "headerProviderConfigs": "Provider Configs",
+    "tableHeaderProvider": "Provider",
+    "tableHeaderName": "Name",
+    "tableHeaderCreated": "Created",
+    "tableHeaderUsage": "Usage"
+  },
   "ControlPlaneListToolbar": {
     "buttonText": "Workspace"
   },
@@ -49,9 +56,9 @@
     "messageHeader": "Message",
     "reasonHeader": "Reason",
     "transitionHeader": "Last transition time"
-  }, 
+  },
   "CopyKubeconfigButton": {
-    "copiedMessage": "Copied to Clipboard", 
+    "copiedMessage": "Copied to Clipboard",
     "failedMessage": "Failed to copy, Error:",
     "menuDownload": "Download",
     "menuCopy": "Copy to clipboard"
@@ -106,7 +113,6 @@
     "errorMessage": "useCopyButton must be used within a CopyButtonProvider"
   },
   "CreateProjectWorkspaceDialog": {
-    "learnButton": "Learn how to do this in code",
     "createButton": "Create",
     "cancelButton": "Cancel",
     "chargingTargetLabel": "Charging Target",
@@ -139,6 +145,79 @@
     "copiedMessage": "Copied To Clipboard",
     "failedMessage": "Failed to copy"
   },
+  "DeleteWorkspaceDialog": {
+    "title": "Delete a Workspace",
+    "introSection1": "The below instructions will help you delete the workspace \"{{workspaceName}}\" from project namespace \"{{projectNamespace}}\" using kubectl.",
+    "introSection2": "Remember that this action is <bold1>irreversible</bold1> and all resources within the workspace will be <bold2>permanently deleted</bold2>.",
+    "mainCommandDescription": "Run this command to delete the workspace:",
+    "verificationCommandDescription": "To verify the workspace has been deleted, run:"
+  },
+  "KubectlDeleteMcpDialog": {
+    "title": "Delete a Managed Control Plane",
+    "introSection1": "The below will help you delete the Managed Control Plane \"{{mcpName}}\" from workspace \"{{workspaceNamespace}}\" using kubectl.",
+    "introSection2": "Remember that this action is <bold1>irreversible</bold1> and all resources managed by this control plane will be <bold2>permanently deleted</bold2>.",
+    "annotateCommand": "First, annotate the ManagedControlPlane to confirm deletion:",
+    "deleteCommand": "Run this command to delete the Managed Control Plane:",
+    "verificationCommandDescription": "To verify the MCP has been deleted, run:"
+  },
+  "KubectlCreateProjectDialog": {
+    "title": "Create a Project",
+    "introSection": "A Project is the starting point to our ManagedControlPlane offering. Projects are usually created for each Organization/Team or similar root setups.",
+    "formFields": {
+      "projectName": {
+        "label": "Project Name",
+        "placeholder": "Enter project name"
+      },
+      "chargingTargetId": {
+        "label": "BTP Global Account ID",
+        "placeholder": "Enter your Global Account ID",
+        "defaultValue": "<your-ga-id>"
+      },
+      "userEmail": {
+        "label": "User Email",
+        "placeholder": "Enter your email address",
+        "defaultValue": "<[email protected]>"
+      }
+    },
+    "mainCommandDescription": "Run this command to create a new project:",
+    "resultCommandDescription": "To see the result of the project creation, run the below command:",
+    "namespaceCommandDescription": "A namespace is automatically generated for your project:"
+  },
+  "KubectlCreateWorkspaceDialog": {
+    "title": "Create a Workspace",
+    "introSection": "Let's add a Workspace to our Project. We use workspaces to separate productive and non-productive ManagedControlPlanes.",
+    "formFields": {
+      "workspaceName": {
+        "label": "Workspace Name",
+        "placeholder": "Enter workspace name"
+      },
+      "chargingTargetId": {
+        "label": "BTP Global Account ID",
+        "placeholder": "Enter your Global Account ID",
+        "defaultValue": "<your-ga-id>"
+      },
+      "userEmail": {
+        "label": "User Email",
+        "placeholder": "Enter your email address",
+        "defaultValue": "<[email protected]>"
+      }
+    },
+    "mainCommandDescription": "Run this command to create a new workspace in your project:",
+    "resultCommandDescription": "To see the result of the workspace creation, run the below command:"
+  },
+  "KubectlBaseDialog": {
+    "prerequisites": "Prerequisites",
+    "prerequisitesText": "Make sure you have installed <bold1>kubectl</bold1> and the <bold2>kubelogin</bold2> plugin. We recommend using <bold3>krew</bold3> which is a plugin manager for kubectl.",
+    "formFieldsNote": "<bold1>Important</bold1>: Before executing, modify the commands below:",
+    "onboardingGuide": "You can also use our <link1>Onboarding Guide</link1> for more information."
+  },
+  "CommonKubectl": {
+    "emphasis": {
+      "irreversible": "irreversible",
+      "permanentlyDeleted": "permanently deleted"
+    },
+    "learnButton": "Learn how to do this in code"
+  },
   "App": {
     "loading": "Loading..."
   },
@@ -150,14 +229,11 @@
     "tableHeaderInstalled": "Installed",
     "tableHeaderHealthy": "Healthy"
   },
-  "ProvidersConfig": {
-    "header": "Provider Configs"
-  },
   "validationErrors": {
     "required": "This field is required!",
     "properFormatting": "Use A-Z, a-z, 0-9, hyphen (-), and period (.), but note that whitespace (spaces, tabs, etc.) is not allowed for proper compatibility.",
     "max25chars": "Max length is 25 characters.",
     "userExists": "User with this email already exists!",
     "atLeastOneUser": "You need to have at least one member assigned."
   }
-}
+}

public/locales/en.json

@@ -49,7 +49,7 @@ export default function ComponentList({ mcp }: { mcp: ControlPlaneType }) {
         columns={componentTableColumns}
         minRows={0}
         data={data}
-        style={{marginLeft: "12px", marginRight: "12px"}}
+        style={{ marginLeft: '12px', marginRight: '12px' }}
       />
     </div>
   );

src/components/ControlPlane/ComponentList.tsx

@@ -3,7 +3,6 @@ import {
   AnalyticalTable,
   AnalyticalTableColumnDefinition,
   AnalyticalTableScaleWidthMode,
-  Icon,
   Title,
 } from '@ui5/webcomponents-react';
 import useResource from '../../lib/api/useApiResource';
@@ -13,7 +12,7 @@ import IllustratedError from '../Shared/IllustratedError';
 import '@ui5/webcomponents-icons/dist/sys-enter-2';
 import '@ui5/webcomponents-icons/dist/sys-cancel-2';
 import { resourcesInterval } from '../../lib/shared/constants';
-import { StatusCellProps } from '../../lib/shared/interfaces';
+import { ResourceStatusCell } from '../Shared/ResourceStatusCell';
 
 interface CellData<T> {
   cell: {
@@ -140,14 +139,3 @@ export function ManagedResources() {
     </>
   );
 }
-
-function ResourceStatusCell({ value, transitionTime }: StatusCellProps) {
-  return (
-    <Icon
-      design={value ? 'Positive' : 'Negative'}
-      name={value ? 'sys-enter-2' : 'sys-cancel-2'}
-      showTooltip={true}
-      accessibleName={timeAgo.format(new Date(transitionTime))}
-    />
-  );
-}