Merge pull request #170 from bimberlabinternal/24.7_fb_u24

Update MCC npm versions

Author: bbimber

mcc/jest.config.js

@@ -19,7 +19,7 @@ module.exports = {
         '^.+\\.tsx?$': [
             'ts-jest',
             {
-                tsconfig: 'node_modules/@labkey/build/webpack/tsconfig.json',
+                isolatedModules: true
             }
         ],
     },

mcc/package-lock.json

@@ -13,21 +13,20 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@labkey/api": "^1.24.0",
+    "@labkey/api": "^1.34.1",
     "@mui/material": "^5.0.0",
     "@mui/styles": "^5.14.7",
     "@mui/x-data-grid": "^6.0.0",
-    "chart.js": "^4.4.0",
+    "chart.js": "^4.4.3",
     "react": "^17.0.2",
     "react-chartjs-2": "^5.2.0",
     "react-dom": "^17.0.2",
-    "react-hot-loader": "^4.13.0",
     "react-tooltip": "^5.21.1",
     "tsv": "^0.2.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@labkey/build": "^6.16.0",
+    "@labkey/build": "^7.3.0",
     "@types/chart.js": "^2.9.37",
     "@types/jest": "^29.0.0",
     "@types/jexl": "^2.3.1",
@@ -44,7 +43,7 @@
     "jest-cli": "^29.0.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-mock": "^29.0.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.0.1",
     "ts-jest": "^29.0.0"
   }
 }

mcc/package.json

@@ -4,6 +4,7 @@
         <column name="u24_status"/>
         <column name="Id"/>
         <column name="gender"/>
+        <column name="Id/age/yearAndDays"/>
         <column name="Id/ageClass/label">
             <properties>
                 <property name="columnTitle" value="Age Class"/>

mcc/resources/queries/study/demographics/.qview.xml

@@ -1,22 +1,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
 
 import { Dashboard } from './Dashboard';
 
 const render = () => {
-    ReactDOM.render(
-        <AppContainer>
-            <Dashboard />
-        </AppContainer>,
-        document.getElementById('app')
-    )
+    ReactDOM.render(<Dashboard />, document.getElementById('app'));
 };
 
-declare const module: any;
-
-if (module.hot) {
-    module.hot.accept();
-}
-
 render();

mcc/src/client/Dashboard/dev.tsx

@@ -1,17 +1,11 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
 import { App } from '@labkey/api';
 
-import { Dashboard } from "../Dashboard";
+import { Dashboard } from '../Dashboard';
 
-App.registerApp<any>('dashboardWebpart', (target: string) => {
-    ReactDOM.render(
-        <AppContainer>
-            <Dashboard />
-        </AppContainer>,
-        document.getElementById(target)
-    );
-}, true /* hot */);
+const render = (target: string) => {
+    ReactDOM.render(<Dashboard />, document.getElementById(target));
+};
 
-declare const module: any;
+App.registerApp<any>('dashboardWebpart', render, true /* hot */);

mcc/src/client/Dashboard/webpart/dev.tsx

@@ -1,22 +1,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
 
 import { GeneticsPlot } from './GeneticsPlot';
 
 const render = () => {
-    ReactDOM.render(
-        <AppContainer>
-            <GeneticsPlot />
-        </AppContainer>,
-        document.getElementById('app')
-    )
+    ReactDOM.render(<GeneticsPlot />, document.getElementById('app'));
 };
 
-declare const module: any;
-
-if (module.hot) {
-    module.hot.accept();
-}
-
 render();

mcc/src/client/GeneticsPlot/dev.tsx

@@ -1,17 +1,11 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppContainer } from 'react-hot-loader';
 import { App } from '@labkey/api';
 
 import { GeneticsPlot } from '../GeneticsPlot';
 
-App.registerApp<any>('mccPcaWebpart', (target: string) => {
-    ReactDOM.render(
-        <AppContainer>
-            <GeneticsPlot />
-        </AppContainer>,
-        document.getElementById(target)
-    );
-}, true /* hot */);
+const render = (target: string) => {
+    ReactDOM.render(<GeneticsPlot />, document.getElementById(target));
+};
 
-declare const module: any;
+App.registerApp<any>('mccPcaWebpart', render, true /* hot */);