From 8941c119ee38f3d53548a3b5d1281cd743bde74f Mon Sep 17 00:00:00 2001 From: MichalKinas Date: Mon, 2 Oct 2023 14:15:33 +0200 Subject: [PATCH] [ACS-5601] Add adf dynamic component to custom name column --- package-lock.json | 26 +++++++++++++++++++ package.json | 1 + .../name-column/name-column.component.html | 5 +++- .../name-column/name-column.component.scss | 20 ++++++++------ .../name-column/name-column.component.ts | 3 ++- projects/aca-shared/package.json | 1 + 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb1b0b59ab..2771d27ea9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@alfresco/adf-content-services": "6.4.0-6341205853", "@alfresco/adf-core": "6.4.0-6341205853", "@alfresco/adf-extensions": "6.4.0-6341205853", + "@alfresco/adf-process-services": "6.4.0-6341205853", "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6341205853", "@alfresco/js-api": "7.1.0-1349", "@angular/animations": "14.1.3", @@ -205,6 +206,31 @@ "@angular/core": ">=14.1.3" } }, + "node_modules/@alfresco/adf-process-services": { + "version": "6.4.0-6341205853", + "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-6.4.0-6341205853.tgz", + "integrity": "sha512-TIHfoqLDgLwJ4dt0QYrlCbuA/cay870Ikty0fWIg2pFWeOAjIEoEJ6Jh8v1Zc/sFTIDBWnZeZynH0ODNCfBwfw==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@alfresco/adf-content-services": ">=6.4.0-6341205853", + "@alfresco/adf-core": ">=6.4.0-6341205853", + "@alfresco/js-api": ">=7.1.0-1349", + "@angular/animations": ">=14.1.3", + "@angular/cdk": ">=14.1.2", + "@angular/common": ">=14.1.3", + "@angular/compiler": ">=14.1.3", + "@angular/core": ">=14.1.3", + "@angular/forms": ">=14.1.3", + "@angular/material": ">=14.1.2", + "@angular/platform-browser": ">=14.1.3", + "@angular/platform-browser-dynamic": ">=14.1.3", + "@angular/router": ">=14.1.3", + "@ngx-translate/core": ">=14.0.0", + "moment": ">=2.22.2" + } + }, "node_modules/@alfresco/adf-testing": { "version": "6.4.0-6341205853", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.4.0-6341205853.tgz", diff --git a/package.json b/package.json index 96a5572aed..aac814960c 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "@alfresco/adf-content-services": "6.4.0-6341205853", "@alfresco/adf-core": "6.4.0-6341205853", "@alfresco/adf-extensions": "6.4.0-6341205853", + "@alfresco/adf-process-services": "6.4.0-6341205853", "@alfresco/eslint-plugin-eslint-angular": "6.4.0-6341205853", "@alfresco/js-api": "7.1.0-1349", "@angular/animations": "14.1.3", diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.html b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.html index 62869c1f4c..800e5d74a9 100644 --- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.html +++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.html @@ -21,7 +21,10 @@
- + + + +
diff --git a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss index c515811ab2..42e3e823c7 100644 --- a/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss +++ b/projects/aca-content/src/lib/components/dl-custom-components/name-column/name-column.component.scss @@ -1,17 +1,13 @@ -.adf-datatable-content-cell.adf-name-column.aca-custom-name-column { - position: unset; -} - -.adf-datatable-list .adf-datatable-link:hover .aca-name-column-badges { - color: var(--adf-theme-foreground-text-color); -} - .aca-custom-name-column { display: flex; align-items: center; justify-content: space-between; width: 100%; + .aca-name-column-badges { + display: flex; + } + .aca-name-column-container { aca-locked-by { display: flex; @@ -27,3 +23,11 @@ } } } + +.adf-datatable-content-cell.adf-name-column.aca-custom-name-column { + position: unset; +} + +.adf-datatable-list .adf-datatable-link:hover .aca-name-column-badges { + color: var(--adf-theme-foreground-text-color); +} 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 d18ae1a521..a952f58f3c 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 @@ -32,10 +32,11 @@ import { LockedByComponent, isLocked, AppExtensionService, Badge } from '@alfres import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { IconModule } from '@alfresco/adf-core'; +import { ExtensionsModule } from '@alfresco/adf-extensions'; @Component({ standalone: true, - imports: [CommonModule, TranslateModule, LockedByComponent, ContentPipeModule, IconModule], + imports: [CommonModule, TranslateModule, LockedByComponent, ContentPipeModule, IconModule, ExtensionsModule], selector: 'aca-custom-name-column', templateUrl: './name-column.component.html', styleUrls: ['./name-column.component.scss'], diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json index abfa150f1f..1467c4bca9 100644 --- a/projects/aca-shared/package.json +++ b/projects/aca-shared/package.json @@ -8,6 +8,7 @@ "@alfresco/adf-content-services": "^6.4.0-6341205853", "@alfresco/adf-core": "^6.4.0-6341205853", "@alfresco/adf-extensions": "^6.4.0-6341205853", + "@alfresco/adf-process-services": "^6.4.0-6341205853", "@alfresco/js-api": "^7.1.0-1349", "@angular/animations": "^14.1.3", "@angular/common": "^14.1.3",