fix(edit-content) fix comments

dotCMS · Feb 1, 2024 · d329d26 · d329d26
1 parent 41779d8
commit d329d26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/core-web/apps/dotcms-binary-field-builder/project.json b/core-web/apps/dotcms-binary-field-builder/project.json
@@ -41,11 +41,6 @@
                 ]
             },
             "configurations": {
-                "localhost": {
-                    "sourceMap": true,
-                    "optimization": false,
-                    "watch": true
-                },
                 "production": {
                     "budgets": [
                         {
@@ -67,7 +62,8 @@
                     "vendorChunk": true,
                     "extractLicenses": false,
                     "sourceMap": true,
-                    "namedChunks": true
+                    "namedChunks": true,
+                    "watch": true
                 },
                 "tomcat": {
                     "outputPath": "../../tomcat9/webapps/ROOT/dotcms-binary-field-builder",

diff --git a/...binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.spec.ts b/...binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.spec.ts
@@ -139,8 +139,6 @@ describe('DotBinaryFieldEditorComponent', () => {
                 content: 'test'
             });
 
-            component.form.updateValueAndValidity();
-
             spectator.detectComponentChanges();
 
             tick(355); //due to debounceTime

diff --git a/...tent-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.ts b/...tent-binary-field/components/dot-binary-field-editor/dot-binary-field-editor.component.ts
@@ -61,8 +61,6 @@ const DEFAULT_FILE_TYPE = 'text';
 export class DotBinaryFieldEditorComponent implements OnInit {
     @Input() fileName = '';
     @Input() fileContent = '';
-
-    private readonly languageType = signal(DEFAULT_FILE_TYPE);
     @Output() readonly tempFileUploaded = new EventEmitter<DotCMSTempFile>();
     @Output() readonly cancel = new EventEmitter<void>();
     @ViewChild('editorRef', { static: true }) editorRef!: MonacoEditorComponent;
@@ -71,6 +69,7 @@ export class DotBinaryFieldEditorComponent implements OnInit {
         content: new FormControl('')
     });
     mimeType = '';
+    private readonly languageType = signal(DEFAULT_FILE_TYPE);
     private readonly cd: ChangeDetectorRef = inject(ChangeDetectorRef);
     private readonly dotUploadService: DotUploadService = inject(DotUploadService);
     private readonly dotMessageService: DotMessageService = inject(DotMessageService);
@@ -81,19 +80,19 @@ export class DotBinaryFieldEditorComponent implements OnInit {
     private invalidFileMessage = '';
     private editor: monaco.editor.IStandaloneCodeEditor;
 
-    private _customMonacoOptions = signal<MonacoEditorConstructionOptions>({});
+    private _userMonacoOptions = signal<MonacoEditorConstructionOptions>({});
 
     monacoOptions = computed(() => {
         return {
             ...DEFAULT_BINARY_FIELD_MONACO_CONFIG,
-            ...this._customMonacoOptions(),
+            ...this._userMonacoOptions(),
             language: this.languageType()
         };
     });
 
     @Input()
-    set customMonacoOptions(customMonacoOptions: MonacoEditorConstructionOptions) {
-        this._customMonacoOptions.set(customMonacoOptions);
+    set userMonacoOptions(customMonacoOptions: MonacoEditorConstructionOptions) {
+        this._userMonacoOptions.set(customMonacoOptions);
     }
 
     get name(): FormControl {

diff --git a/...src/lib/fields/dot-edit-content-binary-field/dot-edit-content-binary-field.component.html b/...src/lib/fields/dot-edit-content-binary-field/dot-edit-content-binary-field.component.html
@@ -83,9 +83,9 @@
                 data-testId="url-mode"></dot-dot-binary-field-url-mode>
             <dot-dot-binary-field-editor
                 *ngSwitchCase="BinaryFieldMode.EDITOR"
-                [customMonacoOptions]="customMonacoOptions()"
                 [fileContent]="vm.tempFile?.content || vm.contentlet?.content"
                 [fileName]="vm.tempFile?.fileName || vm.contentlet?.name"
+                [userMonacoOptions]="customMonacoOptions()"
                 (cancel)="closeDialog()"
                 (tempFileUploaded)="setTempFile($event)"
                 data-testId="editor-mode"></dot-dot-binary-field-editor>