Fixed bug on publish file contentlet (#27411)

dotCMS · Jan 23, 2024 · 213cd0e · 213cd0e
1 parent e5b18c7
commit 213cd0e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 27 deletions.
diff --git a/...-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html b/...-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.html
@@ -27,7 +27,7 @@
         </div>
 
         <div class="preview-metadata__container">
-            <span class="preview-metadata_header">{{ metadata.name }}</span>
+            <span class="preview-metadata_header">{{ title }}</span>
             <div class="preview-metadata" *ngIf="metadata.width && metadata.height">
                 <i class="pi pi-arrows-alt"></i>
                 <span>{{ metadata.width }} x {{ metadata.height }}</span>

diff --git a/...nt-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.ts b/...nt-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.ts
@@ -62,6 +62,10 @@ export class DotBinaryFieldPreviewComponent implements OnChanges {
         return this.tempFile?.metadata || this.contentletMetadata;
     }
 
+    get title(): string {
+        return this.contentlet?.fileName || this.metadata.name;
+    }
+
     get contentletMetadata(): DotFileMetadata {
         const { metaData = '', fieldVariable = '' } = this.contentlet;
 

diff --git a/...t/src/lib/fields/dot-edit-content-binary-field/dot-edit-content-binary-field.component.ts b/...t/src/lib/fields/dot-edit-content-binary-field/dot-edit-content-binary-field.component.ts
@@ -25,12 +25,7 @@ import { InputTextModule } from 'primeng/inputtext';
 import { delay, filter, skip, tap } from 'rxjs/operators';
 
 import { DotLicenseService, DotMessageService } from '@dotcms/data-access';
-import {
-    DotCMSBaseTypesContentTypes,
-    DotCMSContentTypeField,
-    DotCMSContentlet,
-    DotCMSTempFile
-} from '@dotcms/dotcms-models';
+import { DotCMSContentTypeField, DotCMSContentlet, DotCMSTempFile } from '@dotcms/dotcms-models';
 import {
     DotDropZoneComponent,
     DotMessagePipe,
@@ -111,13 +106,6 @@ export class DotEditContentBinaryFieldComponent
         return this.field.variable;
     }
 
-    private get metaDataKey(): string {
-        const { baseType } = this.contentlet;
-        const isFileAsset = baseType === DotCMSBaseTypesContentTypes.FILEASSET;
-
-        return isFileAsset ? 'metaData' : this.variable + 'MetaData';
-    }
-
     get value(): string {
         return this.contentlet?.[this.variable] ?? this.field.defaultValue;
     }

diff --git a/...dit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.spec.ts b/...dit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.spec.ts
@@ -200,7 +200,7 @@ describe('DotBinaryFieldStore', () => {
 
                 const NEW_BINARY_FIELD_CONTENTLET = {
                     ...BINARY_FIELD_CONTENTLET,
-                    fileAsset: '12345',
+                    fileAssetVersion: '12345',
                     metaData
                 };
 

diff --git a/...ibs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts b/...ibs/edit-content/src/lib/fields/dot-edit-content-binary-field/store/binary-field.store.ts
@@ -4,7 +4,7 @@ import { from, Observable, of } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { switchMap, tap, map, catchError } from 'rxjs/operators';
+import { switchMap, tap, map, catchError, distinctUntilChanged } from 'rxjs/operators';
 
 import { DotLicenseService, DotUploadService } from '@dotcms/data-access';
 import { DotCMSContentlet, DotCMSTempFile } from '@dotcms/dotcms-models';
@@ -53,10 +53,10 @@ export class DotBinaryFieldStore extends ComponentStore<BinaryFieldState> {
         isLoading: state.status === BinaryFieldStatus.UPLOADING
     }));
 
-    readonly value$ = this.select((state) => ({
-        value: state.value,
-        fileName: state.tempFile?.fileName
-    }));
+    readonly value$ = this.select(({ value, tempFile }) => ({
+        value,
+        fileName: tempFile?.fileName
+    })).pipe(distinctUntilChanged((previous, current) => previous.value === current.value));
 
     constructor(
         private readonly dotUploadService: DotUploadService,
@@ -180,10 +180,10 @@ export class DotBinaryFieldStore extends ComponentStore<BinaryFieldState> {
             return contentlet$.pipe(
                 tap(() => this.setUploading()),
                 switchMap((contentlet) => {
-                    const { fileAsset, metaData, fieldVariable } = contentlet;
+                    const { fileAssetVersion, metaData, fieldVariable } = contentlet;
                     const metadata = metaData || contentlet[`${fieldVariable}MetaData`];
                     const { contentType: mimeType, editableAsText, name } = metadata || {};
-                    const contentURL = fileAsset || contentlet[fieldVariable];
+                    const contentURL = fileAssetVersion || contentlet[`${fieldVariable}Version`];
                     const obs$ = editableAsText ? this.getFileContent(contentURL) : of('');
 
                     return obs$.pipe(

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
@@ -750,7 +750,7 @@
                      * This is a workaround to get the contentlet from the API
                      * because there is no way to get the same contentlet the AP retreive from the dwr call.
                      */
-                    fetch('/api/v1/content/<%=contentlet.getInode()%>', {
+                    fetch('/api/v1/content/<%=inode%>', {
                         method: 'GET',
                         headers: {
                             'Content-Type': 'application/json'
@@ -783,13 +783,18 @@
                         const contentBaseType = <%= contentlet.getContentType().baseType().getType() %>;
 
                         binaryField.addEventListener('valueUpdated', ({ detail }) => {
-                            const { id, fileName } = detail;
-                            field.value = id;
+                            const { value, fileName } = detail;
+                            field.value = value;
                             if(contentBaseType === 4){ // FileAsset
                                 let titleField = dijit.byId("title");
                                 let fileNameField = dijit.byId("fileName");
-                                titleField?.setValue(fileName);
-                                fileNameField?.setValue(fileName);
+                                if(!titleField.value ){
+                                    titleField?.setValue(fileName);
+                                }
+
+                                if(!fileNameField.value){
+                                    fileNameField?.setValue(fileName);
+                                }
                             }
                         });