CST-14906 Code fix after cherrypick (5) Test fix with new test forms …

…and relation
4Science · Sep 19, 2024 · 7ea6873 · 7ea6873
1 parent ecd3fd3
commit 7ea6873
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 382 deletions.
diff --git a/dspace-api/src/test/data/dspaceFolder/config/entities/relationship-types.xml b/dspace-api/src/test/data/dspaceFolder/config/entities/relationship-types.xml
@@ -129,4 +129,30 @@
         </rightCardinality>
         <copyToRight>true</copyToRight>
     </type>
+    <type>
+        <leftType>Product</leftType>
+        <rightType>Person</rightType>
+        <leftwardType>isCreatorOfProduct</leftwardType>
+        <rightwardType>isProductOfCreator</rightwardType>
+        <leftCardinality>
+            <min>0</min>
+        </leftCardinality>
+        <rightCardinality>
+            <min>0</min>
+        </rightCardinality>
+        <copyToLeft>true</copyToLeft>
+    </type>
+    <type>
+        <leftType>Patent</leftType>
+        <rightType>Person</rightType>
+        <leftwardType>isInventorOfPatent</leftwardType>
+        <rightwardType>isPatentOfInventor</rightwardType>
+        <leftCardinality>
+            <min>0</min>
+        </leftCardinality>
+        <rightCardinality>
+            <min>0</min>
+        </rightCardinality>
+        <copyToLeft>true</copyToLeft>
+    </type>
 </relationships>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
@@ -26,6 +26,8 @@
         <name-map collection-handle="123456789/test-hidden" submission-name="test-hidden"/>
         <name-map collection-handle="123456789/collection-test" submission-name="collectiontest"/>
         <name-map collection-entity-type="CustomEntityType" submission-name="entitytypetest"/>
+        <name-map collection-handle="123456789/test-product" submission-name="producttestform"/>
+        <name-map collection-handle="123456789/test-patent" submission-name="patenttestform"/>
     </submission-map>
 
 
@@ -277,6 +279,24 @@
             <step id="collection"/>
         </submission-process>
 
+        <submission-process name="producttestform">
+
+            <step id="collection"/>
+            <step id="productStep"/>
+            <step id="upload"/>
+            <step id="license"/>
+
+        </submission-process>
+
+        <submission-process name="patenttestform">
+
+            <step id="collection"/>
+            <step id="patentStep"/>
+            <step id="upload"/>
+            <step id="license"/>
+
+        </submission-process>
+
     </submission-definitions>
 
 </item-submission>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml b/dspace-api/src/test/data/dspaceFolder/config/submission-forms.xml
@@ -465,6 +465,68 @@ it, please enter the types and the actual numbers or codes.</hint>
      </row>
    </form>
 
+   <form name="patentStep">
+     <row>
+       <relation-field>
+         <relationship-type>isInventorOf</relationship-type>
+         <search-configuration>person</search-configuration>
+         <repeatable>true</repeatable>
+         <label>Inventor</label>
+         <hint>Select the person who invented this patent.</hint>
+         <linked-metadata-field>
+           <dc-schema>dc</dc-schema>
+           <dc-element>contributor</dc-element>
+           <dc-qualifier>author</dc-qualifier>
+           <input-type>onebox</input-type>
+         </linked-metadata-field>
+         <externalsources>orcid</externalsources>
+       </relation-field>
+     </row>
+     <row>
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Title</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the main title of the item.</hint>
+         <required>You must enter a main title for this item.</required>
+       </field>
+     </row>
+   </form>
+
+   <form name="productStep">
+     <row>
+       <relation-field>
+         <relationship-type>isCreatorOf</relationship-type>
+         <search-configuration>person</search-configuration>
+         <repeatable>true</repeatable>
+         <label>Creator</label>
+         <hint>Select the person who created this product.</hint>
+         <linked-metadata-field>
+           <dc-schema>dc</dc-schema>
+           <dc-element>contributor</dc-element>
+           <dc-qualifier>author</dc-qualifier>
+           <input-type>onebox</input-type>
+         </linked-metadata-field>
+         <externalsources>orcid</externalsources>
+       </relation-field>
+     </row>
+     <row>
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Title</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the main title of the item.</hint>
+         <required>You must enter a main title for this item.</required>
+       </field>
+     </row>
+   </form>
+
  </form-definitions>