Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Issue 202] Review update submission workflows #233

Merged
merged 18 commits into from
Jan 23, 2024
Merged

[Issue 202] Review update submission workflows #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
23369c9
WIP poted over submission forms from 6.3
Jan 18, 2024
e90d9c5
WIP fixed composition field errors
Jan 18, 2024
f0cb9ec
WIP fixed composition field errors
Jan 18, 2024
064eb3b
WIP modified submission item and forms
Jan 19, 2024
9aafb56
WIP modified submission item and forms
Jan 19, 2024
69fad71
WIP modified submission item and forms
Jan 19, 2024
53857f0
WIP modified submission item entities
Jan 19, 2024
bac7aec
WIP modified submission item entities
Jan 19, 2024
40aba78
WIP modified submission item entities
Jan 19, 2024
3acc87a
WIP modified submission item entities
Jan 19, 2024
2a4acb7
WIP modified submission item entities
Jan 19, 2024
10430ec
added row tags to submissions forms
Jan 22, 2024
9cd63bf
added Tamu custom value pairs
Jan 22, 2024
a092c75
removed verify becasuse it does not exist
Jan 22, 2024
f587617
added missing > to step tags
Jan 22, 2024
56f8de2
Update item submission forms
wwelling Jan 23, 2024
79174b2
Input type twobox no longer an option
wwelling Jan 23, 2024
0c4c546
Merge pull request #234 from TAMULib/202-submission-forms
wwelling Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
<type>duplicate</type> </step-definition> -->

<!--Step will be to Verify/Review everything -->
<!-- <step-definition id="verify"> <heading>submit.progressbar.verify</heading> <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
<type>verify</type> </step-definition> -->
<step-definition id="verify"> <heading>submit.progressbar.verify</heading> <processing-class>org.dspace.submit.step.VerifyStep</processing-class>
<type>verify</type> </step-definition>

<!-- Fake Steps to test parsing of all options -->
<!-- <step-definition mandatory="false"> <heading>fake.submission.readonly</heading>
Expand Down
172 changes: 168 additions & 4 deletions dspace/config/item-submission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
<submission-map>
<!-- Default submission process -->
<name-map collection-handle="default" submission-name="traditional"/>
<name-map collection-handle="1969.1/93296" submission-name="facultyPub"/>
<name-map collection-handle="1969.1/187506" submission-name="facultyPub"/>
<name-map collection-handle="1969.1/152358" submission-name="BRTC"/>
<name-map collection-handle="1969.1/129213" submission-name="oscSubmission"/>

<!-- Sample Entities Collection configuration based on the demo Entities dataset available at:
https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
Expand Down Expand Up @@ -97,8 +101,68 @@
<type>collection</type>
</step-definition>

<!-- Tamu Customization-complete step -->

<!-- The "complete" step is a "special step" which is *REQUIRED* to be-->
<!-- in this section! In DSpace, when a submission is completed, -->
<!-- a workflow is automatically kicked off (if one exists) -->
<!-- This "complete" step performs all backend processing that occurs -->
<!-- immediately upon completing the submission. -->
<!-- Since this is a "special step", it is *automatically* added at the -->
<!-- end of each 'submission-process' (therefore it should not be -->
<!-- referenced by any of the below 'submission-process' tags). Also as-->
<!-- a special step, it is currently NEVER editable in a workflow. -->
<!-- <step-definition id="complete">
<heading>submit.progressbar.complete</heading>
<processing-class>org.dspace.submit.step.CompleteStep</processing-class>
<jspui-binding>org.dspace.app.webui.submit.step.JSPCompleteStep</jspui-binding>
<workflow-editable>false</workflow-editable>
</step-definition> -->

<!-- End of Tamu Customization-complete step -->

<!-- The following set of DescribeStep <step-definition>s all point to forms (of the same name) which are
defined in submission-forms.xml -->

<!-- TAMU Cusomization - oscSubmission -->
<step-definition id="oscSubmissionOne" mandatory="true">
<heading>submit.progressbar.describe.stepone</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="oscSubmissionTwo" mandatory="true">
<heading>submit.progressbar.describe.steptwo</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<!-- End TAMU Cusomization - oscSubmission -->

<!-- TAMU Cusomization - facultyPub -->
<step-definition id="facultyPubOne" mandatory="true">
<heading>submit.progressbar.describe.stepone</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="facultyPubTwo" mandatory="true">
<heading>submit.progressbar.describe.steptwo</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<!-- End TAMU Cusomization - facultyPub -->

<!-- TAMU Cusomization - BRTC -->
<step-definition id="BRTCone" mandatory="true">
<heading>submit.progressbar.describe.stepone</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="BRTCtwo" mandatory="true">
<heading>submit.progressbar.describe.steptwo</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<!-- End TAMU Cusomization - BRTC -->

