From 914d4953a6c534207d7518ec5d6f46504d5c2367 Mon Sep 17 00:00:00 2001
From: Dhruv Arora <dhruv.arora1@autodesk.com>
Date: Wed, 31 Jul 2024 13:16:56 -0700
Subject: [PATCH 1/4] Moved import local mirabuf into spawn mirabuf

---
 fission/src/ui/components/MainHUD.tsx                |  4 ++--
 .../ui/modals/mirabuf/ImportLocalMirabufModal.tsx    |  6 +++---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 12 ++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/fission/src/ui/components/MainHUD.tsx b/fission/src/ui/components/MainHUD.tsx
index 91ace0dbeb..394101b6f8 100644
--- a/fission/src/ui/components/MainHUD.tsx
+++ b/fission/src/ui/components/MainHUD.tsx
@@ -105,11 +105,11 @@ const MainHUD: React.FC = () => {
                         icon={SynthesisIcons.Gamepad}
                         onClick={() => openModal("change-inputs")}
                     />
-                    <MainHUDButton
+                    {/* <MainHUDButton
                         value={"Import Local Mira"}
                         icon={SynthesisIcons.Import}
                         onClick={() => openModal("import-local-mirabuf")}
-                    />
+                    /> */}
                 </div>
                 <div className="flex flex-col gap-0 bg-background w-full rounded-3xl">
                     <MainHUDButton
diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
index 6bcd867d90..9b68010590 100644
--- a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
+++ b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -44,7 +44,7 @@ const ImportLocalMirabufModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
 
     return (
         <Modal
-            name={"Import Local Assemblies"}
+            name={"Import From File"}
             icon={SynthesisIcons.Import}
             modalId={modalId}
             acceptEnabled={selectedFile !== undefined && miraType !== undefined}
@@ -69,7 +69,7 @@ const ImportLocalMirabufModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
         >
             <div className="flex flex-col items-center gap-5">
                 <input ref={fileUploadRef} onChange={onInputChanged} type="file" hidden={true} />
-                <Button value="Upload" size={ButtonSize.Large} onClick={uploadClicked} />
+                <Button value="Upload File" size={ButtonSize.Large} onClick={uploadClicked} />
                 {selectedFile ? (
                     <Label
                         className="text-center"
@@ -79,7 +79,7 @@ const ImportLocalMirabufModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
                     <></>
                 )}
                 <Dropdown
-                    label="Type"
+                    label="File Type"
                     options={["None", "Robot", "Field"]}
                     onSelect={(selected: string) => {
                         typeSelected(selected)
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index d2be05336f..93dcf2563a 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -15,6 +15,7 @@ import { CreateMirabuf } from "@/mirabuf/MirabufSceneObject"
 import { Box } from "@mui/material"
 import { ToggleButton, ToggleButtonGroup } from "@/ui/components/ToggleButtonGroup"
 import { usePanelControlContext } from "@/ui/PanelContext"
+import { useModalControlContext } from "@/ui/ModalContext"
 import TaskStatus from "@/util/TaskStatus"
 import {
     PositiveButton,
@@ -23,9 +24,11 @@ import {
     DeleteButton,
     RefreshButton,
     SynthesisIcons,
+    Spacer,
 } from "@/ui/components/StyledComponents"
 import { ProgressHandle } from "@/ui/components/ProgressNotificationData"
 import Panel, { PanelPropsImpl } from "@/ui/components/Panel"
+import Button from "@/ui/components/Button"
 
 interface ItemCardProps {
     id: string
@@ -100,6 +103,7 @@ function SpawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?
 const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
     const { showTooltip } = useTooltipControlContext()
     const { closePanel, openPanel } = usePanelControlContext()
+    const { openModal } = useModalControlContext()
 
     const [cachedRobots, setCachedRobots] = useState(GetCacheInfo(MiraType.ROBOT))
     const [cachedFields, setCachedFields] = useState(GetCacheInfo(MiraType.FIELD))
@@ -363,6 +367,10 @@ const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                         </SectionLabel>
                         <SectionDivider />
                         {cachedRobotElements}
+                        {Spacer(5)}
+                        <Box alignSelf={"center"}>
+                            <Button value="Import from File" onClick={() => openModal("import-local-mirabuf")} />
+                        </Box>
                     </>
                 ) : (
                     <>
@@ -373,6 +381,10 @@ const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                         </SectionLabel>
                         <SectionDivider />
                         {cachedFieldElements}
+                        {Spacer(5)}
+                        <Box alignSelf={"center"}>
+                            <Button value="Import from File" onClick={() => openModal("import-local-mirabuf")} />
+                        </Box>
                     </>
                 )}
                 <Box

From f87c205fea20defccd20bf0e7e4a91eee614e3ba Mon Sep 17 00:00:00 2001
From: Dhruv Arora <dhruv.arora1@autodesk.com>
Date: Thu, 1 Aug 2024 13:18:48 -0700
Subject: [PATCH 2/4] Added bug fix for named control schemes not appearing

---
 fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
index 9b68010590..98188234ae 100644
--- a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
+++ b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -8,10 +8,12 @@ import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader"
 import Dropdown from "@/ui/components/Dropdown"
 import { CreateMirabuf } from "@/mirabuf/MirabufSceneObject"
 import { SynthesisIcons } from "@/ui/components/StyledComponents"
+import { usePanelControlContext } from "@/ui/PanelContext"
 
 const ImportLocalMirabufModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
     // update tooltip based on type of drivetrain, receive message from Synthesis
     const { showTooltip } = useTooltipControlContext()
+    const { openPanel } = usePanelControlContext()
 
     const fileUploadRef = useRef<HTMLInputElement>(null)
 
@@ -64,6 +66,8 @@ const ImportLocalMirabufModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
                                 World.SceneRenderer.RegisterSceneObject(x)
                             }
                         })
+
+                    if (miraType == MiraType.ROBOT) openPanel("choose-scheme")
                 }
             }}
         >

