Skip to content

feat: add warning message when trying to delete active template #10142

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 10 commits into from
Oct 10, 2023
Merged

feat: add warning message when trying to delete active template #10142

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b1ae14
refactor: clean up TemplatePageHeader
Parkreiner Oct 9, 2023
3349176
chore: add react query configs for workspace lists
Parkreiner Oct 9, 2023
5604a0d
feat: add delete-intercept functionality
Parkreiner Oct 9, 2023
8f50beb
refactor: improve readability
Parkreiner Oct 9, 2023
eac4164
refactor: rename entities for readability/accuracy
Parkreiner Oct 9, 2023
1cc2935
refactor: clean up variable names again
Parkreiner Oct 9, 2023
8b6653d
refactor: remove redudant function calls
Parkreiner Oct 9, 2023
164227e
fix: update logic check for safe deletions
Parkreiner Oct 9, 2023
bf2394e
fix: update workspaces query logic
Parkreiner Oct 9, 2023
fd220d9
fix: update call site for workspaces key
Parkreiner Oct 9, 2023
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: update workspaces query logic
  • Loading branch information
@Parkreiner
Parkreiner committed Oct 9, 2023
commit bf2394ed22f1512b9083ffef351a204b159ec890
20 changes: 14 additions & 6 deletions site/src/api/queries/workspaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
import * as API from "api/api";
import { type WorkspacesResponse } from "api/typesGenerated";
import { type QueryOptions } from "react-query";
import {
type WorkspacesResponse,
type WorkspacesRequest,
} from "api/typesGenerated";

export function workspacesByQueryKey(query: string) {
return ["workspaces", query] as const;
export function workspacesKey(config: WorkspacesRequest = {}) {
const { q, limit } = config;
return ["workspaces", { q, limit }] as const;
}

export function workspacesByQuery(query: string) {
export function workspaces(config: WorkspacesRequest = {}) {
// Duplicates some of the work from workspacesKey, but that felt better than
// letting invisible properties sneak into the query logic
const { q, limit } = config;

return {
queryKey: workspacesByQueryKey(query),
queryFn: () => API.getWorkspaces({ q: query }),
queryKey: workspacesKey(config),
queryFn: () => API.getWorkspaces({ q, limit }),
} as const satisfies QueryOptions<WorkspacesResponse>;
}