From cc6bb7e95b3b8cf48078f70469ad066db804fe04 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Wed, 28 Apr 2021 09:30:07 +0100 Subject: [PATCH] [ACA-4365] Expanded info drawer for permissions, properties and comments (#2080) * [ACA-4365] Expanded info drawer for permissions, properties and comments * Add unit tests for details component * Fix linting * Fix e2e tests * Fix e2e tests * Change to Progress Bar * Add unit test for node effects * Fix unit test * Standardize styles info drawer * Remove permissions tab * Updadte ADF dependencies * Update permissions icon * Improve navigation * Fix linting --- .../context-submenus-ext.json | 6 +- .../document-presets-ext.json | 6 +- .../extensibility-configs/header-ext.json | 6 +- .../info-drawer-ext.json | 6 +- .../info-drawer-no-tabs-ext.json | 6 +- .../extensibility-configs/metadata-ext.json | 6 +- .../extensibility-configs/viewer-ext.json | 6 +- package-lock.json | 30 ++--- package.json | 10 +- .../store/src/actions/node.actions.ts | 8 +- .../store/src/actions/router.actions.ts | 9 +- .../store/src/effects/router.effects.ts | 18 ++- src/app/app.module.ts | 4 +- src/app/app.routes.ts | 20 ++++ .../components/details/details.component.html | 59 ++++++++++ .../components/details/details.component.scss | 45 ++++++++ .../details/details.component.spec.ts | 109 ++++++++++++++++++ .../components/details/details.component.ts | 99 ++++++++++++++++ .../comments-tab/comments-tab.component.ts | 2 +- .../info-drawer/info.drawer.module.ts | 3 +- .../library-metadata-tab.component.ts | 2 +- .../node-permissions.dialog.html | 11 -- .../node-permissions.dialog.spec.ts | 32 ----- .../node-permissions.dialog.ts | 40 ------- .../permission-manager.component.html | 27 ----- .../permission-manager.component.scss | 40 ------- .../permission-manager.component.spec.ts | 32 ----- .../permission-manager.component.ts | 90 --------------- .../permissions/permissions.module.ts | 38 ------ .../services/content-management.service.ts | 19 --- src/app/store/effects/node.effects.spec.ts | 36 +++--- src/app/store/effects/node.effects.ts | 31 ++++- src/app/ui/custom-theme.scss | 2 + src/assets/app.extensions.json | 85 ++++++++++---- src/assets/i18n/en.json | 13 ++- 35 files changed, 534 insertions(+), 422 deletions(-) create mode 100644 src/app/components/details/details.component.html create mode 100644 src/app/components/details/details.component.scss create mode 100644 src/app/components/details/details.component.spec.ts create mode 100644 src/app/components/details/details.component.ts delete mode 100644 src/app/components/permissions/permission-dialog/node-permissions.dialog.html delete mode 100644 src/app/components/permissions/permission-dialog/node-permissions.dialog.spec.ts delete mode 100644 src/app/components/permissions/permission-dialog/node-permissions.dialog.ts delete mode 100644 src/app/components/permissions/permission-manager/permission-manager.component.html delete mode 100644 src/app/components/permissions/permission-manager/permission-manager.component.scss delete mode 100644 src/app/components/permissions/permission-manager/permission-manager.component.spec.ts delete mode 100644 src/app/components/permissions/permission-manager/permission-manager.component.ts delete mode 100644 src/app/components/permissions/permissions.module.ts diff --git a/e2e/resources/extensibility-configs/context-submenus-ext.json b/e2e/resources/extensibility-configs/context-submenus-ext.json index 06d72edbe..f564b27dd 100644 --- a/e2e/resources/extensibility-configs/context-submenus-ext.json +++ b/e2e/resources/extensibility-configs/context-submenus-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -801,7 +801,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -1062,7 +1062,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/document-presets-ext.json b/e2e/resources/extensibility-configs/document-presets-ext.json index 6b26b3b24..f48512cc7 100644 --- a/e2e/resources/extensibility-configs/document-presets-ext.json +++ b/e2e/resources/extensibility-configs/document-presets-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -729,7 +729,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -990,7 +990,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/header-ext.json b/e2e/resources/extensibility-configs/header-ext.json index ae5259678..f8c5e3425 100644 --- a/e2e/resources/extensibility-configs/header-ext.json +++ b/e2e/resources/extensibility-configs/header-ext.json @@ -552,7 +552,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -756,7 +756,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -1017,7 +1017,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/info-drawer-ext.json b/e2e/resources/extensibility-configs/info-drawer-ext.json index 5b48c385a..a8c36a2ea 100644 --- a/e2e/resources/extensibility-configs/info-drawer-ext.json +++ b/e2e/resources/extensibility-configs/info-drawer-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -729,7 +729,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -990,7 +990,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json b/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json index 411a0fd16..198c2376d 100644 --- a/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json +++ b/e2e/resources/extensibility-configs/info-drawer-no-tabs-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -729,7 +729,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -990,7 +990,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/metadata-ext.json b/e2e/resources/extensibility-configs/metadata-ext.json index eedc54bf6..be1912763 100644 --- a/e2e/resources/extensibility-configs/metadata-ext.json +++ b/e2e/resources/extensibility-configs/metadata-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -729,7 +729,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -990,7 +990,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/e2e/resources/extensibility-configs/viewer-ext.json b/e2e/resources/extensibility-configs/viewer-ext.json index 3bbe35af6..0c1330288 100644 --- a/e2e/resources/extensibility-configs/viewer-ext.json +++ b/e2e/resources/extensibility-configs/viewer-ext.json @@ -525,7 +525,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -729,7 +729,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -1016,7 +1016,7 @@ "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", "disabled": true, - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, diff --git a/package-lock.json b/package-lock.json index b0a7e6a03..4f97db8cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "4.4.0-32192", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.4.0-32192.tgz", - "integrity": "sha512-weZMZzFlqp+bs/oKm9E4lRuBEON4gnaxEWogfCjtw9Fj6Ya1hlLZmUKIzhLUaLmy3544l+xUUUQ5A/TTj0l9Ig==", + "version": "4.4.0-32262", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.4.0-32262.tgz", + "integrity": "sha512-VQf/Ovcp24Oc+OEPjR3SZJwEnxxV5qzwcnOBiEtp8XhDXbLgv7p08eRPCIPqIMkpEFUNEnu3HHoTtTLPggisXA==", "dev": true, "requires": { "@alfresco/js-api": "4.4.0-3371", @@ -30,33 +30,33 @@ } }, "@alfresco/adf-content-services": { - "version": "4.4.0-32192", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.4.0-32192.tgz", - "integrity": "sha512-FM0qJQ0ltBMnpdGs0Mh1EVx/DJBqoWlGo6SZZUi2g4d1+19HN3PiYr3Uk/78EXqof0FPDQRrSm3hdufj78nC9g==", + "version": "4.4.0-32262", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.4.0-32262.tgz", + "integrity": "sha512-ekycBJ9zPHrrKWyEz4OkqZmhYYdF79Qr6NglAWcaJxJg5ccewQIfpLr3mYXdoLGFJ98UfCR8EbPUZYEyK7R5tg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.4.0-32192", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.4.0-32192.tgz", - "integrity": "sha512-zQ3m5BVEAK4hC5pwy+DRpcV+KHIAkJrSXOxYh2eAaikKoiNxk5bD+xxKGzOae+SfO1hP+Y9kb8K/aoX2gfe1DA==", + "version": "4.4.0-32262", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.4.0-32262.tgz", + "integrity": "sha512-CXOaGnRbPMliRcTNUeztNc4Bc0zHWdQ2vp1JucplMQY6vaDrmKXBXasFTunA9y3v0WR/YHTqDCP2r+5y5LYZTg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.4.0-32192", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.4.0-32192.tgz", - "integrity": "sha512-M4zu2GJPufv0hnm17qbR5YzwpDdIgcb+Q4DoNFH7bD2pDtceYJSvNJWc7m47HkNXZVGKq0p0i5ml6T5TEeahzw==", + "version": "4.4.0-32262", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.4.0-32262.tgz", + "integrity": "sha512-1qpqaJCH2TI6t3ZkLPeEXYmR+7+Z+QQt3g22CYt+DsTti+TZBD7vHp1iV62IXGC4tqpcFLF56ktseOIsrZku8Q==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.4.0-32192", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.4.0-32192.tgz", - "integrity": "sha512-R258bcFpdFHJKdgk9b0B4CpvaAr8uXbH3iyhVQP1Me+nPkcjJ3okcrPDzBpwqwMbDaCGv3MZ91uWG/bNHZ/67A==", + "version": "4.4.0-32262", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.4.0-32262.tgz", + "integrity": "sha512-3N3e8pIYH8BIexTELc6xCR8jnHNwpxtaBJBLbcz5LCeeq/YQmxtPzCne3KSFs62umBrG3K2icXhxVUGbGGc1Uw==", "dev": true, "requires": { "tslib": "^2.0.0" diff --git a/package.json b/package.json index bb40faef1..f4203ca49 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.4.0-32192", - "@alfresco/adf-core": "4.4.0-32192", - "@alfresco/adf-extensions": "4.4.0-32192", + "@alfresco/adf-content-services": "4.4.0-32262", + "@alfresco/adf-core": "4.4.0-32262", + "@alfresco/adf-extensions": "4.4.0-32262", "@alfresco/js-api": "4.4.0-3371", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", @@ -57,8 +57,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "4.4.0-32192", - "@alfresco/adf-testing": "4.4.0-32192", + "@alfresco/adf-cli": "4.4.0-32262", + "@alfresco/adf-testing": "4.4.0-32262", "@angular-custom-builders/lite-serve": "^0.2.3", "@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0", diff --git a/projects/aca-shared/store/src/actions/node.actions.ts b/projects/aca-shared/store/src/actions/node.actions.ts index 5bd03ec4c..b482d6c63 100644 --- a/projects/aca-shared/store/src/actions/node.actions.ts +++ b/projects/aca-shared/store/src/actions/node.actions.ts @@ -46,7 +46,8 @@ export enum NodeActionTypes { UnlockForWriting = 'UNLOCK_WRITE_LOCK', AddFavorite = 'ADD_FAVORITE', RemoveFavorite = 'REMOVE_FAVORITE', - ChangeAspects = 'ASPECT_LIST' + ChangeAspects = 'ASPECT_LIST', + ExpandInfoDrawer = 'EXPAND_INFO_DRAWER' } export class SetSelectedNodesAction implements Action { @@ -126,6 +127,11 @@ export class ManagePermissionsAction implements Action { constructor(public payload: MinimalNodeEntity) {} } +export class ExpandInfoDrawerAction implements Action { + readonly type = NodeActionTypes.ExpandInfoDrawer; + + constructor(public payload: MinimalNodeEntity) {} +} export class PrintFileAction implements Action { readonly type = NodeActionTypes.PrintFile; diff --git a/projects/aca-shared/store/src/actions/router.actions.ts b/projects/aca-shared/store/src/actions/router.actions.ts index cfe0ae660..45ab2df3b 100644 --- a/projects/aca-shared/store/src/actions/router.actions.ts +++ b/projects/aca-shared/store/src/actions/router.actions.ts @@ -30,7 +30,8 @@ export enum RouterActionTypes { NavigateUrl = 'NAVIGATE_URL', NavigateRoute = 'NAVIGATE_ROUTE', NavigateFolder = 'NAVIGATE_FOLDER', - NavigateParentFolder = 'NAVIGATE_PARENT_FOLDER' + NavigateParentFolder = 'NAVIGATE_PARENT_FOLDER', + NavigateToPreviousPage = 'NAVIGATE_TO_PREVIOUS_PAGE' } export class NavigateUrlAction implements Action { @@ -56,3 +57,9 @@ export class NavigateToParentFolder implements Action { constructor(public payload: MinimalNodeEntity) {} } + +export class NavigateToPreviousPage implements Action { + readonly type = RouterActionTypes.NavigateToPreviousPage; + + constructor() {} +} diff --git a/projects/aca-shared/store/src/effects/router.effects.ts b/projects/aca-shared/store/src/effects/router.effects.ts index 46b4d05c6..049664e8c 100644 --- a/projects/aca-shared/store/src/effects/router.effects.ts +++ b/projects/aca-shared/store/src/effects/router.effects.ts @@ -30,12 +30,20 @@ import { MinimalNodeEntryEntity, PathInfoEntity } from '@alfresco/js-api'; import { map } from 'rxjs/operators'; import { Store } from '@ngrx/store'; import { AppStore } from '../states/app.state'; -import { NavigateUrlAction, RouterActionTypes, NavigateRouteAction, NavigateToFolder, NavigateToParentFolder } from '../actions/router.actions'; +import { Location } from '@angular/common'; +import { + NavigateUrlAction, + RouterActionTypes, + NavigateRouteAction, + NavigateToFolder, + NavigateToParentFolder, + NavigateToPreviousPage +} from '../actions/router.actions'; import { SnackbarErrorAction } from '../actions/snackbar.actions'; @Injectable() export class RouterEffects { - constructor(private store: Store, private actions$: Actions, private router: Router) {} + constructor(private store: Store, private actions$: Actions, private router: Router, private location: Location) {} @Effect({ dispatch: false }) navigateUrl$ = this.actions$.pipe( @@ -75,6 +83,12 @@ export class RouterEffects { }) ); + @Effect({ dispatch: false }) + navigateToPreviousPage$ = this.actions$.pipe( + ofType(RouterActionTypes.NavigateToPreviousPage), + map(() => this.location.back()) + ); + private navigateToFolder(node: MinimalNodeEntryEntity) { let link: any[] = null; const { path, id } = node; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a9e818f20..5ac200a1c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -51,7 +51,6 @@ import { ExtensionsModule } from '@alfresco/adf-extensions'; import { AppToolbarModule } from './components/toolbar/toolbar.module'; import { AppCreateMenuModule } from './components/create-menu/create-menu.module'; import { AppSidenavModule } from './components/sidenav/sidenav.module'; -import { AppPermissionsModule } from './components/permissions/permissions.module'; import { AppCommonModule } from './components/common/common.module'; import { AppLayoutModule } from './components/layout/layout.module'; import { AppSearchInputModule } from './components/search/search-input.module'; @@ -65,6 +64,7 @@ import { RecentFilesComponent } from './components/recent-files/recent-files.com import { SharedFilesComponent } from './components/shared-files/shared-files.component'; import { CreateFromTemplateDialogComponent } from './dialogs/node-template/create-from-template.dialog'; import { environment } from '../environments/environment'; +import { DetailsComponent } from './components/details/details.component'; import { registerLocaleData } from '@angular/common'; import localeFr from '@angular/common/locales/fr'; @@ -129,7 +129,6 @@ registerLocaleData(localeSv); AppSidenavModule, AppCreateMenuModule, DocumentListCustomComponentsModule, - AppPermissionsModule, AppSearchInputModule, AppSearchResultsModule, AppHeaderModule, @@ -139,6 +138,7 @@ registerLocaleData(localeSv); declarations: [ AppComponent, FilesComponent, + DetailsComponent, LibrariesComponent, FavoriteLibrariesComponent, NodeVersionsDialogComponent, diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 8cd830f8d..9e77dc994 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -36,6 +36,7 @@ import { AuthGuardEcm, BlankPageComponent } from '@alfresco/adf-core'; import { FavoritesComponent } from './components/favorites/favorites.component'; import { RecentFilesComponent } from './components/recent-files/recent-files.component'; import { SharedFilesComponent } from './components/shared-files/shared-files.component'; +import { DetailsComponent } from './components/details/details.component'; export const APP_ROUTES: Routes = [ { @@ -91,6 +92,25 @@ export const APP_ROUTES: Routes = [ defaultNodeId: '-my-' } }, + { + path: 'details/:nodeId', + children: [ + { + path: '', + component: DetailsComponent, + data: { + navigateSource: 'personal-files' + } + }, + { + path: ':activeTab', + component: DetailsComponent, + data: { + navigateSource: 'personal-files' + } + } + ] + }, // deprecated, backwards compatibility with ACA 1.8 { path: 'preview/:nodeId', diff --git a/src/app/components/details/details.component.html b/src/app/components/details/details.component.html new file mode 100644 index 000000000..689466710 --- /dev/null +++ b/src/app/components/details/details.component.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + +
+
+
+ {{node.name}} + - + {{'APP.INFO_DRAWER.TITLE' | translate}} +
+
+ +
+
+ + + + + + + + + + + + + + + +
+ + + + + + + diff --git a/src/app/components/details/details.component.scss b/src/app/components/details/details.component.scss new file mode 100644 index 000000000..2759a98f1 --- /dev/null +++ b/src/app/components/details/details.component.scss @@ -0,0 +1,45 @@ +@mixin app-details-theme($theme) { + $background: map-get($theme, background); + + .acs-details-container { + background-color: mat-color($background, card); + width: 100%; + } + + .adw-details-tabs { + margin-top: 40px; + height: calc(100% - 80px); + + .mat-tab-body-wrapper { + height: 100%; + } + + .mat-tab-labels { + text-transform: uppercase; + } + } + + .acs-details-title { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + + .acs-close-memebers-container { + margin-right: 15px; + } + } + + .acs-details-breadcrumb { + font-size: 18px; + margin-left: 20px; + + .acs-details-breadcrumb-library { + font-weight: 900; + } + + .acs-details-breadcrumb-item { + font-weight: 100; + } + } +} diff --git a/src/app/components/details/details.component.spec.ts b/src/app/components/details/details.component.spec.ts new file mode 100644 index 000000000..991d26ba9 --- /dev/null +++ b/src/app/components/details/details.component.spec.ts @@ -0,0 +1,109 @@ +/*! + * @license + * Alfresco Example Content Application + * + * Copyright (C) 2005 - 2020 Alfresco Software Limited + * + * This file is part of the Alfresco Example Content Application. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * The Alfresco Example Content Application is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The Alfresco Example Content Application is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ + +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { AppTestingModule } from '../../testing/app-testing.module'; +import { DetailsComponent } from './details.component'; +import { MetadataTabComponent } from './../info-drawer/metadata-tab/metadata-tab.component'; +import { CommentsTabComponent } from './../info-drawer/comments-tab/comments-tab.component'; +import { ActivatedRoute, Router } from '@angular/router'; +import { of, Subject } from 'rxjs'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { ContentManagementService } from '../../services/content-management.service'; +import { AppExtensionService } from '@alfresco/adf-extensions'; +import { ContentApiService } from '@alfresco/aca-shared'; +import { SetSelectedNodesAction } from '@alfresco/aca-shared/store'; +import { NodeEntry } from '@alfresco/js-api'; + +describe('DetailsComponent', () => { + let component: DetailsComponent; + let fixture: ComponentFixture; + let contentApiService: ContentApiService; + let store; + const router: any = { + url: '', + navigate: jasmine.createSpy('navigate') + }; + const mockStream = new Subject(); + const storeMock = { + dispatch: jasmine.createSpy('dispatch'), + select: () => mockStream + }; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [AppTestingModule], + declarations: [DetailsComponent, CommentsTabComponent, MetadataTabComponent], + providers: [ + ContentManagementService, + AppExtensionService, + { + provide: Router, + useValue: router + }, + { provide: Store, useValue: storeMock }, + { + provide: ActivatedRoute, + useValue: { + snapshot: { data: { preferencePrefix: 'prefix' } }, + params: of({ nodeId: 'someId', activeTab: 'permissions' }) + } + } + ], + schemas: [NO_ERRORS_SCHEMA] + }); + + fixture = TestBed.createComponent(DetailsComponent); + component = fixture.componentInstance; + contentApiService = TestBed.inject(ContentApiService); + store = TestBed.inject(Store); + spyOn(contentApiService, 'getNode').and.returnValue(of({ entry: { id: 'libraryId' } } as NodeEntry)); + }); + + afterEach(() => { + fixture.destroy(); + }); + + it('should get node id from router', () => { + fixture.detectChanges(); + expect(component.nodeId).toBe('someId'); + }); + + it('should set active tab from router', () => { + fixture.detectChanges(); + expect(component.activeTab).toBe(2); + }); + + it('should get node info after setting node from router', () => { + fixture.detectChanges(); + expect(contentApiService.getNode).toHaveBeenCalled(); + }); + + it('should dispatch node selection', () => { + fixture.detectChanges(); + expect(store.dispatch).toHaveBeenCalledWith(new SetSelectedNodesAction([{ entry: { id: 'libraryId' } } as NodeEntry])); + }); +}); diff --git a/src/app/components/details/details.component.ts b/src/app/components/details/details.component.ts new file mode 100644 index 000000000..ec10dca82 --- /dev/null +++ b/src/app/components/details/details.component.ts @@ -0,0 +1,99 @@ +/*! + * @license + * Alfresco Example Content Application + * + * Copyright (C) 2005 - 2020 Alfresco Software Limited + * + * This file is part of the Alfresco Example Content Application. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * The Alfresco Example Content Application is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * The Alfresco Example Content Application is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ + +import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { PageComponent } from '../page.component'; +import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared'; +import { AppStore, NavigateToPreviousPage, SetSelectedNodesAction } from '@alfresco/aca-shared/store'; +import { Store } from '@ngrx/store'; +import { ContentManagementService } from '../../services/content-management.service'; +import { Subject } from 'rxjs'; + +@Component({ + selector: 'app-details-manager', + templateUrl: './details.component.html', + styleUrls: ['details.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class DetailsComponent extends PageComponent implements OnInit, OnDestroy { + nodeId: string; + isLoading: boolean; + onDestroy$ = new Subject(); + activeTab = 1; + + constructor( + private route: ActivatedRoute, + private contentApi: ContentApiService, + store: Store, + content: ContentManagementService, + extensions: AppExtensionService + ) { + super(store, extensions, content); + } + + ngOnInit(): void { + super.ngOnInit(); + this.isLoading = true; + const { route } = this; + const { data } = route.snapshot; + this.title = data.title; + + this.route.params.subscribe((params) => { + this.isLoading = true; + this.setActiveTab(params.activeTab); + this.nodeId = params.nodeId; + this.contentApi.getNode(this.nodeId).subscribe((node) => { + this.node = node.entry; + this.isLoading = false; + this.store.dispatch(new SetSelectedNodesAction([{ entry: this.node }])); + }); + }); + } + + setActiveTab(tabName: string) { + switch (tabName) { + case 'comments': + this.activeTab = 1; + break; + case 'permissions': + this.activeTab = 2; + break; + case 'metadata': + default: + this.activeTab = 0; + } + } + + goBack() { + this.store.dispatch(new NavigateToPreviousPage()); + } + + ngOnDestroy(): void { + this.store.dispatch(new SetSelectedNodesAction([])); + this.onDestroy$.next(); + this.onDestroy$.complete(); + } +} diff --git a/src/app/components/info-drawer/comments-tab/comments-tab.component.ts b/src/app/components/info-drawer/comments-tab/comments-tab.component.ts index 9adb4d6ab..bf74bccdf 100644 --- a/src/app/components/info-drawer/comments-tab/comments-tab.component.ts +++ b/src/app/components/info-drawer/comments-tab/comments-tab.component.ts @@ -29,7 +29,7 @@ import { NodePermissionService, isLocked } from '@alfresco/aca-shared'; @Component({ selector: 'app-comments-tab', - template: `` + template: `` }) export class CommentsTabComponent { @Input() diff --git a/src/app/components/info-drawer/info.drawer.module.ts b/src/app/components/info-drawer/info.drawer.module.ts index 0a7ca0c58..8309df1b2 100644 --- a/src/app/components/info-drawer/info.drawer.module.ts +++ b/src/app/components/info-drawer/info.drawer.module.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { ContentMetadataModule, VersionManagerModule } from '@alfresco/adf-content-services'; +import { ContentMetadataModule, ContentModule, VersionManagerModule } from '@alfresco/adf-content-services'; import { CoreModule } from '@alfresco/adf-core'; import { ExtensionsModule } from '@alfresco/adf-extensions'; import { CommonModule } from '@angular/common'; @@ -47,6 +47,7 @@ export function components() { CommonModule, MaterialModule, CoreModule.forChild(), + ContentModule.forChild(), ExtensionsModule, ContentMetadataModule, VersionManagerModule, diff --git a/src/app/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts b/src/app/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts index b834b1e29..445e782a9 100644 --- a/src/app/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts +++ b/src/app/components/info-drawer/library-metadata-tab/library-metadata-tab.component.ts @@ -27,7 +27,7 @@ import { Component, Input } from '@angular/core'; import { SiteEntry } from '@alfresco/js-api'; @Component({ - selector: 'app-metadata-tab', + selector: 'app-library-metadata-tab', template: '', host: { class: 'app-metadata-tab' } }) diff --git a/src/app/components/permissions/permission-dialog/node-permissions.dialog.html b/src/app/components/permissions/permission-dialog/node-permissions.dialog.html deleted file mode 100644 index c4ad08e2e..000000000 --- a/src/app/components/permissions/permission-dialog/node-permissions.dialog.html +++ /dev/null @@ -1,11 +0,0 @@ -
- {{'PERMISSIONS.DIALOG.TITLE' | translate}} -
-
- -
-
- -
diff --git a/src/app/components/permissions/permission-dialog/node-permissions.dialog.spec.ts b/src/app/components/permissions/permission-dialog/node-permissions.dialog.spec.ts deleted file mode 100644 index 5aef3d242..000000000 --- a/src/app/components/permissions/permission-dialog/node-permissions.dialog.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { NodePermissionsDialogComponent } from './node-permissions.dialog'; - -describe('NodePermissionsDialogComponent', () => { - it('should be defined', () => { - expect(NodePermissionsDialogComponent).toBeDefined(); - }); -}); diff --git a/src/app/components/permissions/permission-dialog/node-permissions.dialog.ts b/src/app/components/permissions/permission-dialog/node-permissions.dialog.ts deleted file mode 100644 index 077194161..000000000 --- a/src/app/components/permissions/permission-dialog/node-permissions.dialog.ts +++ /dev/null @@ -1,40 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; - -@Component({ - templateUrl: './node-permissions.dialog.html', - encapsulation: ViewEncapsulation.None, - host: { class: 'aca-node-permissions-dialog' } -}) -export class NodePermissionsDialogComponent { - nodeId: string; - - constructor(@Inject(MAT_DIALOG_DATA) data: any) { - this.nodeId = data.nodeId; - } -} diff --git a/src/app/components/permissions/permission-manager/permission-manager.component.html b/src/app/components/permissions/permission-manager/permission-manager.component.html deleted file mode 100644 index cecbc2e90..000000000 --- a/src/app/components/permissions/permission-manager/permission-manager.component.html +++ /dev/null @@ -1,27 +0,0 @@ -
- - -
- - - diff --git a/src/app/components/permissions/permission-manager/permission-manager.component.scss b/src/app/components/permissions/permission-manager/permission-manager.component.scss deleted file mode 100644 index 85a947d65..000000000 --- a/src/app/components/permissions/permission-manager/permission-manager.component.scss +++ /dev/null @@ -1,40 +0,0 @@ -aca-permissions-dialog-panel { - height: 400px; -} - -.aca-node-permissions-dialog { - .mat-dialog-title { - font-size: 20px; - font-weight: 600; - font-style: normal; - font-stretch: normal; - line-height: 1.6; - margin: 0; - letter-spacing: -0.5px; - color: var(--theme-foreground-text-bold-color); - } - - .mat-dialog-content { - flex: 1 1 auto; - position: relative; - overflow: auto; - - adf-permission-list { - display: flex; - } - } - - .mat-dialog-actions { - flex: 0 0 auto; - - padding: 8px 8px 24px 8px; - display: flex; - justify-content: flex-end; - color: var(--theme-text-color); - - button { - text-transform: uppercase; - font-weight: normal; - } - } -} diff --git a/src/app/components/permissions/permission-manager/permission-manager.component.spec.ts b/src/app/components/permissions/permission-manager/permission-manager.component.spec.ts deleted file mode 100644 index 40456104e..000000000 --- a/src/app/components/permissions/permission-manager/permission-manager.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { PermissionsManagerComponent } from './permission-manager.component'; - -describe('PermissionsManagerComponent', () => { - it('should be defined', () => { - expect(PermissionsManagerComponent).toBeDefined(); - }); -}); diff --git a/src/app/components/permissions/permission-manager/permission-manager.component.ts b/src/app/components/permissions/permission-manager/permission-manager.component.ts deleted file mode 100644 index 529313ab7..000000000 --- a/src/app/components/permissions/permission-manager/permission-manager.component.ts +++ /dev/null @@ -1,90 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { AppStore, SnackbarErrorAction } from '@alfresco/aca-shared/store'; -import { NodePermissionDialogService, PermissionListComponent } from '@alfresco/adf-content-services'; -import { MinimalNodeEntryEntity } from '@alfresco/js-api'; -import { Component, Input, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; -import { Store } from '@ngrx/store'; -import { ContentApiService } from '@alfresco/aca-shared'; -import { NodePermissionsDialogComponent } from '../permission-dialog/node-permissions.dialog'; - -@Component({ - selector: 'app-permission-manager', - templateUrl: './permission-manager.component.html', - styleUrls: ['permission-manager.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class PermissionsManagerComponent implements OnInit { - @ViewChild('permissionList', { static: true }) - permissionList: PermissionListComponent; - - @Input() - nodeId: string; - - toggleStatus = false; - - constructor( - private store: Store, - private dialog: MatDialog, - private contentApi: ContentApiService, - private nodePermissionDialogService: NodePermissionDialogService - ) {} - - ngOnInit() { - this.contentApi.getNodeInfo(this.nodeId, { include: ['permissions'] }).subscribe((currentNode: MinimalNodeEntryEntity) => { - this.toggleStatus = currentNode.permissions.isInheritanceEnabled; - }); - } - - onError(errorMessage: string) { - this.store.dispatch(new SnackbarErrorAction(errorMessage)); - } - - onUpdate() { - this.permissionList.reload(); - } - - onUpdatedPermissions(node: MinimalNodeEntryEntity) { - this.toggleStatus = node.permissions.isInheritanceEnabled; - this.permissionList.reload(); - } - - openAddPermissionDialog() { - this.nodePermissionDialogService.updateNodePermissionByDialog(this.nodeId).subscribe( - () => { - this.dialog.open(NodePermissionsDialogComponent, { - data: { nodeId: this.nodeId }, - panelClass: 'aca-permissions-dialog-panel', - width: '800px' - }); - }, - (error) => { - this.store.dispatch(new SnackbarErrorAction(error)); - } - ); - } -} diff --git a/src/app/components/permissions/permissions.module.ts b/src/app/components/permissions/permissions.module.ts deleted file mode 100644 index 76bb3c75a..000000000 --- a/src/app/components/permissions/permissions.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; -import { ContentModule } from '@alfresco/adf-content-services'; -import { NodePermissionsDialogComponent } from './permission-dialog/node-permissions.dialog'; -import { PermissionsManagerComponent } from './permission-manager/permission-manager.component'; - -@NgModule({ - imports: [CommonModule, CoreModule.forChild(), ContentModule.forChild()], - declarations: [PermissionsManagerComponent, NodePermissionsDialogComponent], - exports: [PermissionsManagerComponent, NodePermissionsDialogComponent] -}) -export class AppPermissionsModule {} diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts index 914deea0c..1f296384a 100644 --- a/src/app/services/content-management.service.ts +++ b/src/app/services/content-management.service.ts @@ -66,7 +66,6 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { Store } from '@ngrx/store'; import { forkJoin, Observable, of, Subject, zip } from 'rxjs'; import { catchError, map, mergeMap, take, tap } from 'rxjs/operators'; -import { NodePermissionsDialogComponent } from '../components/permissions/permission-dialog/node-permissions.dialog'; import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog'; import { NodeActionsService } from './node-actions.service'; @@ -133,24 +132,6 @@ export class ContentManagementService { } } - managePermissions(node: MinimalNodeEntity): void { - if (node && node.entry) { - const { nodeId, id } = node.entry as any; - const siteId = node.entry['guid']; - const targetId = siteId || nodeId || id; - - if (targetId) { - this.dialogRef.open(NodePermissionsDialogComponent, { - data: { nodeId: targetId }, - panelClass: 'aca-permissions-dialog-panel', - width: '730px' - }); - } else { - this.store.dispatch(new SnackbarErrorAction('APP.MESSAGES.ERRORS.PERMISSION')); - } - } - } - manageVersions(node: any) { if (node && node.entry) { // shared and favorite diff --git a/src/app/store/effects/node.effects.spec.ts b/src/app/store/effects/node.effects.spec.ts index c5b296764..5c0925c27 100644 --- a/src/app/store/effects/node.effects.spec.ts +++ b/src/app/store/effects/node.effects.spec.ts @@ -42,21 +42,24 @@ import { EditFolderAction, CopyNodesAction, MoveNodesAction, - ManagePermissionsAction, UnlockWriteAction, FullscreenViewerAction, PrintFileAction, SetCurrentFolderAction, - ManageAspectsAction + ManageAspectsAction, + ManagePermissionsAction } from '@alfresco/aca-shared/store'; import { ViewUtilService } from '@alfresco/adf-core'; import { ViewerEffects } from './viewer.effects'; +import { Router } from '@angular/router'; +import { of } from 'rxjs'; describe('NodeEffects', () => { let store: Store; let contentService: ContentManagementService; let viewUtilService: ViewUtilService; let viewerEffects: ViewerEffects; + let router: Router; beforeEach(() => { TestBed.configureTestingModule({ @@ -68,6 +71,7 @@ describe('NodeEffects', () => { contentService = TestBed.inject(ContentManagementService); viewUtilService = TestBed.inject(ViewUtilService); viewerEffects = TestBed.inject(ViewerEffects); + router = TestBed.inject(Router); }); describe('shareNode$', () => { @@ -366,33 +370,27 @@ describe('NodeEffects', () => { describe('managePermissions$', () => { it('should manage permissions from the payload', () => { - spyOn(contentService, 'managePermissions').and.stub(); - - const node: any = { entry: { isFile: true } }; + spyOn(router, 'navigate').and.stub(); + const node: any = { entry: { isFile: true, id: 'fileId' } }; store.dispatch(new ManagePermissionsAction(node)); - expect(contentService.managePermissions).toHaveBeenCalledWith(node); + expect(router.navigate).toHaveBeenCalledWith(['personal-files/details', 'fileId', 'permissions']); }); - it('should manage permissions from the active selection', fakeAsync(() => { - spyOn(contentService, 'managePermissions').and.stub(); - - const node: any = { entry: { isFile: true } }; - store.dispatch(new SetSelectedNodesAction([node])); - - tick(100); - + it('should manage permissions from the active selection', () => { + spyOn(store, 'select').and.returnValue(of({ isEmpty: false, first: { entry: { id: 'fileId' } } })); + spyOn(router, 'navigate').and.stub(); store.dispatch(new ManagePermissionsAction(null)); - expect(contentService.managePermissions).toHaveBeenCalledWith(node); - })); + expect(router.navigate).toHaveBeenCalledWith(['personal-files/details', 'fileId', 'permissions']); + }); it('should do nothing if invoking manage permissions with no data', () => { - spyOn(contentService, 'managePermissions').and.stub(); - + spyOn(store, 'select').and.returnValue(of(null)); + spyOn(router, 'navigate').and.stub(); store.dispatch(new ManagePermissionsAction(null)); - expect(contentService.managePermissions).not.toHaveBeenCalled(); + expect(router.navigate).not.toHaveBeenCalled(); }); }); diff --git a/src/app/store/effects/node.effects.ts b/src/app/store/effects/node.effects.ts index ed809d073..0a564e389 100644 --- a/src/app/store/effects/node.effects.ts +++ b/src/app/store/effects/node.effects.ts @@ -46,7 +46,9 @@ import { PrintFileAction, getCurrentFolder, getAppSelection, - ManageAspectsAction + ManageAspectsAction, + NavigateRouteAction, + ExpandInfoDrawerAction } from '@alfresco/aca-shared/store'; import { ContentManagementService } from '../../services/content-management.service'; import { ViewUtilService } from '@alfresco/adf-core'; @@ -246,14 +248,37 @@ export class NodeEffects { ofType(NodeActionTypes.ManagePermissions), map((action) => { if (action && action.payload) { - this.contentService.managePermissions(action.payload); + const route = 'personal-files/details'; + this.store.dispatch(new NavigateRouteAction([route, action.payload.entry.id, 'permissions'])); } else { this.store .select(getAppSelection) .pipe(take(1)) .subscribe((selection) => { if (selection && !selection.isEmpty) { - this.contentService.managePermissions(selection.first); + const route = 'personal-files/details'; + this.store.dispatch(new NavigateRouteAction([route, selection.first.entry.id, 'permissions'])); + } + }); + } + }) + ); + + @Effect({ dispatch: false }) + expandInfoDrawer$ = this.actions$.pipe( + ofType(NodeActionTypes.ExpandInfoDrawer), + map((action) => { + if (action && action.payload) { + const route = 'personal-files/details'; + this.store.dispatch(new NavigateRouteAction([route, action.payload.entry.id])); + } else { + this.store + .select(getAppSelection) + .pipe(take(1)) + .subscribe((selection) => { + if (selection && !selection.isEmpty) { + const route = 'personal-files/details'; + this.store.dispatch(new NavigateRouteAction([route, selection.first.entry.id])); } }); } diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 6ccd6f359..37ff8a468 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -5,6 +5,7 @@ @import '../components/search/search-input/search-input.component.theme'; @import '../components/create-menu/create-menu.component.scss'; @import '../dialogs/node-template/create-from-template.dialog.scss'; +@import '../components/details/details.component.scss'; @import './overrides/adf-style-fixes.theme'; @@ -30,6 +31,7 @@ $primary: map-get($custom-theme, primary); @include aca-search-input-theme($theme); @include sidenav-component-theme($theme); @include app-create-from-template-theme($theme); + @include app-details-theme($theme); @include app-create-menu-theme($theme); @include adf-style-fixes($theme); diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json index 0573a6dac..b5f96cf7a 100644 --- a/src/assets/app.extensions.json +++ b/src/assets/app.extensions.json @@ -9,40 +9,74 @@ "$description": "Core application extensions and features", "$references": [], "$ignoreReferenceList": [], - "rules": [ { "id": "app.toolbar.favorite.canAdd", "type": "core.every", "parameters": [ - { "type": "rule", "value": "app.selection.canAddFavorite" }, - { "type": "rule", "value": "app.navigation.isNotRecentFiles" }, - { "type": "rule", "value": "app.navigation.isNotSharedFiles" }, - { "type": "rule", "value": "app.navigation.isNotSearchResults" }, - { "type": "rule", "value": "app.navigation.isNotFavorites" } + { + "type": "rule", + "value": "app.selection.canAddFavorite" + }, + { + "type": "rule", + "value": "app.navigation.isNotRecentFiles" + }, + { + "type": "rule", + "value": "app.navigation.isNotSharedFiles" + }, + { + "type": "rule", + "value": "app.navigation.isNotSearchResults" + }, + { + "type": "rule", + "value": "app.navigation.isNotFavorites" + } ] }, { "id": "app.toolbar.favorite.canRemove", "type": "core.every", "parameters": [ - { "type": "rule", "value": "app.selection.canRemoveFavorite" }, - { "type": "rule", "value": "app.navigation.isNotRecentFiles" }, - { "type": "rule", "value": "app.navigation.isNotSharedFiles" }, - { "type": "rule", "value": "app.navigation.isNotSearchResults" }, - { "type": "rule", "value": "app.navigation.isNotFavorites" } + { + "type": "rule", + "value": "app.selection.canRemoveFavorite" + }, + { + "type": "rule", + "value": "app.navigation.isNotRecentFiles" + }, + { + "type": "rule", + "value": "app.navigation.isNotSharedFiles" + }, + { + "type": "rule", + "value": "app.navigation.isNotSearchResults" + }, + { + "type": "rule", + "value": "app.navigation.isNotFavorites" + } ] }, { "id": "app.toolbar.favorite.canEditMetadata", "type": "core.every", "parameters": [ - { "type": "rule", "value": "app.selection.library" }, - { "type": "rule", "value": "isLibraryManager" } + { + "type": "rule", + "value": "app.selection.library" + }, + { + "type": "rule", + "value": "isLibraryManager" + } ] } ], - "features": { "header": [ { @@ -543,7 +577,7 @@ "id": "app.toolbar.permissions", "order": 1200, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -759,7 +793,7 @@ { "id": "app.context.menu.permissions", "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "order": 1500, "actions": { "click": "MANAGE_PERMISSIONS" @@ -1003,7 +1037,6 @@ "type": "separator", "order": 800 }, - { "id": "app.viewer.versions", "order": 900, @@ -1032,7 +1065,7 @@ "id": "app.viewer.permissions", "order": 1000, "title": "APP.ACTIONS.PERMISSIONS", - "icon": "settings_input_component", + "icon": "supervisor_account", "actions": { "click": "MANAGE_PERMISSIONS" }, @@ -1081,6 +1114,20 @@ ] }, "sidebar": { + "toolbar": [ + { + "id": "app.sidebar.expand", + "order": 100, + "title": "APP.INFO_DRAWER.TABS.EXPAND", + "icon": "chevron_left", + "actions": { + "click": "EXPAND_INFO_DRAWER" + }, + "rules": { + "visible": "app.navigation.isNotLibraries" + } + } + ], "tabs": [ { "id": "app.sidebar.properties", @@ -1141,10 +1188,8 @@ "dp:restrictable", "fm:commentsRollup", "qshare:shared", - "exif:exif", "cm:effectivity", - "cm:likesRatingSchemeRollups", "cm:lockable", "cm:ownable" diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 512268704..24ebd82ce 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -51,6 +51,9 @@ "PREVIEW": { "TITLE": "Preview" }, + "DETAILS": { + "TITLE": "Details" + }, "NEW_MENU": { "LABEL": "New", "TOOLTIP": "Add new files and folders, or create a new File Library", @@ -353,7 +356,9 @@ "PROPERTIES": "Properties", "LIBRARY_PROPERTIES": "About", "VERSIONS": "Versions", - "COMMENTS": "Comments" + "COMMENTS": "Comments", + "PERMISSIONS": "Permissions", + "EXPAND": "Expand" } } }, @@ -428,6 +433,12 @@ "GENERIC": "There was an error versioning the file" } }, + "INFO_PANEL": { + "TABS": { + + }, + "DETAILS": "Details" + }, "LIBRARY": { "DIALOG": { "CREATE_TITLE": "Create Library",