Use standard directories for client code

WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

@@ -1,11 +1,11 @@
-import {TaskValuesType} from "../org/labkey/wnprc_ehr/pages/typings/main";
+import { TaskValuesType } from '../watermonitoring/typings/main';
+import { ActionURL, Filter, Query } from '@labkey/api';
+import { SelectRowsOptions } from '@labkey/api/dist/labkey/query/SelectRows';
+import { SaveRowsOptions } from '@labkey/api/dist/labkey/query/Rows';
 
 interface jsonDataType {
   commands: Array<any>;
 }
-import {Query,ActionURL,Filter} from '@labkey/api';
-import { SelectRowsOptions } from '@labkey/api/dist/labkey/query/SelectRows';
-import { SaveRowsOptions } from '@labkey/api/dist/labkey/query/Rows';
 
 export const groupCommands = (values: Array<any>) => {
   return values.reduce((acc, item) => {

WNPRC_EHR/src/stories/DatePicker.stories.tsx → WNPRC_EHR/src/client/stories/DatePicker.stories.tsx

@@ -43,7 +43,7 @@ export const ToStorybook = () => {
             id="date-id"
             onFocus={()=> {console.log("Focused!")}}
             onChange={handleDateChange}
-            customInput={<DateInput value={date} opendate={openDatepicker} />}
+            customInput={<DateInput opendate={openDatepicker} />}
         />
     )
 };

WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts → WNPRC_EHR/src/client/watermonitoring/query/pageHelpers.ts

@@ -1,17 +1,12 @@
-import {
-    labkeyActionSelectWithPromise,
-} from "./actions";
-import {Filter, Utils} from "@labkey/api";
-
-import { CommandType } from "@labkey/api/dist/labkey/query/Rows";
+import { CommandType } from '@labkey/api/dist/labkey/query/Rows';
 import {
     Commands,
     DataRowsPerCommandType,
     ModifyRowsCommands,
     TaskValuesType,
     WaterAmountValuesType
-} from "../typings/main";
-import {InsertValuesWithCommand, RowObj} from "../../../../../weight/typings/main";
+} from '../typings/main';
+import { InsertValuesWithCommand, RowObj } from '../../weight/typings/main';
 
 export const setupWaterAmountValues = (values: Object, QCStateLabel: string, taskId: string): Array<WaterAmountValuesType> => {
     let valuesToInsert: Array<WaterAmountValuesType> = [];
@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
     return {
         commands: commands
     };
-};
+};

WNPRC_EHR/src/ts/waterMonitoringSystem.ts → WNPRC_EHR/src/client/watermonitoring/waterMonitoringSystem.ts

@@ -1,4 +1,4 @@
-import {setupTaskValues, setupWaterAmountValues} from "../org/labkey/wnprc_ehr/pages/query/pageHelpers";
+import {setupTaskValues, setupWaterAmountValues} from "./query/pageHelpers";
 
 declare const Ext4: any;
 declare const LABKEY: any;
@@ -7,7 +7,7 @@ import * as $ from 'jquery';
 import * as URI from 'urijs';
 
 import {groupCommands, saveRowsDirect,setupJsonData,insertTaskCommand} from "../query/helpers";
-import {RowObj, ContextProviderProps, WaterAmountValuesType,TaskValuesType} from "../../src/org/labkey/wnprc_ehr/pages/typings/main";
+import {RowObj, ContextProviderProps, WaterAmountValuesType,TaskValuesType} from "./typings/main";
 import { ConfigProps } from "../typings/main";
 import {ActionURL, Utils, Security, Filter} from "@labkey/api";
 import { Command, CommandType } from "@labkey/api/dist/labkey/query/Rows";

WNPRC_EHR/tsconfig.json

@@ -10,9 +10,5 @@
   },
   "exclude": [
     "resources"
-  ],
-  "files": [
-    "src/ts/test.tsx",
-    "src/ts/breeding.ts"
   ]
-}
+}

WNPRC_EHR/webpack.config.js

