Skip to content

Commit

Permalink
frontend Detail Drawer: Add detail drawer mode
Browse files Browse the repository at this point in the history
DONE: Added drawer static on refresh ability
WIP: Reload component on name change working
WIP: Pods drawer open close button working
WIP: links no longer route to different drawer path

Signed-off-by: Vincent T <[email protected]>
  • Loading branch information
vyncent-t committed Mar 27, 2024
1 parent 18ce278 commit 50e01f2
Show file tree
Hide file tree
Showing 24 changed files with 768 additions and 191 deletions.
10 changes: 10 additions & 0 deletions frontend/src/components/App/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { styled } from '@mui/material/styles';
import { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { useParams } from 'react-router-dom';
import { useClustersConf } from '../../lib/k8s';
import { request } from '../../lib/k8s/apiProxy';
import { Cluster } from '../../lib/k8s/cluster';
Expand All @@ -18,6 +19,7 @@ import store from '../../redux/stores/store';
import { fetchStatelessClusterKubeConfigs, processClusterComparison } from '../../stateless/';
import ActionsNotifier from '../common/ActionsNotifier';
import AlertNotification from '../common/AlertNotification';
import DetailsDrawer from '../DetailsDrawer/DetailsDrawer';
import Sidebar, { NavigationTabs } from '../Sidebar';
import RouteSwitcher from './RouteSwitcher';
import TopBar from './TopBar';
Expand Down Expand Up @@ -70,6 +72,13 @@ export default function Layout({}: LayoutProps) {
* indexDB and then sends the backend to parse it and then updates the parsed value into redux
* store on an interval.
* */
// DETAIL DRAWER MODE
const isDetailDrawerEnabled = useTypedSelector(state => state.drawerMode.isDetailDrawerEnabled);
console.log('LAY - isDetailDrawerEnabled', isDetailDrawerEnabled);

const params = useParams();
console.log('LAY - params: ', params);

useEffect(() => {
window.clusterConfigFetchHandler = setInterval(
() => {
Expand Down Expand Up @@ -181,6 +190,7 @@ export default function Layout({}: LayoutProps) {
</Container>
</Box>
</Main>
{isDetailDrawerEnabled && <DetailsDrawer />}
<ActionsNotifier />
</Box>
</>
Expand Down
59 changes: 59 additions & 0 deletions frontend/src/components/App/Settings/DrawerModeButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { FormControlLabel, Switch } from '@mui/material';
import React from 'react';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { setDetailDrawerEnabled } from '../../../redux/drawerModeSlice';
import { useTypedSelector } from '../../../redux/reducers/reducers';

export default function DrawerModeButton() {
const dispatch = useDispatch();
const { t } = useTranslation('translation');
// This will fix the problem of the project refreshing the state away from needed position

// DETAIL DRAWER MODE
const isDetailDrawerEnabled = useTypedSelector(state => state.drawerMode.isDetailDrawerEnabled);
// const localDetailDrawerEnabled = localStorage.getItem('detailDrawerEnabled');
const [isDrawerEnabled, changeDetailDrawerEnabled] = useState<any>(isDetailDrawerEnabled);

if (isDetailDrawerEnabled) {
console.log('THE LOCAL STORAGE IS TRUE');
dispatch(setDetailDrawerEnabled(true));
console.log('READING FROM DISPATCHED STATE', isDetailDrawerEnabled);
} else {
console.log(" THE LOCAL STORAGE IS NULL, UNDEFINED, OR 'FALSE' ");
dispatch(setDetailDrawerEnabled(false));
console.log('READING FROM DISPATCHED STATE', isDetailDrawerEnabled);
}

console.log('BUTTON - isDetailDrawerEnabled', isDetailDrawerEnabled);

// the useEffect will run everytime the isDrawerEnabled state changes, which is everytime the user clicks the switch button because the switch button changes the state of isDrawerEnabled
useEffect(() => {
dispatch(setDetailDrawerEnabled(isDrawerEnabled));
console.log('ON SETTINGS');
console.log(localStorage.getItem('detailDrawerEnabled'));
}, [isDrawerEnabled]);

// this function takes in the current changes and updates it, this kicks off the useEffect that is listening for changes to newDrawerEnabled
function drawerModeToggle() {
console.log('drawerModeToggle');
changeDetailDrawerEnabled(!isDrawerEnabled);
}

// NOTICE THAT WE DO NOT USE isDrawerEnabled TO DETERMINE HOW THE SWITCH IS RENDERED UNDER THE CHECKED PROP, THIS IS BECAUSE THE USEEFFECT WILL RERENDER THE COMPONENT WITH THE NEW STATE
return (
<FormControlLabel
control={
<Switch
checked={isDetailDrawerEnabled}
onClick={drawerModeToggle}
name="drawerMode"
color="primary"
/>
}
// will need to replace label
label={t('translation|Drawer Mode')}
/>
);
}
5 changes: 5 additions & 0 deletions frontend/src/components/App/Settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { setAppSettings } from '../../../redux/configSlice';
import { defaultTableRowsPerPageOptions } from '../../../redux/configSlice';
import { ActionButton, NameValueTable, SectionBox } from '../../common';
import TimezoneSelect from '../../common/TimezoneSelect';
import DrawerModeButton from './DrawerModeButton';
import { useSettings } from './hook';
import NumRowsInput from './NumRowsInput';
import ThemeChangeButton from './ThemeChangeButton';
Expand Down Expand Up @@ -69,6 +70,10 @@ export default function Settings() {
name: t('translation|Theme'),
value: <ThemeChangeButton showBothIcons />,
},
{
name: t('translation|Details on list view'),
value: <DrawerModeButton />,
},
{
name: t('translation|Number of rows for tables'),
value: (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,52 @@ exports[`Storyshots Settings General 1`] = `
</button>
</div>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 makeStyles-metadataNameCell css-1r6indk-MuiGrid-root"
>
Drawer Mode
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 makeStyles-metadataCell makeStyles-valueCol css-r0umuq-MuiGrid-root"
>
<label
class="MuiFormControlLabel-root"
>
<span
class="MuiSwitch-root"
>
<span
aria-disabled="false"
class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1 MuiSwitch-switchBase MuiSwitch-colorPrimary"
>
<span
class="MuiIconButton-label"
>
<input
class="PrivateSwitchBase-input-4 MuiSwitch-input"
name="drawerMode"
type="checkbox"
value=""
/>
<span
class="MuiSwitch-thumb"
/>
</span>
<span
class="MuiTouchRipple-root"
/>
</span>
<span
class="MuiSwitch-track"
/>
</span>
<span
class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
>
Drawer Mode
</span>
</label>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 makeStyles-metadataNameCell css-1r6indk-MuiGrid-root"
>
Expand Down
155 changes: 155 additions & 0 deletions frontend/src/components/DetailsDrawer/DetailsDrawer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
import { Box, Button, Drawer, useMediaQuery } from '@mui/material';
import React, { useEffect } from 'react';
import { useDispatch } from 'react-redux';
import { useParams } from 'react-router-dom';
import CronJob from '../../lib/k8s/cronJob';
import Deployment from '../../lib/k8s/deployment';
import Job from '../../lib/k8s/job';
import ReplicaSet from '../../lib/k8s/replicaSet';
import StatefulSet from '../../lib/k8s/statefulSet';
import { setDetailDrawerOpen } from '../../redux/drawerModeSlice';
import { useTypedSelector } from '../../redux/reducers/reducers';
import DaemonSetDetails from '../daemonset/Details';
import PodDetails from '../pod/Details';
import WorkloadDetails from '../workload/Details';

export default function DetailsDrawer() {
const drawerOpen = useTypedSelector(state => state.drawerMode.isDetailDrawerOpen);
const dispatch = useDispatch();

const params = useParams();

console.log('EXAMPLE params: ', params);

const mediaQuerySize = useMediaQuery('(min-width: 1200px)');

// EXPERIMENTAL -------------
//
// const drawerNamespace = useTypedSelector(state => state.drawerMode.currentDrawerNamespace);
// const drawerName = useTypedSelector(state => state.drawerMode.currentDrawerName);
// const drawerResource = useTypedSelector(state => state.drawerMode.currentDrawerResource);
// const drawerCluster = useTypedSelector(state => state.drawerMode.currentDrawerCluster);

// --------------------------

// const detailView = {
// pods: <PodDetails />,
// };

const drawerName = useTypedSelector(state => state.drawerMode.currentDrawerName);

// const localDrawerName = localStorage.getItem('currentDrawerName') as string;
const drawerNamespace = localStorage.getItem('currentDrawerNamespace') as string;
const drawerResource = localStorage.getItem('currentDrawerResource') as string;

console.log('drawerNamespace: ', drawerNamespace);
console.log('drawerName: ', drawerName);
console.log('drawerResource: ', drawerResource);

function closeDrawer() {
dispatch(setDetailDrawerOpen(false));
}

// This is used to reload the drawer, currently the most viable solution
const [currentName, setCurrentName] = React.useState('');

useEffect(() => {
// refresh?
console.log('refresh');
console.log('CLOSING DRAWER');
console.log('DRAWER OPEN', drawerOpen);
console.log('IS DRAWER OPEN', drawerOpen);
console.log('drawerNamespace: ', drawerNamespace);
console.log('drawerName: ', drawerName);
console.log('drawerResource: ', drawerResource);
setCurrentName(drawerName);
}, [drawerName]);

console.log('drawer params: ', params);

function drawerResourceSelector(resource: string) {
const detailView = {
pods: <PodDetails />,
// deployments is missing a details component
deployments: (
<WorkloadDetails
workloadKind={Deployment}
drawerName={drawerName}
drawerNamespace={drawerNamespace}
/>
),
daemonsets: <DaemonSetDetails />,
};

const workloadKindList = [
'pods',
'deployments',
'replicasets',
'jobs',
'cronjobs',
'daemonsets',
'statefulsets',
];

if (workloadKindList.includes(resource)) {
switch (resource) {
case 'pods':
return detailView.pods;
case 'deployments':
return detailView.deployments;
case 'replicasets':
return ReplicaSet;
case 'jobs':
return Job;
case 'cronjobs':
return CronJob;
case 'daemonsets':
return detailView.daemonsets;
case 'statefulsets':
return StatefulSet;
default:
return null;
}
}
}

// NOTE: for the refresh to remember the drawer we need to use the local drawer name first then the redux if not available
return (
<>
{mediaQuerySize && (
<Drawer variant="persistent" anchor="right" open={drawerOpen} onClose={() => closeDrawer()}>
<Box width={800}>
<Box style={{ marginTop: '5rem', marginBottom: '2rem' }}>
<Button variant="outlined" color="primary" onClick={() => closeDrawer()}>
Close
</Button>
</Box>
<Box>
{drawerName === currentName ? (
<>{drawerResourceSelector(drawerResource)}</>
) : (
() => closeDrawer()
)}

{/* {drawerName === currentName ? (
<WorkloadDetails
workloadKind={drawerResourceSelector(drawerResource)}
drawerName={localDrawerName ? localDrawerName : localDrawerName}
drawerNamespace={drawerNamespace}
/>
) : null} */}

{/* {drawerResource === 'pods' && drawerName === currentName ? (
<WorkloadDetails
workloadKind={drawerResourceSelector(drawerResource)}
drawerName={localDrawerName ? localDrawerName : localDrawerName}
drawerNamespace={drawerNamespace}
/>
) : null} */}
</Box>
</Box>
</Drawer>
)}
</>
);
}
Loading

0 comments on commit 50e01f2

Please sign in to comment.