Skip to content

Commit

Permalink
[DURACOM-328] File upload not working correctly: problems when trying…
Browse files Browse the repository at this point in the history 
… to delete uploaded file
  • Loading branch information
@steph-ieffam
Piaget Bouaka Donfack authored and steph-ieffam committed Feb 26, 2025
1 parent ee7a4e6 commit 7d488da
Show file tree
Hide file tree
Showing 4 changed files with 320 additions and 22 deletions.
258 changes: 246 additions & 12 deletions dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
<!-- for handle "default". -->
<submission-map>
<name-map collection-handle="default" submission-name="traditional"/>
<name-map collection-handle="123456789/publication-1" submission-name="publication"/>
<name-map collection-handle="123456789/language-test-1" submission-name="languagetestprocess"/>
<name-map collection-handle="123456789/patent-test" submission-name="patent"/>
<name-map collection-handle="123456789/traditional-cris" submission-name="traditional-cris"/>
<name-map collection-handle="123456789/extraction-test" submission-name="extractiontestprocess"/>
<name-map collection-handle="123456789/qualdrop-test" submission-name="qualdroptest"/>
<name-map collection-handle="123456789/typebind-test" submission-name="typebindtest"/>
Expand All @@ -38,7 +41,7 @@
<!-- defined in this section. EVERY 'step' in this section MUST have a -->
<!-- unique identifier in the 'id' attribute! -->
<!-- -->
<!-- Each <step-definition> REQUIRES the following attributes (@) and properties: -->
<!-- Each <step> REQUIRES the following attributes (@) and properties: -->
<!-- @id - The unique identifier for this step -->
<!-- -->
<!-- <processing-class> - The class which will process all information for -->
Expand All @@ -48,7 +51,7 @@
<!-- This property should reference the full path of the class -->
<!-- (e.g. org.dspace.app.rest.submit.step.MyCustomStep) -->
<!-- -->
<!-- The following properties are OPTIONAL for each <step-definition>: -->
<!-- The following properties are OPTIONAL for each <step>: -->
<!-- <heading> - References the message key, from the -->
<!-- Messages.properties -->
<!-- -->
Expand All @@ -66,11 +69,26 @@
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="traditionalpageone-cris" 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="traditionalpagetwo" 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>
<step-definition id="traditionalpagethree-cris-open" mandatory="true" opened="true">
<heading>submit.progressbar.describe.stepthree</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="traditionalpagethree-cris-collapsed" mandatory="true" opened="false">
<heading>submit.progressbar.describe.stepthree</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="upload">
<heading>submit.progressbar.upload</heading>
<processing-class>org.dspace.app.rest.submit.step.UploadStep</processing-class>
Expand All @@ -82,12 +100,17 @@
<type>license</type>
<scope visibilityOutside="read-only">submission</scope>
</step-definition>
<step-definition id="extraction">
<heading></heading>
<processing-class>org.dspace.app.rest.submit.step.ExtractMetadataStep</processing-class>
<type>utils</type>
<scope visibility="hidden" visibilityOutside="hidden">submission</scope>
</step-definition>

<step-definition id="qualdroptest">
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>

<step-definition id="typebindtest">
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
Expand All @@ -105,38 +128,93 @@
<type>accessCondition</type>
</step-definition>

<step-definition id="itemAccessConditions">
<heading>submit.progressbar.accessCondition</heading>
<processing-class>org.dspace.app.rest.submit.step.AccessConditionStep</processing-class>
<type>accessCondition</type>
</step-definition>

<!-- Step Upload Item with Embargo Features to enable this step, please
make sure to comment-out the previous step "UploadStep" <step-definition id="upload-with-embargo">
<heading>submit.progressbar.upload</heading> <processing-class>org.dspace.submit.step.UploadWithEmbargoStep</processing-class>
<type>uploadWithEmbargo</type> </step-definition> -->


<!--Step will be to select a Creative Commons License -->
<step-definition id="cclicense"> <heading>submit.progressbar.CClicense</heading>
<processing-class>org.dspace.app.rest.submit.step.CCLicenseStep</processing-class>
<type>cclicense</type>
</step-definition>

