瀏覽代碼

fix: page rename e2e tests

Tienson Qin 2 年之前
父節點
當前提交
62d632e1de
共有 2 個文件被更改,包括 12 次插入12 次删除
  1. 0 2
      e2e-tests/page-rename.spec.ts
  2. 12 10
      src/main/frontend/components/page.cljs

+ 0 - 2
e2e-tests/page-rename.spec.ts

@@ -15,7 +15,6 @@ async function page_rename_test(page: Page, original_page_name: string, new_page
 
   // Rename page in UI
   await renamePage(page, new_name)
-  await page.click('.ui__confirm-modal button')
 
   expect(await page.innerText('.page-title .title')).toBe(new_name)
 
@@ -46,7 +45,6 @@ async function homepage_rename_test(page: Page, original_page_name: string, new_
   expect(await page.locator('.home-nav span.flex-1').innerText()).toBe(original_name);
 
   await renamePage(page, new_name)
-  await page.click('.ui__confirm-modal button')
 
   expect(await page.locator('.home-nav span.flex-1').innerText()).toBe(new_name);
 

+ 12 - 10
src/main/frontend/components/page.cljs

@@ -282,7 +282,9 @@
                         (rollback-fn))
 
                     :else
-                    (rename-fn (or title page-name) @*title-value))
+                    (do
+                      (rename-fn (or title page-name) @*title-value)
+                      (reset! *edit? false)))
                   (util/stop e))]
     [:input.edit-input.p-0.focus:outline-none.ring-none
      {:type          "text"
@@ -412,10 +414,9 @@
   (rum/local false ::configuring?)
   {:init (fn [state]
            (let [page-name (first (:rum/args state))
-                 original-name (if page-name
-                                 (:block/origina-name (db/entity [:block/name (util/page-name-sanity-lc page-name)]))
-                                 "")]
-             (assoc state ::title-value (atom original-name))))}
+                 original-name (:block/original-name (db/entity [:block/name (util/page-name-sanity-lc page-name)]))
+                 *title-value (atom original-name)]
+             (assoc state ::title-value *title-value)))}
   [state page-name {:keys [fmt-journal? preview?]}]
   (when page-name
     (let [page (when page-name (db/entity [:block/name page-name]))
@@ -754,11 +755,12 @@
                  :on-mouse-leave (fn [e]
                                    (page-mouse-leave e *control-show?))}
                 (page-blocks-collapse-control title *control-show? *all-collapsed?)])
-             (when-not whiteboard?
-               (page-title page-name {:journal? journal?
-                                      :fmt-journal? fmt-journal?
-                                      :built-in-property? built-in-property?
-                                      :preview? preview?}))
+             (let [original-name (:block/original-name (db/entity [:block/name (util/page-name-sanity-lc page-name)]))]
+               (when (and (not whiteboard?) original-name)
+                (page-title page-name {:journal? journal?
+                                       :fmt-journal? fmt-journal?
+                                       :built-in-property? built-in-property?
+                                       :preview? preview?})))
              (when (not config/publishing?)
                (when config/lsp-enabled?
                  [:div.flex.flex-row