Merged in task/dspace-cris-2023_02_x/CST-14674 (pull request DSpace#1695)

Fix issue with small com/col logo which were stretched out

Approved-by: Andrea Barbasso

Author: atarix83

src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html

@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo mb-3">
-    <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo._links.content.href" class="mw-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>

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

@@ -426,25 +426,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) : [];
 
-    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);
+            }
+          });
+        }
+      });
   }
 }