inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1174 from Alfresco/dev-pionnegru-ACA-2694

Browse Source 
[ACA-2694] update to ADF 3.4.0-1108
This commit is contained in:
Denys Vuika 2019-07-19 13:53:47 +01:00 committed by GitHub
commit 25e5838d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@ -5,25 +5,25 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.3.0", "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz",
"integrity": "sha512-VzEqJC+e2CYtFSwSJDXI8PR7xFCozsV113CpLEW9GT1rcNOyZrwQUe1MZqD3iNJzZdtsw+VI1kfsOwX9v0LNeA==", "integrity": "sha512-zgW68p88uKlvBg9ip/jwTDKHkT13xObxLB0wBLHKsMiRTq24736Sb0hYBdn8M2Ek/DlTWWjPIOLynPrA3E3Xog==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.3.0", "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz",
"integrity": "sha512-OKjG0FduZWj/Ux4O/hKtvz4opWCLrrRP0bsQfRPMfNymIUlHHhS12ciPVSlKaVlozrJ4poyjq8maGa8gqSDMcA==", "integrity": "sha512-lE2w/8HHQjYMO0ejtzaU8db7zYloMunBaEbe7YNiiPzB1yuWLdthpDL720vkOPIdsK6ubEB+B8thBNpuRLfh9g==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.3.0", "version": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c.tgz",
"integrity": "sha512-Fvet22KpZ8zLGKccgsjlf9uEE2+47h0QMDMSX1S4tMbLlLs34PpHQiYNPOEKZgeV/kWx0+nhM7QhQUfH8NpRUA==", "integrity": "sha512-gARzy9b5b/H1bQqOj3QTYjcjU17IufQtkeRzKNT2m2hK0dGgGM+xpQ4aVKUZGy0nU536xdu0QMHgnDzXPnYYcA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }

6
package.json
View File

@ -36,9 +36,9 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.3.0", "@alfresco/adf-content-services": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"@alfresco/adf-core": "3.3.0", "@alfresco/adf-core": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"@alfresco/adf-extensions": "3.3.0", "@alfresco/adf-extensions": "3.4.0-1108e2e77a657c898dcaeb4c121a358434ece13c",
"@alfresco/js-api": "3.3.0", "@alfresco/js-api": "3.3.0",
"@angular/animations": "7.2.15", "@angular/animations": "7.2.15",
"@angular/cdk": "^7.3.7", "@angular/cdk": "^7.3.7",

10
src/app/components/dl-custom-components/name-column/name-column.component.ts
View File

@ -50,7 +50,7 @@ import { isLocked } from '../../../utils/node.utils';
}) })
export class CustomNameColumnComponent extends NameColumnComponent export class CustomNameColumnComponent extends NameColumnComponent
implements OnInit, OnDestroy { implements OnInit, OnDestroy {
private onDestroy$ = new Subject<boolean>(); private onDestroy$$ = new Subject<boolean>();
constructor( constructor(
element: ElementRef, element: ElementRef,
@ -65,7 +65,7 @@ export class CustomNameColumnComponent extends NameColumnComponent
this.updateValue(); this.updateValue();
this.apiService.nodeUpdated this.apiService.nodeUpdated
.pipe(takeUntil(this.onDestroy$)) .pipe(takeUntil(this.onDestroy$$))
.subscribe((node: any) => { .subscribe((node: any) => {
const row = this.context.row; const row = this.context.row;
if (row) { if (row) {
@ -87,7 +87,7 @@ export class CustomNameColumnComponent extends NameColumnComponent
filter(val => { filter(val => {
return this.node.entry.id === val.payload.entry.id; return this.node.entry.id === val.payload.entry.id;
}), }),
takeUntil(this.onDestroy$) takeUntil(this.onDestroy$$)
) )
.subscribe(() => { .subscribe(() => {
this.cd.detectChanges(); this.cd.detectChanges();
@ -97,8 +97,8 @@ export class CustomNameColumnComponent extends NameColumnComponent
ngOnDestroy() { ngOnDestroy() {
super.ngOnDestroy(); super.ngOnDestroy();
this.onDestroy$.next(true); this.onDestroy$$.next(true);
this.onDestroy$.complete(); this.onDestroy$$.complete();
} }
isFile(): boolean { isFile(): boolean {

4
src/app/components/info-drawer/metadata-tab/metadata-tab.component.spec.ts
View File

@ -27,7 +27,7 @@ import { MetadataTabComponent } from './metadata-tab.component';
import { Node } from '@alfresco/js-api'; import { Node } from '@alfresco/js-api';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { AppTestingModule } from '../../../testing/app-testing.module'; 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 { ContentMetadataModule } from '@alfresco/adf-content-services';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { import {
@ -45,7 +45,7 @@ describe('MetadataTabComponent', () => {
let extensions: AppExtensionService; let extensions: AppExtensionService;
setupTestBed({ setupTestBed({
imports: [AppTestingModule, ContentMetadataModule], imports: [CoreModule, AppTestingModule, ContentMetadataModule],
declarations: [MetadataTabComponent] declarations: [MetadataTabComponent]
}); });

8
src/app/directives/library-membership.directive.spec.ts
View File

@ -28,7 +28,8 @@ import {
AlfrescoApiService, AlfrescoApiService,
AlfrescoApiServiceMock, AlfrescoApiServiceMock,
AppConfigService, AppConfigService,
CoreModule CoreModule,
StorageService
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { AppTestingModule } from '../testing/app-testing.module'; import { AppTestingModule } from '../testing/app-testing.module';
import { DirectivesModule } from './directives.module'; import { DirectivesModule } from './directives.module';
@ -61,7 +62,10 @@ describe('LibraryMembershipDirective', () => {
imports: [AppTestingModule, DirectivesModule, CoreModule.forRoot()], imports: [AppTestingModule, DirectivesModule, CoreModule.forRoot()],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
}); });
alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null)); alfrescoApiService = new AlfrescoApiServiceMock(
new AppConfigService(null),
new StorageService()
);
peopleApi = alfrescoApiService.getInstance().core.peopleApi; peopleApi = alfrescoApiService.getInstance().core.peopleApi;
directive = new LibraryMembershipDirective(alfrescoApiService); directive = new LibraryMembershipDirective(alfrescoApiService);
}); });