Skip to content

Commit 3b67c24

Browse files
authored
Merge pull request #12 from oslabs-beta/featurekelvin
RTK conversion for BarGraphComparison and BarGraphComparisonActions
2 parents a655f13 + aa2bfb5 commit 3b67c24

File tree

3 files changed

+36
-7
lines changed

3 files changed

+36
-7
lines changed

src/app/RTKslices.tsx

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,23 @@ export const mainSlice = createSlice({
431431
const { tabs, currentTab } = state;
432432
tabs[currentTab] = { ...tabs[currentTab], seriesSavedStatus: action.payload }
433433

434+
},
435+
deleteSeries: (state) => {
436+
const { tabs, currentTab } = state;
437+
const allStorage = () => {
438+
const keys = Object.keys(localStorage);
439+
let i = keys.length;
440+
while (i--) {
441+
localStorage.removeItem(keys[i]);
442+
}
443+
};
444+
allStorage();
445+
Object.keys(tabs).forEach((tab) => {
446+
tabs[tab] = {
447+
...tabs[tab],
448+
};
449+
});
450+
tabs[currentTab] = { ...tabs[currentTab], seriesSavedStatus: false };
434451
}
435452
},
436453
})
@@ -456,7 +473,8 @@ export const {
456473
resetSlider,
457474
toggleMode,
458475
importSnapshots,
459-
tutorialSaveSeriesToggle
476+
tutorialSaveSeriesToggle,
477+
deleteSeries
460478
} = mainSlice.actions
461479

462480

src/app/components/StateRoute/PerformanceVisx/BarGraphComparison.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ import MenuItem from '@mui/material/MenuItem';
1515
import FormControl from '@mui/material/FormControl';
1616
import { useTheme } from '@mui/material/styles';
1717
import { Button, InputLabel } from '@mui/material';
18-
import { onHover, onHoverExit, deleteSeries, setCurrentTabInApp } from '../../../actions/actions';
19-
import { useStoreContext } from '../../../store';
18+
import { onHover, onHoverExit, deleteSeries, setCurrentTabInApp } from '../../../RTKslices';
19+
// import { useStoreContext } from '../../../store';
20+
//importing useSelector and useDispatch for rtk conversion
21+
import { useSelector, useDispatch } from 'react-redux';
2022
import {
2123
snapshot,
2224
TooltipData,
@@ -46,7 +48,12 @@ const tooltipStyles = {
4648
};
4749

4850
const BarGraphComparison = (props: BarGraphComparisonProps): JSX.Element => {
49-
const [{ tabs, currentTab }, dispatch] = useStoreContext();
51+
//commented out line 51 to add hooks for RTK transition
52+
// const [{ tabs, currentTab }, dispatch] = useStoreContext();
53+
const dispatch = useDispatch();
54+
const tabs = useSelector(state => state.main.tabs);
55+
const currentTab = useSelector(state => state.main.currentTab);
56+
5057
const {
5158
width, // from ParentSize provided in StateRoute
5259
height, // from ParentSize provided in StateRoute

src/app/components/StateRoute/PerformanceVisx/BarGraphComparisonActions.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ import MenuItem from '@mui/material/MenuItem';
1414
import FormControl from '@mui/material/FormControl';
1515
import { useTheme } from '@mui/material/styles';
1616
import { Button } from '@mui/material';
17-
import { deleteSeries, setCurrentTabInApp } from '../../../actions/actions';
18-
import { useStoreContext } from '../../../store';
17+
import { deleteSeries, setCurrentTabInApp } from '../../../RTKslices';
18+
// import { useStoreContext } from '../../../store';
19+
//importing useSelector and useDispatch for rtk conversion
20+
import { useDispatch } from 'react-redux';
1921
import { TooltipData, Margin, BarGraphComparisonAction, ActionObj } from '../../../FrontendTypes';
2022

2123
/* DEFAULTS */
@@ -38,7 +40,9 @@ const tooltipStyles = {
3840
};
3941

4042
const BarGraphComparisonActions = (props: BarGraphComparisonAction) => {
41-
const [dispatch] = useStoreContext(); // used to get the dispatch function from our storeContext
43+
//commented out line 44 to add hooks for RTK transition
44+
// const [dispatch] = useStoreContext(); // used to get the dispatch function from our storeContext
45+
const dispatch = useDispatch();
4246
const {
4347
width, // from ParentSize provided in StateRoute
4448
height, // from ParentSize provided in StateRoute

0 commit comments

Comments
 (0)