FIX: Lifts TemplateDialog to App.tsx

webapp/app.ironcalc.com/frontend/src/App.tsx

@@ -20,10 +20,13 @@ import {
 
 // From IronCalc
 import { IronCalc, IronCalcIcon, Model, init } from "@ironcalc/workbook";
+import { Modal } from "@mui/material";
+import TemplatesDialog from "./components/WelcomeDialog/TemplatesDialog";
 
 function App() {
   const [model, setModel] = useState<Model | null>(null);
   const [showWelcomeDialog, setShowWelcomeDialog] = useState(false);
+  const [isTemplatesDialogOpen, setTemplatesDialogOpen] = useState(false);
 
   useEffect(() => {
     async function start() {
@@ -106,7 +109,7 @@ function App() {
           setModel(createdModel);
         }}
         newModelFromTemplate={() => {
-          setShowWelcomeDialog(true);
+          setTemplatesDialogOpen(true);
         }}
         setModel={(uuid: string) => {
           const newModel = selectModelFromStorage(uuid);
@@ -150,6 +153,25 @@ function App() {
           }}
         />
       )}
+      <Modal
+        open={isTemplatesDialogOpen}
+        onClose={() => setTemplatesDialogOpen(false)}
+        aria-labelledby="templates-dialog-title"
+        aria-describedby="templates-dialog-description"
+      >
+        <TemplatesDialog
+          onClose={() => setTemplatesDialogOpen(false)}
+          onSelectTemplate={
+            async (fileName) => {
+              const model_bytes = await get_documentation_model(fileName);
+              const importedModel = Model.from_bytes(model_bytes);
+              saveModelToStorage(importedModel);
+              setModel(importedModel);
+              setTemplatesDialogOpen(false);
+            }
+          }
+        />
+      </Modal>
     </Wrapper>
   );
 }

webapp/app.ironcalc.com/frontend/src/components/FileMenu.tsx

@@ -4,7 +4,7 @@ import { Check, FileDown, FileUp, Plus, Table2, Trash2 } from "lucide-react";
 import { useRef, useState } from "react";
 import DeleteWorkbookDialog from "./DeleteWorkbookDialog";
 import UploadFileDialog from "./UploadFileDialog";
-import TemplatesDialog from "./WelcomeDialog/TemplatesDialog";
+// import TemplatesDialog from "./WelcomeDialog/TemplatesDialog";
 import { getModelsMetadata, getSelectedUuid } from "./storage";
 
 export function FileMenu(props: {
@@ -22,7 +22,6 @@ export function FileMenu(props: {
   const uuids = Object.keys(models);
   const selectedUuid = getSelectedUuid();
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [isTemplatesDialogOpen, setTemplatesDialogOpen] = useState(false);
   const elements = [];
   for (const uuid of uuids) {
     elements.push(
@@ -98,7 +97,7 @@ export function FileMenu(props: {
         </MenuItemWrapper>
         <MenuItemWrapper
           onClick={() => {
-            setTemplatesDialogOpen(true);
+            props.newModelFromTemplate();
             setMenuOpen(false);
           }}
         >
@@ -166,17 +165,6 @@ export function FileMenu(props: {
           workbookName={selectedUuid ? models[selectedUuid] : ""}
         />
       </Modal>
-      <Modal
-        open={isTemplatesDialogOpen}
-        onClose={() => setTemplatesDialogOpen(false)}
-        aria-labelledby="templates-dialog-title"
-        aria-describedby="templates-dialog-description"
-      >
-        <TemplatesDialog
-          onClose={() => setTemplatesDialogOpen(false)}
-          onSelectTemplate={props.newModelFromTemplate}
-        />
-      </Modal>
     </>
   );
 }