Merge pull request 'feat: support sidebar history item pin feature and show the version in settings page' (#93) from historybar_UI into main

Reviewed-on: https://git.biggo.com/john/dive/pulls/93

Author: johnfunmula

src/atoms/historyState.ts

@@ -1,9 +1,17 @@
-import { atom } from 'jotai'
+import { atom } from "jotai"
 
+interface ChatHistoryResponse {
+  starred: ChatHistory[]
+  normal: ChatHistory[]
+}
 export interface ChatHistory {
   id: string
   title: string
   createdAt: string
+  updatedAt: string
+  starredAt: string
+  user_id: string
+  type: "normal" | "starred"
 }
 
 export const historiesAtom = atom<ChatHistory[]>([])
@@ -16,7 +24,12 @@ export const loadHistoriesAtom = atom(
       const data = await response.json()
 
       if (data.success) {
-        set(historiesAtom, data.data)
+        const response: ChatHistoryResponse = data.data
+        const historyList: ChatHistory[] = []
+        Object.entries(response).forEach(([key, value]) => {
+          historyList.push(...value.map((item: ChatHistory) => ({ ...item, type: key })))
+        })
+        set(historiesAtom, historyList)
       }
     } catch (error) {
       console.warn("Failed to load chat history:", error)

src/atoms/sidebarState.ts

@@ -1,11 +1,13 @@
 import { atom } from "jotai"
 
 export const sidebarVisibleAtom = atom(false)
+const originalSidebarWidthAtom = atom(false)
 
 export const toggleSidebarAtom = atom(
   null,
   (get, set) => {
     set(sidebarVisibleAtom, !get(sidebarVisibleAtom))
+    set(originalSidebarWidthAtom, get(sidebarVisibleAtom))
   }
 )
 
@@ -21,6 +23,8 @@ export const handleWindowResizeAtom = atom(
   (get, set) => {
     if (window.innerWidth < 900) {
       set(sidebarVisibleAtom, false)
+    } else if (window.innerWidth > 900 && get(originalSidebarWidthAtom)) {
+      set(sidebarVisibleAtom, true)
     }
   }
 )

src/components/HistorySidebar.tsx

@@ -3,6 +3,8 @@ import useUpdateProgress from "../hooks/useUpdateProgress"
 import { memo, useCallback, useState } from "react"
 import { useTranslation } from "react-i18next"
 import { showToastAtom } from "../atoms/toastState"
+import Button from "./Button"
+import { version } from "../../package.json"
 
 const AvailableButton = ({ newVersion }: { newVersion: string }) => {
   const { t } = useTranslation()
@@ -14,7 +16,10 @@ const AvailableButton = ({ newVersion }: { newVersion: string }) => {
         <span className="update-btn-text">{t("sidebar.update")}</span>
       </div>
       <div className="update-btn-text">
-        <span>v{newVersion} &gt;</span>
+        <span>v{newVersion}</span>
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" strokeWidth="2" viewBox="0 0 24 24" width="18" height="18">
+          <path strokeLinecap="round" strokeLinejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5"></path>
+        </svg>
       </div>
     </>
   )
@@ -64,18 +69,20 @@ const UpdateButton = () => {
     }, [showToast])
   )
 
-  if (!newVersion) {
-    return null
-  }
-
   return (
     <div className="update-btn-container">
-      <button
-        className={`sidebar-footer-btn update-btn ${progress === 0 ? "available" : "downloading"}`}
-        onClick={update}
-      >
-        {progress === 0 ? <AvailableButton newVersion={newVersion} /> : <DownloadingButton progress={progress} isCompleted={isCompleted} />}
-      </button>
+      <span className="update-version-text">Dive Version: v{version}</span>
+      {newVersion &&
+        <Button
+          className={`update-btn ${progress === 0 ? "available" : "downloading"}`}
+          size="fit"
+          padding="xxs"
+          minHeight="44px"
+          onClick={update}
+        >
+          {progress === 0 ? <AvailableButton newVersion={newVersion} /> : <DownloadingButton progress={progress} isCompleted={isCompleted} />}
+        </Button>
+      }
     </div>
   )
 }

src/components/UpdateButton.tsx

