feat: Update capitalizeFirstLetter function to handle optional string…

… input and improve app key display in portal apps
equinor · Dec 17, 2024 · 59d40b8 · 59d40b8
1 parent a78e9e5
commit 59d40b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/client/apps/portal-administration/src/components/Ag-Grid/defaultGridOptions.ts b/client/apps/portal-administration/src/components/Ag-Grid/defaultGridOptions.ts
@@ -18,7 +18,7 @@ export const defaultGridOptions: GridOptions = {
 
 export const bottomPadding = 70;
 
-export function capitalizeFirstLetter(str: string) {
+export function capitalizeFirstLetter(str?: string) {
 	if (!str) return ''; // Handle empty string
 	return str.charAt(0).toUpperCase() + str.slice(1);
 }
diff --git a/client/apps/portal-administration/src/components/PortalApps/portalAppsColDef.tsx b/client/apps/portal-administration/src/components/PortalApps/portalAppsColDef.tsx
@@ -2,8 +2,7 @@ import { CustomCellRendererProps } from '@ag-grid-community/react';
 
 import { AgStyles } from '../AgStyle';
 import { ColDef } from '@equinor/workspace-ag-grid';
-
-const FAIL_MESSAGE = 'Application Error!';
+import { capitalizeFirstLetter } from '../Ag-Grid/defaultGridOptions';
 
 export const colDefs: ColDef<any, any>[] = [
 	{
@@ -65,11 +64,14 @@ export const colDefs: ColDef<any, any>[] = [
 		cellRenderer: (
 			params: CustomCellRendererProps<{
 				appManifest?: { displayName: string };
+				appKey: string;
 			}>
 		) => {
 			return (
 				<AgStyles.TextCellWrapperLeft key={`active-${params.context?.appKey}`}>
-					{params.data?.appManifest ? params.data?.appManifest.displayName : FAIL_MESSAGE}
+					{params.data?.appManifest
+						? params.data?.appManifest.displayName
+						: capitalizeFirstLetter(params.data?.appKey)}
 				</AgStyles.TextCellWrapperLeft>
 			);
 		},
@@ -93,20 +95,6 @@ export const colDefs: ColDef<any, any>[] = [
 			filterOptions: ['contains', 'startsWith', 'endsWith'],
 			defaultOption: 'startsWith',
 		},
-		cellRenderer: (
-			params: CustomCellRendererProps<{
-				appManifest?: { category: { displayName: string } };
-				doesNotExistInFusion: boolean;
-			}>
-		) => {
-			return (
-				<AgStyles.TextCellWrapperLeft key={`active-${params.context?.appKey}`}>
-					{params.data?.doesNotExistInFusion === false
-						? params.data?.appManifest?.category.displayName
-						: FAIL_MESSAGE}
-				</AgStyles.TextCellWrapperLeft>
-			);
-		},
 	},
 	{
 		field: 'appManifest.build.version',