fix: address PR comments (#335)

Author: makdeniss

projects/wc/src/app/components/generic-ui/list-view/create-resource-modal/create-resource-modal.component.spec.ts

@@ -1,5 +1,4 @@
 import { CreateResourceModalComponent } from './create-resource-modal.component';
-import { DialogMode } from './create-resource-modal.enums';
 import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -59,7 +58,7 @@ describe('CreateResourceModalComponent', () => {
   });
 
   it('should open dialog when open method is called', () => {
-    component.open(DialogMode.Create);
+    component.open();
     expect(mockDialog.open).toBeTruthy();
   });
 
@@ -82,7 +81,7 @@ describe('CreateResourceModalComponent', () => {
 
     const updateSpy = spyOn(component.updateResource, 'emit');
 
-    component.open(DialogMode.Edit, resource);
+    component.open(resource);
     expect(mockDialog.open).toBeTruthy();
 
     expect(component.form.controls['metadata_name'].value).toBe('res1');
@@ -222,10 +221,10 @@ describe('CreateResourceModalComponent', () => {
     expect(component.isCreateFieldOnly(otherField)).toBeFalsy();
   });
 
-  it('should set header to Create and open dialog using open function', () => {
+  it('should open dialog using open function', () => {
     mockDialog.open = false;
 
-    component.open(DialogMode.Create);
+    component.open();
 
     expect(mockDialog.open).toBeTruthy();
   });

projects/wc/src/app/components/generic-ui/list-view/create-resource-modal/create-resource-modal.component.ts

@@ -1,13 +1,9 @@
 import { DynamicSelectComponent } from '../../../dynamic-select/dynamic-select.component';
-import {
-  CreateOnlyResourceFieldNames,
-  DialogMode,
-} from './create-resource-modal.enums';
+import { CreateOnlyResourceFieldNames } from './create-resource-modal.enums';
 import {
   Component,
   OnInit,
   ViewEncapsulation,
-  computed,
   inject,
   input,
   output,
@@ -67,17 +63,14 @@ export class CreateResourceModalComponent implements OnInit {
   fb = inject(FormBuilder);
   form: FormGroup;
 
-  private mode = signal<DialogMode>(DialogMode.Create);
   private originalResource = signal<Resource | null>(null);
 
   ngOnInit(): void {
     this.form = this.fb.group(this.createControls());
   }
 
-  open(dialogMode: DialogMode, resource?: Resource) {
-    this.mode.set(dialogMode);
-
-    if (dialogMode === DialogMode.Edit && resource) {
+  open(resource?: Resource) {
+    if (resource) {
       this.prepareForEdit(resource);
     } else {
       this.prepareForCreate();
@@ -94,7 +87,6 @@ export class CreateResourceModalComponent implements OnInit {
       dialog.open = false;
       this.form.reset();
       this.setEditFieldsDisabled(false);
-      this.mode.set(null);
       this.originalResource.set(null);
     }
   }
@@ -106,9 +98,9 @@ export class CreateResourceModalComponent implements OnInit {
         set(result, key.replaceAll('_', '.'), this.form.value[key]);
       }
 
-      if (this.isEditMode()) {
-        const orig = this.originalResource();
-        if (orig?.metadata) {
+      const orig = this.originalResource();
+      if (orig) {
+        if (orig.metadata) {
           result['metadata'] = { ...orig.metadata, ...result['metadata'] };
         }
         this.updateResource.emit(result);
@@ -141,7 +133,9 @@ export class CreateResourceModalComponent implements OnInit {
     return (property as string).replaceAll('.', '_');
   }
 
-  isEditMode = computed(() => this.mode() === DialogMode.Edit);
+  isEditMode() {
+    return !!this.originalResource();
+  }
 
   isCreateFieldOnly(field: FieldDefinition): boolean {
     return (

projects/wc/src/app/components/generic-ui/list-view/create-resource-modal/create-resource-modal.enums.ts

@@ -1,13 +1,3 @@
-export enum DialogMode {
-  Create = 'create',
-  Edit = 'edit',
-}
-
-export enum DialogHeaderText {
-  Create = 'Create',
-  Edit = 'Edit',
-}
-
 export enum CreateOnlyResourceFieldNames {
   MetadataName = 'metadata.name',
   SpecType = 'spec.type',

projects/wc/src/app/components/generic-ui/list-view/list-view.component.spec.ts

@@ -120,7 +120,7 @@ describe('ListViewComponent', () => {
     const openSpy = jest.fn();
     (component as any).createModal = () => ({ open: openSpy });
     component.openCreateResourceModal();
-    expect(openSpy).toHaveBeenCalledWith('create');
+    expect(openSpy).toHaveBeenCalledWith();
   });
 
   it('should open delete resource modal and stop event propagation', () => {
@@ -144,7 +144,7 @@ describe('ListViewComponent', () => {
     component.openEditResourceModal(event, resource);
 
     expect(event.stopPropagation).toHaveBeenCalled();
-    expect(openSpy).toHaveBeenCalledWith('edit', resource);
+    expect(openSpy).toHaveBeenCalledWith(resource);
   });
 
   it('should check create view fields existence', () => {

projects/wc/src/app/components/generic-ui/list-view/list-view.component.ts

@@ -1,6 +1,5 @@
 import { ValueCellComponent } from '../value-cell/value-cell.component';
 import { CreateResourceModalComponent } from './create-resource-modal/create-resource-modal.component';
-import { DialogMode } from './create-resource-modal/create-resource-modal.enums';
 import { DeleteResourceModalComponent } from './delete-resource-confirmation-modal/delete-resource-modal.component';
 import {
   ChangeDetectionStrategy,
@@ -158,12 +157,12 @@ export class ListViewComponent implements OnInit {
   }
 
   openCreateResourceModal() {
-    this.createModal()?.open(DialogMode.Create);
+    this.createModal()?.open();
   }
 
   openEditResourceModal(event: MouseEvent, resource: Resource) {
     event.stopPropagation?.();
-    this.createModal()?.open(DialogMode.Edit, resource);
+    this.createModal()?.open(resource);
   }
 
   openDeleteResourceModal(event: MouseEvent, resource: Resource) {