Skip to content

Commit 896714e

Browse files
authored
Merge pull request #4163 from IQSS/develop
v4.8
2 parents 62f8987 + c84e899 commit 896714e

File tree

343 files changed

+16401
-4820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+16401
-4820
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ There's a chance your idea is already on our roadmap, which is available at http
1313
[#dataverse IRC channel]: http://chat.dataverse.org
1414
[logged]: http://irclog.iq.harvard.edu/dataverse/today
1515
[issue tracker]: https://github.com/IQSS/dataverse/issues
16-
[@dataverseorg]: http://twitter.com/dataverseorg
16+
[@dataverseorg]: https://twitter.com/dataverseorg
1717
[Functional Requirements Document (FRD for short)]: https://docs.google.com/document/d/1PRyAlP6zlUlUuHfgyUezzuaVQ4JnapvgtGWo0o7tLEs/edit?usp=sharing
1818
[Balsamiq]: https://iqssharvard.mybalsamiq.com/projects
1919
[Functional Requirements Document folder on Google Drive]: https://drive.google.com/folderview?id=0B3_V6vFxEcx-fl92ek92OG1nTmhQenBRX1Z4OVJBLXpURmh2d2RyX1NZRUp6YktaYUU5YTA&usp=sharing
@@ -44,7 +44,7 @@ You can attach certain files (images, screenshots, logs, etc.) by dragging and d
4444

4545
## Documentation
4646

47-
The source for the documentation at http://guides.dataverse.org is in the GitHub repo under the "[doc][]" folder. If you find a typo or inaccuracy or something to clarify, please send us a pull request! For more on the tools used to write docs, please see the [documentation][] section of the Developer Guide.
47+
The source for the documentation at http://guides.dataverse.org/en/latest/ is in the GitHub repo under the "[doc][]" folder. If you find a typo or inaccuracy or something to clarify, please send us a pull request! For more on the tools used to write docs, please see the [documentation][] section of the Developer Guide.
4848

4949
[doc]: https://github.com/IQSS/dataverse/tree/develop/doc/sphinx-guides/source
5050
[documentation]: http://guides.dataverse.org/en/latest/developers/documentation.html

ISSUE_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Thank you for contributing an issue to the Dataverse Project! If this is a bug report, please let us know when the issue occurs, which page it occurs on, to whom it occurs, and which version of Dataverse you're using. If this is a feature request, please let us know what you'd like to see and give us some context - what kind of user is the feature intended for, and what inspired the request? No matter the issue, screenshots are always welcome.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@startuml
2+
3+
@enduml
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
@startuml
2+
' Macro to mark classes you've already implemented
3+
!define DONE(NAME) "NAME ✅" as NAME
4+
5+
class DONE(DvObject) <<entity>>
6+
class DONE(DvObjectContainer) <<entity>>
7+
class DONE(Dataverse) <<entity>>
8+
class Dataset <<entity>>
9+
10+
Dataset --|> DvObjectContainer
11+
DvObjectContainer --|>DvObject
12+
Dataverse -up-|> DvObjectContainer
13+
DvObject o--> DvObjectContainer: parent
14+
15+
class DONE(Workflow) <<entity>> {
16+
id
17+
name
18+
description
19+
}
20+
21+
class DONE(WorkflowStepData) <<entity>> {
22+
providerId: String
23+
stepId: String
24+
parameters: Map<String,String>
25+
}
26+
27+
class WorkflowBean<In Progress> <<bean>> {
28+
getWorkflows()
29+
getWorkflow(id)
30+
deleteWorkflow(id)
31+
saveWorkflow(w)
32+
resumeWorkflow(pwf)
33+
... not implemented ...
34+
getStepProvider(id)
35+
}
36+
37+
class DONE(WorkflowContext) {
38+
r:DataverseRequest
39+
d:Dataset
40+
invocationId:UUID
41+
versionData
42+
isMinorRelease()
43+
}
44+
45+
class DONE(PendingWorkflow) <<entity>> {
46+
externalId: UUID
47+
workflow: Workflow
48+
pendingStepIdx: int
49+
localData: DATA
50+
request: DataverseRequest
51+
dataset: Dataset
52+
}
53+
54+
interface DONE(WorkflowStepSPI) {
55+
id
56+
getStep(stepId, parameters):Step
57+
}
58+
59+
interface DONE(WorkflowStep) {
60+
run( WorkflowContext ): WorkflowStepResult
61+
resume( WorkflowContext ): WorkflowStepResult
62+
rollback( WorkflowContext )
63+
}
64+
65+
class DONE(WorkflowStepResult) <<abstract>>
66+
class DONE(OK) <<singleton>>
67+
class DONE(Pending){
68+
localData
69+
}
70+
class DONE(Failure) {
71+
reason:Throwable
72+
}
73+
74+
package engine.command {
75+
class PublishDatasetCommand
76+
class ResumeWorkflowCommand
77+
}
78+
79+
package api {
80+
class WorkflowStepResponse <<endpoint>> {
81+
POST /step/${externalId}
82+
}
83+
84+
class DONE(WorkflowManagementEndpoint) <<endpoint>> {
85+
POST add
86+
GET list
87+
DELETE id
88+
GET pendingWorkflows
89+
}
90+
}
91+
92+
OK -up-|> WorkflowStepResult
93+
Pending -up-|> WorkflowStepResult
94+
Failure -up-|> WorkflowStepResult
95+
96+
PendingWorkflow o--> Workflow
97+
PendingWorkflow o--> WorkflowStepData
98+
PendingWorkflow o--> Dataset
99+
Workflow "1" *--> "1..*" WorkflowStepData: <<ordered>>
100+
WorkflowStepSPI ..> WorkflowStep: creates
101+
WorkflowStep ..> WorkflowStepResult: creates
102+
WorkflowStepResponse ..> PendingWorkflow : invokes
103+
WorkflowBean *--> WorkflowStepSPI
104+
WorkflowBean *--> Workflow
105+
106+
PublishDatasetCommand ..> Workflow : uses
107+
PublishDatasetCommand ..> Dataset : uses
108+
PublishDatasetCommand ..> WorkflowBean : uses
109+
110+
ResumeWorkflowCommand ..> Workflow : uses
111+
ResumeWorkflowCommand ..> Dataset : uses
112+
ResumeWorkflowCommand ..> WorkflowBean : uses
113+
114+
PendingWorkflow ..> WorkflowContext: <<contains>>
115+
116+
@enduml

doc/Architecture/Workflow/classes.svg

Lines changed: 1 addition & 0 deletions
Loading
33.9 KB
Loading
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"reasonForReturn": "You forgot to upload any files."
3+
}

