Consolidated transitions

SeedCompany · Jun 10, 2024 · 65b5495 · 65b5495
1 parent dd319bc
commit 65b5495
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 75 deletions.
diff --git a/src/components/authorization/policies/by-role/project-manager.policy.ts b/src/components/authorization/policies/by-role/project-manager.policy.ts
@@ -99,19 +99,14 @@ const stepsUntilFinancialEndorsement = takeWhile(
       'Early Conversations -> Pending Concept Approval',
       'Early Conversations -> Did Not Develop',
       'Prep for Consultant Endorsement -> Pending Consultant Endorsement',
-      'Prep for Consultant Endorsement -> Pending Concept Approval',
-      'Prep for Consultant Endorsement -> Did Not Develop',
+      'Prep for Consultant & Financial Endorsement & Finalizing Proposal -> Pending Concept Approval',
+      'Prep for Consultant & Financial Endorsement & Finalizing Proposal -> Did Not Develop',
       'Pending Consultant Endorsement -> Prep for Financial Endorsement With Consultant Endorsement',
       'Pending Consultant Endorsement -> Prep for Financial Endorsement Without Consultant Endorsement',
       'Prep for Financial Endorsement -> Pending Financial Endorsement',
-      'Prep for Financial Endorsement -> Pending Consultant Endorsement',
-      'Prep for Financial Endorsement -> Pending Concept Approval',
-      'Prep for Financial Endorsement -> Did Not Develop',
+      'Prep for Financial Endorsement & Finalizing Proposal -> Pending Consultant Endorsement',
       'Finalizing Proposal -> Pending Regional Director Approval',
       'Finalizing Proposal -> Pending Financial Endorsement',
-      'Finalizing Proposal -> Pending Consultant Endorsement',
-      'Finalizing Proposal -> Pending Concept Approval',
-      'Finalizing Proposal -> Did Not Develop',
       'Active -> Discussing Change To Plan',
       'Active -> Discussing Termination',
       'Active -> Finalizing Completion',
@@ -124,9 +119,8 @@ const stepsUntilFinancialEndorsement = takeWhile(
       'Discussing Suspension -> Pending Suspension Approval',
       'Discussing Suspension -> Back To Active',
       'Suspended -> Discussing Reactivation',
-      'Suspended -> Discussing Termination',
+      'Suspended & Discussing Reactivation -> Discussing Termination',
       'Discussing Reactivation -> Pending Reactivation Approval',
-      'Discussing Reactivation -> Discussing Termination',
       'Discussing Termination -> Pending Termination Approval',
       'Discussing Termination -> Back To Most Recent',
       'Finalizing Completion -> Back To Active',

diff --git a/src/components/project/workflow/project-workflow.ts b/src/components/project/workflow/project-workflow.ts
@@ -84,20 +84,30 @@ export const ProjectWorkflow = defineWorkflow({
     type: Type.Approve,
     conditions: IsNotMultiplication,
   },
-  'Prep for Consultant Endorsement -> Pending Concept Approval': {
-    from: Step.PrepForConsultantEndorsement,
-    to: Step.PendingConceptApproval,
-    label: 'Resubmit for Concept Approval',
-    type: Type.Neutral,
-    conditions: IsNotMultiplication,
-  },
-  'Prep for Consultant Endorsement -> Did Not Develop': {
-    from: Step.PrepForConsultantEndorsement,
-    to: Step.DidNotDevelop,
-    label: 'End Development',
-    type: Type.Reject,
-    conditions: IsNotMultiplication,
-  },
+  'Prep for Consultant & Financial Endorsement & Finalizing Proposal -> Pending Concept Approval':
+    {
+      from: [
+        Step.PrepForConsultantEndorsement,
+        Step.PrepForFinancialEndorsement,
+        Step.FinalizingProposal,
+      ],
+      to: Step.PendingConceptApproval,
+      label: 'Resubmit for Concept Approval',
+      type: Type.Neutral,
+      conditions: IsNotMultiplication,
+    },
+  'Prep for Consultant & Financial Endorsement & Finalizing Proposal -> Did Not Develop':
+    {
+      from: [
+        Step.PrepForConsultantEndorsement,
+        Step.PrepForFinancialEndorsement,
+        Step.FinalizingProposal,
+      ],
+      to: Step.DidNotDevelop,
+      label: 'End Development',
+      type: Type.Reject,
+      conditions: IsNotMultiplication,
+    },
 
   // Pending Consultant Endorsement
   'Pending Consultant Endorsement -> Prep for Financial Endorsement With Consultant Endorsement':
@@ -125,27 +135,14 @@ export const ProjectWorkflow = defineWorkflow({
     type: Type.Approve,
     conditions: IsNotMultiplication,
   },
-  'Prep for Financial Endorsement -> Pending Consultant Endorsement': {
-    from: Step.PrepForFinancialEndorsement,
-    to: Step.PendingConsultantEndorsement,
-    label: 'Resubmit for Consultant Endorsement',
-    type: Type.Neutral,
-    conditions: IsNotMultiplication,
-  },
-  'Prep for Financial Endorsement -> Pending Concept Approval': {
-    from: Step.PrepForFinancialEndorsement,
-    to: Step.PendingConceptApproval,
-    label: 'Resubmit for Concept Approval',
-    type: Type.Neutral,
-    conditions: IsNotMultiplication,
-  },
-  'Prep for Financial Endorsement -> Did Not Develop': {
-    from: Step.PrepForFinancialEndorsement,
-    to: Step.DidNotDevelop,
-    label: 'End Development',
-    type: Type.Reject,
-    conditions: IsNotMultiplication,
-  },
+  'Prep for Financial Endorsement & Finalizing Proposal -> Pending Consultant Endorsement':
+    {
+      from: [Step.PrepForFinancialEndorsement, Step.FinalizingProposal],
+      to: Step.PendingConsultantEndorsement,
+      label: 'Resubmit for Consultant Endorsement',
+      type: Type.Neutral,
+      conditions: IsNotMultiplication,
+    },
 
   // Pending Financial Endorsement
   'Pending Financial Endorsement -> Finalizing Proposal With Financial Endorsement':
@@ -180,27 +177,6 @@ export const ProjectWorkflow = defineWorkflow({
     type: Type.Neutral,
     conditions: IsNotMultiplication,
   },
-  'Finalizing Proposal -> Pending Consultant Endorsement': {
-    from: Step.FinalizingProposal,
-    to: Step.PendingConsultantEndorsement,
-    label: 'Resubmit for Consultant Endorsement',
-    type: Type.Neutral,
-    conditions: IsNotMultiplication,
-  },
-  'Finalizing Proposal -> Pending Concept Approval': {
-    from: Step.FinalizingProposal,
-    to: Step.PendingConceptApproval,
-    label: 'Resubmit for Concept Approval',
-    type: Type.Neutral,
-    conditions: IsNotMultiplication,
-  },
-  'Finalizing Proposal -> Did Not Develop': {
-    from: Step.FinalizingProposal,
-    to: Step.DidNotDevelop,
-    label: 'End Development',
-    type: Type.Reject,
-    conditions: IsNotMultiplication,
-  },
 
   // Pending Regional Director Approval
   'Pending Regional Director Approval -> Early Conversations': {
@@ -491,8 +467,8 @@ export const ProjectWorkflow = defineWorkflow({
     type: Type.Neutral,
     notifiers: EmailDistros('project_suspension@tsco.org'),
   },
-  'Suspended -> Discussing Termination': {
-    from: Step.Suspended,
+  'Suspended & Discussing Reactivation -> Discussing Termination': {
+    from: [Step.Suspended, Step.DiscussingReactivation],
     to: Step.DiscussingTermination,
     label: 'Discuss Termination',
     type: Type.Neutral,
@@ -507,13 +483,6 @@ export const ProjectWorkflow = defineWorkflow({
     type: Type.Approve,
     notifiers: EmailDistros('project_suspension@tsco.org'),
   },
-  'Discussing Reactivation -> Discussing Termination': {
-    from: Step.DiscussingReactivation,
-    to: Step.DiscussingTermination,
-    label: 'Discuss Termination',
-    type: Type.Neutral,
-    notifiers: EmailDistros('project_suspension@tsco.org'),
-  },
 
   // Pending Reactivation Approval
   'Pending Reactivation Approval -> Active Changed Plan': {