From b66ac72d638db14b86479ee3e31049d2c16951e8 Mon Sep 17 00:00:00 2001
From: Mattia Vianelli <mattia.vianelli@4science.com>
Date: Mon, 16 Sep 2024 09:50:16 +0200
Subject: [PATCH] CST-14906 Code fix after cherrypick (4)

---
 .../dspaceFolder/config/item-submission.xml   | 10 +++++
 dspace/config/submission-forms.xml            | 39 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
index feb3c7c12b3..58326b88215 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
@@ -71,6 +71,16 @@
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
+        <step-definition id="productStep" mandatory="true">
+            <heading>submit.progressbar.describe.product</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
+            <type>submission-form</type>
+        </step-definition>
+        <step-definition id="patentStep" 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="upload">
             <heading>submit.progressbar.upload</heading>
             <processing-class>org.dspace.app.rest.submit.step.UploadStep</processing-class>
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index a93195c91f7..f792276646a 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -1348,6 +1348,45 @@
             </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>
+        </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>
+        </form>
+
+
     </form-definitions>