inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-5283] Fix Permission Flaky test (#6380)

Browse Source 
* [ADF-5283] Fix Permission Flaky test

* * Removed search service

* * check permission for folder

* * execution flow fixed

* * wait for files to index

* Fix e2e tests

* * wait for user to index

* * try something api fix

* * revert back the changes

* Add sleep

* Refactor permission tests

* bring back good things

Co-authored-by: Cano <david.cano.nieto@gmail.com>
Co-authored-by: Eugenio Romano <eromano@users.noreply.github.com>
Co-authored-by: Eugenio Romano <eugenio.romano@alfresco.com>
This commit is contained in:
dhrn
2020-12-08 17:13:55 +05:30
committed by GitHub
parent 6a76ba0a99
commit d70cfa7fc9
6 changed files with 109 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
lib/testing/src/lib/core/actions/search.service.ts
View File

@@ -16,68 +16,101 @@
*/
import { ApiService } from './api.service';
import { ResultSetPaging } from '@alfresco/js-api';
import { ResultSetPaging, SearchApi } from '@alfresco/js-api';
import { Logger } from '../utils/logger';
import { ApiUtil } from './api.util';
import { UserModel } from '../models/user.model';
export class SearchService {
apiService: ApiService;
searchApi: SearchApi;
constructor(apiService: ApiService) {
this.apiService = apiService;
this.searchApi = new SearchApi(this.apiService.getInstance());
}
async isSearchable(name: string): Promise<any> {
const query = this.createSearchQuery(name);
const query = this.createSearchQuery(name);
const predicate = (result: ResultSetPaging) => {
return result.list && result.list.entries.length > 0 && !!result.list.entries.find(({ entry }) => entry.name === name);
return !!result?.list?.entries?.find(({ entry }) => entry.name === name);
};
return this.performSearch(query, predicate, 'Failed to search folder');
}
async performSearch(query, predicate, errorMessage): Promise<any> {
const apiCall = async () => {
try {
const path = '/alfresco/api/-default-/public/search/versions/1/search';
const method = 'POST';
const queryParams = {},
postBody = JSON.parse(query);
return this.apiService.performECMOperation(path, method, queryParams, postBody);
return this.searchApi.search(query);
} catch (error) {
Logger.error('Failed to search folder');
Logger.error(errorMessage);
return null;
}
};
return ApiUtil.waitForApi(apiCall, predicate);
}
private createSearchQuery(name: string) {
return `{
"query": {
"query": "${name}*"
async isUserSearchable(user: UserModel): Promise<any> {
const query = this.createUserSearchQuery(user);
const predicate = (result: ResultSetPaging) => {
return result.list && result.list.entries.length > 0 && !!result.list.entries.find(({ entry }) => entry.properties['cm:email'] === user.email);
};
return this.performSearch(query, predicate, 'Failed to search user');
}
private createUserSearchQuery(user: UserModel) {
return {
'query': {
'query': `email:*${user.email}* OR firstName:*${user.firstName}* OR lastName:*${user.lastName}*`
},
"include": [
"path",
"allowableOperations",
"properties"
'include': [
'aspectNames',
'properties'
],
"paging": {
"maxItems": 20,
"skipCount": 0
'paging': {
'maxItems': 1,
'skipCount': 0
},
"filterQueries": [
'filterQueries': [
{
"query": "TYPE:'cm:folder' OR TYPE:'cm:content'"
'query': `TYPE:'cm:authority'`
}
]
};
}
private createSearchQuery(name: string) {
return {
'query': {
'query': `${name}*`
},
'include': [
'path',
'allowableOperations',
'properties'
],
'paging': {
'maxItems': 20,
'skipCount': 0
},
'filterQueries': [
{
'query': `TYPE:'cm:folder' OR TYPE:'cm:content'`
},
{
"query": "NOT cm:creator:System"
'query': 'NOT cm:creator:System'
}
],
"scope": {
"locations": [
"nodes"
'scope': {
'locations': [
'nodes'
]
}
}`;
};
}
}