7066: Dataset Designer Server Side API updates

.gitignore

@@ -11,6 +11,7 @@ experiment/node_modules
 assay/node_modules
 list/node_modules
 query/node_modules
+study/node_modules
 
 # These files are copied to this location
 core/resources/scripts/Ext.js
@@ -67,6 +68,12 @@ query/resources/views/queryMetadataEditor.view.xml
 query/resources/views/queryMetadataEditorDev.html
 query/resources/views/queryMetadataEditorDev.view.xml
 
+study/resources/web/study/gen
+study/resources/views/datasetDesigner.html
+study/resources/views/datasetDesigner.view.xml
+study/resources/views/datasetDesignerDev.html
+study/resources/views/datasetDesignerDev.view.xml
+
 list/resources/web/list/gen
 list/resources/views/designer.html
 list/resources/views/designer.view.xml

api/src/org/labkey/api/study/Dataset.java

@@ -42,6 +42,13 @@
  */
 public interface Dataset<T extends Dataset> extends StudyEntity, StudyCachable<T>
 {
+    enum DataSharing
+    {
+        NONE,
+        ALL,
+        PTID
+    }
+
     Set<String> getDefaultFieldNames();
 
     /**
@@ -101,6 +108,16 @@ public interface Dataset<T extends Dataset> extends StudyEntity, StudyCachable<T
     @Nullable
     String getKeyPropertyName();
 
+    String getTag();
+
+    String getVisitDatePropertyName();
+
+    DataSharing getDataSharingEnum();
+
+    boolean getUseTimeKeyField();
+
+    void setUseTimeKeyField(boolean useTimeKeyField);
+
     void setKeyPropertyName(String name);
 
     void save(User user) throws SQLException;

assay/package.json

@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "0.52.1"
+    "@labkey/components": "0.54.0"
   },
   "devDependencies": {
     "@hot-loader/react-dom": "16.13.0",

core/package.json

@@ -91,7 +91,7 @@
   },
   "dependencies": {
     "@labkey/api": "0.2.4",
-    "@labkey/components": "0.52.1",
+    "@labkey/components": "0.54.0",
     "@labkey/eslint-config-react": "0.0.5",
     "react-toggle-button": "2.2.0"
   },

experiment/package.json

@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "0.52.1"
+    "@labkey/components": "0.54.0"
   },
   "devDependencies": {
     "@hot-loader/react-dom": "16.13.0",

list/package.json

@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "0.52.1"
+    "@labkey/components": "0.54.0"
   },
   "devDependencies": {
     "@hot-loader/react-dom": "16.13.0",

query/package.json

@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "0.52.1"
+    "@labkey/components": "0.54.0"
   },
   "devDependencies": {
     "@hot-loader/react-dom": "16.13.0",

study/.npmrc

@@ -0,0 +1,2 @@
+# Set registry for @labkey scopes
+@labkey:registry=https://artifactory.labkey.com/artifactory/api/npm/libs-client/

study/README.md

@@ -0,0 +1,19 @@
+# LabKey Study Module
+
+The Study module provides a variety of tools for integration of heterogeneous data types, 
+such as demographic, clinical, and experimental data. Cohorts and participant groups are 
+also supported by this module.
+
+### LabKey React pages
+
+This module is setup to use `webpack` to build client application pages, mostly for developing 
+with `React` components and `@labkey/components` shared components. The artifacts will be generated 
+and placed into the standard LabKey view locations to make the pages available to the server through 
+the `study` controller. The generated `<entryPoint>.html` and `<entryPoint>.view.xml` files will 
+be placed in the `study/resources/views` directory and the generated JS/CSS artifacts will be 
+placed in the `study/resources/web/experiment/gen` directory.
+
+For further details about developing React based pages in this module see the following documentation:
+[LabKey React Page Development]. 
+
+[LabKey React Page Development]: https://github.com/LabKey/platform/tree/develop/webpack

study/build.gradle

@@ -20,3 +20,6 @@ dependencies {
     BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "query"), depProjectConfig: "published", depExtension: "module")
     BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "published", depExtension: "module")
 }
+
+project.evaluationDependsOn(BuildUtils.getPlatformProjectPath(project.gradle))
+project.tasks.npmInstall.dependsOn(project.project(BuildUtils.getPlatformProjectPath(project.gradle)).tasks.npmInstall)