Render data selection with data prospectus matching the data request …

…schema version
UtrechtUniversity · Jul 12, 2023 · d134071 · d134071
1 parent d68604d
commit d134071
Show file tree

Hide file tree

Showing 21 changed files with 1,192 additions and 193 deletions.
diff --git a/datarequest/static/datarequest/js/add.js b/datarequest/static/datarequest/js/add.js
diff --git a/datarequest/static/datarequest/js/assign.js b/datarequest/static/datarequest/js/assign.js
diff --git a/datarequest/static/datarequest/js/dao_evaluate.js b/datarequest/static/datarequest/js/dao_evaluate.js
diff --git a/datarequest/static/datarequest/js/datamanager_review.js b/datarequest/static/datarequest/js/datamanager_review.js
diff --git a/datarequest/static/datarequest/js/evaluate.js b/datarequest/static/datarequest/js/evaluate.js
diff --git a/datarequest/static/datarequest/js/preliminary_review.js b/datarequest/static/datarequest/js/preliminary_review.js
diff --git a/datarequest/static/datarequest/js/preregister.js b/datarequest/static/datarequest/js/preregister.js
diff --git a/datarequest/static/datarequest/js/preregistration_confirm.js b/datarequest/static/datarequest/js/preregistration_confirm.js
diff --git a/datarequest/static/datarequest/js/review.js b/datarequest/static/datarequest/js/review.js
diff --git a/datarequest/static/datarequest/js/src/DataSelection.js b/datarequest/static/datarequest/js/src/DataSelection.js
diff --git a/datarequest/static/datarequest/js/src/DataSelectionOld.js b/datarequest/static/datarequest/js/src/DataSelectionOld.js
diff --git a/datarequest/static/datarequest/js/src/assign.js b/datarequest/static/datarequest/js/src/assign.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -111,7 +112,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -145,7 +147,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -184,7 +187,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -229,6 +232,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data)
 {
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/dao_evaluate.js b/datarequest/static/datarequest/js/src/dao_evaluate.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -43,7 +44,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -77,7 +79,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -116,7 +119,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -161,6 +164,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data)
 {
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/datamanager_review.js b/datarequest/static/datarequest/js/src/datamanager_review.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -42,7 +43,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={prSchema}
                                   uiSchema={prUiSchema}
-                                  formData={prFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("preliminaryReview")
         );
     });
@@ -106,7 +108,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -144,7 +147,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -189,6 +192,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data) {
 
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/evaluate.js b/datarequest/static/datarequest/js/src/evaluate.js
@@ -105,7 +105,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -223,7 +224,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -262,7 +264,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -307,6 +309,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data)
 {
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/preliminary_review.js b/datarequest/static/datarequest/js/src/preliminary_review.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -44,7 +45,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -79,7 +81,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -119,7 +122,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -164,6 +167,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function validate(formData, errors) {
     // The data request cannot be accepted if the conditions specified by the checkboxes haven't
     // been met. In the code below, an error is added to the checkboxes if the data request is

diff --git a/datarequest/static/datarequest/js/src/preregister.js b/datarequest/static/datarequest/js/src/preregister.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -32,7 +33,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -78,7 +80,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -117,7 +120,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -162,6 +165,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data) {
 
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/preregistration_confirm.js b/datarequest/static/datarequest/js/src/preregistration_confirm.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -37,7 +38,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -99,7 +101,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -138,7 +141,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -183,6 +186,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data)
 {
     // Disable submit button

diff --git a/datarequest/static/datarequest/js/src/review.js b/datarequest/static/datarequest/js/src/review.js
@@ -4,6 +4,7 @@ import React, { Component } from "react";
 import { render } from "react-dom";
 import Form from "@rjsf/bootstrap-4";
 import DataSelection, { DataSelectionCart } from "./DataSelection.js";
+import DataSelectionOld, { DataSelectionCartOld } from "./DataSelectionOld.js";
 
 document.addEventListener("DOMContentLoaded", async () => {
 
@@ -32,7 +33,8 @@ document.addEventListener("DOMContentLoaded", async () => {
     .then(() => {
         render(<ContainerReadonly schema={datarequestSchema}
                                   uiSchema={datarequestUiSchema}
-                                  formData={datarequestFormData} />,
+                                  formData={datarequestFormData}
+                                  schemaVersion={datarequestSchemaVersion} />,
                document.getElementById("datarequest")
         );
     });
@@ -178,7 +180,8 @@ class ContainerReadonly extends React.Component {
         <div>
           <YodaFormReadonly schema={this.props.schema}
                             uiSchema={this.props.uiSchema}
-                            formData={this.props.formData} />
+                            formData={this.props.formData}
+                            schemaVersion={this.props.schemaVersion} />
         </div>
       );
     }
@@ -218,7 +221,7 @@ class YodaFormReadonly extends React.Component {
                   idPrefix={"yoda"}
                   uiSchema={this.props.uiSchema}
                   formData={this.props.formData}
-                  fields={fields}
+                  fields={(this.props.schemaVersion === "youth-0") ? fieldsOld : fields}
                   disabled>
                   <button className="hidden" />
             </Form>
@@ -263,6 +266,12 @@ const fields = {
   DataSelection: DataSelectionCart
 };
 
+const fieldsOld = {
+  DescriptionField: CustomDescriptionField,
+  TitleField: CustomTitleField,
+  DataSelection: DataSelectionCartOld
+};
+
 function submitData(data)
 {
     // Disable submit button