diff --git a/package-lock.json b/package-lock.json index 14ff75d6b1..e9233ebe9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,9 @@ "dev": true }, "@alfresco/adf-cli": { - "version": "6.0.0-A.3", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.3.tgz", - "integrity": "sha512-Jy/qsJekSG6z1Z4fVvFnS57EMwoEWSGK2U2Fkiqf2R3kthon9LNNB7hRUiFOKMABfTZtJbj5GCp+5IXGvhPzLQ==", + "version": "6.0.0-A.3-8351", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.0.0-A.3-8351.tgz", + "integrity": "sha512-GoJHx8+75tnclsZ1D8mxZH39ChmfPm2eqt/nRHCH6qJY9Vj6L7zTUr/3HLmQVWG1FJrqz5YadDrmYpd7WovZDA==", "dev": true, "requires": { "@alfresco/js-api": "5.4.0", @@ -25,20 +25,34 @@ "rxjs": "^6.6.6", "shelljs": "^0.8.3", "spdx-license-list": "^5.0.0" + }, + "dependencies": { + "@alfresco/js-api": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-5.4.0.tgz", + "integrity": "sha512-l3ac8bbNh3hXPq3epo8rTW1Su/vNKCivskNoV8cEsrbNC3rHSmhuMGFowlLlA/A7hFv87o5ZSA8Ocuqel8SuTA==", + "dev": true, + "requires": { + "event-emitter": "^0.3.5", + "minimatch": "5.0.1", + "superagent": "^6.0.0", + "tslib": "^2.0.0" + } + } } }, "@alfresco/adf-content-services": { - "version": "6.0.0-A.3", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.3.tgz", - "integrity": "sha512-8sSsGXsfGGh5eZu+4/4oWEhuLer+K+5ShRq1RWFP1Au0HV6ATFHnLIKt56aG2euX1pPTznq1d1cJvNhUmkBu3Q==", + "version": "6.0.0-A.3-8351", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.0.0-A.3-8351.tgz", + "integrity": "sha512-uDCkFD38pFR6q5chWnkyN6KlTgUVNpbkeey+c9w6ejkiHbSKyKaBXQ3I6U7NMO4ho+IU4utEV5JaO8gdazGpJg==", "requires": { "tslib": "^2.3.0" } }, "@alfresco/adf-core": { - "version": "6.0.0-A.3", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.3.tgz", - "integrity": "sha512-yArPqXs+BtHNcP+iZkDU9go8Aca/1afmp61tFUzoqzUiBZ8Wz/6j6d5pDGARteF9MG0I7COGrbGlNSOExQg7cg==", + "version": "6.0.0-A.3-8351", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.0.0-A.3-8351.tgz", + "integrity": "sha512-4BRrCih4dhmJb/3XnCILRqHKNDEAxUzbhJEObMpc+coQD+jB/t4tIsh5f/0U4eFOci9bMbHNFakvdqhsPMzw9g==", "requires": { "@editorjs/code": "2.7.0", "@editorjs/editorjs": "^2.26.5", @@ -48,6 +62,8 @@ "@editorjs/marker": "1.2.2", "@editorjs/underline": "1.0.0", "@quanzo/change-font-size": "1.0.0", + "angular-oauth2-oidc": "^13.0.1", + "angular-oauth2-oidc-jwks": "^13.0.1", "cropperjs": "1.5.13", "editorjs-html": "3.4.2", "editorjs-paragraph-with-alignment": "3.0.0", @@ -56,17 +72,17 @@ } }, "@alfresco/adf-extensions": { - "version": "6.0.0-A.3", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.3.tgz", - "integrity": "sha512-RB7sCvbYdq3YNTWn+DNz54/UqdYydVN3H1M4VXl2BWTgyBgUYkz7eVELN0nozbwnrfO+Zb6KNx+6+YZmpgqEew==", + "version": "6.0.0-A.3-8351", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.0.0-A.3-8351.tgz", + "integrity": "sha512-Z4Sd8s/ZTheB5UJNfPAzQRcF++j9iD8T43VMnnHqd70akvhXbU6OH8UgYbzemoN4GvBFZtmYSO+p683zVsVD1w==", "requires": { "tslib": "^2.3.0" } }, "@alfresco/adf-testing": { - "version": "6.0.0-A.3", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.3.tgz", - "integrity": "sha512-kMd+XsVi9JBXwgwcjtTR0aK8fdj/7l3MJK3iXTbn/Aq7ywm1n0/7HT8ARlQELcNX5T8iE3JZBi+j70Td19Lk3Q==", + "version": "6.0.0-A.3-8351", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.0.0-A.3-8351.tgz", + "integrity": "sha512-K8LAQGbxmXrfmsGv3i01bdE74DouhHDjDnIUVhn2DkeRnoVBgqx+4ZBMso9vUtZd+RNzbBVQ1QSltw9QpVv5Aw==", "dev": true, "requires": { "@alfresco/js-api": "5.4.0", @@ -77,6 +93,18 @@ "zone.js": "~0.11.4" }, "dependencies": { + "@alfresco/js-api": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-5.4.0.tgz", + "integrity": "sha512-l3ac8bbNh3hXPq3epo8rTW1Su/vNKCivskNoV8cEsrbNC3rHSmhuMGFowlLlA/A7hFv87o5ZSA8Ocuqel8SuTA==", + "dev": true, + "requires": { + "event-emitter": "^0.3.5", + "minimatch": "5.0.1", + "superagent": "^6.0.0", + "tslib": "^2.0.0" + } + }, "@angular/compiler": { "version": "14.1.3", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-14.1.3.tgz", @@ -98,12 +126,11 @@ } }, "@alfresco/js-api": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-5.4.0.tgz", - "integrity": "sha512-l3ac8bbNh3hXPq3epo8rTW1Su/vNKCivskNoV8cEsrbNC3rHSmhuMGFowlLlA/A7hFv87o5ZSA8Ocuqel8SuTA==", + "version": "5.5.0-728", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-5.5.0-728.tgz", + "integrity": "sha512-WHWOULaiYUymlcPkS3sCAQVXcd5FmqddCqK/rkldJKKcKAT6qtfU618DotJ2mQoPJ01VxsEisiOrQyo+KeVsoA==", "requires": { "event-emitter": "^0.3.5", - "minimatch": "5.0.1", "superagent": "^6.0.0", "tslib": "^2.0.0" } @@ -6297,6 +6324,24 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, + "angular-oauth2-oidc": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-13.0.1.tgz", + "integrity": "sha512-aL1VIv9Jqoqq31lbpUXIeNpM3GeN/ldb3KOlq0cV92amGpZs9J4YA+2rlJ5V9zb6NFNbvd7XfTntMbnNuS0+CQ==", + "requires": { + "fast-sha256": "^1.3.0", + "tslib": "^2.0.0" + } + }, + "angular-oauth2-oidc-jwks": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/angular-oauth2-oidc-jwks/-/angular-oauth2-oidc-jwks-13.0.1.tgz", + "integrity": "sha512-4WqPMkwgEjRcfPa1j7YMsr+eJXBaJuL2vwQe5KoQV9T5oZZ6gtsUV8RQINFMNiuOOzj6SX+pVfUZo/rp0CDaqg==", + "requires": { + "jsrsasign": "^10.3.0", + "tslib": "^2.0.0" + } + }, "ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -11253,6 +11298,11 @@ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" }, + "fast-sha256": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fast-sha256/-/fast-sha256-1.3.0.tgz", + "integrity": "sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==" + }, "fastq": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz", @@ -13434,6 +13484,11 @@ "verror": "1.10.0" } }, + "jsrsasign": { + "version": "10.6.1", + "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.6.1.tgz", + "integrity": "sha512-emiQ05haY9CRj1Ho/LiuCqr/+8RgJuWdiHYNglIg2Qjfz0n+pnUq9I2QHplXuOMO2EnAW1oCGC1++aU5VoWSlw==" + }, "jszip": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", @@ -14650,6 +14705,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, "requires": { "brace-expansion": "^2.0.1" }, @@ -14658,6 +14714,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, "requires": { "balanced-match": "^1.0.0" } diff --git a/package.json b/package.json index 1adfb82b66..77494d250d 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.0.0-A.3", - "@alfresco/adf-core": "6.0.0-A.3", - "@alfresco/adf-extensions": "6.0.0-A.3", - "@alfresco/js-api": "5.4.0", + "@alfresco/adf-content-services": "6.0.0-A.3-8351", + "@alfresco/adf-core": "6.0.0-A.3-8351", + "@alfresco/adf-extensions": "6.0.0-A.3-8351", + "@alfresco/js-api": "5.5.0-728", "@angular/animations": "14.1.2", "@angular/cdk": "14.1.2", "@angular/common": "14.1.2", @@ -64,8 +64,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.0.0-A.3", - "@alfresco/adf-testing": "6.0.0-A.3", + "@alfresco/adf-cli": "6.0.0-A.3-8351", + "@alfresco/adf-testing": "6.0.0-A.3-8351", "@angular-custom-builders/lite-serve": "^0.2.3", "@angular-devkit/build-angular": "14.1.2", "@angular-eslint/builder": "^14.1.2", diff --git a/projects/aca-about/src/lib/about.component.ts b/projects/aca-about/src/lib/about.component.ts index 295271dd54..ecb4131559 100644 --- a/projects/aca-about/src/lib/about.component.ts +++ b/projects/aca-about/src/lib/about.component.ts @@ -27,7 +27,8 @@ import { Component, Inject, OnInit, Optional } from '@angular/core'; import { DEV_MODE_TOKEN } from './dev-mode.tokens'; import { Observable } from 'rxjs'; import { AppExtensionService, ExtensionRef } from '@alfresco/adf-extensions'; -import { AuthenticationService, DiscoveryApiService, RepositoryInfo } from '@alfresco/adf-core'; +import { AuthenticationService, RepositoryInfo } from '@alfresco/adf-core'; +import { DiscoveryApiService } from '@alfresco/adf-content-services'; import { PACKAGE_JSON } from './package-json.token'; @Component({ diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts index 720b8a6353..4b325359d5 100644 --- a/projects/aca-content/src/lib/aca-content.module.ts +++ b/projects/aca-content/src/lib/aca-content.module.ts @@ -120,8 +120,8 @@ import { AppTrashcanModule } from './components/trashcan/trashcan.module'; import { AppSharedLinkViewModule } from './components/shared-link-view/shared-link-view.module'; import { AcaFolderRulesModule } from '@alfresco/aca-folder-rules'; import { TagsColumnComponent } from './components/dl-custom-components/tags-column/tags-column.component'; -import { UserInfoComponent } from './components/common/user-info/user-info.component'; import { ContentManagementService } from './services/content-management.service'; +import { UserInfoComponent } from './components/common/user-info/user-info.component'; registerLocaleData(localeFr); registerLocaleData(localeDe); diff --git a/projects/aca-content/src/lib/components/common/user-info/user-info.component.ts b/projects/aca-content/src/lib/components/common/user-info/user-info.component.ts index b346955898..a0897ee839 100644 --- a/projects/aca-content/src/lib/components/common/user-info/user-info.component.ts +++ b/projects/aca-content/src/lib/components/common/user-info/user-info.component.ts @@ -6,9 +6,10 @@ * agreement is prohibited. */ -import { EcmUserModel, IdentityUserModel, PeopleContentService, IdentityUserService, AuthenticationService, UserInfoMode } from '@alfresco/adf-core'; +import { IdentityUserModel, IdentityUserService, AuthenticationService, UserInfoMode } from '@alfresco/adf-core'; import { Component, OnInit } from '@angular/core'; import { Observable, of } from 'rxjs'; +import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services'; @Component({ selector: 'app-user-info', diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts index f81d553bce..22f5416328 100644 --- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts +++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.ts @@ -23,8 +23,7 @@ * along with Alfresco. If not, see . */ -import { NameColumnComponent } from '@alfresco/adf-content-services'; -import { NodesApiService } from '@alfresco/adf-core'; +import { NameColumnComponent, NodesApiService } from '@alfresco/adf-content-services'; import { ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { Actions, ofType } from '@ngrx/effects'; import { Subject } from 'rxjs'; diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.ts index a84a6cd8ab..9002dd5d3a 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.ts +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.ts @@ -25,7 +25,7 @@ import { AppExtensionService, ContentApiService, PageComponent } from '@alfresco/aca-shared'; import { AppStore } from '@alfresco/aca-shared/store'; -import { UploadService } from '@alfresco/adf-core'; +import { UploadService } from '@alfresco/adf-content-services'; import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, PathInfo } from '@alfresco/js-api'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { Component, OnInit } from '@angular/core'; 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 8639ba66d3..40f4932ffb 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 @@ -26,8 +26,15 @@ import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA, SimpleChange, SimpleChanges } from '@angular/core'; import { Router, ActivatedRoute, convertToParamMap } from '@angular/router'; -import { DataTableComponent, UploadService, AppConfigModule, DataTableModule, PaginationModule } from '@alfresco/adf-core'; -import { DocumentListComponent, DocumentListService, FilterSearch, PathElementEntity, NodeFavoriteDirective } from '@alfresco/adf-content-services'; +import { DataTableComponent, AppConfigModule, DataTableModule, PaginationModule } from '@alfresco/adf-core'; +import { + DocumentListComponent, + DocumentListService, + FilterSearch, + PathElementEntity, + NodeFavoriteDirective, + UploadService +} from '@alfresco/adf-content-services'; import { NodeActionsService } from '../../services/node-actions.service'; import { FilesComponent } from './files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/projects/aca-content/src/lib/components/files/files.component.ts b/projects/aca-content/src/lib/components/files/files.component.ts index 88626d672e..57150e807e 100644 --- a/projects/aca-content/src/lib/components/files/files.component.ts +++ b/projects/aca-content/src/lib/components/files/files.component.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { FileUploadEvent, ShowHeaderMode, UploadService } from '@alfresco/adf-core'; +import { ShowHeaderMode } from '@alfresco/adf-core'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { Store } from '@ngrx/store'; @@ -34,7 +34,7 @@ import { AppExtensionService, ContentApiService, PageComponent } from '@alfresco import { SetCurrentFolderAction, isAdmin, AppStore, UploadFileVersionAction, showLoaderSelector } from '@alfresco/aca-shared/store'; import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { debounceTime, takeUntil } from 'rxjs/operators'; -import { FilterSearch, ShareDataRow } from '@alfresco/adf-content-services'; +import { FilterSearch, ShareDataRow, UploadService, FileUploadEvent } from '@alfresco/adf-content-services'; import { DocumentListPresetRef } from '@alfresco/adf-extensions'; import { Observable } from 'rxjs'; diff --git a/projects/aca-content/src/lib/components/layout/app-layout/app-layout.component.spec.ts b/projects/aca-content/src/lib/components/layout/app-layout/app-layout.component.spec.ts index aece3d0631..4c385cb222 100644 --- a/projects/aca-content/src/lib/components/layout/app-layout/app-layout.component.spec.ts +++ b/projects/aca-content/src/lib/components/layout/app-layout/app-layout.component.spec.ts @@ -25,7 +25,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { AppConfigService, FileModel, UploadService, UserPreferencesService } from '@alfresco/adf-core'; +import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core'; +import { FileModel, UploadService } from '@alfresco/adf-content-services'; import { AppLayoutComponent } from './app-layout.component'; import { AppTestingModule } from '../../../testing/app-testing.module'; import { Store } from '@ngrx/store'; diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts index 77e6920a5f..97eae05ddc 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.ts @@ -29,7 +29,7 @@ import { MinimalNodeEntity } from '@alfresco/js-api'; import { ContentManagementService } from '../../services/content-management.service'; import { Store } from '@ngrx/store'; import { AppStore } from '@alfresco/aca-shared/store'; -import { UploadService } from '@alfresco/adf-core'; +import { UploadService } from '@alfresco/adf-content-services'; import { debounceTime } from 'rxjs/operators'; import { Router } from '@angular/router'; import { AppExtensionService, PageComponent } from '@alfresco/aca-shared'; diff --git a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts index 0e67cbb67f..82b4c633e8 100644 --- a/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts +++ b/projects/aca-content/src/lib/components/search/search-results-row/search-results-row.component.ts @@ -28,7 +28,7 @@ import { MinimalNodeEntity } from '@alfresco/js-api'; import { ViewNodeAction, NavigateToFolder } from '@alfresco/aca-shared/store'; import { Store } from '@ngrx/store'; import { BehaviorSubject, Subject } from 'rxjs'; -import { NodesApiService } from '@alfresco/adf-core'; +import { NodesApiService } from '@alfresco/adf-content-services'; import { takeUntil } from 'rxjs/operators'; import { Router } from '@angular/router'; diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts index 6d6d92d803..8def5e8987 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.ts @@ -28,7 +28,7 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout'; import { ContentManagementService } from '../../services/content-management.service'; import { Store } from '@ngrx/store'; import { debounceTime } from 'rxjs/operators'; -import { UploadService } from '@alfresco/adf-core'; +import { UploadService } from '@alfresco/adf-content-services'; import { Router } from '@angular/router'; import { MinimalNodeEntity } from '@alfresco/js-api'; import { AppExtensionService, AppHookService, PageComponent } from '@alfresco/aca-shared'; diff --git a/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts b/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts index b928f0939f..a1d6060f65 100644 --- a/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts +++ b/projects/aca-content/src/lib/components/view-profile/view-profile.component.spec.ts @@ -12,6 +12,7 @@ import { AppTestingModule } from '../../testing/app-testing.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { MatDividerModule } from '@angular/material/divider'; describe('ViewProfileComponent', () => { let fixture: ComponentFixture; @@ -20,7 +21,7 @@ describe('ViewProfileComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [AppTestingModule, AppConfigModule, FormsModule, ReactiveFormsModule], + imports: [AppTestingModule, AppConfigModule, FormsModule, ReactiveFormsModule, MatDividerModule], declarations: [ViewProfileComponent] }); diff --git a/projects/aca-content/src/lib/services/content-management.service.spec.ts b/projects/aca-content/src/lib/services/content-management.service.spec.ts index 1117b06c97..482adffb7b 100644 --- a/projects/aca-content/src/lib/services/content-management.service.spec.ts +++ b/projects/aca-content/src/lib/services/content-management.service.spec.ts @@ -53,11 +53,18 @@ import { AppHookService, ContentApiService } from '@alfresco/aca-shared'; import { Store } from '@ngrx/store'; import { ContentManagementService } from './content-management.service'; import { NodeActionsService } from './node-actions.service'; -import { TranslationService, NodesApiService, FileModel, NotificationService } from '@alfresco/adf-core'; +import { TranslationService, NotificationService } from '@alfresco/adf-core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; import { NodeEntry, Node, VersionPaging, MinimalNodeEntity } from '@alfresco/js-api'; -import { NewVersionUploaderDataAction, NewVersionUploaderService, NodeAspectService, ViewVersion } from '@alfresco/adf-content-services'; +import { + NewVersionUploaderDataAction, + NewVersionUploaderService, + NodeAspectService, + ViewVersion, + NodesApiService, + FileModel +} from '@alfresco/adf-content-services'; describe('ContentManagementService', () => { let dialog: MatDialog; diff --git a/projects/aca-content/src/lib/services/content-management.service.ts b/projects/aca-content/src/lib/services/content-management.service.ts index 30980083c1..1ff7860104 100644 --- a/projects/aca-content/src/lib/services/content-management.service.ts +++ b/projects/aca-content/src/lib/services/content-management.service.ts @@ -54,9 +54,10 @@ import { NewVersionUploaderService, NewVersionUploaderDialogData, NewVersionUploaderData, - NewVersionUploaderDataAction + NewVersionUploaderDataAction, + NodesApiService } from '@alfresco/adf-content-services'; -import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core'; +import { TranslationService, NotificationService } from '@alfresco/adf-core'; import { DeletedNodesPaging, MinimalNodeEntity, diff --git a/projects/aca-content/src/lib/services/node-actions.service.ts b/projects/aca-content/src/lib/services/node-actions.service.ts index aeac3a76c7..e3b10b1666 100644 --- a/projects/aca-content/src/lib/services/node-actions.service.ts +++ b/projects/aca-content/src/lib/services/node-actions.service.ts @@ -26,14 +26,15 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Observable, Subject, of, zip, from } from 'rxjs'; -import { AlfrescoApiService, ContentService, DataColumn, TranslationService, ThumbnailService } from '@alfresco/adf-core'; +import { AlfrescoApiService, DataColumn, TranslationService, ThumbnailService } from '@alfresco/adf-core'; import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData, ContentNodeDialogService, ShareDataRow, - NodeAction + NodeAction, + ContentService } from '@alfresco/adf-content-services'; import { MinimalNodeEntity, diff --git a/projects/aca-content/src/lib/store/effects/download.effects.ts b/projects/aca-content/src/lib/store/effects/download.effects.ts index 782217bd2c..04557317e1 100644 --- a/projects/aca-content/src/lib/store/effects/download.effects.ts +++ b/projects/aca-content/src/lib/store/effects/download.effects.ts @@ -24,7 +24,7 @@ */ import { AppStore, DownloadNodesAction, NodeActionTypes, NodeInfo, getAppSelection, getCurrentVersion } from '@alfresco/aca-shared/store'; -import { DownloadZipDialogComponent } from '@alfresco/adf-core'; +import { DownloadZipDialogComponent } from '@alfresco/adf-content-services'; import { MinimalNodeEntity, Version } from '@alfresco/js-api'; import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; diff --git a/projects/aca-content/src/lib/store/effects/node.effects.spec.ts b/projects/aca-content/src/lib/store/effects/node.effects.spec.ts index b71373c919..0d94f6985d 100644 --- a/projects/aca-content/src/lib/store/effects/node.effects.spec.ts +++ b/projects/aca-content/src/lib/store/effects/node.effects.spec.ts @@ -50,7 +50,7 @@ import { ManagePermissionsAction, ShowLoaderAction } from '@alfresco/aca-shared/store'; -import { RenditionViewerService } from '@alfresco/adf-content-services'; +import { RenditionService } from '@alfresco/adf-content-services'; import { ViewerEffects } from './viewer.effects'; import { Router } from '@angular/router'; import { of } from 'rxjs'; @@ -58,19 +58,19 @@ import { of } from 'rxjs'; describe('NodeEffects', () => { let store: Store; let contentService: ContentManagementService; - let renditionViewerService: RenditionViewerService; + let renditionViewerService: RenditionService; let viewerEffects: ViewerEffects; let router: Router; beforeEach(() => { TestBed.configureTestingModule({ imports: [AppTestingModule, SharedStoreModule, EffectsModule.forRoot([NodeEffects, ViewerEffects])], - providers: [RenditionViewerService] + providers: [RenditionService] }); store = TestBed.inject(Store); contentService = TestBed.inject(ContentManagementService); - renditionViewerService = TestBed.inject(RenditionViewerService); + renditionViewerService = TestBed.inject(RenditionService); viewerEffects = TestBed.inject(ViewerEffects); router = TestBed.inject(Router); }); diff --git a/projects/aca-content/src/lib/store/effects/node.effects.ts b/projects/aca-content/src/lib/store/effects/node.effects.ts index f69485df97..2f146e67a9 100644 --- a/projects/aca-content/src/lib/store/effects/node.effects.ts +++ b/projects/aca-content/src/lib/store/effects/node.effects.ts @@ -53,7 +53,7 @@ import { ShowLoaderAction } from '@alfresco/aca-shared/store'; import { ContentManagementService } from '../../services/content-management.service'; -import { RenditionViewerService } from '@alfresco/adf-content-services'; +import { RenditionService } from '@alfresco/adf-content-services'; @Injectable() export class NodeEffects { @@ -61,7 +61,7 @@ export class NodeEffects { private store: Store, private actions$: Actions, private contentService: ContentManagementService, - private renditionViewer: RenditionViewerService + private renditionViewer: RenditionService ) {} shareNode$ = createEffect( diff --git a/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts b/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts index 72e928f918..2618be16b1 100644 --- a/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts +++ b/projects/aca-content/src/lib/store/effects/upload.effects.spec.ts @@ -29,7 +29,7 @@ import { EffectsModule } from '@ngrx/effects'; import { UploadEffects } from './upload.effects'; import { AppTestingModule } from '../../testing/app-testing.module'; import { NgZone } from '@angular/core'; -import { UploadService, FileUploadCompleteEvent, FileModel } from '@alfresco/adf-core'; +import { UploadService, FileUploadCompleteEvent, FileModel } from '@alfresco/adf-content-services'; import { UnlockWriteAction, UploadFilesAction, UploadFileVersionAction, UploadFolderAction } from '@alfresco/aca-shared/store'; import { ContentManagementService } from '../../services/content-management.service'; diff --git a/projects/aca-content/src/lib/store/effects/upload.effects.ts b/projects/aca-content/src/lib/store/effects/upload.effects.ts index e8afbef98b..77249bf1e1 100644 --- a/projects/aca-content/src/lib/store/effects/upload.effects.ts +++ b/projects/aca-content/src/lib/store/effects/upload.effects.ts @@ -33,7 +33,7 @@ import { UploadFolderAction, getCurrentFolder } from '@alfresco/aca-shared/store'; -import { FileModel, FileUtils, UploadService } from '@alfresco/adf-core'; +import { FileUtils } from '@alfresco/adf-core'; import { Injectable, NgZone, RendererFactory2 } from '@angular/core'; import { Actions, ofType, createEffect } from '@ngrx/effects'; import { Store } from '@ngrx/store'; @@ -41,6 +41,7 @@ import { of } from 'rxjs'; import { catchError, map, take } from 'rxjs/operators'; import { ContentManagementService } from '../../services/content-management.service'; import { MinimalNodeEntryEntity } from '@alfresco/js-api'; +import { UploadService, FileModel } from '@alfresco/adf-content-services'; @Injectable() export class UploadEffects { diff --git a/projects/aca-content/src/lib/testing/app-testing.module.ts b/projects/aca-content/src/lib/testing/app-testing.module.ts index a6b11970b7..91b83e098f 100644 --- a/projects/aca-content/src/lib/testing/app-testing.module.ts +++ b/projects/aca-content/src/lib/testing/app-testing.module.ts @@ -30,11 +30,11 @@ import { TranslationService, TranslationMock, AuthenticationService, - DiscoveryApiService, AlfrescoApiService, PipeModule, AlfrescoApiServiceMock } from '@alfresco/adf-core'; +import { DiscoveryApiService } from '@alfresco/adf-content-services'; import { RepositoryInfo } from '@alfresco/js-api'; import { HttpClientModule } from '@angular/common/http'; import { StoreModule } from '@ngrx/store'; diff --git a/projects/aca-content/src/lib/ui/colors.scss b/projects/aca-content/src/lib/ui/colors.scss index 377bdc1484..8784ff49cc 100644 --- a/projects/aca-content/src/lib/ui/colors.scss +++ b/projects/aca-content/src/lib/ui/colors.scss @@ -14,20 +14,20 @@ $aca-primary-blue: ( A400: #2a7de1, A700: #00c1de, contrast: ( - 50: #000000, - 100: #000000, - 200: #000000, - 300: #ffffff, - 400: #ffffff, - 500: #ffffff, - 600: #ffffff, - 700: #ffffff, - 800: #ffffff, - 900: #ffffff, - A100: #ffffff, - A200: #ffffff, - A400: #ffffff, - A700: #000000 + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: $black-87-opacity, + 400: $black-87-opacity, + 500: white, + 600: white, + 700: white, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: white, + A400: white, + A700: white, ) ); @@ -47,20 +47,20 @@ $aca-accent-green: ( A400: #76bc21, A700: #c2e76b, contrast: ( - 50: #000000, - 100: #000000, - 200: #000000, - 300: #000000, - 400: #000000, - 500: #ffffff, - 600: #ffffff, - 700: #ffffff, - 800: #ffffff, - 900: #ffffff, - A100: #ffffff, - A200: #ffffff, - A400: #000000, - A700: #000000 + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: $black-87-opacity, + 400: $black-87-opacity, + 500: white, + 600: white, + 700: white, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: white, + A400: white, + A700: white, ) ); @@ -80,19 +80,19 @@ $aca-warn: ( A400: #ff5252, A700: #ff8a80, contrast: ( - 50: #000000, - 100: #000000, - 200: #000000, - 300: #ffffff, - 400: #ffffff, - 500: #ffffff, - 600: #ffffff, - 700: #ffffff, - 800: #ffffff, - 900: #ffffff, - A100: #ffffff, - A200: #ffffff, - A400: #ffffff, - A700: #000000 + 50: $black-87-opacity, + 100: $black-87-opacity, + 200: $black-87-opacity, + 300: $black-87-opacity, + 400: $black-87-opacity, + 500: white, + 600: white, + 700: white, + 800: $white-87-opacity, + 900: $white-87-opacity, + A100: $black-87-opacity, + A200: white, + A400: white, + A700: white, ) ); diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss index 24dbd50686..3acf71c614 100644 --- a/projects/aca-content/src/lib/ui/variables/variables.scss +++ b/projects/aca-content/src/lib/ui/variables/variables.scss @@ -7,23 +7,10 @@ $foreground: map-get($custom-theme, foreground); $background: map-get($custom-theme, background); //Custom variables - ACA specific styling: -$document-list-selection-color: mat.get-color-from-palette($alfresco-ecm-blue, 500); -$document-list-background: white; -$data-table-dividers-wrapper-border: none; $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 150px; $data-table-cell-min-width--no-grow: 120px; -$data-table-cell-min-width--fileSize: 110px !important; -$data-table-cell-text-color: mat.get-color-from-palette($foreground, text, 0.54); -$data-table-cell-link-color: mat.get-color-from-palette($foreground, text); -$data-table-hover-color: #e3fafd; -$data-table-selection-color: #e3fafd; - -$adf-pagination--border: 1px solid mat.get-color-from-palette($foreground, text, 0.07); -$adf-pagination__empty--height: 0; - -$adf-toolbar-single-row-height: 48px; -$adf-toolbar-padding: 14px; +$data-table-cell-min-width--file-size: 110px !important; $adf-upload-dragging-color: unset; $adf-upload-dragging-border: 1px solid #00bcd4; @@ -31,8 +18,6 @@ $adf-upload-dragging-background: #e0f7fa; $adf-upload-dragging-level1-color: unset; $adf-upload-dragging-level1-border: none; -$adf-permission-list-width: 100%; - $grey-background: rgba(33, 33, 33, 0.12); $grey-text-background: rgba(33, 33, 33, 0.05); $grey-hover-background: rgba(33, 33, 33, 0.24); diff --git a/projects/aca-preview/src/lib/components/preview.component.spec.ts b/projects/aca-preview/src/lib/components/preview.component.spec.ts index e57db10071..74b3903960 100644 --- a/projects/aca-preview/src/lib/components/preview.component.spec.ts +++ b/projects/aca-preview/src/lib/components/preview.component.spec.ts @@ -27,16 +27,14 @@ import { Router, ActivatedRoute } from '@angular/router'; import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing'; import { UserPreferencesService, - UploadService, - NodesApiService, AlfrescoApiService, AlfrescoApiServiceMock, AuthenticationService, - DiscoveryApiService, TranslationMock, TranslationService, PipeModule } from '@alfresco/adf-core'; +import { UploadService, NodesApiService, DiscoveryApiService } from '@alfresco/adf-content-services'; import { AppState, ClosePreviewAction } from '@alfresco/aca-shared/store'; import { PreviewComponent } from './preview.component'; import { BehaviorSubject, Observable, of, throwError } from 'rxjs'; diff --git a/projects/aca-preview/src/lib/components/preview.component.ts b/projects/aca-preview/src/lib/components/preview.component.ts index 88ce952775..95d5347828 100644 --- a/projects/aca-preview/src/lib/components/preview.component.ts +++ b/projects/aca-preview/src/lib/components/preview.component.ts @@ -27,7 +27,7 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation, HostListener } from '@ import { Location } from '@angular/common'; import { ActivatedRoute, Router, UrlTree, UrlSegmentGroup, UrlSegment, PRIMARY_OUTLET } from '@angular/router'; import { debounceTime, map, takeUntil } from 'rxjs/operators'; -import { UserPreferencesService, ObjectUtils, UploadService, NodesApiService } from '@alfresco/adf-core'; +import { UserPreferencesService, ObjectUtils } from '@alfresco/adf-core'; import { Store } from '@ngrx/store'; import { AppStore, ClosePreviewAction, ViewerActionTypes, SetSelectedNodesAction } from '@alfresco/aca-shared/store'; import { PageComponent, AppExtensionService, AppHookService, ContentApiService, DocumentBasePageService } from '@alfresco/aca-shared'; @@ -35,6 +35,7 @@ import { ContentActionRef, ViewerExtensionRef } from '@alfresco/adf-extensions'; import { SearchRequest } from '@alfresco/js-api'; import { from } from 'rxjs'; import { Actions, ofType } from '@ngrx/effects'; +import { NodesApiService, UploadService } from '@alfresco/adf-content-services'; @Component({ selector: 'app-preview', diff --git a/projects/aca-shared/src/lib/services/app.service.spec.ts b/projects/aca-shared/src/lib/services/app.service.spec.ts index 9c3735399d..c4727c5701 100644 --- a/projects/aca-shared/src/lib/services/app.service.spec.ts +++ b/projects/aca-shared/src/lib/services/app.service.spec.ts @@ -31,15 +31,13 @@ import { AlfrescoApiService, PageTitleService, UserPreferencesService, - UploadService, AlfrescoApiServiceMock, TranslationMock, - TranslationService, - DiscoveryApiService + TranslationService } from '@alfresco/adf-core'; import { BehaviorSubject, Observable, of, Subject } from 'rxjs'; import { HttpClientModule } from '@angular/common/http'; -import { SharedLinksApiService, GroupService, SearchQueryBuilderService } from '@alfresco/adf-content-services'; +import { SharedLinksApiService, GroupService, SearchQueryBuilderService, UploadService, DiscoveryApiService } from '@alfresco/adf-content-services'; import { ActivatedRoute, Router } from '@angular/router'; import { ContentApiService } from './content-api.service'; import { RouterExtensionService } from './router.extension.service'; diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts index bc442c91f8..5f4f6bb0b3 100644 --- a/projects/aca-shared/src/lib/services/app.service.ts +++ b/projects/aca-shared/src/lib/services/app.service.ts @@ -24,17 +24,9 @@ */ import { Inject, Injectable, OnDestroy } from '@angular/core'; -import { - AuthenticationService, - AppConfigService, - AlfrescoApiService, - UploadService, - FileUploadErrorEvent, - PageTitleService, - UserPreferencesService -} from '@alfresco/adf-core'; +import { AuthenticationService, AppConfigService, AlfrescoApiService, PageTitleService, UserPreferencesService } from '@alfresco/adf-core'; import { Observable, BehaviorSubject, Subject } from 'rxjs'; -import { GroupService, SearchQueryBuilderService, SharedLinksApiService } from '@alfresco/adf-content-services'; +import { GroupService, SearchQueryBuilderService, SharedLinksApiService, UploadService, FileUploadErrorEvent } from '@alfresco/adf-content-services'; import { OverlayContainer } from '@angular/cdk/overlay'; import { ActivatedRoute, ActivationEnd, NavigationStart, Router } from '@angular/router'; import { filter, map, takeUntil, tap } from 'rxjs/operators'; diff --git a/projects/aca-viewer/src/lib/components/viewer/viewer.component.ts b/projects/aca-viewer/src/lib/components/viewer/viewer.component.ts index 315a060ab2..ee8f75af8f 100644 --- a/projects/aca-viewer/src/lib/components/viewer/viewer.component.ts +++ b/projects/aca-viewer/src/lib/components/viewer/viewer.component.ts @@ -40,11 +40,12 @@ import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions'; import { MinimalNodeEntryEntity, SearchRequest, VersionEntry, VersionsApi } from '@alfresco/js-api'; import { Component, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, PRIMARY_OUTLET, Router } from '@angular/router'; -import { AlfrescoApiService, ObjectUtils, UploadService, UserPreferencesService, NodesApiService } from '@alfresco/adf-core'; +import { AlfrescoApiService, ObjectUtils, UserPreferencesService } from '@alfresco/adf-core'; import { Store } from '@ngrx/store'; import { from, Observable, Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { Actions, ofType } from '@ngrx/effects'; +import { NodesApiService, UploadService } from '@alfresco/adf-content-services'; @Component({ selector: 'aca-viewer',