mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-5237] Unexclude C362240 and C362241 (#6137)
* [ADF-5237] Unexclude C362240 and C362241 * Fix initialization bug
This commit is contained in:
@@ -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",
|
||||
"C277752": "setting problem APS not basic",
|
||||
"C277753": "setting problem APS not basic",
|
||||
|
@@ -16,21 +16,18 @@
|
||||
*/
|
||||
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { AppConfigService } from '../app-config/app-config.service';
|
||||
import { DiscoveryApiService } from './discovery-api.service';
|
||||
import { setupTestBed } from '../testing/setup-test-bed';
|
||||
import { CoreTestingModule } from '../testing/core.testing.module';
|
||||
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
|
||||
import { VersionCompatibilityService } from './version-compatibility.service';
|
||||
import { of } from 'rxjs';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { AuthenticationService } from './authentication.service';
|
||||
import { EcmProductVersionModel } from './../models/product-version.model';
|
||||
|
||||
describe('VersionCompatibilityService', () => {
|
||||
let versionCompatibilityService: VersionCompatibilityService;
|
||||
let alfrescoApiService: AlfrescoApiServiceMock;
|
||||
let discoveryApiService: DiscoveryApiService;
|
||||
let authenticationService: AuthenticationService;
|
||||
const mockProductInfo = new BehaviorSubject<EcmProductVersionModel>(null);
|
||||
|
||||
const acsResponceMock = {
|
||||
version: {
|
||||
@@ -45,22 +42,22 @@ describe('VersionCompatibilityService', () => {
|
||||
imports: [
|
||||
TranslateModule.forRoot(),
|
||||
CoreTestingModule
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
provide: DiscoveryApiService,
|
||||
useValue: {
|
||||
ecmProductInfo$: mockProductInfo
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
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);
|
||||
alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), null);
|
||||
versionCompatibilityService = new VersionCompatibilityService(
|
||||
alfrescoApiService,
|
||||
authenticationService,
|
||||
discoveryApiService
|
||||
);
|
||||
await alfrescoApiService.initialize();
|
||||
mockProductInfo.next(acsResponceMock as EcmProductVersionModel);
|
||||
versionCompatibilityService = new VersionCompatibilityService(discoveryApiService);
|
||||
});
|
||||
|
||||
it('should get ACS running version', () => {
|
||||
|
@@ -16,11 +16,9 @@
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { AlfrescoApiService } from './alfresco-api.service';
|
||||
import { filter } from 'rxjs/operators';
|
||||
import { DiscoveryApiService } from './discovery-api.service';
|
||||
import { VersionModel, EcmProductVersionModel } from '../models/product-version.model';
|
||||
import { AuthenticationService } from './authentication.service';
|
||||
import { filter } from 'rxjs/operators';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
@@ -28,23 +26,10 @@ import { AuthenticationService } from './authentication.service';
|
||||
export class VersionCompatibilityService {
|
||||
private acsVersion: VersionModel;
|
||||
|
||||
constructor(
|
||||
private alfrescoApiService: AlfrescoApiService,
|
||||
private authService: AuthenticationService,
|
||||
private discoveryApiService: DiscoveryApiService
|
||||
) {
|
||||
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;
|
||||
});
|
||||
}
|
||||
constructor(private discoveryApiService: DiscoveryApiService) {
|
||||
this.discoveryApiService.ecmProductInfo$
|
||||
.pipe(filter(acsInfo => !!acsInfo))
|
||||
.subscribe((acsInfo: EcmProductVersionModel) => this.acsVersion = acsInfo.version);
|
||||
}
|
||||
|
||||
getAcsVersion(): VersionModel {
|
||||
|
Reference in New Issue
Block a user