mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-06-30 18:15:11 +00:00
[DO NOT MERGE] try reload search conf (#5820)
* try reload * fix * provide * fix * try
This commit is contained in:
parent
238521e9be
commit
1aa1f12c64
@ -53,6 +53,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
this.queryBuilder.resetToDefaults();
|
||||||
|
|
||||||
this.sorting = this.getSorting();
|
this.sorting = this.getSorting();
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
import { AlfrescoApiCompatibility as AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api';
|
import { AlfrescoApiCompatibility as AlfrescoApi, AlfrescoApiConfig } from '@alfresco/js-api';
|
||||||
import { browser } from 'protractor';
|
import { browser } from 'protractor';
|
||||||
|
import { Logger } from '../utils/logger';
|
||||||
|
|
||||||
export class ApiService {
|
export class ApiService {
|
||||||
|
|
||||||
@ -66,6 +67,8 @@ export class ApiService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.config.oauth2.implicitFlow = false;
|
this.config.oauth2.implicitFlow = false;
|
||||||
|
|
||||||
|
Logger.log('Api Service configuration' + JSON.stringify(this.config));
|
||||||
this.apiService = new AlfrescoApi(this.config);
|
this.apiService = new AlfrescoApi(this.config);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ import { element, by, browser, protractor } from 'protractor';
|
|||||||
import { BrowserVisibility } from '../utils/browser-visibility';
|
import { BrowserVisibility } from '../utils/browser-visibility';
|
||||||
import { BrowserActions } from '../utils/browser-actions';
|
import { BrowserActions } from '../utils/browser-actions';
|
||||||
import { LocalStorageUtil } from '../utils/local-storage.util';
|
import { LocalStorageUtil } from '../utils/local-storage.util';
|
||||||
|
import { Logger } from '../utils/logger';
|
||||||
|
|
||||||
export class LoginSSOPage {
|
export class LoginSSOPage {
|
||||||
|
|
||||||
@ -50,6 +51,7 @@ export class LoginSSOPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async login(username: string, password: string) {
|
async login(username: string, password: string) {
|
||||||
|
Logger.log('Login With ' + username);
|
||||||
|
|
||||||
const authType = await LocalStorageUtil.getConfigField('authType');
|
const authType = await LocalStorageUtil.getConfigField('authType');
|
||||||
|
|
||||||
@ -61,6 +63,8 @@ export class LoginSSOPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async loginSSOIdentityService(username: string, password: string) {
|
async loginSSOIdentityService(username: string, password: string) {
|
||||||
|
Logger.log('Login With ' + username);
|
||||||
|
|
||||||
browser.ignoreSynchronization = true;
|
browser.ignoreSynchronization = true;
|
||||||
|
|
||||||
const loginURL: string = browser.baseUrl + (browser.params.loginRoute ? browser.params.loginRoute : '');
|
const loginURL: string = browser.baseUrl + (browser.params.loginRoute ? browser.params.loginRoute : '');
|
||||||
|
@ -66,4 +66,5 @@ export class LocalStorageUtil {
|
|||||||
`window.adf.apiReset();`
|
`window.adf.apiReset();`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user