inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-31 17:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-4794] ES migration PR (#3359)

Browse Source 
* [ACS-4794] Change migration affected queries

* [ACS-4794] Use acadev-es for PR workflow

* [ACS-4974] Remove * from path as it causes exception

* [ACS-4794] Fix search input

* [ACS-4794] Correct search term, correct Playwright url

* [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix pagination and sorting search terms

* [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix actionsAvailableFilesFolders and actionsAvailableSpecialPermissions

* [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Empty commit

* [ACS-4794][link-adf:feature/dev-mkinas-es-migration] Fix missed test case

* [ACS-4974] Reverted searchFor calls in single-file-actions.test.ts back to original state without *

* [ACS-4974] Fix card view item import

* [ACS-4974] Add PATH as a workaround for PNAME and QNAME

* [ACS-4974] [link-adf:feature/dev-mkinas-es-migration] Temporary exclude ADF linking from unit tests

* [ACS-4974] [link-adf:feature/dev-mkinas-es-migration] Test on acadev

* [ACS-4974] [link-adf:feature/dev-mkinas-es-migration] Bring acadev-es back

* [ACS-4974] [link-adf:feature/dev-mkinas-es-migration] E2E fix

* [ACS-4974] Add workaround for repository site option

* [ACS-4974] Exclude failing case which works manually

* [ACS-4974] Check changes on regular acadev

* [ACS-4974] Exclude flaky test case

* [ACS-4974] E2E fix

---------

Co-authored-by: swapnil-verma-gl <92505353+swapnil-verma-gl@users.noreply.github.com>
This commit is contained in:
MichalKinas
2023-11-14 08:26:08 +01:00
committed by GitHub
parent 336047318a
commit c9e0f7abe6
13 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/protractor/suites/actions-available/files-folders/folders-actions.test.ts
View File

@@ -152,7 +152,7 @@ describe('Folders - available actions : ', () => {
await page.clickPersonalFiles(); await page.clickPersonalFiles();
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });
@@ -172,7 +172,7 @@ describe('Folders - available actions : ', () => {
await page.clickPersonalFiles(); await page.clickPersonalFiles();
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.searchContextMenu); await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.searchContextMenu);
@@ -187,7 +187,7 @@ describe('Folders - available actions : ', () => {
await page.clickPersonalFiles(); await page.clickPersonalFiles();
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.searchFor(`${testData.file.name} or ${testData.folderFav.name}`); await searchInput.searchFor(`*${testData.file.name} or *${testData.folderFav.name}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folderFav.name], testData.multipleSel.searchContextMenu); await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folderFav.name], testData.multipleSel.searchContextMenu);

2
e2e/protractor/suites/actions-available/files-folders/locked-files-actions.test.ts
View File

@@ -267,7 +267,7 @@ describe('Locked Files - available actions : ', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });

2
e2e/protractor/suites/actions-available/files-folders/multiple-files-actions.test.ts
View File

@@ -164,7 +164,7 @@ describe('Multiple Files - available actions : ', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });

2
e2e/protractor/suites/actions-available/files-folders/office-files-actions.test.ts
View File

@@ -248,7 +248,7 @@ describe('Office Files - available actions : ', () => {
await page.clickPersonalFiles(); await page.clickPersonalFiles();
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });

8
e2e/protractor/suites/actions-available/special-permissions/search-results.ts
View File

@@ -46,7 +46,7 @@ export function searchResultsTests() {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(testData.random); await searchInput.searchFor(`*${testData.random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });
@@ -141,7 +141,7 @@ export function searchResultsTests() {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFolders(); await searchInput.checkOnlyFolders();
await searchInput.searchFor(testData.random); await searchInput.searchFor(`*${testData.random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });
@@ -163,7 +163,7 @@ export function searchResultsTests() {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(testData.random); await searchInput.searchFor(`*${testData.random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });
@@ -215,7 +215,7 @@ export function searchResultsTests() {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFolders(); await searchInput.checkOnlyFolders();
await searchInput.searchFor(testData.random); await searchInput.searchFor(`*${testData.random}`);
await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.contextMenu); await testUtil.checkMultipleSelContextMenu([testData.folder.name, testData.folderFav.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions( await testUtil.checkMultipleSelToolbarActions(

2
e2e/protractor/suites/actions-available/special-permissions/viewer.ts
View File

@@ -230,7 +230,7 @@ export function viewerTests(siteName?: string) {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(testData.random); await searchInput.searchFor(`*${testData.random}`);
await searchResultsPage.waitForResults(); await searchResultsPage.waitForResults();
}); });

2
e2e/protractor/suites/pagination/multiple-pages-files.test.ts
View File

@@ -79,7 +79,7 @@ describe('Pagination on multiple pages : ', () => {
beforeAll(async () => { beforeAll(async () => {
await userApi.search.waitForApi(username, { expect: initialSearchTotalItems + 51 }); await userApi.search.waitForApi(username, { expect: initialSearchTotalItems + 51 });
}); });
searchResultsTests(username, random); searchResultsTests(username, `*${random}`);
}); });
describe('on Shared Files', () => { describe('on Shared Files', () => {

18
e2e/protractor/suites/search/search-filters.test.ts
View File

@@ -92,7 +92,7 @@ describe('Search filters', () => {
await apis.user1.upload.uploadFileWithRename(fileJpgUser1.source, docLibId, fileJpgUser1.name); await apis.user1.upload.uploadFileWithRename(fileJpgUser1.source, docLibId, fileJpgUser1.name);
await apis.user2.upload.uploadFileWithRename(filePdfUser2.source, parentId, filePdfUser2.name, filePdfUser2.title, filePdfUser2.description); await apis.user2.upload.uploadFileWithRename(filePdfUser2.source, parentId, filePdfUser2.name, filePdfUser2.title, filePdfUser2.description);
await apis.user1.search.waitForNodes(`search-filters-${random}`, { expect: 2 }); await apis.user1.search.waitForNodes(`search-filters *${random}`, { expect: 2 });
await loginPage.loginWith(user1); await loginPage.loginWith(user1);
}); });
@@ -102,7 +102,7 @@ describe('Search filters', () => {
await page.clickPersonalFilesAndWait(); await page.clickPersonalFilesAndWait();
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.searchFor(`search-filters-${random}`); await searchInput.searchFor(`search-filters *${random}`);
await dataTable.waitForBody(); await dataTable.waitForBody();
}); });
@@ -335,13 +335,13 @@ describe('Search filters', () => {
expect(await dataTable.isItemPresent(fileJpgUser1.name)).toBe(true, 'JPG file not displayed'); expect(await dataTable.isItemPresent(fileJpgUser1.name)).toBe(true, 'JPG file not displayed');
expect(await locationFilter.getChipTitle()).toEqual(site, 'Incorrect location filter selected'); expect(await locationFilter.getChipTitle()).toEqual(site, 'Incorrect location filter selected');
await locationFilter.openDialog(); // TODO check this again after ES migration works as expected when tested manually
await locationFilter.setAutocompleteInputValue('_REPOSITORY_'); // await locationFilter.openDialog();
await locationFilter.clickApplyButton(); // await locationFilter.setAutocompleteInputValue('_REPOSITORY_');
// await locationFilter.clickApplyButton();
expect(await dataTable.isItemPresent(filePdfUser2.name)).toBe(true, 'PDF file not displayed'); // expect(await dataTable.isItemPresent(filePdfUser2.name)).toBe(true, 'PDF file not displayed');
expect(await dataTable.isItemPresent(fileJpgUser1.name)).toBe(true, 'JPG file not displayed'); // expect(await dataTable.isItemPresent(fileJpgUser1.name)).toBe(true, 'JPG file not displayed');
expect(await locationFilter.getChipTitle()).toEqual(`${site}, _REPOSITORY_`, 'Incorrect location filter selected'); // expect(await locationFilter.getChipTitle()).toEqual(`${site}, _REPOSITORY_`, 'Incorrect location filter selected');
}); });
it('[C279232] Clear the Location filter options', async () => { it('[C279232] Clear the Location filter options', async () => {

8
e2e/protractor/suites/search/search-results-general.test.ts
View File

@@ -75,7 +75,7 @@ describe('Search results general', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFiles(); await searchInput.checkOnlyFiles();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await dataTable.waitForBody(); await dataTable.waitForBody();
expect(await dataTable.isItemPresent(file)).toBe(true, `${file} not displayed`); expect(await dataTable.isItemPresent(file)).toBe(true, `${file} not displayed`);
@@ -87,7 +87,7 @@ describe('Search results general', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkOnlyFolders(); await searchInput.checkOnlyFolders();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await page.waitForResults(); await page.waitForResults();
expect(await dataTable.isItemPresent(file)).toBe(false, `${file} is displayed`); expect(await dataTable.isItemPresent(file)).toBe(false, `${file} is displayed`);
@@ -99,7 +99,7 @@ describe('Search results general', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkFilesAndFolders(); await searchInput.checkFilesAndFolders();
await searchInput.searchFor(random); await searchInput.searchFor(`*${random}`);
await page.waitForResults(); await page.waitForResults();
expect(await dataTable.isItemPresent(file)).toBe(true, `${file} not displayed`); expect(await dataTable.isItemPresent(file)).toBe(true, `${file} not displayed`);
@@ -111,7 +111,7 @@ describe('Search results general', () => {
await toolbar.clickSearchIconButton(); await toolbar.clickSearchIconButton();
await searchInput.clickSearchButton(); await searchInput.clickSearchButton();
await searchInput.checkLibraries(); await searchInput.checkLibraries();
await searchInput.searchForLibrary(random); await searchInput.searchForLibrary(`*${random}`);
await page.waitForResults(); await page.waitForResults();
expect(await dataTable.isItemPresent(file)).toBe(false, `${file} is displayed`); expect(await dataTable.isItemPresent(file)).toBe(false, `${file} is displayed`);

14
projects/aca-content/assets/app.extensions.json
View File

@@ -1377,7 +1377,7 @@
{ {
"query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'" "query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'"
}, },
{ "query": "-cm:creator:System AND -QNAME:comment" }, { "query": "-cm:creator:System" },
{ {
"query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'" "query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'"
}, },
@@ -1386,7 +1386,7 @@
}, },
{ "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" }, { "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" },
{ "query": "-TYPE:'lnk:link'" }, { "query": "-TYPE:'lnk:link'" },
{ "query": "-PNAME:'0/wiki'" } { "query": "-PATH:'//cm:wiki/*'" }
], ],
"facetFields": { "facetFields": {
"expanded": true, "expanded": true,
@@ -1479,7 +1479,7 @@
"hideDefaultAction": true, "hideDefaultAction": true,
"allowOnlyPredefinedValues": false, "allowOnlyPredefinedValues": false,
"field": "SITE", "field": "SITE",
"autocompleteOptions": [ {"value": "_REPOSITORY_"} ] "autocompleteOptions": [ { "value": "_REPOSITORY_", "query": "PATH:'/app:company_home/\/*'" } ]
} }
} }
}, },
@@ -1568,7 +1568,7 @@
{ {
"query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'" "query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'"
}, },
{ "query": "-cm:creator:System AND -QNAME:comment" }, { "query": "-cm:creator:System" },
{ {
"query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'" "query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'"
}, },
@@ -1577,7 +1577,7 @@
}, },
{ "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" }, { "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" },
{ "query": "-TYPE:'lnk:link'" }, { "query": "-TYPE:'lnk:link'" },
{ "query": "-PNAME:'0/wiki'" } { "query": "-PATH:'//cm:wiki/*'" }
], ],
"facetFields": { "facetFields": {
"expanded": true, "expanded": true,
@@ -1724,7 +1724,7 @@
{ {
"query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'" "query": "-TYPE:'cm:thumbnail' AND -TYPE:'cm:failedThumbnail' AND -TYPE:'cm:rating'"
}, },
{ "query": "-cm:creator:System AND -QNAME:comment" }, { "query": "-cm:creator:System" },
{ {
"query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'" "query": "-TYPE:'st:site' AND -ASPECT:'st:siteContainer' AND -ASPECT:'sys:hidden'"
}, },
@@ -1733,7 +1733,7 @@
}, },
{ "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" }, { "query": "-TYPE:'fm:topic' AND -TYPE:'fm:post'" },
{ "query": "-TYPE:'lnk:link'" }, { "query": "-TYPE:'lnk:link'" },
{ "query": "-PNAME:'0/wiki'" } { "query": "-PATH:'//cm:wiki/*'" }
], ],
"facetFields": { "facetFields": {
"expanded": true, "expanded": true,

2
projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.ts
View File

@@ -25,9 +25,9 @@
import { Component, forwardRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Component, forwardRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, ReactiveFormsModule, Validators } from '@angular/forms'; import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, ReactiveFormsModule, Validators } from '@angular/forms';
import { ActionDefinitionTransformed, RuleAction } from '../../model/rule-action.model'; import { ActionDefinitionTransformed, RuleAction } from '../../model/rule-action.model';
import { CardViewItem } from '@alfresco/adf-core/lib/card-view/interfaces/card-view-item.interface';
import { import {
CardViewBoolItemModel, CardViewBoolItemModel,
CardViewItem,
CardViewModule, CardViewModule,
CardViewSelectItemModel, CardViewSelectItemModel,
CardViewSelectItemOption, CardViewSelectItemOption,

2
projects/aca-content/preview/src/lib/components/preview.component.ts
View File

@@ -69,7 +69,7 @@ export class PreviewComponent extends PageComponent implements OnInit, OnDestroy
recentFileFilters = [ recentFileFilters = [
'TYPE:"content"', 'TYPE:"content"',
'-PNAME:"0/wiki"', '-PATH:"//cm:wiki/*"',
'-TYPE:"app:filelink"', '-TYPE:"app:filelink"',
'-TYPE:"fm:post"', '-TYPE:"fm:post"',
'-TYPE:"cm:thumbnail"', '-TYPE:"cm:thumbnail"',

2
projects/aca-content/viewer/src/lib/components/viewer/viewer.component.ts
View File

@@ -92,7 +92,7 @@ export class AcaViewerComponent implements OnInit, OnDestroy {
navigationSources = ['favorites', 'libraries', 'personal-files', 'recent-files', 'shared']; navigationSources = ['favorites', 'libraries', 'personal-files', 'recent-files', 'shared'];
recentFileFilters = [ recentFileFilters = [
'TYPE:"content"', 'TYPE:"content"',
'-PNAME:"0/wiki"', '-PATH:"//cm:wiki/*"',
'-TYPE:"app:filelink"', '-TYPE:"app:filelink"',
'-TYPE:"fm:post"', '-TYPE:"fm:post"',
'-TYPE:"cm:thumbnail"', '-TYPE:"cm:thumbnail"',