Workbook access dialog legacy

src/server/components/features/features-list/EnableNewAccessDialog.ts

@@ -0,0 +1,10 @@
+import {Feature} from '../../../../shared';
+import {createFeatureConfig} from '../utils';
+
+export default createFeatureConfig({
+    name: Feature.EnableNewAccessDialog,
+    state: {
+        development: false,
+        production: false,
+    },
+});

src/shared/schema/extensions/actions/iam-access-dialog.ts

@@ -1,6 +1,8 @@
 import {createAction} from '../../gateway-utils';
 import type {GetDatalensOperationResponse} from '../../us/types/operations';
 import type {
+    BatchListAccessBindingsArgs,
+    BatchListAccessBindingsResponse,
     BatchListMembersArgs,
     BatchListMembersResponse,
     GetClaimsArgs,
@@ -53,4 +55,13 @@ export const iamAccessDialogActions = {
     batchListMembers: createAction<BatchListMembersResponse, BatchListMembersArgs>(async () => {
         return {members: [], nextPageToken: ''};
     }),
+    batchListAccessBindings: createAction<
+        BatchListAccessBindingsResponse,
+        BatchListAccessBindingsArgs
+    >(async () => {
+        return {
+            subjectsWithBindings: [],
+            nextPageToken: '',
+        };
+    }),
 };

src/shared/schema/extensions/types/iam-access-dialog.ts

@@ -1,6 +1,7 @@
 import type {Lang} from '../../..';
 
 export enum AccessServiceResourceType {
+    Organization = 'organization-manager.organization',
     Collection = 'datalens.collection',
     Workbook = 'datalens.workbook',
 }
@@ -20,6 +21,7 @@ export enum SubjectType {
 }
 
 export enum ClaimsSubjectType {
+    Unspecified = 'SUBJECT_TYPE_UNSPECIFIED',
     UserAccount = 'USER_ACCOUNT',
     Group = 'GROUP',
     Invitee = 'INVITEE',
@@ -122,6 +124,7 @@ export interface SubjectClaims {
     pictureData?: string;
     picture?: string;
     idpType?: string | null;
+    displayName?: string;
 }
 
 export type SubjectDetails = {
@@ -146,3 +149,41 @@ export type BatchListMembersResponse = {
     members: SubjectClaims[];
     nextPageToken: string;
 };
+
+export interface BatchListAccessBindingsResponse {
+    subjectsWithBindings: SubjectWithBindings[];
+    nextPageToken: string;
+}
+
+export interface SubjectWithBindings {
+    subjectClaims: SubjectClaims;
+    accessBindings: InheritedAccessBindings[];
+    inheritedAccessBindings: InheritedAccessBindings[];
+}
+
+export interface InheritedAccessBindings {
+    roleId: string;
+    inheritedFrom: AccessBindingsResource | null;
+}
+
+export interface AccessBindingsResource {
+    id: string;
+    type: string;
+}
+
+export type BatchListAccessBindingsArgs = {
+    resourcePath: AccessBindingsResource[];
+    getInheritedBindings?: boolean;
+    filter?: string;
+    pageSize?: number;
+    pageToken?: string;
+};
+
+export enum ResourceType {
+    Collection = 'collection',
+    Workbook = 'workbook',
+}
+
+export type UpdateAccessBindingsRequest = {
+    accessBindingDeltas: AccessBindingDelta[];
+};

src/shared/types/feature.ts

@@ -93,6 +93,7 @@ export enum Feature {
     EnableSharedEntries = 'EnableSharedEntries',
 
     EnableMobileFixedHeader = 'EnableMobileFixedHeader',
+
     /** enabled redesign/moving to drawers existing settings */
     EnableCommonChartDashSettings = 'EnableCommonChartDashSettings',
     /** Enable a setting in the Selector settings dialog that allows you to make the selector pass-through for all or several tabs */
@@ -103,6 +104,8 @@ export enum Feature {
     EnableDashColorPickersByTheme = 'EnableDashColorPickersByTheme',
     /** Shows updated settings page */
     EnableNewServiceSettings = 'EnableNewServiceSettings',
+    /** Enable new access dialog (AccessDialog) */
+    EnableNewAccessDialog = 'EnableNewAccessDialog',
 }
 
 export type FeatureConfig = Record<string, boolean>;

src/ui/components/AccessDialog/index.tsx

@@ -0,0 +1,8 @@
+import type {AccessDialogProps} from 'ui/registry/units/common/types/components/AccessDialog';
+
+export const DIALOG_ACCESS = Symbol('DIALOG_ACCESS');
+
+export type OpenDialogAccessDialogArgs = {
+    id: typeof DIALOG_ACCESS;
+    props: AccessDialogProps;
+};

src/ui/components/ActionPanel/components/EntryPanel/EntryPanel.tsx

@@ -10,12 +10,13 @@ import type {RouteComponentProps} from 'react-router-dom';
 import {withRouter} from 'react-router-dom';
 import type {Dispatch} from 'redux';
 import {bindActionCreators} from 'redux';
-import {ActionPanelQA, EntryScope} from 'shared';
+import {ActionPanelQA, EntryScope, Feature} from 'shared';
 import type {DatalensGlobalState, EntryDialogues} from 'ui';
 import type {FilterEntryContextMenuItems} from 'ui/components/EntryContextMenu';
 import {CounterName, GoalId, reachMetricaGoal} from 'ui/libs/metrica';
 import {registry} from 'ui/registry';
 import type {BreadcrumbsItem} from 'ui/registry/units/common/types/components/EntryBreadcrumbs';
+import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
 import {
     addCollectionBreadcrumbs,
     addWorkbookInfo,
@@ -291,7 +292,9 @@ class EntryPanel extends React.Component<Props, State> {
 
         const items = [...additionalEntryItems];
 
-        if (isAdmin && enablePublish && !disabled) {
+        const isNewAccessDialogEnabled = isEnabledFeature(Feature.EnableNewAccessDialog);
+
+        if (isAdmin && enablePublish && !disabled && !isNewAccessDialogEnabled) {
             items.push({
                 icon: (
                     <Icon

src/ui/components/EntryContextMenu/constants.ts

@@ -228,7 +228,9 @@ export const getEntryContextMenu = (): ContextMenuItem[] => {
         {
             ...CONTEXT_MENU_COPY_LINK,
             scopes: getAllEntryScopes(),
-            isVisible: (params) => !isVisibleEntryContextShareItem(params),
+            isVisible: (params) =>
+                !isVisibleEntryContextShareItem(params) &&
+                !isEnabledFeature(Feature.EnableNewAccessDialog),
         },
         {
             ...CONTEXT_MENU_COPY_ID,
@@ -246,7 +248,9 @@ export const getEntryContextMenu = (): ContextMenuItem[] => {
             text: 'value_share',
             enable: () => true,
             scopes: getAllEntryScopes(),
-            isVisible: isVisibleEntryContextShareItem,
+            isVisible: (params) =>
+                isVisibleEntryContextShareItem(params) &&
+                !isEnabledFeature(Feature.EnableNewAccessDialog),
         },
         {
             id: ENTRY_CONTEXT_MENU_ACTION.SHOW_RELATED_ENTITIES,

src/ui/registry/units/common/components-map.tsx

@@ -9,6 +9,7 @@ import {makeDefaultEmpty} from '../../components/DefaultEmpty';
 
 import {Example} from './components/Example/Example';
 import {EXAMPLE_COMPONENT} from './constants/components';
+import type {AccessDialogProps} from './types/components/AccessDialog';
 import type {AccessRightsProps} from './types/components/AccessRights';
 import type {AccessRightsUrlOpenProps} from './types/components/AccessRightsUrlOpen';
 import type {AclSubjectProps} from './types/components/AclSubject';
@@ -66,4 +67,5 @@ export const commonComponentsMap = {
     WorkbookEntriesTableTabs: makeDefaultEmpty<WorkbookEntriesTableTabsProps>(),
     WorkbookEntryExtended: makeDefaultEmpty<WorkbookEntriesTableTabsProps>(),
     DialogEntryDescription: makeDefaultEmpty<DialogEntryDescriptionProps>(),
+    AccessDialog: makeDefaultEmpty<AccessDialogProps>(),
 } as const;

src/ui/registry/units/common/functions-map.ts

@@ -60,11 +60,13 @@ import type {OpenDialogOrganizationInviteUsers} from './types/functions/openDial
 import type {RenderDialogRelatedEntitiesAlertHint} from './types/functions/renderDialogRelatedEntitiesAlertHint';
 import type {ResolveUsersByIds} from './types/functions/resolveUsersByIds';
 import type {SetEntryKey} from './types/functions/setEntryKey';
+import type {UseOrganizationData} from './types/functions/useOrganizationData';
 import type {UseSubjectsListId} from './types/functions/useSubjectsListId';
 
 export const commonFunctionsMap = {
     [EXAMPLE_FUNCTION]: makeFunctionTemplate<(arg: number) => string>(),
     useSubjectsListId: makeFunctionTemplate<() => UseSubjectsListId>(),
+    useOrganizationData: makeFunctionTemplate<() => UseOrganizationData>(),
     openDialogOrganizationInvite: makeFunctionTemplate<() => OpenDialogOrganizationInvite>(),
     openDialogOrganizationInviteUsers:
         makeFunctionTemplate<() => OpenDialogOrganizationInviteUsers>(),

src/ui/registry/units/common/types/components/AccessDialog.ts

@@ -0,0 +1,9 @@
+export type AccessDialogProps = {
+    entryId?: string;
+    workbookId?: string;
+    collectionId?: string;
+    resourceTitle?: string;
+    canUpdateAccessBindings: boolean;
+    onClose?: () => void;
+    defaultTab?: string;
+};

src/ui/registry/units/common/types/functions/useOrganizationData.ts

@@ -0,0 +1,4 @@
+export type UseOrganizationData = {
+    id: string | undefined;
+    title: string | undefined;
+};

src/ui/registry/units/common/types/functions/useSubjectsListId.ts

@@ -1 +1,4 @@
-export type UseSubjectsListId = {type: 'organizationId' | 'cloudId'; id: string | undefined};
+export type UseSubjectsListId = {
+    type: 'organizationId' | 'cloudId';
+    id: string | undefined;
+};

src/ui/store/actions/openDialogTypes.ts

@@ -59,6 +59,7 @@ import type {OpenDialogReleaseVersionArgs} from 'ui/components/AsideHeaderAdapte
 import type {OpenDialogExportWorkbookArgs} from 'ui/components/CollectionsStructure/ExportWorkbookDialog/ExportWorkbookDialog';
 import type {OpenDialogDefaultArgs} from 'ui/components/DialogDefault/DialogDefault';
 import type {OpenDialogEntryDescriptionArgs} from 'ui/components/DialogEntryDescription/DialogEntryDescriptionWrapper';
+import type {OpenDialogAccessDialogArgs} from 'ui/components/AccessDialog';
 import type {OpenDialogSharedEntryBindingArgs} from 'ui/components/DialogSharedEntryBindings/DialogSharedEntryBindings';
 import type {OpenDialogSharedEntryUnbindArgs} from 'ui/components/DialogSharedEntryUnbind/DialogSharedEntryUnbind';
 import type {OpenDialogSharedEntryPermissionsArgs} from 'ui/components/DialogSharedEntryPermissions/DialogSharedEntryPermissions';
@@ -123,6 +124,7 @@ export type OpenDialogArgs<T = unknown> =
     | OpenDialogCollectionNoCreatePermissionArgs
     | OpenDialogExportWorkbookArgs
     | OpenDialogDefaultArgs
+    | OpenDialogAccessDialogArgs
     | OpenDialogSharedEntryBindingArgs
     | OpenDialogSharedEntryUnbindArgs
     | OpenDialogSharedEntryPermissionsArgs

src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx

@@ -6,6 +6,7 @@ import {I18n} from 'i18n';
 import {useDispatch} from 'react-redux';
 import {useHistory} from 'react-router-dom';
 import {WORKBOOK_STATUS} from 'shared/constants/workbooks';
+import {DIALOG_ACCESS} from 'ui/components/AccessDialog';
 import {DIALOG_EXPORT_WORKBOOK} from 'ui/components/CollectionsStructure/ExportWorkbookDialog/ExportWorkbookDialog';
 import {DIALOG_SHARED_ENTRY_BINDINGS} from 'ui/components/DialogSharedEntryBindings/DialogSharedEntryBindings';
 import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
@@ -49,6 +50,31 @@ type UseActionsArgs = {
     onCloseMoveDialog: (structureChanged: boolean) => void;
 };
 
+const openAccessDialog = (
+    dispatch: AppDispatch,
+    params: {
+        collectionId?: string;
+        workbookId?: string;
+        resourceTitle?: string;
+        canUpdateAccessBindings?: boolean;
+    },
+) => {
+    dispatch(
+        openDialog({
+            id: DIALOG_ACCESS,
+            props: {
+                collectionId: params.collectionId,
+                workbookId: params.workbookId,
+                resourceTitle: params.resourceTitle,
+                canUpdateAccessBindings: params.canUpdateAccessBindings ?? false,
+                onClose: () => {
+                    dispatch(closeDialog());
+                },
+            },
+        }),
+    );
+};
+
 export const useActions = ({fetchStructureItems, onCloseMoveDialog}: UseActionsArgs) => {
     const collectionsAccessEnabled = isEnabledFeature(Feature.CollectionsAccessEnabled);
 
@@ -115,25 +141,34 @@ export const useActions = ({fetchStructureItems, onCloseMoveDialog}: UseActionsA
             }
 
             if (collectionsAccessEnabled && item.permissions.listAccessBindings) {
+                const isNewAccessDialogEnabled = isEnabledFeature(Feature.EnableNewAccessDialog);
                 actions.push({
                     text: <DropdownAction icon={LockOpen} text={i18n('action_access')} />,
                     action: () => {
-                        dispatch(
-                            openDialog({
-                                id: DIALOG_IAM_ACCESS,
-                                props: {
-                                    open: true,
-                                    resourceId: item.collectionId,
-                                    resourceType: ResourceType.Collection,
-                                    resourceTitle: item.title,
-                                    parentId: item.parentId,
-                                    canUpdate: item.permissions.updateAccessBindings,
-                                    onClose: () => {
-                                        dispatch(closeDialog());
+                        if (isNewAccessDialogEnabled) {
+                            openAccessDialog(dispatch, {
+                                collectionId: item?.collectionId ?? undefined,
+                                resourceTitle: item?.title,
+                                canUpdateAccessBindings: item?.permissions.updateAccessBindings,
+                            });
+                        } else {
+                            dispatch(
+                                openDialog({
+                                    id: DIALOG_IAM_ACCESS,
+                                    props: {
+                                        open: true,
+                                        resourceId: item.collectionId,
+                                        resourceType: ResourceType.Collection,
+                                        resourceTitle: item.title,
+                                        parentId: item.parentId,
+                                        canUpdate: item.permissions.updateAccessBindings,
+                                        onClose: () => {
+                                            dispatch(closeDialog());
+                                        },
                                     },
-                                },
-                            }),
-                        );
+                                }),
+                            );
+                        }
                     },
                 });
             }
@@ -293,25 +328,35 @@ export const useActions = ({fetchStructureItems, onCloseMoveDialog}: UseActionsA
             }
 
             if (collectionsAccessEnabled && item.permissions.listAccessBindings) {
+                const isNewAccessDialogEnabled = isEnabledFeature(Feature.EnableNewAccessDialog);
                 actions.push({
                     text: <DropdownAction icon={LockOpen} text={i18n('action_access')} />,
                     action: () => {
-                        dispatch(
-                            openDialog({
-                                id: DIALOG_IAM_ACCESS,
-                                props: {
-                                    open: true,
-                                    resourceId: item.workbookId,
-                                    resourceType: ResourceType.Workbook,
-                                    resourceTitle: item.title,
-                                    parentId: item.collectionId,
-                                    canUpdate: item.permissions.updateAccessBindings,
-                                    onClose: () => {
-                                        dispatch(closeDialog());
+                        if (isNewAccessDialogEnabled) {
+                            openAccessDialog(dispatch, {
+                                workbookId: item?.workbookId ?? undefined,
+                                collectionId: item?.collectionId ?? undefined,
+                                resourceTitle: item?.title,
+                                canUpdateAccessBindings: item?.permissions.updateAccessBindings,
+                            });
+                        } else {
+                            dispatch(
+                                openDialog({
+                                    id: DIALOG_IAM_ACCESS,
+                                    props: {
+                                        open: true,
+                                        resourceId: item.workbookId,
+                                        resourceType: ResourceType.Workbook,
+                                        resourceTitle: item.title,
+                                        parentId: item.collectionId,
+                                        canUpdate: item.permissions.updateAccessBindings,
+                                        onClose: () => {
+                                            dispatch(closeDialog());
+                                        },
                                     },
-                                },
-                            }),
-                        );
+                                }),
+                            );
+                        }
                     },
                 });
             }