Skip to content

chore(site): migrate a few services to react-query used in the DashboardProvider #9667

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 21 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Refactor build info
  • Loading branch information
BrunoQuaresma committed Sep 11, 2023
commit 7560d99294002c4c4eb7c3618fe88c6392c1a89d
24 changes: 24 additions & 0 deletions site/src/api/queries/buildInfo.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { useQuery } from "@tanstack/react-query";
import * as API from "api/api";

export const useBuildInfo = () => {
return useQuery({
queryKey: ["buildInfo"],
queryFn: fetchBuildInfo,
});
};

const fetchBuildInfo = async () => {
// Build info is injected by the Coder server into the HTML document.
const buildInfo = document.querySelector("meta[property=build-info]");
if (buildInfo) {
const rawContent = buildInfo.getAttribute("content");
try {
return JSON.parse(rawContent as string);
} catch (e) {
console.warn("Failed to parse build info from document", e);
}
}

return API.getBuildInfo();
};
10 changes: 5 additions & 5 deletions site/src/components/Dashboard/DashboardProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useMachine } from "@xstate/react";
import { useBuildInfo } from "api/queries/buildInfo";
import {
AppearanceConfig,
BuildInfoResponse,
Expand All @@ -8,7 +9,6 @@ import {
import { FullScreenLoader } from "components/Loader/FullScreenLoader";
import { createContext, FC, PropsWithChildren, useContext } from "react";
import { appearanceMachine } from "xServices/appearance/appearanceXService";
import { buildInfoMachine } from "xServices/buildInfo/buildInfoXService";
import { entitlementsMachine } from "xServices/entitlements/entitlementsXService";
import { experimentsMachine } from "xServices/experiments/experimentsMachine";

Expand All @@ -31,15 +31,15 @@ export const DashboardProviderContext = createContext<
>(undefined);

export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
const [buildInfoState] = useMachine(buildInfoMachine);
const buildInfoQuery = useBuildInfo();
const [entitlementsState] = useMachine(entitlementsMachine);
const [appearanceState, appearanceSend] = useMachine(appearanceMachine);
const [experimentsState] = useMachine(experimentsMachine);
const { buildInfo } = buildInfoState.context;
const { entitlements } = entitlementsState.context;
const { appearance, preview } = appearanceState.context;
const { experiments } = experimentsState.context;
const isLoading = !buildInfo || !entitlements || !appearance || !experiments;
const isLoading =
!buildInfoQuery.data || !entitlements || !appearance || !experiments;

const setAppearancePreview = (config: AppearanceConfig) => {
appearanceSend({
Expand All @@ -62,7 +62,7 @@ export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
return (
<DashboardProviderContext.Provider
value={{
buildInfo,
buildInfo: buildInfoQuery.data,
entitlements,
experiments,
appearance: {
Expand Down
88 changes: 0 additions & 88 deletions site/src/xServices/buildInfo/buildInfoXService.ts

This file was deleted.