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

* fixed the version-compatibility.directive (#6391)

Browse Source
This commit is contained in:
dhrn
2020-11-30 17:44:29 +05:30
committed by GitHub
parent e55c2555c1
commit f3e5dfecec
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/directives/version-compatibility.directive.spec.ts
View File

@@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { TestBed, ComponentFixture } from '@angular/core/testing'; import { TestBed, ComponentFixture } from '@angular/core/testing';
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 { VersionCompatibilityService } from '@alfresco/adf-core'; import { VersionCompatibilityService } from '../services/version-compatibility.service';
@Component({ @Component({
template: ` template: `
@@ -63,8 +63,7 @@ describe('VersionCompatibilityDirective', () => {
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreTestingModule CoreTestingModule
], ],
declarations: [TestComponent declarations: [TestComponent]
]
}); });
beforeEach(() => { beforeEach(() => {

6
lib/core/directives/version-compatibility.directive.ts
View File

@@ -17,6 +17,7 @@
import { Directive, Input, ViewContainerRef, TemplateRef } from '@angular/core'; import { Directive, Input, ViewContainerRef, TemplateRef } from '@angular/core';
import { VersionCompatibilityService } from '../services/version-compatibility.service'; import { VersionCompatibilityService } from '../services/version-compatibility.service';
import { take } from 'rxjs/operators';
@Directive({ @Directive({
selector: '[adf-acs-version]' selector: '[adf-acs-version]'
@@ -37,11 +38,10 @@ export class VersionCompatibilityDirective {
} }
private validateAcsVersion(requiredVersion: string) { private validateAcsVersion(requiredVersion: string) {
this.versionCompatibilityService.acsVersionInitialized$.subscribe(() => { this.versionCompatibilityService.acsVersionInitialized$.pipe(take(1)).subscribe(() => {
this.viewContainer.clear();
if (requiredVersion && this.versionCompatibilityService.isVersionSupported(requiredVersion)) { if (requiredVersion && this.versionCompatibilityService.isVersionSupported(requiredVersion)) {
this.viewContainer.createEmbeddedView(this.templateRef); this.viewContainer.createEmbeddedView(this.templateRef);
} else {
this.viewContainer.clear();
} }
}); });
} }