Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retain column order & states #568

Merged
merged 2 commits into from
May 1, 2023
Merged

Retain column order & states #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7e7f5
Fixed window not found & occasional sqlite error for packages
OmkarPh Apr 19, 2023
050b04a
Columns & order retention done
OmkarPh Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 75 additions & 64 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,88 @@
import React from 'react'
import {
HashRouter,
Routes,
Route,
} from "react-router-dom";
import { ToastContainer } from 'react-toastify';
import React from "react";
import { HashRouter, Routes, Route } from "react-router-dom";
import { ToastContainer } from "react-toastify";

import { ROUTES } from './constants/routes';
import { WorkbenchDBProvider } from './contexts/workbenchContext';
import { ROUTES } from "./constants/routes";
import { WorkbenchDBProvider } from "./contexts/dbContext";

import Layout from './components/Layout/Layout';
import DropZone from './components/DropZone/DropZone';
import Layout from "./components/Layout/Layout";
import DropZone from "./components/DropZone/DropZone";

import Home from './pages/Home/Home'
import TableView from './pages/TableView/TableView';
import FileInfoDash from './pages/FileInfoDash/FileInfoDash';
import LicenseInfoDash from './pages/LicenseInfoDash/LicenseInfoDash';
import PackageInfoDash from './pages/PackageInfoDash/PackageInfoDash';
import Packages from './pages/Packages/Packages';
import LicenseDetections from './pages/LicenseDetections/LicenseDetections';
import ChartView from './pages/ChartView/ChartView';
import ScanInfo from './pages/ScanInfo/ScanInfo';
import About from './pages/About/About';
import PageNotFound from './pages/PageNotFound';
import Home from "./pages/Home/Home";
import TableView from "./pages/TableView/TableView";
import FileInfoDash from "./pages/FileInfoDash/FileInfoDash";
import LicenseInfoDash from "./pages/LicenseInfoDash/LicenseInfoDash";
import PackageInfoDash from "./pages/PackageInfoDash/PackageInfoDash";
import Packages from "./pages/Packages/Packages";
import LicenseDetections from "./pages/LicenseDetections/LicenseDetections";
import ChartView from "./pages/ChartView/ChartView";
import ScanInfo from "./pages/ScanInfo/ScanInfo";
import About from "./pages/About/About";
import PageNotFound from "./pages/PageNotFound";

import './utils/ensureRendererDeps';
import "./utils/ensureRendererDeps";

import './fontawesome';
import 'rc-tree/assets/index.css';
import 'react-toastify/dist/ReactToastify.css';
import 'bootstrap/dist/css/bootstrap.min.css';
import 'react-tooltip/dist/react-tooltip.css'
import "./fontawesome";
import "rc-tree/assets/index.css";
import "react-toastify/dist/ReactToastify.css";
import "bootstrap/dist/css/bootstrap.min.css";
import "react-tooltip/dist/react-tooltip.css";

import './app.css';
import './dashStyles.css';
import './customFaColors.css';
import "./app.css";
import "./dashStyles.css";
import "./customFaColors.css";
import { WorkbenchStateProvider } from "./contexts/stateContext";

const App = () => {
return (
<HashRouter>
<WorkbenchDBProvider>
<DropZone>
<Layout>
<Routes>
<Route path={ROUTES.HOME}>
<Route index element={<Home />} />
<Route path={ROUTES.ABOUT} element={<About />} />
<Route path={ROUTES.TABLE_VIEW} element={<TableView />} />
<Route path={ROUTES.FILE_DASHBOARD} element={<FileInfoDash />} />
<Route path={ROUTES.LICENSE_DASHBOARD} element={<LicenseInfoDash />} />
<Route path={ROUTES.PACKAGE_DASHBOARD} element={<PackageInfoDash />} />
<Route path={ROUTES.LICENSE_DETECTIONS} element={<LicenseDetections />} />
<Route path={ROUTES.PACKAGES} element={<Packages />} />
<Route path={ROUTES.CHART_SUMMARY} element={<ChartView />} />
<Route path={ROUTES.SCAN_INFO} element={<ScanInfo />} />
</Route>
<Route path="*" element={<PageNotFound />} />
</Routes>
</Layout>
<WorkbenchStateProvider>
<WorkbenchDBProvider>
<DropZone>
<Layout>
<Routes>
<Route path={ROUTES.HOME}>
<Route index element={<Home />} />
<Route path={ROUTES.ABOUT} element={<About />} />
<Route path={ROUTES.TABLE_VIEW} element={<TableView />} />
<Route
path={ROUTES.FILE_DASHBOARD}
element={<FileInfoDash />}
/>
<Route
path={ROUTES.LICENSE_DASHBOARD}
element={<LicenseInfoDash />}
/>
<Route
path={ROUTES.PACKAGE_DASHBOARD}
element={<PackageInfoDash />}
/>
<Route
path={ROUTES.LICENSE_DETECTIONS}
element={<LicenseDetections />}
/>
<Route path={ROUTES.PACKAGES} element={<Packages />} />
<Route path={ROUTES.CHART_SUMMARY} element={<ChartView />} />
<Route path={ROUTES.SCAN_INFO} element={<ScanInfo />} />
</Route>
<Route path="*" element={<PageNotFound />} />
</Routes>
</Layout>

{/* Provider for toasts */}
<ToastContainer
limit={1}
draggable
closeOnClick
hideProgressBar={false}
autoClose={2000}
position='bottom-center'
/>
</DropZone>
</WorkbenchDBProvider>
{/* Provider for toasts */}
<ToastContainer
limit={1}
draggable
closeOnClick
hideProgressBar={false}
autoClose={2000}
position="bottom-center"
/>
</DropZone>
</WorkbenchDBProvider>
</WorkbenchStateProvider>
</HashRouter>
)
}
);
};

