NPM package updates and docker build script update (#750)

* Apply npm updates without Virology updates * update WNPRC_Virology npm packages with new lock file
LabKey · Feb 17, 2025 · c7d8718 · c7d8718
1 parent 420c1a8
commit c7d8718
Show file tree

Hide file tree

Showing 23 changed files with 9,635 additions and 22,011 deletions.
diff --git a/WNPRC_EHR/package-lock.json b/WNPRC_EHR/package-lock.json
diff --git a/WNPRC_EHR/package.json b/WNPRC_EHR/package.json
@@ -19,16 +19,17 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@labkey/api": "1.27.0",
+    "@labkey/api": "1.35.6",
+    "@labkey/components": "5.20.4",
     "dayjs": "^1.11.8",
     "jquery": "^3.6.4",
-    "react": "~16.14.0",
+    "react": "18.3.1",
     "react-bootstrap": "~1.6.7",
     "react-bootstrap-typeahead": "6.2.3",
     "react-data-grid": "7.0.0-beta.40",
     "react-data-grid-addons": "7.0.0-alpha.24",
     "react-datepicker": "4.21.0",
-    "react-dom": "~16.14.0",
+    "react-dom": "18.3.1",
     "react-select": "5.8.0",
     "react-tabs": "~4.3.0",
     "rsvp": "4.8.5",
@@ -37,13 +38,12 @@
     "urijs": "^1.19.11"
   },
   "devDependencies": {
-    "@labkey/components": "2.390.4",
-    "@labkey/build": "7.5.0",
+    "@labkey/build": "8.2.0",
     "@babel/core": "7.23.2",
-    "@types/react": "~16.14.23",
+    "@types/react": "18.3.1",
     "@types/react-bootstrap": "~0.32.32",
     "@types/react-data-grid": "4.0.10",
-    "@types/react-dom": "~16.9.14",
+    "@types/react-dom": "18.3.1",
     "better-npm-run": "0.1.1",
     "css-loader": "^6.8.1",
     "style-loader": "^3.3.3",

diff --git a/WNPRC_EHR/src/client/abstract/base/app.tsx b/WNPRC_EHR/src/client/abstract/base/app.tsx
@@ -1,16 +1,16 @@
 import * as React from "react";
-import * as ReactDom from "react-dom";
 import { ContextProvider } from "./ContextProvider";
 import AbstractContainer from "./AbstractContainer";
-import * as jQuery from 'jquery';
 import { App } from '@labkey/api';
+import { createRoot } from 'react-dom/client';
 
 //export this function to be called in a requiresScript callback
 App.registerApp<any>('Abstract', (id, rand) => {
-    ReactDom.render(
+    const container = document.getElementById("abstract-section" + id + rand);
+    const root = createRoot(container);
+    root.render(
         <ContextProvider>
             <AbstractContainer id={id} />
-        </ContextProvider>,
-        document.getElementById("abstract-section" + id + rand)
+        </ContextProvider>
     );
 });
diff --git a/WNPRC_EHR/src/client/breeding/app.tsx b/WNPRC_EHR/src/client/breeding/app.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as ReactDom from 'react-dom';
 
 // Main react component
 import  {GridPanelConfig}  from '../components/GridPanelConfig';
@@ -8,12 +7,14 @@ import {gridConfig} from './configProps';
 
 // Import stylesheets
 import '../wnprc_ehr.scss';
+import { createRoot } from 'react-dom/client';
 // Need to wait for container element to be available in labkey wrapper before render
 window.addEventListener('DOMContentLoaded', (event) => {
-    ReactDom.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <GridPanelConfig
             {...gridConfig}
-        />,
-        document.getElementById('app')
+        />
     );
 });
diff --git a/WNPRC_EHR/src/client/breeding/dev.tsx b/WNPRC_EHR/src/client/breeding/dev.tsx
@@ -1,21 +1,22 @@
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 // Main react component
 import  {GridPanelConfig}  from '../components/GridPanelConfig';
 // Grid Panel Props
 import { gridConfig } from './configProps';
 // Import stylesheets
 import '../wnprc_ehr.scss';
+import { createRoot } from 'react-dom/client';
 
 
 const render = (): void => {
-    ReactDOM.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <GridPanelConfig
             {...gridConfig}
-        />,
-        document.getElementById('app')
-    )
+        />
+    );
 };
 
 render();
diff --git a/WNPRC_EHR/src/client/components/GridPanelConfig.tsx b/WNPRC_EHR/src/client/components/GridPanelConfig.tsx
@@ -4,7 +4,8 @@ import {
     SchemaQuery,
     ServerContextProvider,
     withAppUser,
-    AppContextProvider
+    AppContextProvider,
+    NotificationsContextProvider
 } from '@labkey/components';
 import { DefaultGridPanel } from "./DefaultGridPanel";
 import { configProps } from './grid_panel/configProps';
