From d375020921e77a5f7c36510f3ed9dc6b63d6066e Mon Sep 17 00:00:00 2001 From: Pascal Breuninger <117151367+pascalbreuninger@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:39:02 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20Disable=20pro=20provider=20con?= =?UTF-8?q?figuration=20for=20pro=20providers=20that=20suppor=E2=80=A6"=20?= =?UTF-8?q?(#1451)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 28e8b51958ab46531b984d04d2c12114766aef09. --- desktop/src/lib/modals/useLoginProModal.tsx | 68 +++++---------------- 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/desktop/src/lib/modals/useLoginProModal.tsx b/desktop/src/lib/modals/useLoginProModal.tsx index ede569d3e..79fd273d5 100644 --- a/desktop/src/lib/modals/useLoginProModal.tsx +++ b/desktop/src/lib/modals/useLoginProModal.tsx @@ -1,5 +1,5 @@ import { BottomActionBar, BottomActionBarError, Form, useStreamingTerminal } from "@/components" -import { useProInstanceManager, useProInstances, useProvider, useProviders } from "@/contexts" +import { useProInstanceManager, useProInstances, useProviders } from "@/contexts" import { canHealthCheck, exists, useFormErrors } from "@/lib" import { Routes } from "@/routes" import { @@ -23,17 +23,14 @@ import { ModalHeader, ModalOverlay, Tooltip, - useDisclosure, VStack, + useDisclosure, } from "@chakra-ui/react" import { useCallback, useEffect, useMemo, useRef, useState } from "react" import { SubmitHandler, useForm } from "react-hook-form" import { useNavigate } from "react-router" import { ConfigureProviderOptionsForm, useSetupProvider } from "@/views/Providers" import { To } from "react-router-dom" -import { useQueryClient } from "@tanstack/react-query" -import { client } from "@/client" -import { QueryKeys } from "@/queryKeys" type TFormValues = { [FieldName.PRO_HOST]: string @@ -101,6 +98,17 @@ export function useLoginProModal() { const { proURLError } = useFormErrors(Object.values(FieldName), formState) + useEffect(() => { + if (login.status === "success") { + const providerID = login.provider?.config?.name + + if (!exists(providerID)) { + return + } + completeSetupProvider({ providerID, suggestedOptions }) + } + }, [completeSetupProvider, login.provider, login.status, suggestedOptions]) + const resetModal = useCallback( (checkDanglingProInstance: boolean = false) => { reset() @@ -159,54 +167,6 @@ export function useLoginProModal() { }, 0) }, [completeConfigureProvider, navigate, providers, proInstances, resetModal, state.providerID]) - const [provider] = useProvider(state.providerID) - - const supportsProFlow = useMemo(() => { - return canHealthCheck(provider?.config) - }, [provider]) - - const queryClient = useQueryClient() - - const saveAndSkipForm = useCallback(async () => { - if (!state.providerID) { - return - } - - ;( - await client.providers.configure(state.providerID, { - useAsDefaultProvider: true, - reuseMachine: false, - options: {}, - }) - ).unwrap() - - await queryClient.invalidateQueries(QueryKeys.PROVIDERS) - - completeFlow() - }, [queryClient, state.providerID, completeFlow]) - - useEffect(() => { - if (login.status === "success") { - const providerID = login.provider?.config?.name - - if (!exists(providerID)) { - return - } - completeSetupProvider({ providerID, suggestedOptions }) - - if (supportsProFlow) { - saveAndSkipForm() - } - } - }, [ - completeSetupProvider, - supportsProFlow, - saveAndSkipForm, - login.provider, - login.status, - suggestedOptions, - ]) - const modal = useMemo(() => { return ( )} - {!supportsProFlow && state.currentStep === "configure-provider" && ( + {state.currentStep === "configure-provider" && ( <>