export default App
export default App;
56 changes: 27 additions & 29 deletions src/components/DropZone/DropZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,60 @@
import { toast } from 'react-toastify';
import React, { DragEvent } from 'react'
import { useNavigate } from 'react-router-dom';
import { toast } from "react-toastify";
import React, { DragEvent } from "react";
import { useNavigate } from "react-router-dom";

import { useWorkbenchDB } from '../../contexts/workbenchContext';
import { ROUTES } from '../../constants/routes';
import { useWorkbenchDB } from "../../contexts/dbContext";
import { ROUTES } from "../../constants/routes";


const lastLogs:{ [key: string]: number} = {}
const lastLogs: { [key: string]: number } = {};
export const CustomLogger = (id: string, ...args: unknown[]) => {
const currentTime = (new Date()).getTime();
if(!(lastLogs[id] && currentTime < lastLogs[id]+1000)){
const currentTime = new Date().getTime();
if (!(lastLogs[id] && currentTime < lastLogs[id] + 1000)) {
console.log(id, ...args);
lastLogs[id] = currentTime;
}
}
};

const DropZone = (props: React.PropsWithChildren) => {
const navigate = useNavigate();
const { sqliteParser, importJsonFile } = useWorkbenchDB();

function DragOverHandler(e: DragEvent){
function DragOverHandler(e: DragEvent) {
e.preventDefault();
e.stopPropagation();
// CustomLogger("Drag detected", e, e.dataTransfer.files);
}
function DropHandler(e: DragEvent){
function DropHandler(e: DragEvent) {
e.preventDefault();
e.stopPropagation();

const regex = {
json: /\.(json)+$/i,
sqlite: /\.(sqlite)+$/i,
}
};

const validFiles =
Array.from(e.dataTransfer.files)
.filter(file => file.name.match(regex.json) || file.name.match(regex.sqlite))
.filter(file => file !== null);
const validFiles = Array.from(e.dataTransfer.files)
.filter(
(file) => file.name.match(regex.json) || file.name.match(regex.sqlite)
)
.filter((file) => file !== null);
const fileToImport = validFiles[0];

console.log("Dropped files:", e, e.dataTransfer.files);
console.log("Valid files:", validFiles);

if(!validFiles.length){
return toast('Only json/sqlite file can be imported !', {
type: 'error',
if (!validFiles.length) {
return toast.error("Only json/sqlite file can be imported !", {
style: { width: 320 },
});
}

if(validFiles.length > 1){
toast(`Only 1 json/sqlite file will be imported at a time`, {
type: 'warning',
if (validFiles.length > 1) {
toast.warn(`Only 1 json/sqlite file can be imported at a time`, {
style: { width: 375 },
});
}

if(regex.sqlite.test(fileToImport.name)){
if (regex.sqlite.test(fileToImport.name)) {
console.log("Parsing sqlite file:", fileToImport.name);
sqliteParser(fileToImport.path);
navigate(ROUTES.HOME);
Expand All @@ -69,9 +67,9 @@ const DropZone = (props: React.PropsWithChildren) => {

return (
<div onDragOver={DragOverHandler} onDrop={DropHandler}>
{ props.children }
{props.children}
</div>
)
}
);
};

export default DropZone
export default DropZone;
2 changes: 1 addition & 1 deletion src/components/FileTree/FileTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { DataNode } from "rc-tree/lib/interface";
import React, { useEffect, useState } from "react";

import EllipticLoader from "../EllipticLoader";
import { PathType, useWorkbenchDB } from "../../contexts/workbenchContext";
import { PathType, useWorkbenchDB } from "../../contexts/dbContext";

import SwitcherIcon from "./SwitcherIcon";

Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Navbar from '../Navbar/Navbar';
import FileTree from '../FileTree/FileTree'
import ImportFallback from '../ImportFallback/ImportFallback';

import { useWorkbenchDB } from '../../contexts/workbenchContext';
import { useWorkbenchDB } from '../../contexts/dbContext';
import { FILE_TREE_ROUTES, IMPORT_FALLBACK_ROUTES } from '../../constants/routes';

import './layout.css';
Expand Down
1 change: 1 addition & 0 deletions src/constants/keys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const COL_DEF_STATE = "col_defs_state"
Loading