Handle 2 workflows for 1 contenttype

core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.spec.ts

@@ -1,7 +1,11 @@
 import { createHttpFactory, HttpMethod, SpectatorHttp } from '@ngneat/spectator/jest';
 
 import { DotCMSWorkflowAction } from '@dotcms/dotcms-models';
-import { mockWorkflows, mockWorkflowsActions } from '@dotcms/utils-testing';
+import {
+    MOCK_SINGLE_WORKFLOW_ACTIONS,
+    mockWorkflows,
+    mockWorkflowsActions
+} from '@dotcms/utils-testing';
 
 import { DotWorkflowsActionsService } from './dot-workflows-actions.service';
 
@@ -38,12 +42,12 @@ describe('DotWorkflowsActionsService', () => {
 
     it('should get default actions by content type', (done) => {
         const contentTypeId = '123';
-        const mockResponse = mockWorkflowsActions.map((action) => ({
-            action
-        }));
+        const mockResponse = {
+            entity: MOCK_SINGLE_WORKFLOW_ACTIONS
+        };
 
         spectator.service.getDefaultActions(contentTypeId).subscribe((res) => {
-            expect(res).toEqual(mockWorkflowsActions);
+            expect(res).toEqual(MOCK_SINGLE_WORKFLOW_ACTIONS);
             done();
         });
 
@@ -52,8 +56,59 @@ describe('DotWorkflowsActionsService', () => {
                 `/api/v1/workflow/initialactions/contenttype/${contentTypeId}`,
                 HttpMethod.GET
             )
+            .flush(mockResponse);
+    });
+
+    it('should get workflow actions by content type name', (done) => {
+        const contentTypeName = 'Blog';
+        const mockWorkflowActionsResponse = [
+            {
+                scheme: mockWorkflows[0],
+                action: mockWorkflowsActions[0],
+                firstStep: {
+                    id: '123',
+                    name: 'First Step',
+                    creationDate: 0,
+                    enableEscalation: false,
+                    escalationAction: null,
+                    escalationTime: 0,
+                    resolved: false,
+                    schemeId: '123',
+                    myOrder: 0
+                }
+            }
+        ];
+
+        spectator.service.getWorkFlowActions(contentTypeName).subscribe((res) => {
+            expect(res).toEqual(mockWorkflowActionsResponse);
+            done();
+        });
+
+        spectator
+            .expectOne(
+                `/api/v1/workflow/defaultactions/contenttype/${contentTypeName}`,
+                HttpMethod.GET
+            )
+            .flush({
+                entity: mockWorkflowActionsResponse
+            });
+    });
+
+    it('should return empty array when workflow actions response is null', (done) => {
+        const contentTypeName = 'Blog';
+
+        spectator.service.getWorkFlowActions(contentTypeName).subscribe((res) => {
+            expect(res).toEqual([]);
+            done();
+        });
+
+        spectator
+            .expectOne(
+                `/api/v1/workflow/defaultactions/contenttype/${contentTypeName}`,
+                HttpMethod.GET
+            )
             .flush({
-                entity: mockResponse
+                entity: null
             });
     });
 });

core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.ts

@@ -6,7 +6,11 @@ import { Injectable, inject } from '@angular/core';
 import { map, pluck } from 'rxjs/operators';
 
 import { DotCMSResponse } from '@dotcms/dotcms-js';
-import { DotCMSWorkflowAction, DotCMSWorkflow } from '@dotcms/dotcms-models';
+import {
+    DotCMSContentletWorkflowActions,
+    DotCMSWorkflow,
+    DotCMSWorkflowAction
+} from '@dotcms/dotcms-models';
 
 export enum DotRenderMode {
     LISTING = 'LISTING',
@@ -51,28 +55,40 @@ export class DotWorkflowsActionsService {
 
     /**
      * Returns the workflow actions of the passed contentType
-     *
      * @param {string} inode
      * @param {DotRenderMode} [renderMode]
      * @returns {Observable<DotCMSWorkflowAction[]>}
      * @memberof DotWorkflowsActionsService
      */
-    getDefaultActions(contentTypeId: string): Observable<DotCMSWorkflowAction[]> {
+    getDefaultActions(contentTypeId: string): Observable<DotCMSContentletWorkflowActions[]> {
         return this.httpClient
             .get<
-                DotCMSResponse<{ action: DotCMSWorkflowAction; scheme: DotCMSWorkflow }[]>
+                DotCMSResponse<DotCMSContentletWorkflowActions[]>
             >(`${this.BASE_URL}/initialactions/contenttype/${contentTypeId}`)
             .pipe(
                 pluck('entity'),
-                map((res = []) => {
-                    return res.map(({ action }) => {
-                        return action;
-                    });
-                })
+                map((res) => res || [])
             );
     }
 
     private getWorkFlowId(workflow: DotCMSWorkflow): string {
         return workflow && workflow.id;
     }
+
+    /**
+     * Returns the workflow actions of the passed content type name
+     *
+     * @param {string} contentTypeName
+     * @returns {Observable<DotCMSWorkflowActions>}
+     */
+    getWorkFlowActions(contentTypeName: string): Observable<DotCMSContentletWorkflowActions[]> {
+        return this.httpClient
+            .get<
+                DotCMSResponse<DotCMSContentletWorkflowActions[]>
+            >(`${this.BASE_URL}/defaultactions/contenttype/${contentTypeName}`)
+            .pipe(
+                pluck('entity'),
+                map((res) => res || [])
+            );
+    }
 }

core-web/libs/dotcms-models/src/lib/dot-workflow-action.model.ts

@@ -1,4 +1,5 @@
 import { DotCMSContentType } from './dot-content-types.model';
+import { DotCMSWorkflow, WorkflowStep } from './dot-workflow.model';
 
 export interface DotCMSWorkflowActionEvent {
     workflow: DotCMSWorkflowAction;
@@ -24,6 +25,19 @@ export interface DotCMSWorkflowAction {
     showOn: string[];
     actionInputs: DotCMSWorkflowInput[];
     metadata?: Record<string, string>;
+    hasArchiveActionlet?: boolean;
+    hasCommentActionlet?: boolean;
+    hasDeleteActionlet?: boolean;
+    hasDestroyActionlet?: boolean;
+    hasMoveActionletActionlet?: boolean;
+    hasMoveActionletHasPathActionlet?: boolean;
+    hasOnlyBatchActionlet?: boolean;
+    hasPublishActionlet?: boolean;
+    hasPushPublishActionlet?: boolean;
+    hasResetActionlet?: boolean;
+    hasSaveActionlet?: boolean;
+    hasUnarchiveActionlet?: boolean;
+    hasUnpublishActionlet?: boolean;
 }
 
 export enum DotCMSSystemActionType {
@@ -58,3 +72,9 @@ export interface DotCMSWorkflowInput {
     id: string;
     body: any;
 }
+
+export interface DotCMSContentletWorkflowActions {
+    scheme: DotCMSWorkflow;
+    action: DotCMSWorkflowAction;
+    firstStep: WorkflowStep;
+}

core-web/libs/dotcms-models/src/lib/dot-workflow.model.ts

@@ -45,6 +45,7 @@ export interface DotCMSWorkflowStatus {
     scheme: DotCMSWorkflow;
     step: WorkflowStep;
     task: WorkflowTask;
+    firstStep?: WorkflowStep;
 }
 
 export interface WorkflowStep {