Merge branch 'dev' into roquej-20241024-medications

pages/js/duster/new-project/src/App.vue

@@ -522,6 +522,13 @@ const getDusterMetadata = (metadataUrl:string) => {
 };
 
 const loadEditMode = () => {
+
+  // add an empty array for missing user-defined labs to each data collection window
+  // retroactive support for user-defined labs feature for older projects
+  projectConfig.initial_design.collectionWindows.forEach((cw: any) => {
+    cw.data.ud_labs = cw.data.ud_labs ? cw.data.ud_labs : [];
+  });
+
   initialDesign.value = projectConfig.initial_design;
 
   // transform and load researcher-provided data

pages/js/duster/new-project/src/components/ClinicalDataOptions.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div class="grid">
     <div
       v-for="(col, index) in filtered"