fix(providers): import helpers, declare oauth state, drop conflict marker
This commit is contained in:
@@ -19,8 +19,10 @@ import {
|
|||||||
import { toast } from '@/components/ui';
|
import { toast } from '@/components/ui';
|
||||||
import { Icon } from "@/components/icon/Icon";
|
import { Icon } from "@/components/icon/Icon";
|
||||||
import type { IconName } from "@/components/icon/icons";
|
import type { IconName } from "@/components/icon/icons";
|
||||||
|
import { reloadOpenCodeConfiguration } from '@/stores/useAgentsStore';
|
||||||
import { noteDeferredRestartFromPayload, recordDeferredOpenCodeRestart } from '@/lib/opencode/deferredRestart';
|
import { noteDeferredRestartFromPayload, recordDeferredOpenCodeRestart } from '@/lib/opencode/deferredRestart';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { copyTextToClipboard } from '@/lib/clipboard';
|
||||||
import type { ModelMetadata } from '@/types';
|
import type { ModelMetadata } from '@/types';
|
||||||
import { getCurrentIntlLocale, useI18n } from '@/lib/i18n';
|
import { getCurrentIntlLocale, useI18n } from '@/lib/i18n';
|
||||||
import { runtimeFetch } from '@/lib/runtime-fetch';
|
import { runtimeFetch } from '@/lib/runtime-fetch';
|
||||||
@@ -164,6 +166,8 @@ export const ProvidersPage: React.FC = () => {
|
|||||||
const [authMethodsByProvider, setAuthMethodsByProvider] = React.useState<Record<string, AuthMethod[]>>({});
|
const [authMethodsByProvider, setAuthMethodsByProvider] = React.useState<Record<string, AuthMethod[]>>({});
|
||||||
const [authLoading, setAuthLoading] = React.useState(false);
|
const [authLoading, setAuthLoading] = React.useState(false);
|
||||||
const [apiKeyInputs, setApiKeyInputs] = React.useState<Record<string, string>>({});
|
const [apiKeyInputs, setApiKeyInputs] = React.useState<Record<string, string>>({});
|
||||||
|
const [oauthCodes, setOauthCodes] = React.useState<Record<string, string>>({});
|
||||||
|
const [pendingOAuth, setPendingOAuth] = React.useState<{ providerId: string; methodIndex: number } | null>(null);
|
||||||
const [authBusyKey, setAuthBusyKey] = React.useState<string | null>(null);
|
const [authBusyKey, setAuthBusyKey] = React.useState<string | null>(null);
|
||||||
const [modelQuery, setModelQuery] = React.useState('');
|
const [modelQuery, setModelQuery] = React.useState('');
|
||||||
const [availableProviders, setAvailableProviders] = React.useState<ProviderOption[]>([]);
|
const [availableProviders, setAvailableProviders] = React.useState<ProviderOption[]>([]);
|
||||||
@@ -577,7 +581,6 @@ export const ProvidersPage: React.FC = () => {
|
|||||||
}
|
}
|
||||||
console.error('Failed to copy device code:', result.error);
|
console.error('Failed to copy device code:', result.error);
|
||||||
toast.error(t('settings.providers.page.toast.deviceCodeCopyFailed'));
|
toast.error(t('settings.providers.page.toast.deviceCodeCopyFailed'));
|
||||||
>>>>>>> e7ca14b2b (fix(providers): refresh credentials after auth save)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleDisconnectProvider = async (providerId: string) => {
|
const handleDisconnectProvider = async (providerId: string) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user