diff --git a/e2e/components/info-drawer/info-drawer.ts b/e2e/components/info-drawer/info-drawer.ts
index 957fcda0d..3c99c3d21 100755
--- a/e2e/components/info-drawer/info-drawer.ts
+++ b/e2e/components/info-drawer/info-drawer.ts
@@ -88,7 +88,7 @@ export class InfoDrawer extends Component {
await this.getTabByTitle(title).click();
}
- async getComponentIdOfTab(title: string) {
+ async getComponentIdOfTab() {
return await this.tabActiveContent.getAttribute('data-automation-id');
}
}
diff --git a/e2e/components/metadata-card/metadata-card.ts b/e2e/components/metadata-card/metadata-card.ts
new file mode 100644
index 000000000..7c6289578
--- /dev/null
+++ b/e2e/components/metadata-card/metadata-card.ts
@@ -0,0 +1,66 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2018 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 { ElementFinder, by, browser, ExpectedConditions as EC, ElementArrayFinder } from 'protractor';
+import { Component } from '../component';
+import { BROWSER_WAIT_TIMEOUT } from '../../configs';
+
+export class MetadataCard extends Component {
+ private static selectors = {
+ root: 'adf-content-metadata-card',
+ footer: '.adf-content-metadata-card-footer',
+ expandButton: '[data-automation-id="meta-data-card-toggle-expand"]',
+ expansionPanel: '.adf-metadata-grouped-properties-container mat-expansion-panel'
+ };
+
+ footer: ElementFinder = this.component.element(by.css(MetadataCard.selectors.footer));
+ expandButton: ElementFinder = this.component.element(by.css(MetadataCard.selectors.expandButton));
+ expansionPanels: ElementArrayFinder = this.component.all(by.css(MetadataCard.selectors.expansionPanel));
+
+ constructor(ancestor?: ElementFinder) {
+ super(MetadataCard.selectors.root, ancestor);
+ }
+
+ async isExpandPresent() {
+ return await this.expandButton.isPresent();
+ }
+
+ async clickExpandButton() {
+ await this.expandButton.click();
+ }
+
+ async waitForFirstExpansionPanel() {
+ return await browser.wait(EC.presenceOf(this.expansionPanels.get(0)), BROWSER_WAIT_TIMEOUT);
+ }
+
+ async isExpansionPanelPresent(index) {
+ return await this.expansionPanels.get(index).isPresent();
+ }
+
+ async getComponentIdOfPanel(index) {
+ return await this.expansionPanels.get(index).getAttribute('data-automation-id');
+ }
+}
+
diff --git a/e2e/configs.ts b/e2e/configs.ts
index 1d39d6f77..73db16569 100755
--- a/e2e/configs.ts
+++ b/e2e/configs.ts
@@ -97,5 +97,6 @@ export const EXTENSIBILITY_CONFIGS = {
INFO_DRAWER: 'info-drawer-ext.json',
INFO_DRAWER_EMPTY: 'info-drawer-no-tabs-ext.json',
VIEWER: 'viewer-ext.json',
- HEADER: 'header-ext.json'
+ HEADER: 'header-ext.json',
+ METADATA_PRESETS: 'metadata-ext.json'
};
diff --git a/e2e/pages/login-page.ts b/e2e/pages/login-page.ts
index 6d1650bd4..26d631776 100755
--- a/e2e/pages/login-page.ts
+++ b/e2e/pages/login-page.ts
@@ -25,7 +25,6 @@
import { browser, ExpectedConditions as EC } from 'protractor';
import { LoginComponent } from '../components/components';
import { Page } from './page';
-import { Utils } from '../utilities/utils';
import { ADMIN_USERNAME, ADMIN_PASSWORD, BROWSER_WAIT_TIMEOUT, APP_ROUTES } from '../configs';
diff --git a/e2e/resources/extensibility-configs/metadata-ext.json b/e2e/resources/extensibility-configs/metadata-ext.json
new file mode 100644
index 000000000..01273636f
--- /dev/null
+++ b/e2e/resources/extensibility-configs/metadata-ext.json
@@ -0,0 +1,920 @@
+{
+ "$schema": "../../extension.schema.json",
+ "$name": "app",
+ "$version": "1.0.0",
+ "$references": [
+ "plugin1.json",
+ "dev.tools.json",
+ "app.header.json",
+ "app.create.json"
+ ],
+
+ "rules": [
+ {
+ "id": "app.toolbar.favorite.canToggle",
+ "comment": "workaround for recent files and search api issue",
+ "type": "core.every",
+ "parameters": [
+ {
+ "type": "rule",
+ "value": "core.some",
+ "parameters": [
+ {
+ "type": "rule",
+ "value": "app.selection.canAddFavorite"
+ },
+ {
+ "type": "rule",
+ "value": "app.selection.canRemoveFavorite"
+ }
+ ]
+ },
+ {
+ "type": "rule",
+ "value": "core.some",
+ "parameters": [
+ {
+ "type": "rule",
+ "value": "app.navigation.isRecentFiles"
+ },
+ {
+ "type": "rule",
+ "value": "app.navigation.isSharedFiles"
+ },
+ {
+ "type": "rule",
+ "value": "app.navigation.isSearchResults"
+ },
+ {
+ "type": "rule",
+ "value": "app.navigation.isFavorites"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "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" }
+ ]
+ },
+ {
+ "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" }
+ ]
+ },
+ {
+ "id": "app.toolbar.info",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.notEmpty" },
+ { "type": "rule", "value": "app.navigation.isNotLibraries" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" }
+ ]
+ },
+ {
+ "id": "app.toolbar.canCopyNode",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.notEmpty" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" },
+ { "type": "rule", "value": "app.navigation.isNotLibraries" }
+ ]
+ },
+ {
+ "id": "app.toolbar.permissions",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.first.canUpdate" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" }
+ ]
+ },
+ {
+ "id": "app.toolbar.versions",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.file" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" }
+ ]
+ },
+ {
+ "id": "app.trashcan.hasSelection",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.notEmpty" },
+ { "type": "rule", "value": "app.navigation.isTrashcan" }
+ ]
+ },
+ {
+ "id": "app.toolbar.canEditFolder",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.folder" },
+ { "type": "rule", "value": "app.selection.folder.canUpdate" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" }
+ ]
+ },
+ {
+ "id": "app.toolbar.canViewFile",
+ "type": "core.every",
+ "parameters": [
+ {
+ "type": "rule",
+ "value": "app.selection.file"
+ },
+ {
+ "type": "rule",
+ "value": "core.not",
+ "parameters": [
+ { "type": "rule", "value": "app.navigation.isTrashcan" }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "app.toolbar.canDownload",
+ "type": "core.every",
+ "parameters": [
+ { "type": "rule", "value": "app.selection.canDownload" },
+ { "type": "rule", "value": "app.navigation.isNotTrashcan" }
+ ]
+ }
+ ],
+
+ "features": {
+ "create": [
+ {
+ "id": "app.create.uploadFile",
+ "order": 100,
+ "icon": "file_upload",
+ "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FILE",
+ "description": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FILES",
+ "description-disabled": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FILES_NOT_ALLOWED",
+ "actions": {
+ "click": "UPLOAD_FILES"
+ },
+ "rules": {
+ "enabled": "app.navigation.folder.canUpload"
+ }
+ },
+ {
+ "id": "app.create.uploadFolder",
+ "order": 200,
+ "icon": "file_upload",
+ "title": "APP.NEW_MENU.MENU_ITEMS.UPLOAD_FOLDER",
+ "description": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS",
+ "description-disabled": "APP.NEW_MENU.TOOLTIPS.UPLOAD_FOLDERS_NOT_ALLOWED",
+ "actions": {
+ "click": "UPLOAD_FOLDER"
+ },
+ "rules": {
+ "enabled": "app.navigation.folder.canUpload"
+ }
+ },
+ {
+ "id": "app.create.separator.1",
+ "type": "separator",
+ "order": 300
+ },
+ {
+ "id": "app.create.folder",
+ "order": 400,
+ "icon": "create_new_folder",
+ "title": "APP.NEW_MENU.MENU_ITEMS.CREATE_FOLDER",
+ "description": "APP.NEW_MENU.TOOLTIPS.CREATE_FOLDER",
+ "description-disabled": "APP.NEW_MENU.TOOLTIPS.CREATE_FOLDER_NOT_ALLOWED",
+ "actions": {
+ "click": "CREATE_FOLDER"
+ },
+ "rules": {
+ "enabled": "app.navigation.folder.canCreate"
+ }
+ },
+ {
+ "id": "app.create.library",
+ "order": 600,
+ "title": "APP.NEW_MENU.MENU_ITEMS.CREATE_LIBRARY",
+ "description": "APP.NEW_MENU.TOOLTIPS.CREATE_LIBRARY",
+ "icon": "create_new_folder",
+ "actions": {
+ "click": "CREATE_LIBRARY"
+ }
+ }
+ ],
+ "navbar": [
+ {
+ "id": "app.navbar.primary",
+ "items": [
+ {
+ "id": "app.navbar.personalFiles",
+ "order": 100,
+ "icon": "folder",
+ "title": "APP.BROWSE.PERSONAL.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.PERSONAL.SIDENAV_LINK.TOOLTIP",
+ "route": "personal-files"
+ },
+ {
+ "id": "app.navbar.libraries",
+ "order": 200,
+ "icon": "group_work",
+ "title": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.LIBRARIES.SIDENAV_LINK.TOOLTIP",
+ "route": "libraries"
+ }
+ ]
+ },
+ {
+ "id": "app.navbar.secondary",
+ "items": [
+ {
+ "id": "app.navbar.shared",
+ "order": 100,
+ "icon": "people",
+ "title": "APP.BROWSE.SHARED.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.SHARED.SIDENAV_LINK.TOOLTIP",
+ "route": "shared",
+ "rules": {
+ "visible": "repository.isQuickShareEnabled"
+ }
+ },
+ {
+ "id": "app.navbar.recentFiles",
+ "order": 200,
+ "icon": "schedule",
+ "title": "APP.BROWSE.RECENT.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.RECENT.SIDENAV_LINK.TOOLTIP",
+ "route": "recent-files"
+ },
+ {
+ "id": "app.navbar.favorites",
+ "order": 300,
+ "icon": "star",
+ "title": "APP.BROWSE.FAVORITES.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.FAVORITES.SIDENAV_LINK.TOOLTIP",
+ "route": "favorites"
+ },
+ {
+ "id": "app.navbar.trashcan",
+ "order": 400,
+ "icon": "delete",
+ "title": "APP.BROWSE.TRASHCAN.SIDENAV_LINK.LABEL",
+ "description": "APP.BROWSE.TRASHCAN.SIDENAV_LINK.TOOLTIP",
+ "route": "trashcan"
+ }
+ ]
+ }
+ ],
+ "toolbar": [
+ {
+ "id": "app.toolbar.preview",
+ "order": 100,
+ "title": "APP.ACTIONS.VIEW",
+ "icon": "open_in_browser",
+ "actions": {
+ "click": "VIEW_FILE"
+ },
+ "rules": {
+ "visible": "app.toolbar.canViewFile"
+ }
+ },
+ {
+ "id": "app.toolbar.download",
+ "order": 200,
+ "title": "APP.ACTIONS.DOWNLOAD",
+ "icon": "get_app",
+ "actions": {
+ "click": "DOWNLOAD_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canDownload"
+ }
+ },
+ {
+ "id": "app.toolbar.editFolder",
+ "order": 300,
+ "title": "APP.ACTIONS.EDIT",
+ "icon": "create",
+ "actions": {
+ "click": "EDIT_FOLDER"
+ },
+ "rules": {
+ "visible": "app.toolbar.canEditFolder"
+ }
+ },
+ {
+ "id": "app.toolbar.purgeDeletedNodes",
+ "order": 400,
+ "title": "APP.ACTIONS.DELETE_PERMANENT",
+ "icon": "delete_forever",
+ "actions": {
+ "click": "PURGE_DELETED_NODES"
+ },
+ "rules": {
+ "visible": "app.trashcan.hasSelection"
+ }
+ },
+ {
+ "id": "app.toolbar.restoreDeletedNodes",
+ "order": 500,
+ "title": "APP.ACTIONS.RESTORE",
+ "icon": "restore",
+ "actions": {
+ "click": "RESTORE_DELETED_NODES"
+ },
+ "rules": {
+ "visible": "app.trashcan.hasSelection"
+ }
+ },
+ {
+ "id": "app.toolbar.info",
+ "type": "custom",
+ "order": 700,
+ "component": "app.toolbar.toggleInfoDrawer",
+ "rules": {
+ "visible": "app.toolbar.info"
+ }
+ },
+ {
+ "id": "app.toolbar.more",
+ "type": "menu",
+ "order": 10000,
+ "icon": "more_vert",
+ "title": "APP.ACTIONS.MORE",
+ "children": [
+ {
+ "id": "app.toolbar.favorite",
+ "comment": "workaround for Recent Files and Search API issue",
+ "type": "custom",
+ "order": 100,
+ "component": "app.toolbar.toggleFavorite",
+ "rules": {
+ "visible": "app.toolbar.favorite.canToggle"
+ }
+ },
+ {
+ "id": "app.toolbar.favorite.add",
+ "order": 200,
+ "title": "APP.ACTIONS.FAVORITE",
+ "icon": "star_border",
+ "actions": {
+ "click": "ADD_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canAdd"
+ }
+ },
+ {
+ "id": "app.toolbar.favorite.remove",
+ "order": 300,
+ "title": "APP.ACTIONS.FAVORITE",
+ "icon": "star",
+ "actions": {
+ "click": "REMOVE_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canRemove"
+ }
+ },
+ {
+ "id": "app.toolbar.copy",
+ "order": 400,
+ "title": "APP.ACTIONS.COPY",
+ "icon": "content_copy",
+ "actions": {
+ "click": "COPY_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canCopyNode"
+ }
+ },
+ {
+ "id": "app.toolbar.move",
+ "order": 500,
+ "title": "APP.ACTIONS.MOVE",
+ "icon": "library_books",
+ "actions": {
+ "click": "MOVE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.toolbar.share",
+ "order": 600,
+ "title": "APP.ACTIONS.SHARE",
+ "icon": "share",
+ "actions": {
+ "click": "SHARE_NODE"
+ },
+ "rules": {
+ "visible": "app.selection.file.canShare"
+ }
+ },
+ {
+ "id": "app.toolbar.unshare",
+ "order": 700,
+ "title": "APP.ACTIONS.UNSHARE",
+ "icon": "stop_screen_share",
+ "actions": {
+ "click": "UNSHARE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canUnshare"
+ }
+ },
+ {
+ "id": "app.toolbar.delete",
+ "order": 800,
+ "title": "APP.ACTIONS.DELETE",
+ "icon": "delete",
+ "actions": {
+ "click": "DELETE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.toolbar.deleteLibrary",
+ "order": 900,
+ "title": "APP.ACTIONS.DELETE",
+ "icon": "delete",
+ "actions": {
+ "click": "DELETE_LIBRARY"
+ },
+ "rules": {
+ "visible": "app.selection.library"
+ }
+ },
+ {
+ "id": "app.toolbar.versions",
+ "order": 1000,
+ "title": "APP.ACTIONS.VERSIONS",
+ "icon": "history",
+ "actions": {
+ "click": "MANAGE_VERSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.versions"
+ }
+ },
+ {
+ "id": "app.toolbar.permissions",
+ "order": 1100,
+ "title": "APP.ACTIONS.PERMISSIONS",
+ "icon": "settings_input_component",
+ "actions": {
+ "click": "MANAGE_PERMISSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.permissions"
+ }
+ }
+ ]
+ }
+ ],
+ "contextMenu": [
+ {
+ "id": "app.context.menu.download",
+ "order": 100,
+ "title": "APP.ACTIONS.DOWNLOAD",
+ "icon": "get_app",
+ "actions": {
+ "click": "DOWNLOAD_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canDownload"
+ }
+ },
+ {
+ "id": "app.context.menu.preview",
+ "order": 200,
+ "title": "APP.ACTIONS.VIEW",
+ "icon": "open_in_browser",
+ "actions": {
+ "click": "VIEW_FILE"
+ },
+ "rules": {
+ "visible": "app.toolbar.canViewFile"
+ }
+ },
+ {
+ "id": "app.context.menu.editFolder",
+ "order": 300,
+ "title": "APP.ACTIONS.EDIT",
+ "icon": "create",
+ "actions": {
+ "click": "EDIT_FOLDER"
+ },
+ "rules": {
+ "visible": "app.toolbar.canEditFolder"
+ }
+ },
+ {
+ "id": "app.context.menu.share",
+ "title": "APP.ACTIONS.SHARE",
+ "order": 400,
+ "icon": "share",
+ "actions": {
+ "click": "SHARE_NODE"
+ },
+ "rules": {
+ "visible": "app.selection.file.canShare"
+ }
+ },
+ {
+ "id": "app.context.menu.favorite.add",
+ "title": "APP.ACTIONS.FAVORITE",
+ "order": 500,
+ "icon": "star_border",
+ "actions": {
+ "click": "ADD_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canAdd"
+ }
+ },
+ {
+ "id": "app.context.menu.favorite.remove",
+ "title": "APP.ACTIONS.FAVORITE",
+ "order": 600,
+ "icon": "star",
+ "actions": {
+ "click": "REMOVE_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canRemove"
+ }
+ },
+ {
+ "id": "app.context.menu.favorite",
+ "comment": "workaround for Recent Files and Search API issue",
+ "type": "custom",
+ "order": 501,
+ "component": "app.toolbar.toggleFavorite",
+ "rules": {
+ "visible": "app.toolbar.favorite.canToggle"
+ }
+ },
+ {
+ "id": "app.context.menu.copy",
+ "title": "APP.ACTIONS.COPY",
+ "order": 700,
+ "icon": "content_copy",
+ "actions": {
+ "click": "COPY_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canCopyNode"
+ }
+ },
+ {
+ "id": "app.context.menu.move",
+ "title": "APP.ACTIONS.MOVE",
+ "order": 800,
+ "icon": "library_books",
+ "actions": {
+ "click": "MOVE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.context.menu.delete",
+ "title": "APP.ACTIONS.DELETE",
+ "order": 900,
+ "icon": "delete",
+ "actions": {
+ "click": "DELETE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.context.menu.versions",
+ "title": "APP.ACTIONS.VERSIONS",
+ "order": 1000,
+ "icon": "history",
+ "actions": {
+ "click": "MANAGE_VERSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.versions"
+ }
+ },
+ {
+ "id": "app.context.menu.permissions",
+ "title": "APP.ACTIONS.PERMISSIONS",
+ "icon": "settings_input_component",
+ "order": 1100,
+ "actions": {
+ "click": "MANAGE_PERMISSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.permissions"
+ }
+ },
+ {
+ "id": "app.context.menu.purgeDeletedNodes",
+ "order": 1200,
+ "title": "APP.ACTIONS.DELETE_PERMANENT",
+ "icon": "delete_forever",
+ "actions": {
+ "click": "PURGE_DELETED_NODES"
+ },
+ "rules": {
+ "visible": "app.trashcan.hasSelection"
+ }
+ },
+ {
+ "id": "app.context.menu.restoreDeletedNodes",
+ "order": 1300,
+ "title": "APP.ACTIONS.RESTORE",
+ "icon": "restore",
+ "actions": {
+ "click": "RESTORE_DELETED_NODES"
+ },
+ "rules": {
+ "visible": "app.trashcan.hasSelection"
+ }
+ }
+ ],
+ "viewer": {
+ "toolbarActions": [
+ {
+ "id": "app.toolbar.download",
+ "order": 100,
+ "title": "APP.ACTIONS.DOWNLOAD",
+ "icon": "get_app",
+ "actions": {
+ "click": "DOWNLOAD_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canDownload"
+ }
+ },
+ {
+ "id": "app.viewer.print",
+ "order": 200,
+ "title": "APP.ACTIONS.PRINT",
+ "icon": "print",
+ "actions": {
+ "click": "PRINT_FILE"
+ },
+ "rules": {
+ "visible": "app.toolbar.canViewFile"
+ }
+ },
+ {
+ "id": "app.viewer.share",
+ "order": 300,
+ "title": "APP.ACTIONS.SHARE",
+ "icon": "share",
+ "actions": {
+ "click": "SHARE_NODE"
+ },
+ "rules": {
+ "visible": "app.selection.file.canShare"
+ }
+ },
+ {
+ "id": "app.viewer.fullscreen",
+ "order": 400,
+ "title": "APP.ACTIONS.FULLSCREEN",
+ "icon": "fullscreen",
+ "actions": {
+ "click": "FULLSCREEN_VIEWER"
+ },
+ "rules": {
+ "visible": "app.toolbar.canViewFile"
+ }
+ }
+ ],
+ "toolbarMoreMenu": [
+ {
+ "id": "app.viewer.favorite.add",
+ "order": 100,
+ "title": "APP.ACTIONS.FAVORITE",
+ "icon": "star_border",
+ "actions": {
+ "click": "ADD_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canAdd"
+ }
+ },
+ {
+ "id": "app.viewer.favorite.remove",
+ "order": 200,
+ "title": "APP.ACTIONS.FAVORITE",
+ "icon": "star",
+ "actions": {
+ "click": "REMOVE_FAVORITE"
+ },
+ "rules": {
+ "visible": "app.toolbar.favorite.canRemove"
+ }
+ },
+ {
+ "id": "app.viewer.favorite",
+ "comment": "workaround for Recent Files and Search API issue",
+ "type": "custom",
+ "order": 101,
+ "component": "app.toolbar.toggleFavorite",
+ "rules": {
+ "visible": "app.toolbar.favorite.canToggle"
+ }
+ },
+ {
+ "id": "app.viewer.share",
+ "order": 300,
+ "title": "APP.ACTIONS.SHARE",
+ "icon": "share",
+ "actions": {
+ "click": "SHARE_NODE"
+ },
+ "rules": {
+ "visible": "app.selection.file.canShare"
+ }
+ },
+ {
+ "id": "app.viewer.copy",
+ "order": 400,
+ "title": "APP.ACTIONS.COPY",
+ "icon": "content_copy",
+ "actions": {
+ "click": "COPY_NODES"
+ },
+ "rules": {
+ "visible": "app.toolbar.canCopyNode"
+ }
+ },
+ {
+ "id": "app.viewer.move",
+ "order": 500,
+ "title": "APP.ACTIONS.MOVE",
+ "icon": "library_books",
+ "actions": {
+ "click": "MOVE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.viewer.delete",
+ "order": 600,
+ "title": "APP.ACTIONS.DELETE",
+ "icon": "delete",
+ "actions": {
+ "click": "DELETE_NODES"
+ },
+ "rules": {
+ "visible": "app.selection.canDelete"
+ }
+ },
+ {
+ "id": "app.viewer.versions",
+ "order": 700,
+ "title": "APP.ACTIONS.VERSIONS",
+ "icon": "history",
+ "actions": {
+ "click": "MANAGE_VERSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.versions"
+ }
+ },
+ {
+ "id": "app.viewer.permissions",
+ "order": 800,
+ "title": "APP.ACTIONS.PERMISSIONS",
+ "icon": "settings_input_component",
+ "actions": {
+ "click": "MANAGE_PERMISSIONS"
+ },
+ "rules": {
+ "visible": "app.toolbar.permissions"
+ }
+ }
+ ],
+ "content": [
+ {
+ "id": "app.viewer.pdf",
+ "disabled": true,
+ "fileExtension": "pdf",
+ "component": "app.components.tabs.metadata"
+ },
+ {
+ "id": "app.viewer.docx",
+ "disabled": true,
+ "fileExtension": "docx",
+ "component": "app.components.tabs.comments"
+ }
+ ]
+ },
+ "sidebar": [
+ {
+ "id": "app.sidebar.properties",
+ "order": 100,
+ "title": "APP.INFO_DRAWER.TABS.PROPERTIES",
+ "component": "app.components.tabs.metadata"
+ },
+ {
+ "id": "app.sidebar.comments",
+ "order": 200,
+ "title": "APP.INFO_DRAWER.TABS.COMMENTS",
+ "component": "app.components.tabs.comments"
+ },
+ {
+ "id": "app.sidebar.versions",
+ "order": 300,
+ "disabled": true,
+ "title": "APP.INFO_DRAWER.TABS.VERSIONS",
+ "component": "app.components.tabs.versions"
+ }
+ ],
+ "content-metadata-presets": [
+ {
+ "id": "app.content.metadata.custom",
+ "custom": [
+ {
+ "id": "a.testGroup",
+ "title": "A Test Group of Properties",
+ "items": [
+ {
+ "id": "app.content.metadata.exifAspect",
+ "aspect": "exif:exif",
+ "properties": [
+ "exif:pixelXDimension",
+ "exif:pixelYDimension",
+ "exif:dateTimeOriginal",
+ "exif:exposureTime",
+ "exif:fNumber",
+ "exif:flash",
+ "exif:focalLength",
+ "exif:isoSpeedRatings",
+ "exif:orientation",
+ "exif:manufacturer",
+ "exif:model",
+ "exif:software"
+ ]
+ }
+ ]
+ },
+ {
+ "id": "another.testGroup",
+ "title": "Another Test Group of Properties",
+ "disabled": false,
+ "items": [
+ {
+ "id": "testAspects",
+ "aspect": "exif:exif",
+ "properties": [
+ "exif:pixelXDimension",
+ "exif:pixelYDimension"
+ ]
+ }
+ ]
+ },
+ {
+ "id": "disabled.testGroup",
+ "title": "Hidden Group of Properties",
+ "disabled": true,
+ "items": [
+ {
+ "id": "testAspects",
+ "aspect": "exif:exif",
+ "properties": [
+ "exif:pixelXDimension",
+ "exif:pixelYDimension"
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/e2e/suites/actions/delete-undo-delete.test.ts b/e2e/suites/actions/delete-undo-delete.test.ts
index 4a7aa5a56..451fc85f6 100755
--- a/e2e/suites/actions/delete-undo-delete.test.ts
+++ b/e2e/suites/actions/delete-undo-delete.test.ts
@@ -23,9 +23,9 @@
* along with Alfresco. If not, see .
*/
-import { browser, ExpectedConditions as EC } from 'protractor';
+import { browser } from 'protractor';
import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
-import { BROWSER_WAIT_TIMEOUT, SIDEBAR_LABELS } from '../../configs';
+import { SIDEBAR_LABELS } from '../../configs';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { Utils } from '../../utilities/utils';
diff --git a/e2e/suites/extensions/ext-header.test.ts b/e2e/suites/extensions/ext-header.test.ts
index 625809ba0..0b21edfc9 100755
--- a/e2e/suites/extensions/ext-header.test.ts
+++ b/e2e/suites/extensions/ext-header.test.ts
@@ -23,7 +23,7 @@
* along with Alfresco. If not, see .
*/
-import { LoginPage, LogoutPage, BrowsingPage } from '../../pages/pages';
+import { LoginPage, LogoutPage } from '../../pages/pages';
import { RepoClient } from '../../utilities/repo-client/repo-client';
import { EXTENSIBILITY_CONFIGS } from '../../configs';
import { Utils } from '../../utilities/utils';
@@ -57,7 +57,6 @@ describe('Extensions - Info Drawer', () => {
const loginPage = new LoginPage();
const logoutPage = new LogoutPage();
- const page = new BrowsingPage();
beforeAll(async (done) => {
await apis.admin.people.createUser({ username });
diff --git a/e2e/suites/extensions/ext-info-drawer.test.ts b/e2e/suites/extensions/ext-info-drawer.test.ts
index e72a9de97..8e0322de4 100755
--- a/e2e/suites/extensions/ext-info-drawer.test.ts
+++ b/e2e/suites/extensions/ext-info-drawer.test.ts
@@ -142,7 +142,7 @@ describe('Extensions - Info Drawer', () => {
expect(await infoDrawer.isTabDisplayed(custom_tab.title)).toBe(true, `${custom_tab.title} tab is not displayed`);
await infoDrawer.clickTab(custom_tab.title);
- expect(await infoDrawer.getComponentIdOfTab(custom_tab.title)).toEqual(custom_tab.component);
+ expect(await infoDrawer.getComponentIdOfTab()).toEqual(custom_tab.component);
});
});
diff --git a/e2e/suites/extensions/ext-metadata.test.ts b/e2e/suites/extensions/ext-metadata.test.ts
new file mode 100644
index 000000000..33e46f715
--- /dev/null
+++ b/e2e/suites/extensions/ext-metadata.test.ts
@@ -0,0 +1,115 @@
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2018 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 { BrowsingPage, LoginPage, LogoutPage } from '../../pages/pages';
+import { RepoClient } from '../../utilities/repo-client/repo-client';
+import { EXTENSIBILITY_CONFIGS } from '../../configs';
+import { Utils } from '../../utilities/utils';
+import { InfoDrawer } from '../../components/info-drawer/info-drawer';
+import { MetadataCard } from '../../components/metadata-card/metadata-card';
+
+describe('Extensions - Metadata presets', () => {
+ const username = `user-${Utils.random()}`;
+
+ const file = `file-${Utils.random()}.png`;
+
+ let fileId;
+
+ const properties_tab = {
+ title: 'Properties',
+ component: 'app.components.tabs.metadata'
+ };
+
+ const customGroup1 = {
+ id: 'a.testGroup',
+ title: 'A Test Group of Properties'
+ };
+
+ const customGroup2 = {
+ id: 'another.testGroup',
+ title: 'Another Test Group of Properties'
+ };
+
+ const disabledGroup = {
+ id: 'disabled.testGroup',
+ title: 'Hidden Group of Properties'
+ };
+
+ const apis = {
+ admin: new RepoClient(),
+ user: new RepoClient(username, username)
+ };
+
+ const infoDrawer = new InfoDrawer();
+ const metadataCard = new MetadataCard();
+
+ const loginPage = new LoginPage();
+ const logoutPage = new LogoutPage();
+ const page = new BrowsingPage();
+
+ beforeAll(async done => {
+ await apis.admin.people.createUser({ username });
+ fileId = (await apis.user.nodes.createImage(file)).entry.id;
+
+ await loginPage.load();
+ await Utils.setSessionStorageFromConfig('"aca.extension.config"', EXTENSIBILITY_CONFIGS.METADATA_PRESETS);
+ await loginPage.loginWith(username);
+
+ done();
+ });
+
+ beforeEach(async done => {
+ await page.refresh();
+
+ await page.dataTable.selectItem(file);
+ await page.toolbar.getButtonByTitleAttribute('View details').click();
+ await infoDrawer.waitForInfoDrawerToOpen();
+
+ await infoDrawer.clickTab(properties_tab.title);
+ await metadataCard.clickExpandButton();
+ await metadataCard.waitForFirstExpansionPanel();
+
+ done();
+ });
+
+ afterAll(async done => {
+ await apis.user.nodes.deleteNodeById(fileId);
+ await logoutPage.load();
+ done();
+ });
+
+ it('Set groups of properties to display - []', async () => {
+ expect(await metadataCard.isExpansionPanelPresent(0)).toBe(true, `expansion panel is not present`);
+ expect(await metadataCard.getComponentIdOfPanel(0)).toEqual(`adf-metadata-group-${customGroup1.title}`);
+ expect(await metadataCard.isExpansionPanelPresent(1)).toBe(true, `expansion panel is not present`);
+ expect(await metadataCard.getComponentIdOfPanel(1)).toEqual(`adf-metadata-group-${customGroup2.title}`);
+ });
+
+ it('Disabled group is not displayed - []', async () => {
+ expect(await metadataCard.isExpansionPanelPresent(2)).toBe(false, `disabled group is displayed`);
+ expect(await metadataCard.getComponentIdOfPanel(1)).not.toEqual(`adf-metadata-group-${disabledGroup.title}`);
+ expect(await metadataCard.getComponentIdOfPanel(0)).not.toEqual(`adf-metadata-group-${disabledGroup.title}`);
+ });
+});
diff --git a/e2e/utilities/repo-client/apis/nodes/nodes-api.ts b/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
index e210179e6..000a25a23 100755
--- a/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
+++ b/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
@@ -91,7 +91,15 @@ export class NodesApi extends RepoApi {
return await this.deleteNodesById(nodeIds);
}
- async createNode(nodeType: string, name: string, parentId: string = '-my-', title: string = '', description: string = '') {
+ async createImageNode(nodeType: string, name: string, parentId: string = '-my-', title: string = '', description: string = '') {
+ const imageProps = {
+ 'exif:pixelXDimension': 1000,
+ 'exif:pixelYDimension': 1200
+ };
+ return await this.createNode('cm:content', name, parentId, title, description, imageProps);
+ }
+
+ async createNode(nodeType: string, name: string, parentId: string = '-my-', title: string = '', description: string = '', imageProps: any = null) {
const nodeBody = {
name,
nodeType,
@@ -100,6 +108,9 @@ export class NodesApi extends RepoApi {
'cm:description': description
}
};
+ if (imageProps) {
+ nodeBody.properties = Object.assign(nodeBody.properties, imageProps);
+ }
await this.apiAuth();
return await this.alfrescoJsApi.core.nodesApi.addNode(parentId, nodeBody);
@@ -109,6 +120,10 @@ export class NodesApi extends RepoApi {
return await this.createNode('cm:content', name, parentId, title, description);
}
+ async createImage(name: string, parentId: string = '-my-', title: string = '', description: string = '') {
+ return await this.createImageNode('cm:content', name, parentId, title, description);
+ }
+
async createFolder(name: string, parentId: string = '-my-', title: string = '', description: string = '') {
return await this.createNode('cm:folder', name, parentId, title, description);
}
diff --git a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
index 19584211b..d0b46c012 100644
--- a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
+++ b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.ts
@@ -26,6 +26,8 @@
import { Component, Input, ViewEncapsulation } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { NodePermissionService } from '../../../services/node-permission.service';
+import { AppExtensionService } from '../../../extensions/extension.service';
+import { AppConfigService } from '@alfresco/adf-core';
@Component({
selector: 'app-metadata-tab',
@@ -44,7 +46,22 @@ export class MetadataTabComponent {
@Input()
node: MinimalNodeEntryEntity;
- constructor(private permission: NodePermissionService) {}
+ constructor(
+ private permission: NodePermissionService,
+ protected extensions: AppExtensionService,
+ private appConfig: AppConfigService
+ ) {
+ try {
+ this.appConfig.config[
+ 'content-metadata'
+ ] = this.extensions.contentMetadata;
+ } catch (error) {
+ console.error(
+ error,
+ '- could not change content-metadata from app.config'
+ );
+ }
+ }
get canUpdateNode() {
return this.node && this.permission.check(this.node, ['update']);
diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts
index 014a08553..f8b4f6f2d 100644
--- a/src/app/extensions/extension.service.ts
+++ b/src/app/extensions/extension.service.ts
@@ -221,10 +221,13 @@ export class AppExtensionService implements RuleContext {
try {
this.appConfig.config['content-metadata'] = { presets };
} catch (error) {
- console.error(error);
+ console.error(
+ error,
+ '- could not change content-metadata from app.config -'
+ );
}
- return presets;
+ return { presets };
}
filterDisabled(object) {