Use latest JS-API and ADF (#3423)

* Update JS-API and ADF versions to latest

* Fix missing types

* Fix incorrect types

* Use correct method to get membership requests
This commit is contained in:
MichalKinas
2023-09-08 10:10:00 +02:00
committed by GitHub
parent 9106608398
commit b086093c2f
7 changed files with 57 additions and 68 deletions

83
package-lock.json generated
View File

@@ -10,11 +10,11 @@
"hasInstallScript": true, "hasInstallScript": true,
"license": "LGPL-3.0", "license": "LGPL-3.0",
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "6.3.0-5977252204", "@alfresco/adf-content-services": "6.3.0-6109128581",
"@alfresco/adf-core": "6.3.0-5977252204", "@alfresco/adf-core": "6.3.0-6109128581",
"@alfresco/adf-extensions": "6.3.0-5977252204", "@alfresco/adf-extensions": "6.3.0-6109128581",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-5977252204", "@alfresco/eslint-plugin-eslint-angular": "6.3.0-6109128581",
"@alfresco/js-api": "6.3.0-1172", "@alfresco/js-api": "6.3.0-1271",
"@angular/animations": "14.1.3", "@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3", "@angular/cdk": "14.1.3",
"@angular/common": "14.1.3", "@angular/common": "14.1.3",
@@ -46,8 +46,8 @@
"zone.js": "0.11.8" "zone.js": "0.11.8"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "6.3.0-5977252204", "@alfresco/adf-cli": "6.3.0-6109128581",
"@alfresco/adf-testing": "6.3.0-5977252204", "@alfresco/adf-testing": "6.3.0-6109128581",
"@angular-devkit/build-angular": "14.2.11", "@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2", "@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2", "@angular-devkit/schematics": "14.1.2",
@@ -120,12 +120,12 @@
"dev": true "dev": true
}, },
"node_modules/@alfresco/adf-cli": { "node_modules/@alfresco/adf-cli": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.3.0-6109128581.tgz",
"integrity": "sha512-Qx+Qc6tcmdQlubsz0VCpPvsYPOD/w6OLQHMrORFDdjc+Xol5zREsOgEuL0X6rxX5z3cZmxDoAflK1VV2188myA==", "integrity": "sha512-31//0TjGscfYGV5M3VBJXkclS8TDduYQ84YLCYBskQukKQpIOk705MHPKsK0UkP7IHwumS36T3mBVRT5/Ajr/A==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@alfresco/js-api": ">=6.3.0-1108", "@alfresco/js-api": ">=6.3.0-1271",
"commander": "^6.2.1", "commander": "^6.2.1",
"ejs": "^3.1.9", "ejs": "^3.1.9",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
@@ -140,15 +140,15 @@
} }
}, },
"node_modules/@alfresco/adf-content-services": { "node_modules/@alfresco/adf-content-services": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.3.0-6109128581.tgz",
"integrity": "sha512-fE6wYdeda+m+gYCTy+sE3UVPL2+ZJ+OF1H60SkLj9urKUPjZ7w+kf+PPi0BGmXUGT5eiECBQ8MtN/yxR66HsCg==", "integrity": "sha512-6rMmxXO2Y+SihOsU/C7HzKXbCMi7PSIfMjxdnhFJPa7OBrSC/cJWus6txza1veL5aqGzl9JNs4ym/i2gjwxpmA==",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/adf-core": ">=6.3.0-5977252204", "@alfresco/adf-core": ">=6.3.0-6109128581",
"@alfresco/js-api": ">=6.3.0-1108", "@alfresco/js-api": ">=6.3.0-1271",
"@angular/animations": ">=14.1.3", "@angular/animations": ">=14.1.3",
"@angular/cdk": ">=14.1.2", "@angular/cdk": ">=14.1.2",
"@angular/common": ">=14.1.3", "@angular/common": ">=14.1.3",
@@ -164,9 +164,9 @@
} }
}, },
"node_modules/@alfresco/adf-core": { "node_modules/@alfresco/adf-core": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.3.0-6109128581.tgz",
"integrity": "sha512-3Di1lbtzAP2oKdOsR6Eit3DUNhpuAfp+LNegqXVNAofZxwB6aMdmbp1BhoNTQkxnUTk92yuACXBDWQ1xpXmOqA==", "integrity": "sha512-rhKZBat7paZguwM7H6fHy0fxYAusx85+LVuf4ckAMd0BXGayJCik3x5WhpZeLsuBkGwViUn6nN3xxCX9GyrLlA==",
"dependencies": { "dependencies": {
"angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc": "^13.0.1",
"angular-oauth2-oidc-jwks": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1",
@@ -174,8 +174,8 @@
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/adf-extensions": ">=6.3.0-5977252204", "@alfresco/adf-extensions": ">=6.3.0-6109128581",
"@alfresco/js-api": ">=6.3.0-1108", "@alfresco/js-api": ">=6.3.0-1271",
"@angular/animations": ">=14.1.3", "@angular/animations": ">=14.1.3",
"@angular/cdk": ">=14.1.2", "@angular/cdk": ">=14.1.2",
"@angular/common": ">=14.1.3", "@angular/common": ">=14.1.3",
@@ -193,25 +193,25 @@
} }
}, },
"node_modules/@alfresco/adf-extensions": { "node_modules/@alfresco/adf-extensions": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.3.0-6109128581.tgz",
"integrity": "sha512-YjF87ZYiBwxlbw1NDzenZAQC9IiBjGs0Z2+7K6wgnDlXDzBAGx8uMyGVZLk0zxXVlhU4iQxs7vGD2nSoqlEgKw==", "integrity": "sha512-8JKdqO7ZS32rb5Jj9sqe2f+d4xLGYF08FH0PwWZlAD5MbnSiyp7iBrlxo+4KdXEkqGa6meKBPezEhGeFrSwoAw==",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/js-api": ">=6.3.0-1108", "@alfresco/js-api": ">=6.3.0-1271",
"@angular/common": ">=14.1.3", "@angular/common": ">=14.1.3",
"@angular/core": ">=14.1.3" "@angular/core": ">=14.1.3"
} }
}, },
"node_modules/@alfresco/adf-testing": { "node_modules/@alfresco/adf-testing": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.3.0-6109128581.tgz",
"integrity": "sha512-itA2H/FzkNdmFJrwzkPFujWv7KaOCUL+xz86X5Vc7noPdKGbxt01f6h9WrnABXVLPqXZwBed/5xf7asLYtjCkQ==", "integrity": "sha512-/MC4kkowrdHS9aIu8onzWUsS2phuN84V9zf6l95kOnw6ZfgoQiTOwBYtRWQLMOf8QJ8nGaO6g769vV5LOe5IZg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@alfresco/js-api": "6.3.0-1108", "@alfresco/js-api": "6.3.0-1271",
"@angular/compiler": "14.1.3", "@angular/compiler": "14.1.3",
"@angular/core": "14.1.3", "@angular/core": "14.1.3",
"rxjs": "6.6.6", "rxjs": "6.6.6",
@@ -219,29 +219,18 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/js-api": ">=6.3.0-1108" "@alfresco/js-api": ">=6.3.0-1271"
}
},
"node_modules/@alfresco/adf-testing/node_modules/@alfresco/js-api": {
"version": "6.3.0-1108",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.3.0-1108.tgz",
"integrity": "sha512-U7YlT6HVsO14OdTi4g0l4MckgugioSfHCUnoAk0KVDQWk/j5CKl+GGIq71mf2ram2L3o9XB/oNhbFSo2cfilTA==",
"dev": true,
"dependencies": {
"event-emitter": "^0.3.5",
"superagent": "^8.0.9",
"tslib": "^2.6.1"
} }
}, },
"node_modules/@alfresco/eslint-plugin-eslint-angular": { "node_modules/@alfresco/eslint-plugin-eslint-angular": {
"version": "6.3.0-5977252204", "version": "6.3.0-6109128581",
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.3.0-5977252204.tgz", "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.3.0-6109128581.tgz",
"integrity": "sha512-On5w7ZSYnyOf2NOA9rc3756S0Ms0GNAaIhBUFQkBQ7n5nHm5Y17yI9YpPh3n4Pag8IRH4lQSzZvfhiqocmtv0g==" "integrity": "sha512-Pv8HfbqOrRoE+NbBt/QzPLLWoPI0aVlzVemxZ1PfZo49DSpIFzGGHm2xagSLTfm3HYf33SyCsimSM68ZbF2Aag=="
}, },
"node_modules/@alfresco/js-api": { "node_modules/@alfresco/js-api": {
"version": "6.3.0-1172", "version": "6.3.0-1271",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.3.0-1172.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.3.0-1271.tgz",
"integrity": "sha512-JIf5qTijNp+RfC6R1iav88k2W8Sn0KRdONhN712+cwFRIBBT8Jx8oYHssyWQQdojHdI7dhi8bkaegpUIM1UWxw==", "integrity": "sha512-Q/zZeZt9V5di8acKeSEPXGmTf5gNyj7PQgPvVFq3Fgvsqjj4P2v5WcRQJbumeMK/Snk8bsWwYQk5Lh/Aau3cyA==",
"dependencies": { "dependencies": {
"event-emitter": "^0.3.5", "event-emitter": "^0.3.5",
"superagent": "^8.0.9", "superagent": "^8.0.9",

View File

@@ -33,11 +33,11 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "6.3.0-5977252204", "@alfresco/adf-content-services": "6.3.0-6109128581",
"@alfresco/adf-core": "6.3.0-5977252204", "@alfresco/adf-core": "6.3.0-6109128581",
"@alfresco/adf-extensions": "6.3.0-5977252204", "@alfresco/adf-extensions": "6.3.0-6109128581",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-5977252204", "@alfresco/eslint-plugin-eslint-angular": "6.3.0-6109128581",
"@alfresco/js-api": "6.3.0-1172", "@alfresco/js-api": "6.3.0-1271",
"@angular/animations": "14.1.3", "@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3", "@angular/cdk": "14.1.3",
"@angular/common": "14.1.3", "@angular/common": "14.1.3",
@@ -69,8 +69,8 @@
"zone.js": "0.11.8" "zone.js": "0.11.8"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "6.3.0-5977252204", "@alfresco/adf-cli": "6.3.0-6109128581",
"@alfresco/adf-testing": "6.3.0-5977252204", "@alfresco/adf-testing": "6.3.0-6109128581",
"@angular-devkit/build-angular": "14.2.11", "@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2", "@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2", "@angular-devkit/schematics": "14.1.2",

View File

@@ -5,10 +5,10 @@
"peerDependencies": { "peerDependencies": {
"@angular/common": "^14.1.0", "@angular/common": "^14.1.0",
"@angular/core": "^14.1.0", "@angular/core": "^14.1.0",
"@alfresco/adf-core": "^6.3.0-5977252204", "@alfresco/adf-core": "^6.3.0-6109128581",
"@alfresco/adf-content-services": "^6.3.0-5977252204", "@alfresco/adf-content-services": "^6.3.0-6109128581",
"@alfresco/adf-extensions": "^6.3.0-5977252204", "@alfresco/adf-extensions": "^6.3.0-6109128581",
"@alfresco/js-api": ">=6.3.0-1172", "@alfresco/js-api": ">=6.3.0-1271",
"@angular/animations": "^14.1.3", "@angular/animations": "^14.1.3",
"@angular/cdk": "^14.1.3", "@angular/cdk": "^14.1.3",
"@angular/forms": "^14.1.3", "@angular/forms": "^14.1.3",

View File

@@ -25,14 +25,14 @@
import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing';
import { NO_ERRORS_SCHEMA, SimpleChange, SimpleChanges } from '@angular/core'; import { NO_ERRORS_SCHEMA, SimpleChange, SimpleChanges } from '@angular/core';
import { Router, ActivatedRoute, convertToParamMap } from '@angular/router'; import { Router, ActivatedRoute, convertToParamMap } from '@angular/router';
import { DocumentListService, FilterSearch, PathElementEntity, UploadService } from '@alfresco/adf-content-services'; import { DocumentListService, FilterSearch, UploadService } from '@alfresco/adf-content-services';
import { NodeActionsService } from '../../services/node-actions.service'; import { NodeActionsService } from '../../services/node-actions.service';
import { FilesComponent } from './files.component'; import { FilesComponent } from './files.component';
import { AppTestingModule } from '../../testing/app-testing.module'; import { AppTestingModule } from '../../testing/app-testing.module';
import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared'; import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
import { of, Subject, throwError } from 'rxjs'; import { of, Subject, throwError } from 'rxjs';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { NodeEntry, NodePaging, Node } from '@alfresco/js-api'; import { NodeEntry, NodePaging, Node, PathElement } from '@alfresco/js-api';
describe('FilesComponent', () => { describe('FilesComponent', () => {
let node; let node;
@@ -437,7 +437,7 @@ describe('FilesComponent', () => {
it('should reset the pagination when navigating using the breadcrumb', () => { it('should reset the pagination when navigating using the breadcrumb', () => {
const resetNewFolderPaginationSpy = spyOn(component.documentList, 'resetNewFolderPagination'); const resetNewFolderPaginationSpy = spyOn(component.documentList, 'resetNewFolderPagination');
const breadcrumbRoute: PathElementEntity = { id: 'fake-breadcrumb-route-id', name: 'fake' }; const breadcrumbRoute: PathElement = { id: 'fake-breadcrumb-route-id', name: 'fake' };
component.onBreadcrumbNavigate(breadcrumbRoute); component.onBreadcrumbNavigate(breadcrumbRoute);
expect(resetNewFolderPaginationSpy).toHaveBeenCalled(); expect(resetNewFolderPaginationSpy).toHaveBeenCalled();

View File

@@ -23,7 +23,7 @@
*/ */
import { ApiClientFactory } from './api-client-factory'; import { ApiClientFactory } from './api-client-factory';
import { SiteBody, SiteEntry } from '@alfresco/js-api'; import { SiteBodyCreate, SiteEntry } from '@alfresco/js-api';
import { users } from '../base-config/global-variables'; import { users } from '../base-config/global-variables';
import { logger } from '@alfresco/adf-cli/scripts/logger'; import { logger } from '@alfresco/adf-cli/scripts/logger';
import { SITE_VISIBILITY } from '../utils/configs'; import { SITE_VISIBILITY } from '../utils/configs';
@@ -47,7 +47,7 @@ export class SitesApi extends ApiClientFactory {
visibility: visibility || SITE_VISIBILITY.PUBLIC, visibility: visibility || SITE_VISIBILITY.PUBLIC,
description: description, description: description,
id: siteId || title id: siteId || title
} as SiteBody; } as SiteBodyCreate;
try { try {
return await this.apiService.sites.createSite(site); return await this.apiService.sites.createSite(site);

View File

@@ -5,10 +5,10 @@
"license": "LGPL-3.0", "license": "LGPL-3.0",
"scripts": {}, "scripts": {},
"peerDependencies": { "peerDependencies": {
"@alfresco/adf-content-services": "^6.3.0-5977252204", "@alfresco/adf-content-services": "^6.3.0-6109128581",
"@alfresco/adf-core": "6.3.0-5977252204", "@alfresco/adf-core": "6.3.0-6109128581",
"@alfresco/adf-extensions": "6.3.0-5977252204", "@alfresco/adf-extensions": "6.3.0-6109128581",
"@alfresco/js-api": ">=6.3.0-1172", "@alfresco/js-api": ">=6.3.0-1271",
"@angular/animations": "^14.1.3", "@angular/animations": "^14.1.3",
"@angular/common": "^14.1.3", "@angular/common": "^14.1.3",
"@angular/compiler": "^14.1.3", "@angular/compiler": "^14.1.3",

View File

@@ -208,7 +208,7 @@ export class SitesApi extends RepoApi {
async hasMembershipRequest(siteId: string) { async hasMembershipRequest(siteId: string) {
try { try {
await this.apiAuth(); await this.apiAuth();
const requests = (await this.sitesApi.getSiteMembershipRequests('-me-')).list.entries.map((e) => e.entry.id); const requests = (await this.sitesApi.listSiteMembershipRequestsForPerson('-me-')).list.entries.map((e) => e.entry.id);
return requests.includes(siteId); return requests.includes(siteId);
} catch (error) { } catch (error) {
this.handleError(`SitesApi hasMembershipRequest : catch : `, error); this.handleError(`SitesApi hasMembershipRequest : catch : `, error);