Workbook access dialog

src/i18n-keysets/component.iam-access-dialog/en.json

@@ -1,4 +1,5 @@
 {
+  "action_add": "Add",
   "action_add-user": "Add user",
   "action_cancel": "Cancel",
   "action_choose-user": "Select user",
@@ -7,6 +8,7 @@
   "action_revoke-access": "Revoke role",
   "action_save": "Save",
   "button_bindings-list-retry": "Reload list",
+  "label_access": "Access rights",
   "label_access_error": "Insufficient rights",
   "label_all": "All",
   "label_groups": "Groups",
@@ -21,6 +23,7 @@
   "role_admin": "Admin",
   "role_editor": "Editor",
   "role_limited-viewer": "Limited viewer",
+  "role_limited-viewer-hint": "Unlike 'Viewer', it doesn't grant access to view datasets and connections",
   "role_viewer": "Viewer",
   "section_direct_accesses": "Direct permissions",
   "section_inherited_accesses": "Inherited permissions",

src/i18n-keysets/component.iam-access-dialog/ru.json

@@ -1,4 +1,5 @@
 {
+  "action_add": "Добавить",
   "action_add-user": "Добавить пользователя",
   "action_cancel": "Отменить",
   "action_choose-user": "Выбрать пользователя",
@@ -7,6 +8,7 @@
   "action_revoke-access": "Отозвать роль",
   "action_save": "Сохранить",
   "button_bindings-list-retry": "Обновить список",
+  "label_access": "Права доступа",
   "label_access_error": "Недостаточно прав",
   "label_all": "Все",
   "label_groups": "Группы",
@@ -21,6 +23,7 @@
   "role_admin": "Администрирование",
   "role_editor": "Редактирование",
   "role_limited-viewer": "Ограниченный просмотр",
+  "role_limited-viewer-hint": "В отличие от просмотра, не даёт доступ просмотру датасетов и подключений",
   "role_viewer": "Просмотр",
   "section_direct_accesses": "Прямые права",
   "section_inherited_accesses": "Наследуемые права",

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,
@@ -40,4 +42,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',
@@ -108,6 +110,7 @@ export interface SubjectClaims {
     pictureData?: string;
     picture?: string;
     idpType?: string | null;
+    displayName?: string;
 }
 
 export type SubjectDetails = {
@@ -132,3 +135,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/schema/extensions/types/index.ts

@@ -1 +1,2 @@
 export * from './iam-access-dialog';
+export * from './invitations';

src/shared/schema/extensions/types/invitations.ts

@@ -0,0 +1,72 @@
+import {ResourceType} from './iam-access-dialog';
+
+export type Invite = {
+    invitee: {
+        email: string;
+    };
+};
+
+export type InviteUsersRequest = {
+    invitations: Invite[];
+};
+
+export type InviteUsersWithAccessRequest = InviteUsersRequest & {
+    resourceType: ResourceType;
+    resourceId: string;
+    roleId: string;
+};
+
+export type InviteUsersResponse = {
+    validInvitations: InviteRespone[];
+    invalidInvitations: InviteRespone[];
+};
+
+export type InviteRespone = Invite & {
+    invitationId: string;
+    status: InviteStatus;
+    createdAt: string;
+    inviteeId: string;
+    subjectId: string;
+};
+
+export type DeleteInvitationRequest = {
+    invitationId: string;
+};
+
+export enum InviteStatus {
+    Creating = 'CREATING',
+    Pending = 'PENDING',
+    Accepted = 'ACCEPTED',
+    Rejected = 'REJECTED',
+}
+
+export type ListOrganizationInvitationsRequest = {
+    status: InviteStatus;
+    filter?: string | undefined;
+    pageSize?: number | undefined;
+    pageToken?: string;
+};
+
+export type ListOrganizationInvitationsResponse = {
+    invitations: Invitation[];
+    nextPageToken: string;
+};
+
+export type Invitation = Invite & {
+    id: string;
+    status: InviteStatus;
+    inviteeId: string;
+    subjectId: string;
+};
+
+export interface ResendInvitationRequest {
+    invitationId: string;
+    notAfter?: InvitationTimestamp;
+}
+export interface ResendInvitationResponse {
+    invitationId: string;
+    organizationId: string;
+    email: string;
+}
+
+export type InvitationTimestamp = {seconds: string; nanos?: number};

src/shared/types/feature.ts

@@ -98,12 +98,15 @@ export enum Feature {
     EnableSharedEntries = 'EnableSharedEntries',
 
     EnableMobileFixedHeader = 'EnableMobileFixedHeader',
+
     /** enabled redesign/moving to drawers existing settings */
     EnableCommonChartDashSettings = 'EnableCommonChartDashSettings',
     /** enables new dash & widgets settings */
     EnableNewDashSettings = 'EnableNewDashSettings',
     /** 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/EntryDialogues/DialogSwitchPublic/DialogPublic/AuthorSection/AuthorSection.tsx

@@ -12,36 +12,54 @@ import './AuthorSection.scss';
 const b = block('dl-dialog-public-author-section');
 const i18n = I18n.keyset('component.dialog-switch-public.view');
 
-type Props = {
+export type AuthorSectionProps = {
     validationErrors: ValidationErrors;
     className?: string;
     scope: 'widget' | 'dash';
     authorData: EntryAuthorData;
     progress: boolean;
     disabled: boolean;
     onChange: ({link, text}: {link?: string; text?: string}) => void;
+    showWarning?: boolean;
+    linkLabel?: string;
+    textLabel?: string;
 };
 
-function AuthorSection(props: Props) {
-    const {className, authorData, disabled, onChange, scope, validationErrors} = props;
+function AuthorSection(props: AuthorSectionProps) {
+    const {
+        className,
+        authorData,
+        disabled,
+        onChange,
+        scope,
+        validationErrors,
+        showWarning = true,
+        linkLabel = i18n('label_author-link'),
+        textLabel = i18n('label_author-text'),
+    } = props;
 
     return (
         <div className={b(null, className)}>
-            <div className={b('title')}>{i18n('section_author')}</div>
-            <div className={b('description')}>
-                {i18n('label_author-description', {subject: i18n(`label_author-subject-${scope}`)})}
-            </div>
-
+            {showWarning && (
+                <React.Fragment>
+                    <div className={b('title')}>{i18n('section_author')}</div>
+                    <div className={b('description')}>
+                        {i18n('label_author-description', {
+                            subject: i18n(`label_author-subject-${scope}`),
+                        })}
+                    </div>
+                </React.Fragment>
+            )}
             <div className={b('form')}>
-                <FormRow label={i18n('label_author-text')} className={b('form-row')}>
+                <FormRow label={textLabel} className={b('form-row')}>
                     <TextInput
                         error={validationErrors.text ?? false}
                         value={authorData.text}
                         disabled={disabled}
                         onUpdate={(value) => onChange({text: value})}
                     ></TextInput>
                 </FormRow>
-                <FormRow label={i18n('label_author-link')} className={b('form-row')}>
+                <FormRow label={linkLabel} className={b('form-row')}>
                     <TextInput
                         error={validationErrors.link ?? false}
                         value={authorData.link}

src/ui/components/IamAccessDialog/AccessList/AccessList.tsx

@@ -175,7 +175,7 @@ export const AccessList = React.memo<Props>(
             return isLoadingInherited && inheritedAccesses?.length === 0 ? (
                 <SmartLoader size="m" showAfter={0} />
             ) : (
-                <>
+                <React.Fragment>
                     <InheritedAccessesTable data={inheritedAccesses} />
 
                     {footerInheritedAccessesTable}
@@ -187,7 +187,7 @@ export const AccessList = React.memo<Props>(
                             }}
                         />
                     )}
-                </>
+                </React.Fragment>
             );
         };
 

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/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/useSubjectsListId.ts

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

src/ui/store/actions/openDialogTypes.ts

@@ -60,6 +60,7 @@ import type {OpenDialogExportWorkbookArgs} from 'ui/components/CollectionsStruct
 import type {OpenDialogDefaultArgs} from 'ui/components/DialogDefault/DialogDefault';
 import type {OpenDialogCreatePublicGalleryWorkbookArgs} from 'ui/components/CollectionsStructure/CreatePublicGalleryWorkbookDialog';
 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';
@@ -125,6 +126,8 @@ export type OpenDialogArgs<T = unknown> =
     | OpenDialogExportWorkbookArgs
     | OpenDialogDefaultArgs
     | OpenDialogCreatePublicGalleryWorkbookArgs
+    | OpenDialogEntryDescriptionArgs
+    | OpenDialogAccessDialogArgs
     | OpenDialogSharedEntryBindingArgs
     | OpenDialogSharedEntryUnbindArgs
     | OpenDialogSharedEntryPermissionsArgs