mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-05-11 02:10:09 +02:00
Compare commits
2 Commits
v2026.4.0-
...
actions-sy
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
986143c4ae | ||
|
|
50b0e23d53 |
@@ -1,27 +1,23 @@
|
|||||||
# Claude Context: Detaching Tauri from Yaak
|
# Claude Context: Detaching Tauri from Yaak
|
||||||
|
|
||||||
## Goal
|
## Goal
|
||||||
|
|
||||||
Make Yaak runnable as a standalone CLI without Tauri as a dependency. The core Rust crates in `crates/` should be usable independently, while Tauri-specific code lives in `crates-tauri/`.
|
Make Yaak runnable as a standalone CLI without Tauri as a dependency. The core Rust crates in `crates/` should be usable independently, while Tauri-specific code lives in `crates-tauri/`.
|
||||||
|
|
||||||
## Project Structure
|
## Project Structure
|
||||||
|
|
||||||
```
|
```
|
||||||
crates/ # Core crates - should NOT depend on Tauri
|
crates/ # Core crates - should NOT depend on Tauri
|
||||||
crates-tauri/ # Tauri-specific crates (yaak-app-client, yaak-tauri-utils, etc.)
|
crates-tauri/ # Tauri-specific crates (yaak-app, yaak-tauri-utils, etc.)
|
||||||
crates-cli/ # CLI crate (yaak-cli)
|
crates-cli/ # CLI crate (yaak-cli)
|
||||||
```
|
```
|
||||||
|
|
||||||
## Completed Work
|
## Completed Work
|
||||||
|
|
||||||
### 1. Folder Restructure
|
### 1. Folder Restructure
|
||||||
|
- Moved Tauri-dependent app code to `crates-tauri/yaak-app/`
|
||||||
- Moved Tauri-dependent app code to `crates-tauri/yaak-app-client/`
|
|
||||||
- Created `crates-tauri/yaak-tauri-utils/` for shared Tauri utilities (window traits, api_client, error handling)
|
- Created `crates-tauri/yaak-tauri-utils/` for shared Tauri utilities (window traits, api_client, error handling)
|
||||||
- Created `crates-cli/yaak-cli/` for the standalone CLI
|
- Created `crates-cli/yaak-cli/` for the standalone CLI
|
||||||
|
|
||||||
### 2. Decoupled Crates (no longer depend on Tauri)
|
### 2. Decoupled Crates (no longer depend on Tauri)
|
||||||
|
|
||||||
- **yaak-models**: Uses `init_standalone()` pattern for CLI database access
|
- **yaak-models**: Uses `init_standalone()` pattern for CLI database access
|
||||||
- **yaak-http**: Removed Tauri plugin, HttpConnectionManager initialized in yaak-app setup
|
- **yaak-http**: Removed Tauri plugin, HttpConnectionManager initialized in yaak-app setup
|
||||||
- **yaak-common**: Only contains Tauri-free utilities (serde, platform)
|
- **yaak-common**: Only contains Tauri-free utilities (serde, platform)
|
||||||
@@ -29,7 +25,6 @@ crates-cli/ # CLI crate (yaak-cli)
|
|||||||
- **yaak-grpc**: Replaced AppHandle with GrpcConfig struct, uses tokio::process::Command instead of Tauri sidecar
|
- **yaak-grpc**: Replaced AppHandle with GrpcConfig struct, uses tokio::process::Command instead of Tauri sidecar
|
||||||
|
|
||||||
### 3. CLI Implementation
|
### 3. CLI Implementation
|
||||||
|
|
||||||
- Basic CLI at `crates-cli/yaak-cli/src/main.rs`
|
- Basic CLI at `crates-cli/yaak-cli/src/main.rs`
|
||||||
- Commands: workspaces, requests, send (by ID), get (ad-hoc URL), create
|
- Commands: workspaces, requests, send (by ID), get (ad-hoc URL), create
|
||||||
- Uses same database as Tauri app via `yaak_models::init_standalone()`
|
- Uses same database as Tauri app via `yaak_models::init_standalone()`
|
||||||
@@ -37,36 +32,31 @@ crates-cli/ # CLI crate (yaak-cli)
|
|||||||
## Remaining Work
|
## Remaining Work
|
||||||
|
|
||||||
### Crates Still Depending on Tauri (in `crates/`)
|
### Crates Still Depending on Tauri (in `crates/`)
|
||||||
|
|
||||||
1. **yaak-git** (3 files) - Moderate complexity
|
1. **yaak-git** (3 files) - Moderate complexity
|
||||||
2. **yaak-plugins** (13 files) - **Hardest** - deeply integrated with Tauri for plugin-to-window communication
|
2. **yaak-plugins** (13 files) - **Hardest** - deeply integrated with Tauri for plugin-to-window communication
|
||||||
3. **yaak-sync** (4 files) - Moderate complexity
|
3. **yaak-sync** (4 files) - Moderate complexity
|
||||||
4. **yaak-ws** (5 files) - Moderate complexity
|
4. **yaak-ws** (5 files) - Moderate complexity
|
||||||
|
|
||||||
### Pattern for Decoupling
|
### Pattern for Decoupling
|
||||||
|
|
||||||
1. Remove Tauri plugin `init()` function from the crate
|
1. Remove Tauri plugin `init()` function from the crate
|
||||||
2. Move commands to `yaak-app/src/commands.rs` or keep inline in `lib.rs`
|
2. Move commands to `yaak-app/src/commands.rs` or keep inline in `lib.rs`
|
||||||
3. Move extension traits (e.g., `SomethingManagerExt`) to yaak-app or yaak-tauri-utils
|
3. Move extension traits (e.g., `SomethingManagerExt`) to yaak-app or yaak-tauri-utils
|
||||||
4. Initialize managers in yaak-app's `.setup()` block
|
4. Initialize managers in yaak-app's `.setup()` block
|
||||||
5. Remove `tauri` from Cargo.toml dependencies
|
5. Remove `tauri` from Cargo.toml dependencies
|
||||||
6. Update `crates-tauri/yaak-app-client/capabilities/default.json` to remove the plugin permission
|
6. Update `crates-tauri/yaak-app/capabilities/default.json` to remove the plugin permission
|
||||||
7. Replace `tauri::async_runtime::block_on` with `tokio::runtime::Handle::current().block_on()`
|
7. Replace `tauri::async_runtime::block_on` with `tokio::runtime::Handle::current().block_on()`
|
||||||
|
|
||||||
## Key Files
|
## Key Files
|
||||||
|
- `crates-tauri/yaak-app/src/lib.rs` - Main Tauri app, setup block initializes managers
|
||||||
- `crates-tauri/yaak-app-client/src/lib.rs` - Main Tauri app, setup block initializes managers
|
- `crates-tauri/yaak-app/src/commands.rs` - Migrated Tauri commands
|
||||||
- `crates-tauri/yaak-app-client/src/commands.rs` - Migrated Tauri commands
|
- `crates-tauri/yaak-app/src/models_ext.rs` - Database plugin and extension traits
|
||||||
- `crates-tauri/yaak-app-client/src/models_ext.rs` - Database plugin and extension traits
|
|
||||||
- `crates-tauri/yaak-tauri-utils/src/window.rs` - WorkspaceWindowTrait for window state
|
- `crates-tauri/yaak-tauri-utils/src/window.rs` - WorkspaceWindowTrait for window state
|
||||||
- `crates/yaak-models/src/lib.rs` - Contains `init_standalone()` for CLI usage
|
- `crates/yaak-models/src/lib.rs` - Contains `init_standalone()` for CLI usage
|
||||||
|
|
||||||
## Git Branch
|
## Git Branch
|
||||||
|
|
||||||
Working on `detach-tauri` branch.
|
Working on `detach-tauri` branch.
|
||||||
|
|
||||||
## Recent Commits
|
## Recent Commits
|
||||||
|
|
||||||
```
|
```
|
||||||
c40cff40 Remove Tauri dependencies from yaak-crypto and yaak-grpc
|
c40cff40 Remove Tauri dependencies from yaak-crypto and yaak-grpc
|
||||||
df495f1d Move Tauri utilities from yaak-common to yaak-tauri-utils
|
df495f1d Move Tauri utilities from yaak-common to yaak-tauri-utils
|
||||||
@@ -77,7 +67,6 @@ e718a5f1 Refactor models_ext to use init_standalone from yaak-models
|
|||||||
```
|
```
|
||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
- Run `cargo check -p <crate>` to verify a crate builds without Tauri
|
- Run `cargo check -p <crate>` to verify a crate builds without Tauri
|
||||||
- Run `npm run client:dev` to test the Tauri app still works
|
- Run `npm run app-dev` to test the Tauri app still works
|
||||||
- Run `cargo run -p yaak-cli -- --help` to test the CLI
|
- Run `cargo run -p yaak-cli -- --help` to test the CLI
|
||||||
|
|||||||
51
.claude/commands/release/check-out-pr.md
Normal file
51
.claude/commands/release/check-out-pr.md
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
---
|
||||||
|
description: Review a PR in a new worktree
|
||||||
|
allowed-tools: Bash(git worktree:*), Bash(gh pr:*)
|
||||||
|
---
|
||||||
|
|
||||||
|
Review a GitHub pull request in a new git worktree.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```
|
||||||
|
/review-pr <PR_NUMBER>
|
||||||
|
```
|
||||||
|
|
||||||
|
## What to do
|
||||||
|
|
||||||
|
1. List all open pull requests and ask the user to select one
|
||||||
|
2. Get PR information using `gh pr view <PR_NUMBER> --json number,headRefName`
|
||||||
|
3. Extract the branch name from the PR
|
||||||
|
4. Create a new worktree at `../yaak-worktrees/pr-<PR_NUMBER>` using `git worktree add` with a timeout of at least 300000ms (5 minutes) since the post-checkout hook runs a bootstrap script
|
||||||
|
5. Checkout the PR branch in the new worktree using `gh pr checkout <PR_NUMBER>`
|
||||||
|
6. The post-checkout hook will automatically:
|
||||||
|
- Create `.env.local` with unique ports
|
||||||
|
- Copy editor config folders
|
||||||
|
- Run `npm install && npm run bootstrap`
|
||||||
|
7. Inform the user:
|
||||||
|
- Where the worktree was created
|
||||||
|
- What ports were assigned
|
||||||
|
- How to access it (cd command)
|
||||||
|
- How to run the dev server
|
||||||
|
- How to remove the worktree when done
|
||||||
|
|
||||||
|
## Example Output
|
||||||
|
|
||||||
|
```
|
||||||
|
Created worktree for PR #123 at ../yaak-worktrees/pr-123
|
||||||
|
Branch: feature-auth
|
||||||
|
Ports: Vite (1421), MCP (64344)
|
||||||
|
|
||||||
|
To start working:
|
||||||
|
cd ../yaak-worktrees/pr-123
|
||||||
|
npm run app-dev
|
||||||
|
|
||||||
|
To remove when done:
|
||||||
|
git worktree remove ../yaak-worktrees/pr-123
|
||||||
|
```
|
||||||
|
|
||||||
|
## Error Handling
|
||||||
|
|
||||||
|
- If the PR doesn't exist, show a helpful error
|
||||||
|
- If the worktree already exists, inform the user and ask if they want to remove and recreate it
|
||||||
|
- If `gh` CLI is not available, inform the user to install it
|
||||||
@@ -37,14 +37,11 @@ The skill generates markdown-formatted release notes following this structure:
|
|||||||
|
|
||||||
**IMPORTANT**: Always add a blank lines around the markdown code fence and output the markdown code block last
|
**IMPORTANT**: Always add a blank lines around the markdown code fence and output the markdown code block last
|
||||||
**IMPORTANT**: PRs by `@gschier` should not mention the @username
|
**IMPORTANT**: PRs by `@gschier` should not mention the @username
|
||||||
**IMPORTANT**: These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.
|
|
||||||
|
|
||||||
## After Generating Release Notes
|
## After Generating Release Notes
|
||||||
|
|
||||||
After outputting the release notes, ask the user if they would like to create a draft GitHub release with these notes. If they confirm, create the release using:
|
After outputting the release notes, ask the user if they would like to create a draft GitHub release with these notes. If they confirm, create the release using:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gh release create <tag> --draft --prerelease --title "Release <version>" --notes '<release notes>'
|
gh release create <tag> --draft --prerelease --title "<tag>" --notes '<release notes>'
|
||||||
```
|
```
|
||||||
|
|
||||||
**IMPORTANT**: The release title format is "Release XXXX" where XXXX is the version WITHOUT the `v` prefix. For example, tag `v2026.2.1-beta.1` gets title "Release 2026.2.1-beta.1".
|
|
||||||
|
|||||||
35
.claude/skills/worktree.md
Normal file
35
.claude/skills/worktree.md
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
# Worktree Management Skill
|
||||||
|
|
||||||
|
## Creating Worktrees
|
||||||
|
|
||||||
|
When creating git worktrees for this project, ALWAYS use the path format:
|
||||||
|
```
|
||||||
|
../yaak-worktrees/<NAME>
|
||||||
|
```
|
||||||
|
|
||||||
|
For example:
|
||||||
|
- `git worktree add ../yaak-worktrees/feature-auth`
|
||||||
|
- `git worktree add ../yaak-worktrees/bugfix-login`
|
||||||
|
- `git worktree add ../yaak-worktrees/refactor-api`
|
||||||
|
|
||||||
|
## What Happens Automatically
|
||||||
|
|
||||||
|
The post-checkout hook will automatically:
|
||||||
|
1. Create `.env.local` with unique ports (YAAK_DEV_PORT and YAAK_PLUGIN_MCP_SERVER_PORT)
|
||||||
|
2. Copy gitignored editor config folders (.zed, .idea, etc.)
|
||||||
|
3. Run `npm install && npm run bootstrap`
|
||||||
|
|
||||||
|
## Deleting Worktrees
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git worktree remove ../yaak-worktrees/<NAME>
|
||||||
|
```
|
||||||
|
|
||||||
|
## Port Assignments
|
||||||
|
|
||||||
|
- Main worktree: 1420 (Vite), 64343 (MCP)
|
||||||
|
- First worktree: 1421, 64344
|
||||||
|
- Second worktree: 1422, 64345
|
||||||
|
- etc.
|
||||||
|
|
||||||
|
Each worktree can run `npm run app-dev` simultaneously without conflicts.
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
---
|
|
||||||
name: release-generate-release-notes
|
|
||||||
description: Generate Yaak release notes from git history and PR metadata, including feedback links and full changelog compare links. Use when asked to run or replace the old Claude generate-release-notes command.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Generate Release Notes
|
|
||||||
|
|
||||||
Generate formatted markdown release notes for a Yaak tag.
|
|
||||||
|
|
||||||
## Workflow
|
|
||||||
|
|
||||||
1. Determine target tag.
|
|
||||||
2. Determine previous comparable tag:
|
|
||||||
- Beta tag: compare against previous beta (if the root version is the same) or stable tag.
|
|
||||||
- Stable tag: compare against previous stable tag.
|
|
||||||
3. Collect commits in range:
|
|
||||||
- `git log --oneline <prev_tag>..<target_tag>`
|
|
||||||
4. For linked PRs, fetch metadata:
|
|
||||||
- `gh pr view <PR_NUMBER> --json number,title,body,author,url`
|
|
||||||
5. Extract useful details:
|
|
||||||
- Feedback URLs (`feedback.yaak.app`)
|
|
||||||
- Plugin install links or other notable context
|
|
||||||
6. Format notes using Yaak style:
|
|
||||||
- Changelog badge at top
|
|
||||||
- Bulleted items with PR links where available
|
|
||||||
- Feedback links where available
|
|
||||||
- Full changelog compare link at bottom
|
|
||||||
|
|
||||||
## Formatting Rules
|
|
||||||
|
|
||||||
- Wrap final notes in a markdown code fence.
|
|
||||||
- Keep a blank line before and after the code fence.
|
|
||||||
- Output the markdown code block last.
|
|
||||||
- Do not append `by @gschier` for PRs authored by `@gschier`.
|
|
||||||
- These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.
|
|
||||||
|
|
||||||
## Release Creation Prompt
|
|
||||||
|
|
||||||
After producing notes, ask whether to create a draft GitHub release.
|
|
||||||
|
|
||||||
If confirmed and release does not yet exist, run:
|
|
||||||
|
|
||||||
`gh release create <tag> --draft --prerelease --title "Release <version_without_v>" --notes '<release notes>'`
|
|
||||||
|
|
||||||
If a draft release for the tag already exists, update it instead:
|
|
||||||
|
|
||||||
`gh release edit <tag> --title "Release <version_without_v>" --notes-file <path_to_notes>`
|
|
||||||
|
|
||||||
Use title format `Release <version_without_v>`, e.g. `v2026.2.1-beta.1` -> `Release 2026.2.1-beta.1`.
|
|
||||||
4
.gitattributes
vendored
4
.gitattributes
vendored
@@ -1,5 +1,5 @@
|
|||||||
crates-tauri/yaak-app-client/vendored/**/* linguist-generated=true
|
crates-tauri/yaak-app/vendored/**/* linguist-generated=true
|
||||||
crates-tauri/yaak-app-client/gen/schemas/**/* linguist-generated=true
|
crates-tauri/yaak-app/gen/schemas/**/* linguist-generated=true
|
||||||
**/bindings/* linguist-generated=true
|
**/bindings/* linguist-generated=true
|
||||||
crates/yaak-templates/pkg/* linguist-generated=true
|
crates/yaak-templates/pkg/* linguist-generated=true
|
||||||
|
|
||||||
|
|||||||
24
.github/ISSUE_TEMPLATE/bug_report.md
vendored
24
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -1,9 +1,10 @@
|
|||||||
---
|
---
|
||||||
name: Bug report
|
name: Bug report
|
||||||
about: Create a report to help us improve
|
about: Create a report to help us improve
|
||||||
title: ""
|
title: ''
|
||||||
labels: ""
|
labels: ''
|
||||||
assignees: ""
|
assignees: ''
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Describe the bug**
|
**Describe the bug**
|
||||||
@@ -11,7 +12,6 @@ A clear and concise description of what the bug is.
|
|||||||
|
|
||||||
**To Reproduce**
|
**To Reproduce**
|
||||||
Steps to reproduce the behavior:
|
Steps to reproduce the behavior:
|
||||||
|
|
||||||
1. Go to '...'
|
1. Go to '...'
|
||||||
2. Click on '....'
|
2. Click on '....'
|
||||||
3. Scroll down to '....'
|
3. Scroll down to '....'
|
||||||
@@ -24,17 +24,15 @@ A clear and concise description of what you expected to happen.
|
|||||||
If applicable, add screenshots to help explain your problem.
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
**Desktop (please complete the following information):**
|
**Desktop (please complete the following information):**
|
||||||
|
- OS: [e.g. iOS]
|
||||||
- OS: [e.g. iOS]
|
- Browser [e.g. chrome, safari]
|
||||||
- Browser [e.g. chrome, safari]
|
- Version [e.g. 22]
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Smartphone (please complete the following information):**
|
**Smartphone (please complete the following information):**
|
||||||
|
- Device: [e.g. iPhone6]
|
||||||
- Device: [e.g. iPhone6]
|
- OS: [e.g. iOS8.1]
|
||||||
- OS: [e.g. iOS8.1]
|
- Browser [e.g. stock browser, safari]
|
||||||
- Browser [e.g. stock browser, safari]
|
- Version [e.g. 22]
|
||||||
- Version [e.g. 22]
|
|
||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
|||||||
19
.github/pull_request_template.md
vendored
19
.github/pull_request_template.md
vendored
@@ -1,19 +0,0 @@
|
|||||||
## Summary
|
|
||||||
|
|
||||||
<!-- Describe the bug and the fix in 1-3 sentences. -->
|
|
||||||
|
|
||||||
## Submission
|
|
||||||
|
|
||||||
- [ ] This PR is a bug fix or small-scope improvement.
|
|
||||||
- [ ] If this PR is not a bug fix or small-scope improvement, I linked an approved feedback item below.
|
|
||||||
- [ ] I have read and followed [`CONTRIBUTING.md`](CONTRIBUTING.md).
|
|
||||||
- [ ] I tested this change locally.
|
|
||||||
- [ ] I added or updated tests when reasonable.
|
|
||||||
|
|
||||||
Approved feedback item (required if not a bug fix or small-scope improvement):
|
|
||||||
|
|
||||||
<!-- https://yaak.app/feedback/... -->
|
|
||||||
|
|
||||||
## Related
|
|
||||||
|
|
||||||
<!-- Link related issues, discussions, or feedback items. -->
|
|
||||||
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
@@ -14,20 +14,17 @@ jobs:
|
|||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: voidzero-dev/setup-vp@v1
|
- uses: actions/setup-node@v4
|
||||||
with:
|
|
||||||
node-version: "24"
|
|
||||||
cache: true
|
|
||||||
- uses: dtolnay/rust-toolchain@stable
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
- uses: Swatinem/rust-cache@v2
|
- uses: Swatinem/rust-cache@v2
|
||||||
with:
|
with:
|
||||||
shared-key: ci
|
shared-key: ci
|
||||||
cache-on-failure: true
|
cache-on-failure: true
|
||||||
|
|
||||||
- run: vp install
|
- run: npm ci
|
||||||
- run: npm run bootstrap
|
- run: npm run bootstrap
|
||||||
- run: npm run lint
|
- run: npm run lint
|
||||||
- name: Run JS Tests
|
- name: Run JS Tests
|
||||||
run: vp test
|
run: npm test
|
||||||
- name: Run Rust Tests
|
- name: Run Rust Tests
|
||||||
run: cargo test --all
|
run: cargo test --all
|
||||||
|
|||||||
1
.github/workflows/claude.yml
vendored
1
.github/workflows/claude.yml
vendored
@@ -47,3 +47,4 @@ jobs:
|
|||||||
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
|
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
|
||||||
# or https://code.claude.com/docs/en/cli-reference for available options
|
# or https://code.claude.com/docs/en/cli-reference for available options
|
||||||
# claude_args: '--allowed-tools Bash(gh pr:*)'
|
# claude_args: '--allowed-tools Bash(gh pr:*)'
|
||||||
|
|
||||||
|
|||||||
52
.github/workflows/flathub.yml
vendored
52
.github/workflows/flathub.yml
vendored
@@ -1,52 +0,0 @@
|
|||||||
name: Update Flathub
|
|
||||||
on:
|
|
||||||
release:
|
|
||||||
types: [published]
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update-flathub:
|
|
||||||
name: Update Flathub manifest
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
# Only run for stable releases (skip betas/pre-releases)
|
|
||||||
if: ${{ !github.event.release.prerelease }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout app repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Checkout Flathub repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: flathub/app.yaak.Yaak
|
|
||||||
token: ${{ secrets.FLATHUB_TOKEN }}
|
|
||||||
path: flathub-repo
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.12"
|
|
||||||
|
|
||||||
- name: Set up Node.js
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: "22"
|
|
||||||
|
|
||||||
- name: Install source generators
|
|
||||||
run: |
|
|
||||||
pip install flatpak-node-generator tomlkit aiohttp
|
|
||||||
git clone --depth 1 https://github.com/flatpak/flatpak-builder-tools flatpak/flatpak-builder-tools
|
|
||||||
|
|
||||||
- name: Run update-manifest.sh
|
|
||||||
run: bash flatpak/update-manifest.sh "${{ github.event.release.tag_name }}" flathub-repo
|
|
||||||
|
|
||||||
- name: Commit and push to Flathub
|
|
||||||
working-directory: flathub-repo
|
|
||||||
run: |
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
||||||
git add -A
|
|
||||||
git diff --cached --quiet && echo "No changes to commit" && exit 0
|
|
||||||
git commit -m "Update to ${{ github.event.release.tag_name }}"
|
|
||||||
git push
|
|
||||||
59
.github/workflows/release-api-npm.yml
vendored
59
.github/workflows/release-api-npm.yml
vendored
@@ -1,59 +0,0 @@
|
|||||||
name: Release API to NPM
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags: [yaak-api-*]
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: API version to publish (for example 0.9.0 or v0.9.0)
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
publish-npm:
|
|
||||||
name: Publish @yaakapp/api
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
id-token: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
registry-url: https://registry.npmjs.org
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Set @yaakapp/api version
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
WORKFLOW_VERSION: ${{ inputs.version }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
|
||||||
VERSION="$WORKFLOW_VERSION"
|
|
||||||
else
|
|
||||||
VERSION="${GITHUB_REF_NAME#yaak-api-}"
|
|
||||||
fi
|
|
||||||
VERSION="${VERSION#v}"
|
|
||||||
echo "Preparing @yaakapp/api version: $VERSION"
|
|
||||||
cd packages/plugin-runtime-types
|
|
||||||
npm version "$VERSION" --no-git-tag-version --allow-same-version
|
|
||||||
|
|
||||||
- name: Build @yaakapp/api
|
|
||||||
working-directory: packages/plugin-runtime-types
|
|
||||||
run: npm run build
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/api
|
|
||||||
working-directory: packages/plugin-runtime-types
|
|
||||||
run: npm publish --provenance --access public
|
|
||||||
218
.github/workflows/release-cli-npm.yml
vendored
218
.github/workflows/release-cli-npm.yml
vendored
@@ -1,218 +0,0 @@
|
|||||||
name: Release CLI to NPM
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags: [yaak-cli-*]
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: CLI version to publish (for example 0.4.0 or v0.4.0)
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
prepare-vendored-assets:
|
|
||||||
name: Prepare vendored plugin assets
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
|
|
||||||
- name: Install Rust stable
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Build plugin assets
|
|
||||||
env:
|
|
||||||
SKIP_WASM_BUILD: "1"
|
|
||||||
run: |
|
|
||||||
npm run build
|
|
||||||
npm run vendor:vendor-plugins
|
|
||||||
|
|
||||||
- name: Upload vendored assets
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: vendored-assets
|
|
||||||
path: |
|
|
||||||
crates-tauri/yaak-app-client/vendored/plugin-runtime/index.cjs
|
|
||||||
crates-tauri/yaak-app-client/vendored/plugins
|
|
||||||
if-no-files-found: error
|
|
||||||
|
|
||||||
build-binaries:
|
|
||||||
name: Build ${{ matrix.pkg }}
|
|
||||||
needs: prepare-vendored-assets
|
|
||||||
runs-on: ${{ matrix.runner }}
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- pkg: cli-darwin-arm64
|
|
||||||
runner: macos-latest
|
|
||||||
target: aarch64-apple-darwin
|
|
||||||
binary: yaak
|
|
||||||
- pkg: cli-darwin-x64
|
|
||||||
runner: macos-latest
|
|
||||||
target: x86_64-apple-darwin
|
|
||||||
binary: yaak
|
|
||||||
- pkg: cli-linux-arm64
|
|
||||||
runner: ubuntu-22.04-arm
|
|
||||||
target: aarch64-unknown-linux-gnu
|
|
||||||
binary: yaak
|
|
||||||
- pkg: cli-linux-x64
|
|
||||||
runner: ubuntu-22.04
|
|
||||||
target: x86_64-unknown-linux-gnu
|
|
||||||
binary: yaak
|
|
||||||
- pkg: cli-win32-arm64
|
|
||||||
runner: windows-latest
|
|
||||||
target: aarch64-pc-windows-msvc
|
|
||||||
binary: yaak.exe
|
|
||||||
- pkg: cli-win32-x64
|
|
||||||
runner: windows-latest
|
|
||||||
target: x86_64-pc-windows-msvc
|
|
||||||
binary: yaak.exe
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install Rust stable
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
targets: ${{ matrix.target }}
|
|
||||||
|
|
||||||
- name: Restore Rust cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
with:
|
|
||||||
shared-key: release-cli-npm
|
|
||||||
cache-on-failure: true
|
|
||||||
|
|
||||||
- name: Install Linux build dependencies
|
|
||||||
if: startsWith(matrix.runner, 'ubuntu')
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y pkg-config libdbus-1-dev
|
|
||||||
|
|
||||||
- name: Download vendored assets
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: vendored-assets
|
|
||||||
path: crates-tauri/yaak-app-client/vendored
|
|
||||||
|
|
||||||
- name: Set CLI build version
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
WORKFLOW_VERSION: ${{ inputs.version }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
|
||||||
VERSION="$WORKFLOW_VERSION"
|
|
||||||
else
|
|
||||||
VERSION="${GITHUB_REF_NAME#yaak-cli-}"
|
|
||||||
fi
|
|
||||||
VERSION="${VERSION#v}"
|
|
||||||
echo "Building yaak version: $VERSION"
|
|
||||||
echo "YAAK_CLI_VERSION=$VERSION" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Build yaak
|
|
||||||
run: cargo build --locked --release -p yaak-cli --bin yaak --target ${{ matrix.target }}
|
|
||||||
|
|
||||||
- name: Stage binary artifact
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
mkdir -p "npm/dist/${{ matrix.pkg }}"
|
|
||||||
cp "target/${{ matrix.target }}/release/${{ matrix.binary }}" "npm/dist/${{ matrix.pkg }}/${{ matrix.binary }}"
|
|
||||||
|
|
||||||
- name: Upload binary artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: ${{ matrix.pkg }}
|
|
||||||
path: npm/dist/${{ matrix.pkg }}/${{ matrix.binary }}
|
|
||||||
if-no-files-found: error
|
|
||||||
|
|
||||||
publish-npm:
|
|
||||||
name: Publish @yaakapp/cli packages
|
|
||||||
needs: build-binaries
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
id-token: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: lts/*
|
|
||||||
registry-url: https://registry.npmjs.org
|
|
||||||
|
|
||||||
- name: Download binary artifacts
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
pattern: cli-*
|
|
||||||
path: npm/dist
|
|
||||||
merge-multiple: false
|
|
||||||
|
|
||||||
- name: Prepare npm packages
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
WORKFLOW_VERSION: ${{ inputs.version }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
|
||||||
VERSION="$WORKFLOW_VERSION"
|
|
||||||
else
|
|
||||||
VERSION="${GITHUB_REF_NAME#yaak-cli-}"
|
|
||||||
fi
|
|
||||||
VERSION="${VERSION#v}"
|
|
||||||
if [[ "$VERSION" == *-* ]]; then
|
|
||||||
PRERELEASE="${VERSION#*-}"
|
|
||||||
NPM_TAG="${PRERELEASE%%.*}"
|
|
||||||
else
|
|
||||||
NPM_TAG="latest"
|
|
||||||
fi
|
|
||||||
echo "Preparing CLI npm packages for version: $VERSION"
|
|
||||||
echo "Publishing with npm dist-tag: $NPM_TAG"
|
|
||||||
echo "NPM_TAG=$NPM_TAG" >> "$GITHUB_ENV"
|
|
||||||
YAAK_CLI_VERSION="$VERSION" node npm/prepare-publish.js
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-darwin-arm64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-darwin-arm64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-darwin-x64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-darwin-x64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-linux-arm64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-linux-arm64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-linux-x64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-linux-x64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-win32-arm64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-win32-arm64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli-win32-x64
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli-win32-x64
|
|
||||||
|
|
||||||
- name: Publish @yaakapp/cli
|
|
||||||
run: npm publish --provenance --access public --tag "$NPM_TAG"
|
|
||||||
working-directory: npm/cli
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Release App Artifacts
|
name: Generate Artifacts
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags: [v*]
|
tags: [v*]
|
||||||
@@ -50,11 +50,8 @@ jobs:
|
|||||||
- name: Checkout yaakapp/app
|
- name: Checkout yaakapp/app
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Vite+
|
- name: Setup Node
|
||||||
uses: voidzero-dev/setup-vp@v1
|
uses: actions/setup-node@v4
|
||||||
with:
|
|
||||||
node-version: "24"
|
|
||||||
cache: true
|
|
||||||
|
|
||||||
- name: install Rust stable
|
- name: install Rust stable
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
@@ -90,15 +87,15 @@ jobs:
|
|||||||
echo $dir >> $env:GITHUB_PATH
|
echo $dir >> $env:GITHUB_PATH
|
||||||
& $exe --version
|
& $exe --version
|
||||||
|
|
||||||
- run: vp install
|
- run: npm ci
|
||||||
- run: npm run bootstrap
|
- run: npm run bootstrap
|
||||||
env:
|
env:
|
||||||
YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
|
YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
|
||||||
- run: npm run lint
|
- run: npm run lint
|
||||||
- name: Run JS Tests
|
- name: Run JS Tests
|
||||||
run: vp test
|
run: npm test
|
||||||
- name: Run Rust Tests
|
- name: Run Rust Tests
|
||||||
run: cargo test --all --exclude yaak-cli
|
run: cargo test --all
|
||||||
|
|
||||||
- name: Set version
|
- name: Set version
|
||||||
run: npm run replace-version
|
run: npm run replace-version
|
||||||
@@ -125,8 +122,8 @@ jobs:
|
|||||||
security list-keychain -d user -s $KEYCHAIN_PATH
|
security list-keychain -d user -s $KEYCHAIN_PATH
|
||||||
|
|
||||||
# Sign vendored binaries with hardened runtime and their specific entitlements
|
# Sign vendored binaries with hardened runtime and their specific entitlements
|
||||||
codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaakprotoc.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/protoc/yaakprotoc || true
|
codesign --force --options runtime --entitlements crates-tauri/yaak-app/macos/entitlements.yaakprotoc.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app/vendored/protoc/yaakprotoc || true
|
||||||
codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaaknode.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/node/yaaknode || true
|
codesign --force --options runtime --entitlements crates-tauri/yaak-app/macos/entitlements.yaaknode.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app/vendored/node/yaaknode || true
|
||||||
|
|
||||||
- uses: tauri-apps/tauri-action@v0
|
- uses: tauri-apps/tauri-action@v0
|
||||||
env:
|
env:
|
||||||
@@ -155,31 +152,4 @@ jobs:
|
|||||||
releaseBody: "[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)"
|
releaseBody: "[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)"
|
||||||
releaseDraft: true
|
releaseDraft: true
|
||||||
prerelease: true
|
prerelease: true
|
||||||
projectPath: ./crates-tauri/yaak-app-client
|
args: "${{ matrix.args }} --config ./crates-tauri/yaak-app/tauri.release.conf.json"
|
||||||
args: "${{ matrix.args }} --config ./tauri.release.conf.json"
|
|
||||||
|
|
||||||
# Build a per-machine NSIS installer for enterprise deployment (PDQ, SCCM, Intune)
|
|
||||||
- name: Build and upload machine-wide installer (Windows only)
|
|
||||||
if: matrix.os == 'windows'
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
|
||||||
YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
|
||||||
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
|
||||||
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
|
||||||
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
||||||
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
Get-ChildItem -Recurse -Path target -File -Filter "*.exe.sig" | Remove-Item -Force
|
|
||||||
Push-Location crates-tauri/yaak-app-client
|
|
||||||
npx tauri bundle ${{ matrix.args }} --bundles nsis --config ./tauri.release.conf.json --config '{"bundle":{"createUpdaterArtifacts":true,"windows":{"nsis":{"installMode":"perMachine"}}}}'
|
|
||||||
Pop-Location
|
|
||||||
$setup = Get-ChildItem -Recurse -Path target -Filter "*setup*.exe" | Select-Object -First 1
|
|
||||||
$setupSig = "$($setup.FullName).sig"
|
|
||||||
$dest = $setup.FullName -replace '-setup\.exe$', '-setup-machine.exe'
|
|
||||||
$destSig = "$dest.sig"
|
|
||||||
Copy-Item $setup.FullName $dest
|
|
||||||
Copy-Item $setupSig $destSig
|
|
||||||
gh release upload "${{ github.ref_name }}" "$dest" --clobber
|
|
||||||
gh release upload "${{ github.ref_name }}" "$destSig" --clobber
|
|
||||||
10
.github/workflows/sponsors.yml
vendored
10
.github/workflows/sponsors.yml
vendored
@@ -16,23 +16,23 @@ jobs:
|
|||||||
uses: JamesIves/github-sponsors-readme-action@v1
|
uses: JamesIves/github-sponsors-readme-action@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.SPONSORS_PAT }}
|
token: ${{ secrets.SPONSORS_PAT }}
|
||||||
file: "README.md"
|
file: 'README.md'
|
||||||
maximum: 1999
|
maximum: 1999
|
||||||
template: '<a href="https://github.com/{{{ login }}}"><img src="{{{ avatarUrl }}}" width="50px" alt="User avatar: {{{ login }}}" /></a> '
|
template: '<a href="https://github.com/{{{ login }}}"><img src="{{{ avatarUrl }}}" width="50px" alt="User avatar: {{{ login }}}" /></a> '
|
||||||
active-only: false
|
active-only: false
|
||||||
include-private: true
|
include-private: true
|
||||||
marker: "sponsors-base"
|
marker: 'sponsors-base'
|
||||||
|
|
||||||
- name: Generate Sponsors
|
- name: Generate Sponsors
|
||||||
uses: JamesIves/github-sponsors-readme-action@v1
|
uses: JamesIves/github-sponsors-readme-action@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.SPONSORS_PAT }}
|
token: ${{ secrets.SPONSORS_PAT }}
|
||||||
file: "README.md"
|
file: 'README.md'
|
||||||
minimum: 2000
|
minimum: 2000
|
||||||
template: '<a href="https://github.com/{{{ login }}}"><img src="{{{ avatarUrl }}}" width="80px" alt="User avatar: {{{ login }}}" /></a> '
|
template: '<a href="https://github.com/{{{ login }}}"><img src="{{{ avatarUrl }}}" width="80px" alt="User avatar: {{{ login }}}" /></a> '
|
||||||
active-only: false
|
active-only: false
|
||||||
include-private: true
|
include-private: true
|
||||||
marker: "sponsors-premium"
|
marker: 'sponsors-premium'
|
||||||
|
|
||||||
# ⚠️ Note: You can use any deployment step here to automatically push the README
|
# ⚠️ Note: You can use any deployment step here to automatically push the README
|
||||||
# changes back to your branch.
|
# changes back to your branch.
|
||||||
@@ -41,4 +41,4 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
branch: main
|
branch: main
|
||||||
force: false
|
force: false
|
||||||
folder: "."
|
folder: '.'
|
||||||
|
|||||||
16
.gitignore
vendored
16
.gitignore
vendored
@@ -39,22 +39,8 @@ codebook.toml
|
|||||||
target
|
target
|
||||||
|
|
||||||
# Per-worktree Tauri config (generated by post-checkout hook)
|
# Per-worktree Tauri config (generated by post-checkout hook)
|
||||||
crates-tauri/yaak-app-client/tauri.worktree.conf.json
|
crates-tauri/yaak-app/tauri.worktree.conf.json
|
||||||
crates-tauri/yaak-app-proxy/tauri.worktree.conf.json
|
|
||||||
|
|
||||||
# Tauri auto-generated permission files
|
# Tauri auto-generated permission files
|
||||||
**/permissions/autogenerated
|
**/permissions/autogenerated
|
||||||
**/permissions/schemas
|
**/permissions/schemas
|
||||||
|
|
||||||
# Flatpak build artifacts
|
|
||||||
flatpak-repo/
|
|
||||||
.flatpak-builder/
|
|
||||||
flatpak/flatpak-builder-tools/
|
|
||||||
flatpak/cargo-sources.json
|
|
||||||
flatpak/node-sources.json
|
|
||||||
|
|
||||||
# Local Codex desktop env state
|
|
||||||
.codex/environments/environment.toml
|
|
||||||
|
|
||||||
# Claude Code local settings
|
|
||||||
.claude/settings.local.json
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
24.14.0
|
|
||||||
2
.npmrc
2
.npmrc
@@ -1,2 +0,0 @@
|
|||||||
# vite-plugin-wasm has not yet declared Vite 8 in its peerDependencies
|
|
||||||
legacy-peer-deps=true
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
**/bindings/**
|
|
||||||
**/routeTree.gen.ts
|
|
||||||
crates/yaak-templates/pkg/**
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"printWidth": 100,
|
|
||||||
"ignorePatterns": [
|
|
||||||
"**/bindings/**",
|
|
||||||
"crates/yaak-templates/pkg/**",
|
|
||||||
"apps/yaak-client/routeTree.gen.ts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
vp lint
|
|
||||||
6
.vscode/extensions.json
vendored
6
.vscode/extensions.json
vendored
@@ -1,7 +1,3 @@
|
|||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": ["biomejs.biome", "rust-lang.rust-analyzer", "bradlc.vscode-tailwindcss"]
|
||||||
"rust-lang.rust-analyzer",
|
|
||||||
"bradlc.vscode-tailwindcss",
|
|
||||||
"VoidZero.vite-plus-extension-pack"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@@ -1,8 +1,6 @@
|
|||||||
{
|
{
|
||||||
"editor.defaultFormatter": "oxc.oxc-vscode",
|
"editor.defaultFormatter": "biomejs.biome",
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
"editor.formatOnSaveMode": "file",
|
"biome.enabled": true,
|
||||||
"editor.codeActionsOnSave": {
|
"biome.lint.format.enable": true
|
||||||
"source.fixAll.oxc": "explicit"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
- Tag safety: app releases use `v*` tags and CLI releases use `yaak-cli-*` tags; always confirm which one is requested before retagging.
|
|
||||||
- Do not commit, push, or tag without explicit approval
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# Contributing to Yaak
|
|
||||||
|
|
||||||
Yaak accepts community pull requests for:
|
|
||||||
|
|
||||||
- Bug fixes
|
|
||||||
- Small-scope improvements directly tied to existing behavior
|
|
||||||
|
|
||||||
Pull requests that introduce broad new features, major redesigns, or large refactors are out of scope unless explicitly approved first.
|
|
||||||
|
|
||||||
## Approval for Non-Bugfix Changes
|
|
||||||
|
|
||||||
If your PR is not a bug fix or small-scope improvement, include a link to the approved [feedback item](https://yaak.app/feedback) where contribution approval was explicitly stated.
|
|
||||||
|
|
||||||
## Development Setup
|
|
||||||
|
|
||||||
For local setup and development workflows, see [`DEVELOPMENT.md`](DEVELOPMENT.md).
|
|
||||||
3708
Cargo.lock
generated
3708
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
78
Cargo.toml
78
Cargo.toml
@@ -1,38 +1,30 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = [
|
members = [
|
||||||
"crates/yaak",
|
# Shared crates (no Tauri dependency)
|
||||||
# Common/foundation crates
|
"crates/yaak-actions",
|
||||||
"crates/common/yaak-database",
|
"crates/yaak-actions-builtin",
|
||||||
"crates/common/yaak-rpc",
|
"crates/yaak-core",
|
||||||
# Shared crates (no Tauri dependency)
|
"crates/yaak-common",
|
||||||
"crates/yaak-core",
|
"crates/yaak-crypto",
|
||||||
"crates/yaak-common",
|
"crates/yaak-git",
|
||||||
"crates/yaak-crypto",
|
"crates/yaak-grpc",
|
||||||
"crates/yaak-git",
|
"crates/yaak-http",
|
||||||
"crates/yaak-grpc",
|
"crates/yaak-models",
|
||||||
"crates/yaak-http",
|
"crates/yaak-plugins",
|
||||||
"crates/yaak-models",
|
"crates/yaak-sse",
|
||||||
"crates/yaak-plugins",
|
"crates/yaak-sync",
|
||||||
"crates/yaak-sse",
|
"crates/yaak-templates",
|
||||||
"crates/yaak-sync",
|
"crates/yaak-tls",
|
||||||
"crates/yaak-templates",
|
"crates/yaak-ws",
|
||||||
"crates/yaak-tls",
|
# CLI crates
|
||||||
"crates/yaak-ws",
|
"crates-cli/yaak-cli",
|
||||||
"crates/yaak-api",
|
# Tauri-specific crates
|
||||||
"crates/yaak-proxy",
|
"crates-tauri/yaak-app",
|
||||||
# Proxy-specific crates
|
"crates-tauri/yaak-fonts",
|
||||||
"crates-proxy/yaak-proxy-lib",
|
"crates-tauri/yaak-license",
|
||||||
# CLI crates
|
"crates-tauri/yaak-mac-window",
|
||||||
"crates-cli/yaak-cli",
|
"crates-tauri/yaak-tauri-utils",
|
||||||
# Tauri-specific crates
|
|
||||||
"crates-tauri/yaak-app-client",
|
|
||||||
"crates-tauri/yaak-app-proxy",
|
|
||||||
"crates-tauri/yaak-fonts",
|
|
||||||
"crates-tauri/yaak-license",
|
|
||||||
"crates-tauri/yaak-mac-window",
|
|
||||||
"crates-tauri/yaak-tauri-utils",
|
|
||||||
"crates-tauri/yaak-window",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
@@ -43,25 +35,21 @@ log = "0.4.29"
|
|||||||
reqwest = "0.12.20"
|
reqwest = "0.12.20"
|
||||||
rustls = { version = "0.23.34", default-features = false }
|
rustls = { version = "0.23.34", default-features = false }
|
||||||
rustls-platform-verifier = "0.6.2"
|
rustls-platform-verifier = "0.6.2"
|
||||||
schemars = { version = "0.8.22", features = ["chrono"] }
|
|
||||||
serde = "1.0.228"
|
serde = "1.0.228"
|
||||||
serde_json = "1.0.145"
|
serde_json = "1.0.145"
|
||||||
sha2 = "0.10.9"
|
sha2 = "0.10.9"
|
||||||
tauri = "2.11.1"
|
tauri = "2.9.5"
|
||||||
tauri-plugin = "2.6.1"
|
tauri-plugin = "2.5.2"
|
||||||
tauri-plugin-dialog = "2.7.1"
|
tauri-plugin-dialog = "2.4.2"
|
||||||
tauri-plugin-shell = "2.3.5"
|
tauri-plugin-shell = "2.3.3"
|
||||||
thiserror = "2.0.17"
|
thiserror = "2.0.17"
|
||||||
tokio = "1.48.0"
|
tokio = "1.48.0"
|
||||||
ts-rs = "11.1.0"
|
ts-rs = "11.1.0"
|
||||||
|
|
||||||
# Internal crates - common/foundation
|
|
||||||
yaak-database = { path = "crates/common/yaak-database" }
|
|
||||||
yaak-rpc = { path = "crates/common/yaak-rpc" }
|
|
||||||
|
|
||||||
# Internal crates - shared
|
# Internal crates - shared
|
||||||
|
yaak-actions = { path = "crates/yaak-actions" }
|
||||||
|
yaak-actions-builtin = { path = "crates/yaak-actions-builtin" }
|
||||||
yaak-core = { path = "crates/yaak-core" }
|
yaak-core = { path = "crates/yaak-core" }
|
||||||
yaak = { path = "crates/yaak" }
|
|
||||||
yaak-common = { path = "crates/yaak-common" }
|
yaak-common = { path = "crates/yaak-common" }
|
||||||
yaak-crypto = { path = "crates/yaak-crypto" }
|
yaak-crypto = { path = "crates/yaak-crypto" }
|
||||||
yaak-git = { path = "crates/yaak-git" }
|
yaak-git = { path = "crates/yaak-git" }
|
||||||
@@ -74,18 +62,12 @@ yaak-sync = { path = "crates/yaak-sync" }
|
|||||||
yaak-templates = { path = "crates/yaak-templates" }
|
yaak-templates = { path = "crates/yaak-templates" }
|
||||||
yaak-tls = { path = "crates/yaak-tls" }
|
yaak-tls = { path = "crates/yaak-tls" }
|
||||||
yaak-ws = { path = "crates/yaak-ws" }
|
yaak-ws = { path = "crates/yaak-ws" }
|
||||||
yaak-api = { path = "crates/yaak-api" }
|
|
||||||
yaak-proxy = { path = "crates/yaak-proxy" }
|
|
||||||
|
|
||||||
# Internal crates - proxy
|
|
||||||
yaak-proxy-lib = { path = "crates-proxy/yaak-proxy-lib" }
|
|
||||||
|
|
||||||
# Internal crates - Tauri-specific
|
# Internal crates - Tauri-specific
|
||||||
yaak-fonts = { path = "crates-tauri/yaak-fonts" }
|
yaak-fonts = { path = "crates-tauri/yaak-fonts" }
|
||||||
yaak-license = { path = "crates-tauri/yaak-license" }
|
yaak-license = { path = "crates-tauri/yaak-license" }
|
||||||
yaak-mac-window = { path = "crates-tauri/yaak-mac-window" }
|
yaak-mac-window = { path = "crates-tauri/yaak-mac-window" }
|
||||||
yaak-tauri-utils = { path = "crates-tauri/yaak-tauri-utils" }
|
yaak-tauri-utils = { path = "crates-tauri/yaak-tauri-utils" }
|
||||||
yaak-window = { path = "crates-tauri/yaak-window" }
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
strip = false
|
strip = false
|
||||||
|
|||||||
@@ -11,16 +11,14 @@ begin.
|
|||||||
|
|
||||||
Make sure you have the following tools installed:
|
Make sure you have the following tools installed:
|
||||||
|
|
||||||
- [Node.js](https://nodejs.org/en/download/package-manager) (v24+)
|
- [Node.js](https://nodejs.org/en/download/package-manager)
|
||||||
- [Rust](https://www.rust-lang.org/tools/install)
|
- [Rust](https://www.rust-lang.org/tools/install)
|
||||||
- [Vite+](https://vite.dev/guide/vite-plus) (`vp` CLI)
|
|
||||||
|
|
||||||
Check the installations with the following commands:
|
Check the installations with the following commands:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
node -v
|
node -v
|
||||||
npm -v
|
npm -v
|
||||||
vp --version
|
|
||||||
rustc --version
|
rustc --version
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -63,9 +61,9 @@ _Note: For safety, development builds use a separate database location from prod
|
|||||||
lezer-generator components/core/Editor/<LANG>/<LANG>.grammar > components/core/Editor/<LANG>/<LANG>.ts
|
lezer-generator components/core/Editor/<LANG>/<LANG>.grammar > components/core/Editor/<LANG>/<LANG>.ts
|
||||||
```
|
```
|
||||||
|
|
||||||
## Linting and Formatting
|
## Linting & Formatting
|
||||||
|
|
||||||
This repo uses [Vite+](https://vite.dev/guide/vite-plus) for linting (oxlint) and formatting (oxfmt).
|
This repo uses Biome for linting and formatting (replacing ESLint + Prettier).
|
||||||
|
|
||||||
- Lint the entire repo:
|
- Lint the entire repo:
|
||||||
|
|
||||||
@@ -73,6 +71,12 @@ This repo uses [Vite+](https://vite.dev/guide/vite-plus) for linting (oxlint) an
|
|||||||
npm run lint
|
npm run lint
|
||||||
```
|
```
|
||||||
|
|
||||||
|
- Auto-fix lint issues where possible:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm run lint:fix
|
||||||
|
```
|
||||||
|
|
||||||
- Format code:
|
- Format code:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
@@ -80,7 +84,5 @@ npm run format
|
|||||||
```
|
```
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
|
- Many workspace packages also expose the same scripts (`lint`, `lint:fix`, and `format`).
|
||||||
- A pre-commit hook runs `vp lint` automatically on commit.
|
- TypeScript type-checking still runs separately via `tsc --noEmit` in relevant packages.
|
||||||
- Some workspace packages also run `tsc --noEmit` for type-checking.
|
|
||||||
- VS Code users should install the recommended extensions for format-on-save support.
|
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -1,6 +1,6 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="https://github.com/JamesIves/github-sponsors-readme-action">
|
<a href="https://github.com/JamesIves/github-sponsors-readme-action">
|
||||||
<img width="200px" src="https://github.com/mountain-loop/yaak/raw/main/crates-tauri/yaak-app-client/icons/icon.png">
|
<img width="200px" src="https://github.com/mountain-loop/yaak/raw/main/crates-tauri/yaak-app/icons/icon.png">
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -16,20 +16,24 @@
|
|||||||
</p>
|
</p>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https://github.com/MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a> <a href="https://github.com/dharsanb"><img src="https://github.com/dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a> <a href="https://github.com/railwayapp"><img src="https://github.com/railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a> <a href="https://github.com/caseyamcl"><img src="https://github.com/caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a> <a href="https://github.com/bytebase"><img src="https://github.com/bytebase.png" width="80px" alt="User avatar: bytebase" /></a> <a href="https://github.com/"><img src="https://raw.githubusercontent.com/JamesIves/github-sponsors-readme-action/dev/.github/assets/placeholder.png" width="80px" alt="User avatar: " /></a> <!-- sponsors-premium -->
|
<!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https://github.com/MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a> <a href="https://github.com/dharsanb"><img src="https://github.com/dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a> <a href="https://github.com/railwayapp"><img src="https://github.com/railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a> <a href="https://github.com/caseyamcl"><img src="https://github.com/caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a> <a href="https://github.com/bytebase"><img src="https://github.com/bytebase.png" width="80px" alt="User avatar: bytebase" /></a> <a href="https://github.com/"><img src="https://raw.githubusercontent.com/JamesIves/github-sponsors-readme-action/dev/.github/assets/placeholder.png" width="80px" alt="User avatar: " /></a> <!-- sponsors-premium -->
|
||||||
</p>
|
</p>
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https://github.com/seanwash.png" width="50px" alt="User avatar: seanwash" /></a> <a href="https://github.com/jerath"><img src="https://github.com/jerath.png" width="50px" alt="User avatar: jerath" /></a> <a href="https://github.com/itsa-sh"><img src="https://github.com/itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a> <a href="https://github.com/dmmulroy"><img src="https://github.com/dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a> <a href="https://github.com/timcole"><img src="https://github.com/timcole.png" width="50px" alt="User avatar: timcole" /></a> <a href="https://github.com/VLZH"><img src="https://github.com/VLZH.png" width="50px" alt="User avatar: VLZH" /></a> <a href="https://github.com/terasaka2k"><img src="https://github.com/terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a> <a href="https://github.com/andriyor"><img src="https://github.com/andriyor.png" width="50px" alt="User avatar: andriyor" /></a> <a href="https://github.com/majudhu"><img src="https://github.com/majudhu.png" width="50px" alt="User avatar: majudhu" /></a> <a href="https://github.com/axelrindle"><img src="https://github.com/axelrindle.png" width="50px" alt="User avatar: axelrindle" /></a> <a href="https://github.com/jirizverina"><img src="https://github.com/jirizverina.png" width="50px" alt="User avatar: jirizverina" /></a> <a href="https://github.com/chip-well"><img src="https://github.com/chip-well.png" width="50px" alt="User avatar: chip-well" /></a> <a href="https://github.com/GRAYAH"><img src="https://github.com/GRAYAH.png" width="50px" alt="User avatar: GRAYAH" /></a> <a href="https://github.com/flashblaze"><img src="https://github.com/flashblaze.png" width="50px" alt="User avatar: flashblaze" /></a> <a href="https://github.com/Frostist"><img src="https://github.com/Frostist.png" width="50px" alt="User avatar: Frostist" /></a> <!-- sponsors-base -->
|
<!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https://github.com/seanwash.png" width="50px" alt="User avatar: seanwash" /></a> <a href="https://github.com/jerath"><img src="https://github.com/jerath.png" width="50px" alt="User avatar: jerath" /></a> <a href="https://github.com/itsa-sh"><img src="https://github.com/itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a> <a href="https://github.com/dmmulroy"><img src="https://github.com/dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a> <a href="https://github.com/timcole"><img src="https://github.com/timcole.png" width="50px" alt="User avatar: timcole" /></a> <a href="https://github.com/VLZH"><img src="https://github.com/VLZH.png" width="50px" alt="User avatar: VLZH" /></a> <a href="https://github.com/terasaka2k"><img src="https://github.com/terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a> <a href="https://github.com/andriyor"><img src="https://github.com/andriyor.png" width="50px" alt="User avatar: andriyor" /></a> <a href="https://github.com/majudhu"><img src="https://github.com/majudhu.png" width="50px" alt="User avatar: majudhu" /></a> <a href="https://github.com/axelrindle"><img src="https://github.com/axelrindle.png" width="50px" alt="User avatar: axelrindle" /></a> <a href="https://github.com/jirizverina"><img src="https://github.com/jirizverina.png" width="50px" alt="User avatar: jirizverina" /></a> <a href="https://github.com/chip-well"><img src="https://github.com/chip-well.png" width="50px" alt="User avatar: chip-well" /></a> <a href="https://github.com/GRAYAH"><img src="https://github.com/GRAYAH.png" width="50px" alt="User avatar: GRAYAH" /></a> <!-- sponsors-base -->
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
Yaak is an offline-first API client designed to stay out of your way while giving you everything you need when you need it.
|
Yaak is an offline-first API client designed to stay out of your way while giving you everything you need when you need it.
|
||||||
Built with [Tauri](https://tauri.app), Rust, and React, it’s fast, lightweight, and private. No telemetry, no VC funding, and no cloud lock-in.
|
Built with [Tauri](https://tauri.app), Rust, and React, it’s fast, lightweight, and private. No telemetry, no VC funding, and no cloud lock-in.
|
||||||
|
|
||||||
|
|
||||||
### 🌐 Work with any API
|
### 🌐 Work with any API
|
||||||
|
|
||||||
- Import collections from Postman, Insomnia, OpenAPI, Swagger, or Curl.
|
- Import collections from Postman, Insomnia, OpenAPI, Swagger, or Curl.
|
||||||
@@ -37,29 +41,25 @@ Built with [Tauri](https://tauri.app), Rust, and React, it’s fast, lightweight
|
|||||||
- Filter and inspect responses with JSONPath or XPath.
|
- Filter and inspect responses with JSONPath or XPath.
|
||||||
|
|
||||||
### 🔐 Stay secure
|
### 🔐 Stay secure
|
||||||
|
|
||||||
- Use OAuth 2.0, JWT, Basic Auth, or custom plugins for authentication.
|
- Use OAuth 2.0, JWT, Basic Auth, or custom plugins for authentication.
|
||||||
- Secure sensitive values with encrypted secrets.
|
- Secure sensitive values with encrypted secrets.
|
||||||
- Store secrets in your OS keychain.
|
- Store secrets in your OS keychain.
|
||||||
|
|
||||||
### ☁️ Organize & collaborate
|
### ☁️ Organize & collaborate
|
||||||
|
|
||||||
- Group requests into workspaces and nested folders.
|
- Group requests into workspaces and nested folders.
|
||||||
- Use environment variables to switch between dev, staging, and prod.
|
- Use environment variables to switch between dev, staging, and prod.
|
||||||
- Mirror workspaces to your filesystem for versioning in Git or syncing with Dropbox.
|
- Mirror workspaces to your filesystem for versioning in Git or syncing with Dropbox.
|
||||||
|
|
||||||
### 🧩 Extend & customize
|
### 🧩 Extend & customize
|
||||||
|
|
||||||
- Insert dynamic values like UUIDs or timestamps with template tags.
|
- Insert dynamic values like UUIDs or timestamps with template tags.
|
||||||
- Pick from built-in themes or build your own.
|
- Pick from built-in themes or build your own.
|
||||||
- Create plugins to extend authentication, template tags, or the UI.
|
- Create plugins to extend authentication, template tags, or the UI.
|
||||||
|
|
||||||
|
|
||||||
## Contribution Policy
|
## Contribution Policy
|
||||||
|
|
||||||
> [!IMPORTANT]
|
Yaak is open source but only accepting contributions for bug fixes. To get started,
|
||||||
> Community PRs are currently limited to bug fixes and small-scope improvements.
|
visit [`DEVELOPMENT.md`](DEVELOPMENT.md) for tips on setting up your environment.
|
||||||
> If your PR is out of scope, link an approved feedback item from [yaak.app/feedback](https://yaak.app/feedback).
|
|
||||||
> See [`CONTRIBUTING.md`](CONTRIBUTING.md) for policy details and [`DEVELOPMENT.md`](DEVELOPMENT.md) for local setup.
|
|
||||||
|
|
||||||
## Useful Resources
|
## Useful Resources
|
||||||
|
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
import type { GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-internal/models";
|
|
||||||
|
|
||||||
import { MoveToWorkspaceDialog } from "../components/MoveToWorkspaceDialog";
|
|
||||||
import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
|
|
||||||
import { createFastMutation } from "../hooks/useFastMutation";
|
|
||||||
import { pluralizeCount } from "../lib/pluralize";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
|
|
||||||
export const moveToWorkspace = createFastMutation({
|
|
||||||
mutationKey: ["move_workspace"],
|
|
||||||
mutationFn: async (requests: (HttpRequest | GrpcRequest | WebsocketRequest)[]) => {
|
|
||||||
const activeWorkspaceId = jotaiStore.get(activeWorkspaceIdAtom);
|
|
||||||
if (activeWorkspaceId == null) return;
|
|
||||||
if (requests.length === 0) return;
|
|
||||||
|
|
||||||
const title =
|
|
||||||
requests.length === 1 ? "Move Request" : `Move ${pluralizeCount("Request", requests.length)}`;
|
|
||||||
|
|
||||||
showDialog({
|
|
||||||
id: "change-workspace",
|
|
||||||
title,
|
|
||||||
size: "sm",
|
|
||||||
render: ({ hide }) => (
|
|
||||||
<MoveToWorkspaceDialog
|
|
||||||
onDone={hide}
|
|
||||||
requests={requests}
|
|
||||||
activeWorkspaceId={activeWorkspaceId}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import { getModel } from "@yaakapp-internal/models";
|
|
||||||
import type { FolderSettingsTab } from "../components/FolderSettingsDialog";
|
|
||||||
import { FolderSettingsDialog } from "../components/FolderSettingsDialog";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
|
|
||||||
export function openFolderSettings(folderId: string, tab?: FolderSettingsTab) {
|
|
||||||
const folder = getModel("folder", folderId);
|
|
||||||
if (folder == null) return;
|
|
||||||
showDialog({
|
|
||||||
id: "folder-settings",
|
|
||||||
title: null,
|
|
||||||
size: "lg",
|
|
||||||
className: "h-[50rem]",
|
|
||||||
noPadding: true,
|
|
||||||
render: () => <FolderSettingsDialog folderId={folderId} tab={tab} />,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import { applySync, calculateSyncFsOnly } from "@yaakapp-internal/sync";
|
|
||||||
import { createFastMutation } from "../hooks/useFastMutation";
|
|
||||||
import { showSimpleAlert } from "../lib/alert";
|
|
||||||
import { router } from "../lib/router";
|
|
||||||
|
|
||||||
export const openWorkspaceFromSyncDir = createFastMutation<void, void, string>({
|
|
||||||
mutationKey: [],
|
|
||||||
mutationFn: async (dir) => {
|
|
||||||
const ops = await calculateSyncFsOnly(dir);
|
|
||||||
|
|
||||||
const workspace = ops
|
|
||||||
.map((o) => (o.type === "dbCreate" && o.fs.model.type === "workspace" ? o.fs.model : null))
|
|
||||||
.filter((m) => m)[0];
|
|
||||||
|
|
||||||
if (workspace == null) {
|
|
||||||
showSimpleAlert("Failed to Open", "No workspace found in directory");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await applySync(workspace.id, dir, ops);
|
|
||||||
|
|
||||||
await router.navigate({
|
|
||||||
to: "/workspaces/$workspaceId",
|
|
||||||
params: { workspaceId: workspace.id },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import type { WorkspaceSettingsTab } from "../components/WorkspaceSettingsDialog";
|
|
||||||
import { WorkspaceSettingsDialog } from "../components/WorkspaceSettingsDialog";
|
|
||||||
import { activeWorkspaceIdAtom } from "../hooks/useActiveWorkspace";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
|
|
||||||
export function openWorkspaceSettings(tab?: WorkspaceSettingsTab) {
|
|
||||||
const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
|
|
||||||
if (workspaceId == null) return;
|
|
||||||
showDialog({
|
|
||||||
id: "workspace-settings",
|
|
||||||
size: "md",
|
|
||||||
className: "h-[calc(100vh-5rem)] !max-h-[40rem]",
|
|
||||||
noPadding: true,
|
|
||||||
render: ({ hide }) => (
|
|
||||||
<WorkspaceSettingsDialog workspaceId={workspaceId} hide={hide} tab={tab} />
|
|
||||||
),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { useTimedBoolean } from "@yaakapp-internal/ui";
|
|
||||||
import { copyToClipboard } from "../lib/copy";
|
|
||||||
import { showToast } from "../lib/toast";
|
|
||||||
import type { ButtonProps } from "./core/Button";
|
|
||||||
import { Button } from "./core/Button";
|
|
||||||
|
|
||||||
interface Props extends Omit<ButtonProps, "onClick"> {
|
|
||||||
text: string | (() => Promise<string | null>);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function CopyButton({ text, ...props }: Props) {
|
|
||||||
const [copied, setCopied] = useTimedBoolean();
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
{...props}
|
|
||||||
onClick={async () => {
|
|
||||||
const content = typeof text === "function" ? await text() : text;
|
|
||||||
if (content == null) {
|
|
||||||
showToast({
|
|
||||||
id: "failed-to-copy",
|
|
||||||
color: "danger",
|
|
||||||
message: "Failed to copy",
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
copyToClipboard(content, { disableToast: true });
|
|
||||||
setCopied();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{copied ? "Copied" : "Copy"}
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import { IconButton, type IconButtonProps, useTimedBoolean } from "@yaakapp-internal/ui";
|
|
||||||
import { copyToClipboard } from "../lib/copy";
|
|
||||||
import { showToast } from "../lib/toast";
|
|
||||||
|
|
||||||
interface Props extends Omit<IconButtonProps, "onClick" | "icon"> {
|
|
||||||
text: string | (() => Promise<string | null>);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function CopyIconButton({ text, ...props }: Props) {
|
|
||||||
const [copied, setCopied] = useTimedBoolean();
|
|
||||||
return (
|
|
||||||
<IconButton
|
|
||||||
{...props}
|
|
||||||
icon={copied ? "check" : "copy"}
|
|
||||||
showConfirm
|
|
||||||
onClick={async () => {
|
|
||||||
const content = typeof text === "function" ? await text() : text;
|
|
||||||
if (content == null) {
|
|
||||||
showToast({
|
|
||||||
id: "failed-to-copy",
|
|
||||||
color: "danger",
|
|
||||||
message: "Failed to copy",
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
copyToClipboard(content, { disableToast: true });
|
|
||||||
setCopied();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { CSSProperties } from "react";
|
|
||||||
import { memo } from "react";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
className?: string;
|
|
||||||
style?: CSSProperties;
|
|
||||||
orientation?: "horizontal" | "vertical";
|
|
||||||
}
|
|
||||||
|
|
||||||
export const DropMarker = memo(
|
|
||||||
function DropMarker({ className, style, orientation = "horizontal" }: Props) {
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
style={style}
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
"absolute pointer-events-none z-50",
|
|
||||||
orientation === "horizontal" && "w-full",
|
|
||||||
orientation === "vertical" && "w-0 top-0 bottom-0",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"absolute bg-primary rounded-full",
|
|
||||||
orientation === "horizontal" && "left-2 right-2 -bottom-[0.1rem] h-[0.2rem]",
|
|
||||||
orientation === "vertical" && "-left-[0.1rem] top-0 bottom-0 w-[0.2rem]",
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
() => true,
|
|
||||||
);
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
import { createWorkspaceModel, foldersAtom, patchModel } from "@yaakapp-internal/models";
|
|
||||||
import { HStack, Icon, InlineCode, VStack } from "@yaakapp-internal/ui";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { Fragment, useMemo } from "react";
|
|
||||||
import { useAuthTab } from "../hooks/useAuthTab";
|
|
||||||
import { useEnvironmentsBreakdown } from "../hooks/useEnvironmentsBreakdown";
|
|
||||||
import { useHeadersTab } from "../hooks/useHeadersTab";
|
|
||||||
import { useInheritedHeaders } from "../hooks/useInheritedHeaders";
|
|
||||||
import { useModelAncestors } from "../hooks/useModelAncestors";
|
|
||||||
import { deleteModelWithConfirm } from "../lib/deleteModelWithConfirm";
|
|
||||||
import { hideDialog } from "../lib/dialog";
|
|
||||||
import { CopyIconButton } from "./CopyIconButton";
|
|
||||||
import { Button } from "./core/Button";
|
|
||||||
import { CountBadge } from "./core/CountBadge";
|
|
||||||
import { Input } from "./core/Input";
|
|
||||||
import { Link } from "./core/Link";
|
|
||||||
import type { TabItem } from "./core/Tabs/Tabs";
|
|
||||||
import { TabContent, Tabs } from "./core/Tabs/Tabs";
|
|
||||||
import { EmptyStateText } from "./EmptyStateText";
|
|
||||||
import { EnvironmentEditor } from "./EnvironmentEditor";
|
|
||||||
import { HeadersEditor } from "./HeadersEditor";
|
|
||||||
import { HttpAuthenticationEditor } from "./HttpAuthenticationEditor";
|
|
||||||
import { MarkdownEditor } from "./MarkdownEditor";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
folderId: string | null;
|
|
||||||
tab?: FolderSettingsTab;
|
|
||||||
}
|
|
||||||
|
|
||||||
const TAB_AUTH = "auth";
|
|
||||||
const TAB_HEADERS = "headers";
|
|
||||||
const TAB_VARIABLES = "variables";
|
|
||||||
const TAB_GENERAL = "general";
|
|
||||||
|
|
||||||
export type FolderSettingsTab =
|
|
||||||
| typeof TAB_AUTH
|
|
||||||
| typeof TAB_HEADERS
|
|
||||||
| typeof TAB_GENERAL
|
|
||||||
| typeof TAB_VARIABLES;
|
|
||||||
|
|
||||||
export function FolderSettingsDialog({ folderId, tab }: Props) {
|
|
||||||
const folders = useAtomValue(foldersAtom);
|
|
||||||
const folder = folders.find((f) => f.id === folderId) ?? null;
|
|
||||||
const ancestors = useModelAncestors(folder);
|
|
||||||
const breadcrumbs = useMemo(() => ancestors.toReversed(), [ancestors]);
|
|
||||||
const authTab = useAuthTab(TAB_AUTH, folder);
|
|
||||||
const headersTab = useHeadersTab(TAB_HEADERS, folder);
|
|
||||||
const inheritedHeaders = useInheritedHeaders(folder);
|
|
||||||
const environments = useEnvironmentsBreakdown();
|
|
||||||
const folderEnvironment = environments.allEnvironments.find(
|
|
||||||
(e) => e.parentModel === "folder" && e.parentId === folderId,
|
|
||||||
);
|
|
||||||
const numVars = (folderEnvironment?.variables ?? []).filter((v) => v.name).length;
|
|
||||||
|
|
||||||
const tabs = useMemo<TabItem[]>(() => {
|
|
||||||
if (folder == null) return [];
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
value: TAB_GENERAL,
|
|
||||||
label: "General",
|
|
||||||
},
|
|
||||||
...headersTab,
|
|
||||||
...authTab,
|
|
||||||
{
|
|
||||||
value: TAB_VARIABLES,
|
|
||||||
label: "Variables",
|
|
||||||
rightSlot: numVars > 0 ? <CountBadge count={numVars} /> : null,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
}, [authTab, folder, headersTab, numVars]);
|
|
||||||
|
|
||||||
if (folder == null) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="h-full flex flex-col">
|
|
||||||
<div className="flex items-center gap-3 px-6 pr-10 mt-4 mb-2 min-w-0 text-xl">
|
|
||||||
<Icon icon="folder_cog" size="lg" color="secondary" className="flex-shrink-0" />
|
|
||||||
<div className="flex items-center gap-1.5 font-semibold text-text min-w-0 overflow-hidden flex-1">
|
|
||||||
{breadcrumbs.map((item, index) => (
|
|
||||||
<Fragment key={item.id}>
|
|
||||||
{index > 0 && (
|
|
||||||
<Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
|
|
||||||
)}
|
|
||||||
<span className="text-text-subtle truncate min-w-0" title={item.name}>
|
|
||||||
{item.name}
|
|
||||||
</span>
|
|
||||||
</Fragment>
|
|
||||||
))}
|
|
||||||
{breadcrumbs.length > 0 && (
|
|
||||||
<Icon icon="chevron_right" size="lg" className="opacity-50 flex-shrink-0" />
|
|
||||||
)}
|
|
||||||
<span className="whitespace-nowrap" title={folder.name}>
|
|
||||||
{folder.name}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Tabs
|
|
||||||
defaultValue={tab ?? TAB_GENERAL}
|
|
||||||
label="Folder Settings"
|
|
||||||
className="pt-2 pb-2 pl-3 pr-1 flex-1"
|
|
||||||
layout="horizontal"
|
|
||||||
addBorders
|
|
||||||
tabs={tabs}
|
|
||||||
>
|
|
||||||
<TabContent value={TAB_AUTH} className="overflow-y-auto h-full px-4">
|
|
||||||
<HttpAuthenticationEditor model={folder} />
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_GENERAL} className="overflow-y-auto h-full px-4">
|
|
||||||
<div className="grid grid-rows-[auto_minmax(0,1fr)_auto] gap-3 pb-3 h-full">
|
|
||||||
<Input
|
|
||||||
label="Folder Name"
|
|
||||||
defaultValue={folder.name}
|
|
||||||
onChange={(name) => patchModel(folder, { name })}
|
|
||||||
stateKey={`name.${folder.id}`}
|
|
||||||
/>
|
|
||||||
<MarkdownEditor
|
|
||||||
name="folder-description"
|
|
||||||
placeholder="Folder description"
|
|
||||||
className="border border-border px-2"
|
|
||||||
defaultValue={folder.description}
|
|
||||||
stateKey={`description.${folder.id}`}
|
|
||||||
onChange={(description) => patchModel(folder, { description })}
|
|
||||||
/>
|
|
||||||
<HStack alignItems="center" justifyContent="between" className="w-full">
|
|
||||||
<Button
|
|
||||||
onClick={async () => {
|
|
||||||
const didDelete = await deleteModelWithConfirm(folder);
|
|
||||||
if (didDelete) {
|
|
||||||
hideDialog("folder-settings");
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
color="danger"
|
|
||||||
variant="border"
|
|
||||||
size="xs"
|
|
||||||
>
|
|
||||||
Delete Folder
|
|
||||||
</Button>
|
|
||||||
<InlineCode className="flex gap-1 items-center text-primary pl-2.5">
|
|
||||||
{folder.id}
|
|
||||||
<CopyIconButton
|
|
||||||
className="opacity-70 !text-primary"
|
|
||||||
size="2xs"
|
|
||||||
iconSize="sm"
|
|
||||||
title="Copy folder ID"
|
|
||||||
text={folder.id}
|
|
||||||
/>
|
|
||||||
</InlineCode>
|
|
||||||
</HStack>
|
|
||||||
</div>
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_HEADERS} className="overflow-y-auto h-full px-4">
|
|
||||||
<HeadersEditor
|
|
||||||
inheritedHeaders={inheritedHeaders}
|
|
||||||
forceUpdateKey={folder.id}
|
|
||||||
headers={folder.headers}
|
|
||||||
onChange={(headers) => patchModel(folder, { headers })}
|
|
||||||
stateKey={`headers.${folder.id}`}
|
|
||||||
/>
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_VARIABLES} className="overflow-y-auto h-full px-4">
|
|
||||||
{folderEnvironment == null ? (
|
|
||||||
<EmptyStateText>
|
|
||||||
<VStack alignItems="center" space={1.5}>
|
|
||||||
<p>
|
|
||||||
Override{" "}
|
|
||||||
<Link href="https://yaak.app/docs/using-yaak/environments-and-variables">
|
|
||||||
Variables
|
|
||||||
</Link>{" "}
|
|
||||||
for requests within this folder.
|
|
||||||
</p>
|
|
||||||
<Button
|
|
||||||
variant="border"
|
|
||||||
size="sm"
|
|
||||||
onClick={async () => {
|
|
||||||
await createWorkspaceModel({
|
|
||||||
workspaceId: folder.workspaceId,
|
|
||||||
parentModel: "folder",
|
|
||||||
parentId: folder.id,
|
|
||||||
model: "environment",
|
|
||||||
name: "Folder Environment",
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Create Folder Environment
|
|
||||||
</Button>
|
|
||||||
</VStack>
|
|
||||||
</EmptyStateText>
|
|
||||||
) : (
|
|
||||||
<EnvironmentEditor hideName environment={folderEnvironment} />
|
|
||||||
)}
|
|
||||||
</TabContent>
|
|
||||||
</Tabs>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
import { activeRequestAtom } from "../hooks/useActiveRequest";
|
|
||||||
import { useSubscribeActiveWorkspaceId } from "../hooks/useActiveWorkspace";
|
|
||||||
import { useActiveWorkspaceChangedToast } from "../hooks/useActiveWorkspaceChangedToast";
|
|
||||||
import { useHotKey, useSubscribeHotKeys } from "../hooks/useHotKey";
|
|
||||||
import { useSubscribeHttpAuthentication } from "../hooks/useHttpAuthentication";
|
|
||||||
import { useSyncFontSizeSetting } from "../hooks/useSyncFontSizeSetting";
|
|
||||||
import { useSyncWorkspaceChildModels } from "../hooks/useSyncWorkspaceChildModels";
|
|
||||||
import { useSyncZoomSetting } from "../hooks/useSyncZoomSetting";
|
|
||||||
import { useSubscribeTemplateFunctions } from "../hooks/useTemplateFunctions";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { renameModelWithPrompt } from "../lib/renameModelWithPrompt";
|
|
||||||
|
|
||||||
export function GlobalHooks() {
|
|
||||||
useSyncZoomSetting();
|
|
||||||
useSyncFontSizeSetting();
|
|
||||||
|
|
||||||
useSubscribeActiveWorkspaceId();
|
|
||||||
|
|
||||||
useSyncWorkspaceChildModels();
|
|
||||||
useSubscribeTemplateFunctions();
|
|
||||||
useSubscribeHttpAuthentication();
|
|
||||||
|
|
||||||
// Other useful things
|
|
||||||
useActiveWorkspaceChangedToast();
|
|
||||||
useSubscribeHotKeys();
|
|
||||||
|
|
||||||
useHotKey(
|
|
||||||
"request.rename",
|
|
||||||
async () => {
|
|
||||||
const model = jotaiStore.get(activeRequestAtom);
|
|
||||||
if (model == null) return;
|
|
||||||
await renameModelWithPrompt(model);
|
|
||||||
},
|
|
||||||
{ allowDefault: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
@@ -1,427 +0,0 @@
|
|||||||
import type { HttpResponse, HttpResponseEvent } from "@yaakapp-internal/models";
|
|
||||||
import { Banner, HStack, Icon, LoadingIcon, VStack } from "@yaakapp-internal/ui";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import type { ComponentType, CSSProperties } from "react";
|
|
||||||
import { lazy, Suspense, useMemo } from "react";
|
|
||||||
import { useCancelHttpResponse } from "../hooks/useCancelHttpResponse";
|
|
||||||
import { useHttpResponseEvents } from "../hooks/useHttpResponseEvents";
|
|
||||||
import { usePinnedHttpResponse } from "../hooks/usePinnedHttpResponse";
|
|
||||||
import { useResponseBodyBytes, useResponseBodyText } from "../hooks/useResponseBodyText";
|
|
||||||
import { useResponseViewMode } from "../hooks/useResponseViewMode";
|
|
||||||
import { useTimelineViewMode } from "../hooks/useTimelineViewMode";
|
|
||||||
import { getMimeTypeFromContentType } from "../lib/contentType";
|
|
||||||
import { getContentTypeFromHeaders, getCookieCounts } from "../lib/model_util";
|
|
||||||
import { ConfirmLargeResponse } from "./ConfirmLargeResponse";
|
|
||||||
import { ConfirmLargeResponseRequest } from "./ConfirmLargeResponseRequest";
|
|
||||||
import { Button } from "./core/Button";
|
|
||||||
import { CountBadge } from "./core/CountBadge";
|
|
||||||
import { HotkeyList } from "./core/HotkeyList";
|
|
||||||
import { HttpResponseDurationTag } from "./core/HttpResponseDurationTag";
|
|
||||||
import { HttpStatusTag } from "./core/HttpStatusTag";
|
|
||||||
import { PillButton } from "./core/PillButton";
|
|
||||||
import { SizeTag } from "./core/SizeTag";
|
|
||||||
import type { TabItem } from "./core/Tabs/Tabs";
|
|
||||||
import { TabContent, Tabs } from "./core/Tabs/Tabs";
|
|
||||||
import { Tooltip } from "./core/Tooltip";
|
|
||||||
import { EmptyStateText } from "./EmptyStateText";
|
|
||||||
import { ErrorBoundary } from "./ErrorBoundary";
|
|
||||||
import { HttpResponseTimeline } from "./HttpResponseTimeline";
|
|
||||||
import { RecentHttpResponsesDropdown } from "./RecentHttpResponsesDropdown";
|
|
||||||
import { RequestBodyViewer } from "./RequestBodyViewer";
|
|
||||||
import { ResponseCookies } from "./ResponseCookies";
|
|
||||||
import { ResponseHeaders } from "./ResponseHeaders";
|
|
||||||
import { AudioViewer } from "./responseViewers/AudioViewer";
|
|
||||||
import { CsvViewer } from "./responseViewers/CsvViewer";
|
|
||||||
import { EventStreamViewer } from "./responseViewers/EventStreamViewer";
|
|
||||||
import { HTMLOrTextViewer } from "./responseViewers/HTMLOrTextViewer";
|
|
||||||
import { ImageViewer } from "./responseViewers/ImageViewer";
|
|
||||||
import { MultipartViewer } from "./responseViewers/MultipartViewer";
|
|
||||||
import { SvgViewer } from "./responseViewers/SvgViewer";
|
|
||||||
import { VideoViewer } from "./responseViewers/VideoViewer";
|
|
||||||
|
|
||||||
const PdfViewer = lazy(() =>
|
|
||||||
import("./responseViewers/PdfViewer").then((m) => ({ default: m.PdfViewer })),
|
|
||||||
);
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
style?: CSSProperties;
|
|
||||||
className?: string;
|
|
||||||
activeRequestId: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const TAB_BODY = "body";
|
|
||||||
const TAB_REQUEST = "request";
|
|
||||||
const TAB_HEADERS = "headers";
|
|
||||||
const TAB_COOKIES = "cookies";
|
|
||||||
const TAB_TIMELINE = "timeline";
|
|
||||||
|
|
||||||
export type TimelineViewMode = "timeline" | "text";
|
|
||||||
|
|
||||||
interface RedirectDropWarning {
|
|
||||||
droppedBodyCount: number;
|
|
||||||
droppedHeaders: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export function HttpResponsePane({ style, className, activeRequestId }: Props) {
|
|
||||||
const { activeResponse, setPinnedResponseId, responses } = usePinnedHttpResponse(activeRequestId);
|
|
||||||
const [viewMode, setViewMode] = useResponseViewMode(activeResponse?.requestId);
|
|
||||||
const [timelineViewMode, setTimelineViewMode] = useTimelineViewMode();
|
|
||||||
const contentType = getContentTypeFromHeaders(activeResponse?.headers ?? null);
|
|
||||||
const mimeType = contentType == null ? null : getMimeTypeFromContentType(contentType).essence;
|
|
||||||
|
|
||||||
const responseEvents = useHttpResponseEvents(activeResponse);
|
|
||||||
const redirectDropWarning = useMemo(
|
|
||||||
() => getRedirectDropWarning(responseEvents.data),
|
|
||||||
[responseEvents.data],
|
|
||||||
);
|
|
||||||
const shouldShowRedirectDropWarning =
|
|
||||||
activeResponse?.state === "closed" && redirectDropWarning != null;
|
|
||||||
|
|
||||||
const cookieCounts = useMemo(() => getCookieCounts(responseEvents.data), [responseEvents.data]);
|
|
||||||
|
|
||||||
const tabs = useMemo<TabItem[]>(
|
|
||||||
() => [
|
|
||||||
{
|
|
||||||
value: TAB_BODY,
|
|
||||||
label: "Response",
|
|
||||||
options: {
|
|
||||||
value: viewMode,
|
|
||||||
onChange: setViewMode,
|
|
||||||
items: [
|
|
||||||
{ label: "Response", value: "pretty" },
|
|
||||||
...(mimeType?.startsWith("image")
|
|
||||||
? []
|
|
||||||
: [{ label: "Response (Raw)", shortLabel: "Raw", value: "raw" }]),
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: TAB_REQUEST,
|
|
||||||
label: "Request",
|
|
||||||
rightSlot:
|
|
||||||
(activeResponse?.requestContentLength ?? 0) > 0 ? <CountBadge count={true} /> : null,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: TAB_HEADERS,
|
|
||||||
label: "Headers",
|
|
||||||
rightSlot: (
|
|
||||||
<CountBadge
|
|
||||||
count={activeResponse?.requestHeaders.length ?? 0}
|
|
||||||
count2={activeResponse?.headers.length ?? 0}
|
|
||||||
showZero
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: TAB_COOKIES,
|
|
||||||
label: "Cookies",
|
|
||||||
rightSlot:
|
|
||||||
cookieCounts.sent > 0 || cookieCounts.received > 0 ? (
|
|
||||||
<CountBadge count={cookieCounts.sent} count2={cookieCounts.received} showZero />
|
|
||||||
) : null,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: TAB_TIMELINE,
|
|
||||||
rightSlot: <CountBadge count={responseEvents.data?.length ?? 0} />,
|
|
||||||
options: {
|
|
||||||
value: timelineViewMode,
|
|
||||||
onChange: (v) => setTimelineViewMode((v as TimelineViewMode) ?? "timeline"),
|
|
||||||
items: [
|
|
||||||
{ label: "Timeline", value: "timeline" },
|
|
||||||
{ label: "Timeline (Text)", shortLabel: "Timeline", value: "text" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[
|
|
||||||
activeResponse?.headers,
|
|
||||||
activeResponse?.requestContentLength,
|
|
||||||
activeResponse?.requestHeaders.length,
|
|
||||||
cookieCounts.sent,
|
|
||||||
cookieCounts.received,
|
|
||||||
mimeType,
|
|
||||||
responseEvents.data?.length,
|
|
||||||
setViewMode,
|
|
||||||
viewMode,
|
|
||||||
timelineViewMode,
|
|
||||||
setTimelineViewMode,
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
const cancel = useCancelHttpResponse(activeResponse?.id ?? null);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
style={style}
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
"x-theme-responsePane",
|
|
||||||
"max-h-full h-full",
|
|
||||||
"bg-surface rounded-md border border-border-subtle overflow-hidden",
|
|
||||||
"relative",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{activeResponse == null ? (
|
|
||||||
<HotkeyList hotkeys={["request.send", "model.create", "sidebar.focus", "url_bar.focus"]} />
|
|
||||||
) : (
|
|
||||||
<div className="h-full w-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1">
|
|
||||||
<HStack
|
|
||||||
className={classNames(
|
|
||||||
"text-text-subtle w-full flex-shrink-0",
|
|
||||||
// Remove a bit of space because the tabs have lots too
|
|
||||||
"-mb-1.5",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{activeResponse && (
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"grid grid-cols-[auto_minmax(4rem,1fr)_auto]",
|
|
||||||
"cursor-default select-none",
|
|
||||||
"whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<HStack space={2} className="w-full flex-shrink-0">
|
|
||||||
{activeResponse.state !== "closed" && <LoadingIcon size="sm" />}
|
|
||||||
<HttpStatusTag showReason response={activeResponse} />
|
|
||||||
<span>•</span>
|
|
||||||
<HttpResponseDurationTag response={activeResponse} />
|
|
||||||
<span>•</span>
|
|
||||||
<SizeTag
|
|
||||||
contentLength={activeResponse.contentLength ?? 0}
|
|
||||||
contentLengthCompressed={activeResponse.contentLengthCompressed}
|
|
||||||
/>
|
|
||||||
</HStack>
|
|
||||||
{shouldShowRedirectDropWarning ? (
|
|
||||||
<Tooltip
|
|
||||||
tabIndex={0}
|
|
||||||
className="my-auto pl-3 flex-shrink-0 max-w-full justify-self-end overflow-hidden"
|
|
||||||
content={
|
|
||||||
<VStack alignItems="start" space={1} className="text-xs">
|
|
||||||
<span className="font-medium text-warning">
|
|
||||||
Redirect changed this request
|
|
||||||
</span>
|
|
||||||
{redirectDropWarning.droppedBodyCount > 0 && (
|
|
||||||
<span>
|
|
||||||
Body dropped on {redirectDropWarning.droppedBodyCount}{" "}
|
|
||||||
{redirectDropWarning.droppedBodyCount === 1
|
|
||||||
? "redirect hop"
|
|
||||||
: "redirect hops"}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{redirectDropWarning.droppedHeaders.length > 0 && (
|
|
||||||
<span>
|
|
||||||
Headers dropped:{" "}
|
|
||||||
<span className="font-mono">
|
|
||||||
{redirectDropWarning.droppedHeaders.join(", ")}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<span className="text-text-subtle">See Timeline for details.</span>
|
|
||||||
</VStack>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<span className="inline-flex min-w-0">
|
|
||||||
<PillButton
|
|
||||||
color="warning"
|
|
||||||
className="font-sans text-sm !flex-shrink max-w-full"
|
|
||||||
innerClassName="flex items-center"
|
|
||||||
leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
|
|
||||||
>
|
|
||||||
<span className="truncate">
|
|
||||||
{getRedirectWarningLabel(redirectDropWarning)}
|
|
||||||
</span>
|
|
||||||
</PillButton>
|
|
||||||
</span>
|
|
||||||
</Tooltip>
|
|
||||||
) : (
|
|
||||||
<span />
|
|
||||||
)}
|
|
||||||
<div className="justify-self-end flex-shrink-0">
|
|
||||||
<RecentHttpResponsesDropdown
|
|
||||||
responses={responses}
|
|
||||||
activeResponse={activeResponse}
|
|
||||||
onPinnedResponseId={setPinnedResponseId}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</HStack>
|
|
||||||
|
|
||||||
<div className="overflow-hidden flex flex-col min-h-0">
|
|
||||||
{activeResponse?.error && (
|
|
||||||
<Banner color="danger" className="mx-3 mt-1 flex-shrink-0">
|
|
||||||
{activeResponse.error}
|
|
||||||
</Banner>
|
|
||||||
)}
|
|
||||||
{/* Show tabs if we have any data (headers, body, etc.) even if there's an error */}
|
|
||||||
<Tabs
|
|
||||||
tabs={tabs}
|
|
||||||
label="Response"
|
|
||||||
className="ml-3 mr-3 mb-3 min-h-0 flex-1"
|
|
||||||
tabListClassName="mt-0.5 -mb-1.5"
|
|
||||||
storageKey="http_response_tabs"
|
|
||||||
activeTabKey={activeRequestId}
|
|
||||||
>
|
|
||||||
<TabContent value={TAB_BODY}>
|
|
||||||
<ErrorBoundary name="Http Response Viewer">
|
|
||||||
<Suspense>
|
|
||||||
<ConfirmLargeResponse response={activeResponse}>
|
|
||||||
{activeResponse.state === "initialized" ? (
|
|
||||||
<EmptyStateText>
|
|
||||||
<VStack space={3}>
|
|
||||||
<HStack space={3}>
|
|
||||||
<LoadingIcon className="text-text-subtlest" />
|
|
||||||
Sending Request
|
|
||||||
</HStack>
|
|
||||||
<Button size="sm" variant="border" onClick={() => cancel.mutate()}>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
</VStack>
|
|
||||||
</EmptyStateText>
|
|
||||||
) : activeResponse.state === "closed" &&
|
|
||||||
(activeResponse.contentLength ?? 0) === 0 ? (
|
|
||||||
<EmptyStateText>Empty</EmptyStateText>
|
|
||||||
) : mimeType?.match(/^text\/event-stream/i) && viewMode === "pretty" ? (
|
|
||||||
<EventStreamViewer response={activeResponse} />
|
|
||||||
) : mimeType?.match(/^image\/svg/) ? (
|
|
||||||
<HttpSvgViewer response={activeResponse} />
|
|
||||||
) : mimeType?.match(/^image/i) ? (
|
|
||||||
<EnsureCompleteResponse response={activeResponse} Component={ImageViewer} />
|
|
||||||
) : mimeType?.match(/^audio/i) ? (
|
|
||||||
<EnsureCompleteResponse response={activeResponse} Component={AudioViewer} />
|
|
||||||
) : mimeType?.match(/^video/i) ? (
|
|
||||||
<EnsureCompleteResponse response={activeResponse} Component={VideoViewer} />
|
|
||||||
) : mimeType?.match(/^multipart/i) && viewMode === "pretty" ? (
|
|
||||||
<HttpMultipartViewer response={activeResponse} />
|
|
||||||
) : mimeType?.match(/pdf/i) ? (
|
|
||||||
<EnsureCompleteResponse response={activeResponse} Component={PdfViewer} />
|
|
||||||
) : mimeType?.match(/csv|tab-separated/i) && viewMode === "pretty" ? (
|
|
||||||
<HttpCsvViewer className="pb-2" response={activeResponse} />
|
|
||||||
) : (
|
|
||||||
<HTMLOrTextViewer
|
|
||||||
textViewerClassName="-mr-2 bg-surface" // Pull to the right
|
|
||||||
response={activeResponse}
|
|
||||||
pretty={viewMode === "pretty"}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</ConfirmLargeResponse>
|
|
||||||
</Suspense>
|
|
||||||
</ErrorBoundary>
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_REQUEST}>
|
|
||||||
<ConfirmLargeResponseRequest response={activeResponse}>
|
|
||||||
<RequestBodyViewer response={activeResponse} />
|
|
||||||
</ConfirmLargeResponseRequest>
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_HEADERS}>
|
|
||||||
<ResponseHeaders response={activeResponse} />
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_COOKIES}>
|
|
||||||
<ResponseCookies response={activeResponse} />
|
|
||||||
</TabContent>
|
|
||||||
<TabContent value={TAB_TIMELINE}>
|
|
||||||
<HttpResponseTimeline response={activeResponse} viewMode={timelineViewMode} />
|
|
||||||
</TabContent>
|
|
||||||
</Tabs>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getRedirectDropWarning(
|
|
||||||
events: HttpResponseEvent[] | undefined,
|
|
||||||
): RedirectDropWarning | null {
|
|
||||||
if (events == null || events.length === 0) return null;
|
|
||||||
|
|
||||||
let droppedBodyCount = 0;
|
|
||||||
const droppedHeaders = new Set<string>();
|
|
||||||
for (const e of events) {
|
|
||||||
const event = e.event;
|
|
||||||
if (event.type !== "redirect") {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.dropped_body) {
|
|
||||||
droppedBodyCount += 1;
|
|
||||||
}
|
|
||||||
for (const headerName of event.dropped_headers ?? []) {
|
|
||||||
pushHeaderName(droppedHeaders, headerName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (droppedBodyCount === 0 && droppedHeaders.size === 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
droppedBodyCount,
|
|
||||||
droppedHeaders: Array.from(droppedHeaders).sort(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function pushHeaderName(headers: Set<string>, headerName: string): void {
|
|
||||||
const existing = Array.from(headers).find((h) => h.toLowerCase() === headerName.toLowerCase());
|
|
||||||
if (existing == null) {
|
|
||||||
headers.add(headerName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getRedirectWarningLabel(warning: RedirectDropWarning): string {
|
|
||||||
if (warning.droppedBodyCount > 0 && warning.droppedHeaders.length > 0) {
|
|
||||||
return "Dropped body and headers";
|
|
||||||
}
|
|
||||||
if (warning.droppedBodyCount > 0) {
|
|
||||||
return "Dropped body";
|
|
||||||
}
|
|
||||||
return "Dropped headers";
|
|
||||||
}
|
|
||||||
|
|
||||||
function EnsureCompleteResponse({
|
|
||||||
response,
|
|
||||||
Component,
|
|
||||||
}: {
|
|
||||||
response: HttpResponse;
|
|
||||||
Component: ComponentType<{ bodyPath: string }>;
|
|
||||||
}) {
|
|
||||||
if (response.bodyPath === null) {
|
|
||||||
return <div>Empty response body</div>;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait until the response has been fully-downloaded
|
|
||||||
if (response.state !== "closed") {
|
|
||||||
return (
|
|
||||||
<EmptyStateText>
|
|
||||||
<LoadingIcon />
|
|
||||||
</EmptyStateText>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return <Component bodyPath={response.bodyPath} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
function HttpSvgViewer({ response }: { response: HttpResponse }) {
|
|
||||||
const body = useResponseBodyText({ response, filter: null });
|
|
||||||
|
|
||||||
if (!body.data) return null;
|
|
||||||
|
|
||||||
return <SvgViewer text={body.data} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
function HttpCsvViewer({ response, className }: { response: HttpResponse; className?: string }) {
|
|
||||||
const body = useResponseBodyText({ response, filter: null });
|
|
||||||
|
|
||||||
return <CsvViewer text={body.data ?? null} className={className} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
function HttpMultipartViewer({ response }: { response: HttpResponse }) {
|
|
||||||
const body = useResponseBodyBytes({ response });
|
|
||||||
|
|
||||||
if (body.data == null) return null;
|
|
||||||
|
|
||||||
const contentTypeHeader = getContentTypeFromHeaders(response.headers);
|
|
||||||
const boundary = contentTypeHeader?.split("boundary=")[1] ?? "unknown";
|
|
||||||
|
|
||||||
return <MultipartViewer data={body.data} boundary={boundary} idPrefix={response.id} />;
|
|
||||||
}
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
import { linter } from "@codemirror/lint";
|
|
||||||
import type { HttpRequest } from "@yaakapp-internal/models";
|
|
||||||
import { patchModel } from "@yaakapp-internal/models";
|
|
||||||
import { Banner, Icon } from "@yaakapp-internal/ui";
|
|
||||||
import { useCallback, useMemo } from "react";
|
|
||||||
import { useKeyValue } from "../hooks/useKeyValue";
|
|
||||||
import { fireAndForget } from "../lib/fireAndForget";
|
|
||||||
import { textLikelyContainsJsonComments } from "../lib/jsonComments";
|
|
||||||
import type { DropdownItem } from "./core/Dropdown";
|
|
||||||
import { Dropdown } from "./core/Dropdown";
|
|
||||||
import type { EditorProps } from "./core/Editor/Editor";
|
|
||||||
import { jsonParseLinter } from "./core/Editor/json-lint";
|
|
||||||
import { Editor } from "./core/Editor/LazyEditor";
|
|
||||||
import { IconButton } from "./core/IconButton";
|
|
||||||
import { IconTooltip } from "./core/IconTooltip";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
forceUpdateKey: string;
|
|
||||||
heightMode: EditorProps["heightMode"];
|
|
||||||
request: HttpRequest;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function JsonBodyEditor({ forceUpdateKey, heightMode, request }: Props) {
|
|
||||||
const handleChange = useCallback(
|
|
||||||
(text: string) => patchModel(request, { body: { ...request.body, text } }),
|
|
||||||
[request],
|
|
||||||
);
|
|
||||||
|
|
||||||
const autoFix = request.body?.sendJsonComments !== true;
|
|
||||||
|
|
||||||
const lintExtension = useMemo(
|
|
||||||
() =>
|
|
||||||
linter(
|
|
||||||
jsonParseLinter(
|
|
||||||
autoFix
|
|
||||||
? { allowComments: true, allowTrailingCommas: true }
|
|
||||||
: { allowComments: false, allowTrailingCommas: false },
|
|
||||||
),
|
|
||||||
),
|
|
||||||
[autoFix],
|
|
||||||
);
|
|
||||||
|
|
||||||
const hasComments = useMemo(
|
|
||||||
() => textLikelyContainsJsonComments(request.body?.text ?? ""),
|
|
||||||
[request.body?.text],
|
|
||||||
);
|
|
||||||
|
|
||||||
const { value: bannerDismissed, set: setBannerDismissed } = useKeyValue<boolean>({
|
|
||||||
namespace: "no_sync",
|
|
||||||
key: ["json-fix-3", request.workspaceId],
|
|
||||||
fallback: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleToggleAutoFix = useCallback(() => {
|
|
||||||
const newBody = { ...request.body };
|
|
||||||
if (autoFix) {
|
|
||||||
newBody.sendJsonComments = true;
|
|
||||||
} else {
|
|
||||||
delete newBody.sendJsonComments;
|
|
||||||
}
|
|
||||||
fireAndForget(patchModel(request, { body: newBody }));
|
|
||||||
}, [request, autoFix]);
|
|
||||||
|
|
||||||
const handleDropdownOpen = useCallback(() => {
|
|
||||||
if (!bannerDismissed) {
|
|
||||||
fireAndForget(setBannerDismissed(true));
|
|
||||||
}
|
|
||||||
}, [bannerDismissed, setBannerDismissed]);
|
|
||||||
|
|
||||||
const showBanner = hasComments && autoFix && !bannerDismissed;
|
|
||||||
|
|
||||||
const stripMessage = "Automatically strip comments and trailing commas before sending";
|
|
||||||
const actions = useMemo<EditorProps["actions"]>(
|
|
||||||
() => [
|
|
||||||
showBanner && (
|
|
||||||
<Banner color="notice" className="!opacity-100 h-sm !py-0 !px-2 flex items-center text-xs">
|
|
||||||
<p className="inline-flex items-center gap-1 min-w-0">
|
|
||||||
<span className="truncate">Auto-fix enabled</span>
|
|
||||||
<Icon icon="arrow_right" size="sm" className="opacity-disabled" />
|
|
||||||
</p>
|
|
||||||
</Banner>
|
|
||||||
),
|
|
||||||
<div key="settings" className="!opacity-100 !shadow">
|
|
||||||
<Dropdown
|
|
||||||
onOpen={handleDropdownOpen}
|
|
||||||
items={
|
|
||||||
[
|
|
||||||
{
|
|
||||||
label: "Automatically Fix JSON",
|
|
||||||
keepOpenOnSelect: true,
|
|
||||||
onSelect: handleToggleAutoFix,
|
|
||||||
rightSlot: <IconTooltip content={stripMessage} />,
|
|
||||||
leftSlot: (
|
|
||||||
<Icon icon={autoFix ? "check_square_checked" : "check_square_unchecked"} />
|
|
||||||
),
|
|
||||||
},
|
|
||||||
] satisfies DropdownItem[]
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<IconButton size="sm" variant="border" icon="settings" title="JSON Settings" />
|
|
||||||
</Dropdown>
|
|
||||||
</div>,
|
|
||||||
],
|
|
||||||
[handleDropdownOpen, handleToggleAutoFix, autoFix, showBanner],
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Editor
|
|
||||||
forceUpdateKey={forceUpdateKey}
|
|
||||||
autocompleteFunctions
|
|
||||||
autocompleteVariables
|
|
||||||
placeholder="..."
|
|
||||||
heightMode={heightMode}
|
|
||||||
defaultValue={`${request.body?.text ?? ""}`}
|
|
||||||
language="json"
|
|
||||||
onChange={handleChange}
|
|
||||||
stateKey={`json.${request.id}`}
|
|
||||||
actions={actions}
|
|
||||||
lintExtension={lintExtension}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
import type { CSSProperties } from "react";
|
|
||||||
import ReactMarkdown, { type Components } from "react-markdown";
|
|
||||||
import { PrismLight as SyntaxHighlighter } from "react-syntax-highlighter";
|
|
||||||
import remarkGfm from "remark-gfm";
|
|
||||||
import { ErrorBoundary } from "./ErrorBoundary";
|
|
||||||
import { Prose } from "./Prose";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
children: string | null;
|
|
||||||
className?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Markdown({ children, className }: Props) {
|
|
||||||
if (children == null) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Prose className={className}>
|
|
||||||
<ErrorBoundary name="Markdown">
|
|
||||||
<ReactMarkdown remarkPlugins={[remarkGfm]} components={markdownComponents}>
|
|
||||||
{children}
|
|
||||||
</ReactMarkdown>
|
|
||||||
</ErrorBoundary>
|
|
||||||
</Prose>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const prismTheme = {
|
|
||||||
'pre[class*="language-"]': {
|
|
||||||
// Needs to be here, so the lib doesn't add its own
|
|
||||||
},
|
|
||||||
|
|
||||||
// Syntax tokens
|
|
||||||
comment: { color: "var(--textSubtle)" },
|
|
||||||
prolog: { color: "var(--textSubtle)" },
|
|
||||||
doctype: { color: "var(--textSubtle)" },
|
|
||||||
cdata: { color: "var(--textSubtle)" },
|
|
||||||
|
|
||||||
punctuation: { color: "var(--textSubtle)" },
|
|
||||||
|
|
||||||
property: { color: "var(--primary)" },
|
|
||||||
"attr-name": { color: "var(--primary)" },
|
|
||||||
|
|
||||||
string: { color: "var(--notice)" },
|
|
||||||
char: { color: "var(--notice)" },
|
|
||||||
|
|
||||||
number: { color: "var(--info)" },
|
|
||||||
constant: { color: "var(--info)" },
|
|
||||||
symbol: { color: "var(--info)" },
|
|
||||||
|
|
||||||
boolean: { color: "var(--warning)" },
|
|
||||||
"attr-value": { color: "var(--warning)" },
|
|
||||||
|
|
||||||
variable: { color: "var(--success)" },
|
|
||||||
|
|
||||||
tag: { color: "var(--info)" },
|
|
||||||
operator: { color: "var(--danger)" },
|
|
||||||
keyword: { color: "var(--danger)" },
|
|
||||||
function: { color: "var(--success)" },
|
|
||||||
"class-name": { color: "var(--primary)" },
|
|
||||||
builtin: { color: "var(--danger)" },
|
|
||||||
selector: { color: "var(--danger)" },
|
|
||||||
inserted: { color: "var(--success)" },
|
|
||||||
deleted: { color: "var(--danger)" },
|
|
||||||
regex: { color: "var(--warning)" },
|
|
||||||
|
|
||||||
important: { color: "var(--danger)", fontWeight: "bold" },
|
|
||||||
italic: { fontStyle: "italic" },
|
|
||||||
bold: { fontWeight: "bold" },
|
|
||||||
entity: { cursor: "help" },
|
|
||||||
};
|
|
||||||
|
|
||||||
const lineStyle: CSSProperties = {
|
|
||||||
paddingRight: "1.5em",
|
|
||||||
paddingLeft: "0",
|
|
||||||
opacity: 0.5,
|
|
||||||
};
|
|
||||||
|
|
||||||
const markdownComponents: Partial<Components> = {
|
|
||||||
// Ensure links open in external browser by adding target="_blank"
|
|
||||||
a: ({ href, children, ...rest }) => {
|
|
||||||
if (href && !href.match(/https?:\/\//)) {
|
|
||||||
href = `http://${href}`;
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<a target="_blank" rel="noreferrer noopener" href={href} {...rest}>
|
|
||||||
{children}
|
|
||||||
</a>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
code(props) {
|
|
||||||
const { children, className, ref, ...extraProps } = props;
|
|
||||||
extraProps.node = undefined;
|
|
||||||
|
|
||||||
const match = /language-(\w+)/.exec(className || "");
|
|
||||||
return match ? (
|
|
||||||
<SyntaxHighlighter
|
|
||||||
{...extraProps}
|
|
||||||
CodeTag="code"
|
|
||||||
showLineNumbers
|
|
||||||
PreTag="div"
|
|
||||||
lineNumberStyle={lineStyle}
|
|
||||||
language={match[1]}
|
|
||||||
style={prismTheme}
|
|
||||||
>
|
|
||||||
{String(children as string).replace(/\n$/, "")}
|
|
||||||
</SyntaxHighlighter>
|
|
||||||
) : (
|
|
||||||
<code {...extraProps} ref={ref} className={className}>
|
|
||||||
{children}
|
|
||||||
</code>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
import type { GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-internal/models";
|
|
||||||
import { patchModel, workspacesAtom } from "@yaakapp-internal/models";
|
|
||||||
import { InlineCode, VStack } from "@yaakapp-internal/ui";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { useState } from "react";
|
|
||||||
import { pluralizeCount } from "../lib/pluralize";
|
|
||||||
import { resolvedModelName } from "../lib/resolvedModelName";
|
|
||||||
import { router } from "../lib/router";
|
|
||||||
import { showToast } from "../lib/toast";
|
|
||||||
import { Button } from "./core/Button";
|
|
||||||
import { Select } from "./core/Select";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
activeWorkspaceId: string;
|
|
||||||
requests: (HttpRequest | GrpcRequest | WebsocketRequest)[];
|
|
||||||
onDone: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function MoveToWorkspaceDialog({ onDone, requests, activeWorkspaceId }: Props) {
|
|
||||||
const workspaces = useAtomValue(workspacesAtom);
|
|
||||||
const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<string>(activeWorkspaceId);
|
|
||||||
|
|
||||||
const targetWorkspace = workspaces.find((w) => w.id === selectedWorkspaceId);
|
|
||||||
const isSameWorkspace = selectedWorkspaceId === activeWorkspaceId;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<VStack space={4} className="mb-4">
|
|
||||||
<Select
|
|
||||||
label="Target Workspace"
|
|
||||||
name="workspace"
|
|
||||||
value={selectedWorkspaceId}
|
|
||||||
onChange={setSelectedWorkspaceId}
|
|
||||||
options={workspaces.map((w) => ({
|
|
||||||
label: w.id === activeWorkspaceId ? `${w.name} (current)` : w.name,
|
|
||||||
value: w.id,
|
|
||||||
}))}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
color="primary"
|
|
||||||
disabled={isSameWorkspace}
|
|
||||||
onClick={async () => {
|
|
||||||
const patch = {
|
|
||||||
workspaceId: selectedWorkspaceId,
|
|
||||||
folderId: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
await Promise.all(requests.map((r) => patchModel(r, patch)));
|
|
||||||
|
|
||||||
// Hide after a moment, to give time for requests to disappear
|
|
||||||
setTimeout(onDone, 100);
|
|
||||||
showToast({
|
|
||||||
id: "workspace-moved",
|
|
||||||
message:
|
|
||||||
requests.length === 1 && requests[0] != null ? (
|
|
||||||
<>
|
|
||||||
<InlineCode>{resolvedModelName(requests[0])}</InlineCode> moved to{" "}
|
|
||||||
<InlineCode>{targetWorkspace?.name ?? "unknown"}</InlineCode>
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
{pluralizeCount("request", requests.length)} moved to{" "}
|
|
||||||
<InlineCode>{targetWorkspace?.name ?? "unknown"}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
action: ({ hide }) => (
|
|
||||||
<Button
|
|
||||||
size="xs"
|
|
||||||
color="secondary"
|
|
||||||
className="mr-auto min-w-[5rem]"
|
|
||||||
onClick={async () => {
|
|
||||||
await router.navigate({
|
|
||||||
to: "/workspaces/$workspaceId",
|
|
||||||
params: { workspaceId: selectedWorkspaceId },
|
|
||||||
});
|
|
||||||
hide();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Switch to Workspace
|
|
||||||
</Button>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{requests.length === 1 ? "Move" : `Move ${pluralizeCount("Request", requests.length)}`}
|
|
||||||
</Button>
|
|
||||||
</VStack>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import "./Prose.css";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
children: ReactNode;
|
|
||||||
className?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Prose({ className, ...props }: Props) {
|
|
||||||
return <div className={classNames("prose", className)} {...props} />;
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
import { workspacesAtom } from "@yaakapp-internal/models";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { useEffect } from "react";
|
|
||||||
import { getRecentCookieJars } from "../hooks/useRecentCookieJars";
|
|
||||||
import { getRecentEnvironments } from "../hooks/useRecentEnvironments";
|
|
||||||
import { getRecentRequests } from "../hooks/useRecentRequests";
|
|
||||||
import { useRecentWorkspaces } from "../hooks/useRecentWorkspaces";
|
|
||||||
import { fireAndForget } from "../lib/fireAndForget";
|
|
||||||
import { router } from "../lib/router";
|
|
||||||
|
|
||||||
export function RedirectToLatestWorkspace() {
|
|
||||||
const workspaces = useAtomValue(workspacesAtom);
|
|
||||||
const recentWorkspaces = useRecentWorkspaces();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (workspaces.length === 0 || recentWorkspaces == null) {
|
|
||||||
console.log("No workspaces found to redirect to. Skipping.", {
|
|
||||||
workspaces,
|
|
||||||
recentWorkspaces,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
fireAndForget(
|
|
||||||
(async () => {
|
|
||||||
const workspaceId = recentWorkspaces[0] ?? workspaces[0]?.id ?? "n/a";
|
|
||||||
const environmentId = (await getRecentEnvironments(workspaceId))[0] ?? null;
|
|
||||||
const cookieJarId = (await getRecentCookieJars(workspaceId))[0] ?? null;
|
|
||||||
const requestId = (await getRecentRequests(workspaceId))[0] ?? null;
|
|
||||||
const params = { workspaceId };
|
|
||||||
const search = {
|
|
||||||
cookie_jar_id: cookieJarId,
|
|
||||||
environment_id: environmentId,
|
|
||||||
request_id: requestId,
|
|
||||||
};
|
|
||||||
|
|
||||||
console.log("Redirecting to workspace", params, search);
|
|
||||||
await router.navigate({ to: "/workspaces/$workspaceId", params, search });
|
|
||||||
})(),
|
|
||||||
);
|
|
||||||
}, [recentWorkspaces, workspaces, workspaces.length]);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
@@ -1,111 +0,0 @@
|
|||||||
import { openUrl } from "@tauri-apps/plugin-opener";
|
|
||||||
import { useLicense } from "@yaakapp-internal/license";
|
|
||||||
import { useRef } from "react";
|
|
||||||
import { openSettings } from "../commands/openSettings";
|
|
||||||
import { useCheckForUpdates } from "../hooks/useCheckForUpdates";
|
|
||||||
import { useExportData } from "../hooks/useExportData";
|
|
||||||
import { appInfo } from "../lib/appInfo";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
import { importData } from "../lib/importData";
|
|
||||||
import type { DropdownRef } from "./core/Dropdown";
|
|
||||||
import { Dropdown } from "./core/Dropdown";
|
|
||||||
import { Icon } from "@yaakapp-internal/ui";
|
|
||||||
import { IconButton } from "./core/IconButton";
|
|
||||||
import { KeyboardShortcutsDialog } from "./KeyboardShortcutsDialog";
|
|
||||||
|
|
||||||
export function SettingsDropdown() {
|
|
||||||
const exportData = useExportData();
|
|
||||||
const dropdownRef = useRef<DropdownRef>(null);
|
|
||||||
const checkForUpdates = useCheckForUpdates();
|
|
||||||
const { check } = useLicense();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dropdown
|
|
||||||
ref={dropdownRef}
|
|
||||||
items={[
|
|
||||||
{
|
|
||||||
label: "Settings",
|
|
||||||
hotKeyAction: "settings.show",
|
|
||||||
leftSlot: <Icon icon="settings" />,
|
|
||||||
onSelect: () => openSettings.mutate(null),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Keyboard shortcuts",
|
|
||||||
hotKeyAction: "hotkeys.showHelp",
|
|
||||||
leftSlot: <Icon icon="keyboard" />,
|
|
||||||
onSelect: () => {
|
|
||||||
showDialog({
|
|
||||||
id: "hotkey",
|
|
||||||
title: "Keyboard Shortcuts",
|
|
||||||
size: "dynamic",
|
|
||||||
render: () => <KeyboardShortcutsDialog />,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Plugins",
|
|
||||||
leftSlot: <Icon icon="puzzle" />,
|
|
||||||
onSelect: () => openSettings.mutate("plugins"),
|
|
||||||
},
|
|
||||||
{ type: "separator", label: "Share Workspace(s)" },
|
|
||||||
{
|
|
||||||
label: "Import Data",
|
|
||||||
leftSlot: <Icon icon="folder_input" />,
|
|
||||||
onSelect: () => importData.mutate(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Export Data",
|
|
||||||
leftSlot: <Icon icon="folder_output" />,
|
|
||||||
onSelect: () => exportData.mutate(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Create Run Button",
|
|
||||||
leftSlot: <Icon icon="rocket" />,
|
|
||||||
onSelect: () => openUrl("https://yaak.app/button/new"),
|
|
||||||
},
|
|
||||||
{ type: "separator", label: `Yaak v${appInfo.version}` },
|
|
||||||
{
|
|
||||||
label: "Check for Updates",
|
|
||||||
leftSlot: <Icon icon="update" />,
|
|
||||||
hidden: !appInfo.featureUpdater,
|
|
||||||
onSelect: () => checkForUpdates.mutate(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Purchase License",
|
|
||||||
color: "success",
|
|
||||||
hidden: check.data == null || check.data.status === "active",
|
|
||||||
leftSlot: <Icon icon="circle_dollar_sign" />,
|
|
||||||
rightSlot: <Icon icon="external_link" color="success" className="opacity-60" />,
|
|
||||||
onSelect: () => openUrl("https://yaak.app/pricing"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Install CLI",
|
|
||||||
hidden: appInfo.cliVersion != null,
|
|
||||||
leftSlot: <Icon icon="square_terminal" />,
|
|
||||||
rightSlot: <Icon icon="external_link" color="secondary" />,
|
|
||||||
onSelect: () => openUrl("https://yaak.app/docs/cli"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Feedback",
|
|
||||||
leftSlot: <Icon icon="chat" />,
|
|
||||||
rightSlot: <Icon icon="external_link" color="secondary" />,
|
|
||||||
onSelect: () => openUrl("https://yaak.app/feedback"),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Changelog",
|
|
||||||
leftSlot: <Icon icon="cake" />,
|
|
||||||
rightSlot: <Icon icon="external_link" color="secondary" />,
|
|
||||||
onSelect: () => openUrl(`https://yaak.app/changelog/${appInfo.version}`),
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<IconButton
|
|
||||||
size="sm"
|
|
||||||
title="Main Menu"
|
|
||||||
icon="settings"
|
|
||||||
iconColor="secondary"
|
|
||||||
className="pointer-events-auto"
|
|
||||||
/>
|
|
||||||
</Dropdown>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,39 +0,0 @@
|
|||||||
import { HStack } from "@yaakapp-internal/ui";
|
|
||||||
import { useMemo } from "react";
|
|
||||||
import { useFloatingSidebarHidden } from "../hooks/useFloatingSidebarHidden";
|
|
||||||
import { useSidebarHidden } from "../hooks/useSidebarHidden";
|
|
||||||
import { CreateDropdown } from "./CreateDropdown";
|
|
||||||
import { IconButton } from "./core/IconButton";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
floating?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function SidebarActions({ floating = false }: Props) {
|
|
||||||
const [sidebarHidden, setSidebarHidden] = useSidebarHidden();
|
|
||||||
const [floatingHidden, setFloatingHidden] = useFloatingSidebarHidden();
|
|
||||||
|
|
||||||
const hidden = floating ? floatingHidden : sidebarHidden;
|
|
||||||
const setHidden = useMemo(
|
|
||||||
() => (floating ? setFloatingHidden : setSidebarHidden),
|
|
||||||
[floating, setFloatingHidden, setSidebarHidden],
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<HStack className="h-full">
|
|
||||||
<IconButton
|
|
||||||
onClick={async () => {
|
|
||||||
await setHidden(!hidden);
|
|
||||||
}}
|
|
||||||
className="pointer-events-auto"
|
|
||||||
size="sm"
|
|
||||||
title="Toggle sidebar"
|
|
||||||
icon={hidden ? "left_panel_hidden" : "left_panel_visible"}
|
|
||||||
iconColor="secondary"
|
|
||||||
/>
|
|
||||||
<CreateDropdown hotKeyAction="model.create">
|
|
||||||
<IconButton size="sm" icon="plus_circle" iconColor="secondary" title="Add Resource" />
|
|
||||||
</CreateDropdown>
|
|
||||||
</HStack>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
import type { WebsocketRequest } from "@yaakapp-internal/models";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import type { CSSProperties } from "react";
|
|
||||||
|
|
||||||
import { SplitLayout } from "@yaakapp-internal/ui";
|
|
||||||
import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
|
|
||||||
import { workspaceLayoutAtom } from "../lib/atoms";
|
|
||||||
import { WebsocketRequestPane } from "./WebsocketRequestPane";
|
|
||||||
import { WebsocketResponsePane } from "./WebsocketResponsePane";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
activeRequest: WebsocketRequest;
|
|
||||||
style: CSSProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function WebsocketRequestLayout({ activeRequest, style }: Props) {
|
|
||||||
const workspaceLayout = useAtomValue(workspaceLayoutAtom);
|
|
||||||
const activeWorkspace = useAtomValue(activeWorkspaceAtom);
|
|
||||||
const wsId = activeWorkspace?.id ?? "n/a";
|
|
||||||
return (
|
|
||||||
<SplitLayout
|
|
||||||
storageKey={`websocket_layout::${wsId}`}
|
|
||||||
className="p-3 gap-1.5"
|
|
||||||
layout={workspaceLayout}
|
|
||||||
style={style}
|
|
||||||
firstSlot={({ orientation, style }) => (
|
|
||||||
<WebsocketRequestPane
|
|
||||||
style={style}
|
|
||||||
activeRequest={activeRequest}
|
|
||||||
fullHeight={orientation === "horizontal"}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
secondSlot={({ style }) => (
|
|
||||||
<div
|
|
||||||
style={style}
|
|
||||||
className={classNames(
|
|
||||||
"x-theme-responsePane",
|
|
||||||
"max-h-full h-full grid grid-rows-[minmax(0,1fr)] grid-cols-1",
|
|
||||||
"bg-surface rounded-md border border-border-subtle",
|
|
||||||
"shadow relative",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<WebsocketResponsePane activeRequest={activeRequest} />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,221 +0,0 @@
|
|||||||
import { type } from "@tauri-apps/plugin-os";
|
|
||||||
import { settingsAtom, workspacesAtom } from "@yaakapp-internal/models";
|
|
||||||
import { Banner, HeaderSize, HStack, SidebarLayout } from "@yaakapp-internal/ui";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import * as m from "motion/react-m";
|
|
||||||
import { useMemo, useState } from "react";
|
|
||||||
import {
|
|
||||||
useEnsureActiveCookieJar,
|
|
||||||
useSubscribeActiveCookieJarId,
|
|
||||||
} from "../hooks/useActiveCookieJar";
|
|
||||||
import {
|
|
||||||
activeEnvironmentAtom,
|
|
||||||
useSubscribeActiveEnvironmentId,
|
|
||||||
} from "../hooks/useActiveEnvironment";
|
|
||||||
import { activeFolderAtom } from "../hooks/useActiveFolder";
|
|
||||||
import { useSubscribeActiveFolderId } from "../hooks/useActiveFolderId";
|
|
||||||
import { activeRequestAtom } from "../hooks/useActiveRequest";
|
|
||||||
import { useSubscribeActiveRequestId } from "../hooks/useActiveRequestId";
|
|
||||||
import { activeWorkspaceAtom } from "../hooks/useActiveWorkspace";
|
|
||||||
import { useFloatingSidebarHidden } from "../hooks/useFloatingSidebarHidden";
|
|
||||||
import { useHotKey } from "../hooks/useHotKey";
|
|
||||||
import { useSubscribeRecentCookieJars } from "../hooks/useRecentCookieJars";
|
|
||||||
import { useSubscribeRecentEnvironments } from "../hooks/useRecentEnvironments";
|
|
||||||
import { useSubscribeRecentRequests } from "../hooks/useRecentRequests";
|
|
||||||
import { useSubscribeRecentWorkspaces } from "../hooks/useRecentWorkspaces";
|
|
||||||
import { useSidebarHidden } from "../hooks/useSidebarHidden";
|
|
||||||
import { useSidebarWidth } from "../hooks/useSidebarWidth";
|
|
||||||
import { useSyncWorkspaceRequestTitle } from "../hooks/useSyncWorkspaceRequestTitle";
|
|
||||||
import { duplicateRequestOrFolderAndNavigate } from "../lib/duplicateRequestOrFolderAndNavigate";
|
|
||||||
import { importData } from "../lib/importData";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { CreateDropdown } from "./CreateDropdown";
|
|
||||||
import { Button } from "./core/Button";
|
|
||||||
import { HotkeyList } from "./core/HotkeyList";
|
|
||||||
import { FeedbackLink } from "./core/Link";
|
|
||||||
import { ErrorBoundary } from "./ErrorBoundary";
|
|
||||||
import { FolderLayout } from "./FolderLayout";
|
|
||||||
import { GrpcConnectionLayout } from "./GrpcConnectionLayout";
|
|
||||||
import { HttpRequestLayout } from "./HttpRequestLayout";
|
|
||||||
import Sidebar from "./Sidebar";
|
|
||||||
import { SidebarActions } from "./SidebarActions";
|
|
||||||
import { WebsocketRequestLayout } from "./WebsocketRequestLayout";
|
|
||||||
import { WorkspaceHeader } from "./WorkspaceHeader";
|
|
||||||
|
|
||||||
const body = { gridArea: "body" };
|
|
||||||
|
|
||||||
export function Workspace() {
|
|
||||||
// First, subscribe to some things applicable to workspaces
|
|
||||||
useGlobalWorkspaceHooks();
|
|
||||||
|
|
||||||
const workspaces = useAtomValue(workspacesAtom);
|
|
||||||
const settings = useAtomValue(settingsAtom);
|
|
||||||
const osType = type();
|
|
||||||
const [width, setWidth] = useSidebarWidth();
|
|
||||||
const [sidebarHidden, setSidebarHidden] = useSidebarHidden();
|
|
||||||
const [floatingSidebarHidden, setFloatingSidebarHidden] = useFloatingSidebarHidden();
|
|
||||||
const activeEnvironment = useAtomValue(activeEnvironmentAtom);
|
|
||||||
const [floating, setFloating] = useState(false);
|
|
||||||
|
|
||||||
const environmentBgStyle = useMemo(() => {
|
|
||||||
if (activeEnvironment?.color == null) return undefined;
|
|
||||||
const background = `linear-gradient(to right, ${activeEnvironment.color} 15%, transparent 40%)`;
|
|
||||||
return { background };
|
|
||||||
}, [activeEnvironment?.color]);
|
|
||||||
|
|
||||||
// We're loading still
|
|
||||||
if (workspaces.length === 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const header = (
|
|
||||||
<HeaderSize
|
|
||||||
data-tauri-drag-region
|
|
||||||
size="lg"
|
|
||||||
className="relative x-theme-appHeader bg-surface"
|
|
||||||
osType={osType}
|
|
||||||
hideWindowControls={settings.hideWindowControls}
|
|
||||||
useNativeTitlebar={settings.useNativeTitlebar}
|
|
||||||
interfaceScale={settings.interfaceScale}
|
|
||||||
>
|
|
||||||
<div className="absolute inset-0 pointer-events-none">
|
|
||||||
<div style={environmentBgStyle} className="absolute inset-0 opacity-[0.07]" />
|
|
||||||
<div
|
|
||||||
style={environmentBgStyle}
|
|
||||||
className="absolute left-0 right-0 -bottom-[1px] h-[1px] opacity-20"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<WorkspaceHeader className="pointer-events-none" floatingSidebar={floating} />
|
|
||||||
</HeaderSize>
|
|
||||||
);
|
|
||||||
|
|
||||||
const workspaceBody = (
|
|
||||||
<ErrorBoundary name="Workspace Body">
|
|
||||||
<WorkspaceBody />
|
|
||||||
</ErrorBoundary>
|
|
||||||
);
|
|
||||||
|
|
||||||
const sidebarContent = floating ? (
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"x-theme-sidebar",
|
|
||||||
"h-full bg-surface border-r border-border-subtle",
|
|
||||||
"grid grid-rows-[auto_1fr]",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<HeaderSize
|
|
||||||
hideControls
|
|
||||||
size="lg"
|
|
||||||
className="border-transparent flex items-center"
|
|
||||||
osType={osType}
|
|
||||||
hideWindowControls={settings.hideWindowControls}
|
|
||||||
useNativeTitlebar={settings.useNativeTitlebar}
|
|
||||||
interfaceScale={settings.interfaceScale}
|
|
||||||
>
|
|
||||||
<SidebarActions floating />
|
|
||||||
</HeaderSize>
|
|
||||||
<ErrorBoundary name="Sidebar (Floating)">
|
|
||||||
<Sidebar />
|
|
||||||
</ErrorBoundary>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="x-theme-sidebar overflow-hidden bg-surface h-full">
|
|
||||||
<ErrorBoundary name="Sidebar">
|
|
||||||
<Sidebar className="border-r border-border-subtle" />
|
|
||||||
</ErrorBoundary>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="grid w-full h-full grid-rows-[auto_minmax(0,1fr)]">
|
|
||||||
{header}
|
|
||||||
<SidebarLayout
|
|
||||||
width={width ?? 250}
|
|
||||||
onWidthChange={setWidth}
|
|
||||||
hidden={sidebarHidden ?? false}
|
|
||||||
onHiddenChange={(hidden) => setSidebarHidden(hidden)}
|
|
||||||
floatingHidden={floatingSidebarHidden ?? true}
|
|
||||||
onFloatingHiddenChange={(hidden) => setFloatingSidebarHidden(hidden)}
|
|
||||||
onFloatingChange={setFloating}
|
|
||||||
sidebar={sidebarContent}
|
|
||||||
>
|
|
||||||
{workspaceBody}
|
|
||||||
</SidebarLayout>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function WorkspaceBody() {
|
|
||||||
const activeRequest = useAtomValue(activeRequestAtom);
|
|
||||||
const activeFolder = useAtomValue(activeFolderAtom);
|
|
||||||
const activeWorkspace = useAtomValue(activeWorkspaceAtom);
|
|
||||||
|
|
||||||
if (activeWorkspace == null) {
|
|
||||||
return (
|
|
||||||
<m.div
|
|
||||||
className="m-auto"
|
|
||||||
initial={{ opacity: 0 }}
|
|
||||||
animate={{ opacity: 1 }}
|
|
||||||
// Delay the entering because the workspaces might load after a slight delay
|
|
||||||
transition={{ delay: 0.5 }}
|
|
||||||
>
|
|
||||||
<Banner color="warning" className="max-w-[30rem]">
|
|
||||||
The active workspace was not found. Select a workspace from the header menu or report this
|
|
||||||
bug to <FeedbackLink />
|
|
||||||
</Banner>
|
|
||||||
</m.div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (activeRequest?.model === "grpc_request") {
|
|
||||||
return <GrpcConnectionLayout style={body} />;
|
|
||||||
}
|
|
||||||
if (activeRequest?.model === "websocket_request") {
|
|
||||||
return <WebsocketRequestLayout style={body} activeRequest={activeRequest} />;
|
|
||||||
}
|
|
||||||
if (activeRequest?.model === "http_request") {
|
|
||||||
return <HttpRequestLayout activeRequest={activeRequest} style={body} />;
|
|
||||||
}
|
|
||||||
if (activeFolder != null) {
|
|
||||||
return <FolderLayout folder={activeFolder} style={body} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<HotkeyList
|
|
||||||
hotkeys={["model.create", "sidebar.focus", "settings.show"]}
|
|
||||||
bottomSlot={
|
|
||||||
<HStack space={1} justifyContent="center" className="mt-3">
|
|
||||||
<Button variant="border" size="sm" onClick={() => importData.mutate()}>
|
|
||||||
Import
|
|
||||||
</Button>
|
|
||||||
<CreateDropdown hideFolder>
|
|
||||||
<Button variant="border" forDropdown size="sm">
|
|
||||||
New Request
|
|
||||||
</Button>
|
|
||||||
</CreateDropdown>
|
|
||||||
</HStack>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function useGlobalWorkspaceHooks() {
|
|
||||||
useEnsureActiveCookieJar();
|
|
||||||
|
|
||||||
useSubscribeActiveRequestId();
|
|
||||||
useSubscribeActiveFolderId();
|
|
||||||
useSubscribeActiveEnvironmentId();
|
|
||||||
useSubscribeActiveCookieJarId();
|
|
||||||
|
|
||||||
useSubscribeRecentRequests();
|
|
||||||
useSubscribeRecentWorkspaces();
|
|
||||||
useSubscribeRecentEnvironments();
|
|
||||||
useSubscribeRecentCookieJars();
|
|
||||||
|
|
||||||
useSyncWorkspaceRequestTitle();
|
|
||||||
|
|
||||||
useHotKey("model.duplicate", () =>
|
|
||||||
duplicateRequestOrFolderAndNavigate(jotaiStore.get(activeRequestAtom)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
import { HStack, Icon } from "@yaakapp-internal/ui";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { useAtom, useAtomValue } from "jotai";
|
|
||||||
import { memo } from "react";
|
|
||||||
import { activeWorkspaceAtom, activeWorkspaceMetaAtom } from "../hooks/useActiveWorkspace";
|
|
||||||
import { useToggleCommandPalette } from "../hooks/useToggleCommandPalette";
|
|
||||||
import { workspaceLayoutAtom } from "../lib/atoms";
|
|
||||||
import { setupOrConfigureEncryption } from "../lib/setupOrConfigureEncryption";
|
|
||||||
import { CookieDropdown } from "./CookieDropdown";
|
|
||||||
import { IconButton } from "./core/IconButton";
|
|
||||||
import { PillButton } from "./core/PillButton";
|
|
||||||
import { EnvironmentActionsDropdown } from "./EnvironmentActionsDropdown";
|
|
||||||
import { ImportCurlButton } from "./ImportCurlButton";
|
|
||||||
import { LicenseBadge } from "./LicenseBadge";
|
|
||||||
import { RecentRequestsDropdown } from "./RecentRequestsDropdown";
|
|
||||||
import { SettingsDropdown } from "./SettingsDropdown";
|
|
||||||
import { SidebarActions } from "./SidebarActions";
|
|
||||||
import { WorkspaceActionsDropdown } from "./WorkspaceActionsDropdown";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
className?: string;
|
|
||||||
floatingSidebar?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const WorkspaceHeader = memo(function WorkspaceHeader({
|
|
||||||
className,
|
|
||||||
floatingSidebar,
|
|
||||||
}: Props) {
|
|
||||||
const togglePalette = useToggleCommandPalette();
|
|
||||||
const [workspaceLayout, setWorkspaceLayout] = useAtom(workspaceLayoutAtom);
|
|
||||||
const workspace = useAtomValue(activeWorkspaceAtom);
|
|
||||||
const workspaceMeta = useAtomValue(activeWorkspaceMetaAtom);
|
|
||||||
const showEncryptionSetup =
|
|
||||||
workspace != null &&
|
|
||||||
workspaceMeta != null &&
|
|
||||||
workspace.encryptionKeyChallenge != null &&
|
|
||||||
workspaceMeta.encryptionKey == null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
"grid grid-cols-[auto_minmax(0,1fr)_auto] items-center w-full h-full",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<HStack space={0.5} className={classNames("flex-1 pointer-events-none")}>
|
|
||||||
<SidebarActions floating={floatingSidebar} />
|
|
||||||
<CookieDropdown />
|
|
||||||
<HStack className="min-w-0">
|
|
||||||
<WorkspaceActionsDropdown />
|
|
||||||
<Icon icon="chevron_right" color="secondary" />
|
|
||||||
<EnvironmentActionsDropdown className="w-auto pointer-events-auto" />
|
|
||||||
</HStack>
|
|
||||||
</HStack>
|
|
||||||
<div className="pointer-events-none w-full max-w-[30vw] mx-auto flex justify-center">
|
|
||||||
<RecentRequestsDropdown />
|
|
||||||
</div>
|
|
||||||
<div className="flex-1 flex gap-1 items-center h-full justify-end pointer-events-none pr-1">
|
|
||||||
<ImportCurlButton />
|
|
||||||
{showEncryptionSetup ? (
|
|
||||||
<PillButton color="danger" onClick={setupOrConfigureEncryption}>
|
|
||||||
Enter Encryption Key
|
|
||||||
</PillButton>
|
|
||||||
) : (
|
|
||||||
<LicenseBadge />
|
|
||||||
)}
|
|
||||||
<IconButton
|
|
||||||
icon={
|
|
||||||
workspaceLayout === "responsive"
|
|
||||||
? "magic_wand"
|
|
||||||
: workspaceLayout === "horizontal"
|
|
||||||
? "columns_2"
|
|
||||||
: "rows_2"
|
|
||||||
}
|
|
||||||
title={`Change to ${workspaceLayout === "horizontal" ? "vertical" : "horizontal"} layout`}
|
|
||||||
size="sm"
|
|
||||||
iconColor="secondary"
|
|
||||||
onClick={() =>
|
|
||||||
setWorkspaceLayout((prev) => (prev === "horizontal" ? "vertical" : "horizontal"))
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<IconButton
|
|
||||||
icon="search"
|
|
||||||
title="Search or execute a command"
|
|
||||||
size="sm"
|
|
||||||
hotkeyAction="command_palette.toggle"
|
|
||||||
iconColor="secondary"
|
|
||||||
onClick={togglePalette}
|
|
||||||
/>
|
|
||||||
<SettingsDropdown />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
});
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import { Button as BaseButton, type ButtonProps as BaseButtonProps } from "@yaakapp-internal/ui";
|
|
||||||
import { forwardRef, useImperativeHandle, useRef } from "react";
|
|
||||||
import type { HotkeyAction } from "../../hooks/useHotKey";
|
|
||||||
import { useFormattedHotkey, useHotKey } from "../../hooks/useHotKey";
|
|
||||||
|
|
||||||
export type ButtonProps = BaseButtonProps & {
|
|
||||||
hotkeyAction?: HotkeyAction;
|
|
||||||
hotkeyLabelOnly?: boolean;
|
|
||||||
hotkeyPriority?: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
|
|
||||||
{ hotkeyAction, hotkeyPriority, hotkeyLabelOnly, title, ...props }: ButtonProps,
|
|
||||||
ref,
|
|
||||||
) {
|
|
||||||
const hotkeyTrigger = useFormattedHotkey(hotkeyAction ?? null)?.join("");
|
|
||||||
const fullTitle = hotkeyTrigger ? `${title ?? ""} ${hotkeyTrigger}`.trim() : title;
|
|
||||||
|
|
||||||
const buttonRef = useRef<HTMLButtonElement>(null);
|
|
||||||
useImperativeHandle<HTMLButtonElement | null, HTMLButtonElement | null>(
|
|
||||||
ref,
|
|
||||||
() => buttonRef.current,
|
|
||||||
);
|
|
||||||
|
|
||||||
useHotKey(
|
|
||||||
hotkeyAction ?? null,
|
|
||||||
() => {
|
|
||||||
buttonRef.current?.click();
|
|
||||||
},
|
|
||||||
{ priority: hotkeyPriority, enable: !hotkeyLabelOnly },
|
|
||||||
);
|
|
||||||
|
|
||||||
return <BaseButton ref={buttonRef} title={fullTitle} {...props} />;
|
|
||||||
});
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { lazy, Suspense } from "react";
|
|
||||||
import type { EditorProps } from "./Editor";
|
|
||||||
|
|
||||||
const Editor_ = lazy(() => import("./Editor").then((m) => ({ default: m.Editor })));
|
|
||||||
|
|
||||||
export function Editor(props: EditorProps) {
|
|
||||||
return (
|
|
||||||
<Suspense>
|
|
||||||
<Editor_ {...props} />
|
|
||||||
</Suspense>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,116 +0,0 @@
|
|||||||
import { getSearchQuery, searchPanelOpen } from "@codemirror/search";
|
|
||||||
import type { Extension } from "@codemirror/state";
|
|
||||||
import { type EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A CodeMirror extension that displays the total number of search matches
|
|
||||||
* inside the built-in search panel.
|
|
||||||
*/
|
|
||||||
export function searchMatchCount(): Extension {
|
|
||||||
return ViewPlugin.fromClass(
|
|
||||||
class {
|
|
||||||
private countEl: HTMLElement | null = null;
|
|
||||||
|
|
||||||
constructor(private view: EditorView) {
|
|
||||||
this.updateCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
update(update: ViewUpdate) {
|
|
||||||
// Recompute when doc changes, search state changes, or selection moves
|
|
||||||
const query = getSearchQuery(update.state);
|
|
||||||
const prevQuery = getSearchQuery(update.startState);
|
|
||||||
const open = searchPanelOpen(update.state);
|
|
||||||
const prevOpen = searchPanelOpen(update.startState);
|
|
||||||
|
|
||||||
if (update.docChanged || update.selectionSet || !query.eq(prevQuery) || open !== prevOpen) {
|
|
||||||
this.updateCount();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private updateCount() {
|
|
||||||
const state = this.view.state;
|
|
||||||
const open = searchPanelOpen(state);
|
|
||||||
const query = getSearchQuery(state);
|
|
||||||
|
|
||||||
if (!open) {
|
|
||||||
this.removeCountEl();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.ensureCountEl();
|
|
||||||
|
|
||||||
if (!query.search) {
|
|
||||||
if (this.countEl) {
|
|
||||||
this.countEl.textContent = "0/0";
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const selection = state.selection.main;
|
|
||||||
let count = 0;
|
|
||||||
let currentIndex = 0;
|
|
||||||
const MAX_COUNT = 9999;
|
|
||||||
const cursor = query.getCursor(state);
|
|
||||||
for (let result = cursor.next(); !result.done; result = cursor.next()) {
|
|
||||||
count++;
|
|
||||||
const match = result.value;
|
|
||||||
if (match.from <= selection.from && match.to >= selection.to) {
|
|
||||||
currentIndex = count;
|
|
||||||
}
|
|
||||||
if (count > MAX_COUNT) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.countEl) {
|
|
||||||
if (count > MAX_COUNT) {
|
|
||||||
this.countEl.textContent = `${MAX_COUNT}+`;
|
|
||||||
} else if (count === 0) {
|
|
||||||
this.countEl.textContent = "0/0";
|
|
||||||
} else if (currentIndex > 0) {
|
|
||||||
this.countEl.textContent = `${currentIndex}/${count}`;
|
|
||||||
} else {
|
|
||||||
this.countEl.textContent = `0/${count}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private ensureCountEl() {
|
|
||||||
// Find the search panel in the editor DOM
|
|
||||||
const panel = this.view.dom.querySelector(".cm-search");
|
|
||||||
if (!panel) {
|
|
||||||
this.countEl = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.countEl && this.countEl.parentElement === panel) {
|
|
||||||
return; // Already attached
|
|
||||||
}
|
|
||||||
|
|
||||||
this.countEl = document.createElement("span");
|
|
||||||
this.countEl.className = "cm-search-match-count";
|
|
||||||
|
|
||||||
// Reorder: insert prev button, then next button, then count after the search input
|
|
||||||
const searchInput = panel.querySelector("input");
|
|
||||||
const prevBtn = panel.querySelector('button[name="prev"]');
|
|
||||||
const nextBtn = panel.querySelector('button[name="next"]');
|
|
||||||
if (searchInput && searchInput.parentElement === panel) {
|
|
||||||
searchInput.after(this.countEl);
|
|
||||||
if (prevBtn) this.countEl.after(prevBtn);
|
|
||||||
if (nextBtn && prevBtn) prevBtn.after(nextBtn);
|
|
||||||
} else {
|
|
||||||
panel.prepend(this.countEl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private removeCountEl() {
|
|
||||||
if (this.countEl) {
|
|
||||||
this.countEl.remove();
|
|
||||||
this.countEl = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
destroy() {
|
|
||||||
this.removeCountEl();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
||||||
import { LRParser } from "@lezer/lr";
|
|
||||||
import { highlight } from "./highlight";
|
|
||||||
export const parser = LRParser.deserialize({
|
|
||||||
version: 14,
|
|
||||||
states:
|
|
||||||
"!pQQOPOOO`OPO'#C^OeOPO'#CaOjOPO'#CcOoOPO'#CeOOOO'#Ci'#CiOOOO'#Cg'#CgQQOPOOOOOO,58x,58xOOOO,58{,58{OOOO,58},58}OOOO,59P,59POOOO-E6e-E6e",
|
|
||||||
stateData: "z~ORPOUQOWROYSO~OSWO~OSXO~OSYO~OSZO~ORUWYW~",
|
|
||||||
goto: "m^PP_PP_P_P_PcPiTTOVQVOR[VTUOV",
|
|
||||||
nodeNames:
|
|
||||||
"⚠ Timeline OutgoingLine OutgoingText Newline IncomingLine IncomingText InfoLine InfoText PlainLine PlainText",
|
|
||||||
maxTerm: 13,
|
|
||||||
propSources: [highlight],
|
|
||||||
skippedNodes: [0],
|
|
||||||
repeatNodeCount: 1,
|
|
||||||
tokenData:
|
|
||||||
"%h~RZOYtYZ!]Zztz{!b{!^t!^!_#d!_!`t!`!a$f!a;'St;'S;=`!V<%lOt~ySY~OYtZ;'St;'S;=`!V<%lOt~!YP;=`<%lt~!bOS~~!gUY~OYtZptpq!yq;'St;'S;=`!V<%lOt~#QSW~Y~OY!yZ;'S!y;'S;=`#^<%lO!y~#aP;=`<%l!y~#iUY~OYtZptpq#{q;'St;'S;=`!V<%lOt~$SSU~Y~OY#{Z;'S#{;'S;=`$`<%lO#{~$cP;=`<%l#{~$kUY~OYtZptpq$}q;'St;'S;=`!V<%lOt~%USR~Y~OY$}Z;'S$};'S;=`%b<%lO$}~%eP;=`<%l$}",
|
|
||||||
tokenizers: [0],
|
|
||||||
topRules: { Timeline: [0, 1] },
|
|
||||||
tokenPrec: 36,
|
|
||||||
});
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
/* oxlint-disable no-template-curly-in-string */
|
|
||||||
|
|
||||||
import { describe, expect, test } from "vite-plus/test";
|
|
||||||
import { parser } from "./twig";
|
|
||||||
|
|
||||||
function getNodeNames(input: string): string[] {
|
|
||||||
const tree = parser.parse(input);
|
|
||||||
const nodes: string[] = [];
|
|
||||||
const cursor = tree.cursor();
|
|
||||||
do {
|
|
||||||
if (cursor.name !== "Template") {
|
|
||||||
nodes.push(cursor.name);
|
|
||||||
}
|
|
||||||
} while (cursor.next());
|
|
||||||
return nodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
function hasTag(input: string): boolean {
|
|
||||||
return getNodeNames(input).includes("Tag");
|
|
||||||
}
|
|
||||||
|
|
||||||
function hasError(input: string): boolean {
|
|
||||||
return getNodeNames(input).includes("⚠");
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("twig grammar", () => {
|
|
||||||
describe("${[var]} format (valid template tags)", () => {
|
|
||||||
test("parses simple variable as Tag", () => {
|
|
||||||
expect(hasTag("${[var]}")).toBe(true);
|
|
||||||
expect(hasError("${[var]}")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses variable with whitespace as Tag", () => {
|
|
||||||
expect(hasTag("${[ var ]}")).toBe(true);
|
|
||||||
expect(hasError("${[ var ]}")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses embedded variable as Tag", () => {
|
|
||||||
expect(hasTag("hello ${[name]} world")).toBe(true);
|
|
||||||
expect(hasError("hello ${[name]} world")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses function call as Tag", () => {
|
|
||||||
expect(hasTag("${[fn()]}")).toBe(true);
|
|
||||||
expect(hasError("${[fn()]}")).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("${var} format (should be plain text, not tags)", () => {
|
|
||||||
test("parses ${var} as plain Text without errors", () => {
|
|
||||||
expect(hasTag("${var}")).toBe(false);
|
|
||||||
expect(hasError("${var}")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses embedded ${var} as plain Text", () => {
|
|
||||||
expect(hasTag("hello ${name} world")).toBe(false);
|
|
||||||
expect(hasError("hello ${name} world")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses JSON with ${var} as plain Text", () => {
|
|
||||||
const json = '{"key": "${value}"}';
|
|
||||||
expect(hasTag(json)).toBe(false);
|
|
||||||
expect(hasError(json)).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses multiple ${var} as plain Text", () => {
|
|
||||||
expect(hasTag("${a} and ${b}")).toBe(false);
|
|
||||||
expect(hasError("${a} and ${b}")).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("mixed content", () => {
|
|
||||||
test("distinguishes ${var} from ${[var]} in same string", () => {
|
|
||||||
const input = "${plain} and ${[tag]}";
|
|
||||||
expect(hasTag(input)).toBe(true);
|
|
||||||
expect(hasError(input)).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("parses JSON with ${[var]} as having Tag", () => {
|
|
||||||
const json = '{"key": "${[value]}"}';
|
|
||||||
expect(hasTag(json)).toBe(true);
|
|
||||||
expect(hasError(json)).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("edge cases", () => {
|
|
||||||
test("handles $ at end of string", () => {
|
|
||||||
expect(hasError("hello$")).toBe(false);
|
|
||||||
expect(hasTag("hello$")).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("handles ${ at end of string without crash", () => {
|
|
||||||
// Incomplete syntax may produce errors, but should not crash
|
|
||||||
expect(() => parser.parse("hello${")).not.toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("handles ${[ without closing without crash", () => {
|
|
||||||
// Unclosed tag may produce partial match, but should not crash
|
|
||||||
expect(() => parser.parse("${[unclosed")).not.toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("handles empty ${[]}", () => {
|
|
||||||
// Empty tags may or may not be valid depending on grammar
|
|
||||||
// Just ensure no crash
|
|
||||||
expect(() => parser.parse("${[]}")).not.toThrow();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { genericCompletion } from "../genericCompletion";
|
|
||||||
|
|
||||||
export const completions = genericCompletion({
|
|
||||||
options: [
|
|
||||||
{ label: "http://", type: "constant" },
|
|
||||||
{ label: "https://", type: "constant" },
|
|
||||||
],
|
|
||||||
minMatch: 1,
|
|
||||||
});
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { HotkeyAction } from "../../hooks/useHotKey";
|
|
||||||
import { useHotkeyLabel } from "../../hooks/useHotKey";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
action: HotkeyAction;
|
|
||||||
className?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function HotkeyLabel({ action, className }: Props) {
|
|
||||||
const label = useHotkeyLabel(action);
|
|
||||||
return (
|
|
||||||
<span className={classNames(className, "text-text-subtle whitespace-nowrap")}>{label}</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
import type { GrpcRequest, HttpRequest, WebsocketRequest } from "@yaakapp-internal/models";
|
|
||||||
import { settingsAtom } from "@yaakapp-internal/models";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { memo } from "react";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
request: HttpRequest | GrpcRequest | WebsocketRequest;
|
|
||||||
className?: string;
|
|
||||||
short?: boolean;
|
|
||||||
noAlias?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
const methodNames: Record<string, string> = {
|
|
||||||
get: "GET",
|
|
||||||
put: "PUT",
|
|
||||||
post: "POST",
|
|
||||||
patch: "PTCH",
|
|
||||||
delete: "DELE",
|
|
||||||
options: "OPTN",
|
|
||||||
head: "HEAD",
|
|
||||||
query: "QURY",
|
|
||||||
graphql: "GQL",
|
|
||||||
grpc: "GRPC",
|
|
||||||
websocket: "WS",
|
|
||||||
};
|
|
||||||
|
|
||||||
export const HttpMethodTag = memo(function HttpMethodTag({
|
|
||||||
request,
|
|
||||||
className,
|
|
||||||
short,
|
|
||||||
noAlias,
|
|
||||||
}: Props) {
|
|
||||||
const method =
|
|
||||||
request.model === "http_request" && request.bodyType === "graphql" && !noAlias
|
|
||||||
? "graphql"
|
|
||||||
: request.model === "grpc_request"
|
|
||||||
? "grpc"
|
|
||||||
: request.model === "websocket_request"
|
|
||||||
? "websocket"
|
|
||||||
: request.method;
|
|
||||||
|
|
||||||
return <HttpMethodTagRaw method={method} className={className} short={short} />;
|
|
||||||
});
|
|
||||||
|
|
||||||
export function HttpMethodTagRaw({
|
|
||||||
className,
|
|
||||||
method,
|
|
||||||
short,
|
|
||||||
forceColor,
|
|
||||||
}: {
|
|
||||||
method: string;
|
|
||||||
className?: string;
|
|
||||||
short?: boolean;
|
|
||||||
forceColor?: boolean;
|
|
||||||
}) {
|
|
||||||
let label = method.toUpperCase();
|
|
||||||
if (short) {
|
|
||||||
label = methodNames[method.toLowerCase()] ?? method.slice(0, 4);
|
|
||||||
label = label.padEnd(4, " ");
|
|
||||||
}
|
|
||||||
|
|
||||||
const m = method.toUpperCase();
|
|
||||||
|
|
||||||
const settings = useAtomValue(settingsAtom);
|
|
||||||
const colored = forceColor || settings.coloredMethods;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
!colored && "text-text-subtle",
|
|
||||||
colored && m === "GRAPHQL" && "text-info",
|
|
||||||
colored && m === "WEBSOCKET" && "text-info",
|
|
||||||
colored && m === "GRPC" && "text-info",
|
|
||||||
colored && m === "QUERY" && "text-text-subtle",
|
|
||||||
colored && m === "OPTIONS" && "text-info",
|
|
||||||
colored && m === "HEAD" && "text-text-subtle",
|
|
||||||
colored && m === "GET" && "text-primary",
|
|
||||||
colored && m === "PUT" && "text-warning",
|
|
||||||
colored && m === "PATCH" && "text-notice",
|
|
||||||
colored && m === "POST" && "text-success",
|
|
||||||
colored && m === "DELETE" && "text-danger",
|
|
||||||
"font-mono flex-shrink-0 whitespace-pre",
|
|
||||||
"pt-[0.15em]", // Fix for monospace font not vertically centering
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
import {
|
|
||||||
IconButton as BaseIconButton,
|
|
||||||
type IconButtonProps as BaseIconButtonProps,
|
|
||||||
} from "@yaakapp-internal/ui";
|
|
||||||
import { forwardRef, useImperativeHandle, useRef } from "react";
|
|
||||||
import type { HotkeyAction } from "../../hooks/useHotKey";
|
|
||||||
import { useFormattedHotkey, useHotKey } from "../../hooks/useHotKey";
|
|
||||||
|
|
||||||
export type IconButtonProps = BaseIconButtonProps & {
|
|
||||||
hotkeyAction?: HotkeyAction;
|
|
||||||
hotkeyLabelOnly?: boolean;
|
|
||||||
hotkeyPriority?: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const IconButton = forwardRef<HTMLButtonElement, IconButtonProps>(function IconButton(
|
|
||||||
{ hotkeyAction, hotkeyPriority, hotkeyLabelOnly, title, ...props }: IconButtonProps,
|
|
||||||
ref,
|
|
||||||
) {
|
|
||||||
const hotkeyTrigger = useFormattedHotkey(hotkeyAction ?? null)?.join("");
|
|
||||||
const fullTitle = hotkeyTrigger ? `${title ?? ""} ${hotkeyTrigger}`.trim() : title;
|
|
||||||
|
|
||||||
const buttonRef = useRef<HTMLButtonElement>(null);
|
|
||||||
useImperativeHandle<HTMLButtonElement | null, HTMLButtonElement | null>(
|
|
||||||
ref,
|
|
||||||
() => buttonRef.current,
|
|
||||||
);
|
|
||||||
|
|
||||||
useHotKey(
|
|
||||||
hotkeyAction ?? null,
|
|
||||||
() => {
|
|
||||||
buttonRef.current?.click();
|
|
||||||
},
|
|
||||||
{ priority: hotkeyPriority, enable: !hotkeyLabelOnly },
|
|
||||||
);
|
|
||||||
|
|
||||||
return <BaseIconButton ref={buttonRef} title={fullTitle} {...props} />;
|
|
||||||
});
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { generateId } from "../../lib/generateId";
|
|
||||||
import type { Pair, PairWithId } from "./PairEditor";
|
|
||||||
|
|
||||||
export function ensurePairId(p: Pair): PairWithId {
|
|
||||||
if (typeof p.id === "string") {
|
|
||||||
return p as PairWithId;
|
|
||||||
}
|
|
||||||
return { ...p, id: p.id ?? generateId() };
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { ButtonProps } from "./Button";
|
|
||||||
import { Button } from "./Button";
|
|
||||||
|
|
||||||
export function PillButton({ className, ...props }: ButtonProps) {
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
size="2xs"
|
|
||||||
variant="border"
|
|
||||||
className={classNames(className, "!rounded-full mx-1 !px-3")}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
import type { FormInput, JsonPrimitive } from "@yaakapp-internal/plugins";
|
|
||||||
import { HStack } from "@yaakapp-internal/ui";
|
|
||||||
import type { FormEvent } from "react";
|
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
|
||||||
import { generateId } from "../../lib/generateId";
|
|
||||||
import { DynamicForm } from "../DynamicForm";
|
|
||||||
import { Button } from "./Button";
|
|
||||||
|
|
||||||
export interface PromptProps {
|
|
||||||
inputs: FormInput[];
|
|
||||||
onCancel: () => void;
|
|
||||||
onResult: (value: Record<string, JsonPrimitive> | null) => void;
|
|
||||||
confirmText?: string;
|
|
||||||
cancelText?: string;
|
|
||||||
onValuesChange?: (values: Record<string, JsonPrimitive>) => void;
|
|
||||||
onInputsUpdated?: (cb: (inputs: FormInput[]) => void) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Prompt({
|
|
||||||
onCancel,
|
|
||||||
inputs: initialInputs,
|
|
||||||
onResult,
|
|
||||||
confirmText = "Confirm",
|
|
||||||
cancelText = "Cancel",
|
|
||||||
onValuesChange,
|
|
||||||
onInputsUpdated,
|
|
||||||
}: PromptProps) {
|
|
||||||
const [value, setValue] = useState<Record<string, JsonPrimitive>>({});
|
|
||||||
const [inputs, setInputs] = useState<FormInput[]>(initialInputs);
|
|
||||||
const handleSubmit = useCallback(
|
|
||||||
(e: FormEvent<HTMLFormElement>) => {
|
|
||||||
e.preventDefault();
|
|
||||||
onResult(value);
|
|
||||||
},
|
|
||||||
[onResult, value],
|
|
||||||
);
|
|
||||||
|
|
||||||
// Register callback for external input updates (from plugin dynamic resolution)
|
|
||||||
useEffect(() => {
|
|
||||||
onInputsUpdated?.(setInputs);
|
|
||||||
}, [onInputsUpdated]);
|
|
||||||
|
|
||||||
// Notify of value changes for dynamic resolution
|
|
||||||
useEffect(() => {
|
|
||||||
onValuesChange?.(value);
|
|
||||||
}, [value, onValuesChange]);
|
|
||||||
|
|
||||||
const id = `prompt.form.${useRef(generateId()).current}`;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form
|
|
||||||
className="grid grid-rows-[auto_auto] grid-cols-[minmax(0,1fr)] gap-4 mb-4"
|
|
||||||
onSubmit={handleSubmit}
|
|
||||||
>
|
|
||||||
<DynamicForm inputs={inputs} onChange={setValue} data={value} stateKey={id} />
|
|
||||||
<HStack space={2} justifyContent="end">
|
|
||||||
<Button onClick={onCancel} variant="border" color="secondary">
|
|
||||||
{cancelText || "Cancel"}
|
|
||||||
</Button>
|
|
||||||
<Button type="submit" color="primary">
|
|
||||||
{confirmText || "Done"}
|
|
||||||
</Button>
|
|
||||||
</HStack>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
|
|
||||||
export interface RadioCardOption<T extends string> {
|
|
||||||
value: T;
|
|
||||||
label: ReactNode;
|
|
||||||
description?: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface RadioCardsProps<T extends string> {
|
|
||||||
value: T | null;
|
|
||||||
onChange: (value: T) => void;
|
|
||||||
options: RadioCardOption<T>[];
|
|
||||||
name: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function RadioCards<T extends string>({
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
options,
|
|
||||||
name,
|
|
||||||
}: RadioCardsProps<T>) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col gap-2">
|
|
||||||
{options.map((option) => {
|
|
||||||
const selected = value === option.value;
|
|
||||||
return (
|
|
||||||
<label
|
|
||||||
key={option.value}
|
|
||||||
className={classNames(
|
|
||||||
"flex items-start gap-3 p-3 rounded-lg border cursor-pointer",
|
|
||||||
"transition-colors",
|
|
||||||
selected ? "border-border-focus" : "border-border-subtle hocus:border-text-subtlest",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
name={name}
|
|
||||||
value={option.value}
|
|
||||||
checked={selected}
|
|
||||||
onChange={() => onChange(option.value)}
|
|
||||||
className="sr-only"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"mt-1 w-4 h-4 flex-shrink-0 rounded-full border",
|
|
||||||
"flex items-center justify-center",
|
|
||||||
selected ? "border-focus" : "border-border",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{selected && <div className="w-2 h-2 rounded-full bg-text" />}
|
|
||||||
</div>
|
|
||||||
<div className="flex flex-col gap-0.5">
|
|
||||||
<span className="font-semibold text-text">{option.label}</span>
|
|
||||||
{option.description && (
|
|
||||||
<span className="text-sm text-text-subtle">{option.description}</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import type { Color } from "@yaakapp-internal/plugins";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import type { ReactNode } from "react";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
orientation?: "horizontal" | "vertical";
|
|
||||||
dashed?: boolean;
|
|
||||||
className?: string;
|
|
||||||
children?: ReactNode;
|
|
||||||
color?: Color;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Separator({
|
|
||||||
color,
|
|
||||||
className,
|
|
||||||
dashed,
|
|
||||||
orientation = "horizontal",
|
|
||||||
children,
|
|
||||||
}: Props) {
|
|
||||||
return (
|
|
||||||
<div role="presentation" className={classNames(className, "flex items-center w-full")}>
|
|
||||||
{children && (
|
|
||||||
<div className="text-sm text-text-subtlest mr-2 whitespace-nowrap">{children}</div>
|
|
||||||
)}
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"h-0 border-t opacity-60",
|
|
||||||
color == null && "border-border",
|
|
||||||
color === "primary" && "border-primary",
|
|
||||||
color === "secondary" && "border-secondary",
|
|
||||||
color === "success" && "border-success",
|
|
||||||
color === "notice" && "border-notice",
|
|
||||||
color === "warning" && "border-warning",
|
|
||||||
color === "danger" && "border-danger",
|
|
||||||
color === "info" && "border-info",
|
|
||||||
dashed && "border-dashed",
|
|
||||||
orientation === "horizontal" && "w-full h-[1px]",
|
|
||||||
orientation === "vertical" && "h-full w-[1px]",
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
import classNames from "classnames";
|
|
||||||
import type { CSSProperties, KeyboardEvent, ReactNode } from "react";
|
|
||||||
import { useRef, useState } from "react";
|
|
||||||
import { generateId } from "../../lib/generateId";
|
|
||||||
import { Portal } from "@yaakapp-internal/ui";
|
|
||||||
|
|
||||||
export interface TooltipProps {
|
|
||||||
children: ReactNode;
|
|
||||||
content: ReactNode;
|
|
||||||
tabIndex?: number;
|
|
||||||
size?: "md" | "lg";
|
|
||||||
className?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
const hiddenStyles: CSSProperties = {
|
|
||||||
left: -99999,
|
|
||||||
top: -99999,
|
|
||||||
visibility: "hidden",
|
|
||||||
pointerEvents: "none",
|
|
||||||
opacity: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
type TooltipPosition = "top" | "bottom";
|
|
||||||
|
|
||||||
interface TooltipOpenState {
|
|
||||||
styles: CSSProperties;
|
|
||||||
position: TooltipPosition;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Tooltip({ children, className, content, tabIndex, size = "md" }: TooltipProps) {
|
|
||||||
const [openState, setOpenState] = useState<TooltipOpenState | null>(null);
|
|
||||||
const triggerRef = useRef<HTMLButtonElement>(null);
|
|
||||||
const tooltipRef = useRef<HTMLDivElement>(null);
|
|
||||||
const showTimeout = useRef<ReturnType<typeof setTimeout>>(undefined);
|
|
||||||
|
|
||||||
const handleOpenImmediate = () => {
|
|
||||||
if (triggerRef.current == null || tooltipRef.current == null) return;
|
|
||||||
clearTimeout(showTimeout.current);
|
|
||||||
const triggerRect = triggerRef.current.getBoundingClientRect();
|
|
||||||
const tooltipRect = tooltipRef.current.getBoundingClientRect();
|
|
||||||
const viewportHeight = document.documentElement.clientHeight;
|
|
||||||
|
|
||||||
const margin = 8;
|
|
||||||
const spaceAbove = Math.max(0, triggerRect.top - margin);
|
|
||||||
const spaceBelow = Math.max(0, viewportHeight - triggerRect.bottom - margin);
|
|
||||||
const preferBottom = spaceAbove < tooltipRect.height + margin && spaceBelow > spaceAbove;
|
|
||||||
const position: TooltipPosition = preferBottom ? "bottom" : "top";
|
|
||||||
|
|
||||||
const styles: CSSProperties = {
|
|
||||||
left: Math.max(0, triggerRect.left + triggerRect.width / 2 - tooltipRect.width / 2),
|
|
||||||
maxHeight: position === "top" ? spaceAbove : spaceBelow,
|
|
||||||
...(position === "top"
|
|
||||||
? { bottom: viewportHeight - triggerRect.top }
|
|
||||||
: { top: triggerRect.bottom }),
|
|
||||||
};
|
|
||||||
|
|
||||||
setOpenState({ styles, position });
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleOpen = () => {
|
|
||||||
clearTimeout(showTimeout.current);
|
|
||||||
showTimeout.current = setTimeout(handleOpenImmediate, 500);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleClose = () => {
|
|
||||||
clearTimeout(showTimeout.current);
|
|
||||||
setOpenState(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleToggleImmediate = () => {
|
|
||||||
if (openState) handleClose();
|
|
||||||
else handleOpenImmediate();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleKeyDown = (e: KeyboardEvent<HTMLButtonElement>) => {
|
|
||||||
if (openState && e.key === "Escape") {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
handleClose();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const id = useRef(`tooltip-${generateId()}`);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Portal name="tooltip">
|
|
||||||
<div
|
|
||||||
ref={tooltipRef}
|
|
||||||
style={openState?.styles ?? hiddenStyles}
|
|
||||||
id={id.current}
|
|
||||||
role="tooltip"
|
|
||||||
aria-hidden={openState == null}
|
|
||||||
onMouseEnter={handleOpenImmediate}
|
|
||||||
onMouseLeave={handleClose}
|
|
||||||
className="p-2 fixed z-50 text-sm transition-opacity grid grid-rows-[minmax(0,1fr)]"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className={classNames(
|
|
||||||
"bg-surface-highlight rounded-md px-3 py-2 z-50 border border-border overflow-auto",
|
|
||||||
size === "md" && "max-w-sm",
|
|
||||||
size === "lg" && "max-w-md",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{content}
|
|
||||||
</div>
|
|
||||||
<Triangle
|
|
||||||
className="text-border"
|
|
||||||
position={openState?.position === "bottom" ? "top" : "bottom"}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</Portal>
|
|
||||||
{/* oxlint-disable-next-line jsx-a11y/prefer-tag-over-role -- Needs to be usable in other buttons */}
|
|
||||||
<span
|
|
||||||
ref={triggerRef}
|
|
||||||
role="button"
|
|
||||||
aria-describedby={openState ? id.current : undefined}
|
|
||||||
tabIndex={tabIndex ?? -1}
|
|
||||||
className={classNames(className, "flex-grow-0 flex items-center")}
|
|
||||||
onClick={handleToggleImmediate}
|
|
||||||
onMouseEnter={handleOpen}
|
|
||||||
onMouseLeave={handleClose}
|
|
||||||
onFocus={handleOpenImmediate}
|
|
||||||
onBlur={handleClose}
|
|
||||||
onKeyDown={handleKeyDown}
|
|
||||||
>
|
|
||||||
{children}
|
|
||||||
</span>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function Triangle({ className, position }: { className?: string; position: "top" | "bottom" }) {
|
|
||||||
const isBottom = position === "bottom";
|
|
||||||
|
|
||||||
return (
|
|
||||||
<svg
|
|
||||||
aria-hidden
|
|
||||||
viewBox="0 0 30 10"
|
|
||||||
preserveAspectRatio="none"
|
|
||||||
shapeRendering="crispEdges"
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
"absolute z-50 left-[calc(50%-0.4rem)] h-[0.5rem] w-[0.8rem]",
|
|
||||||
isBottom
|
|
||||||
? "border-t-[2px] border-surface-highlight -bottom-[calc(0.5rem-3px)] mb-2"
|
|
||||||
: "border-b-[2px] border-surface-highlight -top-[calc(0.5rem-3px)] mt-2",
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<title>Triangle</title>
|
|
||||||
<polygon
|
|
||||||
className="fill-surface-highlight"
|
|
||||||
points={isBottom ? "0,0 30,0 15,10" : "0,10 30,10 15,0"}
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
d={isBottom ? "M0 0 L15 9 L30 0" : "M0 10 L15 1 L30 10"}
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="1"
|
|
||||||
strokeLinejoin="miter"
|
|
||||||
vectorEffect="non-scaling-stroke"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import type { WebsocketConnection } from "@yaakapp-internal/models";
|
|
||||||
import classNames from "classnames";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
connection: WebsocketConnection;
|
|
||||||
className?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function WebsocketStatusTag({ connection, className }: Props) {
|
|
||||||
const { state, error } = connection;
|
|
||||||
|
|
||||||
let label: string;
|
|
||||||
let colorClass = "text-text-subtle";
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
label = "ERROR";
|
|
||||||
colorClass = "text-danger";
|
|
||||||
} else if (state === "connected") {
|
|
||||||
label = "CONNECTED";
|
|
||||||
colorClass = "text-success";
|
|
||||||
} else if (state === "closing") {
|
|
||||||
label = "CLOSING";
|
|
||||||
} else if (state === "closed") {
|
|
||||||
label = "CLOSED";
|
|
||||||
colorClass = "text-warning";
|
|
||||||
} else {
|
|
||||||
label = "CONNECTING";
|
|
||||||
}
|
|
||||||
|
|
||||||
return <span className={classNames(className, "font-mono", colorClass)}>{label}</span>;
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
import { useGitFileDiffForCommit, useGitLog, useGitMutations } from "@yaakapp-internal/git";
|
|
||||||
import type { GitCommit } from "@yaakapp-internal/git";
|
|
||||||
import { InlineCode, SplitLayout } from "@yaakapp-internal/ui";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { formatDistanceToNowStrict } from "date-fns";
|
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
||||||
import { sync } from "../../init/sync";
|
|
||||||
import { showConfirm } from "../../lib/confirm";
|
|
||||||
import { EmptyStateText } from "../EmptyStateText";
|
|
||||||
import { Button } from "../core/Button";
|
|
||||||
import { DiffViewer } from "../core/Editor/DiffViewer";
|
|
||||||
import { useGitCallbacks } from "./callbacks";
|
|
||||||
|
|
||||||
export function FileHistoryDialog({ dir, relaPath }: { dir: string; relaPath: string }) {
|
|
||||||
const callbacks = useGitCallbacks(dir);
|
|
||||||
const { restoreFileFromCommit } = useGitMutations(dir, callbacks);
|
|
||||||
const log = useGitLog(dir, undefined, relaPath);
|
|
||||||
const commits = log.data ?? [];
|
|
||||||
const [selectedOid, setSelectedOid] = useState<string | null>(null);
|
|
||||||
const selectedCommit = useMemo(
|
|
||||||
() => commits.find((commit) => commit.oid === selectedOid) ?? null,
|
|
||||||
[commits, selectedOid],
|
|
||||||
);
|
|
||||||
const diff = useGitFileDiffForCommit(dir, relaPath, selectedCommit?.oid);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (commits.length === 0) {
|
|
||||||
setSelectedOid(null);
|
|
||||||
} else if (selectedOid == null || !commits.some((commit) => commit.oid === selectedOid)) {
|
|
||||||
setSelectedOid(commits[0]?.oid ?? null);
|
|
||||||
}
|
|
||||||
}, [commits, selectedOid]);
|
|
||||||
|
|
||||||
const handleRestoreCommit = useCallback(
|
|
||||||
async (commit: GitCommit) => {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "git-restore-file-history-entry",
|
|
||||||
title: "Restore File",
|
|
||||||
description: "This will restore the file to the selected commit.",
|
|
||||||
confirmText: "Restore",
|
|
||||||
color: "warning",
|
|
||||||
});
|
|
||||||
if (!confirmed) return;
|
|
||||||
|
|
||||||
await restoreFileFromCommit.mutateAsync({ commitOid: commit.oid, relaPath });
|
|
||||||
await sync({ force: true });
|
|
||||||
},
|
|
||||||
[relaPath, restoreFileFromCommit],
|
|
||||||
);
|
|
||||||
|
|
||||||
if (commits.length === 0 && !log.isLoading) {
|
|
||||||
return <EmptyStateText>No history for this file</EmptyStateText>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="h-full px-2 pb-4">
|
|
||||||
<SplitLayout
|
|
||||||
storageKey="git-file-history-horizontal"
|
|
||||||
layout="horizontal"
|
|
||||||
defaultRatio={0.6}
|
|
||||||
firstSlot={({ style }) => (
|
|
||||||
<div style={style} className="h-full overflow-y-auto px-4 pb-2 transform-cpu">
|
|
||||||
<div className="flex flex-col pt-1.5">
|
|
||||||
{commits.map((commit) => (
|
|
||||||
<CommitListItem
|
|
||||||
key={commit.oid}
|
|
||||||
commit={commit}
|
|
||||||
selected={commit.oid === selectedCommit?.oid}
|
|
||||||
onSelect={() => setSelectedOid(commit.oid)}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
secondSlot={({ style }) => (
|
|
||||||
<div style={style} className="h-full min-w-0 border-l border-l-border-subtle px-4">
|
|
||||||
{selectedCommit == null ? (
|
|
||||||
<EmptyStateText>Select a commit to view diff</EmptyStateText>
|
|
||||||
) : (
|
|
||||||
<div className="h-full flex flex-col">
|
|
||||||
<div className="mb-2 min-w-0 text-text-subtle grid items-center gap-2 grid-cols-[minmax(0,1fr)_auto]">
|
|
||||||
<div className="min-w-0 truncate">{selectedCommit.message || "No message"}</div>
|
|
||||||
<Button
|
|
||||||
className="ml-auto"
|
|
||||||
color="warning"
|
|
||||||
size="2xs"
|
|
||||||
variant="border"
|
|
||||||
onClick={() => handleRestoreCommit(selectedCommit)}
|
|
||||||
>
|
|
||||||
Restore File
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
<DiffViewer
|
|
||||||
original={diff.data?.original ?? ""}
|
|
||||||
modified={diff.data?.modified ?? ""}
|
|
||||||
className="flex-1 min-h-0"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function CommitListItem({
|
|
||||||
commit,
|
|
||||||
selected,
|
|
||||||
onSelect,
|
|
||||||
}: {
|
|
||||||
commit: GitCommit;
|
|
||||||
selected: boolean;
|
|
||||||
onSelect: () => void;
|
|
||||||
}) {
|
|
||||||
return (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={classNames(
|
|
||||||
"w-full min-w-0 text-left rounded px-2 py-1.5",
|
|
||||||
selected && "bg-surface-active",
|
|
||||||
)}
|
|
||||||
onClick={onSelect}
|
|
||||||
>
|
|
||||||
<div className="truncate flex-1">{commit.message || "No message"}</div>
|
|
||||||
<div className="text-text-subtle text-sm truncate">
|
|
||||||
{commit.author.name || "Unknown"} - {formatDistanceToNowStrict(commit.when)} ago - <span className="shrink-0 text-2xs text-text-subtle font-mono">{commit.oid.slice(0, 7)}</span>
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,681 +0,0 @@
|
|||||||
import { useGitBranchInfo, useGitMutations } from "@yaakapp-internal/git";
|
|
||||||
import type { WorkspaceMeta } from "@yaakapp-internal/models";
|
|
||||||
import classNames from "classnames";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import type { HTMLAttributes } from "react";
|
|
||||||
import { forwardRef, useCallback, useMemo } from "react";
|
|
||||||
import { openWorkspaceSettings } from "../../commands/openWorkspaceSettings";
|
|
||||||
import { activeWorkspaceAtom, activeWorkspaceMetaAtom } from "../../hooks/useActiveWorkspace";
|
|
||||||
import { useKeyValue } from "../../hooks/useKeyValue";
|
|
||||||
import { useRandomKey } from "../../hooks/useRandomKey";
|
|
||||||
import { sync } from "../../init/sync";
|
|
||||||
import { showConfirm, showConfirmDelete } from "../../lib/confirm";
|
|
||||||
import { fireAndForget } from "../../lib/fireAndForget";
|
|
||||||
import { showDialog } from "../../lib/dialog";
|
|
||||||
import { gitWorktreeStatusAtom } from "../../lib/gitWorktreeStatus";
|
|
||||||
import { showPrompt } from "../../lib/prompt";
|
|
||||||
import { showErrorToast, showToast } from "../../lib/toast";
|
|
||||||
import type { DropdownItem } from "../core/Dropdown";
|
|
||||||
import { Dropdown } from "../core/Dropdown";
|
|
||||||
import { Banner, Icon, InlineCode } from "@yaakapp-internal/ui";
|
|
||||||
import { useGitCallbacks } from "./callbacks";
|
|
||||||
import { GitCommitDialog } from "./GitCommitDialog";
|
|
||||||
import { GitRemotesDialog } from "./GitRemotesDialog";
|
|
||||||
import { handlePullResult, handlePushResult } from "./git-util";
|
|
||||||
import { HistoryDialog } from "./HistoryDialog";
|
|
||||||
|
|
||||||
const EMPTY_BRANCHES: string[] = [];
|
|
||||||
|
|
||||||
export function GitDropdown() {
|
|
||||||
const workspaceMeta = useAtomValue(activeWorkspaceMetaAtom);
|
|
||||||
if (workspaceMeta == null) return null;
|
|
||||||
|
|
||||||
if (workspaceMeta.settingSyncDir == null) {
|
|
||||||
return <SetupSyncDropdown workspaceMeta={workspaceMeta} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
return <SyncDropdownWithSyncDir syncDir={workspaceMeta.settingSyncDir} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
|
|
||||||
const workspace = useAtomValue(activeWorkspaceAtom);
|
|
||||||
const worktreeStatus = useAtomValue(gitWorktreeStatusAtom);
|
|
||||||
const [refreshKey, regenerateKey] = useRandomKey();
|
|
||||||
const branchInfo = useGitBranchInfo(syncDir, refreshKey);
|
|
||||||
const callbacks = useGitCallbacks(syncDir);
|
|
||||||
const {
|
|
||||||
createBranch,
|
|
||||||
deleteBranch,
|
|
||||||
deleteRemoteBranch,
|
|
||||||
renameBranch,
|
|
||||||
mergeBranch,
|
|
||||||
push,
|
|
||||||
pull,
|
|
||||||
checkout,
|
|
||||||
resetChanges,
|
|
||||||
init,
|
|
||||||
} = useGitMutations(syncDir, callbacks);
|
|
||||||
|
|
||||||
const localBranches = branchInfo.data?.localBranches ?? EMPTY_BRANCHES;
|
|
||||||
const remoteBranches = branchInfo.data?.remoteBranches ?? EMPTY_BRANCHES;
|
|
||||||
const remoteOnlyBranches = useMemo(
|
|
||||||
() => remoteBranches.filter((b) => !localBranches.includes(b.replace(/^origin\//, ""))),
|
|
||||||
[localBranches, remoteBranches],
|
|
||||||
);
|
|
||||||
const currentBranch = branchInfo.data?.headRefShorthand;
|
|
||||||
const hasChanges = worktreeStatus?.entries.some((e) => e.status !== "current") ?? false;
|
|
||||||
const ahead = branchInfo.data?.ahead ?? 0;
|
|
||||||
const behind = branchInfo.data?.behind ?? 0;
|
|
||||||
const initRepo = useCallback(() => {
|
|
||||||
init.mutate();
|
|
||||||
}, [init]);
|
|
||||||
|
|
||||||
const items: DropdownItem[] = useMemo(() => {
|
|
||||||
if (workspace == null || branchInfo.data == null) return [];
|
|
||||||
|
|
||||||
const tryCheckout = (branch: string, force: boolean) => {
|
|
||||||
checkout.mutate(
|
|
||||||
{ branch, force },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
async onError(err) {
|
|
||||||
if (!force) {
|
|
||||||
// Checkout failed so ask user if they want to force it
|
|
||||||
const forceCheckout = await showConfirm({
|
|
||||||
id: "git-force-checkout",
|
|
||||||
title: "Conflicts Detected",
|
|
||||||
description:
|
|
||||||
"Your branch has conflicts. Either make a commit or force checkout to discard changes.",
|
|
||||||
confirmText: "Force Checkout",
|
|
||||||
color: "warning",
|
|
||||||
});
|
|
||||||
if (forceCheckout) {
|
|
||||||
tryCheckout(branch, true);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Checkout failed
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-checkout-error",
|
|
||||||
title: "Error checking out branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async onSuccess(branchName) {
|
|
||||||
showToast({
|
|
||||||
id: "git-checkout-success",
|
|
||||||
message: (
|
|
||||||
<>
|
|
||||||
Switched branch <InlineCode>{branchName}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
color: "success",
|
|
||||||
});
|
|
||||||
await sync({ force: true });
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
return [
|
|
||||||
{
|
|
||||||
label: "View History...",
|
|
||||||
leftSlot: <Icon icon="history" />,
|
|
||||||
onSelect: async () => {
|
|
||||||
showDialog({
|
|
||||||
id: "git-history",
|
|
||||||
size: "md",
|
|
||||||
title: "Commit History",
|
|
||||||
noPadding: true,
|
|
||||||
render: () => <HistoryDialog dir={syncDir} />,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Manage Remotes...",
|
|
||||||
leftSlot: <Icon icon="hard_drive_download" />,
|
|
||||||
onSelect: () => GitRemotesDialog.show(syncDir),
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "New Branch...",
|
|
||||||
leftSlot: <Icon icon="git_branch_plus" />,
|
|
||||||
async onSelect() {
|
|
||||||
const name = await showPrompt({
|
|
||||||
id: "git-branch-name",
|
|
||||||
title: "Create Branch",
|
|
||||||
label: "Branch Name",
|
|
||||||
});
|
|
||||||
if (!name) return;
|
|
||||||
|
|
||||||
await createBranch.mutateAsync(
|
|
||||||
{ branch: name },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onError: (err) => {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-branch-error",
|
|
||||||
title: "Error creating branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
tryCheckout(name, false);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Push",
|
|
||||||
leftSlot: <Icon icon="arrow_up_from_line" />,
|
|
||||||
waitForOnSelect: true,
|
|
||||||
async onSelect() {
|
|
||||||
await push.mutateAsync(undefined, {
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess: handlePushResult,
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-push-error",
|
|
||||||
title: "Error pushing changes",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Pull",
|
|
||||||
leftSlot: <Icon icon="arrow_down_to_line" />,
|
|
||||||
waitForOnSelect: true,
|
|
||||||
async onSelect() {
|
|
||||||
await pull.mutateAsync(undefined, {
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess: handlePullResult,
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-pull-error",
|
|
||||||
title: "Error pulling changes",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Commit...",
|
|
||||||
|
|
||||||
leftSlot: <Icon icon="git_commit_vertical" />,
|
|
||||||
onSelect() {
|
|
||||||
showDialog({
|
|
||||||
id: "commit",
|
|
||||||
title: "Commit Changes",
|
|
||||||
size: "full",
|
|
||||||
noPadding: true,
|
|
||||||
render: ({ hide }) => (
|
|
||||||
<GitCommitDialog syncDir={syncDir} onDone={hide} workspace={workspace} />
|
|
||||||
),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Reset Changes",
|
|
||||||
hidden: !hasChanges,
|
|
||||||
leftSlot: <Icon icon="rotate_ccw" />,
|
|
||||||
color: "danger",
|
|
||||||
async onSelect() {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "git-reset-changes",
|
|
||||||
title: "Reset Changes",
|
|
||||||
description: "This will discard all uncommitted changes. This cannot be undone.",
|
|
||||||
confirmText: "Reset",
|
|
||||||
color: "danger",
|
|
||||||
});
|
|
||||||
if (!confirmed) return;
|
|
||||||
|
|
||||||
await resetChanges.mutateAsync(undefined, {
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess() {
|
|
||||||
showToast({
|
|
||||||
id: "git-reset-success",
|
|
||||||
message: "Changes have been reset",
|
|
||||||
color: "success",
|
|
||||||
});
|
|
||||||
fireAndForget(sync({ force: true }));
|
|
||||||
},
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-reset-error",
|
|
||||||
title: "Error resetting changes",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator", label: "Branches", hidden: localBranches.length < 1 },
|
|
||||||
...localBranches.map((branch) => {
|
|
||||||
const isCurrent = currentBranch === branch;
|
|
||||||
return {
|
|
||||||
label: branch,
|
|
||||||
leftSlot: <Icon icon={isCurrent ? "check" : "empty"} />,
|
|
||||||
submenuOpenOnClick: true,
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Checkout",
|
|
||||||
hidden: isCurrent,
|
|
||||||
onSelect: () => tryCheckout(branch, false),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: (
|
|
||||||
<>
|
|
||||||
Merge into <InlineCode>{currentBranch}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
hidden: isCurrent,
|
|
||||||
async onSelect() {
|
|
||||||
await mergeBranch.mutateAsync(
|
|
||||||
{ branch },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess() {
|
|
||||||
showToast({
|
|
||||||
id: "git-merged-branch",
|
|
||||||
message: (
|
|
||||||
<>
|
|
||||||
Merged <InlineCode>{branch}</InlineCode> into{" "}
|
|
||||||
<InlineCode>{currentBranch}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
fireAndForget(sync({ force: true }));
|
|
||||||
},
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-merged-branch-error",
|
|
||||||
title: "Error merging branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "New Branch...",
|
|
||||||
async onSelect() {
|
|
||||||
const name = await showPrompt({
|
|
||||||
id: "git-new-branch-from",
|
|
||||||
title: "New Branch",
|
|
||||||
description: (
|
|
||||||
<>
|
|
||||||
Create a new branch from <InlineCode>{branch}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
label: "Branch Name",
|
|
||||||
});
|
|
||||||
if (!name) return;
|
|
||||||
|
|
||||||
await createBranch.mutateAsync(
|
|
||||||
{ branch: name, base: branch },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onError: (err) => {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-branch-error",
|
|
||||||
title: "Error creating branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
tryCheckout(name, false);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Rename...",
|
|
||||||
async onSelect() {
|
|
||||||
const newName = await showPrompt({
|
|
||||||
id: "git-rename-branch",
|
|
||||||
title: "Rename Branch",
|
|
||||||
label: "New Branch Name",
|
|
||||||
defaultValue: branch,
|
|
||||||
});
|
|
||||||
if (!newName || newName === branch) return;
|
|
||||||
|
|
||||||
await renameBranch.mutateAsync(
|
|
||||||
{ oldName: branch, newName },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess() {
|
|
||||||
showToast({
|
|
||||||
id: "git-rename-branch-success",
|
|
||||||
message: (
|
|
||||||
<>
|
|
||||||
Renamed <InlineCode>{branch}</InlineCode> to{" "}
|
|
||||||
<InlineCode>{newName}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
color: "success",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-rename-branch-error",
|
|
||||||
title: "Error renaming branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: "separator", hidden: isCurrent },
|
|
||||||
{
|
|
||||||
label: "Delete",
|
|
||||||
color: "danger",
|
|
||||||
hidden: isCurrent,
|
|
||||||
onSelect: async () => {
|
|
||||||
const confirmed = await showConfirmDelete({
|
|
||||||
id: "git-delete-branch",
|
|
||||||
title: "Delete Branch",
|
|
||||||
description: (
|
|
||||||
<>
|
|
||||||
Permanently delete <InlineCode>{branch}</InlineCode>?
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
if (!confirmed) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await deleteBranch.mutateAsync(
|
|
||||||
{ branch },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-delete-branch-error",
|
|
||||||
title: "Error deleting branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
if (result.type === "not_fully_merged") {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "force-branch-delete",
|
|
||||||
title: "Branch not fully merged",
|
|
||||||
description: (
|
|
||||||
<>
|
|
||||||
<p>
|
|
||||||
Branch <InlineCode>{branch}</InlineCode> is not fully merged.
|
|
||||||
</p>
|
|
||||||
<p>Do you want to delete it anyway?</p>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
if (confirmed) {
|
|
||||||
await deleteBranch.mutateAsync(
|
|
||||||
{ branch, force: true },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-force-delete-branch-error",
|
|
||||||
title: "Error force deleting branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
} satisfies DropdownItem;
|
|
||||||
}),
|
|
||||||
...remoteOnlyBranches.map((branch) => {
|
|
||||||
const isCurrent = currentBranch === branch;
|
|
||||||
return {
|
|
||||||
label: branch,
|
|
||||||
leftSlot: <Icon icon={isCurrent ? "check" : "empty"} />,
|
|
||||||
submenuOpenOnClick: true,
|
|
||||||
submenu: [
|
|
||||||
{
|
|
||||||
label: "Checkout",
|
|
||||||
hidden: isCurrent,
|
|
||||||
onSelect: () => tryCheckout(branch, false),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Delete",
|
|
||||||
color: "danger",
|
|
||||||
async onSelect() {
|
|
||||||
const confirmed = await showConfirmDelete({
|
|
||||||
id: "git-delete-remote-branch",
|
|
||||||
title: "Delete Remote Branch",
|
|
||||||
description: (
|
|
||||||
<>
|
|
||||||
Permanently delete <InlineCode>{branch}</InlineCode> from the remote?
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
if (!confirmed) return;
|
|
||||||
|
|
||||||
await deleteRemoteBranch.mutateAsync(
|
|
||||||
{ branch },
|
|
||||||
{
|
|
||||||
disableToastError: true,
|
|
||||||
onSuccess() {
|
|
||||||
showToast({
|
|
||||||
id: "git-delete-remote-branch-success",
|
|
||||||
message: (
|
|
||||||
<>
|
|
||||||
Deleted remote branch <InlineCode>{branch}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
color: "success",
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onError(err) {
|
|
||||||
showErrorToast({
|
|
||||||
id: "git-delete-remote-branch-error",
|
|
||||||
title: "Error deleting remote branch",
|
|
||||||
message: String(err),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
} satisfies DropdownItem;
|
|
||||||
}),
|
|
||||||
];
|
|
||||||
}, [
|
|
||||||
branchInfo.data,
|
|
||||||
checkout,
|
|
||||||
createBranch,
|
|
||||||
currentBranch,
|
|
||||||
deleteBranch,
|
|
||||||
deleteRemoteBranch,
|
|
||||||
hasChanges,
|
|
||||||
localBranches,
|
|
||||||
mergeBranch,
|
|
||||||
pull,
|
|
||||||
push,
|
|
||||||
remoteOnlyBranches,
|
|
||||||
renameBranch,
|
|
||||||
resetChanges,
|
|
||||||
syncDir,
|
|
||||||
workspace,
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (workspace == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const noRepo = branchInfo.error?.includes("not found");
|
|
||||||
if (noRepo) {
|
|
||||||
return <SetupGitDropdown workspaceId={workspace.id} initRepo={initRepo} />;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Still loading
|
|
||||||
if (branchInfo.data == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dropdown fullWidth items={items} onOpen={regenerateKey}>
|
|
||||||
<GitMenuButton>
|
|
||||||
<InlineCode className="flex items-center gap-1">
|
|
||||||
<Icon icon="git_branch" size="xs" className="opacity-50" />
|
|
||||||
{currentBranch}
|
|
||||||
</InlineCode>
|
|
||||||
<div className="flex items-center gap-1.5">
|
|
||||||
{ahead > 0 && (
|
|
||||||
<span className="text-xs flex items-center gap-0.5">
|
|
||||||
<span className="text-primary">↗</span>
|
|
||||||
{ahead}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{behind > 0 && (
|
|
||||||
<span className="text-xs flex items-center gap-0.5">
|
|
||||||
<span className="text-info">↙</span>
|
|
||||||
{behind}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</GitMenuButton>
|
|
||||||
</Dropdown>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const GitMenuButton = forwardRef<HTMLButtonElement, HTMLAttributes<HTMLButtonElement>>(
|
|
||||||
function GitMenuButton({ className, ...props }: HTMLAttributes<HTMLButtonElement>, ref) {
|
|
||||||
return (
|
|
||||||
<button
|
|
||||||
ref={ref}
|
|
||||||
className={classNames(
|
|
||||||
className,
|
|
||||||
"px-3 h-md border-t border-border flex items-center justify-between text-text-subtle outline-none focus-visible:bg-surface-highlight",
|
|
||||||
)}
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
function SetupSyncDropdown({ workspaceMeta }: { workspaceMeta: WorkspaceMeta }) {
|
|
||||||
const { value: hidden, set: setHidden } = useKeyValue<Record<string, boolean>>({
|
|
||||||
key: "setup_sync",
|
|
||||||
fallback: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (hidden == null || hidden[workspaceMeta.workspaceId]) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const banner = (
|
|
||||||
<Banner color="info">
|
|
||||||
When enabled, workspace data syncs to the chosen folder as text files, ideal for backup and
|
|
||||||
Git collaboration.
|
|
||||||
</Banner>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dropdown
|
|
||||||
fullWidth
|
|
||||||
items={[
|
|
||||||
{
|
|
||||||
type: "content",
|
|
||||||
label: banner,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
color: "success",
|
|
||||||
label: "Open Workspace Settings",
|
|
||||||
leftSlot: <Icon icon="settings" />,
|
|
||||||
onSelect: () => openWorkspaceSettings("data"),
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Hide This Message",
|
|
||||||
leftSlot: <Icon icon="eye_closed" />,
|
|
||||||
async onSelect() {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "hide-sync-menu-prompt",
|
|
||||||
title: "Hide Setup Message",
|
|
||||||
description: "You can configure filesystem sync or Git it in the workspace settings",
|
|
||||||
});
|
|
||||||
if (confirmed) {
|
|
||||||
await setHidden((prev) => ({ ...prev, [workspaceMeta.workspaceId]: true }));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<GitMenuButton>
|
|
||||||
<div className="text-sm text-text-subtle grid grid-cols-[auto_minmax(0,1fr)] items-center gap-2">
|
|
||||||
<Icon icon="wrench" />
|
|
||||||
<div className="truncate">Setup FS Sync or Git</div>
|
|
||||||
</div>
|
|
||||||
</GitMenuButton>
|
|
||||||
</Dropdown>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function SetupGitDropdown({
|
|
||||||
workspaceId,
|
|
||||||
initRepo,
|
|
||||||
}: {
|
|
||||||
workspaceId: string;
|
|
||||||
initRepo: () => void;
|
|
||||||
}) {
|
|
||||||
const { value: hidden, set: setHidden } = useKeyValue<Record<string, boolean>>({
|
|
||||||
key: "setup_git_repo",
|
|
||||||
fallback: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (hidden == null || hidden[workspaceId]) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const banner = <Banner color="info">Initialize local repo to start versioning with Git</Banner>;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dropdown
|
|
||||||
fullWidth
|
|
||||||
items={[
|
|
||||||
{ type: "content", label: banner },
|
|
||||||
{
|
|
||||||
label: "Initialize Git Repo",
|
|
||||||
leftSlot: <Icon icon="magic_wand" />,
|
|
||||||
onSelect: initRepo,
|
|
||||||
},
|
|
||||||
{ type: "separator" },
|
|
||||||
{
|
|
||||||
label: "Hide This Message",
|
|
||||||
leftSlot: <Icon icon="eye_closed" />,
|
|
||||||
async onSelect() {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "hide-git-init-prompt",
|
|
||||||
title: "Hide Git Setup",
|
|
||||||
description: "You can initialize a git repo outside of Yaak to bring this back",
|
|
||||||
});
|
|
||||||
if (confirmed) {
|
|
||||||
await setHidden((prev) => ({ ...prev, [workspaceId]: true }));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<GitMenuButton>
|
|
||||||
<div className="text-sm text-text-subtle grid grid-cols-[auto_minmax(0,1fr)] items-center gap-2">
|
|
||||||
<Icon icon="folder_git" />
|
|
||||||
<div className="truncate">Setup Git</div>
|
|
||||||
</div>
|
|
||||||
</GitMenuButton>
|
|
||||||
</Dropdown>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import type { GitCallbacks } from "@yaakapp-internal/git";
|
|
||||||
import { useMemo } from "react";
|
|
||||||
import { sync } from "../../init/sync";
|
|
||||||
import { promptCredentials } from "./credentials";
|
|
||||||
import { promptDivergedStrategy } from "./diverged";
|
|
||||||
import { addGitRemote } from "./showAddRemoteDialog";
|
|
||||||
import { promptUncommittedChangesStrategy } from "./uncommitted";
|
|
||||||
|
|
||||||
export function gitCallbacks(dir: string): GitCallbacks {
|
|
||||||
return {
|
|
||||||
addRemote: async () => {
|
|
||||||
return addGitRemote(dir, "origin");
|
|
||||||
},
|
|
||||||
promptCredentials: async ({ url, error }) => {
|
|
||||||
const creds = await promptCredentials({ url, error });
|
|
||||||
if (creds == null) throw new Error("Cancelled credentials prompt");
|
|
||||||
return creds;
|
|
||||||
},
|
|
||||||
promptDiverged: async ({ remote, branch }) => {
|
|
||||||
return promptDivergedStrategy({ remote, branch });
|
|
||||||
},
|
|
||||||
promptUncommittedChanges: async () => {
|
|
||||||
return promptUncommittedChangesStrategy();
|
|
||||||
},
|
|
||||||
forceSync: () => sync({ force: true }),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useGitCallbacks(dir: string): GitCallbacks {
|
|
||||||
return useMemo(() => gitCallbacks(dir), [dir]);
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
import { showPromptForm } from "../../lib/prompt-form";
|
|
||||||
import { Banner, InlineCode } from "@yaakapp-internal/ui";
|
|
||||||
|
|
||||||
export interface GitCredentials {
|
|
||||||
username: string;
|
|
||||||
password: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function promptCredentials({
|
|
||||||
url: remoteUrl,
|
|
||||||
error,
|
|
||||||
}: {
|
|
||||||
url: string;
|
|
||||||
error: string | null;
|
|
||||||
}): Promise<GitCredentials | null> {
|
|
||||||
const isGitHub = /github\.com/i.test(remoteUrl);
|
|
||||||
const userLabel = isGitHub ? "GitHub Username" : "Username";
|
|
||||||
const passLabel = isGitHub ? "GitHub Personal Access Token" : "Password / Token";
|
|
||||||
const userDescription = isGitHub ? "Use your GitHub username (not your email)." : undefined;
|
|
||||||
const passDescription = isGitHub
|
|
||||||
? "GitHub requires a Personal Access Token (PAT) for write operations over HTTPS. Passwords are not supported."
|
|
||||||
: "Enter your password or access token for this Git server.";
|
|
||||||
const r = await showPromptForm({
|
|
||||||
id: "git-credentials",
|
|
||||||
title: "Credentials Required",
|
|
||||||
description: error ? (
|
|
||||||
<Banner color="danger">{error}</Banner>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
Enter credentials for <InlineCode>{remoteUrl}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
inputs: [
|
|
||||||
{ type: "text", name: "username", label: userLabel, description: userDescription },
|
|
||||||
{
|
|
||||||
type: "text",
|
|
||||||
name: "password",
|
|
||||||
label: passLabel,
|
|
||||||
description: passDescription,
|
|
||||||
password: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
if (r == null) return null;
|
|
||||||
|
|
||||||
const username = String(r.username || "");
|
|
||||||
const password = String(r.password || "");
|
|
||||||
return { username, password };
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
import type { DivergedStrategy } from "@yaakapp-internal/git";
|
|
||||||
import { HStack, InlineCode } from "@yaakapp-internal/ui";
|
|
||||||
import { useState } from "react";
|
|
||||||
import { showDialog } from "../../lib/dialog";
|
|
||||||
import { Button } from "../core/Button";
|
|
||||||
import { RadioCards } from "../core/RadioCards";
|
|
||||||
|
|
||||||
type Resolution = "force_reset" | "merge";
|
|
||||||
|
|
||||||
const resolutionLabel: Record<Resolution, string> = {
|
|
||||||
force_reset: "Force Pull",
|
|
||||||
merge: "Merge",
|
|
||||||
};
|
|
||||||
|
|
||||||
interface DivergedDialogProps {
|
|
||||||
remote: string;
|
|
||||||
branch: string;
|
|
||||||
onResult: (strategy: DivergedStrategy) => void;
|
|
||||||
onHide: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
function DivergedDialog({ remote, branch, onResult, onHide }: DivergedDialogProps) {
|
|
||||||
const [selected, setSelected] = useState<Resolution | null>(null);
|
|
||||||
|
|
||||||
const handleSubmit = () => {
|
|
||||||
if (selected == null) return;
|
|
||||||
onResult(selected);
|
|
||||||
onHide();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
onResult("cancel");
|
|
||||||
onHide();
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col gap-4 mb-4">
|
|
||||||
<p className="text-text-subtle">
|
|
||||||
Your local branch has diverged from{" "}
|
|
||||||
<InlineCode>
|
|
||||||
{remote}/{branch}
|
|
||||||
</InlineCode>
|
|
||||||
. How would you like to resolve this?
|
|
||||||
</p>
|
|
||||||
<RadioCards
|
|
||||||
name="diverged-strategy"
|
|
||||||
value={selected}
|
|
||||||
onChange={setSelected}
|
|
||||||
options={[
|
|
||||||
{
|
|
||||||
value: "merge",
|
|
||||||
label: "Merge Commit",
|
|
||||||
description: "Combining local and remote changes into a single merge commit",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: "force_reset",
|
|
||||||
label: "Force Pull",
|
|
||||||
description: "Discard local commits and reset to match the remote branch",
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
<HStack space={2} justifyContent="start" className="flex-row-reverse">
|
|
||||||
<Button
|
|
||||||
color={selected === "force_reset" ? "danger" : "primary"}
|
|
||||||
disabled={selected == null}
|
|
||||||
onClick={handleSubmit}
|
|
||||||
>
|
|
||||||
{selected != null ? resolutionLabel[selected] : "Select an option"}
|
|
||||||
</Button>
|
|
||||||
<Button variant="border" onClick={handleCancel}>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
</HStack>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function promptDivergedStrategy({
|
|
||||||
remote,
|
|
||||||
branch,
|
|
||||||
}: {
|
|
||||||
remote: string;
|
|
||||||
branch: string;
|
|
||||||
}): Promise<DivergedStrategy> {
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
showDialog({
|
|
||||||
id: "git-diverged",
|
|
||||||
title: "Branches Diverged",
|
|
||||||
hideX: true,
|
|
||||||
size: "sm",
|
|
||||||
disableBackdropClose: true,
|
|
||||||
onClose: () => resolve("cancel"),
|
|
||||||
render: ({ hide }) =>
|
|
||||||
DivergedDialog({
|
|
||||||
remote,
|
|
||||||
branch,
|
|
||||||
onHide: hide,
|
|
||||||
onResult: resolve,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import type { PullResult, PushResult } from "@yaakapp-internal/git";
|
|
||||||
import { showToast } from "../../lib/toast";
|
|
||||||
|
|
||||||
export function handlePushResult(r: PushResult) {
|
|
||||||
switch (r.type) {
|
|
||||||
case "needs_credentials":
|
|
||||||
showToast({ id: "push-error", message: "Credentials not found", color: "danger" });
|
|
||||||
break;
|
|
||||||
case "success":
|
|
||||||
showToast({ id: "push-success", message: r.message, color: "success" });
|
|
||||||
break;
|
|
||||||
case "up_to_date":
|
|
||||||
showToast({ id: "push-nothing", message: "Already up-to-date", color: "info" });
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function handlePullResult(r: PullResult) {
|
|
||||||
switch (r.type) {
|
|
||||||
case "needs_credentials":
|
|
||||||
showToast({ id: "pull-error", message: "Credentials not found", color: "danger" });
|
|
||||||
break;
|
|
||||||
case "success":
|
|
||||||
showToast({ id: "pull-success", message: r.message, color: "success" });
|
|
||||||
break;
|
|
||||||
case "up_to_date":
|
|
||||||
showToast({ id: "pull-nothing", message: "Already up-to-date", color: "info" });
|
|
||||||
break;
|
|
||||||
case "diverged":
|
|
||||||
// Handled by mutation callback before reaching here
|
|
||||||
break;
|
|
||||||
case "uncommitted_changes":
|
|
||||||
// Handled by mutation callback before reaching here
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
import type { GitRemote } from "@yaakapp-internal/git";
|
|
||||||
import { gitMutations } from "@yaakapp-internal/git";
|
|
||||||
import { showPromptForm } from "../../lib/prompt-form";
|
|
||||||
import { gitCallbacks } from "./callbacks";
|
|
||||||
|
|
||||||
export async function addGitRemote(dir: string, defaultName?: string): Promise<GitRemote> {
|
|
||||||
const r = await showPromptForm({
|
|
||||||
id: "add-remote",
|
|
||||||
title: "Add Remote",
|
|
||||||
inputs: [
|
|
||||||
{ type: "text", label: "Name", name: "name", defaultValue: defaultName },
|
|
||||||
{ type: "text", label: "URL", name: "url" },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
if (r == null) throw new Error("Cancelled remote prompt");
|
|
||||||
|
|
||||||
const name = String(r.name ?? "");
|
|
||||||
const url = String(r.url ?? "");
|
|
||||||
return gitMutations(dir, gitCallbacks(dir)).addRemote.mutateAsync({ name, url });
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import type { UncommittedChangesStrategy } from "@yaakapp-internal/git";
|
|
||||||
import { showConfirm } from "../../lib/confirm";
|
|
||||||
|
|
||||||
export async function promptUncommittedChangesStrategy(): Promise<UncommittedChangesStrategy> {
|
|
||||||
const confirmed = await showConfirm({
|
|
||||||
id: "git-uncommitted-changes",
|
|
||||||
title: "Uncommitted Changes",
|
|
||||||
description: "You have uncommitted changes. Commit or reset your changes before pulling.",
|
|
||||||
confirmText: "Reset and Pull",
|
|
||||||
color: "danger",
|
|
||||||
});
|
|
||||||
return confirmed ? "reset" : "cancel";
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
// Listen for settings changes, the re-compute theme
|
|
||||||
import { listen } from "@tauri-apps/api/event";
|
|
||||||
import type { ModelPayload } from "@yaakapp-internal/models";
|
|
||||||
import { fireAndForget } from "./lib/fireAndForget";
|
|
||||||
import { getSettings } from "./lib/settings";
|
|
||||||
|
|
||||||
function setFontSizeOnDocument(fontSize: number) {
|
|
||||||
document.documentElement.style.fontSize = `${fontSize}px`;
|
|
||||||
}
|
|
||||||
|
|
||||||
listen<ModelPayload>("model_write", async (event) => {
|
|
||||||
if (event.payload.change.type !== "upsert") return;
|
|
||||||
if (event.payload.model.model !== "settings") return;
|
|
||||||
setFontSizeOnDocument(event.payload.model.interfaceFontSize);
|
|
||||||
}).catch(console.error);
|
|
||||||
|
|
||||||
fireAndForget(getSettings().then((settings) => setFontSizeOnDocument(settings.interfaceFontSize)));
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
// Listen for settings changes, the re-compute theme
|
|
||||||
import { listen } from "@tauri-apps/api/event";
|
|
||||||
import type { ModelPayload, Settings } from "@yaakapp-internal/models";
|
|
||||||
import { fireAndForget } from "./lib/fireAndForget";
|
|
||||||
import { getSettings } from "./lib/settings";
|
|
||||||
|
|
||||||
function setFonts(settings: Settings) {
|
|
||||||
document.documentElement.style.setProperty("--font-family-editor", settings.editorFont ?? "");
|
|
||||||
document.documentElement.style.setProperty(
|
|
||||||
"--font-family-interface",
|
|
||||||
settings.interfaceFont ?? "",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
listen<ModelPayload>("model_write", async (event) => {
|
|
||||||
if (event.payload.change.type !== "upsert") return;
|
|
||||||
if (event.payload.model.model !== "settings") return;
|
|
||||||
setFonts(event.payload.model);
|
|
||||||
}).catch(console.error);
|
|
||||||
|
|
||||||
fireAndForget(getSettings().then((settings) => setFonts(settings)));
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import { useMutation } from "@tanstack/react-query";
|
|
||||||
import { InlineCode } from "@yaakapp-internal/ui";
|
|
||||||
import { showAlert } from "../lib/alert";
|
|
||||||
import { appInfo } from "../lib/appInfo";
|
|
||||||
import { minPromiseMillis } from "../lib/minPromiseMillis";
|
|
||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
|
|
||||||
export function useCheckForUpdates() {
|
|
||||||
return useMutation({
|
|
||||||
mutationKey: ["check_for_updates"],
|
|
||||||
mutationFn: async () => {
|
|
||||||
const hasUpdate: boolean = await minPromiseMillis(invokeCmd("cmd_check_for_updates"), 500);
|
|
||||||
if (!hasUpdate) {
|
|
||||||
showAlert({
|
|
||||||
id: "no-updates",
|
|
||||||
title: "No Update Available",
|
|
||||||
body: (
|
|
||||||
<>
|
|
||||||
You are currently on the latest version <InlineCode>{appInfo.version}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import type { HttpResponse } from "@yaakapp-internal/models";
|
|
||||||
import { copyToClipboard } from "../lib/copy";
|
|
||||||
import { getResponseBodyText } from "../lib/responseBody";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useCopyHttpResponse(response: HttpResponse) {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["copy_http_response", response.id],
|
|
||||||
async mutationFn() {
|
|
||||||
const body = await getResponseBodyText({ response, filter: null });
|
|
||||||
copyToClipboard(body);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { createWorkspaceModel } from "@yaakapp-internal/models";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { showPrompt } from "../lib/prompt";
|
|
||||||
import { setWorkspaceSearchParams } from "../lib/setWorkspaceSearchParams";
|
|
||||||
import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useCreateCookieJar() {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["create_cookie_jar"],
|
|
||||||
mutationFn: async () => {
|
|
||||||
const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
|
|
||||||
if (workspaceId == null) {
|
|
||||||
throw new Error("Cannot create cookie jar when there's no active workspace");
|
|
||||||
}
|
|
||||||
|
|
||||||
const name = await showPrompt({
|
|
||||||
id: "new-cookie-jar",
|
|
||||||
title: "New CookieJar",
|
|
||||||
placeholder: "My Jar",
|
|
||||||
confirmText: "Create",
|
|
||||||
label: "Name",
|
|
||||||
defaultValue: "My Jar",
|
|
||||||
});
|
|
||||||
if (name == null) return null;
|
|
||||||
|
|
||||||
return createWorkspaceModel({ model: "cookie_jar", workspaceId, name });
|
|
||||||
},
|
|
||||||
onSuccess: async (cookieJarId) => {
|
|
||||||
setWorkspaceSearchParams({ cookie_jar_id: cookieJarId });
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { useCallback } from "react";
|
|
||||||
import { CreateWorkspaceDialog } from "../components/CreateWorkspaceDialog";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
|
|
||||||
export function useCreateWorkspace() {
|
|
||||||
return useCallback(() => {
|
|
||||||
showDialog({
|
|
||||||
id: "create-workspace",
|
|
||||||
title: "Create Workspace",
|
|
||||||
size: "sm",
|
|
||||||
render: ({ hide }) => <CreateWorkspaceDialog hide={hide} />,
|
|
||||||
});
|
|
||||||
}, []);
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useDeleteGrpcConnections(requestId?: string) {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["delete_grpc_connections", requestId],
|
|
||||||
mutationFn: async () => {
|
|
||||||
if (requestId === undefined) return;
|
|
||||||
await invokeCmd("cmd_delete_all_grpc_connections", { requestId });
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useDeleteHttpResponses(requestId?: string) {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["delete_http_responses", requestId],
|
|
||||||
mutationFn: async () => {
|
|
||||||
if (requestId === undefined) return;
|
|
||||||
await invokeCmd("cmd_delete_all_http_responses", { requestId });
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import {
|
|
||||||
grpcConnectionsAtom,
|
|
||||||
httpResponsesAtom,
|
|
||||||
websocketConnectionsAtom,
|
|
||||||
} from "@yaakapp-internal/models";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { showAlert } from "../lib/alert";
|
|
||||||
import { showConfirmDelete } from "../lib/confirm";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { pluralizeCount } from "../lib/pluralize";
|
|
||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useDeleteSendHistory() {
|
|
||||||
const httpResponses = useAtomValue(httpResponsesAtom);
|
|
||||||
const grpcConnections = useAtomValue(grpcConnectionsAtom);
|
|
||||||
const websocketConnections = useAtomValue(websocketConnectionsAtom);
|
|
||||||
|
|
||||||
const labels = [
|
|
||||||
httpResponses.length > 0 ? pluralizeCount("Http Response", httpResponses.length) : null,
|
|
||||||
grpcConnections.length > 0 ? pluralizeCount("Grpc Connection", grpcConnections.length) : null,
|
|
||||||
websocketConnections.length > 0
|
|
||||||
? pluralizeCount("WebSocket Connection", websocketConnections.length)
|
|
||||||
: null,
|
|
||||||
].filter((l) => l != null);
|
|
||||||
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["delete_send_history", labels],
|
|
||||||
mutationFn: async () => {
|
|
||||||
if (labels.length === 0) {
|
|
||||||
showAlert({
|
|
||||||
id: "no-responses",
|
|
||||||
title: "Nothing to Delete",
|
|
||||||
body: "There is no Http, Grpc, or Websocket history",
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const confirmed = await showConfirmDelete({
|
|
||||||
id: "delete-send-history",
|
|
||||||
title: "Clear Send History",
|
|
||||||
description: <>Delete {labels.join(" and ")}?</>,
|
|
||||||
});
|
|
||||||
if (!confirmed) return false;
|
|
||||||
|
|
||||||
const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
|
|
||||||
await invokeCmd("cmd_delete_send_history", { workspaceId });
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
import type { Environment } from "@yaakapp-internal/models";
|
|
||||||
import { useKeyValue } from "./useKeyValue";
|
|
||||||
|
|
||||||
export function useEnvironmentValueVisibility(environment: Environment) {
|
|
||||||
return useKeyValue<boolean>({
|
|
||||||
namespace: "global",
|
|
||||||
key: ["environmentValueVisibility", environment.workspaceId],
|
|
||||||
fallback: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
import { workspacesAtom } from "@yaakapp-internal/models";
|
|
||||||
import { ExportDataDialog } from "../components/ExportDataDialog";
|
|
||||||
import { showAlert } from "../lib/alert";
|
|
||||||
import { showDialog } from "../lib/dialog";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { showToast } from "../lib/toast";
|
|
||||||
import { activeWorkspaceAtom } from "./useActiveWorkspace";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useExportData() {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["export_data"],
|
|
||||||
onError: (err: string) => {
|
|
||||||
showAlert({ id: "export-failed", title: "Export Failed", body: err });
|
|
||||||
},
|
|
||||||
mutationFn: async () => {
|
|
||||||
const activeWorkspace = jotaiStore.get(activeWorkspaceAtom);
|
|
||||||
const workspaces = jotaiStore.get(workspacesAtom);
|
|
||||||
|
|
||||||
if (activeWorkspace == null || workspaces.length === 0) return;
|
|
||||||
|
|
||||||
showDialog({
|
|
||||||
id: "export-data",
|
|
||||||
title: "Export Data",
|
|
||||||
size: "md",
|
|
||||||
noPadding: true,
|
|
||||||
render: ({ hide }) => (
|
|
||||||
<ExportDataDialog
|
|
||||||
onHide={hide}
|
|
||||||
onSuccess={() => {
|
|
||||||
showToast({
|
|
||||||
color: "success",
|
|
||||||
message: "Data export successful",
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { activeWorkspaceAtom } from "./useActiveWorkspace";
|
|
||||||
import { useKeyValue } from "./useKeyValue";
|
|
||||||
|
|
||||||
export function useFloatingSidebarHidden() {
|
|
||||||
const activeWorkspace = useAtomValue(activeWorkspaceAtom);
|
|
||||||
const { set, value } = useKeyValue<boolean>({
|
|
||||||
namespace: "no_sync",
|
|
||||||
key: ["floating_sidebar_hidden", activeWorkspace?.id ?? "n/a"],
|
|
||||||
fallback: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
return [value, set] as const;
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
import { useMutation, useQuery } from "@tanstack/react-query";
|
|
||||||
import { emit } from "@tauri-apps/api/event";
|
|
||||||
import type { GrpcConnection, GrpcRequest } from "@yaakapp-internal/models";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
import { minPromiseMillis } from "../lib/minPromiseMillis";
|
|
||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
import { activeEnvironmentIdAtom, useActiveEnvironment } from "./useActiveEnvironment";
|
|
||||||
import { useDebouncedValue } from "@yaakapp-internal/ui";
|
|
||||||
|
|
||||||
export interface ReflectResponseService {
|
|
||||||
name: string;
|
|
||||||
methods: { name: string; schema: string; serverStreaming: boolean; clientStreaming: boolean }[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useGrpc(
|
|
||||||
req: GrpcRequest | null,
|
|
||||||
conn: GrpcConnection | null,
|
|
||||||
protoFiles: string[],
|
|
||||||
) {
|
|
||||||
const requestId = req?.id ?? "n/a";
|
|
||||||
const environment = useActiveEnvironment();
|
|
||||||
|
|
||||||
const go = useMutation<void, string>({
|
|
||||||
mutationKey: ["grpc_go", conn?.id],
|
|
||||||
mutationFn: () =>
|
|
||||||
invokeCmd<void>("cmd_grpc_go", { requestId, environmentId: environment?.id, protoFiles }),
|
|
||||||
});
|
|
||||||
|
|
||||||
const send = useMutation({
|
|
||||||
mutationKey: ["grpc_send", conn?.id],
|
|
||||||
mutationFn: ({ message }: { message: string }) =>
|
|
||||||
emit(`grpc_client_msg_${conn?.id ?? "none"}`, { Message: message }),
|
|
||||||
});
|
|
||||||
|
|
||||||
const cancel = useMutation({
|
|
||||||
mutationKey: ["grpc_cancel", conn?.id ?? "n/a"],
|
|
||||||
mutationFn: () => emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Cancel"),
|
|
||||||
});
|
|
||||||
|
|
||||||
const commit = useMutation({
|
|
||||||
mutationKey: ["grpc_commit", conn?.id ?? "n/a"],
|
|
||||||
mutationFn: () => emit(`grpc_client_msg_${conn?.id ?? "none"}`, "Commit"),
|
|
||||||
});
|
|
||||||
|
|
||||||
const debouncedUrl = useDebouncedValue<string>(req?.url ?? "", 1000);
|
|
||||||
|
|
||||||
const reflect = useQuery<ReflectResponseService[], string>({
|
|
||||||
enabled: req != null,
|
|
||||||
queryKey: ["grpc_reflect", req?.id ?? "n/a", debouncedUrl, protoFiles],
|
|
||||||
staleTime: Infinity,
|
|
||||||
refetchOnMount: false,
|
|
||||||
refetchOnWindowFocus: false,
|
|
||||||
refetchOnReconnect: false,
|
|
||||||
queryFn: () => {
|
|
||||||
const environmentId = jotaiStore.get(activeEnvironmentIdAtom);
|
|
||||||
return minPromiseMillis<ReflectResponseService[]>(
|
|
||||||
invokeCmd("cmd_grpc_reflect", { requestId, protoFiles, environmentId }),
|
|
||||||
300,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
go,
|
|
||||||
reflect,
|
|
||||||
cancel,
|
|
||||||
commit,
|
|
||||||
isStreaming: conn != null && conn.state !== "closed",
|
|
||||||
send,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core";
|
|
||||||
import type { HttpResponse, HttpResponseEvent } from "@yaakapp-internal/models";
|
|
||||||
import {
|
|
||||||
httpResponseEventsAtom,
|
|
||||||
mergeModelsInStore,
|
|
||||||
replaceModelsInStore,
|
|
||||||
} from "@yaakapp-internal/models";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { useEffect } from "react";
|
|
||||||
import { fireAndForget } from "../lib/fireAndForget";
|
|
||||||
|
|
||||||
export function useHttpResponseEvents(response: HttpResponse | null) {
|
|
||||||
const allEvents = useAtomValue(httpResponseEventsAtom);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (response?.id == null) {
|
|
||||||
replaceModelsInStore("http_response_event", []);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fetch events from database, filtering out events from other responses and merging atomically
|
|
||||||
fireAndForget(
|
|
||||||
invoke<HttpResponseEvent[]>("cmd_get_http_response_events", { responseId: response.id }).then(
|
|
||||||
(events) =>
|
|
||||||
mergeModelsInStore("http_response_event", events, (e) => e.responseId === response.id),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}, [response?.id]);
|
|
||||||
|
|
||||||
const events = allEvents.filter((e) => e.responseId === response?.id);
|
|
||||||
return { data: events, error: null, isLoading: false };
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import { installPluginFromDirectory } from "@yaakapp-internal/plugins";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useInstallPlugin() {
|
|
||||||
return useFastMutation<void, unknown, string>({
|
|
||||||
mutationKey: ["install_plugin"],
|
|
||||||
mutationFn: async (directory: string) => {
|
|
||||||
await installPluginFromDirectory(directory);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
|
|
||||||
import type { ModelPayload } from "@yaakapp-internal/models";
|
|
||||||
import { atom, useAtomValue } from "jotai";
|
|
||||||
import { generateId } from "../lib/generateId";
|
|
||||||
import { jotaiStore } from "../lib/jotai";
|
|
||||||
|
|
||||||
const requestUpdateKeyAtom = atom<Record<string, string>>({});
|
|
||||||
|
|
||||||
getCurrentWebviewWindow()
|
|
||||||
.listen<ModelPayload>("model_write", ({ payload }) => {
|
|
||||||
if (payload.change.type !== "upsert") return;
|
|
||||||
|
|
||||||
if (
|
|
||||||
(payload.model.model === "http_request" ||
|
|
||||||
payload.model.model === "grpc_request" ||
|
|
||||||
payload.model.model === "websocket_request") &&
|
|
||||||
((payload.updateSource.type === "window" &&
|
|
||||||
payload.updateSource.label !== getCurrentWebviewWindow().label) ||
|
|
||||||
payload.updateSource.type !== "window")
|
|
||||||
) {
|
|
||||||
wasUpdatedExternally(payload.model.id);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(console.error);
|
|
||||||
|
|
||||||
export function wasUpdatedExternally(changedRequestId: string) {
|
|
||||||
jotaiStore.set(requestUpdateKeyAtom, (m) => ({ ...m, [changedRequestId]: generateId() }));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useRequestUpdateKey(requestId: string | null) {
|
|
||||||
const keys = useAtomValue(requestUpdateKeyAtom);
|
|
||||||
const key = keys[requestId ?? "n/a"];
|
|
||||||
return `${requestId}::${key ?? "default"}`;
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
import { settingsAtom } from "@yaakapp-internal/models";
|
|
||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { resolveAppearance } from "../lib/theme/appearance";
|
|
||||||
import { usePreferredAppearance } from "./usePreferredAppearance";
|
|
||||||
|
|
||||||
export function useResolvedAppearance() {
|
|
||||||
const preferredAppearance = usePreferredAppearance();
|
|
||||||
const settings = useAtomValue(settingsAtom);
|
|
||||||
return resolveAppearance(preferredAppearance, settings.appearance);
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { useQuery } from "@tanstack/react-query";
|
|
||||||
import type { HttpResponse } from "@yaakapp-internal/models";
|
|
||||||
import type { ServerSentEvent } from "@yaakapp-internal/sse";
|
|
||||||
import { getResponseBodyEventSource } from "../lib/responseBody";
|
|
||||||
|
|
||||||
export function useResponseBodyEventSource(response: HttpResponse) {
|
|
||||||
return useQuery<ServerSentEvent[]>({
|
|
||||||
placeholderData: (prev) => prev, // Keep previous data on refetch
|
|
||||||
queryKey: ["response-body-event-source", response.id, response.contentLength],
|
|
||||||
queryFn: () => getResponseBodyEventSource(response),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import { useLocalStorage } from "react-use";
|
|
||||||
|
|
||||||
const DEFAULT_VIEW_MODE = "pretty";
|
|
||||||
|
|
||||||
export function useResponseViewMode(requestId?: string): [string, (m: "pretty" | "raw") => void] {
|
|
||||||
const [value, setValue] = useLocalStorage<"pretty" | "raw">(`response_view_mode::${requestId}`);
|
|
||||||
return [value ?? DEFAULT_VIEW_MODE, setValue];
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import { save } from "@tauri-apps/plugin-dialog";
|
|
||||||
import type { HttpResponse } from "@yaakapp-internal/models";
|
|
||||||
import { getModel } from "@yaakapp-internal/models";
|
|
||||||
import mime from "mime";
|
|
||||||
import slugify from "slugify";
|
|
||||||
import { InlineCode } from "@yaakapp-internal/ui";
|
|
||||||
import { getContentTypeFromHeaders } from "../lib/model_util";
|
|
||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
import { showToast } from "../lib/toast";
|
|
||||||
import { useFastMutation } from "./useFastMutation";
|
|
||||||
|
|
||||||
export function useSaveResponse(response: HttpResponse) {
|
|
||||||
return useFastMutation({
|
|
||||||
mutationKey: ["save_response", response.id],
|
|
||||||
mutationFn: async () => {
|
|
||||||
const request = getModel("http_request", response.requestId);
|
|
||||||
if (request == null) return null;
|
|
||||||
|
|
||||||
const contentType = getContentTypeFromHeaders(response.headers) ?? "unknown";
|
|
||||||
const ext = mime.getExtension(contentType);
|
|
||||||
const slug = slugify(request.name || "response", { lower: true });
|
|
||||||
const filepath = await save({
|
|
||||||
defaultPath: ext ? `${slug}.${ext}` : slug,
|
|
||||||
title: "Save Response",
|
|
||||||
});
|
|
||||||
await invokeCmd("cmd_save_response", { responseId: response.id, filepath });
|
|
||||||
showToast({
|
|
||||||
message: (
|
|
||||||
<>
|
|
||||||
Response saved to <InlineCode>{filepath}</InlineCode>
|
|
||||||
</>
|
|
||||||
),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { useAtomValue } from "jotai";
|
|
||||||
import { activeWorkspaceIdAtom } from "./useActiveWorkspace";
|
|
||||||
import { useKeyValue } from "./useKeyValue";
|
|
||||||
|
|
||||||
export function useSidebarHidden() {
|
|
||||||
const activeWorkspaceId = useAtomValue(activeWorkspaceIdAtom);
|
|
||||||
const { set, value } = useKeyValue<boolean>({
|
|
||||||
namespace: "no_sync",
|
|
||||||
key: ["sidebar_hidden", activeWorkspaceId ?? "n/a"],
|
|
||||||
fallback: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
return [value, set] as const;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import { type } from "@tauri-apps/plugin-os";
|
|
||||||
import { useIsFullscreen } from "@yaakapp-internal/ui";
|
|
||||||
|
|
||||||
export function useStoplightsVisible() {
|
|
||||||
const fullscreen = useIsFullscreen();
|
|
||||||
const stoplightsVisible = type() === "macos" && !fullscreen;
|
|
||||||
return stoplightsVisible;
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
import { useHotKey } from "./useHotKey";
|
|
||||||
import { useListenToTauriEvent } from "./useListenToTauriEvent";
|
|
||||||
import { useZoom } from "./useZoom";
|
|
||||||
|
|
||||||
export function useSyncZoomSetting() {
|
|
||||||
// Handle Zoom.
|
|
||||||
// Note, Mac handles it in the app menu, so need to also handle keyboard
|
|
||||||
// shortcuts for Windows/Linux
|
|
||||||
const zoom = useZoom();
|
|
||||||
useHotKey("app.zoom_in", zoom.zoomIn);
|
|
||||||
useListenToTauriEvent("zoom_in", zoom.zoomIn);
|
|
||||||
useHotKey("app.zoom_out", zoom.zoomOut);
|
|
||||||
useListenToTauriEvent("zoom_out", zoom.zoomOut);
|
|
||||||
useHotKey("app.zoom_reset", zoom.zoomReset);
|
|
||||||
useListenToTauriEvent("zoom_reset", zoom.zoomReset);
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import { useQuery } from "@tanstack/react-query";
|
|
||||||
import type { Tokens } from "@yaakapp-internal/templates";
|
|
||||||
import { invokeCmd } from "../lib/tauri";
|
|
||||||
|
|
||||||
export function useTemplateTokensToString(tokens: Tokens) {
|
|
||||||
return useQuery<string>({
|
|
||||||
refetchOnWindowFocus: false,
|
|
||||||
queryKey: ["template_tokens_to_string", tokens],
|
|
||||||
queryFn: () => templateTokensToString(tokens),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function templateTokensToString(tokens: Tokens): Promise<string> {
|
|
||||||
return invokeCmd("cmd_template_tokens_to_string", { tokens });
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user