From 1717624594245a2db6878cad5edfc0544a54e2cc Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Fri, 19 Jul 2019 12:19:15 +0300 Subject: [PATCH 1/3] update to 3.4.0-1108 alpha --- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36a0704db..fba1084f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,25 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0.tgz", - "integrity": "sha512-VzEqJC+e2CYtFSwSJDXI8PR7xFCozsV113CpLEW9GT1rcNOyZrwQUe1MZqD3iNJzZdtsw+VI1kfsOwX9v0LNeA==", + "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz", + "integrity": "sha512-zgW68p88uKlvBg9ip/jwTDKHkT13xObxLB0wBLHKsMiRTq24736Sb0hYBdn8M2Ek/DlTWWjPIOLynPrA3E3Xog==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0.tgz", - "integrity": "sha512-OKjG0FduZWj/Ux4O/hKtvz4opWCLrrRP0bsQfRPMfNymIUlHHhS12ciPVSlKaVlozrJ4poyjq8maGa8gqSDMcA==", + "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz", + "integrity": "sha512-lE2w/8HHQjYMO0ejtzaU8db7zYloMunBaEbe7YNiiPzB1yuWLdthpDL720vkOPIdsK6ubEB+B8thBNpuRLfh9g==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0.tgz", - "integrity": "sha512-Fvet22KpZ8zLGKccgsjlf9uEE2+47h0QMDMSX1S4tMbLlLs34PpHQiYNPOEKZgeV/kWx0+nhM7QhQUfH8NpRUA==", + "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz", + "integrity": "sha512-gARzy9b5b/H1bQqOj3QTYjcjU17IufQtkeRzKNT2m2hK0dGgGM+xpQ4aVKUZGy0nU536xdu0QMHgnDzXPnYYcA==", "requires": { "tslib": "^1.9.0" } diff --git a/package.json b/package.json index 85f7295da..6ebc0b16e 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "3.3.0", - "@alfresco/adf-core": "3.3.0", - "@alfresco/adf-extensions": "3.3.0", + "@alfresco/adf-content-services": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", + "@alfresco/adf-core": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", + "@alfresco/adf-extensions": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c", "@alfresco/js-api": "3.3.0", "@angular/animations": "7.2.15", "@angular/cdk": "^7.3.7", From 416587989ee360edbc67491c100d699fc238f77b Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Fri, 19 Jul 2019 13:16:55 +0300 Subject: [PATCH 2/3] fix overlapping private properties --- .../name-column/name-column.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/components/dl-custom-components/name-column/name-column.component.ts b/src/app/components/dl-custom-components/name-column/name-column.component.ts index a23e8cc6e..4fce522e3 100644 --- a/src/app/components/dl-custom-components/name-column/name-column.component.ts +++ b/src/app/components/dl-custom-components/name-column/name-column.component.ts @@ -50,7 +50,7 @@ import { isLocked } from '../../../utils/node.utils'; }) export class CustomNameColumnComponent extends NameColumnComponent implements OnInit, OnDestroy { - private onDestroy$ = new Subject(); + private onDestroy$$ = new Subject(); constructor( element: ElementRef, @@ -65,7 +65,7 @@ export class CustomNameColumnComponent extends NameColumnComponent this.updateValue(); this.apiService.nodeUpdated - .pipe(takeUntil(this.onDestroy$)) + .pipe(takeUntil(this.onDestroy$$)) .subscribe((node: any) => { const row = this.context.row; if (row) { @@ -87,7 +87,7 @@ export class CustomNameColumnComponent extends NameColumnComponent filter(val => { return this.node.entry.id === val.payload.entry.id; }), - takeUntil(this.onDestroy$) + takeUntil(this.onDestroy$$) ) .subscribe(() => { this.cd.detectChanges(); @@ -97,8 +97,8 @@ export class CustomNameColumnComponent extends NameColumnComponent ngOnDestroy() { super.ngOnDestroy(); - this.onDestroy$.next(true); - this.onDestroy$.complete(); + this.onDestroy$$.next(true); + this.onDestroy$$.complete(); } isFile(): boolean { From da55ecf542bd814a4cc82ff1aeae6d2ee6d8eea9 Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Fri, 19 Jul 2019 13:49:46 +0300 Subject: [PATCH 3/3] fix tests --- .../metadata-tab/metadata-tab.component.spec.ts | 4 ++-- src/app/directives/library-membership.directive.spec.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts index 66fb62873..6676e2dc8 100644 --- a/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts +++ b/src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts @@ -27,7 +27,7 @@ import { MetadataTabComponent } from './metadata-tab.component'; import { Node } from '@alfresco/js-api'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppTestingModule } from '../../../testing/app-testing.module'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed, CoreModule } from '@alfresco/adf-core'; import { ContentMetadataModule } from '@alfresco/adf-content-services'; import { Store } from '@ngrx/store'; import { @@ -45,7 +45,7 @@ describe('MetadataTabComponent', () => { let extensions: AppExtensionService; setupTestBed({ - imports: [AppTestingModule, ContentMetadataModule], + imports: [CoreModule, AppTestingModule, ContentMetadataModule], declarations: [MetadataTabComponent] }); diff --git a/src/app/directives/library-membership.directive.spec.ts b/src/app/directives/library-membership.directive.spec.ts index 3d2df670d..f09523a06 100644 --- a/src/app/directives/library-membership.directive.spec.ts +++ b/src/app/directives/library-membership.directive.spec.ts @@ -28,7 +28,8 @@ import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigService, - CoreModule + CoreModule, + StorageService } from '@alfresco/adf-core'; import { AppTestingModule } from '../testing/app-testing.module'; import { DirectivesModule } from './directives.module'; @@ -61,7 +62,10 @@ describe('LibraryMembershipDirective', () => { imports: [AppTestingModule, DirectivesModule, CoreModule.forRoot()], schemas: [NO_ERRORS_SCHEMA] }); - alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null)); + alfrescoApiService = new AlfrescoApiServiceMock( + new AppConfigService(null), + new StorageService() + ); peopleApi = alfrescoApiService.getInstance().core.peopleApi; directive = new LibraryMembershipDirective(alfrescoApiService); });