✨ Restore back node based http server for e2e tests

frontend/playwright.config.js

@@ -85,7 +85,7 @@ export default defineConfig({
   /* Run your local dev server before starting the tests */
   webServer: {
     timeout: 2 * 60 * 1000,
-    command: "caddy file-server --root resources/public/ --listen :3000",
+    command: "node ./scripts/e2e-server.js",
     url: "http://localhost:3000",
     reuseExistingServer: !process.env.CI,
   },

frontend/scripts/e2e-server.js

@@ -0,0 +1,20 @@
+import express from "express";
+import compression from "compression";
+
+import { fileURLToPath } from "url";
+import path from "path";
+
+const app = express();
+const port = 3000;
+
+app.use(compression());
+
+const staticPath = path.join(
+  fileURLToPath(import.meta.url),
+  "../../resources/public",
+);
+app.use(express.static(staticPath));
+
+app.listen(port, () => {
+  console.log(`Listening at 0.0.0.0:${port}`);
+});

frontend/src/app/main/data/workspace/path/changes.cljs

@@ -70,22 +70,20 @@
                               (= (-> content last :command) :move-to))
                        (into [] (take (dec (count content)) content))
                        content)]
-         (st/set-content state content)))
+         (-> state
+             (st/set-content content))))
 
      ptk/WatchEvent
      (watch [it state _]
        (let [page-id     (:current-page-id state)
-             local       (get state :workspace-local)
-             id          (get local :edition)
-             objects     (dsh/lookup-page-objects state page-id)]
+             objects     (dsh/lookup-page-objects state page-id)
+             id          (dm/get-in state [:workspace-local :edition])
+             old-content (dm/get-in state [:workspace-local :edit-path id :old-content])
+             shape       (st/get-path state)]
 
-         ;; NOTE: we proceed only if the shape is present on the
-         ;; objects, if shape is a ephimeral drawing shape, we should
-         ;; do nothing
-         (when-let [shape (get objects id)]
-           (when-let [old-content (dm/get-in local [:edit-path id :old-content])]
-             (let [new-content (get shape :content)
-                   changes     (generate-path-changes it objects page-id shape old-content new-content)]
-               (rx/of (dch/commit-changes changes))))))))))
+         (if (and (some? old-content) (some? (:id shape)))
+           (let [changes (generate-path-changes it objects page-id shape old-content (:content shape))]
+             (rx/of (dch/commit-changes changes)))
+           (rx/empty)))))))
 
 

frontend/src/app/main/data/workspace/path/edition.cljs

@@ -8,6 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.files.helpers :as cfh]
    [app.common.geom.point :as gpt]
    [app.common.types.path :as path]
    [app.common.types.path.helpers :as path.helpers]
@@ -288,34 +289,34 @@
 
 (declare stop-path-edit)
 
-
 (defn start-path-edit
   [id]
   (ptk/reify ::start-path-edit
     ptk/UpdateEvent
     (update [_ state]
       (let [objects   (dsh/lookup-page-objects state)
-            shape     (get objects id)]
+            edit-path (dm/get-in state [:workspace-local :edit-path id])
+            content   (st/get-path state :content)
+            state     (cond-> state
+                        (cfh/path-shape? objects id)
+                        (st/set-content (path/close-subpaths content)))]
 
-        (-> state
-            (st/set-content (path/close-subpaths (:content shape)))
-            (update-in [:workspace-local :edit-path id]
-                       (fn [state]
-                         (let [state (if state
-                                       (if (= :move (:edit-mode state))
-                                         (assoc state :edit-mode :draw)
-                                         state)
-                                       {:edit-mode :move
-                                        :selected #{}
-                                        :snap-toggled false})]
-                           (assoc state :old-content (:content shape))))))))
+        (cond-> state
+          (or (not edit-path)
+              (= :draw (:edit-mode edit-path)))
+          (assoc-in [:workspace-local :edit-path id] {:edit-mode :move
+                                                      :selected #{}
+                                                      :snap-toggled false})
+          (and (some? edit-path)
+               (= :move (:edit-mode edit-path)))
+          (assoc-in [:workspace-local :edit-path id :edit-mode] :draw))))
 
     ptk/WatchEvent
     (watch [_ _ stream]
-      (let [stopper (rx/filter #(let [type (ptk/type %)]
-                                  (= type ::dwe/clear-edition-mode)
-                                  (= type ::start-path-edit))
-                               stream)]
+      (let [stopper (->> stream
+                         (rx/filter #(let [type (ptk/type %)]
+                                       (= type ::dwe/clear-edition-mode)
+                                       (= type ::start-path-edit))))]
         (rx/concat
          (rx/of (undo/start-path-undo))
          (->> stream
@@ -324,8 +325,7 @@
               (rx/map #(stop-path-edit id))
               (rx/take-until stopper)))))))
 
-(defn stop-path-edit
-  [id]
+(defn stop-path-edit [id]
   (ptk/reify ::stop-path-edit
     ptk/UpdateEvent
     (update [_ state]
@@ -335,12 +335,13 @@
     (watch [_ _ _]
       (rx/of (ptk/data-event :layout/update {:ids [id]})))))
 
-(defn- split-segments
-  [id {:keys [from-p to-p t]}]
+(defn split-segments
+  [{:keys [from-p to-p t]}]
   (ptk/reify ::split-segments
     ptk/UpdateEvent
     (update [_ state]
-      (let [content (st/get-path state :content)]
+      (let [id (st/get-path-id state)
+            content (st/get-path state :content)]
         (-> state
             (assoc-in [:workspace-local :edit-path id :old-content] content)
             (st/set-content (-> content
@@ -352,10 +353,10 @@
       (rx/of (changes/save-path-content {:preserve-move-to true})))))
 
 (defn create-node-at-position
-  [params]
+  [event]
   (ptk/reify ::create-node-at-position
     ptk/WatchEvent
     (watch [_ state _]
       (let [id (st/get-path-id state)]
         (rx/of (dwsh/update-shapes [id] path/convert-to-path)
-               (split-segments id params))))))
+               (split-segments event))))))