Skip to content

UPDATE: Add a drawer to store user's workbooks #332

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.

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

Draft
wants to merge 22 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 81 additions & 35 deletions webapp/app.ironcalc.com/frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import "./App.css";
import styled from "@emotion/styled";
import { useEffect, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import { FileBar } from "./components/FileBar";
import LeftDrawer from "./components/LeftDrawer/LeftDrawer";
import {
get_documentation_model,
get_model,
Expand All @@ -10,6 +11,8 @@ import {
import {
createNewModel,
deleteSelectedModel,
getModelsMetadata,
getSelectedUuid,
loadModelFromStorageOrCreate,
saveModelToStorage,
saveSelectedModelInStorage,
Expand All @@ -21,6 +24,14 @@ import { IronCalc, IronCalcIcon, Model, init } from "@ironcalc/workbook";

function App() {
const [model, setModel] = useState<Model | null>(null);
const [isDrawerOpen, setIsDrawerOpen] = useState(false);
const [modelsMetadata, setModelsMetadata] = useState(getModelsMetadata());
const [selectedUuid, setSelectedUuid] = useState(getSelectedUuid());

const refreshModelsData = useCallback(() => {
setModelsMetadata(getModelsMetadata());
setSelectedUuid(getSelectedUuid());
}, []);

useEffect(() => {
async function start() {
Expand All @@ -38,6 +49,7 @@ function App() {
const importedModel = Model.from_bytes(model_bytes);
localStorage.removeItem("selected");
setModel(importedModel);
refreshModelsData();
} catch (e) {
alert("Model not found, or failed to load");
}
Expand All @@ -47,17 +59,19 @@ function App() {
const importedModel = Model.from_bytes(model_bytes);
localStorage.removeItem("selected");
setModel(importedModel);
refreshModelsData();
} catch (e) {
alert("Example file not found, or failed to load");
}
} else {
// try to load from local storage
const newModel = loadModelFromStorageOrCreate();
setModel(newModel);
refreshModelsData();
}
}
start();
}, []);
}, [refreshModelsData]);

if (!model) {
return (
Expand All @@ -79,48 +93,80 @@ function App() {
// We could use context for model, but the problem is that it should initialized to null.
// Passing the property down makes sure it is always defined.

// Handlers for model changes that also update our models state
const handleNewModel = () => {
const newModel = createNewModel();
setModel(newModel);
refreshModelsData();
};

const handleSetModel = (uuid: string) => {
const newModel = selectModelFromStorage(uuid);
if (newModel) {
setModel(newModel);
refreshModelsData();
}
};

const handleDeleteModel = () => {
const newModel = deleteSelectedModel();
if (newModel) {
setModel(newModel);
refreshModelsData();
}
};

return (
<Wrapper>
<FileBar
model={model}
onModelUpload={async (arrayBuffer: ArrayBuffer, fileName: string) => {
const blob = await uploadFile(arrayBuffer, fileName);

const bytes = new Uint8Array(await blob.arrayBuffer());
const newModel = Model.from_bytes(bytes);
saveModelToStorage(newModel);

setModel(newModel);
}}
newModel={() => {
setModel(createNewModel());
}}
setModel={(uuid: string) => {
const newModel = selectModelFromStorage(uuid);
if (newModel) {
setModel(newModel);
}
}}
onDelete={() => {
const newModel = deleteSelectedModel();
if (newModel) {
setModel(newModel);
}
}}
<AppContainer>
<LeftDrawer
open={isDrawerOpen}
onClose={() => setIsDrawerOpen(false)}
newModel={handleNewModel}
setModel={handleSetModel}
models={modelsMetadata}
selectedUuid={selectedUuid}
setDeleteDialogOpen={() => {}}
/>
<IronCalc model={model} />
</Wrapper>

<MainContent isDrawerOpen={isDrawerOpen}>
<FileBar
model={model}
onModelUpload={async (arrayBuffer: ArrayBuffer, fileName: string) => {
const blob = await uploadFile(arrayBuffer, fileName);
const bytes = new Uint8Array(await blob.arrayBuffer());
const newModel = Model.from_bytes(bytes);
saveModelToStorage(newModel);
setModel(newModel);
refreshModelsData();
}}
newModel={handleNewModel}
setModel={handleSetModel}
onDelete={handleDeleteModel}
isDrawerOpen={isDrawerOpen}
setIsDrawerOpen={setIsDrawerOpen}
refreshModelsData={refreshModelsData}
/>
<IronCalc model={model} />
</MainContent>
</AppContainer>
);
}

const Wrapper = styled("div")`
margin: 0px;
padding: 0px;
const AppContainer = styled("div")`
display: flex;
width: 100%;
height: 100%;
position: relative;
overflow: hidden;
`;

const MainContent = styled("div")<{ isDrawerOpen: boolean }>`
margin-left: ${({ isDrawerOpen }) => (isDrawerOpen ? "0px" : "-264px")};
transition: margin-left 0.3s ease;
width: ${({ isDrawerOpen }) =>
isDrawerOpen ? "calc(100% - 264px)" : "100%"};
display: flex;
flex-direction: column;
position: absolute;
`;

const Loading = styled("div")`
Expand Down
Loading