fixes

Author: Raubzeug

src/containers/Header/Header.tsx

@@ -15,8 +15,8 @@ import {createDeveloperUIInternalPageHref} from '../../utils/developerUI/develop
 import {useTypedSelector} from '../../utils/hooks';
 import {useDatabaseFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
 import {
-    useIsOnlyDatabaseUser,
     useIsUserAllowedToMakeChanges,
+    useIsViewerUser,
 } from '../../utils/hooks/useIsUserAllowedToMakeChanges';
 
 import {getBreadcrumbs} from './breadcrumbs';
@@ -30,7 +30,7 @@ function Header() {
     const {page, pageBreadcrumbsOptions} = useTypedSelector((state) => state.header);
     const singleClusterMode = useTypedSelector((state) => state.singleClusterMode);
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
-    const isOnlyDatabaseUser = useIsOnlyDatabaseUser();
+    const isViewerUser = useIsViewerUser();
 
     const {title: clusterTitle} = useClusterBaseInfo();
 
@@ -43,7 +43,11 @@ function Header() {
         useAddClusterFeatureAvailable() && uiFactory.onAddCluster !== undefined;
 
     const breadcrumbItems = React.useMemo(() => {
-        let options = {...pageBreadcrumbsOptions, singleClusterMode, isOnlyDatabaseUser};
+        let options = {
+            ...pageBreadcrumbsOptions,
+            singleClusterMode,
+            isViewerUser,
+        };
 
         if (clusterTitle) {
             options = {
@@ -57,7 +61,7 @@ function Header() {
         return breadcrumbs.map((item) => {
             return {...item, action: () => {}};
         });
-    }, [clusterTitle, page, pageBreadcrumbsOptions, singleClusterMode, isOnlyDatabaseUser]);
+    }, [clusterTitle, page, pageBreadcrumbsOptions, singleClusterMode, isViewerUser]);
 
     const renderRightControls = () => {
         const elements: React.ReactNode[] = [];

src/containers/Header/breadcrumbs.tsx

@@ -47,7 +47,7 @@ const getQueryForTenant = (type: 'nodes' | 'tablets') => ({
 });
 
 const getClustersBreadcrumbs: GetBreadcrumbs<ClustersBreadcrumbsOptions> = (options) => {
-    if (options.isOnlyDatabaseUser) {
+    if (!options.isViewerUser) {
         return [];
     }
     return [
@@ -59,9 +59,9 @@ const getClustersBreadcrumbs: GetBreadcrumbs<ClustersBreadcrumbsOptions> = (opti
 };
 
 const getClusterBreadcrumbs: GetBreadcrumbs<ClusterBreadcrumbsOptions> = (options, query = {}) => {
-    const {clusterName, clusterTab, singleClusterMode, isOnlyDatabaseUser} = options;
+    const {clusterName, clusterTab, singleClusterMode, isViewerUser} = options;
 
-    if (isOnlyDatabaseUser) {
+    if (!isViewerUser) {
         return [];
     }
 

src/store/reducers/authentication/authentication.ts

@@ -26,8 +26,7 @@ export const slice = createSlice({
             }
         },
         setUser: (state, action: PayloadAction<TUserToken>) => {
-            const {UserSID, AuthType, IsMonitoringAllowed, IsDatabaseAllowed, IsViewerAllowed} =
-                action.payload;
+            const {UserSID, AuthType, IsMonitoringAllowed, IsViewerAllowed} = action.payload;
 
             state.user = AuthType === 'Login' ? UserSID : undefined;
 
@@ -36,20 +35,19 @@ export const slice = createSlice({
             // Otherwise every user is allowed to make changes
             // Anyway there will be guards on backend
             state.isUserAllowedToMakeChanges = IsMonitoringAllowed !== false;
-            state.isOnlyDatabaseUser = IsDatabaseAllowed && IsViewerAllowed === false;
+            state.isViewerUser = IsViewerAllowed;
         },
     },
     selectors: {
         selectIsUserAllowedToMakeChanges: (state) => state.isUserAllowedToMakeChanges,
-        selectIsOnlyDatabaseUser: (state) => state.isOnlyDatabaseUser,
+        selectIsViewerUser: (state) => state.isViewerUser,
         selectUser: (state) => state.user,
     },
 });
 
 export default slice.reducer;
 export const {setIsAuthenticated, setUser} = slice.actions;
-export const {selectIsUserAllowedToMakeChanges, selectIsOnlyDatabaseUser, selectUser} =
-    slice.selectors;
+export const {selectIsUserAllowedToMakeChanges, selectIsViewerUser, selectUser} = slice.selectors;
 
 export const authenticationApi = api.injectEndpoints({
     endpoints: (build) => ({

src/store/reducers/authentication/types.ts

@@ -1,6 +1,6 @@
 export interface AuthenticationState {
     isAuthenticated: boolean;
     isUserAllowedToMakeChanges?: boolean;
-    isOnlyDatabaseUser?: boolean;
+    isViewerUser?: boolean;
     user: string | undefined;
 }

src/store/reducers/header/types.ts

@@ -16,7 +16,7 @@ export type Page =
     | undefined;
 
 export interface ClustersBreadcrumbsOptions {
-    isOnlyDatabaseUser?: boolean;
+    isViewerUser?: boolean;
 }
 
 export interface ClusterBreadcrumbsOptions extends ClustersBreadcrumbsOptions {

src/types/api/whoami.ts

@@ -11,7 +11,7 @@ export interface TUserToken {
 
     /** Is user allowed to view only database specific data */
     IsDatabaseAllowed?: boolean;
-    /** Is user allowed to view data */
+    /** Is user allowed to view data (includes IsDatabaseAllowed rights) */
     IsViewerAllowed?: boolean;
     /** Is user allowed to view deeper and make simple changes */
     IsMonitoringAllowed?: boolean;

src/utils/hooks/useIsUserAllowedToMakeChanges.ts

@@ -1,13 +1,13 @@
 import {
-    selectIsOnlyDatabaseUser,
     selectIsUserAllowedToMakeChanges,
+    selectIsViewerUser,
 } from '../../store/reducers/authentication/authentication';
 
 import {useTypedSelector} from './useTypedSelector';
 
 export function useIsUserAllowedToMakeChanges() {
     return useTypedSelector(selectIsUserAllowedToMakeChanges);
 }
-export function useIsOnlyDatabaseUser() {
-    return useTypedSelector(selectIsOnlyDatabaseUser);
+export function useIsViewerUser() {
+    return useTypedSelector(selectIsViewerUser);
 }