[Pwa] Adjust layout and margins. Fix initial data load trigger.

BIDMCDigitalPsychiatry · Nov 20, 2024 · f4fc94f · f4fc94f
1 parent e1f4da7
commit f4fc94f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/components/pwa/Pwa.tsx b/src/components/pwa/Pwa.tsx
@@ -219,7 +219,7 @@ export default function Pwa() {
           <Grid item xs={12} sx={{ textAlign: 'center', fontSize: 32, color: 'primary.dark' }}>
             {label}
           </Grid>
-          <Grid item xs={12}>
+          <Grid item xs={12} sx={{ mt: 0.5 }}>
             <Field onChange={onChange(index)} onNext={handleNext} options={options} value={value} />
           </Grid>
         </Grid>

diff --git a/src/components/pwa/PwaApps.tsx b/src/components/pwa/PwaApps.tsx
@@ -12,9 +12,7 @@ export default function PwaApps() {
   const { tablefooterheight } = layout;
   //const tableHeight = height - headerHeight + tablefooterheight + 2 - 40;
   const tableHeight = height - appBarHeight + tablefooterheight - headerHeight + 32;
-  const { filtered } = useAppTableData(); // Trigger data query
-
-  console.log({ headerHeight, appBarHeight, tablefooterheight, tableHeight });
+  const { filtered } = useAppTableData({ trigger: false }); // Don't re-trigger here as it causes a refresh
 
   return <Tables.PwaApplicationsGrid data={filtered} height={tableHeight} />;
 }
diff --git a/src/components/pwa/PwaLayout.tsx b/src/components/pwa/PwaLayout.tsx
@@ -4,6 +4,7 @@ import createStyles from '@mui/styles/createStyles';
 import { useAppBarHeight, useFooterHeight } from '../layout/hooks';
 import ScrollElementProvider from '../layout/ScrollElementProvider';
 import useHeight from '../layout/ViewPort/hooks/useHeight';
+import useAppTableData from '../pages/useAppTableData';
 
 const useStyles = makeStyles(({ breakpoints, palette }: any) =>
   createStyles({
@@ -35,11 +36,12 @@ export function PwaLayout({ children }) {
   const [appBarHeight] = useAppBarHeight();
   const [footerHeight] = useFooterHeight();
   const componentsOnPage = [appBarHeight, footerHeight];
-  const minHeight = height - appBarHeight - footerHeight - 1;
   var contentHeight = height - componentsOnPage.reduce((t, c) => t + c, 0);
 
   var [scrollElement, setScrollElement] = React.useState(null);
 
+  useAppTableData({ trigger: true });
+
   const classes = useStyles({
     leftDrawerOpen: false,
     fullHeight: true,