inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-3888] Correct role for new version dialog (#7965)

Browse Source 
* [ACS-3888] Correct role for new version dialog

* [ACS-3888] Correct role for move/copy dialog

* [ACS-3888] Unit test fix
This commit is contained in:
MichalKinas 2022-11-15 10:03:23 +01:00 committed by GitHub
parent a83e837a96
commit 39e458abb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts
View File

@ -66,7 +66,8 @@ describe('ContentNodeSelectorComponent', () => {
keydownEvents: () => of(null), keydownEvents: () => of(null),
backdropClick: () => of(null), backdropClick: () => of(null),
close: jasmine.createSpy('close'), close: jasmine.createSpy('close'),
afterClosed: () => of(null) afterClosed: () => of(null),
afterOpened: () => of(null)
} }
} }
], ],

7
lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
View File

@ -23,6 +23,7 @@ import { Node } from '@alfresco/js-api';
import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface'; import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';
import { NodeEntryEvent } from '../document-list/components/node.event'; import { NodeEntryEvent } from '../document-list/components/node.event';
import { NodeAction } from '../document-list/models/node-action.enum'; import { NodeAction } from '../document-list/models/node-action.enum';
import { OverlayContainer } from '@angular/cdk/overlay';
@Component({ @Component({
selector: 'adf-content-node-selector', selector: 'adf-content-node-selector',
@ -50,6 +51,7 @@ export class ContentNodeSelectorComponent implements OnInit {
private notificationService: NotificationService, private notificationService: NotificationService,
private uploadService: UploadService, private uploadService: UploadService,
private dialog: MatDialogRef<ContentNodeSelectorComponent>, private dialog: MatDialogRef<ContentNodeSelectorComponent>,
private overlayContainer: OverlayContainer,
@Inject(MAT_DIALOG_DATA) public data: ContentNodeSelectorComponentData) { @Inject(MAT_DIALOG_DATA) public data: ContentNodeSelectorComponentData) {
this.action = data.actionName ?? NodeAction.CHOOSE; this.action = data.actionName ?? NodeAction.CHOOSE;
this.buttonActionName = `NODE_SELECTOR.${this.action}`; this.buttonActionName = `NODE_SELECTOR.${this.action}`;
@ -71,6 +73,10 @@ export class ContentNodeSelectorComponent implements OnInit {
this.close(); this.close();
}); });
this.dialog.afterOpened().subscribe(() => {
this.overlayContainer.getContainerElement().setAttribute('role', 'main');
});
this.uploadService.fileUploadStarting.subscribe(() => { this.uploadService.fileUploadStarting.subscribe(() => {
this.uploadStarted = true; this.uploadStarted = true;
}); });
@ -78,6 +84,7 @@ export class ContentNodeSelectorComponent implements OnInit {
close() { close() {
this.dialog.close(); this.dialog.close();
this.overlayContainer.getContainerElement().setAttribute('role', 'region');
} }
onSelect(nodeList: Node[]) { onSelect(nodeList: Node[]) {

8
lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts
View File

@ -23,6 +23,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog
import { VersionPaging, VersionsApi } from '@alfresco/js-api'; import { VersionPaging, VersionsApi } from '@alfresco/js-api';
import { NewVersionUploaderData, NewVersionUploaderDialogData } from './models'; import { NewVersionUploaderData, NewVersionUploaderDialogData } from './models';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { OverlayContainer } from '@angular/cdk/overlay';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -38,7 +39,8 @@ export class NewVersionUploaderService {
constructor( constructor(
private contentService: ContentService, private contentService: ContentService,
private apiService: AlfrescoApiService, private apiService: AlfrescoApiService,
private dialog: MatDialog private dialog: MatDialog,
private overlayContainer: OverlayContainer
) { } ) { }
/** /**
@ -72,6 +74,10 @@ export class NewVersionUploaderService {
dialogRef.componentInstance.uploadError.asObservable().subscribe(error => { dialogRef.componentInstance.uploadError.asObservable().subscribe(error => {
observer.error(error); observer.error(error);
}); });
dialogRef.afterClosed().subscribe(() => {
this.overlayContainer.getContainerElement().setAttribute('role', 'region');
});
this.overlayContainer.getContainerElement().setAttribute('role', 'main');
}); });
} else { } else {
observer.error({ value: 'OPERATION.ERROR.PERMISSION' }); observer.error({ value: 'OPERATION.ERROR.PERMISSION' });