Merge branch 'main' into feature/oidc-config-change

Author: enrico-kaack-comp

Dockerfile

@@ -16,7 +16,7 @@ RUN npm run build
 
 # Use the latest LTS version of Nginx as the serving image
 # https://hub.docker.com/_/nginx
-FROM nginx:1.27.4-alpine-slim@sha256:b05aceb5ec1844435cae920267ff9949887df5b88f70e11d8b2871651a596612
+FROM nginx:1.27.5-alpine-slim@sha256:b947b2630c97622793113555e13332eec85bdc7a0ac6ab697159af78942bb856
 
 COPY nginx.conf /etc/nginx/templates/default.conf.template
 COPY --from=build-stage /usr/src/app/dist /usr/share/nginx/html

src/components/ControlPlane/MCPHealthPopoverButton.tsx

@@ -101,9 +101,7 @@ function StatusTable({
   );
 }
 
-export function getIconForOverallStatus(
-  status: ReadyStatus | undefined,
-): JSX.Element {
+function getIconForOverallStatus(status: ReadyStatus | undefined): JSX.Element {
   switch (status) {
     case ReadyStatus.Ready:
       return <Icon style={{ color: 'green' }} name="sap-icon://sys-enter" />;

src/components/ControlPlanes/List/ControlPlaneListAllWorkspaces.tsx

@@ -6,7 +6,7 @@ import '@ui5/webcomponents-icons/dist/delete';
 import Loading from '../../Shared/Loading.tsx';
 import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
 import { ControlPlaneListWorkspaceGridTile } from './ControlPlaneListWorkspaceGridTile.tsx';
-import useApiResource from '../../../lib/api/useApiResource.ts';
+import { useApiResource } from '../../../lib/api/useApiResource.ts';
 import { ListWorkspaces } from '../../../lib/api/types/crate/listWorkspaces.ts';
 import { useFrontendConfig } from '../../../context/FrontendConfigContext.tsx';
 import { useTranslation } from 'react-i18next';

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

@@ -22,8 +22,9 @@ import {
   DeleteWorkspaceResource,
   DeleteWorkspaceType,
 } from '../../../lib/api/types/crate/deleteWorkspace.ts';
-import useApiResource, {
+import {
   useApiResourceMutation,
+  useApiResource,
 } from '../../../lib/api/useApiResource.ts';
 import { DISPLAY_NAME_ANNOTATION } from '../../../lib/api/types/shared/keyNames.ts';
 import { DeleteConfirmationDialog } from '../../Dialogs/DeleteConfirmationDialog.tsx';
@@ -64,7 +65,7 @@ export function ControlPlaneListWorkspaceGridTile({
 
   function createErrorView(error: APIError) {
     if (error) {
-      if (error.status == 403) {
+      if (error.status === 403) {
         return (
           <IllustratedError
             title={t(

src/components/ControlPlanes/List/MembersAvatarView.tsx

@@ -4,6 +4,7 @@ import PopoverPlacement from '@ui5/webcomponents/dist/types/PopoverPlacement.js'
 import { useRef, useState } from 'react';
 import { MemberTable } from '../../Members/MemberTable.tsx';
 import { Member } from '../../../lib/api/types/shared/members';
+import { generateInitialsForEmail } from '../../Helper/GenerateInitialsForEmail.ts';
 
 interface Props {
   project?: string;
@@ -53,17 +54,3 @@ export function MembersAvatarView({ members, project, workspace }: Props) {
     </div>
   );
 }
-
-export function generateInitialsForEmail(email: string | undefined): string {
-  if (!email) {
-    return '';
-  }
-  const [name, _] = email.split('@');
-  const nameParts = name.split('.');
-  // return the first letter of each part of the name up to 3 characters
-  return nameParts
-    .map((part) => part[0])
-    .join('')
-    .substring(0, 3)
-    .toUpperCase();
-}

src/components/Core/ShellBar.tsx

@@ -8,12 +8,12 @@ import {
   ShellBarDomRef,
   Ui5CustomEvent,
 } from '@ui5/webcomponents-react';
-import { generateInitialsForEmail } from '../ControlPlanes/List/MembersAvatarView.tsx';
 import { useAuth } from 'react-oidc-context';
 import { RefObject, useRef, useState } from 'react';
 import { ShellBarProfileClickEventDetail } from '@ui5/webcomponents-fiori/dist/ShellBar.js';
 import PopoverPlacement from '@ui5/webcomponents/dist/types/PopoverPlacement.js';
 import { useTranslation } from 'react-i18next';
+import { generateInitialsForEmail } from '../Helper/GenerateInitialsForEmail';
 
 export function ShellBarComponent() {
   const auth = useAuth();

src/components/Dialogs/KubectlCommandInfo/Controllers/KubectlDeleteWorkspace.tsx

@@ -27,4 +27,4 @@ export const KubectlDeleteWorkspace = ({
       />
     </>
   );
-};
+};

src/components/Dialogs/KubectlCommandInfo/KubectlTerminal.tsx

@@ -38,9 +38,9 @@ export const KubectlTerminal = ({ command }: KubeCtlTerminalProps) => {
 
       return (
         <>
-          <span>echo '</span>
+          <span>echo &apos;</span>
           <div style={{ marginLeft: '16px' }}>{yamlLines}</div>
-          <span>'</span> | <span>{kubectlPart}</span>
+          <span>&apos;</span> | <span>{kubectlPart}</span>
         </>
       );
     }

src/components/Helper/GenerateInitialsForEmail.ts

@@ -0,0 +1,13 @@
+export function generateInitialsForEmail(email: string | undefined): string {
+  if (!email) {
+    return '';
+  }
+  const [name, _] = email.split('@');
+  const nameParts = name.split('.');
+  // return the first letter of each part of the name up to 3 characters
+  return nameParts
+    .map((part) => part[0])
+    .join('')
+    .substring(0, 3)
+    .toUpperCase();
+}

src/components/Shared/ConfiguredAnalyticsTable.tsx

@@ -23,7 +23,7 @@ export default function ConfiguredAnalyticsTable(props: Props) {
       scaleWidthMode={AnalyticalTableScaleWidthMode.Smart}
       loading={props.isLoading}
       filterable
-      style={{margin: "12px"}}
+      style={{ margin: '12px' }}
     />
   );
 }