Skip to content

feat: Allow user to cancel workspace jobs #5115

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.

Sign up for GitHub

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 19 commits into from
Nov 21, 2022
Merged

feat: Allow user to cancel workspace jobs #5115

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4dcbf5c
Add database column allow_user_cancel_workspace_jobs
mtojek Nov 17, 2022
400413e
Adjust API
mtojek Nov 17, 2022
7f8dcaa
site: typesGenerated.ts
mtojek Nov 17, 2022
3f76534
Expose template.allow_ in Workspaces API
mtojek Nov 17, 2022
64b8bf3
Fix: site tests
mtojek Nov 17, 2022
73431c9
Fix: make fmt/prettier
mtojek Nov 17, 2022
ba5c06b
Fix: enterprise
mtojek Nov 17, 2022
9be6b1f
Database tests
mtojek Nov 17, 2022
8579883
Add CLI tests
mtojek Nov 17, 2022
3fe5bef
Add checkbox
mtojek Nov 17, 2022
9a303b5
i18n
mtojek Nov 17, 2022
ba443eb
Logic: block cancelling
mtojek Nov 18, 2022
7d36b2d
Unit tests for conditional cancel
mtojek Nov 18, 2022
472fee8
Fix: message
mtojek Nov 18, 2022
056894a
Merge branch 'main' into 5035-allow-user-cancel
mtojek Nov 18, 2022
4ec5aab
Address PR comment
mtojek Nov 18, 2022
c215f5a
Address PR comments
mtojek Nov 21, 2022
69c544f
Merge branch 'main' into 5035-allow-user-cancel
mtojek Nov 21, 2022
4e5ee76
Fix: make
mtojek Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: enterprise
  • Loading branch information
@mtojek
mtojek committed Nov 17, 2022
commit ba5c06bf7677b5e0da6affafbf6e5bc25f0a3ee3
35 changes: 18 additions & 17 deletions enterprise/audit/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,24 @@ var AuditableResources = auditMap(map[any]map[string]Action{
"updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff.
},
&database.Template{}: {
"id": ActionTrack,
"created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff.
"updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff.
"organization_id": ActionIgnore, /// Never changes.
"deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired.
"name": ActionTrack,
"display_name": ActionTrack,
"provisioner": ActionTrack,
"active_version_id": ActionTrack,
"description": ActionTrack,
"icon": ActionTrack,
"default_ttl": ActionTrack,
"min_autostart_interval": ActionTrack,
"created_by": ActionTrack,
"is_private": ActionTrack,
"group_acl": ActionTrack,
"user_acl": ActionTrack,
"id": ActionTrack,
"created_at": ActionIgnore, // Never changes, but is implicit and not helpful in a diff.
"updated_at": ActionIgnore, // Changes, but is implicit and not helpful in a diff.
"organization_id": ActionIgnore, /// Never changes.
"deleted": ActionIgnore, // Changes, but is implicit when a delete event is fired.
"name": ActionTrack,
"display_name": ActionTrack,
"provisioner": ActionTrack,
"active_version_id": ActionTrack,
"description": ActionTrack,
"icon": ActionTrack,
"default_ttl": ActionTrack,
"min_autostart_interval": ActionTrack,
"created_by": ActionTrack,
"is_private": ActionTrack,
"group_acl": ActionTrack,
"user_acl": ActionTrack,
"allow_user_cancel_workspace_jobs": ActionTrack,
},
&database.TemplateVersion{}: {
"id": ActionTrack,
Expand Down