inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-7577] [ADF] Remove Folder Directives from Content Services lib (#9582)

Browse Source 
* ACS-7577 remove create and edit folder directive [ci:force]

* Revert "ACS-7577 remove create and edit folder directive [ci:force]"

This reverts commit a0055aa496d1c6ee64118035acb36b55ab59716b.

* ACS-7577 move edit and create folder directives to demo-shell [ci:force]

* ACS-7577 remove public-api and fix readme file [ci:force]

* ACS-7577 remove edit directive [ci:force]

* ACS-7577 update e2e tests [ci:force]

* ACS-7577 update e2e tests [ci:force]

* ACS-7577 update e2e tests [ci:force]

* ACS-7577 revert e2e tests [ci:force]

* ACS-7577 revert e2e tests and create button [ci:force]

* ACS-7577 refactor e2e test [ci:force]

---------

Co-authored-by: DaryaBalvanovich <darya.balvanovich1@hyland.com>
This commit is contained in:
Darya Blavanovich
2024-04-29 08:55:18 +02:00
committed by GitHub
parent 571fc3dce1
commit 10244f45ac
16 changed files with 16 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/content-services/src/lib/content.module.ts
View File

@@ -33,7 +33,6 @@ import { ContentNodeSelectorModule } from './content-node-selector/content-node-
import { ContentNodeShareModule } from './content-node-share/content-node-share.module';
import { ContentDirectiveModule } from './directives/content-directive.module';
import { DialogModule } from './dialogs/dialog.module';
import { FolderDirectiveModule } from './folder-directive/folder-directive.module';
import { ContentMetadataModule } from './content-metadata/content-metadata.module';
import { PermissionManagerModule } from './permission-manager/permission-manager.module';
import { TreeViewModule } from './tree-view/tree-view.module';
@@ -70,7 +69,6 @@ import { ContentAuthLoaderService } from './auth-loader/content-auth-loader.serv
ContentNodeSelectorModule,
ContentNodeShareModule,
ContentMetadataModule,
FolderDirectiveModule,
ContentDirectiveModule,
PermissionManagerModule,
VersionManagerModule,
@@ -98,7 +96,6 @@ import { ContentAuthLoaderService } from './auth-loader/content-auth-loader.serv
ContentNodeShareModule,
ContentMetadataModule,
DialogModule,
FolderDirectiveModule,
ContentDirectiveModule,
PermissionManagerModule,
VersionManagerModule,

146
lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts
View File

@@ -1,146 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Component } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatDialog } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { Subject, of } from 'rxjs';
import { FolderCreateDirective } from './folder-create.directive';
import { Node } from '@alfresco/js-api';
import { ContentTestingModule } from '../testing/content.testing.module';
import { ContentService } from '../common/services/content.service';
@Component({
template: ` <div [adf-create-folder]="parentNode" (success)="success($event)" title="create-title" [nodeType]="'cm:my-little-pony'"></div>`
})
class TestTypeComponent {
parentNode = '';
public successParameter: Node = null;
success(node: Node) {
this.successParameter = node;
}
}
@Component({
template: `<div [adf-create-folder]="parentNode"></div>`
})
class TestComponent {
parentNode = '';
public successParameter: Node = null;
}
describe('FolderCreateDirective', () => {
let fixture: ComponentFixture<TestTypeComponent | TestComponent>;
let element;
let dialog: MatDialog;
let contentService: ContentService;
let dialogRefMock;
const event = { type: 'click', preventDefault: () => null };
beforeEach(() => {
TestBed.configureTestingModule({
imports: [ContentTestingModule],
declarations: [TestTypeComponent, TestComponent]
});
fixture = TestBed.createComponent(TestComponent);
element = fixture.debugElement.query(By.directive(FolderCreateDirective));
dialog = TestBed.inject(MatDialog);
contentService = TestBed.inject(ContentService);
dialogRefMock = {
afterClosed: (val) => of(val),
componentInstance: {
error: new Subject<any>(),
success: new Subject<Node>()
}
};
});
describe('With overrides', () => {
beforeEach(() => {
fixture = TestBed.createComponent(TestTypeComponent);
element = fixture.debugElement.query(By.directive(FolderCreateDirective));
dialog = TestBed.inject(MatDialog);
contentService = TestBed.inject(ContentService);
spyOn(dialog, 'open').and.returnValue(dialogRefMock);
});
it('should not emit folderCreate event when input value is undefined', async () => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
spyOn(contentService.folderCreate, 'next');
fixture.detectChanges();
await fixture.whenStable();
element.nativeElement.click();
expect(contentService.folderCreate.next).not.toHaveBeenCalled();
});
it('should emit success event with node if the folder creation was successful', async () => {
const testNode = {};
element.triggerEventHandler('click', event);
dialogRefMock.componentInstance.success.next(testNode);
fixture.whenStable();
await fixture.whenStable();
expect(fixture.componentInstance.successParameter).toBe(testNode);
});
it('should open the dialog with the proper title and nodeType', () => {
fixture.detectChanges();
element.triggerEventHandler('click', event);
expect(dialog.open).toHaveBeenCalledWith(jasmine.any(Function), {
data: {
parentNodeId: jasmine.any(String),
createTitle: 'create-title',
nodeType: 'cm:my-little-pony'
},
width: jasmine.any(String)
});
});
});
describe('Without overrides', () => {
beforeEach(() => {
fixture = TestBed.createComponent(TestComponent);
element = fixture.debugElement.query(By.directive(FolderCreateDirective));
dialog = TestBed.inject(MatDialog);
contentService = TestBed.inject(ContentService);
spyOn(dialog, 'open').and.returnValue(dialogRefMock);
});
it('should open the dialog with the default title and nodeType', () => {
fixture.detectChanges();
element.triggerEventHandler('click', event);
expect(dialog.open).toHaveBeenCalledWith(jasmine.any(Function), {
data: {
parentNodeId: jasmine.any(String),
createTitle: null,
nodeType: 'cm:folder'
},
width: jasmine.any(String)
});
});
});
});

