Merged branch feature/moar-small-fixes into develop

horia141 · May 24, 2024 · e294e7b · e294e7b
1 parent c37038a
commit e294e7b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>
   );
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ export function useBranchNeedsToShowLeaf() { @@
           return true;
         }
       }
       return false;
     }
@@ Expand Down @@