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

…9582) * ACS-7577 remove create and edit folder directive [ci:force] * Revert "ACS-7577 remove create and edit folder directive [ci:force]" This reverts commit a0055aa. * 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>
Alfresco · Apr 29, 2024 · 10244f4 · 10244f4
1 parent 571fc3d
commit 10244f4
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 330 deletions.
diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts
@@ -67,6 +67,7 @@ import { ProcessCloudLayoutComponent } from './components/cloud/process-cloud-la
 import { CustomEditorComponent, CustomWidgetComponent } from './components/cloud/custom-form-components/custom-editor.component';
 import { SearchFilterChipsComponent } from './components/search/search-filter-chips.component';
 import { UserInfoComponent } from './components/app-layout/user-info/user-info.component';
+import { FolderDirectiveModule } from './folder-directive';
 
 @NgModule({
     imports: [
@@ -87,7 +88,8 @@ import { UserInfoComponent } from './components/app-layout/user-info/user-info.c
         ExtensionsModule.forRoot(),
         NgChartsModule,
         AppCloudSharedModule,
-        MonacoEditorModule.forRoot()
+        MonacoEditorModule.forRoot(),
+        FolderDirectiveModule
     ],
     declarations: [
         AppComponent,

diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
@@ -64,19 +64,6 @@
                     <mat-icon>more_vert</mat-icon>
                 </button>
                 <mat-menu #menu="matMenu">
-                    <button mat-menu-item
-                            (error)="openSnackMessageError($event)"
-                            [adf-create-folder]="currentFolderId">
-                        <mat-icon>create_new_folder</mat-icon>
-                        <span>New folder</span>
-                    </button>
-                    <button mat-menu-item
-                            [disabled]="!canEditFolder(documentList.selection)"
-                            (error)="openSnackMessageError($event)"
-                            [adf-edit-folder]="documentList.selection[0]?.entry">
-                        <mat-icon>create</mat-icon>
-                        <span>Edit folder</span>
-                    </button>
                     <button mat-menu-item
                             adf-check-allowable-operation="delete"
                             [adf-nodes]="documentList.selection"

diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
@@ -390,17 +390,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
         return this.contentService.hasAllowableOperations(selection[0].entry, 'update');
     }
 
-    canEditFolder(selection: Array<NodeEntry>): boolean {
-        if (selection && selection.length === 1) {
-            const entry = selection[0].entry;
-
-            if (entry?.isFolder) {
-                return this.contentService.hasAllowableOperations(entry, 'update');
-            }
-        }
-        return false;
-    }
-
     canCreateContent(parentNode: Node): boolean {
         if (parentNode) {
             return this.contentService.hasAllowableOperations(parentNode, 'create');

diff --git a/...ces/directives/folder-create.directive.md → ...lder-directive/folder-create.directive.md b/...ces/directives/folder-create.directive.md → ...lder-directive/folder-create.directive.md
@@ -1,7 +1,7 @@
 ---
 Title: Folder Create directive
 Added: v2.0.0
-Status: Active
+Status: Deprecated
 Last reviewed: 2019-01-16
 ---
 

diff --git a/...directive/folder-create.directive.spec.ts → ...directive/folder-create.directive.spec.ts b/...directive/folder-create.directive.spec.ts → ...directive/folder-create.directive.spec.ts
@@ -22,8 +22,8 @@ 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';
+import { ContentService } from '@alfresco/adf-content-services';
+import { ContentTestingModule } from 'lib/content-services/src/lib/testing/content.testing.module';
 
 @Component({
     template: ` <div [adf-create-folder]="parentNode" (success)="success($event)" title="create-title" [nodeType]="'cm:my-little-pony'"></div>`

diff --git a/...lder-directive/folder-create.directive.ts → ...lder-directive/folder-create.directive.ts b/...lder-directive/folder-create.directive.ts → ...lder-directive/folder-create.directive.ts
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-/* eslint-disable @angular-eslint/no-input-rename */
+/* eslint-disable */
 
 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';
+import { ContentService, FolderDialogComponent } from '@alfresco/adf-content-services';
 
 const DEFAULT_FOLDER_PARENT_ID = '-my-';
 const DIALOG_WIDTH: number = 400;
@@ -50,16 +49,13 @@ export class FolderCreateDirective {
     @Output()
     success: EventEmitter<Node> = new EventEmitter<Node>();
 
-    @HostListener('click', [ '$event' ])
+    @HostListener('click', ['$event'])
     onClick(event) {
         event.preventDefault();
         this.openDialog();
     }
 
-    constructor(
-        public dialogRef: MatDialog,
-        public content: ContentService
-    ) {}
+    constructor(public dialogRef: MatDialog, public content: ContentService) {}
 
     private get dialogConfig() {
         const { parentNodeId, title: createTitle, nodeType } = this;

diff --git a/...lder-directive/folder-directive.module.ts → ...lder-directive/folder-directive.module.ts b/...lder-directive/folder-directive.module.ts → ...lder-directive/folder-directive.module.ts
@@ -20,20 +20,10 @@ 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
-    ]
+    imports: [CommonModule, MaterialModule],
+    declarations: [FolderCreateDirective],
+    exports: [FolderCreateDirective]
 })
 export class FolderDirectiveModule {}
diff --git a/...ervices/src/lib/folder-directive/index.ts → demo-shell/src/app/folder-directive/index.ts b/...ervices/src/lib/folder-directive/index.ts → demo-shell/src/app/folder-directive/index.ts
@@ -15,4 +15,6 @@
  * limitations under the License.
  */
 
-export * from './public-api';
+export * from './folder-create.directive';
+
+export * from './folder-directive.module';
diff --git a/docs/README.md b/docs/README.md
@@ -331,8 +331,6 @@ for more information about installing and using the source code.
 | [Check Allowable Operation directive](content-services/directives/check-allowable-operation.directive.md) | Selectively disables an HTML element or Angular component. | [Source](../lib/content-services/src/lib/directives/check-allowable-operation.directive.ts) |
 | [Node Public File Share Directive](content-services/directives/content-node-share.directive.md) | Creates and manages public shared links for files. | [Source](../lib/content-services/src/lib/content-node-share/content-node-share.directive.ts) |
 | [File Draggable directive](content-services/directives/file-draggable.directive.md) | Provides drag-and-drop features for an element such as a div. | [Source](../lib/content-services/src/lib/upload/directives/file-draggable.directive.ts) |
-| [Folder Create directive](content-services/directives/folder-create.directive.md) | Creates folders. | [Source](../lib/content-services/src/lib/folder-directive/folder-create.directive.ts) |
-| [Folder Edit directive](content-services/directives/folder-edit.directive.md) | Allows folders to be edited. | [Source](../lib/content-services/src/lib/folder-directive/folder-edit.directive.ts) |
 | [Inherit Permission directive](content-services/directives/inherited-button.directive.md) | Update the current node by adding/removing the inherited permissions. | [Source](../lib/content-services/src/lib/permission-manager/components/inherited-button.directive.ts) |
 | [Node Counter directive](content-services/directives/node-counter.directive.md) | Appends a counter to an element. | [Source](../lib/content-services/src/lib/directives/node-counter.directive.ts) |
 | [Node Delete directive](content-services/directives/node-delete.directive.md) | Deletes multiple files and folders. | [Source](../lib/content-services/src/lib/directives/node-delete.directive.ts) |

diff --git a/docs/content-services/directives/folder-edit.directive.md b/docs/content-services/directives/folder-edit.directive.md
diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts
@@ -269,10 +269,8 @@ describe('Document List - Pagination', () => {
         await expect(await paginationPage.getCurrentItemsPerPage()).toEqual('5');
 
         await contentServicesPage.createAndOpenNewFolder(folderTwoModel.name);
-
         await contentServicesPage.checkPaginationIsNotDisplayed();
         await contentServicesPage.deleteSubFolderUnderRoot(newFolderModel.name, folderTwoModel.name);
-
     });
 
     it('[C260071] Should be able to change pagination when having 25 files', async () => {
@@ -371,7 +369,6 @@ describe('Document List - Pagination', () => {
         await contentServicesPage.createNewFolder(folderTwoModel.name);
         const nodeIdSubFolderTwo = await contentServicesPage.getAttributeValueForElement(folderTwoModel.name, 'Node id');
         await contentServicesPage.openFolder(folderTwoModel.name);
-
         for (let i = 0; i < numberOfSubFolders; i++) {
             await uploadActions.createFolder('subfolder' + (i + 1), nodeIdSubFolderTwo);
         }

diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts
@@ -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,

diff --git a/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts b/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts