Browse Source

enhance(ux): create remote graph by default

Tienson Qin 3 days ago
parent
commit
709c8257cc

+ 23 - 18
src/main/frontend/components/repo.cljs

@@ -478,14 +478,24 @@
 (rum/defc new-db-graph
   []
   (let [[creating-db? set-creating-db?] (hooks/use-state false)
-        [cloud? set-cloud?] (hooks/use-state false)
+        [cloud? set-cloud?] (hooks/use-state true)
         [e2ee-rsa-key-ensured? set-e2ee-rsa-key-ensured?] (hooks/use-state nil)
-        input-ref (hooks/create-ref)]
+        input-ref (hooks/create-ref)
+        [input-value set-input-value!] (hooks/use-state "")]
+
     (hooks/use-effect!
      (fn []
-       (when-let [^js input (hooks/deref input-ref)]
-         (js/setTimeout #(.focus input) 32)))
+       (let [token (state/get-auth-id-token)
+             user-uuid (user-handler/user-uuid)]
+         (when (and cloud? (not e2ee-rsa-key-ensured?))
+           (when (and token user-uuid)
+             (-> (p/let [rsa-key-pair (state/<invoke-db-worker :thread-api/get-user-rsa-key-pair token user-uuid)]
+                   (set-e2ee-rsa-key-ensured? (some? rsa-key-pair)))
+                 (p/catch (fn [e]
+                            (log/error :get-user-rsa-key-pair e)
+                            e)))))))
      [])
+
     (letfn [(new-db-f [graph-name]
               (when-not (or (string/blank? graph-name)
                             creating-db?)
@@ -515,28 +525,22 @@
        (shui/input
         {:disabled creating-db?
          :ref input-ref
-         :placeholder "your graph name"
+         :auto-focus true
+         :placeholder "Graph name"
          :on-key-down submit!
+         :on-change (fn [e] (set-input-value! (util/evalue e)))
+         :value input-value
          :autoComplete "off"})
        (when (user-handler/rtc-group?)
          [:div.flex.flex-col
           [:div.flex.flex-row.items-center.gap-1
            (shui/checkbox
             {:id "rtc-sync"
-             :value cloud?
+             :checked cloud?
              :on-checked-change
              (fn []
-               (let [v (boolean (not cloud?))
-                     token (state/get-auth-id-token)
-                     user-uuid (user-handler/user-uuid)]
-                 (set-cloud? v)
-                 (when (and (true? v) (not e2ee-rsa-key-ensured?))
-                   (when (and token user-uuid)
-                     (-> (p/let [rsa-key-pair (state/<invoke-db-worker :thread-api/get-user-rsa-key-pair token user-uuid)]
-                           (set-e2ee-rsa-key-ensured? (some? rsa-key-pair)))
-                         (p/catch (fn [e]
-                                    (log/error :get-user-rsa-key-pair e)
-                                    e)))))))})
+               (let [v (boolean (not cloud?))]
+                 (set-cloud? v)))})
            [:label.opacity-70.text-sm
             {:for "rtc-sync"}
             "Use Logseq Sync?"]]
@@ -545,7 +549,8 @@
              {:for "rtc-sync"}
              "Need to init E2EE settings first, Settings > Encryption"])])
        (shui/button
-        {:disabled (and cloud? (not e2ee-rsa-key-ensured?))
+        {:disabled (or (and cloud? (not e2ee-rsa-key-ensured?))
+                       (string/blank? input-value))
          :on-click #(submit! % true)
          :on-key-down submit!}
         (if creating-db?

+ 0 - 1
src/resources/dicts/ca.edn

@@ -38,7 +38,6 @@
  :logout                                            "Tancar sessió"
  :new-graph                                         "Afegir nou graf"
  :new-page                                          "Nova pàgina:"
- :open-a-directory                                  "Obrir un directori local"
  :parsing-files                                     "Analitzant arxius"
  :plugins                                           "Extensions"
  :port                                              "Port"

+ 0 - 1
src/resources/dicts/cs.edn

@@ -445,7 +445,6 @@
  :remove-heading                                   "Odstranit nadpis"
  :heading                                          "Nadpis {1}"
  :auto-heading                                     "Automatický nadpis"
- :open-a-directory                                 "Otevřít místní adresár"
  :toggle-theme                                     "Přepnout motiv"
 
  :help/shortcut-page-title                         "Klávesové zkratky"

+ 0 - 1
src/resources/dicts/de.edn

@@ -44,7 +44,6 @@
  :new-graph "Neuen Graphen hinzufügen"
  :new-page "Neue Seite:"
  :new-tag "Neuer Tag:"
- :open-a-directory "Öffne ein lokales Verzeichnis"
  :parsing-files "Dateien analysieren"
  :plugins "Plugins"
  :port "Port"

+ 0 - 1
src/resources/dicts/en.edn

@@ -489,7 +489,6 @@
  :remove-heading "Remove heading"
  :heading "Heading {1}"
  :auto-heading "Auto heading"
- :open-a-directory "Open a local directory"
  :toggle-theme      "Toggle theme"
 
  :help/shortcut-page-title "Keyboard shortcuts"

+ 0 - 1
src/resources/dicts/es.edn

@@ -38,7 +38,6 @@
  :logout                                            "Cerrar sesión"
  :new-graph                                         "Añadir nuevo grafo"
  :new-page                                          "Nueva página:"
- :open-a-directory                                  "Abrir un directorio local"
  :parsing-files                                     "Analizando archivos"
  :plugins                                           "Extensiones"
  :port                                              "Puerto"

+ 0 - 1
src/resources/dicts/fa.edn

@@ -307,7 +307,6 @@
  :download "بارگیری"
  :language "زبان"
  :remove-background "حذف پس‌زمینه"
- :open-a-directory "باز کردن یک پوشه محلی"
  :toggle-theme      "تغییر پوسته"
 
  :help/shortcut-page-title "کلیدهای میان‌بر"

+ 0 - 1
src/resources/dicts/fr.edn

@@ -87,7 +87,6 @@
     :login "Connexion"
     :logout "Déconnexion"
     :new-graph "Ajouter un nouveau graphe"
-    :open-a-directory "Ouvrir un dossier local"
     :plugins "Extensions"
     :port "Port"
     :re-index-detail "Reconstruire le graphe"

+ 0 - 1
src/resources/dicts/id.edn

@@ -443,7 +443,6 @@
  :remove-heading "Hapus judul"
  :heading "Judul {1}"
  :auto-heading "Judul otomatis"
- :open-a-directory "Buka direktori lokal"
  :toggle-theme "Alihkan tema"
 
  :help/shortcut-page-title "Pintasan Papan Ketik"

+ 0 - 1
src/resources/dicts/it.edn

@@ -133,7 +133,6 @@
  :download "Scarica"
  :language "Lingua"
  :remove-background "Rimuovi lo sfondo"
- :open-a-directory "Apri una cartella locale"
  :help/shortcut-page-title "Scorciatoie da tastiera"
  :plugin/installed "Installati"
  :plugin/not-installed "Non installati"

+ 0 - 1
src/resources/dicts/ja.edn

@@ -465,7 +465,6 @@
  :remove-heading "見出しを消去"
  :heading "見出し {1}"
  :auto-heading "自動見出し"
- :open-a-directory "ローカルディレクトリを開く"
  :toggle-theme "テーマを切り替える"
 
  :help/shortcut-page-title "キーボードショートカット"

+ 1 - 2
src/resources/dicts/ko.edn

@@ -139,7 +139,6 @@
  :download "다운로드"
  :language "언어"
  :remove-background "배경 제거"
- :open-a-directory "로컬 디렉토리 열기"
 
  :help/shortcut-page-title "키보드 단축키"
 
@@ -376,7 +375,7 @@
  :command.ui/install-plugins-from-file            "plugins.edn에서 플러그인 설치"
  :command.command-palette/toggle                  "명령어 검색"
  :command.go/search-in-page                       "현재 페이지에서 블록 검색"
- 
+
  :settings-page/preferred-outdenting-tip "왼쪽은 기본 상태, 오른쪽은 설정이 활성화된 상태를 표시합니다. "
  :settings-page/preferred-outdenting-tip-more "→ 더 알아보기"
  :settings-page/preferred-pasting-file-hint "활성화하면, 인터넷으로부터 이미지를 붙여넣기할 때 이미지를 다운로드한 뒤 삽입합니다. 비활성화하면, 이미지의 링크를 붙여넣습니다."

+ 0 - 1
src/resources/dicts/nb-no.edn

@@ -131,7 +131,6 @@
  :download "Last ned"
  :language "Språk"
  :remove-background "Fjern bakgrunn"
- :open-a-directory "Åpne en lokal mappe"
 
  :help/shortcut-page-title "Tastatursnarveier"
 

+ 0 - 1
src/resources/dicts/nl.edn

@@ -25,7 +25,6 @@
  :login "Inloggen"
  :logout "Uitloggen"
  :new-graph "Nieuwe grafiek toevoegen"
- :open-a-directory "Open een lokale map"
  :parsing-files "Bestanden analyseren"
  :plugins "Plugins"
  :port "Poort"

+ 0 - 1
src/resources/dicts/pl.edn

@@ -150,7 +150,6 @@
  :download "Ściągnij"
  :language "Język"
  :remove-background "Usuń tło"
- :open-a-directory "Otwórz lokalny katalog"
  :help/shortcut-page-title "Skróty klawiszowe"
  :plugin/installed "Zainstalowany"
  :plugin/not-installed "Nie zainstalowany"

+ 0 - 1
src/resources/dicts/pt-br.edn

@@ -445,7 +445,6 @@
  :remove-heading "Remover cabeçalho"
  :heading "Cabeçalho {1}"
  :auto-heading "Cabeçalho automático"
- :open-a-directory "Abrir um diretório local"
  :toggle-theme "Alternar tema"
 
  :help/shortcut-page-title "Atalhos de teclado"

+ 0 - 1
src/resources/dicts/pt-pt.edn

@@ -195,7 +195,6 @@
  :remove-heading "Remover título"
  :heading "Título {1}"
  :auto-heading "Título automático"
- :open-a-directory "Abrir uma pasta local"
 
  :help/shortcut-page-title "Atalhos de teclado"
 

+ 0 - 1
src/resources/dicts/ru.edn

@@ -327,7 +327,6 @@
  :remove-heading                                       "Удалить заголовок"
  :heading                                              "Заголовок {1}"
  :auto-heading                                         "Автоматический заголовок"
- :open-a-directory                                     "Открыть локальный каталог"
  :toggle-theme                                         "Переключить тему"
 
  :help/shortcut-page-title                             "Сочетания клавиш"

+ 0 - 1
src/resources/dicts/sk.edn

@@ -446,7 +446,6 @@
  :remove-heading                                   "Odstrániť nadpis"
  :heading                                          "Nadpis {1}"
  :auto-heading                                     "Automatický nadpis"
- :open-a-directory                                 "Otvoriť lokálny adresár"
  :toggle-theme                                     "Prepnúť motív"
 
  :help/shortcut-page-title                         "Klávesové skratky"

+ 0 - 1
src/resources/dicts/tr.edn

@@ -458,7 +458,6 @@
  :remove-heading "Başlığı kaldır"
  :heading "Başlık {1}"
  :auto-heading "Otomatik başlık"
- :open-a-directory "Yerel bir dizin aç"
  :toggle-theme "Temayı değiştir"
 
  :help/shortcut-page-title "Klavye kısayolları"

+ 0 - 1
src/resources/dicts/uk.edn

@@ -218,7 +218,6 @@
  :remove-heading "Видалити заголовок"
  :heading "Заголовок {1}"
  :auto-heading "Авто заголовок"
- :open-a-directory "Відкрити локальку директорію"
 
  :help/shortcut-page-title "Кобмінації клавіш"
 

+ 0 - 1
src/resources/dicts/zh-cn.edn

@@ -241,7 +241,6 @@
  :remove-background "去除背景"
  :remove-heading "移除 heading"
  :auto-heading "自动转为 heading"
- :open-a-directory "打开本地文件夹"
  :all-whiteboards "所有白板"
 
  :plugin/installed "已安装"

+ 0 - 1
src/resources/dicts/zh-hant.edn

@@ -202,7 +202,6 @@
  :remove-heading "移除標頭"
  :heading "標頭 {1}"
  :auto-heading "自動寫入標頭"
- :open-a-directory "於本地開啟資料夾"
 
  :help/shortcut-page-title "鍵盤快捷鍵"