fix: whiteboard page rename

e2e-tests/whiteboards.spec.ts

@@ -67,13 +67,6 @@ 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')
-
-  // Updating non-default title should pop up a confirmation dialog
-  await expect(page.locator('.ui__confirm-modal >> .headline')).toContainText(
-    `Do you really want to change the page name to “${title}-2”?`
-  )
-
-  await page.click('.ui__confirm-modal button')
   await expect(page.locator('.whiteboard-page-title .title')).toContainText(
     title + '-2'
   )
@@ -500,4 +493,4 @@ test('Renaming a page to an existing whiteboard name should be prohibited', asyn
   await renamePage(page, "My embedded whiteboard")
 
   await expect(page.locator('.page-title input')).toHaveValue('My page')
-})
+})

src/main/frontend/components/page_menu.cljs

@@ -70,7 +70,7 @@
           repo (state/sub :git/current-repo)
           page (db/entity repo [:block/name page-name])
           page-original-name (:block/original-name page)
-          whiteboard? (contains? (:block/type page) "whiteboard")
+          whiteboard? (contains? (set (:block/type page)) "whiteboard")
           block? (and page (util/uuid-string? page-name) (not whiteboard?))
           contents? (= page-name "contents")
           properties (:block/properties page)

src/main/frontend/components/right_sidebar.cljs

@@ -151,7 +151,7 @@
       [[:.flex.items-center.page-title
         (if-let [icon (pu/lookup (:block/properties page) :icon)]
           [:.text-md.mr-2 icon]
-          (ui/icon (if (contains? (:block/type page) "whiteboard") "whiteboard" "page") {:class "text-md mr-2"}))
+          (ui/icon (if (contains? (set (:block/type page)) "whiteboard") "whiteboard" "page") {:class "text-md mr-2"}))
         [:span.overflow-hidden.text-ellipsis (db-model/get-page-original-name page-name)]]
        (page-cp repo page-name)])
 

src/main/frontend/db/model.cljs

@@ -1417,13 +1417,13 @@ independent of format as format specific heading characters are stripped"
     (string? page)
     (let [page (db-utils/entity [:block/name (util/safe-page-name-sanity-lc page)])]
       (or
-       (contains? (:block/type page) "whiteboard")
+       (contains? (set (:block/type page)) "whiteboard")
        (when-let [file (:block/file page)]
          (when-let [path (:file/path (db-utils/entity (:db/id file)))]
            (gp-config/whiteboard? path)))))
 
     (seq page)
-    (contains? (:block/type page) "whiteboard")
+    (contains? (set (:block/type page)) "whiteboard")
 
     :else false))
 

src/main/frontend/handler/export.cljs

@@ -314,7 +314,7 @@
                [?b :block/name]] db)
 
         (map (fn [[{:block/keys [name] :as page}]]
-               (let [whiteboard? (contains? (:block/type page) "whiteboard")
+               (let [whiteboard? (contains? (set (:block/type page)) "whiteboard")
                      blocks (db/get-page-blocks-no-cache
                              (state/get-current-repo)
                              name