@@ -16,6 +16,7 @@
     "deleteSuccess": "Chat deleted",
     "deleteFailed": "Delete failed",
     "confirmDelete": "Confirm Delete",
+    "confirmDeleteDescription": "Once deleted, the chat cannot be recovered.",
     "tools": "Tools",
     "abort": "Stop Generating",
     "retry": "Retry",
@@ -71,7 +72,16 @@
     "system": "System Settings",
     "manageAndSettings": "Manage and Settings",
     "OAPhub": "OAPhub",
-    "signOut": "Sign Out"
+    "signOut": "Sign Out",
+    "chat": {
+      "starredChat": "Starred",
+      "starChat": "Star",
+      "unStarChat": "Unstar",
+      "starFailed": "Star failed",
+      "renameChat": "Rename",
+      "renameFailed": "Rename failed",
+      "deleteChat": "Delete"
+    }
   },
   "tools": {
     "title": "Tools Management(MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "Download Image",
     "login": "Login",
     "signup": "Sign Up",
-    "save": "Save"
+    "save": "Save",
+    "signout": "Sign Out"
   },
   "models": {
     "title": "Model Settings",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "Downloading",
+    "downloading": "New Version Downloading",
     "readyToInstall": "Ready to Install",
     "clickToInstall": "Click to Install Update"
   },

src/locales/en/translation.json

@@ -16,6 +16,7 @@
     "deleteSuccess": "Chat eliminado",
     "deleteFailed": "Error al eliminar",
     "confirmDelete": "Confirmar Eliminación",
+    "confirmDeleteDescription": "El chat una vez eliminado no se puede recuperar.",
     "tools": "Herramientas",
     "abort": "Detener generación de respuesta",
     "retry": "Reintentar",
@@ -71,7 +72,16 @@
     "system": "Configuración del Sistema",
     "manageAndSettings": "Gestión y Configuración",
     "OAPhub": "OAPhub",
-    "signOut": "Cerrar sesión"
+    "signOut": "Cerrar sesión",
+    "chat": {
+      "starredChat": "Favorito",
+      "starChat": "Marcar como favorito",
+      "unStarChat": "Quitar de favoritos",
+      "starFailed": "Error al marcar como favorito",
+      "renameChat": "Renombrar",
+      "renameFailed": "Error al renombrar",
+      "deleteChat": "Eliminar"
+    }
   },
   "tools": {
     "title": "Gestión de Herramientas (MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "Descargar imagen",
     "login": "Iniciar sesión",
     "signup": "Registrarse",
-    "save": "Guardar"
+    "save": "Guardar",
+    "signout": "Cerrar sesión"
   },
   "models": {
     "title": "Configuración de Modelos",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "Descargando",
+    "downloading": "Descargando nueva versión",
     "readyToInstall": "Descarga completada",
     "clickToInstall": "Haga clic para instalar la actualización"
   },

src/locales/es/translation.json

@@ -16,6 +16,7 @@
     "deleteSuccess": "チャットを削除しました",
     "deleteFailed": "削除に失敗しました",
     "confirmDelete": "削除の確認",
+    "confirmDeleteDescription": "チャット一經削除即永久無法復原。",
     "tools": "ツール",
     "abort": "生成を停止",
     "retry": "再試行",
@@ -71,7 +72,16 @@
     "system": "システム設定",
     "manageAndSettings": "管理と設定",
     "OAPhub": "OAPhub",
-    "signOut": "ログアウト"
+    "signOut": "ログアウト",
+    "chat": {
+      "starredChat": "釘選済み",
+      "starChat": "釘選",
+      "unStarChat": "釘選解除",
+      "starFailed": "釘選に失敗しました",
+      "renameChat": "名前変更",
+      "renameFailed": "名前変更失敗",
+      "deleteChat": "削除"
+    }
   },
   "tools": {
     "title": "ツール管理(MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "画像をダウンロード",
     "login": "ログイン",
     "signup": "サインアップ",
-    "save": "保存"
+    "save": "保存",
+    "signout": "ログアウト"
   },
   "models": {
     "title": "モデル設定",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "ダウンロード中",
+    "downloading": "新バージョンをダウンロード中",
     "readyToInstall": "インストール準備完了",
     "clickToInstall": "クリックしてアップデートをインストール"
   },

src/locales/ja/translation.json

