From 6167b8f1b3648b457fbf769c8078b58c01bbd288 Mon Sep 17 00:00:00 2001
From: Valentino Giardino <77643678+valentinogiardino@users.noreply.github.com>
Date: Tue, 3 Dec 2024 11:42:51 -0300
Subject: [PATCH 1/2] [Content Import Job Management] Implement the Content
 Import Get Job Status REST endpoint #30791 (#30818)

### Proposed Changes

- Enhanced `ContentImportResource` to include a new endpoint for
retrieving the status of a content import job.
- Introduced a new class `ResponseEntityJobView` to represent job
entities in API responses.
- Added validations for workflow action and key fields in
`ImportContentletsProcessor`.
- Introduced a method `isCsvFile` to check if the uploaded file is a CSV
file, with corresponding validation added in `ContentImportParams`.

### Checklist

- [x] Tests
- [x] Translations
- [x] Security Implications Contemplated (add notes if applicable)

### Additional Info

- API updates streamline job status tracking and provide clearer data
structures for frontend integration.
- Refactoring the validation and workflow action handling improves error
clarity and ensures robust data validation in the content import
process. (This fix IQA findings on #30669)
---
 .../impl/ImportContentletsProcessor.java      |  89 ++-
 .../dotcms/rest/ResponseEntityJobView.java    |   9 +
 .../dotimport/ContentImportHelper.java        |  11 +
 .../dotimport/ContentImportParams.java        |   7 +
 .../dotimport/ContentImportResource.java      |  57 +-
 ...rtContentletsProcessorIntegrationTest.java | 173 +++++-
 .../ContentImportResourceIntegrationTest.java | 101 +++-
 ...tentImportResource.postman_collection.json | 568 ++++++++++++++++--
 .../resources/ContentImportResource/test.txt  |   1 +
 9 files changed, 914 insertions(+), 102 deletions(-)
 create mode 100644 dotCMS/src/main/java/com/dotcms/rest/ResponseEntityJobView.java
 create mode 100644 dotcms-postman/src/main/resources/postman/resources/ContentImportResource/test.txt

diff --git a/dotCMS/src/main/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessor.java b/dotCMS/src/main/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessor.java
index 04420a9bf468..bf42bf0fc249 100644
--- a/dotCMS/src/main/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessor.java
+++ b/dotCMS/src/main/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessor.java
@@ -23,6 +23,7 @@
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.contentlet.action.ImportAuditUtil;
 import com.dotmarketing.portlets.languagesmanager.model.Language;
+import com.dotmarketing.portlets.workflows.model.WorkflowAction;
 import com.dotmarketing.util.AdminLogger;
 import com.dotmarketing.util.ImportUtil;
 import com.dotmarketing.util.Logger;
@@ -38,12 +39,7 @@
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.LongConsumer;
 
@@ -198,6 +194,13 @@ && getWorkflowActionId(parameters).isEmpty()) {
             // Make sure the content type exist (will throw an exception if it doesn't)
             final var contentTypeFound = findContentType(parameters);
 
+            // Make sure the workflow action exist (will throw an exception if it doesn't)
+            findWorkflowAction(parameters);
+
+            // Make sure the fields exist in the content type (will throw an exception if it doesn't)
+            validateFields(parameters, contentTypeFound);
+
+
             // Security measure to prevent invalid attempts to import a host.
             final ContentType hostContentType = APILocator.getContentTypeAPI(
                     APILocator.systemUser()).find(Host.HOST_VELOCITY_VAR_NAME);
@@ -212,6 +215,30 @@ && getWorkflowActionId(parameters).isEmpty()) {
         }
     }
 
