From 97cb566e1bef51f5762431adaf73de1b80c6e5cf Mon Sep 17 00:00:00 2001
From: Ben Whitmore <ben.whitmore0@gmail.com>
Date: Wed, 24 Mar 2021 19:20:43 +1300
Subject: [PATCH] fix(form): fix broken merge of aperture submission form

---
 app/storage/forms-coko/submit.json | 174 ++++++++++++++---------------
 1 file changed, 84 insertions(+), 90 deletions(-)

diff --git a/app/storage/forms-coko/submit.json b/app/storage/forms-coko/submit.json
index a67b934cbb..ba61d5c497 100644
--- a/app/storage/forms-coko/submit.json
+++ b/app/storage/forms-coko/submit.json
@@ -2,13 +2,35 @@
   "name": "Research Object Submission Form",
   "id": "submit",
   "children": [
+    {
+      "title": "Research object links",
+      "id": "1591192678688",
+      "component": "LinksInput",
+      "name": "submission.links",
+      "placeholder": "Enter your links, separated by commas",
+      "parse": {
+        "value": "split",
+        "label": "Split"
+      },
+      "format": {
+        "value": "join",
+        "label": "Join"
+      }
+    },
+    {
+      "title": "Title",
+      "id": "1593634996801",
+      "component": "TextField",
+      "name": "meta.title",
+      "placeholder": "Enter the manuscript's title",
+      "description": "<p></p>"
+    },
     {
       "title": "Name",
       "id": "1531303631370",
       "component": "TextField",
       "name": "submission.name",
       "placeholder": "Enter your name",
-      "order": "1",
       "validate": [
         {
           "value": "minChars",
@@ -24,40 +46,36 @@
       "id": "1531303727228",
       "component": "TextField",
       "name": "submission.affiliation",
-      "placeholder": "Enter your affiliation",
-      "order": "2"
+      "placeholder": "Enter your affiliation"
     },
     {
       "title": "Email and contact information",
       "id": "1531726163478",
       "component": "TextField",
       "name": "submission.contact",
-      "order": "3",
       "placeholder": "Enter your contact information"
     },
     {
-      "title": "Keywords",
-      "id": "1531303777701",
-      "component": "TextField",
-      "name": "submission.keywords",
-      "placeholder": "Enter keywords...",
-      "parse": "split",
-      "format": "join",
-      "order": "11",
-      "validateValue": {
-        "minChars": "2",
-        "maxChars": "6"
-      },
-      "validate": [
-        {
-          "value": "minChars",
-          "label": "minimum Characters"
-        },
-        {
-          "value": "required",
-          "label": "Required"
-        }
-      ]
+      "title": "Cover letter",
+      "id": "1591172762874",
+      "component": "AbstractEditor",
+      "name": "submission.cover",
+      "description": "<p>Cover letter describing submission, relevant implications, and timely information to consider</p>",
+      "placeholder": "Enter your cover letter"
+    },
+    {
+      "title": "Data and Code availability statements",
+      "id": "1591173076622",
+      "component": "AbstractEditor",
+      "name": "submission.datacode",
+      "placeholder": "Enter your data and code availability statement"
+    },
+    {
+      "title": "Ethics statement",
+      "id": "1591173029656",
+      "component": "AbstractEditor",
+      "name": "submission.ethics",
+      "placeholder": "Enter your ethics statements"
     },
     {
       "title": "Type of Research Object",
@@ -81,8 +99,7 @@
           "value": "notebook",
           "label": "Notebook"
         }
-      ],
-      "order": "7"
+      ]
     },
     {
       "title": "Suggested reviewers",
@@ -91,57 +108,37 @@
       "placeholder": "Add reviewer names...",
       "name": "submission.suggested",
       "parse": "split",
-      "format": "join",
-      "order": "8"
+      "format": "join"
     },
     {
       "title": "Upload supplementary materials",
       "id": "1531305332347",
       "component": "SupplementaryFiles",
       "description": "<p>Upload your files.</p>",
-      "name": "fileName",
-      "order": "10"
-    },
-    {
-      "title": "Cover letter",
-      "id": "1591172762874",
-      "component": "AbstractEditor",
-      "name": "submission.cover",
-      "description": "<p>Cover letter describing submission, relevant implications, and timely information to consider</p>",
-      "order": "4",
-      "placeholder": "Enter your cover letter"
-    },
-    {
-      "title": "Ethics statement",
-      "id": "1591173029656",
-      "component": "AbstractEditor",
-      "name": "submission.ethics",
-      "placeholder": "Enter your ethics statements",
-      "order": "6"
-    },
-    {
-      "title": "Data and Code availability statements",
-      "id": "1591173076622",
-      "component": "AbstractEditor",
-      "name": "submission.datacode",
-      "placeholder": "Enter your data and code availability statement",
-      "order": "5"
+      "name": "fileName"
     },
     {
-      "title": "Links",
-      "id": "1591192678688",
+      "title": "Keywords",
+      "id": "1531303777701",
       "component": "TextField",
-      "name": "submission.links",
-      "placeholder": "Enter your links, separated by commas",
-      "order": "9",
-      "parse": {
-        "value": "split",
-        "label": "Split"
+      "name": "submission.keywords",
+      "placeholder": "Enter keywords...",
+      "parse": "split",
+      "format": "join",
+      "validateValue": {
+        "minChars": "2",
+        "maxChars": "6"
       },
-      "format": {
-        "value": "join",
-        "label": "Join"
-      }
+      "validate": [
+        {
+          "value": "minChars",
+          "label": "minimum Characters"
+        },
+        {
+          "value": "required",
+          "label": "Required"
+        }
+      ]
     },
     {
       "title": "Did your study involve healthy subjects only or patients (note that patient studies may also involve healthy subjects)",
@@ -159,8 +156,7 @@
         }
       ],
       "description": "<p></p>",
