fix: split display path and query base path by nicotsx · Pull Request #714 · nicotsx/zerobyte

nicotsx · 2026-03-26T18:14:44Z

coderabbitai · 2026-03-26T18:14:53Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: aad6aeff-a33c-43f8-ae91-e1b6ba5e4c8b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

nicotsx · 2026-03-26T18:14:58Z

fix: split display path and query base path #714 👈 (View in Graphite)
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

nicotsx · 2026-03-26T18:37:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4020c536c7

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

app/client/components/file-browsers/snapshot-tree-browser.tsx

Closes #709

dosubot · 2026-03-29T09:40:25Z

Related Documentation

1 document(s) may need updating based on files changed in this PR:

Zerobyte's Space

Repositories in Zerobyte: Types, Architecture, and Operations

View Suggested Changes

@@ -341,6 +341,10 @@
 - [List snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L222-L252)
 - [Get snapshot details](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L388-L418)
 - [Browse files](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L254-L317)
+  - The snapshot tree browser in the UI distinguishes between "query base path" (the actual path queried from the snapshot API) and "display base path" (the path shown to users in the UI)
+  - This split allows showing a different root directory to users than what is actually being queried from the snapshot
+  - Example use case: querying files from a deep subdirectory while displaying them as if they're at the root of a volume mount point
+  - The file tree building logic ensures all parent directories are properly created in the tree structure, preventing gaps in the folder hierarchy
 - [Delete snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L515-L531)
 - [Tag snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L553-L575)
 - [Download snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L394-L451)
@@ -357,6 +361,10 @@
     - `targetPath`: Custom location for restore
     - `overwrite`: Overwrite mode for existing files (`'always'`, `'if-changed'`, `'if-newer'`, or `'never'`)
   - Single-file restore behavior: When restoring a single file to a custom location with `selectedItemKind: "file"`, the system uses the file's parent directory as the common ancestor for proper path resolution, ensuring the file is placed correctly at the target path