@@ -86,14 +87,16 @@ export const GridPanelConfig: FC<configProps> = ({
     return (
         <ServerContextProvider initialContext={serverContext}>
             <AppContextProvider>
-                <DefaultGridPanel
-                    queryConfigs={queryConfigs}
-                    input={input}
-                    autoLoad
-                    cellStyles={cellStyles}
-                    title={title}
-                    columnStyles={columnStyles}
-                />
+                <NotificationsContextProvider>
+                    <DefaultGridPanel
+                        queryConfigs={queryConfigs}
+                        input={input}
+                        autoLoad
+                        cellStyles={cellStyles}
+                        title={title}
+                        columnStyles={columnStyles}
+                    />
+                </NotificationsContextProvider>
             </AppContextProvider>
         </ServerContextProvider>
     );

diff --git a/WNPRC_EHR/src/client/feeding/base/app.tsx b/WNPRC_EHR/src/client/feeding/base/app.tsx
@@ -1,13 +1,14 @@
 import * as React from "react";
 import { ContextProvider } from "./ContextProvider";
 import FeedingFormContainer from "./FeedingFormContainer";
-import * as ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 
 window.addEventListener('DOMContentLoaded', (event) => {
-    ReactDOM.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <ContextProvider>
             <FeedingFormContainer />
-        </ContextProvider>,
-        document.getElementById('app')
+        </ContextProvider>
     )
 });
diff --git a/WNPRC_EHR/src/client/feeding/base/dev.tsx b/WNPRC_EHR/src/client/feeding/base/dev.tsx
@@ -1,15 +1,16 @@
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 import { ContextProvider } from "./ContextProvider";
 import FeedingFormContainer from "./FeedingFormContainer";
+import { createRoot } from 'react-dom/client';
 
 const render = (): void => {
-    ReactDOM.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <ContextProvider>
             <FeedingFormContainer />
-        </ContextProvider>,
-        document.getElementById('app')
+        </ContextProvider>
     )
 };
 

diff --git a/WNPRC_EHR/src/client/researchUltrasounds/app.tsx b/WNPRC_EHR/src/client/researchUltrasounds/app.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as ReactDom from 'react-dom';
 
 // Main react component
 import  {GridPanelConfig}  from '../components/GridPanelConfig';
@@ -8,12 +7,14 @@ import {gridConfig} from './configProps';
 
 // Import stylesheets
 import '../wnprc_ehr.scss';
+import { createRoot } from 'react-dom/client';
 // Need to wait for container element to be available in labkey wrapper before render
 window.addEventListener('DOMContentLoaded', (event) => {
-    ReactDom.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <GridPanelConfig
             {...gridConfig}
-        />,
-        document.getElementById('app')
+        />
     );
 });
diff --git a/WNPRC_EHR/src/client/researchUltrasounds/dev.tsx b/WNPRC_EHR/src/client/researchUltrasounds/dev.tsx
@@ -1,19 +1,22 @@
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 // Main react component
 import  {GridPanelConfig}  from '../components/GridPanelConfig';
 // Grid Panel Props
 import { gridConfig } from './configProps';
 // Import stylesheets
 import '../wnprc_ehr.scss';
+import { createRoot } from 'react-dom/client';
 
 
 const render = (): void => {
-    ReactDOM.render(
-        <GridPanelConfig {...gridConfig} />,
-        document.getElementById('app')
-    )
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
+        <GridPanelConfig
+            {...gridConfig}
+        />
+    );
 };
 
 render();
diff --git a/WNPRC_EHR/src/client/weight/app.tsx b/WNPRC_EHR/src/client/weight/app.tsx
@@ -1,17 +1,18 @@
 // React
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 // Components
 import EnterWeightFormContainer from "./containers/Forms/EnterWeightFormContainer";
 import {ContextProvider} from "./containers/App/ContextProvider";
+import { createRoot } from 'react-dom/client';
 
 
 window.addEventListener('DOMContentLoaded', (event) => {
-    ReactDOM.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <ContextProvider>
             <EnterWeightFormContainer />
         </ContextProvider>,
-        document.getElementById('app')
     )
 });
diff --git a/WNPRC_EHR/src/client/weight/dev.tsx b/WNPRC_EHR/src/client/weight/dev.tsx
@@ -1,17 +1,18 @@
 // React
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 
 // Components
 import EnterWeightFormContainer from "./containers/Forms/EnterWeightFormContainer";
 import {ContextProvider} from "./containers/App/ContextProvider";
+import { createRoot } from 'react-dom/client';
 
 const render = (): void => {
-    ReactDOM.render(
+    const container = document.getElementById('app');
+    const root = createRoot(container);
+    root.render(
         <ContextProvider>
             <EnterWeightFormContainer />
         </ContextProvider>,
-        document.getElementById('app')
     )
 };
 

diff --git a/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java b/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
@@ -3461,11 +3461,17 @@ public void checkUpdateProgramIncomeAccount() throws UnhandledAlertException
     @Test
     public void testReactGridPanel() throws UnhandledAlertException {
         log("Starting testReactGridPanel.");
-        log("Testing grid panel renders for full webpage");
-        beginAt(buildURL("wnprc_ehr", getContainerPath(), "research_ultrasounds"));
+        log("Testing grid panel renders for breeding");
+        beginAt(buildURL("wnprc_ehr", getContainerPath(), "breeding"));
         WebElement reactComp = getDriver().findElement(By.cssSelector(".grid-panel"));
         Assert.assertTrue(reactComp.isDisplayed());
 
+        log("Testing grid panel renders for research ultrasounds");
+        beginAt(buildURL("wnprc_ehr", getContainerPath(), "research_ultrasounds"));
+        reactComp = getDriver().findElement(By.cssSelector(".grid-panel"));
+        Assert.assertTrue(reactComp.isDisplayed());
+
+
         log("Testing grid panel renders for web parts");
         goToEHRFolder();
         waitAndClickAndWait(Locator.linkWithText("Animal History"));