diff --git a/docs/design/overview/img/research/research-space-sequence-diagram.png b/docs/design/overview/img/research/research-space-sequence-diagram.png index 21309c3b2..6d1ad4e0c 100644 Binary files a/docs/design/overview/img/research/research-space-sequence-diagram.png and b/docs/design/overview/img/research/research-space-sequence-diagram.png differ diff --git a/docs/design/overview/img/research/research-space-sequence-diagram.svg b/docs/design/overview/img/research/research-space-sequence-diagram.svg index a76e97e01..3d5c110c2 100644 --- a/docs/design/overview/img/research/research-space-sequence-diagram.svg +++ b/docs/design/overview/img/research/research-space-sequence-diagram.svg @@ -1,197 +1 @@ -ResearcherResearcherDatamanagerDatamanagerYodaYodaAccepted folderSubmit for vaultSUBMITTEDSubmitted notificationAccept for vaultAccepted notificationACCEPTEDSecure in vaultSECUREDSecured notificationSecured notificationRejected folderSubmit for vaultSUBMITTEDSubmitted notificationReject for vaultRejected notificationREJECTED \ No newline at end of file +ResearcherResearcherDatamanagerDatamanagerYodaYodaAccepted folderSubmit for vaultSUBMITTEDSubmitted notificationAccept for vaultAccepted notificationACCEPTEDSecure in vaultSecured notificationSecured notificationRejected folderSubmit for vaultSUBMITTEDSubmitted notificationReject for vaultRejected notificationREJECTED \ No newline at end of file diff --git a/docs/design/overview/img/research/research-space-sequence-diagram.uml b/docs/design/overview/img/research/research-space-sequence-diagram.uml index 8f00c35ca..6fec2ff2c 100644 --- a/docs/design/overview/img/research/research-space-sequence-diagram.uml +++ b/docs/design/overview/img/research/research-space-sequence-diagram.uml @@ -13,7 +13,6 @@ datamanager -> yoda : Accept for vault yoda --> researcher : Accepted notification note over yoda : ACCEPTED yoda -> yoda : Secure in vault -note over yoda : SECURED yoda --> researcher : Secured notification yoda --> datamanager : Secured notification == Rejected folder == diff --git a/docs/design/overview/img/research/research-space-state-diagram.png b/docs/design/overview/img/research/research-space-state-diagram.png index e7140be58..158f8529e 100644 Binary files a/docs/design/overview/img/research/research-space-state-diagram.png and b/docs/design/overview/img/research/research-space-state-diagram.png differ diff --git a/docs/design/overview/img/research/research-space-state-diagram.svg b/docs/design/overview/img/research/research-space-state-diagram.svg index d3344d001..87376ba2e 100644 --- a/docs/design/overview/img/research/research-space-state-diagram.svg +++ b/docs/design/overview/img/research/research-space-state-diagram.svg @@ -1,213 +1 @@ -Research SpaceFOLDERUnlockedLOCKEDLockedSUBMITTEDSubmitted for vaultACCEPTEDAccepted for vaultREJECTEDRejected for vaultSECUREDSecured in vaultCreate folder (WebDAV)LockSubmitUnlockSubmitUnsubmitAcceptRejectLockSubmitSecureLockSubmitDelete folder (WebDAV) \ No newline at end of file +Research SpaceFOLDERUnlockedLOCKEDLockedSUBMITTEDSubmitted for vaultACCEPTEDAccepted for vaultREJECTEDRejected for vaultCreate folderLockSubmitUnlockSubmitUnsubmitAcceptRejectLockSubmitSecure \ No newline at end of file diff --git a/docs/design/overview/img/research/research-space-state-diagram.uml b/docs/design/overview/img/research/research-space-state-diagram.uml index 7e9e3a125..1877e6a08 100644 --- a/docs/design/overview/img/research/research-space-state-diagram.uml +++ b/docs/design/overview/img/research/research-space-state-diagram.uml @@ -7,9 +7,8 @@ state ResearchSpace as "Research Space" { SUBMITTED : Submitted for vault ACCEPTED : Accepted for vault REJECTED : Rejected for vault - SECURED : Secured in vault - [*] --> FOLDER : Create folder (WebDAV) + [*] --> FOLDER : Create folder FOLDER --> LOCKED : Lock FOLDER --> SUBMITTED : Submit LOCKED --> FOLDER : Unlock @@ -19,10 +18,7 @@ state ResearchSpace as "Research Space" { SUBMITTED --> REJECTED : Reject REJECTED --> LOCKED : Lock REJECTED --> SUBMITTED : Submit - ACCEPTED --> SECURED : Secure - SECURED --> LOCKED : Lock - SECURED --> SUBMITTED : Submit - SECURED --> [*] : Delete folder (WebDAV) + ACCEPTED --> FOLDER : Secure } @enduml diff --git a/docs/design/processes/vault-process.md b/docs/design/processes/vault-process.md index 01f4acfe1..9e8737923 100644 --- a/docs/design/processes/vault-process.md +++ b/docs/design/processes/vault-process.md @@ -32,7 +32,7 @@ IIFOLDERTRANSITIONS = list((FOLDER, LOCKED), (REJECTED, LOCKED), (REJECTED, FOLDER), (REJECTED, SUBMITTED), - (ACCEPTED, SECURED), + (ACCEPTED, FOLDER), (SECURED, LOCKED), (SECURED, FOLDER), (SECURED, SUBMITTED)) @@ -56,7 +56,7 @@ A research group without a datamanager can submit packages to the vault directly submission. ## Copy to vault -The **retry-copy-to-vault.r** cronjob in the tools directory of the research ruleset will copy any folder with a 'PENDING' or 'RETRY' cronjob copy state to the vault and set it to 'SECURED' state when successful. In Yoda versions 1.9 or lower this is only done with folders with a 'RETRY' state. The copy uses `irsync` in versions 1.10 and higher. The metadata is copied as well. Folders with 'RETRY' status have previously failed to copy. +The **retry-copy-to-vault.r** cronjob in the tools directory of the research ruleset will copy any folder with a 'PENDING' or 'RETRY' cronjob copy state to the vault and set it to 'SECURED' state when successful. For Yoda version 1.10 or higher, the state will be set to 'FOLDER' upon success. In Yoda versions 1.9 or lower this is only done with folders with a 'RETRY' state. The copy uses `irsync` in versions 1.10 and higher. The metadata is copied as well. Folders with 'RETRY' status have previously failed to copy. See [Copy to vault diagrams](copy-to-vault-diagrams.md) for diagrams of the copy to vault process.