Skip to content

Commit 3d31b21

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
authored
Merge pull request #568 from nexB/retainColumnOrder
Retain column order & states
2 parents 1759b67 + 050b04a commit 3d31b21

File tree

19 files changed

+1069
-804
lines changed

19 files changed

+1069
-804
lines changed

‎src/App.tsx‎

Lines changed: 75 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,88 @@
1-
import React from 'react'
2-
import {
3-
HashRouter,
4-
Routes,
5-
Route,
6-
} from "react-router-dom";
7-
import { ToastContainer } from 'react-toastify';
1+
import React from "react";
2+
import { HashRouter, Routes, Route } from "react-router-dom";
3+
import { ToastContainer } from "react-toastify";
84

9-
import { ROUTES } from './constants/routes';
10-
import { WorkbenchDBProvider } from './contexts/workbenchContext';
5+
import { ROUTES } from "./constants/routes";
6+
import { WorkbenchDBProvider } from "./contexts/dbContext";
117

12-
import Layout from './components/Layout/Layout';
13-
import DropZone from './components/DropZone/DropZone';
8+
import Layout from "./components/Layout/Layout";
9+
import DropZone from "./components/DropZone/DropZone";
1410

15-
import Home from './pages/Home/Home'
16-
import TableView from './pages/TableView/TableView';
17-
import FileInfoDash from './pages/FileInfoDash/FileInfoDash';
18-
import LicenseInfoDash from './pages/LicenseInfoDash/LicenseInfoDash';
19-
import PackageInfoDash from './pages/PackageInfoDash/PackageInfoDash';
20-
import Packages from './pages/Packages/Packages';
21-
import LicenseDetections from './pages/LicenseDetections/LicenseDetections';
22-
import ChartView from './pages/ChartView/ChartView';
23-
import ScanInfo from './pages/ScanInfo/ScanInfo';
24-
import About from './pages/About/About';
25-
import PageNotFound from './pages/PageNotFound';
11+
import Home from "./pages/Home/Home";
12+
import TableView from "./pages/TableView/TableView";
13+
import FileInfoDash from "./pages/FileInfoDash/FileInfoDash";
14+
import LicenseInfoDash from "./pages/LicenseInfoDash/LicenseInfoDash";
15+
import PackageInfoDash from "./pages/PackageInfoDash/PackageInfoDash";
16+
import Packages from "./pages/Packages/Packages";
17+
import LicenseDetections from "./pages/LicenseDetections/LicenseDetections";
18+
import ChartView from "./pages/ChartView/ChartView";
19+
import ScanInfo from "./pages/ScanInfo/ScanInfo";
20+
import About from "./pages/About/About";
21+
import PageNotFound from "./pages/PageNotFound";
2622

27-
import './utils/ensureRendererDeps';
23+
import "./utils/ensureRendererDeps";
2824

29-
import './fontawesome';
30-
import 'rc-tree/assets/index.css';
31-
import 'react-toastify/dist/ReactToastify.css';
32-
import 'bootstrap/dist/css/bootstrap.min.css';
33-
import 'react-tooltip/dist/react-tooltip.css'
25+
import "./fontawesome";
26+
import "rc-tree/assets/index.css";
27+
import "react-toastify/dist/ReactToastify.css";
28+
import "bootstrap/dist/css/bootstrap.min.css";
29+
import "react-tooltip/dist/react-tooltip.css";
3430

35-
import './app.css';
36-
import './dashStyles.css';
37-
import './customFaColors.css';
31+
import "./app.css";
32+
import "./dashStyles.css";
33+
import "./customFaColors.css";
34+
import { WorkbenchStateProvider } from "./contexts/stateContext";
3835

