Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 6 commits into from
Nov 7, 2022
Merged

Use standard directories for client code #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a179330
Standardize client code for primateid module
labkey-tchad Nov 2, 2022
117366a
Standardize client code for WNPRC_EHR module
labkey-tchad Nov 2, 2022
06c4526
Add npm build outputs
labkey-tchad Nov 2, 2022
b621dbc
Update relative paths in ts imports
labkey-tchad Nov 2, 2022
2868396
Make it more clear that the same configuration is happening
labkey-tchad Nov 2, 2022
8b5c0fe
Move TypeScript water monitoring files to appropriate client dir, add…
csebranek Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx
View file
Open in desktop
File renamed without changes.
0 ..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx
View file
Open in desktop
File renamed without changes.
0 ...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx
View file
Open in desktop
File renamed without changes.
0 ...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx
View file
Open in desktop
File renamed without changes.
0 ..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx
View file
Open in desktop
File renamed without changes.
0 ...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down
0 WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
/>
)
};
Expand Down
0 ...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx
View file
Open in desktop
File renamed without changes.
0 ...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts
View file
Open in desktop
File renamed without changes.
13 changes: 4 additions & 9 deletions ...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
return {
commands: commands
};
};
};
0 ...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down
0 WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx
View file
Open in desktop
File renamed without changes.
0 .../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx
View file
Open in desktop
File renamed without changes.
0 ..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx
View file
Open in desktop
File renamed without changes.
0 ...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx
View file
Open in desktop
File renamed without changes.
0 ...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx
View file
Open in desktop
File renamed without changes.
0 ...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx
View file
Open in desktop
File renamed without changes.
0 ...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx
View file
Open in desktop
File renamed without changes.
0 ...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/weight/query/helpers.ts → WNPRC_EHR/src/client/weight/query/helpers.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts
View file
Open in desktop
File renamed without changes.
0 WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts
View file
Open in desktop
File renamed without changes.
122 changes: 0 additions & 122 deletions WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions WNPRC_EHR/src/ts/test.tsx
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions WNPRC_EHR/tsconfig.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
},
"exclude": [
"resources"
],
"files": [
"src/ts/test.tsx",
"src/ts/breeding.ts"
]
}
}
81 changes: 41 additions & 40 deletions WNPRC_EHR/webpack.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];
10 changes: 10 additions & 0 deletions primateid/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
})
}
0 primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion primateid/webpack.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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',
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Use standard directories for client code#225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

labkey-tchad
merged 6 commits into

from

Nov 7, 2022
 Merged


Use standard directories for client code
#225
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a179330

Standardize client code for primateid module


labkey-tchad Nov 2, 2022
117366a

Standardize client code for WNPRC_EHR module


labkey-tchad Nov 2, 2022
06c4526

Add npm build outputs


labkey-tchad Nov 2, 2022
b621dbc

Update relative paths in ts imports


labkey-tchad Nov 2, 2022
2868396

Make it more clear that the same configuration is happening


labkey-tchad Nov 2, 2022
8b5c0fe

Move TypeScript water monitoring files to appropriate client dir, add…


csebranek Nov 4, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


0
...R/src/abstract/base/AbstractContainer.tsx → ...lient/abstract/base/AbstractContainer.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/abstract/base/AnimalInfoPane.tsx → ...c/client/abstract/base/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/base/App.tsx → WNPRC_EHR/src/client/abstract/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/abstract/base/ContextProvider.tsx → .../client/abstract/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/theme/css/index.css → ...R/src/client/abstract/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/abstract/typings/main.ts → ...C_EHR/src/client/abstract/typings/main.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/ts/breeding.ts → WNPRC_EHR/src/client/breeding.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/AnimalInfoPane.tsx → .../src/client/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BatchModal.tsx → ..._EHR/src/client/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/BulkEditModal.tsx → ...R/src/client/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DateInput.tsx → ...C_EHR/src/client/components/DateInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/DropdownOptions.tsx → ...src/client/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/EHRSpinner.tsx → ..._EHR/src/client/components/EHRSpinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/InputLabel.tsx → ..._EHR/src/client/components/InputLabel.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/Spinner.tsx → WNPRC_EHR/src/client/components/Spinner.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/SubmitModal.tsx → ...EHR/src/client/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/components/TextInput.tsx → ...C_EHR/src/client/components/TextInput.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/App.tsx → WNPRC_EHR/src/client/feeding/base/App.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/feeding/base/BulkEditFields.tsx → ...rc/client/feeding/base/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/feeding/base/ContextProvider.tsx → ...c/client/feeding/base/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/ErrorModal.tsx → ...HR/src/client/feeding/base/ErrorModal.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/base/FeedingForm.tsx → ...R/src/client/feeding/base/FeedingForm.tsx

View file


Open in desktop


File renamed without changes.


0
...src/feeding/base/FeedingFormContainer.tsx → ...ent/feeding/base/FeedingFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/query/helpers.tsx → ..._EHR/src/client/feeding/query/helpers.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/feeding/typings/main.ts → WNPRC_EHR/src/client/feeding/typings/main.ts

View file


