Skip to content

Commit 6d91edb

Browse files
committed
ui: fix check for config
Add check of UIConfig used on CC Console, which could be undefinied initially and cause a crash. Epic: none Release note: None
1 parent 32b2be3 commit 6d91edb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/ui/workspaces/cluster-ui/src/statementDetails/statementDetails.selectors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ export const selectStatementDetails = createSelector(
7575
);
7676

7777
export const selectStatementDetailsUiConfig = createSelector(
78-
(state: AppState) => state.adminUI?.uiConfig.pages.statementDetails,
78+
(state: AppState) => state.adminUI?.uiConfig?.pages.statementDetails,
7979
statementDetailsUiConfig => statementDetailsUiConfig,
8080
);

pkg/ui/workspaces/cluster-ui/src/store/sessions/sessions.selectors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ export const selectSession = createSelector(
3333
);
3434

3535
export const selectSessionDetailsUiConfig = createSelector(
36-
(state: AppState) => state.adminUI?.uiConfig.pages.sessionDetails,
36+
(state: AppState) => state.adminUI?.uiConfig?.pages.sessionDetails,
3737
statementDetailsUiConfig => statementDetailsUiConfig,
3838
);

pkg/ui/workspaces/cluster-ui/src/store/uiConfig/uiConfig.selector.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ export const selectUIConfig = createSelector(
1818

1919
export const selectIsTenant = createSelector(
2020
selectUIConfig,
21-
uiConfig => uiConfig.isTenant,
21+
uiConfig => uiConfig?.isTenant,
2222
);
2323

2424
export const selectHasViewActivityRedactedRole = createSelector(
2525
selectUIConfig,
26-
uiConfig => uiConfig.userSQLRoles.includes("VIEWACTIVITYREDACTED"),
26+
uiConfig => uiConfig?.userSQLRoles.includes("VIEWACTIVITYREDACTED"),
2727
);
2828

2929
export const selectHasAdminRole = createSelector(selectUIConfig, uiConfig =>
30-
uiConfig.userSQLRoles.includes("ADMIN"),
30+
uiConfig?.userSQLRoles.includes("ADMIN"),
3131
);

0 commit comments

Comments
 (0)