@@ -4,7 +4,7 @@ let breedingConfig = function wp(env) {
 
     return {
         devtool: 'source-map',
-        entry: './src/ts/breeding.ts',
+        entry: './src/client/breeding.ts',
         externals: {
             jquery: 'jQuery',
             urijs: 'URI',
@@ -29,47 +29,13 @@ let breedingConfig = function wp(env) {
     };
 };
 
-let testConfig = function wp(env) {
-
-    return {
-        devtool: 'source-map',
-        entry: './src/ts/test.tsx',
-        externals: {
-            jquery: 'jQuery',
-            urijs: 'URI',
-        },
-        mode: process.env.NODE_ENV,
-        module: {
-            rules: [
-                {
-                    test: /\.tsx?$/,
-                    loader: "ts-loader"
-                },
-                {
-                    test: /\.css$/,
-                    loaders: ['style-loader', 'css-loader', 'sass-loader']
-                }
-            ],
-        },
-        output: {
-            filename: 'test.js',
-            library: 'Test',
-            libraryExport: 'default',
-            libraryTarget: 'umd',
-            path: path.resolve(__dirname, 'resources/web/wnprc_ehr/gen')
-        },
-        resolve: {
-            extensions: ['.ts', '.tsx', '.js', '.json'],
-        },
-    };
-};
 
 let feedingConfig = function wp(env) {
 
     return {
         mode: process.env.NODE_ENV,
         devtool: 'source-map',
-        entry: './src/feeding/base/App.tsx',
+        entry: './src/client/feeding/base/App.tsx',
         externals: {
             jquery: 'jQuery',
             urijs: 'URI',
@@ -102,7 +68,7 @@ var abstractConfig = function wp(env) {
     return {
         mode: process.env.NODE_ENV,
         devtool: 'source-map',
-        entry: './src/abstract/base/App.tsx',
+        entry: './src/client/abstract/base/App.tsx',
         externals: {
             jquery: 'jQuery',
             urijs: 'URI',
@@ -135,7 +101,7 @@ let researchUltrasoundsConfig = function wp(env) {
 
     return {
         devtool: 'source-map',
-        entry: './src/ts/research_ultrasounds.ts',
+        entry: './src/client/research_ultrasounds.ts',
         externals: {
             jquery: 'jQuery',
             urijs: 'URI',
@@ -165,7 +131,7 @@ var weightConfig = function wp(env) {
     return {
         mode: process.env.NODE_ENV,
         devtool: 'source-map',
-        entry: './src/weight/app.tsx',
+        entry: './src/client/weight/app.tsx',
         externals: {
             jquery: 'jQuery',
             urijs: 'URI',
@@ -196,6 +162,41 @@ var weightConfig = function wp(env) {
     };
 };
 
+let waterMonitoringConfig = function wp(env) {
+
+    return {
+        devtool: 'source-map',
+        entry: './src/client/watermonitoring/waterMonitoringSystem.ts',
+        externals: {
+            jquery: 'jQuery',
+            urijs: 'URI',
+            LABKEY: 'LABKEY'
+        },
+        mode: process.env.NODE_ENV,
+        module: {
+            rules: [
+                {
+                    loader: 'ts-loader',
+                    test: /\.tsx?$/},
+                {
+                    test: /\.css$/i,
+                    use: ['style-loader', 'css-loader']
+                },
+            ],
+        },
+        output: {
+            filename: 'waterMonitoringSystem.js',
+            library: 'waterMonitoringSystem',
+            libraryExport: 'default',
+            libraryTarget: 'umd',
+            path: path.resolve(__dirname, 'resources/web/wnprc_ehr/gen')
+        },
+        resolve: {
+            extensions: ['.ts', '.tsx', '.js', '.json', '.css'],
+        },
+    };
+};
+
 module.exports = [
-    breedingConfig, testConfig, feedingConfig, researchUltrasoundsConfig, abstractConfig, weightConfig
+    breedingConfig, feedingConfig, researchUltrasoundsConfig, abstractConfig, weightConfig, waterMonitoringConfig
 ];

primateid/build.gradle

@@ -10,3 +10,13 @@ dependencies {
     BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "study"), depProjectConfig: 'published', depExtension: 'module')
     BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "query"), depProjectConfig: 'published', depExtension: 'module')
 }
+
+project.afterEvaluate {
+    List.of(project.tasks.named("npmRunBuildProd"),
+            project.tasks.named("npm_run_${project.npmRun.buildProd}"),
+            project.tasks.named("npmRunBuild"),
+            project.tasks.named("npm_run_${project.npmRun.buildDev}")
+    ).forEach(task -> task.configure {
+        outputs.dir project.file('resources/scripts/primateid/gen')
+    })
+}

primateid/webpack.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 module.exports = function wp(env) {
     const base = {
-        entry: './src/ts/primateid.ts',
+        entry: './src/client/primateid.ts',
         externals: {
             console: 'console',
         },