<step-definition id="traditionalpageone" mandatory="true">
<heading>submit.progressbar.describe.stepone</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
Expand Down Expand Up @@ -152,7 +216,10 @@
</step-definition>
<step-definition id="license">
<heading>submit.progressbar.license</heading>
<processing-class>org.dspace.app.rest.submit.step.LicenseStep</processing-class>
<!-- TAMU Customization - proxy license step -->
<processing-class>org.dspace.app.rest.submit.step.ProxyLicenseStep</processing-class>
<!-- <processing-class>org.dspace.app.rest.submit.step.LicenseStep</processing-class> -->
<!-- End TAMU Customization - proxy license step -->
<type>license</type>
<scope visibilityOutside="read-only">submission</scope>
</step-definition>
Expand All @@ -161,10 +228,11 @@
<step-definition id="cclicense" mandatory="false">
<heading>submit.progressbar.CClicense</heading>
<processing-class>org.dspace.app.rest.submit.step.CCLicenseStep</processing-class>
<type>cclicense</type>
<type>cclicense</type>
</step-definition>

<!-- This optional step may allow the user to select access conditions on the item -->

<!-- This optional step may allow the user to select access conditions on the item -->
<step-definition id="itemAccessConditions">
<heading>submit.progressbar.accessCondition</heading>
<processing-class>org.dspace.app.rest.submit.step.AccessConditionStep</processing-class>
Expand Down Expand Up @@ -249,6 +317,102 @@
<!-- -->
<submission-definitions>

<!-- TAMU Cusomization - facultyPub -->
<submission-process name="facultyPub">
<!--Uncommment to display the SAMPLE step as your first step -->
<!--<step id="sample"/> -->

<step id="collection"/>
<!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
that identifiers.cfg and identifier-service.xml are properly configured. -->
<!--<step id="identifiers"/>-->
<!--Step will be to Describe the item. -->
<step id="facultyPubOne"/>
<step id="facultyPubTwo"/>

<!-- Uncomment this step to allow the user to embargo or access restrict the entire item -->
<!-- <step id="itemAccessConditions"/> -->

<!-- Uncomment this step to show when appropriate publisher policies retrieved from SHERPA/RoMEO -->
<!-- <step id="sherpaPolicies"/> -->

<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>

<!--Step will be to Sign off on the required DSpace License agreement -->
<step id="license"/>
</submission-process>
<!-- End TAMU Cusomization - facultyPub -->

<!-- TAMU Cusomization - BRTC -->
<submission-process name="BRTC">
<!--Uncommment to display the SAMPLE step as your first step -->
<!--<step id="sample"/> -->

<step id="collection"/>
<!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
that identifiers.cfg and identifier-service.xml are properly configured. -->
<!--<step id="identifiers"/>-->
<!--Step will be to Describe the item. -->
<step id="BRTCone"/>
<step id="BRTCtwo"/>

<!-- Uncomment this step to allow the user to embargo or access restrict the entire item -->
<!-- <step id="itemAccessConditions"/> -->

<!-- Uncomment this step to show when appropriate publisher policies retrieved from SHERPA/RoMEO -->
<!-- <step id="sherpaPolicies"/> -->

<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>

<!--Step will be to Sign off on the required DSpace License agreement -->
<step id="license"/>
</submission-process>
<!-- End TAMU Cusomization - BRTC -->

<!-- TAMU Cusomization - oscSubmission -->
<submission-process name="oscSubmission">
<!--Uncommment to display the SAMPLE step as your first step -->
<!--<step id="sample"/> -->

<step id="collection"/>
<!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
that identifiers.cfg and identifier-service.xml are properly configured. -->
<!--<step id="identifiers"/>-->
<!--Step will be to Describe the item. -->
<step id="oscSubmissionOne"/>
<step id="oscSubmissionTwo"/>

<!-- Uncomment this step to allow the user to embargo or access restrict the entire item -->
<!-- <step id="itemAccessConditions"/> -->

<!-- Uncomment this step to show when appropriate publisher policies retrieved from SHERPA/RoMEO -->
<!-- <step id="sherpaPolicies"/> -->

<!--Step will be to Upload the item -->
<step id="upload"/>

<!-- <step id="extractionstep"/> -->

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<step id="cclicense"/>

<!--Step will be to Sign off on the required DSpace License agreement -->
<step id="license"/>
</submission-process>
<!-- End TAMU Cusomization - oscSubmission -->

<!--This "traditional" process defines the DEFAULT item submission process -->
<submission-process name="traditional">
<!--Uncommment to display the SAMPLE step as your first step -->
Expand All @@ -274,7 +438,7 @@
<!-- <step id="extractionstep"/> -->

<!-- Uncomment this step to allow the user to select a Creative Commons License -->
<!-- <step id="cclicense"/> -->
<step id="cclicense"/>

<!--Step will be to Sign off on the required DSpace License agreement -->
<step id="license"/>
Expand Down
Loading
Loading