Skip to content

Commit

Permalink
Update settings input UX (#145)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjreinhart authored Jul 19, 2024
1 parent e62b980 commit 2cae453
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
2 changes: 2 additions & 0 deletions packages/web/src/routes/secrets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ function Secrets() {
const { secrets } = useLoaderData() as { secrets: Record<string, string> };

const [error, _setError] = useState<string | null>(null);

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const timeoutRef = useRef<any>(null);

function setError(message: string | null, clearAfter: number | null = null) {
Expand Down
19 changes: 14 additions & 5 deletions packages/web/src/routes/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react';
import { disk, getConfig, updateConfig } from '@/lib/server';
import { type CodeLanguageType } from '@srcbook/shared';
import type { SettingsType, FsObjectResultType } from '@/types';
import { useLoaderData } from 'react-router-dom';
import { useLoaderData, useRevalidator } from 'react-router-dom';
import { DirPicker } from '@/components/file-picker';
import {
Select,
Expand Down Expand Up @@ -44,19 +44,28 @@ function Settings() {
enabledAnalytics: configEnabledAnalytics,
} = useLoaderData() as SettingsType & FsObjectResultType;

const [openaiKey, setOpenaiKey] = useState(configOpenaiKey);
const revalidator = useRevalidator();

const [openaiKey, setOpenaiKey] = useState<string>(configOpenaiKey ?? '');
const [enabledAnalytics, setEnabledAnalytics] = useState(configEnabledAnalytics);

const updateDefaultLanguage = async (value: CodeLanguageType) => {
await updateConfig({ defaultLanguage: value });
const updateDefaultLanguage = (value: CodeLanguageType) => {
updateConfig({ defaultLanguage: value });
};

const updateOpenaiKey = async () => {
await updateConfig({ openaiKey });
revalidator.revalidate();
};

const { theme, toggleTheme } = useTheme();

// Either the key from the server is null/undefined and the user entered input
// or the key from the server is a string and the user entered input is different.
const openaiKeySaveEnabled =
(typeof configOpenaiKey === 'string' && openaiKey !== configOpenaiKey) ||
((configOpenaiKey === null || configOpenaiKey === undefined) && openaiKey.length > 0);

return (
<div>
<h1 className="text-4xl pb-4">Settings</h1>
Expand Down Expand Up @@ -115,7 +124,7 @@ function Settings() {
value={openaiKey}
onChange={(e) => setOpenaiKey(e.target.value)}
/>
<Button className="px-5" onClick={updateOpenaiKey}>
<Button className="px-5" onClick={updateOpenaiKey} disabled={!openaiKeySaveEnabled}>
Save
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface FsObjectResultType {
export type SettingsType = {
baseDir: string;
defaultLanguage: CodeLanguageType;
openaiKey?: string;
openaiKey?: string | null;
enabledAnalytics: boolean;
};

Expand Down

0 comments on commit 2cae453

Please sign in to comment.