Skip to content

fix: stop metadata queries from short-circuiting #10312

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

fix: stop metadata queries from short-circuiting #10312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d378aa
fix: prevent metadata queries from short-circuiting
Parkreiner Oct 17, 2023
669fcbd
fix: use correct type definitions
Parkreiner Oct 17, 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
fix: use correct type definitions
  • Loading branch information
@Parkreiner
Parkreiner committed Oct 17, 2023
commit 669fcbd8163e9386779f4e8ecbd7dee289534e5c
4 changes: 2 additions & 2 deletions site/src/api/queries/appearance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryClient, type QueryOptions } from "react-query";
import { QueryClient, type UseQueryOptions } from "react-query";
import * as API from "api/api";
import { type AppearanceConfig } from "api/typesGenerated";
import { getMetadataAsJSON } from "utils/metadata";
Expand All @@ -17,7 +17,7 @@ export const appearance = (queryClient: QueryClient) => {

return API.getAppearance();
},
} satisfies QueryOptions<AppearanceConfig>;
} satisfies UseQueryOptions<AppearanceConfig>;
};

export const updateAppearance = (queryClient: QueryClient) => {
Expand Down
4 changes: 2 additions & 2 deletions site/src/api/queries/experiments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as API from "api/api";
import { getMetadataAsJSON } from "utils/metadata";
import { type Experiments } from "api/typesGenerated";
import { QueryClient, type QueryOptions } from "react-query";
import { QueryClient, type UseQueryOptions } from "react-query";

const initialExperimentsData = getMetadataAsJSON<Experiments>("experiments");
const experimentsKey = ["experiments"] as const;
Expand All @@ -17,5 +17,5 @@ export const experiments = (queryClient: QueryClient) => {

return API.getExperiments();
},
} satisfies QueryOptions<Experiments>;
} satisfies UseQueryOptions<Experiments>;
};
6 changes: 3 additions & 3 deletions site/src/api/queries/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryClient, QueryOptions } from "react-query";
import { QueryClient, type UseQueryOptions } from "react-query";
import * as API from "api/api";
import {
AuthorizationRequest,
Expand All @@ -11,7 +11,7 @@ import {
import { getMetadataAsJSON } from "utils/metadata";
import { getAuthorizationKey } from "./authCheck";

export const users = (req: UsersRequest): QueryOptions<GetUsersResponse> => {
export const users = (req: UsersRequest): UseQueryOptions<GetUsersResponse> => {
return {
queryKey: ["users", req],
queryFn: ({ signal }) => API.getUsers(req, signal),
Expand Down Expand Up @@ -103,7 +103,7 @@ export const me = (queryClient: QueryClient) => {

return API.getAuthenticatedUser();
},
} satisfies QueryOptions<User>;
} satisfies UseQueryOptions<User>;
};

export const hasFirstUser = () => {
Expand Down