[DSC-1735] fix cherry-pick conflicts

Author: FrancescoMolinaro

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -123,9 +123,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interfac
 import { itemLinksToFollow } from '../../../utils/relation-query.utils';
 import { DynamicConcatModel } from './models/ds-dynamic-concat.model';
 import { Metadata } from '../../../../core/shared/metadata.utils';
-import { DsDynamicMarkdownComponent } from './models/markdown/dynamic-markdown.component';
-import { DYNAMIC_FORM_CONTROL_TYPE_MARKDOWN } from './models/markdown/dynamic-markdown.model';
-import { DynamicLinkModel } from './models/ds-dynamic-link.model';
+import { DynamicLinkModel } from "./models/ds-dynamic-link.model";
 
 export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
   switch (model.type) {
@@ -188,9 +186,6 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
     case DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH:
       return CustomSwitchComponent;
 
-    case DYNAMIC_FORM_CONTROL_TYPE_MARKDOWN:
-      return DsDynamicMarkdownComponent;
-
     default:
       return null;
   }
@@ -503,6 +498,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    * Unsubscribe from all subscriptions
    */
   ngOnDestroy(): void {
+    super.ngOnDestroy();
     this.subs
       .filter((sub) => hasValue(sub))
       .forEach((sub) => sub.unsubscribe());

src/app/shared/form/form.component.ts

@@ -55,9 +55,9 @@ export class FormComponent implements OnDestroy, OnInit {
   @Input() displaySubmit = true;
 
   /**
-   * A boolean that indicate if to display form's cancel button
+   * A boolean that indicate if to display form's reset button
    */
-  @Input() displayCancel = true;
+  @Input() displayReset = true;
 
   /**
    * A String that indicate the entity type of the item
@@ -82,7 +82,7 @@ export class FormComponent implements OnDestroy, OnInit {
   /**
    * i18n key for the cancel button
    */
-  @Input() cancelLabel = 'form.cancel';
+  @Input() resetLabel = 'form.reset';
 
   /**
    * An array of DynamicFormControlModel type
@@ -350,7 +350,6 @@ export class FormComponent implements OnDestroy, OnInit {
   removeItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
     const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as UntypedFormArray;
     const event = this.getEvent($event, arrayContext, index, 'remove');
-    console.log(formArrayControl, event);
     if (this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel) || this.isInlineGroupForm) {
       // In case of qualdrop value or inline-group remove event must be dispatched before removing the control from array
       this.removeArrayItem.emit(event);
@@ -434,25 +433,27 @@ export class FormComponent implements OnDestroy, OnInit {
     const metadataKeys = hasValue(metadataFields) ? Object.keys(metadataFields) : [];
     const formKeys = hasValue(this.formGroup.value) ? Object.keys(this.formGroup.value).map(key => key.replace('_array', '')) : [];
 
-    formKeys.forEach((key) => {
-      const innerObjectKeys = (Object.keys(this.formGroup.value[key] ?? {} ) as any[]).map((oldKey) => oldKey.replaceAll('_', '.'));
-      const filteredKeys = innerObjectKeys.filter(innerKey => metadataKeys.includes(innerKey));
-      const oldValue = this.formGroup.value[key];
-
-      if (filteredKeys.length > 0) {
-        filteredKeys.forEach((oldValueKey) => {
-          const newValue = {...oldValue};
-          const formattedKey = (oldValueKey as any).replaceAll('.', '_');
-          const patchValue = {};
-
-          newValue[formattedKey] = metadataFields[oldValueKey][0];
-          patchValue[key] = newValue;
-
-          if (!isEqual(oldValue[oldValueKey], newValue[oldValueKey])) {
-            this.formGroup.patchValue(patchValue);
-          }
-        });
-      }
+    formKeys
+      .filter((key) => isNotEmpty(this.formGroup.value[key]))
+      .forEach((key) => {
+        const innerObjectKeys = (Object.keys(this.formGroup.value[key] ?? {} ) as any[]).map((oldKey) => oldKey.replaceAll('_', '.'));
+        const filteredKeys = innerObjectKeys.filter(innerKey => metadataKeys.includes(innerKey));
+        const oldValue = this.formGroup.value[key];
+
+        if (filteredKeys.length > 0) {
+          filteredKeys.forEach((oldValueKey) => {
+            const newValue = {...oldValue};
+            const formattedKey = (oldValueKey as any).replaceAll('.', '_');
+            const patchValue = {};
+
+            newValue[formattedKey] = metadataFields[oldValueKey][0];
+            patchValue[key] = newValue;
+
+            if (!isEqual(oldValue[oldValueKey], newValue[oldValueKey])) {
+              this.formGroup.patchValue(patchValue);
+            }
+          });
+        }
     });
   }
 }