inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix viewer page loading method (#6577)

Browse Source
This commit is contained in:
Eugenio Romano 2021-01-26 17:58:54 +00:00 committed by GitHub
parent 099bec6f1d
commit 5258a34a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/cli/scripts/init-aae-env.ts
View File

@ -80,7 +80,7 @@ async function getApplicationByStatus(status: string) {
await alfrescoJsApiDevops.login(args.devopsUsername, args.devopsPassword); await alfrescoJsApiDevops.login(args.devopsUsername, args.devopsPassword);
return alfrescoJsApiDevops.oauth2Auth.callCustomApi(url, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam, return alfrescoJsApiDevops.oauth2Auth.callCustomApi(url, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam,
contentTypes, accepts).on('error',(error)=>{ contentTypes, accepts).on('error', (error) => {
logger.error(`Get application by status ${error} `); logger.error(`Get application by status ${error} `);
}); });
@ -138,7 +138,7 @@ function getProjectRelease(projectId: string) {
} }
} }
function releaseProject(projectId: string) { async function releaseProject(projectId: string) {
const url = `${args.host}/modeling-service/v1/projects/${projectId}/releases`; const url = `${args.host}/modeling-service/v1/projects/${projectId}/releases`;
const pathParams = {}, queryParams = {}, const pathParams = {}, queryParams = {},
@ -149,11 +149,28 @@ function releaseProject(projectId: string) {
contentTypes, accepts); contentTypes, accepts);
} catch (error) { } catch (error) {
await deleteProject(projectId);
logger.error('Post Projects Release' + error.status); logger.error('Post Projects Release' + error.status);
isValid = false; isValid = false;
} }
} }
function deleteProject(projectId: string) {
const url = `${args.host}/modeling-service/v1/projects/${projectId}`;
const pathParams = {}, queryParams = {},
headerParams = {}, formParams = {}, bodyParam = {},
contentTypes = ['application/json'], accepts = ['application/json'];
try {
return alfrescoJsApiModeler.oauth2Auth.callCustomApi(url, 'DELETE', pathParams, queryParams, headerParams, formParams, bodyParam,
contentTypes, accepts);
} catch (error) {
logger.error('Delete project error' + error.status);
isValid = false;
}
}
async function importAndReleaseProject(absoluteFilePath: string) { async function importAndReleaseProject(absoluteFilePath: string) {
const fileContent = await fs.createReadStream(absoluteFilePath); const fileContent = await fs.createReadStream(absoluteFilePath);

9
lib/testing/src/lib/core/pages/viewer.page.ts
View File

@ -24,6 +24,8 @@ import { Logger } from '../utils/logger';
export class ViewerPage { export class ViewerPage {
MAX_LOADING_TIME = 120000;
tabsPage = new TabsPage(); tabsPage = new TabsPage();
togglePage = new TogglePage(); togglePage = new TogglePage();
@ -117,13 +119,14 @@ export class ViewerPage {
async waitTillContentLoaded(): Promise<void> { async waitTillContentLoaded(): Promise<void> {
await browser.sleep(500); await browser.sleep(500);
if (this.isSpinnerPresent()) { if (await this.isSpinnerPresent()) {
Logger.log('wait spinner disappear'); Logger.log('wait spinner disappear');
await BrowserVisibility.waitUntilElementIsNotPresent(element(by.tagName('mat-progress-spinner'))); await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-progress-spinner')), this.MAX_LOADING_TIME);
} else { } else {
try { try {
Logger.log('wait spinner is present'); Logger.log('wait spinner is present');
await BrowserVisibility.waitUntilElementIsPresent(element(by.tagName('mat-progress-spinner'))); await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-progress-spinner')));
await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-progress-spinner')), this.MAX_LOADING_TIME);
} catch (error) { } catch (error) {
} }
} }