[backend/frontend] fix(importexport): payload comming from collector (#4427)

openaev-api/src/main/java/io/openaev/api/payload/PayloadApiExporter.java

@@ -5,13 +5,16 @@
 import io.openaev.database.model.Payload;
 import io.openaev.database.model.ResourceType;
 import io.openaev.database.repository.PayloadRepository;
+import io.openaev.jsonapi.IncludeOptions;
 import io.openaev.jsonapi.ZipJsonApi;
 import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.rest.helper.RestBehavior;
 import io.openaev.rest.payload.PayloadApi;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.constraints.NotBlank;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,8 +38,12 @@ public class PayloadApiExporter extends RestBehavior {
   @RBAC(actionPerformed = Action.READ, resourceType = ResourceType.PAYLOAD)
   public ResponseEntity<byte[]> export(@PathVariable @NotBlank final String payloadId)
       throws IOException {
+    Map<String, Boolean> opts = new HashMap<>();
+    opts.put("exclude from payload export", false);
+    IncludeOptions includeOptions = IncludeOptions.of(opts);
+
     Payload payload =
         payloadRepository.findById(payloadId).orElseThrow(ElementNotFoundException::new);
-    return zipJsonApi.handleExport(payload);
+    return zipJsonApi.handleExport(payload, null, includeOptions);
   }
 }

openaev-front/src/components/common/ImportUploader.tsx

@@ -23,7 +23,7 @@ const ImportUploader: FunctionComponent<Props> = ({
   color,
   isIconButton = true,
   fileAccepted = '',
-  allowReUpload = false,
+  allowReUpload = true,
   disabled = false,
 }) => {
   // Standard hooks

openaev-model/src/main/java/io/openaev/database/model/Payload.java

@@ -16,6 +16,7 @@
 import io.openaev.helper.MonoIdDeserializer;
 import io.openaev.helper.MultiIdListDeserializer;
 import io.openaev.helper.MultiIdSetDeserializer;
+import io.openaev.jsonapi.IncludeOption;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -191,6 +192,7 @@ public enum PAYLOAD_EXECUTION_ARCH {
   @JoinColumn(name = "payload_collector")
   @JsonSerialize(using = MonoIdDeserializer.class)
   @JsonProperty("payload_collector")
+  @IncludeOption(key = "exclude from payload export")
   @Schema(type = "string")
   private Collector collector;
 

openaev-model/src/main/java/io/openaev/database/model/Tag.java

@@ -15,6 +15,7 @@
 import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.annotations.UuidGenerator;
@@ -98,8 +99,11 @@ public boolean equals(Object o) {
     if (o == null || !Base.class.isAssignableFrom(o.getClass())) {
       return false;
     }
-    Base base = (Base) o;
-    return id.equals(base.getId());
+    Tag other = (Tag) o;
+    if (StringUtils.isBlank(id) || StringUtils.isBlank(other.getId())) {
+      return !StringUtils.isBlank(name) && name.equals(other.getName());
+    }
+    return id.equals(other.getId());
   }
 
   @Override