<step-definition id="extractionstep">
<!--Step will be to Check for potential duplicate -->
<step-definition id="detect-duplicate">
<heading>submit.progressbar.detect-duplicate</heading>
<processing-class>org.dspace.app.rest.submit.step.DetectPotentialDuplicateStep</processing-class>
<type>detect-duplicate</type>
</step-definition>

<step-definition id="extractionstep">
<heading>submit.progressbar.ExtractMetadataStep</heading>
<processing-class>org.dspace.app.rest.submit.step.ExtractMetadataStep</processing-class>
<type>extract</type>
</step-definition>

<!-- Fake Steps to test parsing of all options -->
<!-- <step-definition mandatory="false"> <heading>fake.submission.readonly</heading>
<!-- <step mandatory="false"> <heading>fake.submission.readonly</heading>
<processing-class>org.dspace.submit.step.SampleStep</processing-class> <type>sample</type>
<scope visibility="read-only">submission</scope> </step-definition> <step-definition mandatory="false">
<scope visibility="read-only">submission</scope> </step-definition> <step mandatory="false">
<heading>fake.workflow.readonly</heading> <processing-class>org.dspace.submit.step.SampleStep</processing-class>
<type>sample</type> <scope visibility="read-only">workflow</scope> </step-definition> -->

<!-- patent steps [START] -->
<step-definition id="patent" mandatory="true">
<heading>submit.progressbar.describe.patent</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="patent_indexing" mandatory="true">
<heading>submit.progressbar.describe.patent_indexing</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="patent_references" mandatory="true">
<heading>submit.progressbar.describe.patent_references</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<!-- publication steps [END] -->

<!-- This is the Sample Step which utilizes the JSPSampleStep class -->
<step-definition id="sample">
<heading>Sample</heading>
<processing-class>org.dspace.submit.step.SampleStep</processing-class>
<type>sample</type>
</step-definition>

<step-definition id="publication" mandatory="true">
<heading>submit.progressbar.describe.publication</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="publication_indexing" mandatory="false">
<heading>submit.progressbar.describe.publication_indexing</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="publication_bibliographic_details" mandatory="true">
<heading>submit.progressbar.describe.publication_bibliographic_details</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="publication_references" mandatory="false">
<heading>submit.progressbar.describe.publication_references</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="person" mandatory="true">
<heading>submit.progressbar.describe.person</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="languagetest" mandatory="true">
<heading>submit.progressbar.describe.stepone</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
Expand All @@ -149,6 +227,36 @@
<type>sherpaPolicy</type>
</step-definition>

<step-definition id="titleAndIssuedDate" 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="onlyTitle" 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="custom-url" mandatory="false">
<heading>submit.progressbar.CustomUrlStep</heading>
<processing-class>org.dspace.app.rest.submit.step.CustomUrlStep</processing-class>
<type>custom-url</type>
</step-definition>

<step-definition id="correction" mandatory="true">
<heading>submit.progressbar.correction-step</heading>
<processing-class>org.dspace.app.rest.submit.step.CorrectionStep</processing-class>
<type>correction</type>
<scope visibilityOutside="hidden">workflow</scope>
</step-definition>

<step-definition id="controlled-vocabulary-test" 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="identifiers">
<heading>submit.progressbar.identifiers</heading>
<processing-class>org.dspace.app.rest.submit.step.ShowIdentifiersStep</processing-class>
Expand Down Expand Up @@ -182,6 +290,22 @@
<scope visibility="hidden" visibilityOutside="hidden">submission</scope>
</step-definition>

<step-definition id="green" mandatory="true">
<heading>submit.progressbar.describe.green</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="orange" mandatory="true">
<heading>submit.progressbar.describe.green</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>
<step-definition id="funding" mandatory="true">
<heading>submit.progressbar.describe.funding</heading>
<processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
<type>submission-form</type>
</step-definition>

<!-- Detect duplicates step -->
<step-definition id="duplicates">
<heading>submit.progressbar.duplicates</heading>
Expand Down Expand Up @@ -220,6 +344,7 @@
<!--<step id="sample"/> -->

<step id="collection"/>
<step id="extraction" />

<step id="identifiers"/>

