updated

.npmrc

+package-manager=npm

src/api/current-history/content-types/current-history/schema.json

@@ -27,20 +27,14 @@
       "repeatable": false,
       "component": "question1.question-1"
     },
-    "question2": {
-      "displayName": "question2",
-      "type": "component",
-      "repeatable": false,
-      "component": "question2.question2"
+    "title": {
+      "type": "text"
     },
-    "question3": {
-      "displayName": "question3",
+    "chQuestion2": {
+      "displayName": "ch-question2",
       "type": "component",
       "repeatable": false,
-      "component": "question3.question3"
-    },
-    "title": {
-      "type": "text"
+      "component": "ch-question2.ch-question2"
     }
   }
 }

src/api/family-history/content-types/family-history/schema.json

@@ -15,10 +15,23 @@
     "title": {
       "type": "string"
     },
-    "question1": {
+    "fhQ1": {
+      "displayName": "fhQuestion1",
       "type": "component",
       "repeatable": false,
-      "component": "question1.question-1"
+      "component": "fh-question1.fh-question1"
+    },
+    "fhQ2": {
+      "displayName": "fhQ2",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q2.fh-q2"
+    },
+    "fhQ3": {
+      "displayName": "fhQ3",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q3.fh-q3"
     }
   }
 }

src/components/ch-q2-options/ch-q2-options.json

+{
+  "collectionName": "components_ch_q2_options_ch_q2_options",
+  "info": {
+    "displayName": "ch-q2-options"
+  },
+  "options": {},
+  "attributes": {
+    "text": {
+      "type": "string"
+    }
+  }
+}

src/components/ch-question2/ch-question2.json

+{
+  "collectionName": "components_ch_question2_ch_question2s",
+  "info": {
+    "displayName": "ch-question2"
+  },
+  "options": {},
+  "attributes": {
+    "chQ2": {
+      "type": "string"
+    },
+    "chQ2Options": {
+      "displayName": "ch-q2-options",
+      "type": "component",
+      "repeatable": true,
+      "component": "ch-q2-options.ch-q2-options"
+    }
+  }
+}

src/components/fh-q1-options/fh-q1-options.json

+{
+  "collectionName": "components_fh_q1_options_fh_q1_options",
+  "info": {
+    "displayName": "fhQ1Options"
+  },
+  "options": {},
+  "attributes": {
+    "text": {
+      "type": "string"
+    }
+  }
+}

src/components/fh-q2-options/fh-q2-options.json

+{
+  "collectionName": "components_fh_q2_options_fh_q2_options",
+  "info": {
+    "displayName": "fhQ2Options"
+  },
+  "options": {},
+  "attributes": {
+    "text": {
+      "type": "string"
+    }
+  }
+}

src/components/fh-q2/fh-q2.json

+{
+  "collectionName": "components_fh_q2_fh_q2s",
+  "info": {
+    "displayName": "fhQ2"
+  },
+  "options": {},
+  "attributes": {
+    "fhQ2": {
+      "type": "string"
+    },
+    "fhQ2Options": {
+      "displayName": "fhQ2Options",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q2-options.fh-q2-options"
+    }
+  }
+}

src/components/fh-q3-options/fh-q3-options.json

+{
+  "collectionName": "components_fh_q3_options_fh_q3_options",
+  "info": {
+    "displayName": "fhQ3Options"
+  },
+  "options": {},
+  "attributes": {
+    "text": {
+      "type": "string"
+    }
+  }
+}

src/components/fh-q3/fh-q3.json

+{
+  "collectionName": "components_fh_q3_fh_q3s",
+  "info": {
+    "displayName": "fhQ3"
+  },
+  "options": {},
+  "attributes": {
+    "fhQ3": {
+      "type": "string"
+    },
+    "fhQ3Options": {
+      "displayName": "fhQ3Options",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q3-options.fh-q3-options"
+    }
+  }
+}

src/components/fh-question1/fh-question1.json

+{
+  "collectionName": "components_fh_question1_fh_question1s",
+  "info": {
+    "displayName": "fhQuestion1"
+  },
+  "options": {},
+  "attributes": {
+    "fhQ1": {
+      "type": "string"
+    },
+    "fhQ1Options": {
+      "displayName": "fhQ1Options",
+      "type": "component",
+      "repeatable": true,
+      "component": "fh-q1-options.fh-q1-options"
+    }
+  }
+}

src/components/question1/question-1.json

@@ -6,7 +6,7 @@
   },
   "options": {},
   "attributes": {
-    "question": {
+    "question1A": {
       "type": "string"
     },
     "options": {
@@ -15,7 +15,7 @@
       "repeatable": true,
       "component": "options.options"
     },
-    "question02": {
+    "question1B": {
       "type": "string"
     },
     "option02": {
@@ -23,9 +23,6 @@
       "repeatable": true,
       "component": "options2.options2"
     },
-    "question03": {
-      "type": "text"
-    },
     "options03": {
       "type": "component",
       "repeatable": true,