91
lib/content-services/src/lib/folder-directive/folder-create.directive.ts
View File

@@ -1,91 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint-disable @angular-eslint/no-input-rename */
import { Directive, HostListener, Input, Output, EventEmitter } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { Node } from '@alfresco/js-api';
import { FolderDialogComponent } from '../dialogs/folder.dialog';
import { ContentService } from '../common/services/content.service';
const DEFAULT_FOLDER_PARENT_ID = '-my-';
const DIALOG_WIDTH: number = 400;
@Directive({
selector: '[adf-create-folder]'
})
export class FolderCreateDirective {
/** Parent folder where the new folder will be located after creation. */
@Input('adf-create-folder')
parentNodeId: string = DEFAULT_FOLDER_PARENT_ID;
/** Title of folder creation dialog. */
@Input()
title: string = null;
/** Type of node to create. */
@Input()
nodeType = 'cm:folder';
/** Emitted when an error occurs (eg, a folder with same name already exists). */
@Output()
error: EventEmitter<any> = new EventEmitter<any>();
/** Emitted when the folder is created successfully. */
@Output()
success: EventEmitter<Node> = new EventEmitter<Node>();
@HostListener('click', [ '$event' ])
onClick(event) {
event.preventDefault();
this.openDialog();
}
constructor(
public dialogRef: MatDialog,
public content: ContentService
) {}
private get dialogConfig() {
const { parentNodeId, title: createTitle, nodeType } = this;
return {
data: { parentNodeId, createTitle, nodeType },
width: `${DIALOG_WIDTH}px`
};
}
private openDialog(): void {
const { dialogRef, dialogConfig, content } = this;
const dialogInstance = dialogRef.open(FolderDialogComponent, dialogConfig);
dialogInstance.componentInstance.error.subscribe((error) => {
this.error.emit(error);
});
dialogInstance.componentInstance.success.subscribe((node: Node) => {
this.success.emit(node);
});
dialogInstance.afterClosed().subscribe((node: Node) => {
if (node) {
content.folderCreate.next(node);
}
});
}
}

39
lib/content-services/src/lib/folder-directive/folder-directive.module.ts
View File

@@ -1,39 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { MaterialModule } from '../material.module';
import { FolderCreateDirective } from './folder-create.directive';
import { FolderEditDirective } from './folder-edit.directive';
@NgModule({
imports: [
CommonModule,
MaterialModule
],
declarations: [
FolderCreateDirective,
FolderEditDirective
],
exports: [
FolderCreateDirective,
FolderEditDirective
]
})
export class FolderDirectiveModule {}

110
lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts
View File