3936
const App = () => {
4037
return (
4138
<HashRouter>
42-
<WorkbenchDBProvider>
43-
<DropZone>
44-
<Layout>
45-
<Routes>
46-
<Route path={ROUTES.HOME}>
47-
<Route index element={<Home />} />
48-
<Route path={ROUTES.ABOUT} element={<About />} />
49-
<Route path={ROUTES.TABLE_VIEW} element={<TableView />} />
50-
<Route path={ROUTES.FILE_DASHBOARD} element={<FileInfoDash />} />
51-
<Route path={ROUTES.LICENSE_DASHBOARD} element={<LicenseInfoDash />} />
52-
<Route path={ROUTES.PACKAGE_DASHBOARD} element={<PackageInfoDash />} />
53-
<Route path={ROUTES.LICENSE_DETECTIONS} element={<LicenseDetections />} />
54-
<Route path={ROUTES.PACKAGES} element={<Packages />} />
55-
<Route path={ROUTES.CHART_SUMMARY} element={<ChartView />} />
56-
<Route path={ROUTES.SCAN_INFO} element={<ScanInfo />} />
57-
</Route>
58-
<Route path="*" element={<PageNotFound />} />
59-
</Routes>
60-
</Layout>
39+
<WorkbenchStateProvider>
40+
<WorkbenchDBProvider>
41+
<DropZone>
42+
<Layout>
43+
<Routes>
44+
<Route path={ROUTES.HOME}>
45+
<Route index element={<Home />} />
46+
<Route path={ROUTES.ABOUT} element={<About />} />
47+
<Route path={ROUTES.TABLE_VIEW} element={<TableView />} />
48+
<Route
49+
path={ROUTES.FILE_DASHBOARD}
50+
element={<FileInfoDash />}
51+
/>
52+
<Route
53+
path={ROUTES.LICENSE_DASHBOARD}
54+
element={<LicenseInfoDash />}
55+
/>
56+
<Route
57+
path={ROUTES.PACKAGE_DASHBOARD}
58+
element={<PackageInfoDash />}
59+
/>
60+
<Route
61+
path={ROUTES.LICENSE_DETECTIONS}
62+
element={<LicenseDetections />}
63+
/>
64+
<Route path={ROUTES.PACKAGES} element={<Packages />} />
65+
<Route path={ROUTES.CHART_SUMMARY} element={<ChartView />} />
66+
<Route path={ROUTES.SCAN_INFO} element={<ScanInfo />} />
67+
</Route>
68+
<Route path="*" element={<PageNotFound />} />
69+
</Routes>
70+
</Layout>
6171

62-
{/* Provider for toasts */}
63-
<ToastContainer
64-
limit={1}
65-
draggable
66-
closeOnClick
67-
hideProgressBar={false}
68-
autoClose={2000}
69-
position='bottom-center'
70-
/>
71-
</DropZone>
72-
</WorkbenchDBProvider>
72+
{/* Provider for toasts */}
73+
<ToastContainer
74+
limit={1}
75+
draggable
76+
closeOnClick
77+
hideProgressBar={false}
78+
autoClose={2000}
79+
position="bottom-center"
80+
/>
81+
</DropZone>
82+
</WorkbenchDBProvider>
83+
</WorkbenchStateProvider>
7384
</HashRouter>
74-
)
75-
}
85+
);
86+
};
7687

77-
export default App
88+
export default App;

‎src/components/DropZone/DropZone.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { toast } from "react-toastify";
22
import React, { DragEvent } from "react";
33
import { useNavigate } from "react-router-dom";
44

5-
import { useWorkbenchDB } from "../../contexts/workbenchContext";
5+
import { useWorkbenchDB } from "../../contexts/dbContext";
66
import { ROUTES } from "../../constants/routes";
77

88
const lastLogs: { [key: string]: number } = {};

‎src/components/FileTree/FileTree.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DataNode } from "rc-tree/lib/interface";
33
import React, { useEffect, useState } from "react";
44

55
import EllipticLoader from "../EllipticLoader";
6-
import { PathType, useWorkbenchDB } from "../../contexts/workbenchContext";
6+
import { PathType, useWorkbenchDB } from "../../contexts/dbContext";
77

88
import SwitcherIcon from "./SwitcherIcon";
99

‎src/components/Layout/Layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Navbar from '../Navbar/Navbar';
88
import FileTree from '../FileTree/FileTree'
99
import ImportFallback from '../ImportFallback/ImportFallback';
1010

11-
import { useWorkbenchDB } from '../../contexts/workbenchContext';
11+
import { useWorkbenchDB } from '../../contexts/dbContext';
1212
import { FILE_TREE_ROUTES, IMPORT_FALLBACK_ROUTES } from '../../constants/routes';
1313

1414
import './layout.css';

‎src/constants/keys.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const COL_DEF_STATE = "col_defs_state"

0 commit comments

Comments
 (0)