inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-6831] Correctly pass stored displayAspect to metadata component (#3663)

Browse Source 
* [ACS-6831] Correctly pass stored displayAspect to metadata component

* [ACS-6831] Bump ADF version
This commit is contained in:
MichalKinas
2024-02-26 12:30:45 +01:00
committed by GitHub
parent 8ca0d69f1a
commit 8c45ab95b7
3 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
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.7.0-8009374031", "@alfresco/adf-content-services": "6.7.0-8045358395",
"@alfresco/adf-core": "6.7.0-8009374031", "@alfresco/adf-core": "6.7.0-8045358395",
"@alfresco/adf-extensions": "6.7.0-8009374031", "@alfresco/adf-extensions": "6.7.0-8045358395",
"@alfresco/eslint-plugin-eslint-angular": "6.7.0-8009374031", "@alfresco/eslint-plugin-eslint-angular": "6.7.0-8045358395",
"@alfresco/js-api": "7.6.0-8009374031", "@alfresco/js-api": "7.6.0-8045358395",
"@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",
@@ -42,7 +42,7 @@
"zone.js": "0.11.8" "zone.js": "0.11.8"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "6.7.0-8009374031", "@alfresco/adf-cli": "6.7.0-8045358395",
"@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",
@@ -123,12 +123,12 @@
"dev": true "dev": true
}, },
"node_modules/@alfresco/adf-cli": { "node_modules/@alfresco/adf-cli": {
"version": "6.7.0-8009374031", "version": "6.7.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-8045358395.tgz",
"integrity": "sha512-LOqzbYRbnu8LjI0WRrMha9uyaQjRrBy30gW8a6oMIzHcXcZCulFeMjV9CRFcl1lmnJNdjj0HpjxhD+3txs1gtA==", "integrity": "sha512-i3ze7KD+6HXird+NeBh6WxsQCziJpXOeL3moE6ZeoXag2KnBFbdBlPjo0+X920sEvJhERonFnWsshwsxGZbU2w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@alfresco/js-api": ">=7.6.0-8009374031", "@alfresco/js-api": ">=7.6.0-8045358395",
"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",
@@ -143,15 +143,15 @@
} }
}, },
"node_modules/@alfresco/adf-content-services": { "node_modules/@alfresco/adf-content-services": {
"version": "6.7.0-8009374031", "version": "6.7.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-8045358395.tgz",
"integrity": "sha512-Itm90fVYUTwFLwKHPY4qQXe7oZVscOcKvMsiDXtPWa/X1EMDr0CS0UHKoISxK4Ywd+dXmYtIwy1nDPVXix85VA==", "integrity": "sha512-pXdcnCcIiNtR2ntgZdIGSTYry3ESBA3YY4kfGbHnoS+FsXD7r03TBQBQQErsj6FykcMyKCDVpWSh9AHlXxudOg==",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/adf-core": ">=6.7.0-8009374031", "@alfresco/adf-core": ">=6.7.0-8045358395",
"@alfresco/js-api": ">=7.6.0-8009374031", "@alfresco/js-api": ">=7.6.0-8045358395",
"@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",
@@ -166,9 +166,9 @@
} }
}, },
"node_modules/@alfresco/adf-core": { "node_modules/@alfresco/adf-core": {
"version": "6.7.0-8009374031", "version": "6.7.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-8045358395.tgz",
"integrity": "sha512-qdi7DCYb5qvEBBwJgAzV0il5yJVRzR2mTJLNojbIO/Fw1xYnywXw5ftTtXtfxUKfGrB1yS2+QOn5E+GeKgRYLg==", "integrity": "sha512-Y3UOh2+1fivbNE4pVVO9rHDTvNRWe+ZglysCbI+7vkzA7+MpC0eAqENBMAV/XKNXGDzvwSPTM+NZEfrns3lw+w==",
"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",
@@ -176,8 +176,8 @@
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/adf-extensions": ">=6.7.0-8009374031", "@alfresco/adf-extensions": ">=6.7.0-8045358395",
"@alfresco/js-api": ">=7.6.0-8009374031", "@alfresco/js-api": ">=7.6.0-8045358395",
"@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",
@@ -192,27 +192,27 @@
} }
}, },
"node_modules/@alfresco/adf-extensions": { "node_modules/@alfresco/adf-extensions": {
"version": "6.7.0-8009374031", "version": "6.7.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-8045358395.tgz",
"integrity": "sha512-2ECWJvACM5/4aAhvLBvIoB929qqTDzF+ROMjO+3e8NKrpe155AFFWh6+1jDLzSRhoxR7IC5YKSeTC6XQzLdM9Q==", "integrity": "sha512-NQrB2DfCoyZPYoioWtY8awei23k6u+294nthEqy1Uq4WXrieuParrMhAmbzvu9Gkf7+0fppD4uvY5kVh+dwQvg==",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "tslib": "^2.3.0"
}, },
"peerDependencies": { "peerDependencies": {
"@alfresco/js-api": ">=7.6.0-8009374031", "@alfresco/js-api": ">=7.6.0-8045358395",
"@angular/common": ">=14.1.3", "@angular/common": ">=14.1.3",
"@angular/core": ">=14.1.3" "@angular/core": ">=14.1.3"
} }
}, },
"node_modules/@alfresco/eslint-plugin-eslint-angular": { "node_modules/@alfresco/eslint-plugin-eslint-angular": {
"version": "6.7.0-8009374031", "version": "6.7.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-8045358395.tgz",
"integrity": "sha512-qqNA9bB2tSEkt+xAU1Nc+07nKFgodVb5NLImKH6B51fHcwm9N9Kn2DWOdpFEPx4h3H4JeBrLgN8wtV0pior5rg==" "integrity": "sha512-d2JpPLT1dv+6U/TeBblrsR2d5o1cPRk+vvoV7UuQwjjiMUWV72mBMvvntTBN6RhdJzgVtU82rcWzeQ6ZKQepOg=="
}, },
"node_modules/@alfresco/js-api": { "node_modules/@alfresco/js-api": {
"version": "7.6.0-8009374031", "version": "7.6.0-8045358395",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-8009374031.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-8045358395.tgz",
"integrity": "sha512-Y+uoa8QfQE9ETIr+JmuXsdKXqTtZSqfMXHhXLWjqrntLLjjxcpO/urnvgMjAM7pjHBF+hugeDSo0sCnLsQBmOw==", "integrity": "sha512-nRZPx+lvFF6gsT3vYFIZHqG39uGOO2PapdIrIAkOrsKCEoujjSb6iqw6UehmmPYPYYoc0Zj25OgpQujQ4pvUiA==",
"dependencies": { "dependencies": {
"event-emitter": "^0.3.5", "event-emitter": "^0.3.5",
"superagent": "^8.0.9", "superagent": "^8.0.9",

12
package.json
View File

@@ -34,11 +34,11 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "6.7.0-8009374031", "@alfresco/adf-content-services": "6.7.0-8045358395",
"@alfresco/adf-core": "6.7.0-8009374031", "@alfresco/adf-core": "6.7.0-8045358395",
"@alfresco/adf-extensions": "6.7.0-8009374031", "@alfresco/adf-extensions": "6.7.0-8045358395",
"@alfresco/eslint-plugin-eslint-angular": "6.7.0-8009374031", "@alfresco/eslint-plugin-eslint-angular": "6.7.0-8045358395",
"@alfresco/js-api": "7.6.0-8009374031", "@alfresco/js-api": "7.6.0-8045358395",
"@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",
@@ -66,7 +66,7 @@
"zone.js": "0.11.8" "zone.js": "0.11.8"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "6.7.0-8009374031", "@alfresco/adf-cli": "6.7.0-8045358395",
"@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",

12
projects/aca-content/src/lib/components/info-drawer/metadata-tab/metadata-tab.component.ts
View File

@@ -25,7 +25,7 @@
import { Component, Input, ViewEncapsulation, OnInit, OnDestroy } from '@angular/core'; import { Component, Input, ViewEncapsulation, OnInit, OnDestroy } from '@angular/core';
import { Node } from '@alfresco/js-api'; import { Node } from '@alfresco/js-api';
import { NodePermissionService, isLocked, AppExtensionService } from '@alfresco/aca-shared'; import { NodePermissionService, isLocked, AppExtensionService } from '@alfresco/aca-shared';
import { EditOfflineAction, NodeActionTypes } from '@alfresco/aca-shared/store'; import { AppStore, EditOfflineAction, NodeActionTypes, infoDrawerMetadataAspect } from '@alfresco/aca-shared/store';
import { AppConfigService, NotificationService } from '@alfresco/adf-core'; import { AppConfigService, NotificationService } from '@alfresco/adf-core';
import { Observable, Subject } from 'rxjs'; import { Observable, Subject } from 'rxjs';
import { import {
@@ -38,6 +38,7 @@ import {
import { filter, map, takeUntil } from 'rxjs/operators'; import { filter, map, takeUntil } from 'rxjs/operators';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Actions, ofType } from '@ngrx/effects'; import { Actions, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
@Component({ @Component({
standalone: true, standalone: true,
@@ -51,6 +52,7 @@ import { Actions, ofType } from '@ngrx/effects';
[customPanels]="customPanels | async" [customPanels]="customPanels | async"
[displayCategories]="displayCategories" [displayCategories]="displayCategories"
[displayTags]="displayTags" [displayTags]="displayTags"
[displayAspect]="metadataAspect"
> >
</adf-content-metadata> </adf-content-metadata>
`, `,
@@ -67,6 +69,7 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
readOnly = false; readOnly = false;
customPanels: Observable<ContentMetadataCustomPanel[]>; customPanels: Observable<ContentMetadataCustomPanel[]>;
metadataAspect: string;
get displayCategories(): boolean { get displayCategories(): boolean {
return this._displayCategories; return this._displayCategories;
@@ -83,7 +86,8 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
private contentMetadataService: ContentMetadataService, private contentMetadataService: ContentMetadataService,
private actions$: Actions, private actions$: Actions,
private tagService: TagService, private tagService: TagService,
private categoryService: CategoryService private categoryService: CategoryService,
private store: Store<AppStore>
) { ) {
if (this.extensions.contentMetadata) { if (this.extensions.contentMetadata) {
this.appConfig.config['content-metadata'].presets = this.extensions.contentMetadata.presets; this.appConfig.config['content-metadata'].presets = this.extensions.contentMetadata.presets;
@@ -115,6 +119,10 @@ export class MetadataTabComponent implements OnInit, OnDestroy {
}), }),
takeUntil(this.onDestroy$) takeUntil(this.onDestroy$)
); );
this.store
.select(infoDrawerMetadataAspect)
.pipe(takeUntil(this.onDestroy$))
.subscribe((metadataAspect) => (this.metadataAspect = metadataAspect));
} }
ngOnDestroy() { ngOnDestroy() {