Merge pull request IQSS#11052 from IQSS/11044-edit-facet-bug

11044 edit facet bug
DANS-KNAW · Dec 4, 2024 · a36db2d · a36db2d
2 parents 1b5a1ea + ca95ad8
commit a36db2d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java
@@ -42,23 +42,24 @@ public void delete(DataverseFacet dataverseFacet) {
         cache.invalidate();
     }
 
-	public void deleteFacetsFor( Dataverse d ) {
-		em.createNamedQuery("DataverseFacet.removeByOwnerId")
-			.setParameter("ownerId", d.getId())
-				.executeUpdate();
+    public void deleteFacetsFor(Dataverse d) {
+        em.createNamedQuery("DataverseFacet.removeByOwnerId")
+                .setParameter("ownerId", d.getId())
+                .executeUpdate();
         cache.invalidate(d.getId());
-        
-	}
-	
+
+    }
+
     public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
         DataverseFacet dataverseFacet = new DataverseFacet();
-        
+
         dataverseFacet.setDisplayOrder(displayOrder);
         dataverseFacet.setDatasetFieldType(fieldType);
         dataverseFacet.setDataverse(ownerDv);
-
         ownerDv.getDataverseFacets().add(dataverseFacet);
         em.persist(dataverseFacet);
+
+        cache.invalidate(ownerDv.getId());
         return dataverseFacet;
     }
 

diff --git a/...main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java b/...main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractWriteDataverseCommand.java
@@ -72,7 +72,8 @@ private void processMetadataBlocks() {
     private void processFacets(CommandContext ctxt) {
         if (facets != null) {
             ctxt.facets().deleteFacetsFor(dataverse);
-
+            dataverse.setDataverseFacets(new ArrayList<>());
+
             if (!facets.isEmpty()) {
                 dataverse.setFacetRoot(true);
             }