-      "shortDescription": "Patients/healthy subjects",
-      "order": "12"
+      "shortDescription": "Patients/healthy subjects"
     },
     {
       "title": "If your research involved human subjects, was the research approved by the relevant Institutional Review Board or ethics panel?",
@@ -182,8 +178,7 @@
         }
       ],
       "description": "<p><i>NOTE: Any human subjects studies without IRB approval will be automatically rejected.</i></p>",
-      "shortDescription": "Ethics panel",
-      "order": "13"
+      "shortDescription": "Ethics panel"
     },
     {
       "title": "Was any animal research approved by the relevant IACUC or other animal research panel?",
@@ -205,7 +200,6 @@
           "value": "N/A"
         }
       ],
-      "order": "14",
       "shortDescription": "Animal research panel"
     },
     {
@@ -267,7 +261,6 @@
           "value": "Computational modeling"
         }
       ],
-      "order": "15",
       "shortDescription": "Methods"
     },
     {
@@ -276,7 +269,6 @@
       "component": "TextField",
       "name": "submission.otherMethods",
       "placeholder": "Enter any additional methods used, if applicable",
-      "order": "16",
       "shortDescription": "Other methods"
     },
     {
@@ -284,7 +276,6 @@
       "id": "1591344209443",
       "component": "Select",
       "name": "submission.humanMRI",
-      "order": "17",
       "options": [
         {
           "label": "1T",
@@ -318,7 +309,6 @@
       "id": "1591345370930",
       "component": "TextField",
       "name": "submission.humanMRIother",
-      "order": "18",
       "validate": [],
       "validateValue": {
         "minChars": "10"
@@ -360,7 +350,6 @@
           "value": "LONI Pipeline"
         }
       ],
-      "order": "19",
       "shortDescription": "Processing packages"
     },
     {
@@ -368,29 +357,34 @@
       "id": "1591345560536",
       "component": "TextField",
       "name": "submission.otherPackages",
-      "shortDescription": "Other processing packages",
-      "order": "20"
+      "shortDescription": "Other processing packages"
     },
     {
       "title": "Provide references using author date format:",
       "id": "1591345620839",
       "component": "AbstractEditor",
       "name": "submission.references",
-      "order": "21",
       "shortDescription": "References"
     },
     {
-      "title": "Title",
-      "id": "1593634996801",
-      "component": "TextField",
-      "name": "meta.title",
-      "placeholder": "Enter the manuscript's title",
-      "description": "<p></p>",
-      "order": "0"
+      "title": "Visual Abstract",
+      "id": "1601471819978",
+      "component": "VisualAbstract",
+      "name": "visualAbstract",
+      "description": "<p>Provide a visual abstract or figure to represent your manuscript.</p>"
+    },
+    {
+      "title": "Abstract",
+      "id": "1601488776604",
+      "component": "AbstractEditor",
+      "name": "submission.abstract",
+      "placeholder": "Input your abstract...",
+      "description": "<p>Please provide a short summary of your submission</p>",
+      "shortDescription": "Abstract"
     }
   ],
   "description": "<p>Aperture is now accepting Research Object Submissions. Please fill out the form below to complete your submission.</p>",
   "haspopup": "true",
   "popuptitle": "By submitting the manuscript, you agree to the following statements.",
-  "popupdescription": "<p>The corresponding author confirms that all co-authors are included, and that everyone listed as a co-author agrees to that role and all the following requirements and acknowledgements.</p><p></p><p>The submission represents original work and that sources are given proper attribution. The journal employs CrossCheck to compare submissions against a large and growing database of published scholarly content. If in the judgment of a senior editor a submission is genuinely suspected of plagiarism, it will be returned to the author(s) with a request for explanation.</p><p></p><p>The research was conducted in accordance with ethical principles.</p><p></p><p>There is a Data Accessibility Statement, containing information about the location of open data and materials, in the manuscript.</p><p></p><p>A conflict of interest statement is present in the manuscript, even if to state no conflicts of interest.</p>"
+  "popupdescription": "<p>The corresponding author confirms that all co-authors are included, and that everyone listed as a co-author agrees to that role and all the following requirements and acknowledgements.</p><p></p><p>The submission represents original work and that sources are given proper attribution. The journal employs CrossCheck to compare submissions against a large and growing database of published scholarly content. If in the judgment of a senior editor a submission is genuinely suspected of plagiarism, it will be returned to the author(s) with a request for explanation.</p><p></p><p>The research was conducted in accordance with ethical principles.</p><p></p><p>There is a Data Accessibility Statement, containing information about the location of open data and materials, in the manuscript.</p><p>n</p><p>A conflict of interest statement is present in the manuscript, even if to state no conflicts of interest.</p>"
 }
-- 
GitLab