Skip to content

fix: layout shift when open Access drawer #3108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2025
Merged

fix: layout shift when open Access drawer #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffcf0ac
fix: layout shift when open Access drawer
Raubzeug Nov 19, 2025
627ce63
fix: tests
Raubzeug Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions src/containers/Tenant/GrantAccess/GrantAccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ export function GrantAccess({handleCloseDrawer}: GrantAccessProps) {
[setExplicitRightsChanges],
);

const rightsLoading = aclIsFetching || availableRightsAreFetching;

const renderSubject = () => {
if (aclSubject) {
return <SubjectWithAvatar subject={aclSubject} />;
Expand All @@ -144,45 +146,45 @@ export function GrantAccess({handleCloseDrawer}: GrantAccessProps) {
const subjectSelected = Boolean(aclSubject || newSubjects.length > 0);

return (
<LoaderWrapper loading={aclIsFetching || availableRightsAreFetching}>
<div className={block()}>
<Flex direction="column">
<Flex gap={4} direction="column" className={block('navigation')}>
{renderSubject()}
{/* wrapper to prevent radio button stretch */}
{subjectSelected && (
<RightsSectionSelector
value={rightView}
onUpdate={setRightsView}
rights={currentRightsMap}
availablePermissions={availablePermissions}
/>
)}
</Flex>
<Flex direction="column" className={block()} height={'100%'}>
<Flex direction="column" grow={1}>
<Flex gap={4} direction="column" className={block('navigation')}>
{renderSubject()}
{/* wrapper to prevent radio button stretch */}
{subjectSelected && (
<div className={block('rights-wrapper')}>
<RightsSectionSelector
value={rightView}
onUpdate={setRightsView}
rights={currentRightsMap}
availablePermissions={availablePermissions}
/>
)}
</Flex>
{subjectSelected && (
<LoaderWrapper loading={rightsLoading}>
<Flex grow={1} position="relative" qa="access-rights-wrapper">
<Rights
inheritedRights={inheritedRightsSet}
rights={currentRightsMap}
availablePermissions={availablePermissions}
handleChangeRightGetter={handleChangeRightGetter}
view={rightView}
/>
</div>
)}
</Flex>

{subjectSelected && (
<Footer
onCancel={handleCloseDrawer}
onDiscard={handleDiscardRightsChanges}
onSave={handleSaveRightsChanges}
loading={updateRightsResponse.isLoading}
error={updateRightsError}
disabled={!hasChanges}
/>
</Flex>
</LoaderWrapper>
)}
</div>
</LoaderWrapper>
</Flex>

{subjectSelected && (
<Footer
onCancel={handleCloseDrawer}
onDiscard={handleDiscardRightsChanges}
onSave={handleSaveRightsChanges}
loading={updateRightsResponse.isLoading}
error={updateRightsError}
disabled={!hasChanges}
/>
)}
</Flex>
);
}
2 changes: 1 addition & 1 deletion src/containers/Tenant/TenantDrawerRights.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function TenantDrawerRights({children}: TenantDrawerWrapperProps) {
isDrawerVisible={Boolean(showGrantAccess)}
onCloseDrawer={handleCloseDrawer}
renderDrawerContent={renderDrawerContent}
drawerId="tenant-healthcheck-details"
drawerId="tenant-grant-access"
storageKey="tenant-grant-access-drawer-width"
detectClickOutside
hideVeil={false}
Expand Down
2 changes: 1 addition & 1 deletion tests/suites/tenant/diagnostics/Diagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ export class Diagnostics {
}

async isRightsWrapperVisible(): Promise<boolean> {
const rightsWrapper = this.page.locator('.ydb-grant-access__rights-wrapper');
const rightsWrapper = this.page.getByTestId('access-rights-wrapper');
return rightsWrapper.isVisible();
}

Expand Down
Loading