Expand All @@ -233,6 +358,7 @@
<!--Step will be to Upload the item -->
<step id="upload"/>
<!-- <step id="upload-with-embargo"/> -->
<step id="detect-duplicate"/>
<!-- <step id="extractionstep"/> -->
<step id="defaultAC"/>
<step id="sherpaPolicies"/>
Expand All @@ -242,11 +368,103 @@
<step id="cclicense"/>
</submission-process>

<submission-process name="traditional-with-custom-url">
<step id="collection"/>
<step id="extraction" />
<step id="traditionalpageone"/>"
<step id="traditionalpagetwo"/>
<step id="custom-url"/>
</submission-process>

<submission-process name="traditional-with-correction">
<step id="collection"/>
<step id="extraction" />
<step id="traditionalpageone"/>"
<step id="traditionalpagetwo"/>
<step id="correction"/>
<step id="license"/>
</submission-process>

<submission-process name="test-hidden">
<step id="test-outside-workflow-hidden"/>
<step id="test-outside-submission-hidden"/>
<step id="test-never-hidden"/>
<step id="test-always-hidden"/>
</submission-process>

<!--This "traditional" process defines the DEFAULT item submission process -->
<submission-process name="traditional-cris">

<!--Uncommment to display the SAMPLE step as your first step -->
<!--<step id="sample"/> -->

<step id="collection"/>
<step id="extraction" />

<!--Step will be to Describe the item. -->
<step id="traditionalpageone-cris"/>
<step id="traditionalpagetwo"/>
<step id="traditionalpagethree-cris-open"/>
<step id="traditionalpagethree-cris-collapsed"/>

<!--Step will be to Upload the item -->
<step id="upload"/>
<step id="defaultAC"/>
<!-- <step id="upload-with-embargo"/> -->
<step id="detect-duplicate"/>

<!--Step will be to Sign off on the License -->
<step id="license"/>
<!-- <step id="creative-commons"/> -->
<!-- <step id="verify"/> -->
</submission-process>

<submission-process name="publication">
<step id="collection" />
<step id="extraction" />
<step id="publication" />
<step id="publication_indexing" />
<step id="publication_bibliographic_details" />
<step id="publication_references" />
<step id="detect-duplicate"/>
<step id="upload" />
<step id="license" />
</submission-process>

<!-- patent, used by some collection like 123456789/1001 -->
<submission-process name="patent">
<step id="collection" />
<step id="patent" />
<step id="patent_indexing" />
<step id="patent_references" />
<step id="upload" />
<step id="license" />
</submission-process>
<submission-process name="person">
<step id="collection" />
<step id="person" />
<step id="detect-duplicate" />
<step id="upload" />
<step id="license" />
</submission-process>

<submission-process name="languagetestprocess">
<step id="collection"/>
<step id="languagetest"/>
</submission-process>

<submission-process name="modeA">
<step id="titleAndIssuedDate"/>
</submission-process>
<submission-process name="modeB">
<step id="onlyTitle"/>
</submission-process>
<submission-process name="modeC">
<step id="collection" />
<step id="onlyTitle"/>
<step id="upload" />
</submission-process>

<submission-process name="extractiontestprocess">
<step id="collection"/>
<step id="traditionalpageone"/>
Expand All @@ -271,11 +489,27 @@
<step id="notDiscoverable"/>
</submission-process>

<submission-process name="test-hidden">
<step id="test-outside-workflow-hidden"/>
<step id="test-outside-submission-hidden"/>
<step id="test-never-hidden"/>
<step id="test-always-hidden"/>
<submission-process name="controlled-vocabulary-test">
<step id="collection"/>
<step id="controlled-vocabulary-test"/>
</submission-process>

<submission-process name="green">
<step id="extractionstep" />
<step id="green" />
<step id="upload" />
</submission-process>
<submission-process name="orange">
<step id="extractionstep" />
<step id="orange" />
<step id="upload" />
</submission-process>

<submission-process name="funding">
<step id="collection" />
<step id="funding" />
<step id="detect-duplicate" />
<step id="license" />
</submission-process>

<submission-process name="topcommunitytest">
Expand Down
Loading

0 comments on commit 7d488da

Please sign in to comment.