diff --git a/e2e/playwright/navigation/src/tests/sidebar.spec.ts b/e2e/playwright/navigation/src/tests/sidebar.spec.ts index e64a8835e5..7fcc577f1b 100644 --- a/e2e/playwright/navigation/src/tests/sidebar.spec.ts +++ b/e2e/playwright/navigation/src/tests/sidebar.spec.ts @@ -50,21 +50,21 @@ test.describe('Sidebar', () => { test('[C269100] sidebar state is preserved on page refresh', async ({ personalFiles }) => { await personalFiles.navigate(); - expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar expanded').toBe(true); + expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(true); await personalFiles.reload(); - expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar expanded').toBe(true); + expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(true); await personalFiles.sidenav.collapseSideNav(); - expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(false); + expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar expanded').toBe(false); await personalFiles.reload(); - expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(false); + expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar expanded').toBe(false); }); test('[C269096] sidebar toggle', async ({ personalFiles }) => { await personalFiles.navigate(); await personalFiles.sidenav.collapseSideNav(); - expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(false); + expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar expanded').toBe(false); await personalFiles.sidenav.expandSideNav(); expect(await personalFiles.sidenav.isSidenavExpanded(), 'Sidebar not expanded').toBe(true); }); diff --git a/e2e/protractor/suites/info-drawer/file-folder-properties.test.ts b/e2e/protractor/suites/info-drawer/file-folder-properties.test.ts index 0efdde86df..adf9b4a40c 100755 --- a/e2e/protractor/suites/info-drawer/file-folder-properties.test.ts +++ b/e2e/protractor/suites/info-drawer/file-folder-properties.test.ts @@ -34,8 +34,7 @@ import { DATE_FORMAT } from '@alfresco/aca-testing-shared'; import { BrowserActions } from '@alfresco/adf-testing'; - -const moment = require('moment'); +import { format } from 'date-fns'; describe('File / Folder properties', () => { const username = `user1-${Utils.random()}`; @@ -132,10 +131,10 @@ describe('File / Folder properties', () => { file1.name, file1.title, apiProps.entry.createdByUser.displayName, - moment(apiProps.entry.createdAt).format(DATE_FORMAT), + format(apiProps.entry.createdAt, DATE_FORMAT), `${apiProps.entry.content.sizeInBytes} Bytes`, apiProps.entry.modifiedByUser.displayName, - moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), + format(apiProps.entry.modifiedAt, DATE_FORMAT), apiProps.entry.content.mimeTypeName, file1.author, file1.description, @@ -160,9 +159,9 @@ describe('File / Folder properties', () => { folder1.name, folder1.title, apiProps.entry.createdByUser.displayName, - moment(apiProps.entry.createdAt).format(DATE_FORMAT), + format(apiProps.entry.createdAt, DATE_FORMAT), apiProps.entry.modifiedByUser.displayName, - moment(apiProps.entry.modifiedAt).format(DATE_FORMAT), + format(apiProps.entry.modifiedAt, DATE_FORMAT), folder1.author, folder1.description, folder1.contentType @@ -220,7 +219,7 @@ describe('File / Folder properties', () => { const expectedPropValues = [ properties['exif:pixelXDimension']?.toString(), properties['exif:pixelYDimension']?.toString(), - moment(properties['exif:dateTimeOriginal']).format(DATE_TIME_FORMAT), + format(new Date(properties['exif:dateTimeOriginal']), DATE_TIME_FORMAT), properties['exif:exposureTime']?.toString(), properties['exif:fNumber']?.toString(), properties['exif:flash'], diff --git a/e2e/protractor/suites/search/search-filters.test.ts b/e2e/protractor/suites/search/search-filters.test.ts index a456e62498..6eb1e792ee 100644 --- a/e2e/protractor/suites/search/search-filters.test.ts +++ b/e2e/protractor/suites/search/search-filters.test.ts @@ -34,8 +34,7 @@ import { SizeOperator } from '@alfresco/aca-testing-shared'; import { BrowserActions } from '@alfresco/adf-testing'; - -const moment = require('moment'); +import { addDays, format, subDays } from 'date-fns'; describe('Search filters', () => { const random = Utils.random(); @@ -162,9 +161,9 @@ describe('Search filters', () => { }); describe('Filter by Created date', () => { - const yesterday = moment().subtract(1, 'day').format('DD-MMM-YY'); - const today = moment().format('DD-MMM-YY'); - const future = moment().add(1, 'month').format('DD-MMM-YY'); + const yesterday = format(subDays(new Date(), 1), 'dd-MMM-yy'); + const today = format(new Date(), 'dd-MMM-yy'); + const future = format(addDays(new Date(), 1), 'dd-MMM-yy'); afterEach(async () => { await Utils.pressEscape(); diff --git a/e2e/protractor/suites/search/search-results-files-folders.test.ts b/e2e/protractor/suites/search/search-results-files-folders.test.ts index a30cc3fd02..73ed3ff7ce 100644 --- a/e2e/protractor/suites/search/search-results-files-folders.test.ts +++ b/e2e/protractor/suites/search/search-results-files-folders.test.ts @@ -23,7 +23,7 @@ */ import { AdminActions, LoginPage, SearchResultsPage, RepoClient, Utils } from '@alfresco/aca-testing-shared'; -const moment = require('moment'); +import { format } from 'date-fns'; describe('Search results - files and folders', () => { const random = Utils.random(); @@ -92,7 +92,7 @@ describe('Search results - files and folders', () => { await dataTable.waitForBody(); const fileEntry = await apis.user.nodes.getNodeById(fileId); - const modifiedDate = moment(fileEntry.entry.modifiedAt).format('MMM D, YYYY, h:mm:ss A'); + const modifiedDate = format(fileEntry.entry.modifiedAt, 'MMM d, yyyy, h:mm:ss aa'); const modifiedBy = fileEntry.entry.modifiedByUser.displayName; const size = fileEntry.entry.content.sizeInBytes; @@ -114,7 +114,7 @@ describe('Search results - files and folders', () => { await dataTable.waitForBody(); const folderEntry = await apis.user.nodes.getNodeById(folderId); - const modifiedDate = moment(folderEntry.entry.modifiedAt).format('MMM D, YYYY, h:mm:ss A'); + const modifiedDate = format(folderEntry.entry.modifiedAt, 'MMM d, yyyy, h:mm:ss aa'); const modifiedBy = folderEntry.entry.modifiedByUser.displayName; expect(await dataTable.isItemPresent(folder)).toBe(true, `${folder} is not displayed`); diff --git a/package-lock.json b/package-lock.json index 0d69466a9c..e58ff042d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.3.0", - "@alfresco/adf-core": "6.3.0", - "@alfresco/adf-extensions": "6.3.0", - "@alfresco/eslint-plugin-eslint-angular": "6.3.0", - "@alfresco/js-api": "7.0.0", + "@alfresco/adf-content-services": "6.4.0-6336818839", + "@alfresco/adf-core": "6.4.0-6336818839", + "@alfresco/adf-extensions": "6.4.0-6336818839", + "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6336818839", + "@alfresco/js-api": "7.1.0-1349", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -46,8 +46,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.3.0", - "@alfresco/adf-testing": "6.3.0", + "@alfresco/adf-cli": "6.4.0-6336818839", + "@alfresco/adf-testing": "6.4.0-6336818839", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -95,7 +95,7 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "^2.0.0", "karma-mocha-reporter": "^2.2.5", - "lint-staged": "^13.1.0", + "lint-staged": "^14.0.1", "ng-packagr": "^14.2.2", "node-stream-zip": "^1.14.0", "nx": "15.9.2", @@ -120,12 +120,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.3.0.tgz", - "integrity": "sha512-m/pVbGF4k99WU7rjiPsqRLppR/qjWYdEQh7yGhQ64RgUP90SpSD2h7eIjA7Q8b+9V0dcHp5/l8qH70HHGVDCoQ==", + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.4.0-6336818839.tgz", + "integrity": "sha512-/O/WZAooRIm7rzcyQK0Eo86Z4iijPJR7vy5+GMMB6ZKZ8aOH9XzAaSVIs3mAbd3MwCO/s/i796Uzd9pkUbtXfg==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.0.0", + "@alfresco/js-api": ">=7.1.0-1349", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -140,15 +140,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.3.0.tgz", - "integrity": "sha512-LkTb7qkpayES9rPkhfjzJsq4arkiq6zw21lrysgDl0WTy4D643AtkdNFoClwm/VtY1y79VkFGEpdsmtDySJpHg==", + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.4.0-6336818839.tgz", + "integrity": "sha512-KFDqgkRQ+flFJyS9NMf81wrtbmDP+ugczGuK7CztjQIgXKzTl8lEhyqT9VjN6JYxRJgCuhMdJQ08B2LM0ZLW6w==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.3.0", - "@alfresco/js-api": ">=7.0.0", + "@alfresco/adf-core": ">=6.4.0-6336818839", + "@alfresco/js-api": ">=7.1.0-1349", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -164,9 +164,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.3.0.tgz", - "integrity": "sha512-T6IciDsnSUmLVM+UN4geI/rQUHvuYJ0iUvNadZM/PXxHJFRLQZ0nL5H/ZOItLfBnWPJjMmmsQ6ktfjlpBHxcbg==", + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.4.0-6336818839.tgz", + "integrity": "sha512-eKfw2GoYVnkgg/NkzHzdg/q8EPUr3CytGy6Zzg7QhZpWzcO2V0sCDRKWYLqjXkNmSV7WX1jrr2OsnxoDcjpLfA==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -174,8 +174,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.3.0", - "@alfresco/js-api": ">=7.0.0", + "@alfresco/adf-extensions": ">=6.4.0-6336818839", + "@alfresco/js-api": ">=7.1.0-1349", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -193,25 +193,25 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.3.0.tgz", - "integrity": "sha512-nLo/0YM4SbiQpvQlnXWG1iP3xsCArwMcq5V1F3Vt3V3uszrZH7FFsCEPRHCmC88U7j8Via+qT9wqXjjlJB8KoA==", + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.4.0-6336818839.tgz", + "integrity": "sha512-YO+5a99urBvOuqLZ6VIT+qTtnEm+uUEOTZgLiBDV8fwl4nZlPqwFiV/hOL5AJdAa4eevJ2+s65QEdMQmRNMJrw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.0.0", + "@alfresco/js-api": ">=7.1.0-1349", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/adf-testing": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.3.0.tgz", - "integrity": "sha512-EBemEkbyq72MmYLUCil9aMCob5+DUTwzzvmcn5iH0BftNdpoS5fsKSS8CMmooaoDeMR8AVMmaMzv6UpuOnLnuA==", + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.4.0-6336818839.tgz", + "integrity": "sha512-Vbkqu3qbj6pgdd+AJ7ZaHk0qzrPt+Tac4UaXcwLLHrvMPX9iKM4rLtwy7wg32s0L+bOXCrxte8DsAu2YA0/O6w==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.0.0", + "@alfresco/js-api": "7.1.0-1349", "@angular/compiler": "14.1.3", "@angular/core": "14.1.3", "rxjs": "6.6.6", @@ -219,18 +219,18 @@ "zone.js": "~0.11.4" }, "peerDependencies": { - "@alfresco/js-api": ">=7.0.0" + "@alfresco/js-api": ">=7.1.0-1349" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.3.0.tgz", - "integrity": "sha512-sQOklz3i2ISMrO2VY7H5ur7SNfqrzc6knGVfbpI5z4rJDlg8sJ4aVAk67FAlSlXNyg7yhLT3yfRicZ4hwcNQ9A==" + "version": "6.4.0-6336818839", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.4.0-6336818839.tgz", + "integrity": "sha512-l7k2cEIHQq5Yi6EmQ7w7wI7fTLluRcIufI0ljLdwFDIzlj06rJ2KMB3i6bACuDlcyB9wlwm7CgowDwy7zpXvHQ==" }, "node_modules/@alfresco/js-api": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.0.0.tgz", - "integrity": "sha512-scczDjDr+KwFZkTVdXAI8QghqZUCPLm8FnWt5wJYeiyWTC/LxCQu1xgjH8AJtYWfj+zIWtmLY98VK7gBwULulw==", + "version": "7.1.0-1349", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.1.0-1349.tgz", + "integrity": "sha512-p0qfoF8mTmaj8BCJ2EhNedOv60uqc2kOFEVByX/VxxTCYrMbG/OHRRNorYWoybI896AqJI5ytqJaKAtGqBKeuQ==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^8.0.9", @@ -20417,35 +20417,47 @@ "dev": true }, "node_modules/lint-staged": { - "version": "13.2.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.2.1.tgz", - "integrity": "sha512-8gfzinVXoPfga5Dz/ZOn8I2GOhf81Wvs+KwbEXQn/oWZAvCVS2PivrXfVbFJc93zD16uC0neS47RXHIjXKYZQw==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-14.0.1.tgz", + "integrity": "sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==", "dev": true, "dependencies": { - "chalk": "5.2.0", - "cli-truncate": "^3.1.0", - "commander": "^10.0.0", - "debug": "^4.3.4", - "execa": "^7.0.0", + "chalk": "5.3.0", + "commander": "11.0.0", + "debug": "4.3.4", + "execa": "7.2.0", "lilconfig": "2.1.0", - "listr2": "^5.0.7", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "object-inspect": "^1.12.3", - "pidtree": "^0.6.0", - "string-argv": "^0.3.1", - "yaml": "^2.2.1" + "listr2": "6.6.1", + "micromatch": "4.0.5", + "pidtree": "0.6.0", + "string-argv": "0.3.2", + "yaml": "2.3.1" }, "bin": { "lint-staged": "bin/lint-staged.js" }, "engines": { - "node": "^14.13.1 || >=16.0.0" + "node": "^16.14.0 || >=18.0.0" }, "funding": { "url": "https://opencollective.com/lint-staged" } }, + "node_modules/lint-staged/node_modules/ansi-escapes": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "dev": true, + "dependencies": { + "type-fest": "^1.0.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/lint-staged/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -20471,9 +20483,9 @@ } }, "node_modules/lint-staged/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -20482,14 +20494,13 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/lint-staged/node_modules/cli-truncate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", - "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "node_modules/lint-staged/node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", "dev": true, "dependencies": { - "slice-ansi": "^5.0.0", - "string-width": "^5.0.0" + "restore-cursor": "^4.0.0" }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -20498,31 +20509,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/lint-staged/node_modules/cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", "dev": true, "dependencies": { - "color-name": "~1.1.4" + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" }, "engines": { - "node": ">=7.0.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/lint-staged/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", + "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", "dev": true, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/lint-staged/node_modules/emoji-regex": { @@ -20531,10 +20540,16 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, + "node_modules/lint-staged/node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true + }, "node_modules/lint-staged/node_modules/execa": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.1.1.tgz", - "integrity": "sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -20588,22 +20603,20 @@ } }, "node_modules/lint-staged/node_modules/listr2": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz", - "integrity": "sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", + "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", "dev": true, "dependencies": { - "cli-truncate": "^2.1.0", - "colorette": "^2.0.19", - "log-update": "^4.0.0", - "p-map": "^4.0.0", + "cli-truncate": "^3.1.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^5.0.1", "rfdc": "^1.3.0", - "rxjs": "^7.8.0", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" + "wrap-ansi": "^8.1.0" }, "engines": { - "node": "^14.13.1 || >=16.0.0" + "node": ">=16.0.0" }, "peerDependencies": { "enquirer": ">= 2.3.0 < 3" @@ -20614,101 +20627,25 @@ } } }, - "node_modules/lint-staged/node_modules/listr2/node_modules/ansi-regex": { + "node_modules/lint-staged/node_modules/log-update": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", + "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", "dev": true, "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" + "ansi-escapes": "^5.0.0", + "cli-cursor": "^4.0.0", + "slice-ansi": "^5.0.0", + "strip-ansi": "^7.0.1", + "wrap-ansi": "^8.0.1" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/listr2/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/lint-staged/node_modules/listr2/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/lint-staged/node_modules/mimic-fn": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", @@ -20763,13 +20700,44 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "node_modules/lint-staged/node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", "dev": true, "dependencies": { - "tslib": "^2.1.0" + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/restore-cursor/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/lint-staged/node_modules/restore-cursor/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lint-staged/node_modules/slice-ansi": { @@ -20806,9 +20774,9 @@ } }, "node_modules/lint-staged/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "dependencies": { "ansi-regex": "^6.0.1" @@ -20832,10 +20800,39 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lint-staged/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/lint-staged/node_modules/yaml": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", - "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", + "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", "dev": true, "engines": { "node": ">= 14" @@ -21046,6 +21043,8 @@ "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", @@ -21064,6 +21063,8 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -21079,6 +21080,8 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -21090,13 +21093,17 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -21114,6 +21121,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -28473,9 +28482,9 @@ } }, "node_modules/string-argv": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", + "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", "dev": true, "engines": { "node": ">=0.6.19" diff --git a/package.json b/package.json index ca4cf2e5ab..dd248ccad0 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.3.0", - "@alfresco/adf-core": "6.3.0", - "@alfresco/adf-extensions": "6.3.0", - "@alfresco/eslint-plugin-eslint-angular": "6.3.0", - "@alfresco/js-api": "7.0.0", + "@alfresco/adf-content-services": "6.4.0-6336818839", + "@alfresco/adf-core": "6.4.0-6336818839", + "@alfresco/adf-extensions": "6.4.0-6336818839", + "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6336818839", + "@alfresco/js-api": "7.1.0-1349", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -69,8 +69,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.3.0", - "@alfresco/adf-testing": "6.3.0", + "@alfresco/adf-cli": "6.4.0-6336818839", + "@alfresco/adf-testing": "6.4.0-6336818839", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -118,7 +118,7 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "^2.0.0", "karma-mocha-reporter": "^2.2.5", - "lint-staged": "^13.1.0", + "lint-staged": "^14.0.1", "ng-packagr": "^14.2.2", "node-stream-zip": "^1.14.0", "nx": "15.9.2", diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json index 692b547d19..9c0d7fff4d 100644 --- a/projects/aca-content/assets/app.extensions.json +++ b/projects/aca-content/assets/app.extensions.json @@ -1244,7 +1244,7 @@ "id": "app.sidebar.expand", "order": 200, "title": "APP.INFO_DRAWER.TABS.EXPAND", - "icon": "chevron_left", + "icon": "aspect_ratio", "actions": { "click": "EXPAND_INFO_DRAWER" }, diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index 2bc90d8438..5f20b2c65c 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -5,10 +5,10 @@ "peerDependencies": { "@angular/common": "^14.1.0", "@angular/core": "^14.1.0", - "@alfresco/adf-core": "^6.3.0", - "@alfresco/adf-content-services": "^6.3.0", - "@alfresco/adf-extensions": "^6.3.0", - "@alfresco/js-api": ">=7.0.0", + "@alfresco/adf-core": "^6.4.0-6336818839", + "@alfresco/adf-content-services": "^6.4.0-6336818839", + "@alfresco/adf-extensions": "^6.4.0-6336818839", + "@alfresco/js-api": "^7.1.0-1349", "@angular/animations": "^14.1.3", "@angular/cdk": "^14.1.3", "@angular/forms": "^14.1.3", diff --git a/projects/aca-content/src/lib/components/details/details.component.html b/projects/aca-content/src/lib/components/details/details.component.html index de8c24fee0..2d9dda876a 100644 --- a/projects/aca-content/src/lib/components/details/details.component.html +++ b/projects/aca-content/src/lib/components/details/details.component.html @@ -18,7 +18,7 @@ data-automation-id="close-library" title="{{ 'APP.INFO_DRAWER.CLOSE' | translate }}" (click)="goBack()"> - close + fullscreen_exit diff --git a/projects/aca-content/src/lib/components/details/details.component.scss b/projects/aca-content/src/lib/components/details/details.component.scss index 873bfb1bc3..778bead773 100644 --- a/projects/aca-content/src/lib/components/details/details.component.scss +++ b/projects/aca-content/src/lib/components/details/details.component.scss @@ -5,6 +5,12 @@ app-details-manager { outline: none; border-radius: 4px; + &:focus { + background-color: var(--theme-selected-background-color); + outline: 2px solid var(--theme-blue-button-color); + border-radius: 4px; + } + &:focus-visible { outline: 2px solid var(--theme-blue-button-color); border-radius: 4px; diff --git a/projects/aca-content/src/lib/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts b/projects/aca-content/src/lib/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts index 5d3d51f2eb..d9dae1918c 100644 --- a/projects/aca-content/src/lib/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts +++ b/projects/aca-content/src/lib/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts @@ -44,9 +44,19 @@ import { MatIconModule } from '@angular/material/icon'; [attr.title]="'APP.ACTIONS.DETAILS' | translate" (click)="onClick()" > - menu_open + view_sidebar `, + styles: [ + ` + .app-toggle-info-drawer button:focus { + border: 2px solid var(--theme-blue-button-color); + border-radius: 6px; + outline: none; + background-color: var(--theme-selected-background-color); + } + ` + ], encapsulation: ViewEncapsulation.None, host: { class: 'app-toggle-info-drawer' } }) diff --git a/projects/aca-playwright-shared/src/api/file-actions.ts b/projects/aca-playwright-shared/src/api/file-actions.ts index f0c75b6742..4b698e39ca 100644 --- a/projects/aca-playwright-shared/src/api/file-actions.ts +++ b/projects/aca-playwright-shared/src/api/file-actions.ts @@ -110,6 +110,16 @@ export class FileActionsApi { } } + private async getLockType(nodeId: string): Promise { + try { + const lockType = await this.getNodeProperty(nodeId, 'cm:lockType'); + return lockType || ''; + } catch (error) { + Logger.error(`${this.constructor.name} ${this.getLockType.name}`, error); + return ''; + } + } + async isFileLockedWriteWithRetry(nodeId: string, expect: boolean): Promise { const data = { expect: expect, diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json index 7f5637ab5a..c50874270a 100644 --- a/projects/aca-shared/package.json +++ b/projects/aca-shared/package.json @@ -5,10 +5,10 @@ "license": "LGPL-3.0", "scripts": {}, "peerDependencies": { - "@alfresco/adf-content-services": "^6.3.0", - "@alfresco/adf-core": "^6.3.0", - "@alfresco/adf-extensions": "^6.3.0", - "@alfresco/js-api": ">=7.0.0", + "@alfresco/adf-content-services": "^6.4.0-6336818839", + "@alfresco/adf-core": "^6.4.0-6336818839", + "@alfresco/adf-extensions": "^6.4.0-6336818839", + "@alfresco/js-api": "^7.1.0-1349", "@angular/animations": "^14.1.3", "@angular/common": "^14.1.3", "@angular/compiler": "^14.1.3", diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts index b20ca26987..7c72919a75 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts @@ -29,7 +29,7 @@ import { OnDestroy, OnInit, OnChanges, ViewChild, SimpleChanges, Directive, inje import { Store } from '@ngrx/store'; import { NodeEntry, Node, NodePaging } from '@alfresco/js-api'; import { Observable, Subject, Subscription } from 'rxjs'; -import { takeUntil, map } from 'rxjs/operators'; +import { takeUntil } from 'rxjs/operators'; import { DocumentBasePageService } from './document-base-page.service'; import { AppStore, @@ -90,7 +90,7 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges { }); this.sharedPreviewUrl$ = this.store.select(getSharedUrl); - this.infoDrawerOpened$ = this.store.select(isInfoDrawerOpened).pipe(map((infoDrawerState) => !this.isOutletPreviewUrl() && infoDrawerState)); + this.infoDrawerOpened$ = this.store.select(isInfoDrawerOpened); this.store .select(getAppSelection) diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts index 47817c536d..bee443e72c 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts @@ -355,13 +355,13 @@ describe('Info Drawer state', () => { }); }); - it('should not open info drawer if viewer outlet is active', (done) => { + it('should open info drawer even if viewer outlet is active', (done) => { window.history.pushState({}, null, `${locationHref}#test(viewer:view)`); fixture.detectChanges(); fixture.whenStable().then(() => { component.infoDrawerOpened$.subscribe((state) => { - expect(state).toBe(false); + expect(state).toBe(true); done(); }); }); diff --git a/projects/aca-testing-shared/src/configs.ts b/projects/aca-testing-shared/src/configs.ts index e57262f6aa..df28f491b3 100755 --- a/projects/aca-testing-shared/src/configs.ts +++ b/projects/aca-testing-shared/src/configs.ts @@ -28,8 +28,8 @@ export const BROWSER_WAIT_TIMEOUT = 10000; export const USE_HASH_STRATEGY = true; // Dates -export const DATE_FORMAT = 'MMM D, YYYY'; -export const DATE_TIME_FORMAT = 'MMM D, YYYY, H:mm'; +export const DATE_FORMAT = 'MMM d, yyyy'; +export const DATE_TIME_FORMAT = 'MMM d, yyyy, H:mm'; // Application Routes export const APP_ROUTES = {