+    /**
+     * Validates that the fields specified in the job parameters exist in the given content type.
+     *
+     * <p>This method checks each field specified in the job parameters against the fields defined
+     * in the provided content type. If any field is not found in the content type, a
+     * {@link JobValidationException} is thrown.</p>
+     *
+     * @param parameters The job parameters containing the fields to validate
+     * @param contentTypeFound The content type to validate the fields against
+     * @throws JobValidationException if any field specified in the parameters is not found in the content type
+     */
+    private void validateFields(final Map<String, Object> parameters, final ContentType contentTypeFound) {
+        var fields = contentTypeFound.fields();
+        for (String field : getFields(parameters)) {
+            if (fields.stream().noneMatch(f -> Objects.equals(f.variable(), field))) {
+                final var errorMessage = String.format(
+                        "Field [%s] not found in Content Type [%s].", field, contentTypeFound.variable()
+                );
+                Logger.error(this, errorMessage);
+                throw new JobValidationException(errorMessage);
+            }
+        }
+    }
+
     /**
      * Handles cancellation requests for the import operation. When called, it marks the operation
      * for cancellation.
@@ -618,6 +645,56 @@ private ContentType findContentType(final Map<String, Object> parameters)
         }
     }
 
+
+    /**
+     * Finds and returns a workflow action based on the provided parameters.
+     *
+     * <p>This method retrieves the workflow action ID from the given parameters and attempts to
+     * find the corresponding workflow action using the Workflow API.
+     *
+     *
+     * @param parameters a map containing parameters required for finding the workflow action,
+     *                   including the workflow action ID and user details.
+     *
+     * @return the {@link WorkflowAction} corresponding to the workflow action ID.
+     *
+     * @throws JobValidationException if the workflow action cannot be found.
+     * @throws JobProcessingException if an error occurs during user retrieval or
+     *                                workflow action lookup.
+     */
+    private WorkflowAction findWorkflowAction(final Map<String, Object> parameters) {
+
+            final var workflowActionId = getWorkflowActionId(parameters);
+            final User user;
+
+            try {
+                user = getUser(parameters);
+            } catch (DotDataException | DotSecurityException e) {
+                final var errorMessage = "Error retrieving user.";
+                Logger.error(this.getClass(), errorMessage);
+                throw new JobProcessingException(errorMessage, e);
+            }
+
+            try {
+                var workflowAction = APILocator.getWorkflowAPI()
+                        .findAction(workflowActionId,user);
+                if(Objects.isNull(workflowAction)){
+                    final var errorMessage = String.format(
+                            "Workflow Action [%s] not found.", workflowActionId
+                    );
+                    Logger.error(this.getClass(), errorMessage);
+                    throw new JobValidationException(errorMessage);
+                }
+                return workflowAction;
+            } catch (DotDataException | DotSecurityException e) {
+                final var errorMessage = String.format(
+                        "Error finding Workflow Action [%s].", workflowActionId
+                );
+                Logger.error(this.getClass(), errorMessage);
+                throw new JobProcessingException(errorMessage, e);
+            }
+    }
+
     /**
      * Retrieves the existing language based on an id or ISO code.
      *
diff --git a/dotCMS/src/main/java/com/dotcms/rest/ResponseEntityJobView.java b/dotCMS/src/main/java/com/dotcms/rest/ResponseEntityJobView.java
new file mode 100644
index 000000000000..1c3436b67579
--- /dev/null
+++ b/dotCMS/src/main/java/com/dotcms/rest/ResponseEntityJobView.java
@@ -0,0 +1,9 @@
+package com.dotcms.rest;
+
+import com.dotcms.jobs.business.job.Job;
+
+public class ResponseEntityJobView extends ResponseEntityView<Job> {
+    public ResponseEntityJobView(Job entity) {
+        super(entity);
+    }
+}
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportHelper.java
index 1b086adf1402..8487fdbe5a79 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportHelper.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportHelper.java
@@ -1,6 +1,7 @@
 package com.dotcms.rest.api.v1.content.dotimport;
 
 import com.dotcms.jobs.business.api.JobQueueManagerAPI;
+import com.dotcms.jobs.business.job.Job;
 import com.dotcms.rest.api.v1.JobQueueManagerHelper;
 import com.dotcms.rest.api.v1.temp.DotTempFile;
 import com.dotmarketing.business.APILocator;
@@ -95,6 +96,16 @@ public String createJob(
         return jobQueueManagerAPI.createJob(queueName, jobParameters);
     }
 
+    /**
+     * gets a job
+     * @param jobId The ID of the job
+     * @return Job
+     * @throws DotDataException if there's an error fetching the job
+     */
+    Job getJob(final String jobId) throws DotDataException {
+        return jobQueueManagerAPI.getJob(jobId);
+    }
+
     /**
      * Constructs a map of job parameters based on the provided inputs.
      *
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportParams.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportParams.java
index 3ac164f1ae14..c5639ad6c07d 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportParams.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportParams.java
@@ -85,5 +85,12 @@ public void checkValid() {
         if (contentDisposition == null || contentDisposition.getFileName() == null) {
             throw new ValidationException("The file must have a valid file name.");
         }
+        if (!isCsvFile(contentDisposition.getFileName())) {
+            throw new ValidationException("The file must be a CSV file.");
+        }
+    }
+
+    private boolean isCsvFile(final String fileName) {
+        return fileName != null && fileName.toLowerCase().endsWith(".csv");
     }
 }
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResource.java
index 66f7904e10f0..f911bf5899a3 100644
--- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResource.java
+++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResource.java
@@ -1,6 +1,9 @@
 package com.dotcms.rest.api.v1.content.dotimport;
 
 import com.dotcms.jobs.business.error.JobValidationException;
+import com.dotcms.jobs.business.job.Job;
+import com.dotcms.repackage.javax.validation.ValidationException;
+import com.dotcms.rest.ResponseEntityJobView;
 import com.dotcms.rest.ResponseEntityStringView;
 import com.dotcms.rest.ResponseEntityView;
 import com.dotcms.rest.WebResource;
@@ -10,6 +13,7 @@
 import com.dotmarketing.util.Logger;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -142,7 +146,7 @@ public Response importContent(
             // Create the content import job
             final String jobId = importHelper.createJob(CMD_PUBLISH, IMPORT_QUEUE_NAME, params, initDataObject.getUser(), request);
             return Response.ok(new ResponseEntityView<>(jobId)).build();
-        } catch (JobValidationException e) {
+        } catch (JobValidationException | ValidationException e) {
             // Handle validation exception and return appropriate error message
             return ExceptionMapperUtil.createResponse(null, e.getMessage());
         }
@@ -230,9 +234,58 @@ public Response validateContentImport(
             // Create the content import job in preview mode
             final String jobId = importHelper.createJob(CMD_PREVIEW, IMPORT_QUEUE_NAME, params, initDataObject.getUser(), request);
             return Response.ok(new ResponseEntityView<>(jobId)).build();
-        } catch (JobValidationException e) {
+        } catch (JobValidationException | ValidationException e) {
             // Handle validation exception and return appropriate error message
             return ExceptionMapperUtil.createResponse(null, e.getMessage());
         }
     }
+
+
+
+    @GET
+    @Path("/{jobId}")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(
+            operationId = "getJobStatus",
+            summary = "Retrieves the status of a content import job",
+            description = "Fetches the current status of a content import job based on the provided job ID.",
+            tags = {"Content Import"},
+            responses = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "Successfully retrieved job status",
+                            content = @Content(
+                                    mediaType = "application/json",
+                                    schema = @Schema(implementation = ResponseEntityJobView.class)
+                            )
+                    ),
+                    @ApiResponse(responseCode = "401", description = "Invalid user authentication"),
+                    @ApiResponse(responseCode = "403", description = "Forbidden due to insufficient permissions"),
+                    @ApiResponse(responseCode = "404", description = "Job not found"),
+                    @ApiResponse(responseCode = "500", description = "Internal server error")
+            }
+    )
+    public ResponseEntityView<Job> getJobStatus(
+            @Context final HttpServletRequest request,
+            @Context final HttpServletResponse response,
+            @PathParam("jobId") @Parameter(
+                required = true,
+                description = "The ID of the job whose status is to be retrieved",
+                schema = @Schema(type = "string")
+            ) final String jobId)
+            throws DotDataException {
+
+        // Initialize the WebResource and set required user information
+        final var initDataObject =  new WebResource.InitBuilder(webResource)
+                .requiredBackendUser(true)
+                .requiredFrontendUser(false)
+                .requestAndResponse(request, response)
+                .rejectWhenNoUser(true)
+                .init();
+
+        Logger.debug(this, ()->String.format(" user %s is retrieving status of job: %s", initDataObject.getUser().getUserId(), jobId));
+
+        Job job = importHelper.getJob(jobId);
+        return new ResponseEntityView<>(job);
+    }
 }
\ No newline at end of file
diff --git a/dotcms-integration/src/test/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessorIntegrationTest.java b/dotcms-integration/src/test/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessorIntegrationTest.java
index 9055a905d33c..fbfd96a170cc 100644
--- a/dotcms-integration/src/test/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessorIntegrationTest.java
+++ b/dotcms-integration/src/test/java/com/dotcms/jobs/business/processor/impl/ImportContentletsProcessorIntegrationTest.java
@@ -1,8 +1,5 @@
 package com.dotcms.jobs.business.processor.impl;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import com.dotcms.contenttype.model.type.ContentType;
 import com.dotcms.datagen.TestDataUtils;
 import com.dotcms.jobs.business.error.JobValidationException;
@@ -22,16 +19,15 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import org.jboss.weld.junit5.EnableWeld;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
+import static com.dotmarketing.portlets.workflows.business.SystemWorkflowConstants.WORKFLOW_PUBLISH_ACTION_ID;
 /**
  * Integration tests for the {@link ImportContentletsProcessor} class. These tests verify the
  * functionality of content import operations in a real database environment. The tests cover both
@@ -108,7 +104,7 @@ void test_process_preview_using_content_type_variable() throws Exception {
             // Create test job
             final var testJob = createTestJob(
                     csvFile, "preview", "1", testContentType.variable(),
-                    "b9d89c80-3d88-4311-8365-187323c96436"
+                    WORKFLOW_PUBLISH_ACTION_ID
             );
 
             // Process the job in preview mode
@@ -154,7 +150,7 @@ void test_process_preview_invalid_content_type_variable() throws Exception {
         // Create test job
         final var testJob = createTestJob(
                 csvFile, "preview", "1", "doesNotExist",
-                "b9d89c80-3d88-4311-8365-187323c96436"
+                WORKFLOW_PUBLISH_ACTION_ID
         );
 
         try {
@@ -199,7 +195,7 @@ void test_process_preview_using_language_iso_code() throws Exception {
             // Create test job
             final var testJob = createTestJob(
                     csvFile, "preview", "en-us", testContentType.variable(),
-                    "b9d89c80-3d88-4311-8365-187323c96436"
+                    WORKFLOW_PUBLISH_ACTION_ID
             );
 
             // Process the job in preview mode
@@ -245,7 +241,7 @@ void test_process_preview_invalid_language() throws Exception {
         // Create test job
         final var testJob = createTestJob(
                 csvFile, "preview", "12345", "doesNotExist",
-                "b9d89c80-3d88-4311-8365-187323c96436"
+                WORKFLOW_PUBLISH_ACTION_ID
         );
 
         try {
@@ -256,6 +252,82 @@ void test_process_preview_invalid_language() throws Exception {
         }
     }
 
+
+    /**
+     * Scenario: Test the preview mode of the content import process with an invalid workflow action.
+     * <p>
+     * Expected: A JobValidationException should be thrown.
+     *
+     * @throws Exception if there's an error during the test execution
+     */
+    @Test
+    void test_process_preview_invalid_workflow_action() throws Exception {
+        ContentType testContentType = null;
+
+        try {
+            // Initialize processor
+            final var processor = new ImportContentletsProcessor();
+
+            // Create test content type
+            testContentType = createTestContentType();
+
+            // Create test CSV file
+            File csvFile = createTestCsvFile();
+
+            // Create test job
+            final var testJob = createTestJob(
+                    csvFile, "preview", "en-us", testContentType.variable(),
+                    "doesNotExist"
+            );
+
+            // Process the job in preview mode
+            assertThrows(JobValidationException.class, ()-> processor.validate((testJob.parameters())));
+        } finally {
+            if (testContentType != null) {
+                // Clean up test content type
+                APILocator.getContentTypeAPI(systemUser).delete(testContentType);
+            }
+        }
+    }
+
+
+    /**
+     * Scenario: Test the preview mode of the content import process with an invalid key field.
+     * <p>
+     * Expected: A JobValidationException should be thrown.
+     *
+     * @throws Exception if there's an error during the test execution
+     */
+    @Test
+    void test_process_preview_invalid_key_field() throws Exception {
+        ContentType testContentType = null;
+
+        try {
+            // Initialize processor
+            final var processor = new ImportContentletsProcessor();
+
+            // Create test content type
+            testContentType = createTestContentType();
+
+            // Create test CSV file
+            File csvFile = createTestCsvFile();
+
+            // Create test job
+            final var testJob = createTestJob(
+                    csvFile, "preview", "en-us", testContentType.variable(),
+                    WORKFLOW_PUBLISH_ACTION_ID, List.of("doesNotExist")
+            );
+
+            assertThrows(JobValidationException.class, ()-> processor.validate((testJob.parameters())));
+
+        } finally {
+            if (testContentType != null) {
+                // Clean up test content type
+                APILocator.getContentTypeAPI(systemUser).delete(testContentType);
+            }
+        }
+    }
+
     /**
      * Tests the preview mode of the content import process. This test:
      * <ul>
@@ -289,7 +361,7 @@ void test_process_preview() throws Exception {
             // Create test job
             final var testJob = createTestJob(
                     csvFile, "preview", "1", testContentType.id(),
-                    "b9d89c80-3d88-4311-8365-187323c96436"
+                    WORKFLOW_PUBLISH_ACTION_ID
             );
 
             // Process the job in preview mode
@@ -348,7 +420,7 @@ void test_process_publish() throws Exception {
             // Create test job
             final var testJob = createTestJob(
                     csvFile, "publish", "1", testContentType.id(),
-                    "b9d89c80-3d88-4311-8365-187323c96436"
+                    WORKFLOW_PUBLISH_ACTION_ID
             );
 
             // Process the job in preview mode
@@ -398,33 +470,91 @@ private ContentType createTestContentType() {
      * @throws DotSecurityException if there's a security violation during job creation
      */
     private Job createTestJob(final File csvFile, final String cmd, final String language,
-            final String contentType, final String workflowActionId)
+                              final String contentType, final String workflowActionId)
             throws IOException, DotSecurityException {
+        return createTestJob(csvFile, cmd, language, contentType, workflowActionId, null);
+    }
 
