-
Notifications
You must be signed in to change notification settings - Fork 455
feat: [ENG-2784] add WebUI cancel button to task list rows and detail… #693
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import {useMutation} from '@tanstack/react-query' | ||
|
|
||
| import type {MutationConfig} from '../../../lib/react-query' | ||
|
|
||
| import { | ||
| type TaskCancelRequest, | ||
| type TaskCancelResponse, | ||
| TaskEvents, | ||
| } from '../../../../shared/transport/events/task-events' | ||
| import {useTransportStore} from '../../../stores/transport-store' | ||
|
|
||
| export const cancelTask = async (payload: TaskCancelRequest): Promise<TaskCancelResponse> => { | ||
| const {apiClient} = useTransportStore.getState() | ||
| if (!apiClient) throw new Error('Not connected') | ||
|
|
||
| const response = await apiClient.request<TaskCancelResponse, TaskCancelRequest>(TaskEvents.CANCEL, payload) | ||
| if (!response.success) throw new Error(response.error ?? 'Cancel failed') | ||
| return response | ||
| } | ||
|
|
||
| type UseCancelTaskOptions = { | ||
| mutationConfig?: MutationConfig<typeof cancelTask> | ||
| } | ||
|
|
||
| export const useCancelTask = ({mutationConfig}: UseCancelTaskOptions = {}) => | ||
| useMutation({ | ||
| ...mutationConfig, | ||
| mutationFn: cancelTask, | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import type {TaskListItemStatus} from '../../../../shared/transport/events/task-events' | ||
|
|
||
| import {isTerminalStatus} from './task-status' | ||
|
|
||
| export type RowActionKind = 'cancel' | 'delete' | ||
|
|
||
| export function rowActionKind(status: TaskListItemStatus): RowActionKind { | ||
| return isTerminalStatus(status) ? 'delete' : 'cancel' | ||
| } | ||
|
ncnthien marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import {expect} from 'chai' | ||
| import {createSandbox, type SinonSandbox, type SinonStub} from 'sinon' | ||
|
|
||
| import type {BrvApiClient} from '../../../../../../src/webui/lib/api-client.js' | ||
|
|
||
| import {TaskEvents} from '../../../../../../src/shared/transport/events/task-events.js' | ||
| import {cancelTask} from '../../../../../../src/webui/features/tasks/api/cancel-task.js' | ||
| import {useTransportStore} from '../../../../../../src/webui/stores/transport-store.js' | ||
|
|
||
| describe('cancelTask', () => { | ||
| let sandbox: SinonSandbox | ||
| let request: SinonStub | ||
|
|
||
| beforeEach(() => { | ||
| sandbox = createSandbox() | ||
| request = sandbox.stub() | ||
| useTransportStore.setState({ | ||
| apiClient: {on: sandbox.stub(), request} as unknown as BrvApiClient, | ||
| }) | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
| sandbox.restore() | ||
| useTransportStore.setState({apiClient: null}) | ||
| }) | ||
|
|
||
| it('emits task:cancel with the taskId payload', async () => { | ||
| request.resolves({success: true}) | ||
| await cancelTask({taskId: 'tsk-1'}) | ||
| expect(request.firstCall.args[0]).to.equal(TaskEvents.CANCEL) | ||
| expect(request.firstCall.args[1]).to.deep.equal({taskId: 'tsk-1'}) | ||
| }) | ||
|
|
||
| it('resolves with the daemon response on success', async () => { | ||
| request.resolves({success: true}) | ||
| const result = await cancelTask({taskId: 'tsk-1'}) | ||
| expect(result).to.deep.equal({success: true}) | ||
| }) | ||
|
|
||
| it('throws when the daemon returns success: false', async () => { | ||
| request.resolves({error: 'Task not found', success: false}) | ||
| try { | ||
| await cancelTask({taskId: 'tsk-1'}) | ||
| expect.fail('expected to throw') | ||
| } catch (error) { | ||
| expect((error as Error).message).to.equal('Task not found') | ||
| } | ||
| }) | ||
|
|
||
| it('falls back to "Cancel failed" when success: false has no error string', async () => { | ||
| request.resolves({success: false}) | ||
| try { | ||
| await cancelTask({taskId: 'tsk-1'}) | ||
| expect.fail('expected to throw') | ||
| } catch (error) { | ||
| expect((error as Error).message).to.equal('Cancel failed') | ||
| } | ||
| }) | ||
|
|
||
| it('throws when not connected to the daemon', async () => { | ||
| useTransportStore.setState({apiClient: null}) | ||
| try { | ||
| await cancelTask({taskId: 'tsk-1'}) | ||
| expect.fail('expected to throw') | ||
| } catch (error) { | ||
| expect((error as Error).message).to.equal('Not connected') | ||
| } | ||
| }) | ||
| }) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.