@@ -1,110 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Component } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatDialog } from '@angular/material/dialog';
import { By } from '@angular/platform-browser';
import { Subject, of } from 'rxjs';
import { FolderEditDirective } from './folder-edit.directive';
import { Node } from '@alfresco/js-api';
import { ContentTestingModule } from '../testing/content.testing.module';
import { ContentService } from '../common/services/content.service';
@Component({
template: '<div [adf-edit-folder]="folder" (success)="success($event)" title="edit-title"></div>'
})
class TestComponent {
folder = {};
public successParameter: Node = null;
success(node: Node) {
this.successParameter = node;
}
}
describe('FolderEditDirective', () => {
let fixture: ComponentFixture<TestComponent>;
let element;
let dialog: MatDialog;
let contentService: ContentService;
let dialogRefMock;
const event = {
type: 'click',
preventDefault: () => null
};
beforeEach(() => {
TestBed.configureTestingModule({
imports: [ContentTestingModule],
declarations: [TestComponent]
});
fixture = TestBed.createComponent(TestComponent);
element = fixture.debugElement.query(By.directive(FolderEditDirective));
dialog = TestBed.inject(MatDialog);
contentService = TestBed.inject(ContentService);
dialogRefMock = {
afterClosed: (val) => of(val),
componentInstance: {
error: new Subject<any>(),
success: new Subject<Node>()
}
};
spyOn(dialog, 'open').and.returnValue(dialogRefMock);
});
it('should not emit folderEdit event when input value is undefined', async () => {
spyOn(dialogRefMock, 'afterClosed').and.returnValue(of(null));
spyOn(contentService.folderEdit, 'next');
fixture.detectChanges();
await fixture.whenStable();
element.nativeElement.click();
expect(contentService.folderEdit.next).not.toHaveBeenCalled();
});
it('should emit success event with node if the folder creation was successful', async () => {
fixture.detectChanges();
const testNode: any = {};
element.triggerEventHandler('click', event);
dialogRefMock.componentInstance.success.next(testNode);
fixture.detectChanges();
await fixture.whenStable();
expect(fixture.componentInstance.successParameter).toBe(testNode);
});
it('should open the dialog with the proper title', async () => {
fixture.detectChanges();
element.triggerEventHandler('click', event);
await fixture.whenStable();
expect(dialog.open).toHaveBeenCalledWith(jasmine.any(Function), {
data: {
folder: jasmine.any(Object),
editTitle: 'edit-title'
},
width: jasmine.any(String)
});
});
});

92
lib/content-services/src/lib/folder-directive/folder-edit.directive.ts
View File

@@ -1,92 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint-disable @angular-eslint/no-input-rename */
import { Directive, ElementRef, HostListener, Input, Output, EventEmitter } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { Node } from '@alfresco/js-api';
import { FolderDialogComponent } from '../dialogs/folder.dialog';
import { ContentService } from '../common/services/content.service';
const DIALOG_WIDTH: number = 400;
@Directive({
selector: '[adf-edit-folder]'
})
export class FolderEditDirective {
/** Folder node to edit. */
@Input('adf-edit-folder')
folder: Node;
/** Emitted when an error occurs (eg, a folder with same name already exists). */
@Output()
error = new EventEmitter<any>();
/** Title of folder edit dialog. */
@Input()
title: string = null;
/** Emitted when the folder has been edited successfully. */
@Output()
success = new EventEmitter<Node>();
@HostListener('click', [ '$event' ])
onClick(event) {
event.preventDefault();
if (this.folder) {
this.openDialog();
}
}
constructor(
public dialogRef: MatDialog,
public elementRef: ElementRef,
public content: ContentService
) {}
private get dialogConfig() {
const { folder } = this;
return {
data: {
folder,
editTitle: this.title
},
width: `${DIALOG_WIDTH}px`
};
}
private openDialog(): void {
const { dialogRef, dialogConfig, content } = this;
const dialogInstance = dialogRef.open(FolderDialogComponent, dialogConfig);
dialogInstance.componentInstance.error.subscribe((error) => {
this.error.emit(error);
});
dialogInstance.componentInstance.success.subscribe((node: Node) => {
this.success.emit(node);
});
dialogInstance.afterClosed().subscribe((node: Node) => {
if (node) {
content.folderEdit.next(node);
}
});
}
}

18
lib/content-services/src/lib/folder-directive/index.ts
View File

@@ -1,18 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export * from './public-api';

21
lib/content-services/src/lib/folder-directive/public-api.ts
View File

@@ -1,21 +0,0 @@
/*!
* @license
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
export * from './folder-create.directive';
export * from './folder-edit.directive';
export * from './folder-directive.module';

1
lib/content-services/src/public-api.ts
View File

@@ -26,7 +26,6 @@ export * from './lib/breadcrumb/index';
export * from './lib/version-manager/index';
export * from './lib/content-node-selector/index';
export * from './lib/dialogs/index';
export * from './lib/folder-directive/index';
export * from './lib/content-metadata/index';
export * from './lib/permission-manager/index';
export * from './lib/content-node-share/index';