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/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/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-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 = {