Merge branch 'dev' into alexey/2065/dropdown-sounds-reimplement

Author: AlexD717

.github/workflows/FissionUnitTest.yml

@@ -11,7 +11,7 @@ jobs:
   runUnitTests:
     name: Playwright Unit Tests
     container:
-      image: mcr.microsoft.com/playwright:v1.54.0-noble
+      image: mcr.microsoft.com/playwright:v1.54.2-noble
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -57,3 +57,41 @@ jobs:
 
       - name: Run Tests
         run: HOME=/root npm run test
+
+  runAssetpackTests:
+    name: Assetpack Tests
+    needs: runUnitTests
+    container:
+      image: mcr.microsoft.com/playwright:v1.54.2-noble
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: "fission"
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: JavaScript Setup
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Cache Unzipped Synthesis Assets
+        id: cache-assets
+        uses: actions/cache@v3
+        with:
+          path: fission/public/Downloadables
+          key: ${{ runner.os }}-assets-${{hashFiles('fission/public/assetpack.zip')}}
+
+      - name: Cache Node Dependencies
+        uses: actions/cache@v3
+        with:
+          key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
+          path: "fission/node_modules"
+          restore-keys: |
+            ${{runner.os}}-npm-fission-
+            ${{runner.os}}-npm
+
+      - name: Run Assetpack Tests
+        run: HOME=/root npm run test src/test/mirabuf/DefaultAssets.test.ts
+        env:
+          VITE_RUN_ASSETPACK_TEST: true

exporter/SynthesisFusionAddin/src/ErrorHandling.py

@@ -129,6 +129,7 @@ def handle_err_top(func: Callable[..., Result[None]]) -> Callable[..., None]:
 
     def wrapper(*args, **kwargs):  # type: ignore
         result = func(*args, **kwargs)
+
         if result.is_err():
             message, severity = result.unwrap_err()
             if severity == ErrorSeverity.Fatal:

exporter/SynthesisFusionAddin/src/Parser/SynthesisParser/JointHierarchy.py

@@ -1,6 +1,7 @@
 import enum
 import sys
 from logging import ERROR
+from os import error
 from typing import Any, Iterator, cast
 
 import adsk.core
@@ -221,10 +222,10 @@ def __init__(self, design: adsk.fusion.Design) -> None:
         self.grounded = searchForGrounded(design.rootComponent)
 
         if self.grounded is None:
-            message = "These is no grounded component in this assembly, aborting kinematic export."
-            gm.ui.messageBox(message)
+            message = "There is not a pinned component in this assembly, aborting kinematic export."
+            # gm.ui.messageBox(message)
             _____: Err[None] = Err(message, ErrorSeverity.Fatal)
-            raise RuntimeError()
+            raise RuntimeError(message)
 
         self.currentTraversal: dict[str, DynamicOccurrenceNode | bool] = dict()
         self.groundedConnections: list[adsk.fusion.Occurrence] = []
@@ -247,7 +248,7 @@ def __init__(self, design: adsk.fusion.Design) -> None:
             message = populate_node_result.unwrap_err()[0]
             gm.ui.messageBox(message)
             ____: Err[None] = Err(message, ErrorSeverity.Fatal)
-            raise RuntimeError()
+            raise RuntimeError(message)
 
         rootNode = populate_node_result.unwrap()
         self.groundSimNode = SimulationNode(rootNode, None, grounded=True)
@@ -522,12 +523,9 @@ def buildJointPartHierarchy(
 
         return Ok(None)
 
-    # I'm fairly certain bubbling this back up is the way to go
-    except Warning:
-        return Err(
-            "Instantiation of the JointParser failed, likely due to a lack of a grounded component in the assembly",
-            ErrorSeverity.Fatal,
-        )
+    except RuntimeError as e:
+        progressDialog.progressDialog.hide()
+        raise e
 
 
 def populateJoint(simNode: SimulationNode, joints: joint_pb2.Joints, progressDialog: PDMessage) -> Result[None]:

exporter/SynthesisFusionAddin/src/Parser/SynthesisParser/Parser.py

@@ -148,7 +148,12 @@ def export(self) -> None:
             self.pdMessage,
         )
 
-        JointHierarchy.buildJointPartHierarchy(design, assembly_out.data.joints, self.exporterOptions, self.pdMessage)
+        try:
+            JointHierarchy.buildJointPartHierarchy(
+                design, assembly_out.data.joints, self.exporterOptions, self.pdMessage
+            )
+        except RuntimeError as e:
+            raise e
 
         # These don't have an effect, I forgot how this is suppose to work
         # progressDialog.message = "Taking Photo for thumbnail..."

exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py

@@ -247,8 +247,7 @@ def notify(self, html_args: adsk.core.HTMLEventArgs) -> None:
             )
         elif html_args.action == "export":
             opts = moduleExporterOptions.ExporterOptions().readFromJSON(data)
-            export(opts)
-            html_args.returnData = "{}"
+            export(opts, html_args)
         elif html_args.action == "save":
             opts = moduleExporterOptions.ExporterOptions().readFromJSON(data)
             opts.writeToDesign()
@@ -336,7 +335,7 @@ def addChildOccurrences(childOccurrences: adsk.fusion.OccurrenceList) -> None:
 
 
 @logFailure(messageBox=True)
-def export(exporterOptions: moduleExporterOptions.ExporterOptions) -> None:
+def export(exporterOptions: moduleExporterOptions.ExporterOptions, html_args: adsk.core.HTMLEventArgs) -> None:
     logger.info("NEWUI")
     logger.info(exporterOptions)
     design = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct)
@@ -361,8 +360,13 @@ def export(exporterOptions: moduleExporterOptions.ExporterOptions) -> None:
     exporterOptions.version = docVersion
     exporterOptions.materials = 0
 
-    Parser.Parser(exporterOptions).export()
+    try:
+        Parser.Parser(exporterOptions).export()
+    except RuntimeError as e:
+        html_args.returnData = json.dumps({"_err": str(e)})
+        return
     exporterOptions.writeToDesign()
+    html_args.returnData = "{}"
 
     if exporterOptions.openSynthesisUponExport:
         res = webbrowser.open(APP_WEBSITE_URL)
@@ -431,7 +435,10 @@ def notify(self, _: adsk.core.CommandEventArgs) -> None:
         try:
             Parser.Parser(exporterOptions).export()
         except:
-            pass
+            jointConfigTab.reset()
+            gamepieceConfigTab.reset()
+
+            return
         exporterOptions.writeToDesign()
         jointConfigTab.reset()
         gamepieceConfigTab.reset()

exporter/SynthesisFusionAddin/web/src/App.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from "react"
 
 import "./App.css"
-import { RestartAlt, Settings, SportsFootball, Texture } from "@mui/icons-material"
+import { RestartAlt, Settings, SportsFootball } from "@mui/icons-material"
 import DownloadIcon from "@mui/icons-material/Download"
 import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
 import SaveIcon from "@mui/icons-material/Save"
@@ -36,7 +36,7 @@ import GamepiecesConfigTab from "./ui/GamepiecesConfigTab.tsx"
 import GeneralConfigTab from "./ui/GeneralConfigTab.tsx"
 import GlobalAlert from "./ui/GlobalAlert.tsx"
 import JointsConfigTab from "./ui/JointsConfigTab.tsx"
