diff --git a/e2e/suites/info-drawer/file-folder-properties.test.ts b/e2e/suites/info-drawer/file-folder-properties.test.ts index 544a9afe3..51c715b08 100755 --- a/e2e/suites/info-drawer/file-folder-properties.test.ts +++ b/e2e/suites/info-drawer/file-folder-properties.test.ts @@ -48,7 +48,8 @@ describe('File / Folder properties', () => { name: `file1-${Utils.random()}.txt`, title: 'file title', description: 'file description', - author: 'file author' + author: 'file author', + contentType: 'Content' }; let file1Id: string; @@ -64,7 +65,8 @@ describe('File / Folder properties', () => { name: `folder1-${Utils.random()}`, title: 'folder title', description: 'folder description', - author: 'folder author' + author: 'folder author', + contentType: 'Folder' }; let folder1Id: string; @@ -127,7 +129,8 @@ describe('File / Folder properties', () => { 'Modified Date', 'Mimetype', 'Author', - 'Description' + 'Description', + 'Content Type' ]; const expectedPropValues = [ file1.name, @@ -139,7 +142,8 @@ describe('File / Folder properties', () => { moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), apiProps.entry.content.mimeTypeName, file1.author, - file1.description + file1.description, + file1.contentType ]; await dataTable.selectItem(file1.name); @@ -155,7 +159,7 @@ describe('File / Folder properties', () => { it('[C307106] Folder properties', async () => { const apiProps = await apis.user.nodes.getNodeById(folder1Id); - const expectedPropLabels = ['Name', 'Title', 'Creator', 'Created Date', 'Modifier', 'Modified Date', 'Author', 'Description']; + const expectedPropLabels = ['Name', 'Title', 'Creator', 'Created Date', 'Modifier', 'Modified Date', 'Author', 'Description', 'Content Type']; const expectedPropValues = [ folder1.name, folder1.title, @@ -164,7 +168,8 @@ describe('File / Folder properties', () => { apiProps.entry.modifiedByUser.displayName, moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), folder1.author, - folder1.description + folder1.description, + folder1.contentType ]; await dataTable.selectItem(folder1.name); diff --git a/package-lock.json b/package-lock.json index c3506480d..f06383d63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz", - "integrity": "sha512-eULIVGauVs7mDE/1fpqgzWrFTsopHNwztvxN6w1OYkF8ecCt6QiDPOPZHFR7tvr4gb5Prf+etw4TPQP9xlQbkQ==", + "version": "4.3.0-31380", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-31380.tgz", + "integrity": "sha512-Vc3BD/QnTib5ecRfECZWWVQegMJhXXlvZV2u3pugF3Uv8qY6+6V4lradbmrGAWNJh7yT3d0b2i99q/X0d7Jslw==", "dev": true, "requires": { - "@alfresco/js-api": "4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779", + "@alfresco/js-api": "^4.3.0-3207", "commander": "^4.0.0", "ejs": "^2.6.1", "license-checker": "^25.0.1", @@ -22,9 +22,9 @@ }, "dependencies": { "@alfresco/js-api": { - "version": "4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779.tgz", - "integrity": "sha512-8ZTFW3VNmbd4TG5Anm/IvoLI/ps97hJkXcna55bP05kCcHNrigpxksnrOiW+faNZANAdmjfA0Wzgx08e33wNpQ==", + "version": "4.3.0-3207", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-3207.tgz", + "integrity": "sha512-3sLb0T086B7c648U0BnYZCk9yvALwL8TpBIgmnaEjWwaruxRD/Z8ZSpcHx5fCIlgNFiPkFK/QXxR/jhpbjTwlQ==", "dev": true, "requires": { "event-emitter": "^0.3.5", @@ -41,42 +41,42 @@ } }, "@alfresco/adf-content-services": { - "version": "4.3.0-31297", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-31297.tgz", - "integrity": "sha512-NHdFJOqHreyuOMEYHPswY58TCBcnNON5GyOKLnZD+3Gy/XUowDPgva5rrH6vVssMnXMyJvzNOGpx4VXcpvU8+A==", + "version": "4.3.0-31380", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-31380.tgz", + "integrity": "sha512-yU8xiEGNDrUYGKGwFpl6iZCldVEoSOAg+5lQa0xM8AYk8rayHYDcibxKw4zhFheyyFJbxfkqxhnL59sAhc7fAg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.3.0-31297", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-31297.tgz", - "integrity": "sha512-LukfihY+iCWdlrk4ydB4lMuKEo1ZChxOCACoj4VgOgwEBWI041/xOG5kYD+BOxtULf409P5JjYNdKHwH12rtIg==", + "version": "4.3.0-31380", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-31380.tgz", + "integrity": "sha512-08jNFTzkX7sYuspQDVnzLrCqRdt8pRAxqTLunVxGyaZZ9cR8zMn1iNKMeu5V2SQgiQRJqPXThlhjah9+S56AHA==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.3.0-31297", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-31297.tgz", - "integrity": "sha512-JDEubSB7zh6oRiRXjKnsclhmBzmyVTeePSUHWohL9oSwPqs9w/QmdyE2DAiT+5R+nkAlZcRsFGWgP1N3j3POLQ==", + "version": "4.3.0-31380", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-31380.tgz", + "integrity": "sha512-51pgT4uIMIwtbyn/YUcnOLr9HAJ/m2XxnH7mGou40QXR67alC4TK0NLu8oqvYNhLNktaepDljdnMA64aGLspgw==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz", - "integrity": "sha512-afjQbuAQYWeqym2SK+3Eqwt7mJAG1ygYypVqKUgesubZIsJ2/vOsYX6dx46ErmmabvD3EJuIoZ2xFAwNhJuoag==", + "version": "4.3.0-31380", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-31380.tgz", + "integrity": "sha512-oTn90ew4aMi6Wia0lYKkltZOPNupyKE8HtK4p3hiJz2K2dlrxwMLNKfGyOSU217PTdkXVcwLpyhD3FXee4IHrw==", "dev": true, "requires": { "tslib": "^2.0.0" } }, "@alfresco/js-api": { - "version": "4.3.0-3207", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-3207.tgz", - "integrity": "sha512-3sLb0T086B7c648U0BnYZCk9yvALwL8TpBIgmnaEjWwaruxRD/Z8ZSpcHx5fCIlgNFiPkFK/QXxR/jhpbjTwlQ==", + "version": "4.3.0-3224", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-3224.tgz", + "integrity": "sha512-Uw9+GQpe+VhJRFaW+A9cnRAzEzJzNQkDUklHyP0lIlj3vTsLFLRJ+4S816sNQ/lChrZ/LyXd6Mffe7CEYgg8Fg==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", @@ -16836,9 +16836,9 @@ } }, "webdriver-manager": { - "version": "12.1.7", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz", - "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==", + "version": "12.1.8", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.8.tgz", + "integrity": "sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==", "dev": true, "requires": { "adm-zip": "^0.4.9", diff --git a/package.json b/package.json index 1ef0b54c6..30b287cab 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.3.0-31297", - "@alfresco/adf-core": "4.3.0-31297", - "@alfresco/adf-extensions": "4.3.0-31297", - "@alfresco/js-api": "4.3.0-3207", + "@alfresco/adf-content-services": "4.3.0-31380", + "@alfresco/adf-core": "4.3.0-31380", + "@alfresco/adf-extensions": "4.3.0-31380", + "@alfresco/js-api": "4.3.0-3224", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", "@angular/common": "10.0.4", @@ -56,8 +56,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc", - "@alfresco/adf-testing": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc", + "@alfresco/adf-cli": "4.3.0-31380", + "@alfresco/adf-testing": "4.3.0-31380", "@angular-custom-builders/lite-serve": "^0.2.2", "@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0", @@ -110,7 +110,7 @@ "tslint-config-prettier": "^1.18.0", "tslint-plugin-prettier": "^2.3.0", "typescript": "3.9.8", - "webdriver-manager": "12.1.7", + "webdriver-manager": "12.1.8", "winston": "^3.3.3" }, "lint-staged": { diff --git a/src/app/extensions/core.extensions.module.ts b/src/app/extensions/core.extensions.module.ts index ae7e16baa..337a32bc4 100644 --- a/src/app/extensions/core.extensions.module.ts +++ b/src/app/extensions/core.extensions.module.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { CoreModule, AuthGuardEcm, UserInfoComponent } from '@alfresco/adf-core'; +import { CoreModule, AuthGuardEcm, UserInfoComponent, NotificationHistoryComponent } from '@alfresco/adf-core'; import { CommonModule } from '@angular/common'; import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core'; import { AppLayoutComponent } from '../components/layout/app-layout/app-layout.component'; @@ -108,7 +108,8 @@ export class CoreExtensionsModule { 'app.toolbar.viewNode': ViewNodeComponent, 'app.languagePicker': LanguagePickerComponent, 'app.logout': LogoutComponent, - 'app.user': UserInfoComponent + 'app.user': UserInfoComponent, + 'app.notification-center': NotificationHistoryComponent }); extensions.setAuthGuards({ diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json index 5f9d62db9..bf1a05de6 100644 --- a/src/assets/app.extensions.json +++ b/src/assets/app.extensions.json @@ -45,6 +45,12 @@ "features": { "header": [ + { + "id": "app.header.notification-center", + "type": "custom", + "component": "app.notification-center", + "order": 50 + }, { "id": "app.header.user", "type": "custom",