@@ -16,6 +16,7 @@
     "deleteSuccess": "채팅이 삭제되었습니다",
     "deleteFailed": "삭제에 실패했습니다",
     "confirmDelete": "삭제 확인",
+    "confirmDeleteDescription": "채팅 삭제 후 복구가 불가능합니다.",
     "tools": "도구",
     "abort": "생성 중단",
     "retry": "다시 시도",
@@ -71,7 +72,16 @@
     "system": "시스템 설정",
     "manageAndSettings": "관리 및 설정",
     "OAPhub": "OAPhub",
-    "signOut": "로그아웃"
+    "signOut": "로그아웃",
+    "chat": {
+      "starredChat": "즐겨찾기",
+      "starChat": "즐겨찾기",
+      "unStarChat": "즐겨찾기 해제",
+      "starFailed": "즐겨찾기 실패",
+      "renameChat": "이름 변경",
+      "renameFailed": "이름 변경 실패",
+      "deleteChat": "삭제"
+    }
   },
   "tools": {
     "title": "도구 관리 (MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "이미지 다운로드",
     "login": "로그인",
     "signup": "회원가입",
-    "save": "저장"
+    "save": "저장",
+    "signout": "로그아웃"
   },
   "models": {
     "title": "모델 설정",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "다운로드 중",
+    "downloading": "새 버전 다운로드 중",
     "readyToInstall": "설치 준비 완료",
     "clickToInstall": "업데이트 설치하려면 클릭하세요"
   },

src/locales/ko/translation.json

@@ -16,6 +16,7 @@
     "deleteSuccess": "对话已删除",
     "deleteFailed": "删除失败",
     "confirmDelete": "确认删除",
+    "confirmDeleteDescription": "对话一经删除即永久无法恢复。",
     "tools": "工具",
     "abort": "停止生成回应",
     "retry": "重试",
@@ -71,7 +72,16 @@
     "system": "系统设置",
     "manageAndSettings": "管理与设置",
     "OAPhub": "OAPhub",
-    "signOut": "登出"
+    "signOut": "登出",
+    "chat": {
+      "starredChat": "已钉选",
+      "starChat": "钉选",
+      "unStarChat": "取消钉选",
+      "starFailed": "钉选失败",
+      "renameChat": "重新命名",
+      "renameFailed": "重新命名失败",
+      "deleteChat": "删除"
+    }
   },
   "tools": {
     "title": "工具管理(MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "下载图片",
     "login": "登录",
     "signup": "注册",
-    "save": "保存"
+    "save": "保存",
+    "signout": "登出"
   },
   "models": {
     "title": "模型设置",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "下载中",
+    "downloading": "新版本下载中",
     "readyToInstall": "下载完成",
     "clickToInstall": "点击安装更新"
   },

src/locales/zh-CN/translation.json

@@ -16,6 +16,7 @@
     "deleteSuccess": "對話已刪除",
     "deleteFailed": "刪除失敗",
     "confirmDelete": "確認刪除",
+    "confirmDeleteDescription": "對話一經刪除即永久無法復原。",
     "tools": "工具",
     "abort": "停止生成回應",
     "retry": "重試",
@@ -71,7 +72,16 @@
     "system": "帳號與系統設定",
     "manageAndSettings": "管理與設定",
     "OAPhub": "OAPhub",
-    "signOut": "登出"
+    "signOut": "登出",
+    "chat": {
+      "starredChat": "已釘選",
+      "starChat": "釘選",
+      "unStarChat": "取消釘選",
+      "starFailed": "釘選失敗",
+      "renameChat": "重新命名",
+      "renameFailed": "重新命名失敗",
+      "deleteChat": "刪除"
+    }
   },
   "tools": {
     "title": "工具管理(MCP)",
@@ -214,7 +224,8 @@
     "downloadImage": "下載圖片",
     "login": "登入",
     "signup": "註冊",
-    "save": "儲存"
+    "save": "儲存",
+    "signout": "登出"
   },
   "models": {
     "title": "模型設定",
@@ -374,7 +385,7 @@
     }
   },
   "update": {
-    "downloading": "下載中",
+    "downloading": "新版本下載中",
     "readyToInstall": "下載完成",
     "clickToInstall": "點擊安裝更新"
   },