From 7e9d8ff5ed48e1ce0863e1998d5b35566ddfc01b Mon Sep 17 00:00:00 2001
From: Dhruv Arora <dhruv.arora1@autodesk.com>
Date: Thu, 8 Aug 2024 14:36:27 -0700
Subject: [PATCH 3/4] Removed commented code

---
 fission/src/ui/components/MainHUD.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fission/src/ui/components/MainHUD.tsx b/fission/src/ui/components/MainHUD.tsx
index 394101b6f8..a637faf9f0 100644
--- a/fission/src/ui/components/MainHUD.tsx
+++ b/fission/src/ui/components/MainHUD.tsx
@@ -105,11 +105,6 @@ const MainHUD: React.FC = () => {
                         icon={SynthesisIcons.Gamepad}
                         onClick={() => openModal("change-inputs")}
                     />
-                    {/* <MainHUDButton
-                        value={"Import Local Mira"}
-                        icon={SynthesisIcons.Import}
-                        onClick={() => openModal("import-local-mirabuf")}
-                    /> */}
                 </div>
                 <div className="flex flex-col gap-0 bg-background w-full rounded-3xl">
                     <MainHUDButton

From 645ee2b135cc91ca865155e80b9642fbb2e14654 Mon Sep 17 00:00:00 2001
From: LucaHaverty <lucahaverty@gmail.com>
Date: Fri, 9 Aug 2024 11:41:55 -0700
Subject: [PATCH 4/4] Forgot to add the button change :(

---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index fdc5a0efcb..aa3f37b2f8 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -372,10 +372,6 @@ const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                         </SectionLabel>
                         <SectionDivider />
                         {cachedRobotElements}
-                        {Spacer(5)}
-                        <Box alignSelf={"center"}>
-                            <Button value="Import from File" onClick={() => openModal("import-local-mirabuf")} />
-                        </Box>
                     </>
                 ) : (
                     <>
@@ -431,6 +427,9 @@ const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                         {remoteFieldElements}
                     </>
                 )}
+                <Box alignSelf={"center"}>
+                    <Button value="Import from File" onClick={() => openModal("import-local-mirabuf")} />
+                </Box>
             </div>
         </Panel>
     )