-        final Map<String, Object> jobParameters = new HashMap<>();
+    /**
+     * Creates a test job for the import process with optional fields.
+     *
+     * @param csvFile          The CSV file containing the content to be imported
+     * @param cmd              The command to execute ('preview' or 'publish')
+     * @param contentType      The content type for the imported content
+     * @param language         The language of the imported content
+     * @param workflowActionId The ID of the workflow action to be applied
+     * @param fields           Additional fields to include in the job parameters
+     * @return A configured {@link Job} instance ready for processing
+     * @throws IOException          if there's an error reading the CSV file
+     * @throws DotSecurityException if there's a security violation during job creation
+     */
+    private Job createTestJob(final File csvFile, final String cmd, final String language,
+                              final String contentType, final String workflowActionId, final List<String> fields)
+            throws IOException, DotSecurityException {
+
+        final Map<String, Object> jobParameters = buildJobParameters(cmd, contentType, language, workflowActionId, fields);
+        addTempFileToJobParameters(csvFile, jobParameters);
 
-        // Setup basic job parameters
+        return buildJob(jobParameters);
+    }
+
+    /**
+     * Builds the base job parameters.
+     *
+     * @param cmd              The command to execute ('preview' or 'publish')
+     * @param contentType      The content type for the imported content
+     * @param language         The language of the imported content
+     * @param workflowActionId The ID of the workflow action to be applied
+     * @param fields           Additional fields to include in the job parameters
+     * @return A map containing the base job parameters
+     */
+    private Map<String, Object> buildJobParameters(final String cmd, final String contentType,
+                                                   final String language, final String workflowActionId,
+                                                   final List<String> fields) {
+        final Map<String, Object> jobParameters = new HashMap<>();
         jobParameters.put("cmd", cmd);
         jobParameters.put("userId", systemUser.getUserId());
         jobParameters.put("siteName", defaultSite.getHostname());
         jobParameters.put("siteIdentifier", defaultSite.getIdentifier());
         jobParameters.put("contentType", contentType);
         jobParameters.put("workflowActionId", workflowActionId);
+
         if (language != null) {
             jobParameters.put("language", language);
         }
+        if (fields != null) {
+            jobParameters.put("fields", fields);
+        }
 
-        final TempFileAPI tempFileAPI = APILocator.getTempFileAPI();
-        try (final var fileInputStream = new FileInputStream(csvFile)) {
+        return jobParameters;
+    }
 
-            final DotTempFile tempFile = tempFileAPI.createTempFile(
-                    csvFile.getName(), request, fileInputStream
-            );
+    /**
+     * Adds a temporary file to the job parameters.
+     *
+     * @param csvFile       The CSV file to be used
+     * @param jobParameters The job parameters map to update
+     * @throws IOException          if there's an error reading the CSV file
+     * @throws DotSecurityException if there's a security violation during temporary file creation
+     */
+    private void addTempFileToJobParameters(final File csvFile, final Map<String, Object> jobParameters)
+            throws IOException, DotSecurityException {
 
+        final TempFileAPI tempFileAPI = APILocator.getTempFileAPI();
+        try (final var fileInputStream = new FileInputStream(csvFile)) {
+            final DotTempFile tempFile = tempFileAPI.createTempFile(csvFile.getName(), request, fileInputStream);
             jobParameters.put("tempFileId", tempFile.id);
             jobParameters.put("requestFingerPrint", tempFileAPI.getRequestFingerprint(request));
         }
+    }
 
+    /**
+     * Builds the final job instance.
+     *
+     * @param jobParameters The parameters to configure the job
+     * @return A configured {@link Job} instance
+     */
+    private Job buildJob(final Map<String, Object> jobParameters) {
         return Job.builder()
                 .id("test-job-id")
                 .queueName("Test Job")
@@ -434,6 +564,7 @@ private Job createTestJob(final File csvFile, final String cmd, final String lan
                 .build();
     }
 
+
     /**
      * Creates a test CSV file with sample content. The file includes a header row and two content
      * rows with title and body fields.
diff --git a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResourceIntegrationTest.java b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResourceIntegrationTest.java
index 7243f9440ed2..bd50dd777cc7 100644
--- a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResourceIntegrationTest.java
+++ b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/content/dotimport/ContentImportResourceIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.dotcms.rest.api.v1.content.dotimport;
 
+import static com.dotmarketing.portlets.workflows.business.SystemWorkflowConstants.WORKFLOW_PUBLISH_ACTION_ID;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.dotcms.Junit5WeldBaseTest;
@@ -7,7 +8,6 @@
 import com.dotcms.datagen.ContentTypeDataGen;
 import com.dotcms.datagen.TestDataUtils;
 import com.dotcms.datagen.TestUserUtils;
-import com.dotcms.jobs.business.api.JobQueueManagerAPI;
 import com.dotcms.jobs.business.job.Job;
 import com.dotcms.jobs.business.util.JobUtil;
 import com.dotcms.mock.response.MockHttpResponse;
@@ -61,9 +61,6 @@ public class ContentImportResourceIntegrationTest extends Junit5WeldBaseTest {
     @Inject
     ContentImportHelper contentImportHelper;
 
-    @Inject
-    JobQueueManagerAPI jobQueueManagerAPI;
-
     @BeforeAll
     static void setUp() throws Exception {
         IntegrationTestInitService.getInstance().init();
@@ -104,11 +101,11 @@ static void cleanup() {
      */
     @Test
     public void test_import_content_with_valid_params() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), "workflow-action-id", List.of("title"));
