Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: Move deploy settings machine to the layout #5693

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
Jan 12, 2023
Merged

refactor: Move deploy settings machine to the layout #5693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff037c1
refactor: Move deploy settings machine to the layout
BrunoQuaresma Jan 12, 2023
2511d94
Merge branch 'main' into bq/refactor-deployment-settings-machine
BrunoQuaresma Jan 12, 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
14 changes: 3 additions & 11 deletions site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ import {
PropsWithChildren,
Suspense,
useContext,
useEffect,
FC,
} from "react"
import { useActor } from "@xstate/react"
import { XServiceContext } from "xServices/StateContext"
import { useMachine } from "@xstate/react"
import { Loader } from "components/Loader/Loader"
import { DeploymentConfig } from "api/typesGenerated"
import { deploymentConfigMachine } from "xServices/deploymentConfig/deploymentConfigMachine"

type DeploySettingsContextValue = { deploymentConfig: DeploymentConfig }

Expand All @@ -32,17 +31,10 @@ export const useDeploySettings = (): DeploySettingsContextValue => {
}

export const DeploySettingsLayout: FC<PropsWithChildren> = ({ children }) => {
const xServices = useContext(XServiceContext)
const [state, send] = useActor(xServices.deploymentConfigXService)
const [state] = useMachine(deploymentConfigMachine)
const styles = useStyles()
const { deploymentConfig } = state.context

useEffect(() => {
if (state.matches("idle")) {
send("LOAD")
}
}, [send, state])

return (
<Margins>
<Stack className={styles.wrapper} direction="row" spacing={6}>
Expand Down
4 changes: 0 additions & 4 deletions site/src/xServices/StateContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { ActorRefFrom } from "xstate"
import { authMachine } from "./auth/authXService"
import { buildInfoMachine } from "./buildInfo/buildInfoXService"
import { updateCheckMachine } from "./updateCheck/updateCheckXService"
import { deploymentConfigMachine } from "./deploymentConfig/deploymentConfigMachine"
import { entitlementsMachine } from "./entitlements/entitlementsXService"
import { appearanceMachine } from "./appearance/appearanceXService"

Expand All @@ -13,8 +12,6 @@ interface XServiceContextType {
buildInfoXService: ActorRefFrom<typeof buildInfoMachine>
entitlementsXService: ActorRefFrom<typeof entitlementsMachine>
appearanceXService: ActorRefFrom<typeof appearanceMachine>
// Since the info here is used by multiple deployment settings page and we don't want to refetch them every time
deploymentConfigXService: ActorRefFrom<typeof deploymentConfigMachine>
updateCheckXService: ActorRefFrom<typeof updateCheckMachine>
}

Expand All @@ -36,7 +33,6 @@ export const XServiceProvider: FC<{ children: ReactNode }> = ({ children }) => {
buildInfoXService: useInterpret(buildInfoMachine),
entitlementsXService: useInterpret(entitlementsMachine),
appearanceXService: useInterpret(appearanceMachine),
deploymentConfigXService: useInterpret(deploymentConfigMachine),
updateCheckXService: useInterpret(updateCheckMachine),
}}
>
Expand Down
16 changes: 5 additions & 11 deletions site/src/xServices/deploymentConfig/deploymentConfigMachine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const deploymentConfigMachine = createMachine(
{
id: "deploymentConfigMachine",
predictableActionArguments: true,
initial: "idle",

schema: {
context: {} as {
deploymentConfig?: DeploymentConfig
Expand All @@ -20,28 +20,22 @@ export const deploymentConfigMachine = createMachine(
},
},
tsTypes: {} as import("./deploymentConfigMachine.typegen").Typegen0,
initial: "loading",
states: {
idle: {
on: {
LOAD: {
target: "loading",
},
},
},
loading: {
invoke: {
src: "getDeploymentConfig",
onDone: {
target: "loaded",
target: "done",
actions: ["assignDeploymentConfig"],
},
onError: {
target: "idle",
target: "done",
actions: ["assignGetDeploymentConfigError"],
},
},
},
loaded: {
done: {
type: "final",
},
},
Expand Down