-import MaterialTaggingTab, { type TaggedBody } from "./ui/MaterialTaggingTab.tsx"
+import type { TaggedBody } from "./ui/MaterialTaggingTab.tsx"
 
 function TabPanel(props: { children?: React.ReactNode; value: number; index: number }) {
     const { children, value, index, ...other } = props
@@ -179,7 +179,11 @@ function App() {
     return (
         <ThemeProvider theme={theme}>
             <Backdrop
-                sx={theme => ({ color: "#fff", zIndex: theme.zIndex.drawer + 1, backdropFilter: "blur(0px)" })}
+                sx={theme => ({
+                    color: "#fff",
+                    zIndex: theme.zIndex.drawer + 1,
+                    backdropFilter: "blur(0px)",
+                })}
                 open={isSelecting}
                 onClick={() => {
                     Global_SetAlert(
@@ -227,7 +231,7 @@ function App() {
                             disabled={generalConfig.exportMode === ExportMode.ROBOT}
                         />
 
-                        <Tab icon={<Texture />} iconPosition={"start"} label="Materials" />
+                        {/*<Tab icon={<Texture />} iconPosition={"start"} label="Materials" />*/}
 
                         {/*<Tab label="APS" />*/}
                     </Tabs>
@@ -252,13 +256,13 @@ function App() {
                     selection={{ isSelecting, setIsSelecting }}
                 />
             </TabPanel>
-            <TabPanel value={activeTab} index={3}>
-                <MaterialTaggingTab
-                    tags={taggedBodies}
-                    updateTags={updateTaggedBodies}
-                    selection={{ isSelecting, setIsSelecting }}
-                />
-            </TabPanel>
+            {/*<TabPanel value={activeTab} index={3}>*/}
+            {/*    <MaterialTaggingTab*/}
+            {/*        tags={taggedBodies}*/}
+            {/*        updateTags={updateTaggedBodies}*/}
+            {/*        selection={{ isSelecting, setIsSelecting }}*/}
+            {/*    />*/}
+            {/*</TabPanel>*/}
             <Container
                 sx={{
                     position: "sticky",

exporter/SynthesisFusionAddin/web/src/lib/index.ts

@@ -40,6 +40,12 @@ const errorMatchers: { text: string; cb: () => void }[] = [
             Global_SetAlert("info", "Selection cancelled")
         },
     },
+    {
+        text: "not a pinned",
+        cb: () => {
+            Global_SetAlert("error", "Please pin a component to export the assembly")
+        },
+    },
 ]
 
 export async function sendData<A extends keyof Messages>(
@@ -64,9 +70,10 @@ export async function sendData<A extends keyof Messages>(
             })
             if (!wasHandled) {
                 console.error({ action, errorResponse: parsed._err })
+                return undefined
             }
 
-            return undefined
+            return parsed as Messages[A][1] & { _err: string }
         }
         return parsed as Messages[A][1]
     } catch (error) {
@@ -85,9 +92,12 @@ export async function sendDataAndToast<A extends keyof Messages>(
 
     if (resp === undefined) {
         Global_SetAlert("error", failureMsg)
-    } else {
+    } else if (resp._err === undefined) {
         Global_SetAlert("info", sucessMsg)
+    } else {
+        return undefined
     }
+
     return resp
 }
 

exporter/SynthesisFusionAddin/web/src/ui/GeneralConfigTab.tsx

@@ -2,7 +2,6 @@ import AnimationIcon from "@mui/icons-material/Animation"
 import ArchiveIcon from "@mui/icons-material/Archive"
 import BalanceIcon from "@mui/icons-material/Balance"
 import LaunchIcon from "@mui/icons-material/Launch"
-import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
 import SaveIcon from "@mui/icons-material/Save"
 import TuneIcon from "@mui/icons-material/Tune"
 import {
@@ -135,13 +134,14 @@ function GeneralConfigTab({ config, updateConfigItem }: ConfigTabProps): React.R
                     <Switch edge="end" onChange={updateLiteral("compressOutput")} checked={config.compressOutput} />
                 </ListItem>
                 <Collapse in={config.exportMode === ExportMode.ROBOT}>
-                    <ListItem>
-                        <ListItemIcon>
-                            <PrecisionManufacturingIcon />
-                        </ListItemIcon>
-                        <ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />
-                        <Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />
-                    </ListItem>
+                    {/* TODO: enable when mix and match is created */}
+                    {/*<ListItem>*/}
+                    {/*    <ListItemIcon>*/}
+                    {/*        <PrecisionManufacturingIcon />*/}
+                    {/*    </ListItemIcon>*/}
+                    {/*    <ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />*/}
+                    {/*    <Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />*/}
+                    {/*</ListItem>*/}
                     <ListItem>
                         <ListItemIcon>
                             <TuneIcon />

exporter/SynthesisFusionAddin/web/src/ui/JointsConfigTab.tsx

@@ -207,7 +207,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
             />
 
             <h4>
-                {joints.filter(j => j.isWheel).length} Wheel{joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
+                {joints.filter(j => j.isWheel).length} Wheel
+                {joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
             </h4>
             <TableContainer component={Paper} elevation={6}>
                 <Table sx={{ minWidth: 650 }} aria-label="simple table">
@@ -241,8 +242,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
                                                 fullWidth
                                             >
                                                 <MenuItem value={WheelType.STANDARD}>Standard</MenuItem>
-                                                <MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>
-                                                <MenuItem value={WheelType.OMNI}>Omni</MenuItem>
+                                                {/*<MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>*/}
+                                                {/*<MenuItem value={WheelType.OMNI}>Omni</MenuItem>*/}
                                             </Select>
                                         </TableCell>
                                     </TableRow>

fission/biome.json

@@ -179,5 +179,5 @@
     { "includes": ["src/proto/**/*"], "linter": { "enabled": false } }
   ],
 
-  "assist": { "enabled": true, "actions": { "source": { "organizeImports": "on" } } }
+  "assist": { "enabled": true, "actions": { "source": { "organizeImports": "off" } } }
 }