+        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), WORKFLOW_PUBLISH_ACTION_ID, List.of("title"));
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         Response importContentResponse = importResource.importContent(request, response, params);
-        validateSuccessfulResponse(importContentResponse, contentType.name(), String.valueOf(defaultLanguage.getId()), List.of("title"), "workflow-action-id", CMD_PUBLISH);
+        validateSuccessfulResponse(importContentResponse, contentType.name(), String.valueOf(defaultLanguage.getId()), List.of("title"), WORKFLOW_PUBLISH_ACTION_ID, CMD_PUBLISH);
     }
 
 
@@ -122,11 +119,11 @@ public void test_import_content_with_valid_params() throws IOException, DotDataE
      */
     @Test
     public void test_import_content_validate_with_valid_params() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), "workflow-action-id", List.of("title"));
+        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), WORKFLOW_PUBLISH_ACTION_ID, List.of("title"));
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         Response importContentResponse = importResource.validateContentImport(request, response, params);
-        validateSuccessfulResponse(importContentResponse, contentType.name(), String.valueOf(defaultLanguage.getId()), List.of("title"), "workflow-action-id", CMD_PREVIEW);
+        validateSuccessfulResponse(importContentResponse, contentType.name(), String.valueOf(defaultLanguage.getId()), List.of("title"), WORKFLOW_PUBLISH_ACTION_ID, CMD_PREVIEW);
     }
 
     /**
@@ -139,11 +136,11 @@ public void test_import_content_validate_with_valid_params() throws IOException,
      */
     @Test
     public void test_import_content_with_language_iso_code() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), defaultLanguage.getIsoCode(), "workflow-action-id", List.of("title"));
+        ContentImportForm form = createContentImportForm(contentType.name(), defaultLanguage.getIsoCode(), WORKFLOW_PUBLISH_ACTION_ID, List.of("title"));
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         Response importContentResponse = importResource.importContent(request, response, params);
-        validateSuccessfulResponse(importContentResponse, contentType.name(), defaultLanguage.getIsoCode(), List.of("title"), "workflow-action-id", CMD_PUBLISH);
+        validateSuccessfulResponse(importContentResponse, contentType.name(), defaultLanguage.getIsoCode(), List.of("title"), WORKFLOW_PUBLISH_ACTION_ID, CMD_PUBLISH);
     }
 
 
@@ -157,11 +154,11 @@ public void test_import_content_with_language_iso_code() throws IOException, Dot
      */
     @Test
     public void test_import_content__validate_with_language_iso_code() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), defaultLanguage.getIsoCode(), "workflow-action-id", List.of("title"));
+        ContentImportForm form = createContentImportForm(contentType.name(), defaultLanguage.getIsoCode(), WORKFLOW_PUBLISH_ACTION_ID, List.of("title"));
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         Response importContentResponse = importResource.validateContentImport(request, response, params);
-        validateSuccessfulResponse(importContentResponse, contentType.name(), defaultLanguage.getIsoCode(), List.of("title"), "workflow-action-id", CMD_PREVIEW);
+        validateSuccessfulResponse(importContentResponse, contentType.name(), defaultLanguage.getIsoCode(), List.of("title"), WORKFLOW_PUBLISH_ACTION_ID, CMD_PREVIEW);
     }
 
     /**
@@ -176,7 +173,7 @@ public void test_import_content__validate_with_language_iso_code() throws IOExce
      */
     @Test
     public void test_import_content_without_language_and_field_params() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), null, "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), null, WORKFLOW_PUBLISH_ACTION_ID, null);
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         // Assert that the response status is BAD_REQUEST (400)
@@ -196,7 +193,7 @@ public void test_import_content_without_language_and_field_params() throws IOExc
      */
     @Test
     public void test_import_content_validate_without_language_and_field_params() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), null, "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), null, WORKFLOW_PUBLISH_ACTION_ID, null);
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         // Assert that the response status is BAD_REQUEST (400)
@@ -213,7 +210,7 @@ public void test_import_content_validate_without_language_and_field_params() thr
      */
     @Test
     public void test_import_content_with_invalid_language() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), "12345", "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), "12345", WORKFLOW_PUBLISH_ACTION_ID, null);
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         assertBadRequestResponse(importResource.importContent(request, response, params));
@@ -230,7 +227,7 @@ public void test_import_content_with_invalid_language() throws IOException, DotD
      */
     @Test
     public void test_import_content_validate_with_invalid_language() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm(contentType.name(), "12345", "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), "12345", WORKFLOW_PUBLISH_ACTION_ID, null);
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         assertBadRequestResponse(importResource.validateContentImport(request, response, params));
@@ -246,7 +243,39 @@ public void test_import_content_validate_with_invalid_language() throws IOExcept
      */
     @Test
     public void test_import_content_with_invalid_content_type() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm("doesNotExist", "12345", "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm("doesNotExist", "12345", WORKFLOW_PUBLISH_ACTION_ID, null);
+        ContentImportParams params = createContentImportParams(csvFile, form);
+
+        assertBadRequestResponse(importResource.importContent(request, response, params));
+    }
+
+    /**
+     * Scenario: Attempt to import content specifying a non-existing workflow action.
+     * <p>
+     * Expected: The import request should fail with BAD_REQUEST (400) status code since the workflow action is invalid.
+     *
+     * @throws IOException if there's an error with file operations
+     * @throws DotDataException if there's an error with dotCMS data operations
+     */
+    @Test
+    public void test_import_content_with_invalid_workflow_action() throws IOException, DotDataException {
+        ContentImportForm form = createContentImportForm(contentType.name(), "12345", "workflow-action-2", null);
+        ContentImportParams params = createContentImportParams(csvFile, form);
+
+        assertBadRequestResponse(importResource.importContent(request, response, params));
+    }
+
+    /**
+     * Scenario: Attempt to import content specifying an invalid key field.
+     * <p>
+     * Expected: The import request should fail with BAD_REQUEST (400) status code since the key field is invalid.
+     *
+     * @throws IOException if there's an error with file operations
+     * @throws DotDataException if there's an error with dotCMS data operations
+     */
+    @Test
+    public void test_import_content_with_invalid_key_field() throws IOException, DotDataException {
+        ContentImportForm form = createContentImportForm(contentType.name(), "12345", "workflow-action-2", List.of("doesNotExist"));
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         assertBadRequestResponse(importResource.importContent(request, response, params));
@@ -263,7 +292,7 @@ public void test_import_content_with_invalid_content_type() throws IOException,
      */
     @Test
     public void test_import_content_validate_with_invalid_content_type() throws IOException, DotDataException {
-        ContentImportForm form = createContentImportForm("doesNotExist", "12345", "workflow-action-id-2", null);
+        ContentImportForm form = createContentImportForm("doesNotExist", "12345", WORKFLOW_PUBLISH_ACTION_ID, null);
         ContentImportParams params = createContentImportParams(csvFile, form);
 
         assertBadRequestResponse(importResource.validateContentImport(request, response, params));
@@ -280,7 +309,7 @@ public void test_import_content_validate_with_invalid_content_type() throws IOEx
      */
     @Test
     public void test_import_content_without_content_type_in_form() {
-        assertThrows(ValidationException.class, () -> createContentImportForm(null, null, "workflow-action-id", null));
+        assertThrows(ValidationException.class, () -> createContentImportForm(null, null, WORKFLOW_PUBLISH_ACTION_ID, null));
     }
 
     /**
@@ -307,7 +336,7 @@ public void test_import_content_without_workflow_action_in_form() {
      */
     @Test
     public void test_import_content_missing_file() throws JsonProcessingException {
-        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), "workflow-action-id", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), WORKFLOW_PUBLISH_ACTION_ID, null);
 
         ContentImportParams params = new ContentImportParams();
         params.setJsonForm(mapper.writeValueAsString(form));
@@ -327,7 +356,7 @@ public void test_import_content_missing_file() throws JsonProcessingException {
      */
     @Test
     public void test_import_content_validate_missing_file() throws JsonProcessingException {
-        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), "workflow-action-id", null);
+        ContentImportForm form = createContentImportForm(contentType.name(), String.valueOf(defaultLanguage.getId()), WORKFLOW_PUBLISH_ACTION_ID, null);
 
         ContentImportParams params = new ContentImportParams();
         params.setJsonForm(mapper.writeValueAsString(form));
@@ -335,6 +364,34 @@ public void test_import_content_validate_missing_file() throws JsonProcessingExc
         assertThrows(ValidationException.class, () -> importResource.validateContentImport(request, response, params));
     }
 