Open in desktop


File renamed without changes.


8 changes: 4 additions & 4 deletions
WNPRC_EHR/src/query/helpers.ts → WNPRC_EHR/src/client/query/helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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) => {
Expand Down

0
WNPRC_EHR/src/ts/research_ultrasounds.ts → WNPRC_EHR/src/client/research_ultrasounds.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
WNPRC_EHR/src/stories/DatePicker.stories.tsx → ...src/client/stories/DatePicker.stories.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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} />}
 />
 )
};
Expand Down

0
...R/src/stories/DropdownOptions.stories.tsx → ...lient/stories/DropdownOptions.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/InputLabel.stories.tsx → ...src/client/stories/InputLabel.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/Spinner.stories.tsx → ...HR/src/client/stories/Spinner.stories.tsx

View file


Open in desktop


File renamed without changes.


0
...C_EHR/src/stories/SubmitModal.stories.tsx → ...rc/client/stories/SubmitModal.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/stories/TextInput.stories.tsx → .../src/client/stories/TextInput.stories.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/index.css → WNPRC_EHR/src/client/theme/css/index.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/react-datepicker.css → ...src/client/theme/css/react-datepicker.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/theme/css/tooltip.css → WNPRC_EHR/src/client/theme/css/tooltip.css

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/typings/main.ts → WNPRC_EHR/src/client/typings/main.ts

View file


Open in desktop


File renamed without changes.


13 changes: 4 additions & 9 deletions
...bkey/wnprc_ehr/pages/query/pageHelpers.ts → ...ient/watermonitoring/query/pageHelpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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> = [];
Expand DownExpand Up@@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t
 return {
 commands: commands
 };
};
};

0
...rg/labkey/wnprc_ehr/pages/typings/main.ts → ...rc/client/watermonitoring/typings/main.ts

View file


Open in desktop


File renamed without changes.


4 changes: 2 additions & 2 deletions
WNPRC_EHR/src/ts/waterMonitoringSystem.ts → .../watermonitoring/waterMonitoringSystem.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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;
Expand All@@ -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";
Expand Down

0
WNPRC_EHR/src/weight/app.tsx → WNPRC_EHR/src/client/weight/app.tsx

View file


Open in desktop


File renamed without changes.


0
.../src/weight/components/AnimalInfoPane.tsx → ...ient/weight/components/AnimalInfoPane.tsx

View file


Open in desktop


File renamed without changes.


0
..._EHR/src/weight/components/BatchModal.tsx → ...c/client/weight/components/BatchModal.tsx

View file


Open in desktop


File renamed without changes.


0
...R/src/weight/components/BulkEditModal.tsx → ...lient/weight/components/BulkEditModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/CustomAlert.tsx → .../client/weight/components/CustomAlert.tsx

View file


Open in desktop


File renamed without changes.


0
...src/weight/components/DropdownOptions.tsx → ...ent/weight/components/DropdownOptions.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/components/SubmitForReviewModal.tsx → ...eight/components/SubmitForReviewModal.tsx

View file


Open in desktop


File renamed without changes.


0
...EHR/src/weight/components/SubmitModal.tsx → .../client/weight/components/SubmitModal.tsx

View file


Open in desktop


File renamed without changes.


0
...weight/containers/App/ContextProvider.tsx → ...weight/containers/App/ContextProvider.tsx

View file


Open in desktop


File renamed without changes.


0
...eight/containers/Forms/BulkEditFields.tsx → ...eight/containers/Forms/BulkEditFields.tsx

View file


Open in desktop


File renamed without changes.


0
...ight/containers/Forms/EnterWeightForm.tsx → ...ight/containers/Forms/EnterWeightForm.tsx

View file


Open in desktop


File renamed without changes.


0
...ainers/Forms/EnterWeightFormContainer.tsx → ...ainers/Forms/EnterWeightFormContainer.tsx

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/query/actions.ts → WNPRC_EHR/src/client/weight/query/actions.ts

View file


Open in desktop


File renamed without changes.


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

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/globals.d.ts → ...HR/src/client/weight/typings/globals.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.d.ts → ...C_EHR/src/client/weight/typings/main.d.ts

View file


Open in desktop


File renamed without changes.


0
WNPRC_EHR/src/weight/typings/main.ts → WNPRC_EHR/src/client/weight/typings/main.ts

View file


Open in desktop


File renamed without changes.


122 changes: 0 additions & 122 deletions
WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts

View file


Open in desktop


This file was deleted.


14 changes: 0 additions & 14 deletions
WNPRC_EHR/src/ts/test.tsx

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
WNPRC_EHR/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,5 @@
 },
 "exclude": [
 "resources"
 ],
 "files": [
 "src/ts/test.tsx",
 "src/ts/breeding.ts"
 ]
}
}

81 changes: 41 additions & 40 deletions
WNPRC_EHR/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand All@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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',
Expand DownExpand Up@@ -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
];

10 changes: 10 additions & 0 deletions
primateid/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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')
 })
}

0
primateid/src/ts/primateid.ts → primateid/src/client/primateid.ts

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
primateid/webpack.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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',
 },
Expand Down