From 6ac43c6f1e50d4dc4a1923cd5f1e9383097f5ede Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Wed, 25 Oct 2023 12:32:00 +0200 Subject: [PATCH 1/2] Use latest JS-API and ADF --- package-lock.json | 84 ++++++++++++++----------------- package.json | 14 +++--- projects/aca-content/package.json | 8 +-- projects/aca-shared/package.json | 8 +-- 4 files changed, 52 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index af98a47513..69f047ee9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.4.0-6550080792", - "@alfresco/adf-core": "6.4.0-6550080792", - "@alfresco/adf-extensions": "6.4.0-6550080792", - "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6550080792", - "@alfresco/js-api": "7.1.0-1409", + "@alfresco/adf-content-services": "6.4.0-6638624919", + "@alfresco/adf-core": "6.4.0-6638624919", + "@alfresco/adf-extensions": "6.4.0-6638624919", + "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6638624919", + "@alfresco/js-api": "7.1.0-1437", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -46,8 +46,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.4.0-6550080792", - "@alfresco/adf-testing": "6.4.0-6550080792", + "@alfresco/adf-cli": "6.4.0-6638624919", + "@alfresco/adf-testing": "6.4.0-6638624919", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -120,12 +120,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.4.0-6550080792.tgz", - "integrity": "sha512-txwG3cKCYSqzJWLjzM8lnxoLBURE3mSvmZnba9JX54dZraP76tVgnDdrZaggBiAbQDMSTJZ5O3PZ+4N4e2sAFQ==", + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.4.0-6638624919.tgz", + "integrity": "sha512-jJV4BAc55X41Pjg9QrBI629sRIHNeSEAdBuPvO6z2HLU+Xhsbcmg/CHIBojnfMaXlHq0Gau2mLN4/lw1/ZD4OQ==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.1.0-1372", + "@alfresco/js-api": ">=7.1.0-1437", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -140,15 +140,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.4.0-6550080792.tgz", - "integrity": "sha512-/1O+XlPZJLMEanBW/5T2sjfTq8RuTQve7VVwOzhWYaiHAq9I2WLX/GOGztTvb2a55UtOoVJSpvxxukim8zQFQA==", + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.4.0-6638624919.tgz", + "integrity": "sha512-0ZiACISqMz+buImWAotRbOKkW4GbZUhaN6bzKTX7aXQIIzvxmmfo75vIqYnFISRcj71xx//su87N2AWrKtkSuQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.4.0-6550080792", - "@alfresco/js-api": ">=7.1.0-1372", + "@alfresco/adf-core": ">=6.4.0-6638624919", + "@alfresco/js-api": ">=7.1.0-1437", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -164,9 +164,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.4.0-6550080792.tgz", - "integrity": "sha512-GibZrIgNkr36dRClVT0DnrufruVtTlVmR8G2pkxG39wzd+wKb9FTtb/sw4kpEvw+LMeZnU2vNyxMSnRWOt2/qg==", + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.4.0-6638624919.tgz", + "integrity": "sha512-2VMReStMtV7YvU93omT+2h+80F7PvtAgeuYmpJkMxgQUlW4dhM9DYCD1yrzTGSiOORIK+zUUapZM6N4wN2XKIA==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -174,8 +174,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.4.0-6550080792", - "@alfresco/js-api": ">=7.1.0-1372", + "@alfresco/adf-extensions": ">=6.4.0-6638624919", + "@alfresco/js-api": ">=7.1.0-1437", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -193,55 +193,45 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.4.0-6550080792.tgz", - "integrity": "sha512-sm8olNAV3VdEU+iSQhgJyNm9BHqqBPRkxKPqEho1b957QMaJ+jGvBTApPiOAdm3XjTJpwnTCyh9VDQS7UiXCrQ==", + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.4.0-6638624919.tgz", + "integrity": "sha512-NnQCp9aWkRdOcAF3M3cOTyuiKb4tWIWQV/IKiqApwz3tDhChe5a8EngrB6u07iYG+R6zqvIZNaYaRfueDcEA6g==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.1.0-1372", + "@alfresco/js-api": ">=7.1.0-1437", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/adf-testing": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.4.0-6550080792.tgz", - "integrity": "sha512-86d4AO9+5JZS+KFBeem1znaHn8gRW+Ct0jpd77Tz6n/uGVUftWgEpit4G9vQw9H1b3LA0mLD5Qc+cNn++09f7Q==", + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.4.0-6638624919.tgz", + "integrity": "sha512-+/DlHvh+eysD+VCxLOL2NJJlI06Wx+EYc9xOT2ey9XLq0gIUvSx++oeOQnrvO8ciyzorqRemTkl+fPzb0SuzKA==", "dev": true, "dependencies": { - "@alfresco/js-api": "7.1.0-1372", + "@alfresco/js-api": "7.1.0-1437", "@angular/compiler": "14.1.3", "@angular/core": "14.1.3", + "date-fns": "^2.30.0", "rxjs": "6.6.6", "tslib": "^2.6.2", "zone.js": "~0.11.4" }, "peerDependencies": { - "@alfresco/js-api": ">=7.1.0-1372" - } - }, - "node_modules/@alfresco/adf-testing/node_modules/@alfresco/js-api": { - "version": "7.1.0-1372", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.1.0-1372.tgz", - "integrity": "sha512-jaJaZr7unhdKvcG5wzr2ZNfUR0+/74BHDbpdzZJ8Edp77JnhQrQCtXcIzvw2qDzM84PT7PELUe6x4Ys0h6FzJA==", - "dev": true, - "dependencies": { - "event-emitter": "^0.3.5", - "superagent": "^8.0.9", - "tslib": "^2.6.1" + "@alfresco/js-api": ">=7.1.0-1437" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.4.0-6550080792", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.4.0-6550080792.tgz", - "integrity": "sha512-A5h8n+GfHL0dpm3tHTdvl4jHTkEkRBozY8WgwOdHK2zClv0iWaqgZn0clJUo4nPTLl8bkIJflzFUHzWicYcuUQ==" + "version": "6.4.0-6638624919", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.4.0-6638624919.tgz", + "integrity": "sha512-aLWsfP6uVpZM6K/iNfSXlLnNl8uNh+KRw9T+CxZxc8F9JneD1CKSZ/lhd7hVeG41Ev/3/qkbBSiKw8rJD/dwtw==" }, "node_modules/@alfresco/js-api": { - "version": "7.1.0-1409", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.1.0-1409.tgz", - "integrity": "sha512-HbA1FBkSgaibEjgeoo7o1umNksc+TiDRlG6VCZWNt5twn2MT1oJZ70TuPpl1oDdU3c34B5SHZb5gKz4vHUToWw==", + "version": "7.1.0-1437", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.1.0-1437.tgz", + "integrity": "sha512-L5RmmGYyHN/v+LZiO7F0dNTgRWbfptGJW9YG/eg7RUwc1RHukkqhf4kfKdSMCoc+oKU8N4LXgxgJcbgU3cC7gA==", "dependencies": { "event-emitter": "^0.3.5", "jsdom": "^22.1.0", diff --git a/package.json b/package.json index 472d7d2126..3a17fb60e5 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.4.0-6550080792", - "@alfresco/adf-core": "6.4.0-6550080792", - "@alfresco/adf-extensions": "6.4.0-6550080792", - "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6550080792", - "@alfresco/js-api": "7.1.0-1409", + "@alfresco/adf-content-services": "6.4.0-6638624919", + "@alfresco/adf-core": "6.4.0-6638624919", + "@alfresco/adf-extensions": "6.4.0-6638624919", + "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6638624919", + "@alfresco/js-api": "7.1.0-1437", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -69,8 +69,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.4.0-6550080792", - "@alfresco/adf-testing": "6.4.0-6550080792", + "@alfresco/adf-cli": "6.4.0-6638624919", + "@alfresco/adf-testing": "6.4.0-6638624919", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index 76b70fe165..b3b3333fc4 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -5,10 +5,10 @@ "peerDependencies": { "@angular/common": ">=14.1.0", "@angular/core": ">=14.1.0", - "@alfresco/adf-core": ">=6.4.0-6497510485", - "@alfresco/adf-content-services": ">=6.4.0-6497510485", - "@alfresco/adf-extensions": ">=6.4.0-6497510485", - "@alfresco/js-api": ">=7.1.0-1384", + "@alfresco/adf-core": ">=6.4.0-6638624919", + "@alfresco/adf-content-services": ">=6.4.0-6638624919", + "@alfresco/adf-extensions": ">=6.4.0-6638624919", + "@alfresco/js-api": ">=7.1.0-1437", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.3", "@angular/forms": ">=14.1.3", diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json index 6cc9d7a3cd..85c3796a58 100644 --- a/projects/aca-shared/package.json +++ b/projects/aca-shared/package.json @@ -5,10 +5,10 @@ "license": "LGPL-3.0", "scripts": {}, "peerDependencies": { - "@alfresco/adf-content-services": ">=6.4.0-6497510485", - "@alfresco/adf-core": ">=6.4.0-6497510485", - "@alfresco/adf-extensions": ">=6.4.0-6497510485", - "@alfresco/js-api": ">=7.1.0-1384", + "@alfresco/adf-content-services": ">=6.4.0-6638624919", + "@alfresco/adf-core": ">=6.4.0-6638624919", + "@alfresco/adf-extensions": ">=6.4.0-6638624919", + "@alfresco/js-api": ">=7.1.0-1437", "@angular/animations": ">=14.1.3", "@angular/common": ">=14.1.3", "@angular/compiler": ">=14.1.3", From f1a4583b1344c3df09d3ab9eff8a93eba1c97794 Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Wed, 25 Oct 2023 13:16:06 +0200 Subject: [PATCH 2/2] Unit test fix --- .../src/lib/components/files/files.component.spec.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/aca-content/src/lib/components/files/files.component.spec.ts b/projects/aca-content/src/lib/components/files/files.component.spec.ts index 46b709853b..3e53beb5d3 100644 --- a/projects/aca-content/src/lib/components/files/files.component.spec.ts +++ b/projects/aca-content/src/lib/components/files/files.component.spec.ts @@ -33,6 +33,7 @@ import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared'; import { of, Subject, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; import { NodeEntry, NodePaging, Node, PathElement } from '@alfresco/js-api'; +import { DocumentListPresetRef } from '@alfresco/adf-extensions'; describe('FilesComponent', () => { let node; @@ -87,7 +88,7 @@ describe('FilesComponent', () => { fixture = TestBed.createComponent(FilesComponent); component = fixture.componentInstance; - const documentListService = TestBed.inject(DocumentListService); + const documentListService: DocumentListService = TestBed.inject(DocumentListService); const fakeNodeEntry: NodeEntry = { entry: { id: 'fake-node-entry' } } as NodeEntry; const fakeNodePaging: NodePaging = { list: { pagination: { count: 10, maxItems: 10, skipCount: 0 } } }; const documentLoaderNode = { children: fakeNodePaging, currentNode: fakeNodeEntry }; @@ -161,7 +162,7 @@ describe('FilesComponent', () => { desktopOnly: true, template: 'template', sortingKey: 'sorting-key' - } + } as DocumentListPresetRef ]; extensions.filesDocumentListPreset$ = of(filesDocumentListPresetMock);