+
+    /**
+     * Scenario: Attempt to validate content import with valid form data but providing a txt file.
+     * <p>
+     * Expected: A ValidationException should be thrown since the file must be a CSV file
+     * for content import operations.
+     *
+     * @throws JsonProcessingException if there's an error during JSON serialization
+     * @throws ValidationException when attempting to import content without setting the file
+     */
+    @Test
+    public void test_import_content_validate_txt_file() throws IOException, DotDataException {
+        File txtFile = null;
+        try{
+            ContentImportForm form = createContentImportForm(contentType.name(), "12345", WORKFLOW_PUBLISH_ACTION_ID, null);
+            txtFile = File.createTempFile("test", ".txt");
+            ContentImportParams params = createContentImportParams(txtFile, form);
+
+            // Assert that the response status is BAD_REQUEST (400)
+            assertBadRequestResponse(importResource.validateContentImport(request, response, params));
+        }finally {
+            if(txtFile != null && txtFile.exists()){
+                txtFile.delete();
+            }
+        }
+
+    }
+
     /**
      * Scenario: Attempt to import content with a valid CSV file but without providing the required form data.
      * <p>
@@ -410,7 +467,7 @@ private void validateSuccessfulResponse(Response response, String expectedConten
         assertFalse(responseEntityView.getEntity().isEmpty(), "Job ID should be a non-empty string");
 
         // Retrieve and validate job exists in the queue
-        Job job = jobQueueManagerAPI.getJob(responseEntityView.getEntity());
+        Job job = contentImportHelper.getJob(responseEntityView.getEntity());
         assertNotNull(job, "Job should exist in queue");
 
         // Validate core import parameters
diff --git a/dotcms-postman/src/main/resources/postman/ContentImportResource.postman_collection.json b/dotcms-postman/src/main/resources/postman/ContentImportResource.postman_collection.json
index e088ca8e42a4..25cebbf18a26 100644
--- a/dotcms-postman/src/main/resources/postman/ContentImportResource.postman_collection.json
+++ b/dotcms-postman/src/main/resources/postman/ContentImportResource.postman_collection.json
@@ -116,41 +116,77 @@
 							"listen": "test",
 							"script": {
 								"exec": [
-									"// Validate the response is successful",
+									"// Validate the response status is 200",
 									"pm.test(\"Response status is 200\", function () {",
 									"    pm.response.to.have.status(200);",
 									"});",
 									"",
 									"// Parse the response body",
-									"pm.test(\"Response body should contain a valid Job ID\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    pm.expect(responseBody).to.have.property('entity').that.is.not.empty;",
+									"let response = pm.response.json();",
+									"let entity = response.entity;",
+									"let parameters = entity?.parameters;",
+									"",
+									"// Validate the response body structure",
+									"pm.test(\"Response contains a valid entity\", function () {",
+									"    pm.expect(response).to.have.property('entity').that.is.not.empty;",
+									"    pm.expect(entity).to.be.an('object');",
 									"});",
 									"",
+									"// Validate top-level properties of the entity",
+									"pm.test(\"Entity contains expected fields\", function () {",
+									"    pm.expect(entity).to.have.property('queueName', pm.collectionVariables.get('queueName'));",
+									"    pm.expect(entity.queueName).to.be.a(\"string\").that.is.not.empty;",
 									"",
-									"pm.test(\"Job entity should be defined\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    const job = responseBody.entity;",
-									"    pm.expect(job).to.be.an('object');",
+									"    pm.expect(entity).to.have.property('state').that.is.a(\"string\").that.is.not.empty;",
+									"    pm.expect(entity.state).to.be.oneOf([\"RUNNING\", \"PENDING\", \"COMPLETED\"]);",
+									"",
+									"    pm.expect(entity).to.have.property('progress').that.is.a(\"number\").within(0, 1);",
+									"    pm.expect(entity).to.have.property('retryCount').that.is.a(\"number\").that.is.at.least(0);",
+									"",
+									"    pm.expect(entity).to.have.property('result');",
+									"    pm.expect(entity.result === null || typeof entity.result === \"object\").to.be.true;",
 									"});",
 									"",
+									"// Validate date fields in the entity",
+									"pm.test(\"Entity date fields are valid\", function () {",
+									"    const isValidDate = (val) => val === null || new Date(val).toString() !== \"Invalid Date\";",
 									"",
-									"pm.test(\"Job should contain correct parameters\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    const job = responseBody.entity;",
-									"    const jobParameters = job.parameters;",
+									"    pm.expect(isValidDate(entity.completedAt)).to.be.true;",
+									"    pm.expect(new Date(entity.createdAt)).to.not.equal(\"Invalid Date\");",
+									"    pm.expect(isValidDate(entity.startedAt)).to.be.true;",
+									"    pm.expect(new Date(entity.updatedAt)).to.not.equal(\"Invalid Date\");",
+									"});",
 									"",
-									"    pm.expect(job).to.have.property('queueName', pm.collectionVariables.get('queueName'));",
-									"    pm.expect(jobParameters).to.be.an('object');",
-									"    pm.expect(jobParameters).to.have.property('cmd', 'preview');",
-									"    pm.expect(jobParameters).to.have.property('userId', 'dotcms.org.1');",
+									"// Validate UUID fields in the entity",
+									"pm.test(\"Entity UUID fields are valid\", function () {",
+									"    const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;",
 									"",
-									"    pm.expect(jobParameters).to.have.property('contentType', pm.collectionVariables.get(\"contentType\"));",
-									"    pm.expect(jobParameters).to.have.property('language', pm.collectionVariables.get(\"language\"));",
-									"    pm.expect(jobParameters).to.have.property('workflowActionId', pm.collectionVariables.get(\"workflowActionId\"));",
-									"    pm.expect(jobParameters).to.have.property('fields').that.deep.equals(JSON.parse(pm.collectionVariables.get(\"fields\")));",
+									"    pm.expect(entity.executionNode).to.match(uuidRegex);",
+									"    pm.expect(entity.id).to.match(uuidRegex);",
+									"});",
+									"",
+									"// Validate parameters in the entity",
+									"pm.test(\"Entity parameters are valid\", function () {",
+									"    pm.expect(parameters).to.be.an('object');",
+									"    pm.expect(parameters).to.have.property('cmd', 'preview');",
+									"    pm.expect(parameters).to.have.property('userId', 'dotcms.org.1');",
+									"    pm.expect(parameters).to.have.property('contentType', pm.collectionVariables.get('contentType'));",
+									"    pm.expect(parameters).to.have.property('language', pm.collectionVariables.get('language'));",
+									"    pm.expect(parameters).to.have.property('workflowActionId', pm.collectionVariables.get('workflowActionId'));",
+									"    pm.expect(parameters).to.have.property('fields').that.deep.equals(JSON.parse(pm.collectionVariables.get('fields')));",
+									"    pm.expect(parameters).to.have.property('requestFingerPrint').that.is.a(\"string\").with.lengthOf(44);",
+									"    pm.expect(parameters).to.have.property('tempFileId').that.is.a(\"string\");",
+									"});",
 									"",
-									"});"
+									"// Validate other top-level objects in the response",
+									"pm.test(\"Response contains expected auxiliary fields\", function () {",
+									"    pm.expect(response.errors).to.be.an(\"array\").that.is.empty;",
+									"    pm.expect(response.i18nMessagesMap).to.be.an(\"object\").that.is.empty;",
+									"    pm.expect(response.messages).to.be.an(\"array\").that.is.empty;",
+									"    pm.expect(response.pagination).to.be.null;",
+									"    pm.expect(response.permissions).to.be.an(\"array\").that.is.empty;",
+									"});",
+									""
 								],
 								"type": "text/javascript",
 								"packages": {}
@@ -171,16 +207,16 @@
 						"method": "GET",
 						"header": [],
 						"url": {
-							"raw": "{{serverURL}}/api/v1/jobs/{{jobId}}/status",
+							"raw": "{{serverURL}}/api/v1/content/_import/{{jobId}}",
 							"host": [
 								"{{serverURL}}"
 							],
 							"path": [
 								"api",
 								"v1",
-								"jobs",
-								"{{jobId}}",
-								"status"
+								"content",
+								"_import",
+								"{{jobId}}"
 							]
 						}
 					},
@@ -509,6 +545,204 @@
 					},
 					"response": []
 				},
+				{
+					"name": "Validate Content Import Job With Invalid Field Expect Failure",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('Field [doesNotExist] not found in Content Type [TestImportJob].');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test-import-content-job-final.csv"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"{{workflowActionId}}\", \"fields\": [\"doesNotExist\"]}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import/_validate",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import",
+								"_validate"
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
+				{
+					"name": "Validate Content Import Job With Invalid File Type Expect Failure",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('The file must be a CSV file.');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test.txt"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"{{workflowActionId}}\", \"fields\": {{fields}}}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import/_validate",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import",
+								"_validate"
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
+				{
+					"name": "Validate Content Import Job With Invalid Workflow Action Expect Failure",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('Workflow Action [doesNotExtist] not found.');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test-import-content-job-final.csv"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"doesNotExtist\", \"fields\": {{fields}}}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import/_validate",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import",
+								"_validate"
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
 				{
 					"name": "Validate Content Import Job With Invalid ContentType Expect Failure",
 					"event": [
@@ -760,47 +994,83 @@
 					"response": []
 				},
 				{
-					"name": "Check Successful Job Status",
+					"name": "Check Successful Content Import Job Status",
 					"event": [
 						{
 							"listen": "test",
 							"script": {
 								"exec": [
-									"// Validate the response is successful",
+									"// Validate the response status is 200",
 									"pm.test(\"Response status is 200\", function () {",
 									"    pm.response.to.have.status(200);",
 									"});",
 									"",
 									"// Parse the response body",
-									"pm.test(\"Response body should contain a valid Job ID\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    pm.expect(responseBody).to.have.property('entity').that.is.not.empty;",
+									"let response = pm.response.json();",
+									"let entity = response.entity;",
+									"let parameters = entity?.parameters;",
+									"",
+									"// Validate the response body structure",
+									"pm.test(\"Response contains a valid entity\", function () {",
+									"    pm.expect(response).to.have.property('entity').that.is.not.empty;",
+									"    pm.expect(entity).to.be.an('object');",
 									"});",
 									"",
+									"// Validate top-level properties of the entity",
+									"pm.test(\"Entity contains expected fields\", function () {",
+									"    pm.expect(entity).to.have.property('queueName', pm.collectionVariables.get('queueName'));",
+									"    pm.expect(entity.queueName).to.be.a(\"string\").that.is.not.empty;",
 									"",
-									"pm.test(\"Job entity should be defined\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    const job = responseBody.entity;",
-									"    pm.expect(job).to.be.an('object');",
+									"    pm.expect(entity).to.have.property('state').that.is.a(\"string\").that.is.not.empty;",
+									"    pm.expect(entity.state).to.be.oneOf([\"RUNNING\", \"PENDING\", \"COMPLETED\"]);",
+									"",
+									"    pm.expect(entity).to.have.property('progress').that.is.a(\"number\").within(0, 1);",
+									"    pm.expect(entity).to.have.property('retryCount').that.is.a(\"number\").that.is.at.least(0);",
+									"",
+									"    pm.expect(entity).to.have.property('result');",
+									"    pm.expect(entity.result === null || typeof entity.result === \"object\").to.be.true;",
 									"});",
 									"",
+									"// Validate date fields in the entity",
+									"pm.test(\"Entity date fields are valid\", function () {",
+									"    const isValidDate = (val) => val === null || new Date(val).toString() !== \"Invalid Date\";",
 									"",
-									"pm.test(\"Job should contain correct parameters\", function () {",
-									"    const responseBody = pm.response.json();",
-									"    const job = responseBody.entity;",
-									"    const jobParameters = job.parameters;",
+									"    pm.expect(isValidDate(entity.completedAt)).to.be.true;",
+									"    pm.expect(new Date(entity.createdAt)).to.not.equal(\"Invalid Date\");",
+									"    pm.expect(isValidDate(entity.startedAt)).to.be.true;",
+									"    pm.expect(new Date(entity.updatedAt)).to.not.equal(\"Invalid Date\");",
+									"});",
+									"",
+									"// Validate UUID fields in the entity",
+									"pm.test(\"Entity UUID fields are valid\", function () {",
+									"    const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;",
 									"",
-									"    pm.expect(job).to.have.property('queueName', pm.collectionVariables.get('queueName'));",
-									"    pm.expect(jobParameters).to.be.an('object');",
-									"    pm.expect(jobParameters).to.have.property('cmd', 'publish');",
-									"    pm.expect(jobParameters).to.have.property('userId', 'dotcms.org.1');",
+									"    pm.expect(entity.executionNode).to.match(uuidRegex);",
+									"    pm.expect(entity.id).to.match(uuidRegex);",
+									"});",
 									"",
-									"    pm.expect(jobParameters).to.have.property('contentType', pm.collectionVariables.get(\"contentType\"));",
-									"    pm.expect(jobParameters).to.have.property('language', pm.collectionVariables.get(\"language\"));",
-									"    pm.expect(jobParameters).to.have.property('workflowActionId', pm.collectionVariables.get(\"workflowActionId\"));",
-									"    pm.expect(jobParameters).to.have.property('fields').that.deep.equals(JSON.parse(pm.collectionVariables.get(\"fields\")));",
+									"// Validate parameters in the entity",
+									"pm.test(\"Entity parameters are valid\", function () {",
+									"    pm.expect(parameters).to.be.an('object');",
+									"    pm.expect(parameters).to.have.property('cmd', 'publish');",
+									"    pm.expect(parameters).to.have.property('userId', 'dotcms.org.1');",
+									"    pm.expect(parameters).to.have.property('contentType', pm.collectionVariables.get('contentType'));",
+									"    pm.expect(parameters).to.have.property('language', pm.collectionVariables.get('language'));",
+									"    pm.expect(parameters).to.have.property('workflowActionId', pm.collectionVariables.get('workflowActionId'));",
+									"    pm.expect(parameters).to.have.property('fields').that.deep.equals(JSON.parse(pm.collectionVariables.get('fields')));",
+									"    pm.expect(parameters).to.have.property('requestFingerPrint').that.is.a(\"string\").with.lengthOf(44);",
+									"    pm.expect(parameters).to.have.property('tempFileId').that.is.a(\"string\");",
+									"});",
 									"",
-									"});"
+									"// Validate other top-level objects in the response",
+									"pm.test(\"Response contains expected auxiliary fields\", function () {",
+									"    pm.expect(response.errors).to.be.an(\"array\").that.is.empty;",
+									"    pm.expect(response.i18nMessagesMap).to.be.an(\"object\").that.is.empty;",
+									"    pm.expect(response.messages).to.be.an(\"array\").that.is.empty;",
+									"    pm.expect(response.pagination).to.be.null;",
+									"    pm.expect(response.permissions).to.be.an(\"array\").that.is.empty;",
+									"});",
+									""
 								],
 								"type": "text/javascript",
 								"packages": {}
@@ -821,16 +1091,16 @@
 						"method": "GET",
 						"header": [],
 						"url": {
-							"raw": "{{serverURL}}/api/v1/jobs/{{jobId}}/status",
+							"raw": "{{serverURL}}/api/v1/content/_import/{{jobId}}",
 							"host": [
 								"{{serverURL}}"
 							],
 							"path": [
 								"api",
 								"v1",
-								"jobs",
-								"{{jobId}}",
-								"status"
+								"content",
+								"_import",
+								"{{jobId}}"
 							]
 						}
 					},
@@ -1218,6 +1488,202 @@
 					},
 					"response": []
 				},
+				{
+					"name": "Create Import Job With Invalid Field Expect Failure Copy",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('Field [doesNotExist] not found in Content Type [TestImportJob].');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test-import-content-job-final.csv"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"{{workflowActionId}}\", \"fields\": [\"doesNotExist\"]}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import/",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import",
+								""
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
+				{
+					"name": "Create Import Job With Invalid File Type Expect Failure Copy",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('The file must be a CSV file.');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test.txt"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"{{workflowActionId}}\", \"fields\": {{fields}}}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import"
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
+				{
+					"name": "Create Import Job With Invalid Workflow Action Expect Failure Copy",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"// Validate the response status is 400",
+									"pm.test(\"Response status is 400\", function () {",
+									"    pm.response.to.have.status(400);",
+									"});",
+									"",
+									"",
+									"// Validate that the response body contains the 'message' property and it is not empty",
+									"pm.test(\"Response should have an error message\", function () {",
+									"    const responseBody = pm.response.json();",
+									"    pm.expect(responseBody).to.have.property('message').that.is.not.empty;",
+									"    pm.expect(responseBody.message).to.equal('Workflow Action [doesNotExtist] not found.');",
+									"});",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "multipart/form-data"
+							}
+						],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "resources/ContentImportResource/test-import-content-job-final.csv"
+								},
+								{
+									"key": "form",
+									"value": "{\"contentType\":\"{{contentType}}\",\"language\":\"{{language}}\",\"workflowActionId\":\"doesNotExtist\", \"fields\": {{fields}}}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/content/_import",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"content",
+								"_import"
+							]
+						},
+						"description": "Creates a new job in the specified queue."
+					},
+					"response": []
+				},
 				{
 					"name": "Create Job Without File Expect Failure",
 					"event": [
diff --git a/dotcms-postman/src/main/resources/postman/resources/ContentImportResource/test.txt b/dotcms-postman/src/main/resources/postman/resources/ContentImportResource/test.txt
new file mode 100644
index 000000000000..30d74d258442
--- /dev/null
+++ b/dotcms-postman/src/main/resources/postman/resources/ContentImportResource/test.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file

From 83de9e0d06cfdab51021c7e25897465eb8805121 Mon Sep 17 00:00:00 2001
From: Jalinson Diaz <zjaaaldev@gmail.com>
Date: Tue, 3 Dec 2024 12:26:20 -0300
Subject: [PATCH 2/2] chore(uve): Add Running Experiments Badge to new toolbar
 (#30824)

This pull request introduces several changes to the `dot-uve-toolbar`
component and its associated files to support displaying running
experiments. The most important changes include updating the HTML
template, modifying the component's TypeScript file, and adjusting the
related tests to accommodate the new functionality.

Changes to `dot-uve-toolbar` component:

*
[`core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html`](diffhunk://#diff-9937556e73b051b878ba22ad1ce971a70019a617d7979b3e0bcc814801ad350bL28-R33):
Updated the template to conditionally display the
`dot-ema-running-experiment` component if there is a running experiment.
*
[`core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.ts`](diffhunk://#diff-217a9e619d6590c4f652e85353b9637ba5e464ddeb0424be35aef39bb8dceb30R9-R20):
Imported the `DotEmaRunningExperimentComponent` and included it in the
component's imports array.

Updates to tests:

*
`core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.spec.ts`:
* Imported `DotEmaRunningExperimentComponent` and
`getRunningExperimentMock`.
[[1]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1L14-R15)
[[2]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1R35-R45)
* Refactored the base state setup and added tests for the new running
experiment functionality.
[[1]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1L86-L98)
[[2]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1L109-R124)
[[3]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1R136-R141)
[[4]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1L141-L144)
[[5]](diffhunk://#diff-3eaa147616a5d1ff374a5fa27b0f38f0159a9039ef7e8d672dec43631f48a9e1R166-R187)

Backend support:

*
[`core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-page-api.service.ts`](diffhunk://#diff-9acb0e7dc2619395c49047164381778d2b6d6c41f58b30aa3cd6a798044007c6R39):
Added `runningExperimentId` to the `DotPageApiResponse` interface.
*
[`core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts`](diffhunk://#diff-0cbc04b5047422551dde0970e4ea1d0e1fcce3d9d8f4e0b4612fbc30b1658487L106-R108):
Updated the `withLoad` function to use `runningExperimentId` if
available.

## Screenshot


https://github.com/user-attachments/assets/97d92935-93cf-4198-9db7-36cc38f9f394
---
 .../dot-uve-toolbar.component.html            |   7 +-
 .../dot-uve-toolbar.component.spec.ts         | 101 ++++++++++++------
 .../dot-uve-toolbar.component.ts              |   2 +
 .../src/lib/services/dot-page-api.service.ts  |   1 +
 .../src/lib/store/features/load/withLoad.ts   |  13 ++-
 5 files changed, 83 insertions(+), 41 deletions(-)

diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html
index bc71d713e5ca..835d9a334eab 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html
@@ -27,7 +27,12 @@
     </div>
 
     <div class="p-toolbar-group-end">
-        <span data-testId="uve-toolbar-running-experiment">Experiments</span>
+        @if ($toolbar().runningExperiment; as runningExperiment) {
+            <dot-ema-running-experiment
+                [runningExperiment]="runningExperiment"
+                data-testId="uve-toolbar-running-experiment" />
+        }
+
         <span data-testId="uve-toolbar-language-selector">Language</span>
         <span data-testId="uve-toolbar-persona-selector">Persona</span>
         <span data-testId="uve-toolbar-workflow-actions">Workflows</span>
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.spec.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.spec.ts
index c65e5925b441..a87708cecd5f 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.spec.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.spec.ts
@@ -14,7 +14,8 @@ import { LoginService } from '@dotcms/dotcms-js';
 import {
     DotExperimentsServiceMock,
     DotLanguagesServiceMock,
-    DotLicenseServiceMock
+    DotLicenseServiceMock,
+    getRunningExperimentMock
 } from '@dotcms/utils-testing';
 
 import { DotUveToolbarComponent } from './dot-uve-toolbar.component';
@@ -34,6 +35,7 @@ import {
     sanitizeURL
 } from '../../../utils';
 import { DotEmaBookmarksComponent } from '../dot-ema-bookmarks/dot-ema-bookmarks.component';
+import { DotEmaRunningExperimentComponent } from '../dot-ema-running-experiment/dot-ema-running-experiment.component';
 
 describe('DotUveToolbarComponent', () => {
     let spectator: Spectator<DotUveToolbarComponent>;
@@ -41,7 +43,11 @@ describe('DotUveToolbarComponent', () => {
 
     const createComponent = createComponentFactory({
         component: DotUveToolbarComponent,
-        imports: [HttpClientTestingModule, MockComponent(DotEmaBookmarksComponent)],
+        imports: [
+            HttpClientTestingModule,
+            MockComponent(DotEmaBookmarksComponent),
+            MockComponent(DotEmaRunningExperimentComponent)
+        ],
         providers: [
             UVEStore,
             provideHttpClientTesting(),
@@ -94,38 +100,39 @@ describe('DotUveToolbarComponent', () => {
         siteId: pageAPIResponse?.site.identifier
     });
 
+    const baseUVEToolbarState = {
+        editor: {
+            bookmarksUrl,
+            copyUrl: createFullURL(params, pageAPIResponse?.site.identifier),
+            apiUrl: `${'http://localhost'}${pageAPI}`
+        },
+        preview: null,
+        currentLanguage: pageAPIResponse?.viewAs.language,
+        urlContentMap: null,
+        runningExperiment: null,
+        workflowActionsInode: pageAPIResponse?.page.inode,
+        unlockButton: null,
+        showInfoDisplay: shouldShowInfoDisplay,
+        personaSelector: {
+            pageId: pageAPIResponse?.page.identifier,
+            value: pageAPIResponse?.viewAs.persona ?? DEFAULT_PERSONA
+        }
+    };
+
+    const baseUVEState = {
+        $uveToolbar: signal(baseUVEToolbarState),
+        setDevice: jest.fn(),
+        setSocialMedia: jest.fn(),
+        pageParams: signal(params),
+        pageAPIResponse: signal(MOCK_RESPONSE_VTL),
+        reloadCurrentPage: jest.fn(),
+        loadPageAsset: jest.fn()
+    };
+
     describe('base state', () => {
         beforeEach(() => {
             spectator = createComponent({
-                providers: [
-                    mockProvider(UVEStore, {
-                        $uveToolbar: signal({
-                            editor: {
-                                bookmarksUrl,
-                                copyUrl: createFullURL(params, pageAPIResponse?.site.identifier),
-                                apiUrl: `${'http://localhost'}${pageAPI}`
-                            },
-                            preview: null,
-
-                            currentLanguage: pageAPIResponse?.viewAs.language,
-                            urlContentMap: null,
-                            runningExperiment: null,
-                            workflowActionsInode: pageAPIResponse?.page.inode,
-                            unlockButton: null,
-                            showInfoDisplay: shouldShowInfoDisplay,
-                            personaSelector: {
-                                pageId: pageAPIResponse?.page.identifier,
-                                value: pageAPIResponse?.viewAs.persona ?? DEFAULT_PERSONA
-                            }
-                        }),
-                        setDevice: jest.fn(),
-                        setSocialMedia: jest.fn(),
-                        pageParams: signal(params),
-                        pageAPIResponse: signal(MOCK_RESPONSE_VTL),
-                        reloadCurrentPage: jest.fn(),
-                        loadPageAsset: jest.fn()
-                    })
-                ]
+                providers: [mockProvider(UVEStore, { ...baseUVEState })]
             });
 
             messageService = spectator.inject(MessageService);
@@ -139,6 +146,12 @@ describe('DotUveToolbarComponent', () => {
             });
         });
 
+        describe('dot-ema-running-experiment', () => {
+            it('should be null', () => {
+                expect(spectator.query(byTestId('uve-toolbar-running-experiment'))).toBeNull();
+            });
+        });
+
         it('should have preview button', () => {
             expect(spectator.query(byTestId('uve-toolbar-preview'))).toBeTruthy();
         });
@@ -178,10 +191,6 @@ describe('DotUveToolbarComponent', () => {
             expect(spectator.query(byTestId('uve-toolbar-api-link'))).toBeTruthy();
         });
 
-        it('should have experiments button', () => {
-            expect(spectator.query(byTestId('uve-toolbar-running-experiment'))).toBeTruthy();
-        });
-
         it('should have language selector', () => {
             expect(spectator.query(byTestId('uve-toolbar-language-selector'))).toBeTruthy();
         });
@@ -194,4 +203,26 @@ describe('DotUveToolbarComponent', () => {
             expect(spectator.query(byTestId('uve-toolbar-workflow-actions'))).toBeTruthy();
         });
     });
+
+    describe('State changes', () => {
+        describe('Experiment is running', () => {
+            beforeEach(() => {
+                const state = {
+                    ...baseUVEState,
+                    $uveToolbar: signal({
+                        ...baseUVEToolbarState,
+                        runningExperiment: getRunningExperimentMock()
+                    })
+                };
+
+                spectator = createComponent({
+                    providers: [mockProvider(UVEStore, { ...state })]
+                });
+            });
+
+            it('should have experiment running component', () => {
+                expect(spectator.query(byTestId('uve-toolbar-running-experiment'))).toBeTruthy();
+            });
+        });
+    });
 });
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.ts
index f35b0b432f3f..5e3869e11e1e 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.ts
@@ -10,6 +10,7 @@ import { DotMessageService } from '@dotcms/data-access';
 import { UVEStore } from '../../../store/dot-uve.store';
 import { DotEmaBookmarksComponent } from '../dot-ema-bookmarks/dot-ema-bookmarks.component';
 import { DotEmaInfoDisplayComponent } from '../dot-ema-info-display/dot-ema-info-display.component';
+import { DotEmaRunningExperimentComponent } from '../dot-ema-running-experiment/dot-ema-running-experiment.component';
 
 @Component({
     selector: 'dot-uve-toolbar',
@@ -19,6 +20,7 @@ import { DotEmaInfoDisplayComponent } from '../dot-ema-info-display/dot-ema-info
         ToolbarModule,
         DotEmaBookmarksComponent,
         DotEmaInfoDisplayComponent,
+        DotEmaRunningExperimentComponent,
         ClipboardModule
     ],
     templateUrl: './dot-uve-toolbar.component.html',
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-page-api.service.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-page-api.service.ts
index 1d9975d5b4cd..40f867dab0e5 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-page-api.service.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-page-api.service.ts
@@ -36,6 +36,7 @@ export interface DotPageApiResponse {
     containers: DotPageContainerStructure;
     urlContentMap?: DotCMSContentlet;
     vanityUrl?: VanityUrl;
+    runningExperimentId?: string;
 }
 
 export interface DotPageApiParams {
diff --git a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts
index a6823605dbea..ee3944fcec67 100644
--- a/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts
+++ b/core-web/libs/portlets/edit-ema/portlet/src/lib/store/features/load/withLoad.ts
@@ -100,10 +100,13 @@ export function withLoad() {
                                         });
                                     }
                                 }),
-                                switchMap(({ pageAsset, isEnterprise, currentUser }) =>
-                                    forkJoin({
+                                switchMap(({ pageAsset, isEnterprise, currentUser }) => {
+                                    const experimentId =
+                                        pageParams?.experimentId ?? pageAsset?.runningExperimentId;
+
+                                    return forkJoin({
                                         experiment: dotExperimentsService.getById(
-                                            pageParams?.experimentId || DEFAULT_VARIANT_ID
+                                            experimentId ?? DEFAULT_VARIANT_ID
                                         ),
                                         languages: dotLanguagesService.getLanguagesUsedPage(
                                             pageAsset.page.identifier
@@ -145,8 +148,8 @@ export function withLoad() {
                                                 });
                                             }
                                         })
-                                    )
-                                )
+                                    );
+                                })
                             );
                         })
                     )