Use hash strategy in demo shell as the other apps (#6402)

* hash startegy

* use hash in e2e

* trigger build

* fix

* fix

* remove children router overwrite crazynes

* Update login.module.ts

* revert not needed changes

* some fixes

* fix

* remove fdescribe

* fix

* fix

* Update share-file.e2e.ts

* Update lock-file.e2e.ts

* Update share-file.e2e.ts

* some fix

* some other fixes

* username as id

* fix after rebase

* username

* fix usernamee

* Fix the errorComponent

* Attempt to fix unit test - to check

* * Fixed circular dependency error while building adf-testing package

* * Fixed failing UT

* fix

* use username

* some fixes

* some fix

* fix

Co-authored-by: Maurizio Vitale <maurizio.vitale@alfresco.com>
Co-authored-by: Vito Albano <vitoalbano@vitoalbano-mbp-0120.local>
Co-authored-by: sivakumar414ram <siva.kumar@muraai.com>

e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts

@@ -57,10 +57,10 @@ describe('Viewer', () => {
             visibility: 'PUBLIC'
         });
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -76,7 +76,7 @@ describe('Viewer', () => {
         beforeAll(async () => {
             archiveFolderUploaded = await uploadActions.createFolder(archiveFolderInfo.name, '-my-');
             uploadedArchives = await uploadActions.uploadFolder(archiveFolderInfo.location, archiveFolderUploaded.entry.id);
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-component.e2e.ts

@@ -69,11 +69,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         pngFileUploaded = await uploadActions.uploadFile(pngFileInfo.location, pngFileInfo.name, site.entry.guid);
     });
@@ -81,11 +81,10 @@ describe('Viewer', () => {
     afterAll(async () => {
         await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
-        await navigationBarPage.clickLogoutButton();
     });
 
     it('[C272813] Should be redirected to site when opening and closing a file in a site', async () => {
-        await loginPage.login(acsUser.email, acsUser.password);
+        await loginPage.login(acsUser.username, acsUser.password);
 
         await navigationBarPage.goToSite(site);
         await contentServicesPage.contentList.dataTablePage().waitTillContentLoaded();
@@ -95,6 +94,7 @@ describe('Viewer', () => {
         await viewerPage.checkImgViewerIsDisplayed();
 
         await viewerPage.clickCloseButton();
+        await navigationBarPage.clickLogoutButton();
     });
 
     describe('Other Folder Uploaded', () => {
@@ -102,11 +102,12 @@ describe('Viewer', () => {
         let otherFolderUploaded;
 
         beforeAll(async () => {
+            await apiService.login(acsUser.username, acsUser.password);
             otherFolderUploaded = await uploadActions.createFolder(otherFolderInfo.name, '-my-');
 
             uploadedOthers = await uploadActions.uploadFolder(otherFolderInfo.location, otherFolderUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts

@@ -56,11 +56,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -77,7 +77,7 @@ describe('Viewer', () => {
 
             uploadedExcels = await uploadActions.uploadFolder(excelFolderInfo.location, excelFolderUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts

@@ -62,11 +62,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -87,7 +87,7 @@ describe('Viewer', () => {
 
             uploadedImgRenditionFolderInfo = await uploadActions.uploadFolder(imgRenditionFolderInfo.location, imgFolderRenditionUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts

@@ -58,11 +58,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -79,7 +79,7 @@ describe('Viewer', () => {
 
             uploadedPpt = await uploadActions.uploadFolder(pptFolderInfo.location, pptFolderUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts

@@ -56,11 +56,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -77,7 +77,7 @@ describe('Viewer', () => {
 
             uploadedTexts = await uploadActions.uploadFolder(textFolderInfo.location, textFolderUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts

@@ -58,11 +58,11 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
     });
 
     afterAll(async () => {
@@ -80,7 +80,7 @@ describe('Viewer', () => {
 
             uploadedWords = await uploadActions.uploadFolder(wordFolderInfo.location, wordFolderUploaded.entry.id);
 
-            await loginPage.login(acsUser.email, acsUser.password);
+            await loginPage.login(acsUser.username, acsUser.password);
             await contentServicesPage.goToDocumentList();
         });
 

e2e/core/viewer/viewer-content-services-component.e2e.ts

@@ -92,7 +92,7 @@ describe('Content Services Viewer', () => {
 
         await usersActions.createUser(acsUser);
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         const pdfFileUploaded = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
         Object.assign(pdfFile, pdfFileUploaded.entry);
@@ -115,7 +115,7 @@ describe('Content Services Viewer', () => {
         const unsupportedFileUploaded = await uploadActions.uploadFile(unsupportedFile.location, unsupportedFile.name, '-my-');
         Object.assign(unsupportedFile, unsupportedFileUploaded.entry);
 
-        await loginPage.login(acsUser.email, acsUser.password);
+        await loginPage.login(acsUser.username, acsUser.password);
 
         await contentServicesPage.goToDocumentList();
     });

e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts

@@ -51,11 +51,11 @@ describe('Viewer', () => {
         await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         txtFileUploaded = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, '-my-');
 
-        await loginPage.login(acsUser.email, acsUser.password);
+        await loginPage.login(acsUser.username, acsUser.password);
    });
 
     afterAll(async () => {

e2e/core/viewer/viewer-properties.e2e.ts

@@ -29,7 +29,7 @@ import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { FileModel } from '../../models/ACS/file.model';
 
-describe('Viewer - properties', () => {
+describe('Viewer', () => {
 
     const acsUser = new UserModel();
     const viewerPage = new ViewerPage();
@@ -56,7 +56,7 @@ describe('Viewer - properties', () => {
 
         await usersActions.createUser(acsUser);
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         let pngFileUploaded = await uploadActions.uploadFile(pngFile.location, pngFile.name, '-my-');
         Object.assign(pngFile, pngFileUploaded.entry);
@@ -64,126 +64,137 @@ describe('Viewer - properties', () => {
         pngFileUploaded = await uploadActions.uploadFile(fileForOverlay.location, fileForOverlay.name, '-my-');
         Object.assign(fileForOverlay, pngFileUploaded.entry);
 
-        await loginPage.login(acsUser.email, acsUser.password);
+        await loginPage.login(acsUser.username, acsUser.password);
 
         await contentServicesPage.goToDocumentList();
-
-        await viewerPage.viewFile(pngFile.name);
-
-        await viewerPage.clickLeftSidebarButton();
-        await viewerPage.checkLeftSideBarIsDisplayed();
-   });
+    });
 
     afterAll(async () => {
         await uploadActions.deleteFileOrFolder(pngFile.getId());
         await navigationBarPage.clickLogoutButton();
-   });
-
-    it('[C260066] Should Show/Hide viewer toolbar when showToolbar is true/false', async () => {
-        await viewerPage.checkToolbarIsDisplayed();
-        await viewerPage.disableToolbar();
-        await viewerPage.checkToolbarIsNotDisplayed();
-        await viewerPage.enableToolbar();
     });
 
-    it('[C260076] Should Show/Hide back button when allowGoBack is true/false', async () => {
-        await viewerPage.checkGoBackIsDisplayed();
-        await viewerPage.disableGoBack();
-        await viewerPage.checkGoBackIsNotDisplayed();
-        await viewerPage.enableGoBack();
-    });
+    describe('properties', () => {
 
-    it('[C260077] Should Show toolbar options dropdown when adf-viewer-open-with directive is used', async () => {
-        await viewerPage.checkToolbarOptionsIsNotDisplayed();
-        await viewerPage.enableToolbarOptions();
-        await viewerPage.checkToolbarOptionsIsDisplayed();
-        await viewerPage.disableToolbarOptions();
-    });
+        beforeAll(async () => {
+            await viewerPage.viewFile(pngFile.name);
 
-    it('[C260079] Should Show/Hide download button when allowDownload is true/false', async () => {
-        await viewerPage.checkDownloadButtonIsDisplayed();
-        await viewerPage.disableDownload();
-        await viewerPage.checkDownloadButtonIsNotDisplayed();
-        await viewerPage.enableDownload();
-    });
+            await viewerPage.clickLeftSidebarButton();
+            await viewerPage.checkLeftSideBarIsDisplayed();
+        });
 
-    it('[C260082] Should Show/Hide print button when allowPrint is true/false', async () => {
-        await viewerPage.checkPrintButtonIsDisplayed();
-        await viewerPage.disablePrint();
-        await viewerPage.checkPrintButtonIsNotDisplayed();
-        await viewerPage.enablePrint();
-    });
+        afterAll(async () => {
+            await viewerPage.clickCloseButton();
+        });
 
-    it('[C260092] Should show adf-viewer-toolbar-actions directive buttons when adf-viewer-toolbar-actions is used', async () => {
-        await viewerPage.checkMoreActionsDisplayed();
+        it('[C260066] Should Show/Hide viewer toolbar when showToolbar is true/false', async () => {
+            await viewerPage.checkToolbarIsDisplayed();
+            await viewerPage.disableToolbar();
+            await viewerPage.checkToolbarIsNotDisplayed();
+            await viewerPage.enableToolbar();
+        });
 
-        await viewerPage.disableMoreActions();
+        it('[C260076] Should Show/Hide back button when allowGoBack is true/false', async () => {
+            await viewerPage.checkGoBackIsDisplayed();
+            await viewerPage.disableGoBack();
+            await viewerPage.checkGoBackIsNotDisplayed();
+            await viewerPage.enableGoBack();
+        });
 
-        await viewerPage.checkMoreActionsIsNotDisplayed();
+        it('[C260077] Should Show toolbar options dropdown when adf-viewer-open-with directive is used', async () => {
+            await viewerPage.checkToolbarOptionsIsNotDisplayed();
+            await viewerPage.enableToolbarOptions();
+            await viewerPage.checkToolbarOptionsIsDisplayed();
+            await viewerPage.disableToolbarOptions();
+        });
 
-        await viewerPage.enableMoreActions();
-    });
+        it('[C260079] Should Show/Hide download button when allowDownload is true/false', async () => {
+            await viewerPage.checkDownloadButtonIsDisplayed();
+            await viewerPage.disableDownload();
+            await viewerPage.checkDownloadButtonIsNotDisplayed();
+            await viewerPage.enableDownload();
+        });
 
-    it('[C260074] Should show a custom file name when displayName property is used', async () => {
-        await viewerPage.checkFileNameIsDisplayed(pngFile.name);
+        it('[C260082] Should Show/Hide print button when allowPrint is true/false', async () => {
+            await viewerPage.checkPrintButtonIsDisplayed();
+            await viewerPage.disablePrint();
+            await viewerPage.checkPrintButtonIsNotDisplayed();
+            await viewerPage.enablePrint();
+        });
 
-        await viewerPage.enableCustomName();
+        it('[C260092] Should show adf-viewer-toolbar-actions directive buttons when adf-viewer-toolbar-actions is used', async () => {
+            await viewerPage.checkMoreActionsDisplayed();
 
-        await viewerPage.enterCustomName('test custom title');
-        await viewerPage.checkFileNameIsDisplayed('test custom title');
+            await viewerPage.disableMoreActions();
 
-        await viewerPage.disableCustomName();
-    });
+            await viewerPage.checkMoreActionsIsNotDisplayed();
 
-    it('[C260090] Should showSidebar allow right info-drawer to be shown', async () => {
-        await viewerPage.clickToggleRightSidebar();
-        await viewerPage.checkInfoSideBarIsDisplayed();
+            await viewerPage.enableMoreActions();
+        });
 
-        await viewerPage.clickToggleRightSidebar();
-        await viewerPage.checkInfoSideBarIsNotDisplayed();
-    });
+        it('[C260074] Should show a custom file name when displayName property is used', async () => {
+            await viewerPage.checkFileNameIsDisplayed(pngFile.name);
 
-    it('[C286442] Should showLeftSidebar allow left info-drawer to be shown', async () => {
-        await viewerPage.clickToggleLeftSidebar();
-        await viewerPage.checkLeftSideBarIsNotDisplayed();
-        await viewerPage.clickLeftSidebarButton();
-        await viewerPage.checkLeftSideBarIsDisplayed();
-    });
+            await viewerPage.enableCustomName();
 
-    it('[C260089] Should Show/Hide info-drawer if allowSidebar true/false', async () => {
-        await viewerPage.clickInfoButton();
+            await viewerPage.enterCustomName('test custom title');
+            await viewerPage.checkFileNameIsDisplayed('test custom title');
 
-        await viewerPage.checkInfoSideBarIsDisplayed();
-        await viewerPage.checkInfoButtonIsDisplayed();
+            await viewerPage.disableCustomName();
+        });
 
-        await viewerPage.disableAllowSidebar();
+        it('[C260090] Should showSidebar allow right info-drawer to be shown', async () => {
+            await viewerPage.clickToggleRightSidebar();
+            await viewerPage.checkInfoSideBarIsDisplayed();
 
-        await viewerPage.checkInfoButtonIsNotDisplayed();
-        await viewerPage.checkInfoSideBarIsNotDisplayed();
-    });
+            await viewerPage.clickToggleRightSidebar();
+            await viewerPage.checkInfoSideBarIsNotDisplayed();
+        });
 
-    it('[C286596] Should Show/Hide left info-drawer if allowLeftSidebar true/false', async () => {
-        await viewerPage.checkLeftSideBarIsDisplayed();
-        await viewerPage.checkLeftSideBarButtonIsDisplayed();
+        it('[C286442] Should showLeftSidebar allow left info-drawer to be shown', async () => {
+            await viewerPage.clickToggleLeftSidebar();
+            await viewerPage.checkLeftSideBarIsNotDisplayed();
+            await viewerPage.clickLeftSidebarButton();
+            await viewerPage.checkLeftSideBarIsDisplayed();
+        });
 
-        await viewerPage.disableAllowLeftSidebar();
+        it('[C260089] Should Show/Hide info-drawer if allowSidebar true/false', async () => {
+            await viewerPage.clickInfoButton();
+
+            await viewerPage.checkInfoSideBarIsDisplayed();
+            await viewerPage.checkInfoButtonIsDisplayed();
+
+            await viewerPage.disableAllowSidebar();
+
+            await viewerPage.checkInfoButtonIsNotDisplayed();
+            await viewerPage.checkInfoSideBarIsNotDisplayed();
+        });
+
+        it('[C286596] Should Show/Hide left info-drawer if allowLeftSidebar true/false', async () => {
+            await viewerPage.checkLeftSideBarIsDisplayed();
+            await viewerPage.checkLeftSideBarButtonIsDisplayed();
+
+            await viewerPage.disableAllowLeftSidebar();
+
+            await viewerPage.checkLeftSideBarButtonIsNotDisplayed();
+            await viewerPage.checkLeftSideBarIsNotDisplayed();
+        });
 
-        await viewerPage.checkLeftSideBarButtonIsNotDisplayed();
-        await viewerPage.checkLeftSideBarIsNotDisplayed();
     });
 
     it('[C260100] Should be possible to disable Overlay viewer', async () => {
-        await viewerPage.clickCloseButton();
         await navigationBarPage.clickOverlayViewerButton();
-
         await dataTable.doubleClickRow('Name', fileForOverlay.name);
         await viewerPage.checkOverlayViewerIsDisplayed();
+
         await viewerPage.clickCloseButton();
         await dataTable.doubleClickRow('Name', pngFile.name);
+
         await viewerPage.checkOverlayViewerIsDisplayed();
         await viewerPage.clickCloseButton();
 
         await viewerPage.disableOverlay();
+
         await dataTable.doubleClickRow('Name', fileForOverlay.name);
         await viewerPage.checkImgContainerIsDisplayed();
         await viewerPage.checkInlineViewerIsDisplayed();
@@ -191,4 +202,5 @@ describe('Viewer - properties', () => {
         await viewerPage.checkImgContainerIsDisplayed();
         await viewerPage.checkInlineViewerIsDisplayed();
     });
-});
+})
+;

e2e/core/viewer/viewer-share-content.ts

@@ -71,15 +71,15 @@ describe('Viewer', () => {
         });
 
         await apiService.getInstance().core.sitesApi.addSiteMember(site.entry.id, {
-            id: acsUser.email,
+            id: acsUser.username,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         pngFileUploaded = await uploadActions.uploadFile(pngFileInfo.location, pngFileInfo.name, site.entry.guid);
 
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
 
         wordFileUploaded = await uploadActions.uploadFile(wordFileInfo.location, wordFileInfo.name, '-my-');
 
@@ -88,12 +88,12 @@ describe('Viewer', () => {
 
     afterAll(async () => {
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
-        await apiService.login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.username, acsUser.password);
         await uploadActions.deleteFileOrFolder(wordFileUploaded.entry.id);
     });
 
     beforeEach(async () => {
-        await loginPage.login(acsUser.email, acsUser.password);
+        await loginPage.login(acsUser.username, acsUser.password);
     });
 
     it('[C260105] Should be able to open an image file shared via API', async () => {