Просмотр исходного кода

fix: whiteboard rename use the same logic

Tienson Qin 1 год назад
Родитель
Сommit
66c36326a1

+ 1 - 2
e2e-tests/whiteboards.spec.ts

@@ -67,7 +67,7 @@ test('update whiteboard title', async ({ page }) => {
   await page.click('.whiteboard-page-title')
   await page.fill('.whiteboard-page-title input', title + '-2')
   await page.keyboard.press('Enter')
-  await page.click('.ui__modal-enter')
+
   await expect(page.locator('.whiteboard-page-title .title')).toContainText(
     title + '-2'
   )
@@ -91,7 +91,6 @@ test('draw a rectangle', async ({ page }) => {
 
 test('undo the rectangle action', async ({ page }) => {
   await page.keyboard.press(modKey + '+z')
-
   await expect(page.locator('.logseq-tldraw .tl-positioned-svg rect')).toHaveCount(0)
 })
 

+ 1 - 8
src/main/frontend/components/page.cljs

@@ -252,14 +252,7 @@
                        (db/page-exists? page-name)
                        (db/page-exists? @*title-value))
         rename-fn (fn [old-name new-name]
-                    (if (and whiteboard-page? (config/db-based-graph? (state/get-current-repo)))
-                      (p/do!
-                       (db/transact! [{:db/id (:db/id page)
-                                       :block/original-name new-name
-                                       :block/name (util/page-name-sanity-lc new-name)
-                                       :block/updated-at (util/time-ms)}])
-                       (route-handler/redirect-to-whiteboard! new-name))
-                      (page-handler/rename! old-name new-name)))
+                    (page-handler/rename! old-name new-name))
         rollback-fn #(let [old-name (if untitled? "" old-name)]
                        (reset! *title-value old-name)
                        (gobj/set (rum/deref input-ref) "value" old-name)

+ 1 - 1
src/main/frontend/state.cljs

@@ -821,7 +821,7 @@ Similar to re-frame subscriptions"
 
 (defn get-current-page
   []
-  (when (= :page (get-current-route))
+  (when (contains? #{:whiteboard :page} (get-current-route)) ; TODO: move /whiteboard to /page
     (get-in (get-route-match)
             [:path-params :name])))