Bump Typescript to 5.3.2

Signed-off-by: Steve Cassidy <[email protected]>
FAIMS · Nov 22, 2023 · 240c144 · 240c144
1 parent 5fa1b47
commit 240c144
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -164,7 +164,7 @@
     "taffydb": "^2.7.3",
     "ts-loader": "^9.4.2",
     "type-fest": "^3.10.0",
-    "typescript": "^4.0.2",
+    "typescript": "^5.3.2",
     "vite": "^4.4.9",
     "vite-plugin-svgr": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.1",

diff --git a/src/gui/components/authentication/cluster_card.tsx b/src/gui/components/authentication/cluster_card.tsx
@@ -125,21 +125,32 @@ function UserSwitcher(props: UserSwitcherProps) {
             disablePortal
             id={`user-switcher-${props.listing_id}`}
             options={userList}
-            getOptionLabel={option =>
-              option.name ? option.name : option.username
-            }
-            renderOption={(props, option) => (
-              <Box component="li" {...props}>
-                {option.name ? (
-                  <span>
-                    {option.name}{' '}
-                    <Chip size={'small'} label={option.username} />
-                  </span>
-                ) : (
-                  option.username
-                )}
-              </Box>
-            )}
+            getOptionLabel={option => {
+              if (option) return option.name ? option.name : option.username;
+              else return '';
+            }}
+            renderOption={(props, option) => {
+              if (option) {
+                return (
+                  <Box component="li" {...props}>
+                    {option.name ? (
+                      <span>
+                        {option.name}{' '}
+                        <Chip size={'small'} label={option.username} />
+                      </span>
+                    ) : (
+                      option.username
+                    )}
+                  </Box>
+                );
+              } else {
+                return (
+                  <Box component="li" {...props}>
+                    Unknown User
+                  </Box>
+                );
+              }
+            }}
             value={value}
             onChange={(
               event: any,
@@ -148,7 +159,7 @@ function UserSwitcher(props: UserSwitcherProps) {
               setValue(newValue);
             }}
             isOptionEqualToValue={(option, value) =>
-              option.username === value.username
+              option && value ? option.username === value.username : false
             }
             fullWidth
             renderInput={params => (