Merge discvr-24.3 to discvr-24.7

Author: bbimber

mcc/src/client/Dashboard/Dashboard.tsx

@@ -1,11 +1,11 @@
-import './dashboard.css';
+import '../components/dashboard/dashboard.css';
 
 import React, { useState, useEffect } from 'react';
 import { Query } from '@labkey/api';
 import { getServerContext } from "@labkey/api";
 
-import PieChart from './PieChart';
-import BarChart from './BarChart';
+import PieChart from '../components/dashboard/PieChart';
+import BarChart from '../components/dashboard/BarChart';
 
 export function Dashboard() {
     const [demographics, setDemographics] = useState(null);

mcc/src/client/GeneticsPlot/GeneticsPlot.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { ActionURL, Filter, getServerContext, Query } from '@labkey/api';
-import './../Dashboard/dashboard.css';
+import '../components/dashboard/dashboard.css';
 import ScatterChart from './ScatterChart';
 import { Box, Tab, Tabs } from '@mui/material';
 import KinshipTable from './KinshipTable';