-
Notifications
You must be signed in to change notification settings - Fork 319
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NAS-130474: UI should expose option to skip ACL traverse validation i…
…n the ACL form (#10535) (cherry picked from commit 46b5bc5) Co-authored-by: Evgeny Stepanovych <[email protected]>
- Loading branch information
Showing
101 changed files
with
449 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...iners/dataset-acl-editor/acl-editor-save-controls/acl-editor-save-controls.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <div class="checkboxes" [formGroup]="saveParameters"> | ||
| <ix-checkbox | ||
| formControlName="recursive" | ||
| class="recursive-checkbox" | ||
| [label]="helptext.dataset_acl_recursive_placeholder | translate" | ||
| [tooltip]="helptext.dataset_acl_recursive_tooltip | translate" | ||
| ></ix-checkbox> | ||
|
|
||
| @if (saveParameters.get('recursive').value) { | ||
| <ix-checkbox | ||
| formControlName="traverse" | ||
| [label]="helptext.dataset_acl_traverse_placeholder | translate" | ||
| [tooltip]="helptext.dataset_acl_traverse_tooltip | translate" | ||
| ></ix-checkbox> | ||
| } | ||
|
|
||
| @if (hasValidateAclCheckbox()) { | ||
| <ix-checkbox | ||
| formControlName="validate_effective_acl" | ||
| [label]="helptext.dataset_acl_validate_placeholder | translate" | ||
| [tooltip]="helptext.dataset_acl_validate_tooltip | translate" | ||
| ></ix-checkbox> | ||
| } | ||
| </div> | ||
|
|
||
| <button | ||
| *ixRequiresRoles="[Role.FilesystemAttrsWrite, Role.FilesystemFullControl]" | ||
| mat-button | ||
| color="primary" | ||
| class="save-button" | ||
| ixTest="save-acl" | ||
| [disabled]="!canBeSaved()" | ||
| (click)="onSavePressed()" | ||
| > | ||
| {{ 'Save Access Control List' | translate }} | ||
| </button> |
8 changes: 8 additions & 0 deletions
8
...iners/dataset-acl-editor/acl-editor-save-controls/acl-editor-save-controls.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .checkboxes { | ||
| padding: 0 5px; | ||
| } | ||
|
|
||
| .save-button { | ||
| margin-bottom: 10px; | ||
| width: 100%; | ||
| } |
115 changes: 115 additions & 0 deletions
115
...rs/dataset-acl-editor/acl-editor-save-controls/acl-editor-save-controls.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| import { HarnessLoader } from '@angular/cdk/testing'; | ||
| import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; | ||
| import { ReactiveFormsModule } from '@angular/forms'; | ||
| import { MatButtonHarness } from '@angular/material/button/testing'; | ||
| import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; | ||
| import { BehaviorSubject, of } from 'rxjs'; | ||
| import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; | ||
| import { DirectoryServiceState } from 'app/enums/directory-service-state.enum'; | ||
| import { helptextAcl } from 'app/helptext/storage/volumes/datasets/dataset-acl'; | ||
| import { DialogService } from 'app/modules/dialog/dialog.service'; | ||
| import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; | ||
| import { IxFormsModule } from 'app/modules/forms/ix-forms/ix-forms.module'; | ||
| import { | ||
| AclEditorSaveControlsComponent, | ||
| } from 'app/pages/datasets/modules/permissions/containers/dataset-acl-editor/acl-editor-save-controls/acl-editor-save-controls.component'; | ||
| import { DatasetAclEditorStore } from 'app/pages/datasets/modules/permissions/stores/dataset-acl-editor.store'; | ||
| import { WebSocketService } from 'app/services/ws.service'; | ||
|
|
||
| describe('AclEditorSaveControlsComponent', () => { | ||
| let spectator: Spectator<AclEditorSaveControlsComponent>; | ||
| let loader: HarnessLoader; | ||
| const call$ = new BehaviorSubject({ | ||
| activedirectory: DirectoryServiceState.Disabled, | ||
| ldap: DirectoryServiceState.Disabled, | ||
| }); | ||
| const createComponent = createComponentFactory({ | ||
| component: AclEditorSaveControlsComponent, | ||
| imports: [ | ||
| IxFormsModule, | ||
| ReactiveFormsModule, | ||
| ], | ||
| providers: [ | ||
| mockProvider(DatasetAclEditorStore, { | ||
| saveAcl: jest.fn(), | ||
| }), | ||
| mockProvider(DialogService, { | ||
| confirm: jest.fn(() => of(true)), | ||
| }), | ||
| mockProvider(WebSocketService, { | ||
| call: jest.fn(() => call$), | ||
| }), | ||
| mockAuth(), | ||
| ], | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| spectator = createComponent({ | ||
| props: { | ||
| canBeSaved: true, | ||
| ownerValues: { | ||
| owner: 'root', | ||
| ownerGroup: 'wheel', | ||
| applyOwner: true, | ||
| applyGroup: false, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| loader = TestbedHarnessEnvironment.loader(spectator.fixture); | ||
| }); | ||
|
|
||
| it('marks save button as disabled when [canBeSaved] is false', async () => { | ||
| spectator.setInput('canBeSaved', false); | ||
|
|
||
| const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save Access Control List' })); | ||
| expect(await saveButton.isDisabled()).toBe(true); | ||
| }); | ||
|
|
||
| it('shows a warning when Recursive is selected', async () => { | ||
| const recursiveCheckbox = await loader.getHarness(IxCheckboxHarness.with({ label: 'Apply permissions recursively' })); | ||
| await recursiveCheckbox.setValue(true); | ||
|
|
||
| expect(spectator.inject(DialogService).confirm).toHaveBeenCalledWith({ | ||
| title: helptextAcl.dataset_acl_recursive_dialog_warning, | ||
| message: helptextAcl.dataset_acl_recursive_dialog_warning_message, | ||
| }); | ||
| }); | ||
|
|
||
| it('shows Traverse checkbox when Recursive is selected', async () => { | ||
| const recursiveCheckbox = await loader.getHarness(IxCheckboxHarness.with({ label: 'Apply permissions recursively' })); | ||
| await recursiveCheckbox.setValue(true); | ||
|
|
||
| const traverseCheckbox = await loader.getHarness(IxCheckboxHarness.with({ label: 'Apply permissions to child datasets' })); | ||
| expect(traverseCheckbox).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('shows Validate Effective ACL checkbox that defaults to true when directory services are enabled', async () => { | ||
| call$.next({ | ||
| activedirectory: DirectoryServiceState.Healthy, | ||
| ldap: DirectoryServiceState.Disabled, | ||
| }); | ||
|
|
||
| const validateAclCheckbox = await loader.getHarness(IxCheckboxHarness.with({ label: 'Validate effective ACL' })); | ||
| expect(validateAclCheckbox).toBeTruthy(); | ||
| expect(await validateAclCheckbox.getValue()).toBe(true); | ||
| }); | ||
|
|
||
| it('saves current ACL settings when save button is pressed', async () => { | ||
| const recursiveCheckbox = await loader.getHarness(IxCheckboxHarness.with({ label: 'Apply permissions recursively' })); | ||
| await recursiveCheckbox.setValue(true); | ||
|
|
||
| const saveButton = await loader.getHarness(MatButtonHarness.with({ text: 'Save Access Control List' })); | ||
| await saveButton.click(); | ||
|
|
||
| expect(spectator.inject(DatasetAclEditorStore).saveAcl).toHaveBeenCalledWith({ | ||
| recursive: true, | ||
| traverse: false, | ||
| validateEffectiveAcl: true, | ||
| owner: 'root', | ||
| ownerGroup: 'wheel', | ||
| applyOwner: true, | ||
| applyGroup: false, | ||
| }); | ||
| }); | ||
| }); |
91 changes: 91 additions & 0 deletions
91
...tainers/dataset-acl-editor/acl-editor-save-controls/acl-editor-save-controls.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| import { | ||
| ChangeDetectionStrategy, Component, input, OnInit, | ||
| } from '@angular/core'; | ||
| import { toSignal } from '@angular/core/rxjs-interop'; | ||
| import { FormBuilder } from '@angular/forms'; | ||
| import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; | ||
| import { filter, map, switchMap } from 'rxjs/operators'; | ||
| import { DirectoryServiceState } from 'app/enums/directory-service-state.enum'; | ||
| import { Role } from 'app/enums/role.enum'; | ||
| import { helptextAcl } from 'app/helptext/storage/volumes/datasets/dataset-acl'; | ||
| import { DialogService } from 'app/modules/dialog/dialog.service'; | ||
| import { DatasetAclEditorStore } from 'app/pages/datasets/modules/permissions/stores/dataset-acl-editor.store'; | ||
| import { WebSocketService } from 'app/services/ws.service'; | ||
|
|
||
| @UntilDestroy() | ||
| @Component({ | ||
| selector: 'ix-acl-editor-save-controls', | ||
| templateUrl: './acl-editor-save-controls.component.html', | ||
| styleUrls: ['./acl-editor-save-controls.component.scss'], | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| }) | ||
| export class AclEditorSaveControlsComponent implements OnInit { | ||
| readonly canBeSaved = input(false); | ||
| readonly ownerValues = input.required<{ | ||
| owner: string; | ||
| ownerGroup: string; | ||
| applyOwner: boolean; | ||
| applyGroup: boolean; | ||
| }>(); | ||
|
|
||
| protected saveParameters = this.formBuilder.group({ | ||
| recursive: [false], | ||
| traverse: [false], | ||
| validate_effective_acl: [true], | ||
| }); | ||
|
|
||
| protected readonly helptext = helptextAcl; | ||
| protected readonly Role = Role; | ||
|
|
||
| constructor( | ||
| private formBuilder: FormBuilder, | ||
| private store: DatasetAclEditorStore, | ||
| private dialogService: DialogService, | ||
| private ws: WebSocketService, | ||
| ) {} | ||
|
|
||
| ngOnInit(): void { | ||
| this.setRecursiveCheckboxWarning(); | ||
| } | ||
|
|
||
| // TODO: Move here and in other places to global store. | ||
| protected hasValidateAclCheckbox = toSignal(this.ws.call('directoryservices.get_state').pipe( | ||
| map((state) => { | ||
| return state.activedirectory !== DirectoryServiceState.Disabled | ||
| || state.ldap !== DirectoryServiceState.Disabled; | ||
| }), | ||
| )); | ||
|
|
||
| protected onSavePressed(): void { | ||
| const saveParameters = this.saveParameters.value; | ||
|
|
||
| this.store.saveAcl({ | ||
| recursive: saveParameters.recursive, | ||
| traverse: saveParameters.recursive && saveParameters.traverse, | ||
| validateEffectiveAcl: saveParameters.validate_effective_acl, | ||
| owner: this.ownerValues().owner, | ||
| ownerGroup: this.ownerValues().ownerGroup, | ||
| applyOwner: this.ownerValues().applyOwner, | ||
| applyGroup: this.ownerValues().applyGroup, | ||
| }); | ||
| } | ||
|
|
||
| private setRecursiveCheckboxWarning(): void { | ||
| this.saveParameters.get('recursive').valueChanges.pipe( | ||
| filter(Boolean), | ||
| switchMap(() => { | ||
| return this.dialogService.confirm({ | ||
| title: helptextAcl.dataset_acl_recursive_dialog_warning, | ||
| message: helptextAcl.dataset_acl_recursive_dialog_warning_message, | ||
| }); | ||
| }), | ||
| untilDestroyed(this), | ||
| ).subscribe((confirmed) => { | ||
| if (confirmed) { | ||
| return; | ||
| } | ||
|
|
||
| this.saveParameters.patchValue({ recursive: false }); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.