From e294e7b38ad2911da0dd2e6dafae96490d4757aa Mon Sep 17 00:00:00 2001
From: Horia Coman <horia141@gmail.com>
Date: Fri, 24 May 2024 21:22:13 +0000
Subject: [PATCH] Merged branch feature/moar-small-fixes into develop

---
 scripts/pm2.config.ci.template.js                 |  4 ++--
 scripts/pm2.config.dev.template.js                |  6 +++---
 src/webui/app/rendering/use-nested-entities.ts    |  1 -
 src/webui/app/routes/workspace/time-plans/$id.tsx | 10 +++++-----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/pm2.config.ci.template.js b/scripts/pm2.config.ci.template.js
index 6eed8a186..f830ef0f0 100644
--- a/scripts/pm2.config.ci.template.js
+++ b/scripts/pm2.config.ci.template.js
@@ -15,8 +15,8 @@ module.exports = {
         name: "${NAMESPACE}:webui",
         cwd: "src/webui",
         interpreter: "none",
-        script: "npm",
-        args: "run dev",
+        script: "remix",
+        args: "dev",
         log_file: "$WEBUI_LOG_FILE",
         env: {
             LOCAL_WEBAPI_SERVER_URL: "$WEBAPI_SERVER_URL",
diff --git a/scripts/pm2.config.dev.template.js b/scripts/pm2.config.dev.template.js
index d277d32ce..275ecb2cb 100644
--- a/scripts/pm2.config.dev.template.js
+++ b/scripts/pm2.config.dev.template.js
@@ -11,12 +11,12 @@ module.exports = {
         SQLITE_DB_URL: "$WEBAPI_SQLITE_DB_URL",
         PORT: "$WEBAPI_PORT"
       }
-    },{
+    }, {
         name: "${NAMESPACE}:webui",
         cwd: "src/webui",
         interpreter: "none",
-        script: "npm",
-        args: "run dev",
+        script: "remix",
+        args: "dev",
         log_file: "$WEBUI_LOG_FILE",
         env: {
             LOCAL_WEBAPI_SERVER_URL: "$WEBAPI_SERVER_URL",
diff --git a/src/webui/app/rendering/use-nested-entities.ts b/src/webui/app/rendering/use-nested-entities.ts
index 8477b7904..49180e694 100644
--- a/src/webui/app/rendering/use-nested-entities.ts
+++ b/src/webui/app/rendering/use-nested-entities.ts
@@ -31,7 +31,6 @@ export function useBranchNeedsToShowLeaf() {
       return true;
     }
   }
-
   return false;
 }
 
diff --git a/src/webui/app/routes/workspace/time-plans/$id.tsx b/src/webui/app/routes/workspace/time-plans/$id.tsx
index 3eeeabc0c..6d324dae1 100644
--- a/src/webui/app/routes/workspace/time-plans/$id.tsx
+++ b/src/webui/app/routes/workspace/time-plans/$id.tsx
@@ -281,7 +281,7 @@ export default function TimePlanView() {
         </Card>
 
         <Card>
-          <CardContent>
+          <CardContent sx={{ overflowX: "scroll" }}>
             <ButtonGroup>
               <Button
                 variant="contained"
@@ -423,11 +423,11 @@ export default function TimePlanView() {
             />
           </>
         )}
-
-        <AnimatePresence mode="wait" initial={false}>
-          <Outlet />
-        </AnimatePresence>
       </NestingAwareBlock>
+
+      <AnimatePresence mode="wait" initial={false}>
+        <Outlet />
+      </AnimatePresence>
     </BranchPanel>
   );
 }