diff --git a/core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.ts b/core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.ts index 5bf7089bdcb..abdcdb5837b 100644 --- a/core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.ts +++ b/core-web/libs/data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service.ts @@ -6,7 +6,7 @@ import { Injectable, inject } from '@angular/core'; import { map, pluck } from 'rxjs/operators'; import { DotCMSResponse } from '@dotcms/dotcms-js'; -import { DotCMSWorkflow, DotCMSWorkflowAction, DotCMSWorkflowStep } from '@dotcms/dotcms-models'; +import { DotCMSWorkflow, DotCMSWorkflowAction, WorkflowStep } from '@dotcms/dotcms-models'; export enum DotRenderMode { LISTING = 'LISTING', @@ -16,7 +16,7 @@ export enum DotRenderMode { export interface DotCMSWorkflowActions { scheme: DotCMSWorkflow; action: DotCMSWorkflowAction; - firstStep: DotCMSWorkflowStep; + firstStep: WorkflowStep; } @Injectable() diff --git a/core-web/libs/dotcms-models/src/lib/dot-workflow-action.model.ts b/core-web/libs/dotcms-models/src/lib/dot-workflow-action.model.ts index f0fb2d4075c..91a0314820c 100644 --- a/core-web/libs/dotcms-models/src/lib/dot-workflow-action.model.ts +++ b/core-web/libs/dotcms-models/src/lib/dot-workflow-action.model.ts @@ -71,15 +71,3 @@ export interface DotCMSWorkflowInput { id: string; body: any; } - -export interface DotCMSWorkflowStep { - creationDate: number; - enableEscalation: boolean; - escalationAction: null; - escalationTime: number; - id: string; - myOrder: number; - name: string; - resolved: boolean; - schemeId: string; -} diff --git a/core-web/libs/utils-testing/src/lib/dot-workflows-actions.mock.ts b/core-web/libs/utils-testing/src/lib/dot-workflows-actions.mock.ts index 4c15f4f1204..01085c7a22c 100644 --- a/core-web/libs/utils-testing/src/lib/dot-workflows-actions.mock.ts +++ b/core-web/libs/utils-testing/src/lib/dot-workflows-actions.mock.ts @@ -1,4 +1,5 @@ -import { DotCMSWorkflow, DotCMSWorkflowAction, DotCMSWorkflowStep } from '@dotcms/dotcms-models'; +import { DotCMSWorkflowAction } from '@dotcms/dotcms-models'; +import { DotCMSWorkflowActions } from '../../../data-access/src/lib/dot-workflows-actions/dot-workflows-actions.service'; export const mockWorkflowsActions: DotCMSWorkflowAction[] = [ { @@ -83,11 +84,7 @@ export const mockPublishAction = { actionInputs: [] }; -export const MOCK_SINGLE_WORKFLOW_ACTIONS: { - scheme: DotCMSWorkflow; - action: DotCMSWorkflowAction; - firstStep: DotCMSWorkflowStep; -}[] = [ +export const MOCK_SINGLE_WORKFLOW_ACTIONS: DotCMSWorkflowActions[] = [ { action: { assignable: false, @@ -204,11 +201,7 @@ export const MOCK_SINGLE_WORKFLOW_ACTIONS: { } ]; -export const MOCK_MULTIPLE_WORKFLOW_ACTIONS: { - scheme: DotCMSWorkflow; - action: DotCMSWorkflowAction; - firstStep: DotCMSWorkflowStep; -}[] = [ +export const MOCK_MULTIPLE_WORKFLOW_ACTIONS: DotCMSWorkflowActions[] = [ { action: { assignable: false,