doc/sphinx-guides/source/_static/fontcustom.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44

55
@font-face {
66
font-family: "fontcustom";
7-
src: url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot");
8-
src: url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot?#iefix") format("embedded-opentype"),
9-
url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.woff") format("woff"),
10-
url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.ttf") format("truetype"),
11-
url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
7+
src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot");
8+
src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot?#iefix") format("embedded-opentype"),
9+
url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2") format("woff2"),
10+
url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff") format("woff"),
11+
url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf") format("truetype"),
12+
url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg");
1213
font-weight: normal;
1314
font-style: normal;
1415
}
1516

1617
@media screen and (-webkit-min-device-pixel-ratio:0) {
1718
@font-face {
1819
font-family: "fontcustom";
19-
src: url("./fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
20+
src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg");
2021
}
2122
}
2223

@@ -34,6 +35,7 @@
3435
.icon-image:before,
3536
.icon-network:before,
3637
.icon-other:before,
38+
.icon-package:before,
3739
.icon-tabular:before,
3840
.icon-unlock:before,
3941
.icon-video:before {
@@ -62,6 +64,7 @@
6264
.icon-image:before { content: "\f103"; }
6365
.icon-network:before { content: "\f10c"; }
6466
.icon-other:before { content: "\f10d"; }
67+
.icon-package:before { content: "\f10f"; }
6568
.icon-tabular:before { content: "\f108"; }
6669
.icon-unlock:before { content: "\f10e"; }
6770
.icon-video:before { content: "\f109"; }
-2.53 KB
Binary file not shown.
4.87 KB
Binary file not shown.

0 commit comments

Comments
 (0)