DN-3886 feat: harmonise the project workflows onto a common base (#201)

* DN-3886 feature: harmonise the project workflows onto a common base

* DN-3886 chore(RMSS): cleanup unused

* DN-3886 fix: RMSS pilot

* DN-3886 feat(resetParent): first version of resetParentStep suppression generatio

* DN-3886 chore(test): also resetparentstep in rmss test

* DN-3886 chore: rename for better clarity

* Feature/dn 3886 pick substeps (#216)

* DN-3886 feat(inheritance): track declared keys better

* DN-3886 fix: inherit resources correctly

* DN-3886 fix: same logic for relatedUserGrouping

* DN-3886 fix: merge (global)actions

* DN-3886 chore: make inheritance property checks type-safe

---------

Co-authored-by: Gerrit Oomens <g.oomens@uva.nl>

Author: annesnour03

Schemas/Step.json

@@ -1481,6 +1481,10 @@
           "items": {
             "type": "string"
           }
+        },
+        "resetParentStep": {
+          "type": "boolean",
+          "description": "When declared on a step event, restarts the sequential parent of the declaring step; the suppression rules are generated from the effective hierarchy (see docs/reset-parent-step.md)."
         }
       }
     }

Schemas/WorkflowDefinition.json

@@ -1206,6 +1206,10 @@
           "items": {
             "type": "string"
           }
+        },
+        "resetParentStep": {
+          "type": "boolean",
+          "description": "When declared on a step event, restarts the sequential parent of the declaring step; the suppression rules are generated from the effective hierarchy (see docs/reset-parent-step.md)."
         }
       }
     },

UvA.Workflow.Tests/Fixtures/PA/Project-PA/Entity.yaml

@@ -1,4 +1,5 @@
 name: Project-PA
+inheritsFrom: Project-Base
 title:
   en: Project (PA)
   nl: Project (PA)

UvA.Workflow.Tests/Fixtures/PA/Project-PA/Properties.yaml

@@ -1,29 +1,10 @@
 properties:
-  - name: Course
-    type: Context!
-    inheritedRoles: [Coordinator, Impersonator]
-
-  - name: Student
-    type: User!
-
   - name: WorkingTitle
     type: String!
     text:
       en: Working title
       nl: Werktitel
 
-  - name: EC
-    type: Int!
-    text:
-      en: EC
-      nl: EC
-
-  - name: Examiner
-    type: User!
-    text:
-      en: Examiner
-      nl: Examinator
-
   - name: SecondReviewer
     type: User!
     text:

UvA.Workflow.Tests/Fixtures/Project-Base/Entity.yaml

@@ -0,0 +1,28 @@
+name: Project-Base
+title: Project (base)
+titlePlural: Projects
+instanceTitle: '{{ Title }}'
+
+relatedUsers:
+  - property: Supervisor
+    group: default
+  - property: Examiner
+    group: default
+  - property: Reviewer
+    group: default
+  - property: SecondReader
+    group: default
+  - property: Course.Coordinator
+    group: support
+  - property: Course.ConfidentialAdviser
+    group: support
+  - property: Course.StudyAdviser
+    group: support
+
+relatedUserGrouping:
+  groups:
+    - name: default
+    - name: support
+      title:
+        en: Other involved staff
+        nl: Andere betrokkenen

UvA.Workflow.Tests/Fixtures/Project-Base/Properties.yaml

@@ -0,0 +1,53 @@
+properties:
+  - name: Course
+    type: Context!
+    inheritedRoles: [Coordinator, Impersonator]
+
+  - name: Title
+    type: String!
+    text:
+      en: Working title
+      nl: Werktitel
+
+  - name: EC
+    type: Int!
+
+  - name: StartDate
+    type: Date!
+    text:
+      en: Start date
+      nl: Startdatum
+
+  - name: EndDate
+    type: Date!
+    text:
+      en: End date
+      nl: Einddatum
+
+  - name: Examiner
+    type: User!
+    text:
+      en: Examiner
+      nl: Examinator
+
+  - name: Supervisor
+    type: User!
+    allowsExternalUsers: true
+    text:
+      en: Supervisor
+      nl: Begeleider
+
+  - name: Reviewer
+    type: User!
+    text:
+      en: Reviewer
+      nl: Beoordelaar
+
+  - name: SecondReader
+    type: User!
+    text:
+      en: Second reader
+      nl: Tweede beoordelaar
+
+  - name: Student
+    type: User!

UvA.Workflow.Tests/Fixtures/Project-RMSS/Entity.yaml

@@ -4,29 +4,22 @@ titlePlural:
   en: Projects (RMSS)
   nl: Projecten (RMSS)
 instanceTitle: '{{ Title }}'
-inheritsFrom: Project
+inheritsFrom: Project-Base
 
-events:
-  - name: Start
-    suppresses:
-      - ProposalApprovedSupervisor
-      - ProposalRejectedSupervisor
-      - ProposalApprovedReviewer
-      - ProposalRejectedReviewer
-      - ProposalReturnedForRevision
-
-  - name: ProposalRejectedSupervisor
-    suppresses: [ProposalApprovedSupervisor]
-  - name: ProposalApprovedSupervisor
-    suppresses: [ProposalRejectedSupervisor]
-
-  - name: ProposalRejectedReviewer
-    suppresses: [ProposalApprovedReviewer]
-  - name: ProposalApprovedReviewer
-    suppresses: [ProposalRejectedReviewer]
-
-  - name: ProposalReturnedForRevision
-    suppresses: [Start]
+fields:
+  - property: Course.Name
+    title: Course
+  - property: Course.StudyManual
+    title:
+      en: Study Manual
+      nl: Studiehandleiding
+  - property: Student.DisplayName
+    title: Student
+  - property: Student.Email
+    title: Email
+  - property: Title
+  - currentStep: true
+  - property: TurnitinId
 
 steps:
   - ProposalPhase

UvA.Workflow.Tests/Fixtures/Project-RMSS/Properties.yaml

@@ -1,8 +1,4 @@
 properties:
-  - name: Course
-    type: Context!
-    inheritedRoles: [Coordinator, Impersonator]
-
   - name: EC
     type: EcType!
     text:
@@ -27,3 +23,6 @@ properties:
     text:
       en: Proposal reviewer
       nl: Voorstel beoordelaar
+
+  - name: TurnitinId
+    type: String

UvA.Workflow.Tests/Fixtures/Project-RMSS/Screens/Projects-RMSS.yaml

@@ -44,7 +44,6 @@ grouping:
         nl: Werkt aan scriptie
       steps:
         - Finish
-  
     - name: completed
       title:
         en: Completed

UvA.Workflow.Tests/Fixtures/Project-RMSS/Steps/ProposalAssessment.yaml

@@ -18,3 +18,8 @@ hierarchyMode: Parallel
 children:
   - ProposalAssessmentSupervisor
   - ProposalAssessmentReviewer
+
+events:
+  # Resets ProposalPhase: reopens Start, and resubmitting it clears both assessments.
+  - name: ProposalReturnedForRevision
+    resetParentStep: true