feat(edit-content) remove duplicated interface

dotCMS · Nov 14, 2024 · 18015ae · 18015ae
1 parent 1f9d81b
commit 18015ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
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
@@ -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
@@ -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/...mponents/dot-edit-content-sidebar-workflow/dot-edit-content-sidebar-workflow.component.ts b/...mponents/dot-edit-content-sidebar-workflow/dot-edit-content-sidebar-workflow.component.ts
@@ -1,4 +1,3 @@
-import { JsonPipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
@@ -26,8 +25,7 @@ import { DotMessagePipe } from '@dotcms/ui';
         ButtonModule,
         DialogModule,
         DropdownModule,
-        FormsModule,
-        JsonPipe
+        FormsModule
     ],
 
     templateUrl: './dot-edit-content-sidebar-workflow.component.html',

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