From a179330885cde063afe8a1e1986889c8b5ad9ab5 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 2 Nov 2022 12:34:40 -0700 Subject: [PATCH 1/6] Standardize client code for primateid module --- primateid/src/{ts => client}/primateid.ts | 0 primateid/webpack.config.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename primateid/src/{ts => client}/primateid.ts (100%) diff --git a/primateid/src/ts/primateid.ts b/primateid/src/client/primateid.ts similarity index 100% rename from primateid/src/ts/primateid.ts rename to primateid/src/client/primateid.ts diff --git a/primateid/webpack.config.js b/primateid/webpack.config.js index c33a5d6ca..012cf7a9f 100644 --- a/primateid/webpack.config.js +++ b/primateid/webpack.config.js @@ -1,7 +1,7 @@ const path = require('path'); module.exports = function wp(env) { const base = { - entry: './src/ts/primateid.ts', + entry: './src/client/primateid.ts', externals: { console: 'console', }, From 117366a653408b1ca3c738d0513ac121a20d0f62 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 2 Nov 2022 12:46:50 -0700 Subject: [PATCH 2/6] Standardize client code for WNPRC_EHR module --- .../{ => client}/abstract/base/AbstractContainer.tsx | 0 .../{ => client}/abstract/base/AnimalInfoPane.tsx | 0 WNPRC_EHR/src/{ => client}/abstract/base/App.tsx | 0 .../{ => client}/abstract/base/ContextProvider.tsx | 0 .../src/{ => client}/abstract/theme/css/index.css | 0 WNPRC_EHR/src/{ => client}/abstract/typings/main.ts | 0 WNPRC_EHR/src/{ts => client}/breeding.ts | 0 .../src/{ => client}/components/AnimalInfoPane.tsx | 0 WNPRC_EHR/src/{ => client}/components/BatchModal.tsx | 0 .../src/{ => client}/components/BulkEditModal.tsx | 0 WNPRC_EHR/src/{ => client}/components/DateInput.tsx | 0 .../src/{ => client}/components/DropdownOptions.tsx | 0 WNPRC_EHR/src/{ => client}/components/EHRSpinner.tsx | 0 WNPRC_EHR/src/{ => client}/components/InputLabel.tsx | 0 WNPRC_EHR/src/{ => client}/components/Spinner.tsx | 0 .../src/{ => client}/components/SubmitModal.tsx | 0 WNPRC_EHR/src/{ => client}/components/TextInput.tsx | 0 WNPRC_EHR/src/{ => client}/feeding/base/App.tsx | 0 .../src/{ => client}/feeding/base/BulkEditFields.tsx | 0 .../{ => client}/feeding/base/ContextProvider.tsx | 0 .../src/{ => client}/feeding/base/ErrorModal.tsx | 0 .../src/{ => client}/feeding/base/FeedingForm.tsx | 0 .../feeding/base/FeedingFormContainer.tsx | 0 WNPRC_EHR/src/{ => client}/feeding/query/helpers.tsx | 0 WNPRC_EHR/src/{ => client}/feeding/typings/main.ts | 0 WNPRC_EHR/src/{ => client}/query/helpers.ts | 0 WNPRC_EHR/src/{ts => client}/research_ultrasounds.ts | 0 .../src/{ => client}/stories/DatePicker.stories.tsx | 0 .../{ => client}/stories/DropdownOptions.stories.tsx | 0 .../src/{ => client}/stories/InputLabel.stories.tsx | 0 .../src/{ => client}/stories/Spinner.stories.tsx | 0 .../src/{ => client}/stories/SubmitModal.stories.tsx | 0 .../src/{ => client}/stories/TextInput.stories.tsx | 0 WNPRC_EHR/src/{ts => client}/test.tsx | 0 WNPRC_EHR/src/{ => client}/theme/css/index.css | 0 .../src/{ => client}/theme/css/react-datepicker.css | 0 WNPRC_EHR/src/{ => client}/theme/css/tooltip.css | 0 WNPRC_EHR/src/{ => client}/typings/main.ts | 0 .../src/{ts => client}/waterMonitoringSystem.ts | 0 WNPRC_EHR/src/{ => client}/weight/app.tsx | 0 .../weight/components/AnimalInfoPane.tsx | 0 .../{ => client}/weight/components/BatchModal.tsx | 0 .../{ => client}/weight/components/BulkEditModal.tsx | 0 .../{ => client}/weight/components/CustomAlert.tsx | 0 .../weight/components/DropdownOptions.tsx | 0 .../weight/components/SubmitForReviewModal.tsx | 0 .../{ => client}/weight/components/SubmitModal.tsx | 0 .../weight/containers/App/ContextProvider.tsx | 0 .../weight/containers/Forms/BulkEditFields.tsx | 0 .../weight/containers/Forms/EnterWeightForm.tsx | 0 .../containers/Forms/EnterWeightFormContainer.tsx | 0 WNPRC_EHR/src/{ => client}/weight/query/actions.ts | 0 WNPRC_EHR/src/{ => client}/weight/query/helpers.ts | 0 .../src/{ => client}/weight/typings/globals.d.ts | 0 WNPRC_EHR/src/{ => client}/weight/typings/main.d.ts | 0 WNPRC_EHR/src/{ => client}/weight/typings/main.ts | 0 WNPRC_EHR/tsconfig.json | 6 +++--- WNPRC_EHR/webpack.config.js | 12 ++++++------ 58 files changed, 9 insertions(+), 9 deletions(-) rename WNPRC_EHR/src/{ => client}/abstract/base/AbstractContainer.tsx (100%) rename WNPRC_EHR/src/{ => client}/abstract/base/AnimalInfoPane.tsx (100%) rename WNPRC_EHR/src/{ => client}/abstract/base/App.tsx (100%) rename WNPRC_EHR/src/{ => client}/abstract/base/ContextProvider.tsx (100%) rename WNPRC_EHR/src/{ => client}/abstract/theme/css/index.css (100%) rename WNPRC_EHR/src/{ => client}/abstract/typings/main.ts (100%) rename WNPRC_EHR/src/{ts => client}/breeding.ts (100%) rename WNPRC_EHR/src/{ => client}/components/AnimalInfoPane.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/BatchModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/BulkEditModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/DateInput.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/DropdownOptions.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/EHRSpinner.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/InputLabel.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/Spinner.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/SubmitModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/components/TextInput.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/App.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/BulkEditFields.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/ContextProvider.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/ErrorModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/FeedingForm.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/base/FeedingFormContainer.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/query/helpers.tsx (100%) rename WNPRC_EHR/src/{ => client}/feeding/typings/main.ts (100%) rename WNPRC_EHR/src/{ => client}/query/helpers.ts (100%) rename WNPRC_EHR/src/{ts => client}/research_ultrasounds.ts (100%) rename WNPRC_EHR/src/{ => client}/stories/DatePicker.stories.tsx (100%) rename WNPRC_EHR/src/{ => client}/stories/DropdownOptions.stories.tsx (100%) rename WNPRC_EHR/src/{ => client}/stories/InputLabel.stories.tsx (100%) rename WNPRC_EHR/src/{ => client}/stories/Spinner.stories.tsx (100%) rename WNPRC_EHR/src/{ => client}/stories/SubmitModal.stories.tsx (100%) rename WNPRC_EHR/src/{ => client}/stories/TextInput.stories.tsx (100%) rename WNPRC_EHR/src/{ts => client}/test.tsx (100%) rename WNPRC_EHR/src/{ => client}/theme/css/index.css (100%) rename WNPRC_EHR/src/{ => client}/theme/css/react-datepicker.css (100%) rename WNPRC_EHR/src/{ => client}/theme/css/tooltip.css (100%) rename WNPRC_EHR/src/{ => client}/typings/main.ts (100%) rename WNPRC_EHR/src/{ts => client}/waterMonitoringSystem.ts (100%) rename WNPRC_EHR/src/{ => client}/weight/app.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/AnimalInfoPane.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/BatchModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/BulkEditModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/CustomAlert.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/DropdownOptions.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/SubmitForReviewModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/components/SubmitModal.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/containers/App/ContextProvider.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/containers/Forms/BulkEditFields.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/containers/Forms/EnterWeightForm.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/containers/Forms/EnterWeightFormContainer.tsx (100%) rename WNPRC_EHR/src/{ => client}/weight/query/actions.ts (100%) rename WNPRC_EHR/src/{ => client}/weight/query/helpers.ts (100%) rename WNPRC_EHR/src/{ => client}/weight/typings/globals.d.ts (100%) rename WNPRC_EHR/src/{ => client}/weight/typings/main.d.ts (100%) rename WNPRC_EHR/src/{ => client}/weight/typings/main.ts (100%) diff --git a/WNPRC_EHR/src/abstract/base/AbstractContainer.tsx b/WNPRC_EHR/src/client/abstract/base/AbstractContainer.tsx similarity index 100% rename from WNPRC_EHR/src/abstract/base/AbstractContainer.tsx rename to WNPRC_EHR/src/client/abstract/base/AbstractContainer.tsx diff --git a/WNPRC_EHR/src/abstract/base/AnimalInfoPane.tsx b/WNPRC_EHR/src/client/abstract/base/AnimalInfoPane.tsx similarity index 100% rename from WNPRC_EHR/src/abstract/base/AnimalInfoPane.tsx rename to WNPRC_EHR/src/client/abstract/base/AnimalInfoPane.tsx diff --git a/WNPRC_EHR/src/abstract/base/App.tsx b/WNPRC_EHR/src/client/abstract/base/App.tsx similarity index 100% rename from WNPRC_EHR/src/abstract/base/App.tsx rename to WNPRC_EHR/src/client/abstract/base/App.tsx diff --git a/WNPRC_EHR/src/abstract/base/ContextProvider.tsx b/WNPRC_EHR/src/client/abstract/base/ContextProvider.tsx similarity index 100% rename from WNPRC_EHR/src/abstract/base/ContextProvider.tsx rename to WNPRC_EHR/src/client/abstract/base/ContextProvider.tsx diff --git a/WNPRC_EHR/src/abstract/theme/css/index.css b/WNPRC_EHR/src/client/abstract/theme/css/index.css similarity index 100% rename from WNPRC_EHR/src/abstract/theme/css/index.css rename to WNPRC_EHR/src/client/abstract/theme/css/index.css diff --git a/WNPRC_EHR/src/abstract/typings/main.ts b/WNPRC_EHR/src/client/abstract/typings/main.ts similarity index 100% rename from WNPRC_EHR/src/abstract/typings/main.ts rename to WNPRC_EHR/src/client/abstract/typings/main.ts diff --git a/WNPRC_EHR/src/ts/breeding.ts b/WNPRC_EHR/src/client/breeding.ts similarity index 100% rename from WNPRC_EHR/src/ts/breeding.ts rename to WNPRC_EHR/src/client/breeding.ts diff --git a/WNPRC_EHR/src/components/AnimalInfoPane.tsx b/WNPRC_EHR/src/client/components/AnimalInfoPane.tsx similarity index 100% rename from WNPRC_EHR/src/components/AnimalInfoPane.tsx rename to WNPRC_EHR/src/client/components/AnimalInfoPane.tsx diff --git a/WNPRC_EHR/src/components/BatchModal.tsx b/WNPRC_EHR/src/client/components/BatchModal.tsx similarity index 100% rename from WNPRC_EHR/src/components/BatchModal.tsx rename to WNPRC_EHR/src/client/components/BatchModal.tsx diff --git a/WNPRC_EHR/src/components/BulkEditModal.tsx b/WNPRC_EHR/src/client/components/BulkEditModal.tsx similarity index 100% rename from WNPRC_EHR/src/components/BulkEditModal.tsx rename to WNPRC_EHR/src/client/components/BulkEditModal.tsx diff --git a/WNPRC_EHR/src/components/DateInput.tsx b/WNPRC_EHR/src/client/components/DateInput.tsx similarity index 100% rename from WNPRC_EHR/src/components/DateInput.tsx rename to WNPRC_EHR/src/client/components/DateInput.tsx diff --git a/WNPRC_EHR/src/components/DropdownOptions.tsx b/WNPRC_EHR/src/client/components/DropdownOptions.tsx similarity index 100% rename from WNPRC_EHR/src/components/DropdownOptions.tsx rename to WNPRC_EHR/src/client/components/DropdownOptions.tsx diff --git a/WNPRC_EHR/src/components/EHRSpinner.tsx b/WNPRC_EHR/src/client/components/EHRSpinner.tsx similarity index 100% rename from WNPRC_EHR/src/components/EHRSpinner.tsx rename to WNPRC_EHR/src/client/components/EHRSpinner.tsx diff --git a/WNPRC_EHR/src/components/InputLabel.tsx b/WNPRC_EHR/src/client/components/InputLabel.tsx similarity index 100% rename from WNPRC_EHR/src/components/InputLabel.tsx rename to WNPRC_EHR/src/client/components/InputLabel.tsx diff --git a/WNPRC_EHR/src/components/Spinner.tsx b/WNPRC_EHR/src/client/components/Spinner.tsx similarity index 100% rename from WNPRC_EHR/src/components/Spinner.tsx rename to WNPRC_EHR/src/client/components/Spinner.tsx diff --git a/WNPRC_EHR/src/components/SubmitModal.tsx b/WNPRC_EHR/src/client/components/SubmitModal.tsx similarity index 100% rename from WNPRC_EHR/src/components/SubmitModal.tsx rename to WNPRC_EHR/src/client/components/SubmitModal.tsx diff --git a/WNPRC_EHR/src/components/TextInput.tsx b/WNPRC_EHR/src/client/components/TextInput.tsx similarity index 100% rename from WNPRC_EHR/src/components/TextInput.tsx rename to WNPRC_EHR/src/client/components/TextInput.tsx diff --git a/WNPRC_EHR/src/feeding/base/App.tsx b/WNPRC_EHR/src/client/feeding/base/App.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/App.tsx rename to WNPRC_EHR/src/client/feeding/base/App.tsx diff --git a/WNPRC_EHR/src/feeding/base/BulkEditFields.tsx b/WNPRC_EHR/src/client/feeding/base/BulkEditFields.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/BulkEditFields.tsx rename to WNPRC_EHR/src/client/feeding/base/BulkEditFields.tsx diff --git a/WNPRC_EHR/src/feeding/base/ContextProvider.tsx b/WNPRC_EHR/src/client/feeding/base/ContextProvider.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/ContextProvider.tsx rename to WNPRC_EHR/src/client/feeding/base/ContextProvider.tsx diff --git a/WNPRC_EHR/src/feeding/base/ErrorModal.tsx b/WNPRC_EHR/src/client/feeding/base/ErrorModal.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/ErrorModal.tsx rename to WNPRC_EHR/src/client/feeding/base/ErrorModal.tsx diff --git a/WNPRC_EHR/src/feeding/base/FeedingForm.tsx b/WNPRC_EHR/src/client/feeding/base/FeedingForm.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/FeedingForm.tsx rename to WNPRC_EHR/src/client/feeding/base/FeedingForm.tsx diff --git a/WNPRC_EHR/src/feeding/base/FeedingFormContainer.tsx b/WNPRC_EHR/src/client/feeding/base/FeedingFormContainer.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/base/FeedingFormContainer.tsx rename to WNPRC_EHR/src/client/feeding/base/FeedingFormContainer.tsx diff --git a/WNPRC_EHR/src/feeding/query/helpers.tsx b/WNPRC_EHR/src/client/feeding/query/helpers.tsx similarity index 100% rename from WNPRC_EHR/src/feeding/query/helpers.tsx rename to WNPRC_EHR/src/client/feeding/query/helpers.tsx diff --git a/WNPRC_EHR/src/feeding/typings/main.ts b/WNPRC_EHR/src/client/feeding/typings/main.ts similarity index 100% rename from WNPRC_EHR/src/feeding/typings/main.ts rename to WNPRC_EHR/src/client/feeding/typings/main.ts diff --git a/WNPRC_EHR/src/query/helpers.ts b/WNPRC_EHR/src/client/query/helpers.ts similarity index 100% rename from WNPRC_EHR/src/query/helpers.ts rename to WNPRC_EHR/src/client/query/helpers.ts diff --git a/WNPRC_EHR/src/ts/research_ultrasounds.ts b/WNPRC_EHR/src/client/research_ultrasounds.ts similarity index 100% rename from WNPRC_EHR/src/ts/research_ultrasounds.ts rename to WNPRC_EHR/src/client/research_ultrasounds.ts diff --git a/WNPRC_EHR/src/stories/DatePicker.stories.tsx b/WNPRC_EHR/src/client/stories/DatePicker.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/DatePicker.stories.tsx rename to WNPRC_EHR/src/client/stories/DatePicker.stories.tsx diff --git a/WNPRC_EHR/src/stories/DropdownOptions.stories.tsx b/WNPRC_EHR/src/client/stories/DropdownOptions.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/DropdownOptions.stories.tsx rename to WNPRC_EHR/src/client/stories/DropdownOptions.stories.tsx diff --git a/WNPRC_EHR/src/stories/InputLabel.stories.tsx b/WNPRC_EHR/src/client/stories/InputLabel.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/InputLabel.stories.tsx rename to WNPRC_EHR/src/client/stories/InputLabel.stories.tsx diff --git a/WNPRC_EHR/src/stories/Spinner.stories.tsx b/WNPRC_EHR/src/client/stories/Spinner.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/Spinner.stories.tsx rename to WNPRC_EHR/src/client/stories/Spinner.stories.tsx diff --git a/WNPRC_EHR/src/stories/SubmitModal.stories.tsx b/WNPRC_EHR/src/client/stories/SubmitModal.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/SubmitModal.stories.tsx rename to WNPRC_EHR/src/client/stories/SubmitModal.stories.tsx diff --git a/WNPRC_EHR/src/stories/TextInput.stories.tsx b/WNPRC_EHR/src/client/stories/TextInput.stories.tsx similarity index 100% rename from WNPRC_EHR/src/stories/TextInput.stories.tsx rename to WNPRC_EHR/src/client/stories/TextInput.stories.tsx diff --git a/WNPRC_EHR/src/ts/test.tsx b/WNPRC_EHR/src/client/test.tsx similarity index 100% rename from WNPRC_EHR/src/ts/test.tsx rename to WNPRC_EHR/src/client/test.tsx diff --git a/WNPRC_EHR/src/theme/css/index.css b/WNPRC_EHR/src/client/theme/css/index.css similarity index 100% rename from WNPRC_EHR/src/theme/css/index.css rename to WNPRC_EHR/src/client/theme/css/index.css diff --git a/WNPRC_EHR/src/theme/css/react-datepicker.css b/WNPRC_EHR/src/client/theme/css/react-datepicker.css similarity index 100% rename from WNPRC_EHR/src/theme/css/react-datepicker.css rename to WNPRC_EHR/src/client/theme/css/react-datepicker.css diff --git a/WNPRC_EHR/src/theme/css/tooltip.css b/WNPRC_EHR/src/client/theme/css/tooltip.css similarity index 100% rename from WNPRC_EHR/src/theme/css/tooltip.css rename to WNPRC_EHR/src/client/theme/css/tooltip.css diff --git a/WNPRC_EHR/src/typings/main.ts b/WNPRC_EHR/src/client/typings/main.ts similarity index 100% rename from WNPRC_EHR/src/typings/main.ts rename to WNPRC_EHR/src/client/typings/main.ts diff --git a/WNPRC_EHR/src/ts/waterMonitoringSystem.ts b/WNPRC_EHR/src/client/waterMonitoringSystem.ts similarity index 100% rename from WNPRC_EHR/src/ts/waterMonitoringSystem.ts rename to WNPRC_EHR/src/client/waterMonitoringSystem.ts diff --git a/WNPRC_EHR/src/weight/app.tsx b/WNPRC_EHR/src/client/weight/app.tsx similarity index 100% rename from WNPRC_EHR/src/weight/app.tsx rename to WNPRC_EHR/src/client/weight/app.tsx diff --git a/WNPRC_EHR/src/weight/components/AnimalInfoPane.tsx b/WNPRC_EHR/src/client/weight/components/AnimalInfoPane.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/AnimalInfoPane.tsx rename to WNPRC_EHR/src/client/weight/components/AnimalInfoPane.tsx diff --git a/WNPRC_EHR/src/weight/components/BatchModal.tsx b/WNPRC_EHR/src/client/weight/components/BatchModal.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/BatchModal.tsx rename to WNPRC_EHR/src/client/weight/components/BatchModal.tsx diff --git a/WNPRC_EHR/src/weight/components/BulkEditModal.tsx b/WNPRC_EHR/src/client/weight/components/BulkEditModal.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/BulkEditModal.tsx rename to WNPRC_EHR/src/client/weight/components/BulkEditModal.tsx diff --git a/WNPRC_EHR/src/weight/components/CustomAlert.tsx b/WNPRC_EHR/src/client/weight/components/CustomAlert.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/CustomAlert.tsx rename to WNPRC_EHR/src/client/weight/components/CustomAlert.tsx diff --git a/WNPRC_EHR/src/weight/components/DropdownOptions.tsx b/WNPRC_EHR/src/client/weight/components/DropdownOptions.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/DropdownOptions.tsx rename to WNPRC_EHR/src/client/weight/components/DropdownOptions.tsx diff --git a/WNPRC_EHR/src/weight/components/SubmitForReviewModal.tsx b/WNPRC_EHR/src/client/weight/components/SubmitForReviewModal.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/SubmitForReviewModal.tsx rename to WNPRC_EHR/src/client/weight/components/SubmitForReviewModal.tsx diff --git a/WNPRC_EHR/src/weight/components/SubmitModal.tsx b/WNPRC_EHR/src/client/weight/components/SubmitModal.tsx similarity index 100% rename from WNPRC_EHR/src/weight/components/SubmitModal.tsx rename to WNPRC_EHR/src/client/weight/components/SubmitModal.tsx diff --git a/WNPRC_EHR/src/weight/containers/App/ContextProvider.tsx b/WNPRC_EHR/src/client/weight/containers/App/ContextProvider.tsx similarity index 100% rename from WNPRC_EHR/src/weight/containers/App/ContextProvider.tsx rename to WNPRC_EHR/src/client/weight/containers/App/ContextProvider.tsx diff --git a/WNPRC_EHR/src/weight/containers/Forms/BulkEditFields.tsx b/WNPRC_EHR/src/client/weight/containers/Forms/BulkEditFields.tsx similarity index 100% rename from WNPRC_EHR/src/weight/containers/Forms/BulkEditFields.tsx rename to WNPRC_EHR/src/client/weight/containers/Forms/BulkEditFields.tsx diff --git a/WNPRC_EHR/src/weight/containers/Forms/EnterWeightForm.tsx b/WNPRC_EHR/src/client/weight/containers/Forms/EnterWeightForm.tsx similarity index 100% rename from WNPRC_EHR/src/weight/containers/Forms/EnterWeightForm.tsx rename to WNPRC_EHR/src/client/weight/containers/Forms/EnterWeightForm.tsx diff --git a/WNPRC_EHR/src/weight/containers/Forms/EnterWeightFormContainer.tsx b/WNPRC_EHR/src/client/weight/containers/Forms/EnterWeightFormContainer.tsx similarity index 100% rename from WNPRC_EHR/src/weight/containers/Forms/EnterWeightFormContainer.tsx rename to WNPRC_EHR/src/client/weight/containers/Forms/EnterWeightFormContainer.tsx diff --git a/WNPRC_EHR/src/weight/query/actions.ts b/WNPRC_EHR/src/client/weight/query/actions.ts similarity index 100% rename from WNPRC_EHR/src/weight/query/actions.ts rename to WNPRC_EHR/src/client/weight/query/actions.ts diff --git a/WNPRC_EHR/src/weight/query/helpers.ts b/WNPRC_EHR/src/client/weight/query/helpers.ts similarity index 100% rename from WNPRC_EHR/src/weight/query/helpers.ts rename to WNPRC_EHR/src/client/weight/query/helpers.ts diff --git a/WNPRC_EHR/src/weight/typings/globals.d.ts b/WNPRC_EHR/src/client/weight/typings/globals.d.ts similarity index 100% rename from WNPRC_EHR/src/weight/typings/globals.d.ts rename to WNPRC_EHR/src/client/weight/typings/globals.d.ts diff --git a/WNPRC_EHR/src/weight/typings/main.d.ts b/WNPRC_EHR/src/client/weight/typings/main.d.ts similarity index 100% rename from WNPRC_EHR/src/weight/typings/main.d.ts rename to WNPRC_EHR/src/client/weight/typings/main.d.ts diff --git a/WNPRC_EHR/src/weight/typings/main.ts b/WNPRC_EHR/src/client/weight/typings/main.ts similarity index 100% rename from WNPRC_EHR/src/weight/typings/main.ts rename to WNPRC_EHR/src/client/weight/typings/main.ts diff --git a/WNPRC_EHR/tsconfig.json b/WNPRC_EHR/tsconfig.json index 8449aac50..576a5e752 100644 --- a/WNPRC_EHR/tsconfig.json +++ b/WNPRC_EHR/tsconfig.json @@ -12,7 +12,7 @@ "resources" ], "files": [ - "src/ts/test.tsx", - "src/ts/breeding.ts" + "src/client/test.tsx", + "src/client/breeding.ts" ] -} \ No newline at end of file +} diff --git a/WNPRC_EHR/webpack.config.js b/WNPRC_EHR/webpack.config.js index c35155014..841eafeb4 100644 --- a/WNPRC_EHR/webpack.config.js +++ b/WNPRC_EHR/webpack.config.js @@ -4,7 +4,7 @@ let breedingConfig = function wp(env) { return { devtool: 'source-map', - entry: './src/ts/breeding.ts', + entry: './src/client/breeding.ts', externals: { jquery: 'jQuery', urijs: 'URI', @@ -33,7 +33,7 @@ let testConfig = function wp(env) { return { devtool: 'source-map', - entry: './src/ts/test.tsx', + entry: './src/client/test.tsx', externals: { jquery: 'jQuery', urijs: 'URI', @@ -69,7 +69,7 @@ let feedingConfig = function wp(env) { return { mode: process.env.NODE_ENV, devtool: 'source-map', - entry: './src/feeding/base/App.tsx', + entry: './src/client/feeding/base/App.tsx', externals: { jquery: 'jQuery', urijs: 'URI', @@ -102,7 +102,7 @@ var abstractConfig = function wp(env) { return { mode: process.env.NODE_ENV, devtool: 'source-map', - entry: './src/abstract/base/App.tsx', + entry: './src/client/abstract/base/App.tsx', externals: { jquery: 'jQuery', urijs: 'URI', @@ -135,7 +135,7 @@ let researchUltrasoundsConfig = function wp(env) { return { devtool: 'source-map', - entry: './src/ts/research_ultrasounds.ts', + entry: './src/client/research_ultrasounds.ts', externals: { jquery: 'jQuery', urijs: 'URI', @@ -165,7 +165,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', From 06c45265fb5aa5652b3671e2835799da20a95158 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 2 Nov 2022 14:34:22 -0700 Subject: [PATCH 3/6] Add npm build outputs --- primateid/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/primateid/build.gradle b/primateid/build.gradle index aab663c01..080a0fa1b 100644 --- a/primateid/build.gradle +++ b/primateid/build.gradle @@ -10,3 +10,10 @@ 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 { + project.tasks.named("npmRunBuildProd").configure { outputs.dir project.file('resources/scripts/primateid/gen') } + project.tasks.named("npm_run_${project.npmRun.buildProd}").configure { outputs.dir project.file('resources/scripts/primateid/gen') } + project.tasks.named("npmRunBuild").configure { outputs.dir project.file('resources/scripts/primateid/gen') } + project.tasks.named("npm_run_${project.npmRun.buildDev}").configure { outputs.dir project.file('resources/scripts/primateid/gen') } +} From b621dbc9c1cfea9ce8ccef03e1999e51b35548ba Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 2 Nov 2022 14:56:44 -0700 Subject: [PATCH 4/6] Update relative paths in ts imports --- WNPRC_EHR/src/client/query/helpers.ts | 8 ++++---- .../org/labkey/wnprc_ehr/pages/query/pageHelpers.ts | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/WNPRC_EHR/src/client/query/helpers.ts b/WNPRC_EHR/src/client/query/helpers.ts index bb278a935..0aaab488d 100644 --- a/WNPRC_EHR/src/client/query/helpers.ts +++ b/WNPRC_EHR/src/client/query/helpers.ts @@ -1,11 +1,11 @@ -import {TaskValuesType} from "../org/labkey/wnprc_ehr/pages/typings/main"; +import { TaskValuesType } from '../../org/labkey/wnprc_ehr/pages/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; } -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) => { return values.reduce((acc, item) => { diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts b/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts index 14ca23cca..59976524d 100644 --- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts +++ b/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts @@ -1,17 +1,12 @@ -import { - labkeyActionSelectWithPromise, -} from "./actions"; -import {Filter, Utils} from "@labkey/api"; - -import { CommandType } from "@labkey/api/dist/labkey/query/Rows"; +import { CommandType } from '@labkey/api/dist/labkey/query/Rows'; import { Commands, DataRowsPerCommandType, ModifyRowsCommands, TaskValuesType, WaterAmountValuesType -} from "../typings/main"; -import {InsertValuesWithCommand, RowObj} from "../../../../../weight/typings/main"; +} from '../typings/main'; +import { InsertValuesWithCommand, RowObj } from '../../../../../client/weight/typings/main'; export const setupWaterAmountValues = (values: Object, QCStateLabel: string, taskId: string): Array => { let valuesToInsert: Array = []; @@ -93,4 +88,4 @@ export const setupJsonData = (values: DataRowsPerCommandType, QCState: string, t return { commands: commands }; -}; \ No newline at end of file +}; From 286839633d26f51d2abf68c9a951c663771e8bc2 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 2 Nov 2022 15:00:43 -0700 Subject: [PATCH 5/6] Make it more clear that the same configuration is happening --- primateid/build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/primateid/build.gradle b/primateid/build.gradle index 080a0fa1b..aafe0637a 100644 --- a/primateid/build.gradle +++ b/primateid/build.gradle @@ -12,8 +12,11 @@ dependencies { } project.afterEvaluate { - project.tasks.named("npmRunBuildProd").configure { outputs.dir project.file('resources/scripts/primateid/gen') } - project.tasks.named("npm_run_${project.npmRun.buildProd}").configure { outputs.dir project.file('resources/scripts/primateid/gen') } - project.tasks.named("npmRunBuild").configure { outputs.dir project.file('resources/scripts/primateid/gen') } - project.tasks.named("npm_run_${project.npmRun.buildDev}").configure { outputs.dir project.file('resources/scripts/primateid/gen') } + 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') + }) } From 8b5c0fe59256cac473ac81b9e589b9ef7554618e Mon Sep 17 00:00:00 2001 From: Chad Sebranek Date: Fri, 4 Nov 2022 14:47:44 -0500 Subject: [PATCH 6/6] Move TypeScript water monitoring files to appropriate client dir, add back webpack config, remove/fix test files --- WNPRC_EHR/src/client/query/helpers.ts | 2 +- .../src/client/stories/DatePicker.stories.tsx | 2 +- WNPRC_EHR/src/client/test.tsx | 14 -- .../watermonitoring}/query/pageHelpers.ts | 2 +- .../watermonitoring}/typings/main.ts | 0 .../waterMonitoringSystem.ts | 4 +- .../labkey/wnprc_ehr/pages/query/actions.ts | 122 ------------------ WNPRC_EHR/tsconfig.json | 4 - WNPRC_EHR/webpack.config.js | 71 +++++----- 9 files changed, 41 insertions(+), 180 deletions(-) delete mode 100644 WNPRC_EHR/src/client/test.tsx rename WNPRC_EHR/src/{org/labkey/wnprc_ehr/pages => client/watermonitoring}/query/pageHelpers.ts (96%) rename WNPRC_EHR/src/{org/labkey/wnprc_ehr/pages => client/watermonitoring}/typings/main.ts (100%) rename WNPRC_EHR/src/client/{ => watermonitoring}/waterMonitoringSystem.ts (94%) delete mode 100644 WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts diff --git a/WNPRC_EHR/src/client/query/helpers.ts b/WNPRC_EHR/src/client/query/helpers.ts index 0aaab488d..e8a3cd2e2 100644 --- a/WNPRC_EHR/src/client/query/helpers.ts +++ b/WNPRC_EHR/src/client/query/helpers.ts @@ -1,4 +1,4 @@ -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'; diff --git a/WNPRC_EHR/src/client/stories/DatePicker.stories.tsx b/WNPRC_EHR/src/client/stories/DatePicker.stories.tsx index 858fbcf0d..894e69dc0 100644 --- a/WNPRC_EHR/src/client/stories/DatePicker.stories.tsx +++ b/WNPRC_EHR/src/client/stories/DatePicker.stories.tsx @@ -43,7 +43,7 @@ export const ToStorybook = () => { id="date-id" onFocus={()=> {console.log("Focused!")}} onChange={handleDateChange} - customInput={} + customInput={} /> ) }; diff --git a/WNPRC_EHR/src/client/test.tsx b/WNPRC_EHR/src/client/test.tsx deleted file mode 100644 index 5410e3422..000000000 --- a/WNPRC_EHR/src/client/test.tsx +++ /dev/null @@ -1,14 +0,0 @@ -// React -import * as React from 'react'; -import * as ReactDom from 'react-dom'; -import * as $ from 'jquery'; - - -$(() => { - ReactDom.render( -
-

Test!

-
, - document.getElementById('app') - ); -}); diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts b/WNPRC_EHR/src/client/watermonitoring/query/pageHelpers.ts similarity index 96% rename from WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts rename to WNPRC_EHR/src/client/watermonitoring/query/pageHelpers.ts index 59976524d..5c7c370b1 100644 --- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/pageHelpers.ts +++ b/WNPRC_EHR/src/client/watermonitoring/query/pageHelpers.ts @@ -6,7 +6,7 @@ import { TaskValuesType, WaterAmountValuesType } from '../typings/main'; -import { InsertValuesWithCommand, RowObj } from '../../../../../client/weight/typings/main'; +import { InsertValuesWithCommand, RowObj } from '../../weight/typings/main'; export const setupWaterAmountValues = (values: Object, QCStateLabel: string, taskId: string): Array => { let valuesToInsert: Array = []; diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/typings/main.ts b/WNPRC_EHR/src/client/watermonitoring/typings/main.ts similarity index 100% rename from WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/typings/main.ts rename to WNPRC_EHR/src/client/watermonitoring/typings/main.ts diff --git a/WNPRC_EHR/src/client/waterMonitoringSystem.ts b/WNPRC_EHR/src/client/watermonitoring/waterMonitoringSystem.ts similarity index 94% rename from WNPRC_EHR/src/client/waterMonitoringSystem.ts rename to WNPRC_EHR/src/client/watermonitoring/waterMonitoringSystem.ts index be95ac19c..58ba582c0 100644 --- a/WNPRC_EHR/src/client/waterMonitoringSystem.ts +++ b/WNPRC_EHR/src/client/watermonitoring/waterMonitoringSystem.ts @@ -1,4 +1,4 @@ -import {setupTaskValues, setupWaterAmountValues} from "../org/labkey/wnprc_ehr/pages/query/pageHelpers"; +import {setupTaskValues, setupWaterAmountValues} from "./query/pageHelpers"; declare const Ext4: any; declare const LABKEY: any; @@ -7,7 +7,7 @@ import * as $ from 'jquery'; import * as URI from 'urijs'; import {groupCommands, saveRowsDirect,setupJsonData,insertTaskCommand} from "../query/helpers"; -import {RowObj, ContextProviderProps, WaterAmountValuesType,TaskValuesType} from "../../src/org/labkey/wnprc_ehr/pages/typings/main"; +import {RowObj, ContextProviderProps, WaterAmountValuesType,TaskValuesType} from "./typings/main"; import { ConfigProps } from "../typings/main"; import {ActionURL, Utils, Security, Filter} from "@labkey/api"; import { Command, CommandType } from "@labkey/api/dist/labkey/query/Rows"; diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts b/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts deleted file mode 100644 index ad23c25a2..000000000 --- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/query/actions.ts +++ /dev/null @@ -1,122 +0,0 @@ -//Returns most recent demographics given animal id -import { ConfigProps } from "../typings/main"; -import {Query, ActionURL} from "@labkey/api"; - - -interface jsonDataType { - commands: object; -} - -//Expects json row data with commands property, see API docs for saveRows -export function saveWeightActionSaveRowsDirect(jsonData: jsonDataType) { - return new Promise((resolve, reject) => { - - - /* Query.saveRows({ - commands: jsonData.commands, - method: "POST", - containerPath: ActionURL.getContainer(), - success: data => { - console.log("success"); - resolve(data); - }, - failure: data => { - console.log("error"); - console.log(data); - reject(data); - } - });*/ - }); -} - -export interface qcMapType { - label: {}; - rowid: {}; -} - -export function buildQCMap(data: any): qcMapType { - let qcmap: qcMapType = { - label: {}, - rowid: {} - }; - - let row; - if (data.rows && data.rows.length) { - for (let i = 0; i < data.rows.length; i++) { - row = data.rows[i]; - qcmap.label[row.Label] = row; - qcmap.rowid[row.RowId] = row; - } - } - return qcmap; -} - -export function getQCStateByRowId(qcmap: qcMapType, rowid: number): string { - if (!qcmap) { - return null; - } - - if (!qcmap.rowid[rowid]) { - console.log( - "ERROR: QC State associated with the rowId " + rowid + " not found" - ); - return null; - } - return qcmap.rowid[rowid].Label; -} - -export function getQCStateByLabel(qcmap: qcMapType, label: string): number { - if (!qcmap) { - return null; - } - - if (!qcmap.label[label]) { - console.log( - "ERROR: QC State associated with the rowId " + label + " not found" - ); - return null; - } - return qcmap.label[label].RowId; -} - -export function getQCStateMap(): Promise { - return new Promise((resolve, reject) => { - Query.selectRows({ - containerPath: ActionURL.getContainer(), - schemaName: "core", - queryName: "qcState", - columns: "*", - scope: this, - success: function(data) { - resolve(buildQCMap(data)); - }, - failure: function(data) { - reject(data); - } - }); - }); -} - -export function labkeyActionSelectWithPromise( - config: ConfigProps -): Promise { - return new Promise((resolve, reject) => { - Query.selectRows({ - schemaName: config.schemaName, - queryName: config.queryName, - columns: config.columns, - sort: config.sort, - containerPath: config.containerPath || ActionURL.getContainer(), - filterArray: config.filterArray, - success: function(data) { - if (data && data.exception) { - reject(data); - } - resolve(data); - }, - failure: function(data) { - reject(data); - } - }); - }); -} diff --git a/WNPRC_EHR/tsconfig.json b/WNPRC_EHR/tsconfig.json index 576a5e752..1c5b5f0bf 100644 --- a/WNPRC_EHR/tsconfig.json +++ b/WNPRC_EHR/tsconfig.json @@ -10,9 +10,5 @@ }, "exclude": [ "resources" - ], - "files": [ - "src/client/test.tsx", - "src/client/breeding.ts" ] } diff --git a/WNPRC_EHR/webpack.config.js b/WNPRC_EHR/webpack.config.js index 841eafeb4..2c5ee6cbf 100644 --- a/WNPRC_EHR/webpack.config.js +++ b/WNPRC_EHR/webpack.config.js @@ -29,40 +29,6 @@ let breedingConfig = function wp(env) { }; }; -let testConfig = function wp(env) { - - return { - devtool: 'source-map', - entry: './src/client/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) { @@ -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 ];