feat: restrictions for users without IsViewerAllowed role

Author: Raubzeug

src/components/VDiskPopup/VDiskPopup.tsx

@@ -13,7 +13,10 @@ import {createVDiskDeveloperUILink} from '../../utils/developerUI/developerUI';
 import {isFullVDiskData} from '../../utils/disks/helpers';
 import type {PreparedVDisk, UnavailableDonor} from '../../utils/disks/types';
 import {useTypedSelector} from '../../utils/hooks';
-import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
+import {
+    useIsUserAllowedToMakeChanges,
+    useIsViewerUser,
+} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {bytesToGB, bytesToSpeed} from '../../utils/utils';
 import type {InfoViewerItem} from '../InfoViewer';
 import {InfoViewer} from '../InfoViewer';
@@ -221,6 +224,7 @@ interface VDiskPopupProps {
 
 export const VDiskPopup = ({data}: VDiskPopupProps) => {
     const isFullData = isFullVDiskData(data);
+    const isViewerUser = useIsViewerUser();
 
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
 
@@ -257,7 +261,7 @@ export const VDiskPopup = ({data}: VDiskPopupProps) => {
         <div className={b()}>
             {data.DonorMode && <Label className={b('donor-label')}>Donor</Label>}
             <InfoViewer title="VDisk" info={vdiskInfo} size="s" />
-            {pdiskInfo && <InfoViewer title="PDisk" info={pdiskInfo} size="s" />}
+            {pdiskInfo && isViewerUser && <InfoViewer title="PDisk" info={pdiskInfo} size="s" />}
             {donorsInfo.length > 0 && <InfoViewer title="Donors" info={donorsInfo} size="s" />}
         </div>
     );

src/components/nodesColumns/constants.ts

@@ -43,6 +43,12 @@ export function isMonitoringUserNodesColumn(columnId: string): boolean {
     return MONITORING_USER_COLUMNS_IDS.includes(columnId as NodesColumnId);
 }
 
+// Columns, that should displayed only for users with isViewerAllowed:true
+const VIEWER_USER_COLUMNS_IDS: NodesColumnId[] = ['LoadAverage'];
+export function isViewerUserNodesColumn(columnId: string): boolean {
+    return VIEWER_USER_COLUMNS_IDS.some((el) => el === columnId);
+}
+
 // This code is running when module is initialized and correct language may not be set yet
 // get functions guarantee that i18n fields will be inited on render with current render language
 export const NODES_COLUMNS_TITLES = {

src/containers/Nodes/Nodes.tsx

@@ -1,12 +1,18 @@
 import React from 'react';
 
 import type {Column} from '../../components/PaginatedTable';
-import {isMonitoringUserNodesColumn} from '../../components/nodesColumns/constants';
+import {
+    isMonitoringUserNodesColumn,
+    isViewerUserNodesColumn,
+} from '../../components/nodesColumns/constants';
 import type {NodesColumnId} from '../../components/nodesColumns/constants';
 import type {NodesPreparedEntity} from '../../store/reducers/nodes/types';
 import type {AdditionalNodesProps} from '../../types/additionalProps';
 import type {NodesGroupByField} from '../../types/api/nodes';
-import {useIsUserAllowedToMakeChanges} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
+import {
+    useIsUserAllowedToMakeChanges,
+    useIsViewerUser,
+} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
 
 import {PaginatedNodes} from './PaginatedNodes';
 import {getNodesColumns} from './columns/columns';
@@ -45,13 +51,20 @@ export function Nodes({
     groupByParams = ALL_NODES_GROUP_BY_PARAMS,
 }: NodesProps) {
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
+    const isViewerUser = useIsViewerUser();
 
     const preparedColumns = React.useMemo(() => {
         if (isUserAllowedToMakeChanges) {
             return columns;
         }
-        return columns.filter((column) => !isMonitoringUserNodesColumn(column.name));
-    }, [columns, isUserAllowedToMakeChanges]);
+        const filteredColumns = columns.filter(
+            (column) => !isMonitoringUserNodesColumn(column.name),
+        );
+        if (isViewerUser) {
+            return filteredColumns;
+        }
+        return filteredColumns.filter((column) => !isViewerUserNodesColumn(column.name));
+    }, [columns, isUserAllowedToMakeChanges, isViewerUser]);
 
     return (
         <PaginatedNodes

src/containers/Nodes/NodesControls/NodesControls.tsx

@@ -13,6 +13,7 @@ import {
 } from '../../../store/reducers/capabilities/hooks';
 import {useProblemFilter} from '../../../store/reducers/settings/hooks';
 import type {NodesGroupByField} from '../../../types/api/nodes';
+import {useIsViewerUser} from '../../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {PeerRoleFilter} from '../PeerRoleFilter/PeerRoleFilter';
 import {getNodesGroupByOptions} from '../columns/constants';
 import i18n from '../i18n';
@@ -58,12 +59,13 @@ export function NodesControls({
         handleGroupByParamChange,
     } = useNodesPageQueryParams(groupByParams);
     const {problemFilter, handleProblemFilterChange} = useProblemFilter();
+    const isViewerUser = useIsViewerUser();
 
     const systemStateGroupingAvailable = useViewerNodesHandlerHasGroupingBySystemState();
     const groupByoptions = getNodesGroupByOptions(groupByParams, systemStateGroupingAvailable);
 
     const networStatsAvailable = useViewerNodesHandlerHasNetworkStats();
-    const shouldDisplayPeerRoleFilter = withPeerRoleFilter && networStatsAvailable;
+    const shouldDisplayPeerRoleFilter = withPeerRoleFilter && networStatsAvailable && isViewerUser;
 
     const handleGroupBySelectUpdate = (value: string[]) => {
         handleGroupByParamChange(value[0]);

src/containers/Nodes/useNodesPageQueryParams.ts

@@ -2,6 +2,7 @@ import {StringParam, useQueryParams} from 'use-query-params';
 
 import {useViewerNodesHandlerHasGroupingBySystemState} from '../../store/reducers/capabilities/hooks';
 import type {NodesGroupByField, NodesPeerRole} from '../../types/api/nodes';
+import {useIsViewerUser} from '../../utils/hooks/useIsUserAllowedToMakeChanges';
 import type {NodesUptimeFilterValues} from '../../utils/nodes';
 import {nodesUptimeFilterValuesSchema} from '../../utils/nodes';
 
@@ -16,9 +17,13 @@ export function useNodesPageQueryParams(groupByParams: NodesGroupByField[] | und
         nodesGroupBy: StringParam,
     });
 
+    const isViewerUser = useIsViewerUser();
+
     const uptimeFilter = nodesUptimeFilterValuesSchema.parse(queryParams.uptimeFilter);
     const searchValue = queryParams.search ?? '';
-    const peerRoleFilter = parseNodesPeerRoleFilter(queryParams.peerRole);
+    const peerRoleFilter = isViewerUser
+        ? parseNodesPeerRoleFilter(queryParams.peerRole)
+        : 'database';
 
     const systemStateGroupingAvailable = useViewerNodesHandlerHasGroupingBySystemState();
     const groupByParam = parseNodesGroupByParam(

src/containers/Storage/PaginatedStorageGroupsTable/columns/constants.ts

@@ -55,6 +55,12 @@ export const DEFAULT_STORAGE_GROUPS_COLUMNS: StorageGroupsColumnId[] = [
     'VDisks',
 ];
 
+// Columns, that should displayed only for users with isViewerAllowed:true
+const VIEWER_USER_COLUMNS_IDS: StorageGroupsColumnId[] = ['DiskSpace'];
+export function isViewerGroupsColumn(columnId: string): boolean {
+    return VIEWER_USER_COLUMNS_IDS.some((el) => el === columnId);
+}
+
 export const REQUIRED_STORAGE_GROUPS_COLUMNS: StorageGroupsColumnId[] = ['GroupId'];
 
 // This code is running when module is initialized and correct language may not be set yet

src/containers/Storage/PaginatedStorageGroupsTable/columns/hooks.ts

@@ -1,7 +1,10 @@
 import React from 'react';
 
 import {VISIBLE_ENTITIES} from '../../../../store/reducers/storage/constants';
-import {useIsUserAllowedToMakeChanges} from '../../../../utils/hooks/useIsUserAllowedToMakeChanges';
+import {
+    useIsUserAllowedToMakeChanges,
+    useIsViewerUser,
+} from '../../../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {useSelectedColumns} from '../../../../utils/hooks/useSelectedColumns';
 
 import {getStorageGroupsColumns} from './columns';
@@ -12,6 +15,7 @@ import {
     STORAGE_GROUPS_COLUMNS_TITLES,
     STORAGE_GROUPS_SELECTED_COLUMNS_LS_KEY,
     isMonitoringUserGroupsColumn,
+    isViewerGroupsColumn,
 } from './constants';
 import type {GetStorageGroupsColumnsParams} from './types';
 
@@ -20,15 +24,22 @@ export function useStorageGroupsSelectedColumns({
     viewContext,
 }: GetStorageGroupsColumnsParams) {
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
+    const isViewerUser = useIsViewerUser();
 
     const columns = React.useMemo(() => {
         const allColumns = getStorageGroupsColumns({viewContext});
 
         if (isUserAllowedToMakeChanges) {
             return allColumns;
         }
-        return allColumns.filter((column) => !isMonitoringUserGroupsColumn(column.name));
-    }, [isUserAllowedToMakeChanges, viewContext]);
+        const filteredColumns = allColumns.filter(
+            (column) => !isMonitoringUserGroupsColumn(column.name),
+        );
+        if (isViewerUser) {
+            return filteredColumns;
+        }
+        return filteredColumns.filter((column) => !isViewerGroupsColumn(column.name));
+    }, [isUserAllowedToMakeChanges, viewContext, isViewerUser]);
 
     const requiredColumns = React.useMemo(() => {
         if (visibleEntities === VISIBLE_ENTITIES.missing) {

src/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -17,6 +17,7 @@ import type {AdditionalNodesProps, AdditionalTenantsProps} from '../../../types/
 import {uiFactory} from '../../../uiFactory/uiFactory';
 import {cn} from '../../../utils/cn';
 import {useScrollPosition, useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
+import {useIsViewerUser} from '../../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {Heatmap} from '../../Heatmap';
 import {Nodes} from '../../Nodes/Nodes';
 import {Operations} from '../../Operations';
@@ -63,11 +64,13 @@ function Diagnostics(props: DiagnosticsProps) {
 
     const hasFeatureFlags = useFeatureFlagsAvailable();
     const hasTopicData = useTopicDataAvailable();
+    const isViewerUser = useIsViewerUser();
     const pages = getPagesByType(type, subType, {
         hasFeatureFlags,
         hasTopicData,
         isTopLevel: path === database,
         hasBackups: typeof uiFactory.renderBackups === 'function' && Boolean(controlPlane),
+        hasConfigs: isViewerUser,
     });
     let activeTab = pages.find((el) => el.id === diagnosticsTab);
     if (!activeTab) {

src/containers/Tenant/Diagnostics/DiagnosticsPages.ts

@@ -176,23 +176,27 @@ export const getPagesByType = (
         hasTopicData?: boolean;
         isTopLevel?: boolean;
         hasBackups?: boolean;
+        hasConfigs?: boolean;
     },
 ) => {
     const subTypePages = subType ? pathSubTypeToPages[subType] : undefined;
     const typePages = type ? pathTypeToPages[type] : undefined;
     let pages = subTypePages || typePages || DIR_PAGES;
 
     if (isTopicEntityType(type) && !options?.hasTopicData) {
-        return pages?.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.topicData);
+        pages = pages?.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.topicData);
     }
     if (isDatabaseEntityType(type) || options?.isTopLevel) {
         pages = DATABASE_PAGES;
         if (!options?.hasFeatureFlags) {
-            return pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.configs);
+            pages = pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.configs);
         }
     }
     if (!options?.hasBackups) {
-        return pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.backups);
+        pages = pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.backups);
+    }
+    if (!options?.hasConfigs) {
+        pages = pages.filter((item) => item.id !== TENANT_DIAGNOSTICS_TABS_IDS.configs);
     }
     return pages;
 };

src/store/reducers/cluster/cluster.ts

@@ -10,6 +10,7 @@ import type {TClusterInfo} from '../../../types/api/cluster';
 import type {TTabletStateInfo} from '../../../types/api/tablet';
 import {CLUSTER_DEFAULT_TITLE, DEFAULT_CLUSTER_TAB_KEY} from '../../../utils/constants';
 import {useClusterNameFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
+import {useIsViewerUser} from '../../../utils/hooks/useIsUserAllowedToMakeChanges';
 import {isQueryErrorResponse} from '../../../utils/query';
 import type {RootState} from '../../defaultStore';
 import {api} from '../api';
@@ -139,8 +140,11 @@ export const clusterApi = api.injectEndpoints({
 
 export function useClusterBaseInfo() {
     const clusterNameFromQuery = useClusterNameFromQuery();
+    const isViewerUser = useIsViewerUser();
 
-    const {currentData} = clusterApi.useGetClusterBaseInfoQuery(clusterNameFromQuery ?? skipToken);
+    const {currentData} = clusterApi.useGetClusterBaseInfoQuery(clusterNameFromQuery ?? skipToken, {
+        skip: !isViewerUser,
+    });
 
     const {solomon: monitoring, name, title, trace_view: traceView, ...data} = currentData || {};