+  - **Path handling in restore form**: The restore form accepts two path parameters:
+    - `queryBasePath`: The actual path used for API queries when browsing snapshot contents
+    - `displayBasePath`: Optional path prefix shown to users in the file browser. If not provided, defaults to `queryBasePath`
+    - This allows flexible path presentation during restore operations (e.g., showing files as if they're at a volume root while querying from a subdirectory)
   - **Protected path restrictions**: To prevent accidental overwriting of critical system files or application data, restore operations are blocked from targeting certain protected paths. If a restore is attempted to any of these locations, the operation will fail with a `BadRequestError: "Restore target path is not allowed. Restoring to this path could overwrite critical system files or application data."` The following paths and their subdirectories are protected from restore operations:
     - Repository base directory (`/var/lib/zerobyte/repositories`)
     - Restic cache directory (`/var/lib/zerobyte/cache`)
@@ -583,3 +591,30 @@
 
 This visual feedback helps users understand the path handling behavior before creating or importing a repository.
 
+### SnapshotTreeBrowser
+The `SnapshotTreeBrowser` component provides a file browser interface for exploring snapshot contents.
+
+**Location:** `app/client/components/file-browsers/snapshot-tree-browser.tsx`
+
+**Path Handling:**
+- `queryBasePath`: The actual path used when fetching files from the API (defaults to `/`)
+- `displayBasePath`: Optional path prefix for display purposes. If not provided, defaults to `queryBasePath`
+- The component properly displays ancestor folders in the tree even when they weren't explicitly returned by the API
+- This enables flexible presentation where the query path differs from the displayed path (e.g., querying from `/var/data` while displaying paths as if they start from `/`)
+
+**Usage:**
+The component is used in both snapshot browsing and restore operations, allowing users to navigate snapshot contents with appropriate path context based on the use case.
+
+### RestoreForm
+The `RestoreForm` component provides the interface for restoring files from snapshots.
+
+**Location:** `app/client/components/restore-form.tsx`
+
+**Path Parameters:**
+- `queryBasePath`: The actual path used for API queries when browsing snapshot contents (defaults to `/`)
+- `displayBasePath`: Optional path prefix shown to users in the file browser. If not provided, defaults to `queryBasePath`
+- These parameters are passed through to the `SnapshotTreeBrowser` component for consistent path handling
+
+**Path Presentation:**
+The split between query and display paths enables flexible path presentation during restore operations. For example, when restoring a backup of `/var/data`, the form can query from `/var/data` while displaying paths as if they're at the root of a volume mount point, improving user experience by showing familiar paths.
+

[Accept] [Decline]

Note: You must be authenticated to accept/decline updates.

^{How did I do? Any feedback?}

dosubot · 2026-03-29T09:40:27Z

Documentation Updates

1 document(s) were updated by changes in this PR:

Repositories in Zerobyte: Types, Architecture, and Operations

View Changes

@@ -340,7 +340,10 @@
 **Snapshot Management:**
 - [List snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L222-L252)
 - [Get snapshot details](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L388-L418)
-- [Browse files](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L254-L317)
+- [Browse files](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L254-L317) - The `SnapshotTreeBrowser` component provides snapshot browsing functionality with path handling that separates display and query concerns:
+  - `queryBasePath`: The path used for API queries to fetch snapshot files (typically the common ancestor of snapshot paths)
+  - `displayBasePath`: The path prefix used for displaying file paths in the UI (typically the volume mount path)
+  - This separation allows proper rendering of ancestor folders when browsing snapshots with a nested query root - the display path can show the full hierarchy while queries are scoped to a specific subtree
 - [Delete snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L515-L531)
 - [Tag snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L553-L575)
 - [Download snapshots](https://github.com/nicotsx/zerobyte/blob/bad944a2329540088a51f7699d6f53d9ac82137c/app/server/modules/repositories/repositories.service.ts#L394-L451)
@@ -357,6 +360,9 @@
     - `targetPath`: Custom location for restore
     - `overwrite`: Overwrite mode for existing files (`'always'`, `'if-changed'`, `'if-newer'`, or `'never'`)
   - Single-file restore behavior: When restoring a single file to a custom location with `selectedItemKind: "file"`, the system uses the file's parent directory as the common ancestor for proper path resolution, ensuring the file is placed correctly at the target path
+  - The `RestoreForm` component accepts both `queryBasePath` and `displayBasePath` parameters for path handling:
+    - `queryBasePath`: The base path for API queries (scoped to snapshot contents)
+    - `displayBasePath`: The path prefix for displaying file paths in the UI
   - **Protected path restrictions**: To prevent accidental overwriting of critical system files or application data, restore operations are blocked from targeting certain protected paths. If a restore is attempted to any of these locations, the operation will fail with a `BadRequestError: "Restore target path is not allowed. Restoring to this path could overwrite critical system files or application data."` The following paths and their subdirectories are protected from restore operations:
     - Repository base directory (`/var/lib/zerobyte/repositories`)
     - Restic cache directory (`/var/lib/zerobyte/cache`)

^{How did I do? Any feedback?}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 48a55c0183

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-29T09:43:57Z

app/client/components/file-browsers/snapshot-tree-browser.tsx

+				nextFullPaths.add(displayPathFns.add(displayPath));
 			}

 			if (onSingleSelectionKindChange) {


Preserve kind for remapped ancestor selections

With the new display/query path split, users can now select ancestor folders that are synthesized in the tree (for example selecting /project while querying /mnt/project/subdir). In handleSelectionChange this path is remapped to /mnt/project, but onSingleSelectionKindChange still relies on displayPathKinds, which is built only from API-returned entries and does not include synthesized ancestors. That emits null for a single-folder selection, so RestoreForm omits the kind query param on /dump requests and the server rejects the download (Path kind is required when downloading a specific snapshot path) in this new flow.

Useful? React with 👍 / 👎.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 48a55c0183

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-29T09:44:39Z

app/client/components/file-tree.tsx

+			fileMap.set(parentPath, {
+				kind: "folder",
+				id: fileMap.size,
+				name: parentName,
+				fullPath: parentPath,


Propagate kind for synthesized ancestor folders

This change adds virtual ancestor folders (for example, /project) into the tree, but those paths are not present in SnapshotTreeBrowser’s displayPathKinds map because that map is built only from fetched API entries. In the new nested-base flow (queryBasePath under displayBasePath), selecting one of these ancestor rows sets selectedPathKind to null; then the restore page’s download action sends path without kind, and the backend rejects it with 400 Path kind is required. This makes single-item download fail for exactly the ancestor nodes introduced here.

Useful? React with 👍 / 👎.

app/routes/(dashboard)/repositories/$repositoryId/$snapshotId/restore.tsx

nicotsx marked this pull request as ready for review March 26, 2026 18:31

chatgpt-codex-connector bot reviewed Mar 26, 2026

View reviewed changes

app/client/components/file-browsers/snapshot-tree-browser.tsx Outdated Show resolved Hide resolved

nicotsx force-pushed the 03-26-fix_split_display_path_and_query_base_path branch from 4020c53 to 187030d Compare March 26, 2026 20:03

nicotsx added 2 commits March 26, 2026 23:02

fix: split display path and query base path

2a1eaf2

Closes #709

test(frontend): shared render utils

28d5c05

nicotsx force-pushed the 03-26-fix_split_display_path_and_query_base_path branch from 187030d to 28d5c05 Compare March 26, 2026 22:33

nicotsx marked this pull request as draft March 26, 2026 22:56

nicotsx force-pushed the 03-26-fix_split_display_path_and_query_base_path branch from 444f3bd to e79b733 Compare March 29, 2026 08:33

fix(file-tree): add missing path segments

a7c6808

nicotsx force-pushed the 03-26-fix_split_display_path_and_query_base_path branch from e79b733 to a7c6808 Compare March 29, 2026 08:46

chore: bump Bun version

48a55c0

nicotsx force-pushed the 03-26-fix_split_display_path_and_query_base_path branch from 2fa22a3 to 48a55c0 Compare March 29, 2026 09:27

nicotsx marked this pull request as ready for review March 29, 2026 09:38

chatgpt-codex-connector bot reviewed Mar 29, 2026

View reviewed changes

fix: select kind for synthetic folders

10d5bda

nicotsx merged commit 611640b into main Mar 29, 2026
10 checks passed

nicotsx deleted the 03-26-fix_split_display_path_and_query_base_path branch March 29, 2026 10:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: split display path and query base path#714

fix: split display path and query base path#714
nicotsx merged 5 commits intomainfrom
03-26-fix_split_display_path_and_query_base_path

nicotsx commented Mar 26, 2026 •

edited

Loading

Uh oh!

coderabbitai bot commented Mar 26, 2026 •

edited

Loading

Review skipped

Uh oh!

nicotsx commented Mar 26, 2026

Uh oh!

nicotsx commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

dosubot bot commented Mar 29, 2026

Uh oh!

dosubot bot commented Mar 29, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 29, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 29, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

nicotsx commented Mar 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Mar 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

nicotsx commented Mar 26, 2026

Uh oh!

nicotsx commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

dosubot bot commented Mar 29, 2026

Repositories in Zerobyte: Types, Architecture, and Operations

Uh oh!

dosubot bot commented Mar 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Repositories in Zerobyte: Types, Architecture, and Operations

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

nicotsx commented Mar 26, 2026 •

edited

Loading

coderabbitai bot commented Mar 26, 2026 •

edited

Loading

dosubot bot commented Mar 29, 2026 •

edited

Loading