Merge pull request DSpace#5412 from LA-Referencia-Lyrasis-Project/fix-cms-edit-metadata

Fix CMS metadata editor language field saving

Author: tdonohue

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.spec.ts

@@ -10,6 +10,7 @@ import { provideNoopAnimations } from '@angular/platform-browser/animations';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
 import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
 import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import {
   TranslateLoader,
   TranslateModule,
@@ -26,11 +27,12 @@ describe('AdminEditCmsMetadataComponent', () => {
   let component: AdminEditCmsMetadataComponent;
   let fixture: ComponentFixture<AdminEditCmsMetadataComponent>;
   const site = Object.assign(new Site(), {
-    metadata: { },
+    metadata: {},
   });
 
   const siteServiceStub = jasmine.createSpyObj('SiteDataService', {
     find: jasmine.createSpy('find'),
+    findByHref: jasmine.createSpy('findByHref'),
     patch: jasmine.createSpy('patch'),
   });
 
@@ -70,6 +72,7 @@ describe('AdminEditCmsMetadataComponent', () => {
     fixture = TestBed.createComponent(AdminEditCmsMetadataComponent);
     component = fixture.componentInstance;
     siteServiceStub.find.and.returnValue(of(site));
+    siteServiceStub.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(site));
     siteServiceStub.patch.and.returnValue(of(site));
   });
 
@@ -131,28 +134,29 @@ describe('AdminEditCmsMetadataComponent', () => {
 
       it('should call method patch of service', () => {
         component.selectedMetadata = environment.cms.metadataList[0];
-        const saveButton = fixture.debugElement.query(By.css('#save-metadata-btn'));
-        saveButton.nativeElement.click();
+        component.site = site;
+        component.selectedMetadataValues.set(environment.languages[0].code, 'Test English Text');
+        component.selectedMetadataValues.set(environment.languages[1].code, 'Test Second Language Text');
+        component.saveMetadata();
+
         const operations = [];
-        operations.push({
-          op: 'replace',
-          path: '/metadata/' + component.selectedMetadata,
-          value: {
-            value: component.selectedMetadataValues.get(environment.languages[0].code),
-            language: environment.languages[0].code,
-          },
-        });
-        component.selectedMetadataValues.forEach((value, key) => {
-          if (key !== environment.languages[0].code) {
-            operations.push({
-              op: 'add',
-              path: '/metadata/' + component.selectedMetadata,
-              value: {
-                value: value,
-                language: key,
-              },
-            });
-          }
+        if (site.hasMetadata && site.hasMetadata(component.selectedMetadata)) {
+          operations.push({
+            op: 'remove',
+            path: '/metadata/' + component.selectedMetadata,
+          });
+        }
+        const nonEmptyValues = Array.from(component.selectedMetadataValues.entries())
+          .filter(([, text]) => text && text.trim().length > 0);
+        nonEmptyValues.forEach(([language, value]) => {
+          operations.push({
+            op: 'add',
+            path: '/metadata/' + component.selectedMetadata + '/-',
+            value: {
+              value,
+              language,
+            },
+          });
         });
         expect(siteServiceStub.patch).toHaveBeenCalledWith(site, operations);
       });

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.ts

@@ -84,9 +84,7 @@ export class AdminEditCmsMetadataComponent implements OnInit {
       }
       this.metadataList.push(md);
     });
-    this.siteService.find().subscribe((site) => {
-      this.site = site;
-    });
+    this.refreshSiteWithAllLanguages();
   }
 
   /**
@@ -106,12 +104,25 @@ export class AdminEditCmsMetadataComponent implements OnInit {
           this.notificationsService.error(this.translateService.get('admin.edit-cms-metadata.error'));
         }
         this.siteService.setStale();
-        this.siteService.find().subscribe((site) => {
-          this.site = site;
-        });
+        this.refreshSiteWithAllLanguages();
       });
   }
 
+  /**
+   * Reload site metadata including all language variants.
+   */
+  private refreshSiteWithAllLanguages() {
+    this.siteService.find().subscribe((site) => {
+      this.siteService.findByHref(`${site.self}?projection=allLanguages`, false, true).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((response) => {
+        if (response?.hasSucceeded) {
+          this.site = response.payload;
+        }
+      });
+    });
+  }
+
   /**
    * Reset metadata selection and go back to the select options
    */
@@ -147,16 +158,38 @@ export class AdminEditCmsMetadataComponent implements OnInit {
    * @returns List of operations to send to backend to edit selected metadata
    */
   private getOperationsToEditText(): Operation[] {
-    const entries = Array.from(this.selectedMetadataValues.entries());
+    const operations: Operation[] = [];
+    const nonEmptyValues = Array.from(this.selectedMetadataValues.entries())
+      .filter(([, text]) => text && text.trim().length > 0);
+
+    if (nonEmptyValues.length === 0) {
+      if (this.site.hasMetadata(this.selectedMetadata)) {
+        operations.push({
+          op: 'remove',
+          path: `/metadata/${this.selectedMetadata}`,
+        });
+      }
+      return operations;
+    }
+
+    if (this.site.hasMetadata(this.selectedMetadata)) {
+      operations.push({
+        op: 'remove',
+        path: `/metadata/${this.selectedMetadata}`,
+      });
+    }
+
+    nonEmptyValues.forEach(([language, text]) => {
+      operations.push({
+        op: 'add',
+        path: `/metadata/${this.selectedMetadata}/-`,
+        value: {
+          value: text,
+          language,
+        },
+      });
+    });
 
-    // First entry should form a 'replace' operation, then the rest should be an 'add' operation
-    return entries.map(([language, text], index) => ({
-      op: index === 0 ? 'replace' : 'add',
-      path: `/metadata/${this.selectedMetadata}`,
-      value: {
-        value: text ?? '',
-        language: language,
-      },
-    }));
+    return operations;
   }
 }