Merge branch 'main' into issue-30733-ftm-new-uve-toolbar-implement-ap…

…i-button

core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/components/dot-uve-toolbar/dot-uve-toolbar.component.html

@@ -31,7 +31,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>

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';
 
 const $apiURL = '/api/v1/page/json/123-xyz-567-xxl?host_id=123-xyz-567-xxl&language_id=1';
 
@@ -43,7 +45,11 @@ describe('DotUveToolbarComponent', () => {
 
     const createComponent = createComponentFactory({
         component: DotUveToolbarComponent,
-        imports: [HttpClientTestingModule, MockComponent(DotEmaBookmarksComponent)],
+        imports: [
+            HttpClientTestingModule,
+            MockComponent(DotEmaBookmarksComponent),
+            MockComponent(DotEmaRunningExperimentComponent)
+        ],
         providers: [
             UVEStore,
             provideHttpClientTesting(),
@@ -96,39 +102,40 @@ 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),
+        $apiURL: signal($apiURL),
+        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
-                            }
-                        }),
-                        $apiURL: signal($apiURL),
-                        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);
@@ -142,6 +149,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();
         });
@@ -204,4 +217,26 @@ describe('DotUveToolbarComponent', () => {
             });
         });
     });
+
+    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();
+            });
+        });
+    });
 });

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',

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 {

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() {
                                                 });
                                             }
                                         })
-                                    )
-                                )
+                                    );
+                                })
                             );
                         })
                     )

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.
      *

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);
+    }
+}

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.
      *

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");
     }
 }