Content Edit: Allow Drag&Drop and select file (#26618)

* dev: fix choose file button * dev: add test
dotCMS · Nov 13, 2023 · 307d112 · 307d112
1 parent d856431
commit 307d112
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.html b/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.html
@@ -22,6 +22,7 @@
                     <button
                         class="binary-field__drop-zone-btn"
                         (click)="openFilePicker()"
+                        type="button"
                         data-testId="choose-file-btn">
                         {{ 'dot.binary.field.action.choose.file' | dm }}
                     </button>

diff --git a/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.spec.ts b/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.spec.ts
@@ -181,6 +181,7 @@ describe('DotBinaryFieldComponent', () => {
             const spyInputFile = jest.spyOn(spectator.component.inputFile.nativeElement, 'click');
             const chooseFile = spectator.query(byTestId('choose-file-btn')) as HTMLButtonElement;
             chooseFile.click();
+            expect(chooseFile.getAttribute('type')).toBe('button');
             expect(spyOpenFilePicker).toHaveBeenCalled();
             expect(spyInputFile).toHaveBeenCalled();
         });

diff --git a/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.ts b/core-web/libs/contenttype-fields/src/lib/fields/binary-field/binary-field.component.ts
@@ -281,7 +281,7 @@ export class DotBinaryFieldComponent
         const variable = this.field.variable;
         const metaDataKey = variable + 'MetaData';
         const { titleImage, inode, [metaDataKey]: metadata } = this.contentlet;
-        const { contentType: mimeType } = metadata;
+        const { contentType: mimeType } = metadata || {};
 
         this.dotBinaryFieldStore.setFileAndContent({
             inode,

diff --git a/dotCMS/src/main/webapp/html/binary-field.js b/dotCMS/src/main/webapp/html/binary-field.js