Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
SKY-10578: Add credential folders (frontend) (#6376)
Celal Zamanoğlu817cc9f0759b
diff --git a/skyvern-frontend/src/api/types.ts b/skyvern-frontend/src/api/types.tsindex faa2341f3..19fbf29b2 100644--- a/skyvern-frontend/src/api/types.ts+++ b/skyvern-frontend/src/api/types.ts@@ -748,6 +748,7 @@ export type CredentialApiResponse = {tested_url?: string | null;user_context?: string | null;save_browser_session_intent?: boolean | null;+ folder_id?: string | null;};export function isPasswordCredential(diff --git a/skyvern-frontend/src/routes/credentials/CreateCredentialFolderDialog.tsx b/skyvern-frontend/src/routes/credentials/CreateCredentialFolderDialog.tsxnew file mode 100644index 000000000..df7856b0e--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/CreateCredentialFolderDialog.tsx@@ -0,0 +1,109 @@+import { useState } from "react";+import { Button } from "@/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { Textarea } from "@/components/ui/textarea";+import { useCreateCredentialFolderMutation } from "./hooks/useCredentialFolderMutations";++interface CreateCredentialFolderDialogProps {+ open: boolean;+ onOpenChange: (open: boolean) => void;+}++function CreateCredentialFolderDialog({+ open,+ onOpenChange,+}: CreateCredentialFolderDialogProps) {+ const [title, setTitle] = useState("");+ const [description, setDescription] = useState("");+ const createFolderMutation = useCreateCredentialFolderMutation();++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault();+ if (!title.trim()) return;++ try {+ await createFolderMutation.mutateAsync({+ title: title.trim(),+ description: description.trim() || null,+ });+ setTitle("");+ setDescription("");+ onOpenChange(false);+ } catch {+ // onError toast already surfaces the failure+ }+ };++ const handleOpenChange = (open: boolean) => {+ onOpenChange(open);+ if (!open) {+ setTitle("");+ setDescription("");+ }+ };++ return (+ <Dialog open={open} onOpenChange={handleOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Create New Folder</DialogTitle>+ <DialogDescription>+ Create a folder to organize your credentials.+ </DialogDescription>+ </DialogHeader>+ <form onSubmit={handleSubmit}>+ <div className="grid gap-4 py-4">+ <div className="grid gap-2">+ <Label htmlFor="credential-folder-title">Title</Label>+ <Input+ id="credential-folder-title"+ value={title}+ onChange={(e) => setTitle(e.target.value)}+ placeholder="e.g., Production Credentials"+ autoFocus+ />+ </div>+ <div className="grid gap-2">+ <Label htmlFor="credential-folder-description">+ Description (optional)+ </Label>+ <Textarea+ id="credential-folder-description"+ value={description}+ onChange={(e) => setDescription(e.target.value)}+ placeholder="Add a description..."+ rows={3}+ />+ </div>+ </div>+ <DialogFooter>+ <Button+ type="button"+ variant="outline"+ onClick={() => handleOpenChange(false)}+ >+ Cancel+ </Button>+ <Button+ type="submit"+ disabled={!title.trim() || createFolderMutation.isPending}+ >+ Create Folder+ </Button>+ </DialogFooter>+ </form>+ </DialogContent>+ </Dialog>+ );+}++export { CreateCredentialFolderDialog };diff --git a/skyvern-frontend/src/routes/credentials/CredentialFolderCard.tsx b/skyvern-frontend/src/routes/credentials/CredentialFolderCard.tsxnew file mode 100644index 000000000..53e5fd7be--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/CredentialFolderCard.tsx@@ -0,0 +1,101 @@+import { Pencil1Icon } from "@radix-ui/react-icons";+import { FolderIcon } from "@/components/icons/FolderIcon";+import { cn } from "@/util/utils";+import type { CredentialFolder } from "./types/credentialFolderTypes";+import { DeleteCredentialFolderButton } from "./DeleteCredentialFolderButton";+import { EditCredentialFolderDialog } from "./EditCredentialFolderDialog";+import { useState } from "react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";++interface CredentialFolderCardProps {+ folder: CredentialFolder;+ isSelected: boolean;+ onClick: () => void;+}++function CredentialFolderCard({+ folder,+ isSelected,+ onClick,+}: CredentialFolderCardProps) {+ const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);++ return (+ <>+ <div+ role="button"+ tabIndex={0}+ onClick={onClick}+ onKeyDown={(e) => {+ // Only the card itself activates; let keydowns from the nested+ // Edit/Delete buttons through without also selecting the folder.+ if (+ e.target === e.currentTarget &&+ (e.key === "Enter" || e.key === " ")+ ) {+ e.preventDefault();+ onClick();+ }+ }}+ className={cn(+ "group relative flex h-24 cursor-pointer flex-col gap-3 rounded-lg border p-4 text-left transition-colors hover:border-blue-400",+ isSelected+ ? "border-blue-400 bg-blue-50 ring-2 ring-blue-400/20 dark:bg-blue-950/20"+ : "border-slate-200 bg-slate-elevation1 dark:border-slate-700",+ )}+ >+ <div className="flex items-start gap-3">+ <div className="mt-0.5">+ <FolderIcon className="h-5 w-5 text-blue-400" />+ </div>+ <div className="flex min-w-0 flex-1 flex-col gap-1">+ <div className="flex items-start justify-between gap-2">+ <h3 className="truncate text-sm font-medium text-slate-900 dark:text-slate-100">+ {folder.title}+ </h3>+ <div+ onClick={(e) => e.stopPropagation()}+ className="flex gap-1 opacity-0 transition-opacity focus-within:opacity-100 group-hover:opacity-100 [@media(hover:none)]:opacity-100"+ >+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ onClick={() => setIsEditDialogOpen(true)}+ className="rounded p-1.5 text-slate-400 transition-colors hover:bg-slate-500/20 hover:text-slate-300"+ aria-label="Edit folder"+ >+ <Pencil1Icon className="h-4 w-4" />+ </button>+ </TooltipTrigger>+ <TooltipContent>Edit Folder</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ <DeleteCredentialFolderButton+ folderId={folder.folder_id}+ folderTitle={folder.title}+ />+ </div>+ </div>+ <p className="text-xs text-slate-500 dark:text-slate-400">+ {folder.credential_count}{" "}+ {folder.credential_count === 1 ? "credential" : "credentials"}+ </p>+ </div>+ </div>+ </div>+ <EditCredentialFolderDialog+ open={isEditDialogOpen}+ onOpenChange={setIsEditDialogOpen}+ folder={folder}+ />+ </>+ );+}++export { CredentialFolderCard };diff --git a/skyvern-frontend/src/routes/credentials/CredentialFolderSelector.tsx b/skyvern-frontend/src/routes/credentials/CredentialFolderSelector.tsxnew file mode 100644index 000000000..e1eec459a--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/CredentialFolderSelector.tsx@@ -0,0 +1,178 @@+import { useState, useMemo } from "react";+import {+ CheckIcon,+ Cross2Icon,+ MagnifyingGlassIcon,+ ReloadIcon,+} from "@radix-ui/react-icons";+import { FolderIcon } from "@/components/icons/FolderIcon";+import { Button } from "@/components/ui/button";+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from "@/components/ui/popover";+import { Input } from "@/components/ui/input";+import { cn, handleInfiniteScroll } from "@/util/utils";+import { useInfiniteCredentialFoldersQuery } from "./hooks/useInfiniteCredentialFoldersQuery";+import { useUpdateCredentialFolderAssignmentMutation } from "./hooks/useCredentialFolderMutations";+import { useDebounce } from "use-debounce";+import { Skeleton } from "@/components/ui/skeleton";++interface CredentialFolderSelectorProps {+ credentialId: string;+ currentFolderId: string | null;+}++function CredentialFolderSelector({+ credentialId,+ currentFolderId,+}: CredentialFolderSelectorProps) {+ const [open, setOpen] = useState(false);+ const [search, setSearch] = useState("");+ const [debouncedSearch] = useDebounce(search, 500);+ const isTyping = search !== debouncedSearch;++ const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isFetching } =+ useInfiniteCredentialFoldersQuery({+ search: debouncedSearch,+ page_size: 20,+ });++ const folders = useMemo(() => {+ return data?.pages.flatMap((page) => page) ?? [];+ }, [data]);++ const updateFolderMutation = useUpdateCredentialFolderAssignmentMutation();++ const handleFolderSelect = async (folderId: string | null) => {+ try {+ await updateFolderMutation.mutateAsync({+ credentialId,+ data: { folder_id: folderId },+ });+ setOpen(false);+ setSearch("");+ } catch {+ // onError toast already surfaces the failure+ }+ };++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <Button+ variant="ghost"+ size="icon"+ aria-label="Assign to folder"+ className={cn(+ "h-8 w-8",+ currentFolderId ? "text-blue-400" : "text-slate-400",+ )}+ >+ <FolderIcon className="h-4 w-4" />+ </Button>+ </PopoverTrigger>+ <PopoverContent+ className="w-80 p-0"+ align="end"+ onCloseAutoFocus={(e) => e.preventDefault()}+ >+ <div className="border-b p-3">+ <h4 className="mb-2 text-sm font-medium">Move to folder</h4>+ <div className="relative">+ <MagnifyingGlassIcon className="absolute left-2 top-1/2 h-4 w-4 -translate-y-1/2 text-slate-400" />+ <Input+ placeholder="Search folders..."+ value={search}+ onChange={(e) => setSearch(e.target.value)}+ className="h-8 pl-8"+ autoFocus+ />+ </div>+ </div>+ <div+ className="max-h-[300px] overflow-y-auto [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-2 [&::-webkit-scrollbar-thumb]:border-slate-100 [&::-webkit-scrollbar-thumb]:bg-slate-300 dark:[&::-webkit-scrollbar-thumb]:border-slate-800 dark:[&::-webkit-scrollbar-thumb]:bg-slate-600 [&::-webkit-scrollbar-track]:bg-slate-100 dark:[&::-webkit-scrollbar-track]:bg-slate-800 [&::-webkit-scrollbar]:w-2"+ onScroll={(e) =>+ handleInfiniteScroll(+ e,+ fetchNextPage,+ hasNextPage,+ isFetchingNextPage,+ )+ }+ >+ {currentFolderId && (+ <button+ onClick={() => handleFolderSelect(null)}+ disabled={updateFolderMutation.isPending}+ className="flex w-full items-center justify-between border-b px-3 py-2 text-left text-sm transition-colors hover:bg-slate-50 disabled:opacity-50 dark:hover:bg-slate-800"+ >+ <div className="flex items-center gap-2">+ <Cross2Icon className="h-4 w-4 text-red-400" />+ <span>Remove from folder</span>+ </div>+ </button>+ )}++ {(isFetching || isTyping) && folders.length === 0 ? (+ <>+ {Array.from({ length: 8 }).map((_, index) => (+ <div+ key={`skeleton-${index}`}+ className="flex w-full items-center gap-2 px-3 py-2"+ >+ <Skeleton className="h-4 w-4" />+ <div className="flex flex-1 flex-col gap-1">+ <Skeleton className="h-4 w-3/4" />+ <Skeleton className="h-3 w-1/2" />+ </div>+ </div>+ ))}+ </>+ ) : folders.length === 0 ? (+ <div className="px-3 py-8 text-center text-sm text-slate-400">+ No folders found+ </div>+ ) : (+ <>+ {folders.map((folder) => {+ const isCurrentFolder = currentFolderId === folder.folder_id;+ return (+ <button+ key={folder.folder_id}+ onClick={() => handleFolderSelect(folder.folder_id)}+ disabled={isCurrentFolder || updateFolderMutation.isPending}+ className="flex w-full items-center justify-between px-3 py-2 text-left text-sm transition-colors hover:bg-slate-50 disabled:opacity-50 dark:hover:bg-slate-800"+ >+ <div className="flex items-center gap-2">+ <FolderIcon className="h-4 w-4 text-blue-400" />+ <div className="flex flex-col">+ <span>{folder.title}</span>+ {folder.description && (+ <span className="text-xs text-slate-400">+ {folder.description}+ </span>+ )}+ </div>+ </div>+ {isCurrentFolder && (+ <CheckIcon className="h-4 w-4 text-blue-400" />+ )}+ </button>+ );+ })}+ {isFetchingNextPage && (+ <div className="flex items-center justify-center py-2">+ <ReloadIcon className="h-3 w-3 animate-spin text-slate-400" />+ </div>+ )}+ </>+ )}+ </div>+ </PopoverContent>+ </Popover>+ );+}++export { CredentialFolderSelector };diff --git a/skyvern-frontend/src/routes/credentials/CredentialItem.tsx b/skyvern-frontend/src/routes/credentials/CredentialItem.tsxindex 4559becc6..e24ff48db 100644--- a/skyvern-frontend/src/routes/credentials/CredentialItem.tsx+++ b/skyvern-frontend/src/routes/credentials/CredentialItem.tsx@@ -18,6 +18,7 @@ import {TooltipTrigger,} from "@/components/ui/tooltip";import { DeleteCredentialButton } from "./DeleteCredentialButton";+import { CredentialFolderSelector } from "./CredentialFolderSelector";import { getHostname } from "@/util/getHostname";import { CredentialsModal } from "./CredentialsModal";import { credentialTypeToModalType } from "./useCredentialModalState";@@ -176,6 +177,19 @@ function CredentialItem({ credential, onStartBackgroundTest }: Props) {</div>{credentialDetails}<div className="ml-auto flex gap-1">+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <div>+ <CredentialFolderSelector+ credentialId={credential.credential_id}+ currentFolderId={credential.folder_id ?? null}+ />+ </div>+ </TooltipTrigger>+ <TooltipContent>Assign to Folder</TooltipContent>+ </Tooltip>+ </TooltipProvider><TooltipProvider><Tooltip><TooltipTrigger asChild>diff --git a/skyvern-frontend/src/routes/credentials/CredentialsList.tsx b/skyvern-frontend/src/routes/credentials/CredentialsList.tsxindex 0d73fa56a..842c16e0b 100644--- a/skyvern-frontend/src/routes/credentials/CredentialsList.tsx+++ b/skyvern-frontend/src/routes/credentials/CredentialsList.tsx@@ -17,6 +17,8 @@ type CredentialFilter = "password" | "credit_card" | "secret";type Props = {filter?: CredentialFilter;search?: string;+ folderId?: string | null;+ isResolvingFolder?: boolean;onStartBackgroundTest?: (credentialId: string,url: string,@@ -35,16 +37,20 @@ const PAGE_SIZE = 25;function CredentialsList({filter,search,+ folderId,+ isResolvingFolder,onStartBackgroundTest,}: Props = {}) {const trimmedSearch = search?.trim() ?? "";const [page, setPage] = useState(1);const [prevSearch, setPrevSearch] = useState(trimmedSearch);+ const [prevFolderId, setPrevFolderId] = useState(folderId);- // Reset to page 1 synchronously when the search changes — avoids the extra- // fetch with the stale page that a post-render effect would trigger.- if (prevSearch !== trimmedSearch) {+ // Reset to page 1 synchronously when the search or folder filter changes —+ // avoids the extra fetch with the stale page that a post-render effect would trigger.+ if (prevSearch !== trimmedSearch || prevFolderId !== folderId) {setPrevSearch(trimmedSearch);+ setPrevFolderId(folderId);setPage(1);}@@ -53,9 +59,13 @@ function CredentialsList({page_size: PAGE_SIZE,credential_type: filter,search: trimmedSearch || undefined,+ folder_id: folderId || undefined,+ // Hold the query until a deep-linked ?folder= slug resolves, so the+ // unfiltered credential bank doesn't flash before the filter applies.+ enabled: !isResolvingFolder,});- if (isLoading) {+ if (isResolvingFolder || isLoading) {return (<div className="space-y-5"><Skeleton className="h-20 w-full" />diff --git a/skyvern-frontend/src/routes/credentials/CredentialsPage.tsx b/skyvern-frontend/src/routes/credentials/CredentialsPage.tsxindex d24de4ede..8cc621798 100644--- a/skyvern-frontend/src/routes/credentials/CredentialsPage.tsx+++ b/skyvern-frontend/src/routes/credentials/CredentialsPage.tsx@@ -1,4 +1,4 @@-import { useEffect, useState } from "react";+import { useCallback, useEffect, useMemo, useState } from "react";import { useDebounce } from "use-debounce";import { Button } from "@/components/ui/button";import { TableSearchInput } from "@/components/TableSearchInput";@@ -20,6 +20,14 @@ import { KeyIcon } from "@/components/icons/KeyIcon";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";import { CredentialsTotpTab } from "./CredentialsTotpTab";import { useSearchParams } from "react-router-dom";+import { FolderIcon } from "@/components/icons/FolderIcon";+import { getUniqueSlugForFolder } from "@/util/folderSlug";+import { cn } from "@/util/utils";+import { useCredentialFoldersQuery } from "./hooks/useCredentialFoldersQuery";+import { CredentialFolderCard } from "./CredentialFolderCard";+import { CreateCredentialFolderDialog } from "./CreateCredentialFolderDialog";+import { ViewAllCredentialFoldersDialog } from "./ViewAllCredentialFoldersDialog";+import type { CredentialFolder } from "./types/credentialFolderTypes";const subHeaderText ="Securely store your passwords, credit cards, secrets, and manage incoming 2FA codes for your agents.";@@ -58,6 +66,89 @@ function CredentialsPage() {setSearchParams(params, { replace: true });}+ const folderSlug = searchParams.get("folder");+ const [isCreateFolderOpen, setIsCreateFolderOpen] = useState(false);+ const [isViewAllFoldersOpen, setIsViewAllFoldersOpen] = useState(false);++ // Load a generous page so the slug map covers every folder a user can pick+ // from "View all" or a shared ?folder= URL, not just the recent few.+ const { data: allFolders = [], isLoading: isFoldersLoading } =+ useCredentialFoldersQuery({ page_size: 100 });++ const slugToFolderMap = useMemo(() => {+ const map = new Map<string, CredentialFolder>();+ for (const folder of allFolders) {+ map.set(getUniqueSlugForFolder(folder, allFolders), folder);+ }+ return map;+ }, [allFolders]);++ // selectedFolderId is derived from the ?folder= slug (handles collision suffixes)+ const selectedFolderId = useMemo(() => {+ if (!folderSlug) return null;+ const mapped = slugToFolderMap.get(folderSlug)?.folder_id;+ if (mapped) return mapped;+ // A ?folder= value that isn't a known slug may be the id of a folder past+ // the loaded page; treat a credential-folder id as the filter directly.+ return folderSlug.startsWith("cfld_") ? folderSlug : null;+ }, [folderSlug, slugToFolderMap]);++ // While a deep-linked ?folder= slug is still resolving, hold the credential+ // lists so the unfiltered bank doesn't flash before the filter applies.+ const isResolvingFolder = Boolean(folderSlug) && isFoldersLoading;++ // Drop a stale ?folder= slug (deleted/renamed folder) once folders have loaded+ useEffect(() => {+ if (+ folderSlug &&+ !selectedFolderId &&+ allFolders.length > 0 &&+ !isFoldersLoading+ ) {+ const params = new URLSearchParams(searchParams);+ params.delete("folder");+ setSearchParams(params, { replace: true });+ }+ }, [+ folderSlug,+ selectedFolderId,+ allFolders.length,+ isFoldersLoading,+ searchParams,+ setSearchParams,+ ]);++ // Writes the ?folder= slug while preserving the ?tab= param so the folder+ // filter persists across tab switches.+ const setSelectedFolderId = useCallback(+ (folderId: string | null) => {+ const params = new URLSearchParams(searchParams);+ if (folderId) {+ const folder = allFolders.find((f) => f.folder_id === folderId);+ // Fall back to the folder id as the slug when the folder is past the+ // loaded page, so selecting it from "View all" still deep-links.+ params.set(+ "folder",+ folder ? getUniqueSlugForFolder(folder, allFolders) : folderId,+ );+ setSearchParams(params, { replace: true });+ return;+ }+ params.delete("folder");+ setSearchParams(params, { replace: true });+ },+ [searchParams, allFolders, setSearchParams],+ );++ const recentFolders = useMemo(() => {+ return [...allFolders]+ .sort(+ (a, b) =>+ new Date(b.modified_at).getTime() - new Date(a.modified_at).getTime(),+ )+ .slice(0, 5);+ }, [allFolders]);+return (<div className="space-y-5"><h1 className="text-2xl">Credentials</h1>@@ -105,6 +196,84 @@ function CredentialsPage() {</DropdownMenuContent></DropdownMenu></div>++ <div className={cn("space-y-4", activeTab === "twoFactor" && "hidden")}>+ <div className="flex items-center justify-between">+ <div className="flex items-center gap-3">+ <h2 className="text-lg font-semibold">Folders</h2>+ <Button+ variant="link"+ size="sm"+ className="h-auto p-0 text-blue-600 dark:text-blue-400"+ onClick={() => setIsCreateFolderOpen(true)}+ >+ + New folder+ </Button>+ </div>+ {allFolders.length > 5 && (+ <Button+ variant="link"+ size="sm"+ className="text-blue-600 dark:text-blue-400"+ onClick={() => setIsViewAllFoldersOpen(true)}+ >+ View all+ </Button>+ )}+ </div>++ {isFoldersLoading ? (+ <div className="grid grid-cols-5 gap-4">+ {Array.from({ length: 5 }).map((_, i) => (+ <div+ key={i}+ className="h-24 animate-pulse rounded-lg border border-slate-200 bg-slate-elevation1 dark:border-slate-700"+ />+ ))}+ </div>+ ) : recentFolders.length > 0 ? (+ <div className="grid grid-cols-5 gap-4">+ {recentFolders.map((folder) => (+ <CredentialFolderCard+ key={folder.folder_id}+ folder={folder}+ isSelected={selectedFolderId === folder.folder_id}+ onClick={() =>+ setSelectedFolderId(+ selectedFolderId === folder.folder_id+ ? null+ : folder.folder_id,+ )+ }+ />+ ))}+ </div>+ ) : (+ <div className="rounded-lg border border-slate-200 bg-slate-elevation1 py-6 text-center dark:border-slate-700">+ <div className="mx-auto max-w-md">+ <FolderIcon className="mx-auto mb-3 h-10 w-10 text-blue-400 opacity-50" />+ <h3 className="mb-2 text-slate-900 dark:text-slate-100">+ Organize Your Credentials with Folders+ </h3>+ <p className="mb-4 text-sm text-slate-500 dark:text-slate-400">+ Keep your credentials organized by creating folders. Group+ related credentials together by project, team, or environment+ for easier management.+ </p>+ <Button+ variant="link"+ size="sm"+ className="h-auto p-0 text-blue-600 dark:text-blue-400"+ onClick={() => setIsCreateFolderOpen(true)}+ >+ <PlusIcon className="mr-2 h-4 w-4" />+ Create Your First Folder+ </Button>+ </div>+ </div>+ )}+ </div>+<Tabsvalue={activeTab}className="space-y-4"@@ -117,21 +286,35 @@ function CredentialsPage() {<TabsTrigger value="secrets">Secrets</TabsTrigger><TabsTrigger value="twoFactor">2FA</TabsTrigger></TabsList>- {activeTab !== "twoFactor" && (- <TableSearchInput- value={search}- onChange={setSearch}- placeholder="Search credentials…"- className="w-72"- maxLength={200}- />- )}+ <div className="flex items-center gap-3">+ {selectedFolderId && activeTab !== "twoFactor" && (+ <Button+ variant="link"+ size="sm"+ className="h-auto p-0 text-blue-600 dark:text-blue-400"+ onClick={() => setSelectedFolderId(null)}+ >+ View all credentials+ </Button>+ )}+ {activeTab !== "twoFactor" && (+ <TableSearchInput+ value={search}+ onChange={setSearch}+ placeholder="Search credentials…"+ className="w-72"+ maxLength={200}+ />+ )}+ </div></div><TabsContent value="passwords" className="space-y-4"><CredentialsListfilter="password"search={debouncedSearch}+ folderId={selectedFolderId}+ isResolvingFolder={isResolvingFolder}onStartBackgroundTest={startBackgroundTest}/></TabsContent>@@ -140,6 +323,8 @@ function CredentialsPage() {<CredentialsListfilter="credit_card"search={debouncedSearch}+ folderId={selectedFolderId}+ isResolvingFolder={isResolvingFolder}onStartBackgroundTest={startBackgroundTest}/></TabsContent>@@ -148,6 +333,8 @@ function CredentialsPage() {<CredentialsListfilter="secret"search={debouncedSearch}+ folderId={selectedFolderId}+ isResolvingFolder={isResolvingFolder}onStartBackgroundTest={startBackgroundTest}/></TabsContent>@@ -158,6 +345,17 @@ function CredentialsPage() {</Tabs><CredentialsModal onStartBackgroundTest={startBackgroundTest} />+ <CreateCredentialFolderDialog+ open={isCreateFolderOpen}+ onOpenChange={setIsCreateFolderOpen}+ />+ <ViewAllCredentialFoldersDialog+ open={isViewAllFoldersOpen}+ onOpenChange={setIsViewAllFoldersOpen}+ selectedFolderId={selectedFolderId}+ onFolderSelect={setSelectedFolderId}+ />+{/* Footer note - only for Passwords and Credit Cards tabs */}{activeTab !== "twoFactor" && (<div className="mt-8 border-t border-slate-700 pt-4">diff --git a/skyvern-frontend/src/routes/credentials/DeleteCredentialFolderButton.tsx b/skyvern-frontend/src/routes/credentials/DeleteCredentialFolderButton.tsxnew file mode 100644index 000000000..17927db61--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/DeleteCredentialFolderButton.tsx@@ -0,0 +1,85 @@+import { GarbageIcon } from "@/components/icons/GarbageIcon";+import { Button } from "@/components/ui/button";+import {+ Dialog,+ DialogClose,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from "@/components/ui/dialog";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { ReloadIcon } from "@radix-ui/react-icons";+import { useEffect, useState } from "react";+import { useDeleteCredentialFolderMutation } from "./hooks/useCredentialFolderMutations";++type Props = {+ folderId: string;+ folderTitle: string;+};++function DeleteCredentialFolderButton({ folderId, folderTitle }: Props) {+ const [isDialogOpen, setIsDialogOpen] = useState(false);+ const {+ mutate: deleteFolder,+ isPending: isDeleteFolderPending,+ isSuccess: isDeleteFolderSuccess,+ } = useDeleteCredentialFolderMutation();++ useEffect(() => {+ if (isDeleteFolderSuccess) setIsDialogOpen(false);+ }, [isDeleteFolderSuccess]);++ return (+ <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <DialogTrigger asChild>+ <button+ onClick={(e) => e.stopPropagation()}+ className="rounded p-1.5 text-red-400 transition-colors hover:bg-red-500/20 hover:text-red-300"+ aria-label="Delete folder"+ >+ <GarbageIcon className="h-4 w-4" />+ </button>+ </DialogTrigger>+ </TooltipTrigger>+ <TooltipContent>Delete Folder</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ <DialogContent onCloseAutoFocus={(e) => e.preventDefault()}>+ <DialogHeader>+ <DialogTitle>Delete Folder: {folderTitle}</DialogTitle>+ <DialogDescription>+ The credentials in this folder will be unassigned, not deleted.+ </DialogDescription>+ </DialogHeader>+ <DialogFooter>+ <DialogClose asChild>+ <Button variant="secondary">Cancel</Button>+ </DialogClose>+ <Button+ variant="destructive"+ onClick={() => deleteFolder({ folderId })}+ disabled={isDeleteFolderPending}+ >+ {isDeleteFolderPending && (+ <ReloadIcon className="mr-2 h-4 w-4 animate-spin" />+ )}+ Delete+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+}++export { DeleteCredentialFolderButton };diff --git a/skyvern-frontend/src/routes/credentials/EditCredentialFolderDialog.tsx b/skyvern-frontend/src/routes/credentials/EditCredentialFolderDialog.tsxnew file mode 100644index 000000000..56e4f4d92--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/EditCredentialFolderDialog.tsx@@ -0,0 +1,114 @@+import { useEffect, useState } from "react";+import { Button } from "@/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { Textarea } from "@/components/ui/textarea";+import { useUpdateCredentialFolderMutation } from "./hooks/useCredentialFolderMutations";+import type { CredentialFolder } from "./types/credentialFolderTypes";++interface EditCredentialFolderDialogProps {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ folder: CredentialFolder;+}++function EditCredentialFolderDialog({+ open,+ onOpenChange,+ folder,+}: EditCredentialFolderDialogProps) {+ const [title, setTitle] = useState(folder.title);+ const [description, setDescription] = useState(folder.description || "");+ const updateFolderMutation = useUpdateCredentialFolderMutation();++ useEffect(() => {+ if (open) {+ setTitle(folder.title);+ setDescription(folder.description || "");+ }+ }, [open, folder]);++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault();+ if (!title.trim()) return;++ try {+ await updateFolderMutation.mutateAsync({+ folderId: folder.folder_id,+ data: {+ title: title.trim(),+ // Send the trimmed value (possibly "") rather than null so clearing the+ // field actually persists — the API treats null as "leave unchanged".+ description: description.trim(),+ },+ });+ onOpenChange(false);+ } catch {+ // onError toast already surfaces the failure+ }+ };++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Edit Folder</DialogTitle>+ <DialogDescription>+ Update the folder's title and description.+ </DialogDescription>+ </DialogHeader>+ <form onSubmit={handleSubmit}>+ <div className="grid gap-4 py-4">+ <div className="grid gap-2">+ <Label htmlFor="edit-credential-folder-title">Title</Label>+ <Input+ id="edit-credential-folder-title"+ value={title}+ onChange={(e) => setTitle(e.target.value)}+ placeholder="e.g., Production Credentials"+ autoFocus+ />+ </div>+ <div className="grid gap-2">+ <Label htmlFor="edit-credential-folder-description">+ Description (optional)+ </Label>+ <Textarea+ id="edit-credential-folder-description"+ value={description}+ onChange={(e) => setDescription(e.target.value)}+ placeholder="Add a description..."+ rows={3}+ />+ </div>+ </div>+ <DialogFooter>+ <Button+ type="button"+ variant="outline"+ onClick={() => onOpenChange(false)}+ >+ Cancel+ </Button>+ <Button+ type="submit"+ disabled={!title.trim() || updateFolderMutation.isPending}+ >+ Save Changes+ </Button>+ </DialogFooter>+ </form>+ </DialogContent>+ </Dialog>+ );+}++export { EditCredentialFolderDialog };diff --git a/skyvern-frontend/src/routes/credentials/ViewAllCredentialFoldersDialog.tsx b/skyvern-frontend/src/routes/credentials/ViewAllCredentialFoldersDialog.tsxnew file mode 100644index 000000000..8263bcb78--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/ViewAllCredentialFoldersDialog.tsx@@ -0,0 +1,145 @@+import { useState, useMemo } from "react";+import { MagnifyingGlassIcon, ReloadIcon } from "@radix-ui/react-icons";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogHeader,+ DialogTitle,+} from "@/components/ui/dialog";+import { Input } from "@/components/ui/input";+import { CredentialFolderCard } from "./CredentialFolderCard";+import { useInfiniteCredentialFoldersQuery } from "./hooks/useInfiniteCredentialFoldersQuery";+import { handleInfiniteScroll } from "@/util/utils";+import { useDebounce } from "use-debounce";+import { Skeleton } from "@/components/ui/skeleton";++interface ViewAllCredentialFoldersDialogProps {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ selectedFolderId: string | null;+ onFolderSelect: (folderId: string | null) => void;+}++function ViewAllCredentialFoldersDialog({+ open,+ onOpenChange,+ selectedFolderId,+ onFolderSelect,+}: ViewAllCredentialFoldersDialogProps) {+ const [search, setSearch] = useState("");+ const [debouncedSearch] = useDebounce(search, 500);+ const isTyping = search !== debouncedSearch;++ const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isFetching } =+ useInfiniteCredentialFoldersQuery({+ search: debouncedSearch,+ page_size: 20,+ });++ const folders = useMemo(() => {+ return data?.pages.flatMap((page) => page) ?? [];+ }, [data]);++ const handleFolderClick = (folderId: string) => {+ onFolderSelect(selectedFolderId === folderId ? null : folderId);+ onOpenChange(false);+ setSearch("");+ };++ const handleOpenChange = (open: boolean) => {+ onOpenChange(open);+ if (!open) {+ setSearch("");+ }+ };++ return (+ <Dialog open={open} onOpenChange={handleOpenChange}>+ <DialogContent className="max-h-[90vh] max-w-4xl">+ <DialogHeader>+ <DialogTitle>All Folders</DialogTitle>+ <DialogDescription>+ Browse and select from all folders. Scroll to load more.+ </DialogDescription>+ </DialogHeader>++ <div className="relative mb-4">+ <MagnifyingGlassIcon className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-slate-400" />+ <Input+ type="text"+ placeholder="Search folders..."+ value={search}+ onChange={(e) => setSearch(e.target.value)}+ className="pl-10"+ />+ </div>++ <div+ className="max-h-[500px] overflow-y-auto pr-2 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-2 [&::-webkit-scrollbar-thumb]:border-slate-100 [&::-webkit-scrollbar-thumb]:bg-slate-300 dark:[&::-webkit-scrollbar-thumb]:border-slate-800 dark:[&::-webkit-scrollbar-thumb]:bg-slate-600 [&::-webkit-scrollbar-track]:bg-slate-100 dark:[&::-webkit-scrollbar-track]:bg-slate-800 [&::-webkit-scrollbar]:w-2"+ onScroll={(e) =>+ handleInfiniteScroll(+ e,+ fetchNextPage,+ hasNextPage,+ isFetchingNextPage,+ )+ }+ >+ {(isFetching || isTyping) && folders.length === 0 ? (+ <div className="grid grid-cols-3 gap-4">+ {Array.from({ length: 12 }).map((_, index) => (+ <div+ key={`skeleton-${index}`}+ className="flex h-24 flex-col gap-3 rounded-lg border border-slate-200 bg-slate-elevation1 p-4 dark:border-slate-700"+ >+ <div className="flex items-start gap-3">+ <Skeleton className="mt-0.5 h-5 w-5" />+ <div className="flex min-w-0 flex-1 flex-col gap-2">+ <Skeleton className="h-4 w-3/4" />+ <Skeleton className="h-3 w-1/2" />+ </div>+ </div>+ </div>+ ))}+ </div>+ ) : folders.length === 0 ? (+ <div className="flex flex-col items-center justify-center py-12 text-slate-400">+ <p>No folders found</p>+ </div>+ ) : (+ <>+ <div className="grid grid-cols-3 gap-4">+ {folders.map((folder) => (+ <CredentialFolderCard+ key={folder.folder_id}+ folder={folder}+ isSelected={selectedFolderId === folder.folder_id}+ onClick={() => handleFolderClick(folder.folder_id)}+ />+ ))}+ </div>+ {isFetchingNextPage && (+ <div className="mt-4 flex items-center justify-center py-4">+ <ReloadIcon className="mr-2 h-4 w-4 animate-spin" />+ <span className="text-sm text-slate-400">+ Loading more folders...+ </span>+ </div>+ )}+ {!hasNextPage && folders.length > 20 && (+ <div className="mt-4 flex items-center justify-center py-4">+ <span className="text-sm text-slate-400">+ All folders loaded+ </span>+ </div>+ )}+ </>+ )}+ </div>+ </DialogContent>+ </Dialog>+ );+}++export { ViewAllCredentialFoldersDialog };diff --git a/skyvern-frontend/src/routes/credentials/hooks/useCredentialFolderMutations.ts b/skyvern-frontend/src/routes/credentials/hooks/useCredentialFolderMutations.tsnew file mode 100644index 000000000..824a2d8e5--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/hooks/useCredentialFolderMutations.ts@@ -0,0 +1,123 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";+import { getClient } from "@/api/AxiosClient";+import { toast } from "@/components/ui/use-toast";+import type {+ CredentialFolder,+ CredentialFolderCreate,+ CredentialFolderUpdate,+ UpdateCredentialFolderRequest,+} from "../types/credentialFolderTypes";++function useCreateCredentialFolderMutation() {+ const credentialGetter = useCredentialGetter();+ const queryClient = useQueryClient();++ return useMutation({+ mutationFn: async (data: CredentialFolderCreate) => {+ const client = await getClient(credentialGetter);+ return client+ .post<CredentialFolder>("/credential_folders", data)+ .then((response) => response.data);+ },+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["credential-folders"] });+ },+ onError: (error: Error) => {+ toast({+ variant: "destructive",+ title: "Failed to create folder",+ description: error.message,+ });+ },+ });+}++function useUpdateCredentialFolderMutation() {+ const credentialGetter = useCredentialGetter();+ const queryClient = useQueryClient();++ return useMutation({+ mutationFn: async ({+ folderId,+ data,+ }: {+ folderId: string;+ data: CredentialFolderUpdate;+ }) => {+ const client = await getClient(credentialGetter);+ return client+ .put<CredentialFolder>(`/credential_folders/${folderId}`, data)+ .then((response) => response.data);+ },+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["credential-folders"] });+ },+ onError: (error: Error) => {+ toast({+ variant: "destructive",+ title: "Failed to update folder",+ description: error.message,+ });+ },+ });+}++function useDeleteCredentialFolderMutation() {+ const credentialGetter = useCredentialGetter();+ const queryClient = useQueryClient();++ return useMutation({+ mutationFn: async ({ folderId }: { folderId: string }) => {+ const client = await getClient(credentialGetter);+ return client.delete(`/credential_folders/${folderId}`);+ },+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["credential-folders"] });+ queryClient.invalidateQueries({ queryKey: ["credentials"] });+ },+ onError: (error: Error) => {+ toast({+ variant: "destructive",+ title: "Failed to delete folder",+ description: error.message,+ });+ },+ });+}++function useUpdateCredentialFolderAssignmentMutation() {+ const credentialGetter = useCredentialGetter();+ const queryClient = useQueryClient();++ return useMutation({+ mutationFn: async ({+ credentialId,+ data,+ }: {+ credentialId: string;+ data: UpdateCredentialFolderRequest;+ }) => {+ const client = await getClient(credentialGetter);+ return client.put(`/credentials/${credentialId}/folder`, data);+ },+ onSuccess: () => {+ queryClient.invalidateQueries({ queryKey: ["credentials"] });+ queryClient.invalidateQueries({ queryKey: ["credential-folders"] });+ },+ onError: (error: Error) => {+ toast({+ variant: "destructive",+ title: "Failed to move credential",+ description: error.message,+ });+ },+ });+}++export {+ useCreateCredentialFolderMutation,+ useUpdateCredentialFolderMutation,+ useDeleteCredentialFolderMutation,+ useUpdateCredentialFolderAssignmentMutation,+};diff --git a/skyvern-frontend/src/routes/credentials/hooks/useCredentialFoldersQuery.ts b/skyvern-frontend/src/routes/credentials/hooks/useCredentialFoldersQuery.tsnew file mode 100644index 000000000..1779fbcdd--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/hooks/useCredentialFoldersQuery.ts@@ -0,0 +1,40 @@+import { getClient } from "@/api/AxiosClient";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";+import { useQuery } from "@tanstack/react-query";+import type { CredentialFolder } from "../types/credentialFolderTypes";++interface UseCredentialFoldersQueryParams {+ page?: number;+ page_size?: number;+ search?: string;+}++function useCredentialFoldersQuery(params?: UseCredentialFoldersQueryParams) {+ const credentialGetter = useCredentialGetter();++ return useQuery({+ queryKey: ["credential-folders", params],+ queryFn: async () => {+ const client = await getClient(credentialGetter);+ const searchParams = new URLSearchParams();++ if (params?.page) {+ searchParams.append("page", String(params.page));+ }+ if (params?.page_size) {+ searchParams.append("page_size", String(params.page_size));+ }+ if (params?.search) {+ searchParams.append("search", params.search);+ }++ return client+ .get<Array<CredentialFolder>>("/credential_folders", {+ params: searchParams,+ })+ .then((response) => response.data);+ },+ });+}++export { useCredentialFoldersQuery };diff --git a/skyvern-frontend/src/routes/credentials/hooks/useInfiniteCredentialFoldersQuery.ts b/skyvern-frontend/src/routes/credentials/hooks/useInfiniteCredentialFoldersQuery.tsnew file mode 100644index 000000000..cc106690b--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/hooks/useInfiniteCredentialFoldersQuery.ts@@ -0,0 +1,45 @@+import { getClient } from "@/api/AxiosClient";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";+import { useInfiniteQuery } from "@tanstack/react-query";+import type { CredentialFolder } from "../types/credentialFolderTypes";++interface UseInfiniteCredentialFoldersQueryParams {+ page_size?: number;+ search?: string;+}++function useInfiniteCredentialFoldersQuery(+ params?: UseInfiniteCredentialFoldersQueryParams,+) {+ const credentialGetter = useCredentialGetter();+ const pageSize = params?.page_size ?? 20;++ return useInfiniteQuery({+ queryKey: ["credential-folders", "infinite", params],+ queryFn: async ({ pageParam = 1 }) => {+ const client = await getClient(credentialGetter);+ const searchParams = new URLSearchParams();++ searchParams.append("page", String(pageParam));+ searchParams.append("page_size", String(pageSize));+ if (params?.search) {+ searchParams.append("search", params.search);+ }++ return client+ .get<Array<CredentialFolder>>("/credential_folders", {+ params: searchParams,+ })+ .then((response) => response.data);+ },+ getNextPageParam: (lastPage, allPages) => {+ if (lastPage.length === pageSize) {+ return allPages.length + 1;+ }+ return undefined;+ },+ initialPageParam: 1,+ });+}++export { useInfiniteCredentialFoldersQuery };diff --git a/skyvern-frontend/src/routes/credentials/types/credentialFolderTypes.ts b/skyvern-frontend/src/routes/credentials/types/credentialFolderTypes.tsnew file mode 100644index 000000000..657448adb--- /dev/null+++ b/skyvern-frontend/src/routes/credentials/types/credentialFolderTypes.ts@@ -0,0 +1,23 @@+export interface CredentialFolder {+ folder_id: string;+ organization_id: string;+ title: string;+ description: string | null;+ credential_count: number;+ created_at: string;+ modified_at: string;+}++export interface CredentialFolderCreate {+ title: string;+ description?: string | null;+}++export interface CredentialFolderUpdate {+ title?: string;+ description?: string | null;+}++export interface UpdateCredentialFolderRequest {+ folder_id: string | null;+}diff --git a/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts b/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.tsindex f06225d5e..d31101fa2 100644--- a/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts+++ b/skyvern-frontend/src/routes/workflows/hooks/useCredentialsQuery.ts@@ -16,6 +16,7 @@ type Props = UseQueryOptions & {vault_type?: string;credential_type?: "password" | "credit_card" | "secret";search?: string;+ folder_id?: string | null;};function useCredentialsQuery(props: Props = {}) {@@ -25,6 +26,7 @@ function useCredentialsQuery(props: Props = {}) {vault_type,credential_type,search,+ folder_id,...queryOptions} = props;const credentialGetter = useCredentialGetter();@@ -39,6 +41,7 @@ function useCredentialsQuery(props: Props = {}) {vault_type,credential_type,search,+ folder_id,],queryFn: async () => {const client = await getClient(credentialGetter);@@ -54,6 +57,9 @@ function useCredentialsQuery(props: Props = {}) {if (search) {params.set("search", search);}+ if (folder_id) {+ params.set("folder_id", folder_id);+ }return client.get("/credentials", { params }).then((res) => res.data);},refetchOnMount: "always",diff --git a/skyvern-frontend/src/util/folderSlug.ts b/skyvern-frontend/src/util/folderSlug.tsnew file mode 100644index 000000000..6cf05ae5b--- /dev/null+++ b/skyvern-frontend/src/util/folderSlug.ts@@ -0,0 +1,52 @@+type SluggableFolder = {+ folder_id: string;+ title: string;+ created_at: string;+};++function slugifyFolderName(name: string): string {+ return name+ .toLowerCase()+ .trim()+ .replace(/[^\w\s-]/g, "")+ .replace(/\s+/g, "-")+ .replace(/-+/g, "-")+ .replace(/^-|-$/g, "");+}++// Append a numeric suffix only when multiple folders slugify to the same base,+// assigning suffixes by created_at order so a folder's slug stays stable.+function getUniqueSlugForFolder<T extends SluggableFolder>(+ folder: T,+ allFolders: T[],+): string {+ const baseSlug = slugifyFolderName(folder.title);++ // Titles made only of stripped characters (emoji, punctuation, non-Latin)+ // slugify to "", which the page reads as "no folder selected". Fall back to+ // the unique folder id so the folder stays selectable and deep-linkable.+ if (!baseSlug) {+ return folder.folder_id;+ }++ const foldersWithSameSlug = allFolders.filter(+ (f) => slugifyFolderName(f.title) === baseSlug,+ );++ if (foldersWithSameSlug.length <= 1) {+ return baseSlug;+ }++ const sortedFolders = [...foldersWithSameSlug].sort(+ (a, b) =>+ new Date(a.created_at).getTime() - new Date(b.created_at).getTime(),+ );++ const index = sortedFolders.findIndex(+ (f) => f.folder_id === folder.folder_id,+ );++ return index === 0 ? baseSlug : `${baseSlug}-${index + 1}`;+}++export { slugifyFolderName, getUniqueSlugForFolder };