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-5237] Unexclude C362240 and C362241 (#6137)

Browse Source 
* [ADF-5237] Unexclude C362240 and C362241

* Fix initialization bug
This commit is contained in:
davidcanonieto
2020-09-22 10:52:41 +02:00
committed by GitHub
parent e98b40c37d
commit 3b02233481
3 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/protractor.excludes.json
View File

@@ -1,6 +1,4 @@
{ {
"C362240": "Include once ADF starts using ACS 7 , https://issues.alfresco.com/jira/browse/ADF-5182",
"C362241": "Include once ADF starts using ACS 7, https://issues.alfresco.com/jira/browse/ADF-5182",
"C277751": "setting problem APS not basic", "C277751": "setting problem APS not basic",
"C277752": "setting problem APS not basic", "C277752": "setting problem APS not basic",
"C277753": "setting problem APS not basic", "C277753": "setting problem APS not basic",

29
lib/core/services/version-compatibility.service.spec.ts
View File

@@ -16,21 +16,18 @@
*/ */
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { AppConfigService } from '../app-config/app-config.service';
import { DiscoveryApiService } from './discovery-api.service'; import { DiscoveryApiService } from './discovery-api.service';
import { setupTestBed } from '../testing/setup-test-bed'; import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing/core.testing.module'; import { CoreTestingModule } from '../testing/core.testing.module';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { VersionCompatibilityService } from './version-compatibility.service'; import { VersionCompatibilityService } from './version-compatibility.service';
import { of } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { AuthenticationService } from './authentication.service'; import { EcmProductVersionModel } from './../models/product-version.model';
describe('VersionCompatibilityService', () => { describe('VersionCompatibilityService', () => {
let versionCompatibilityService: VersionCompatibilityService; let versionCompatibilityService: VersionCompatibilityService;
let alfrescoApiService: AlfrescoApiServiceMock;
let discoveryApiService: DiscoveryApiService; let discoveryApiService: DiscoveryApiService;
let authenticationService: AuthenticationService; const mockProductInfo = new BehaviorSubject<EcmProductVersionModel>(null);
const acsResponceMock = { const acsResponceMock = {
version: { version: {
@@ -45,22 +42,22 @@ describe('VersionCompatibilityService', () => {
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreTestingModule CoreTestingModule
],
providers: [
{
provide: DiscoveryApiService,
useValue: {
ecmProductInfo$: mockProductInfo
}
}
] ]
}); });
beforeEach(async () => { beforeEach(async () => {
discoveryApiService = TestBed.inject(DiscoveryApiService); discoveryApiService = TestBed.inject(DiscoveryApiService);
authenticationService = TestBed.inject(AuthenticationService);
spyOn(discoveryApiService, 'getEcmProductInfo').and.returnValue(of(acsResponceMock));
spyOn(authenticationService, 'isEcmLoggedIn').and.returnValue(true);
versionCompatibilityService = TestBed.inject(VersionCompatibilityService); versionCompatibilityService = TestBed.inject(VersionCompatibilityService);
alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), null); mockProductInfo.next(acsResponceMock as EcmProductVersionModel);
versionCompatibilityService = new VersionCompatibilityService( versionCompatibilityService = new VersionCompatibilityService(discoveryApiService);
alfrescoApiService,
authenticationService,
discoveryApiService
);
await alfrescoApiService.initialize();
}); });
it('should get ACS running version', () => { it('should get ACS running version', () => {

25
lib/core/services/version-compatibility.service.ts
View File

@@ -16,11 +16,9 @@
*/ */
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { AlfrescoApiService } from './alfresco-api.service';
import { filter } from 'rxjs/operators';
import { DiscoveryApiService } from './discovery-api.service'; import { DiscoveryApiService } from './discovery-api.service';
import { VersionModel, EcmProductVersionModel } from '../models/product-version.model'; import { VersionModel, EcmProductVersionModel } from '../models/product-version.model';
import { AuthenticationService } from './authentication.service'; import { filter } from 'rxjs/operators';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -28,23 +26,10 @@ import { AuthenticationService } from './authentication.service';
export class VersionCompatibilityService { export class VersionCompatibilityService {
private acsVersion: VersionModel; private acsVersion: VersionModel;
constructor( constructor(private discoveryApiService: DiscoveryApiService) {
private alfrescoApiService: AlfrescoApiService, this.discoveryApiService.ecmProductInfo$
private authService: AuthenticationService, .pipe(filter(acsInfo => !!acsInfo))
private discoveryApiService: DiscoveryApiService .subscribe((acsInfo: EcmProductVersionModel) => this.acsVersion = acsInfo.version);
) {
this.alfrescoApiService.alfrescoApiInitialized
.pipe(filter(status => status))
.subscribe(this.initCompatibilityVersion.bind(this));
}
private initCompatibilityVersion() {
if (this.authService.isEcmLoggedIn()) {
this.discoveryApiService.getEcmProductInfo().toPromise().then(
(acsInfo: EcmProductVersionModel) => {
this.acsVersion = acsInfo.version;
});
}
} }
getAcsVersion(): VersionModel { getAcsVersion(): VersionModel {