Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 4 additions & 4 deletions openless-all/app/src/components/FloatingShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { getHotkeyTriggerLabel } from '../lib/hotkey';
import { getCredentials, openExternal } from '../lib/ipc';
import { OL_DATA } from '../lib/mockData';
import {
PROVIDER_SETUP_PROMPT_SEEN_KEY,
PROVIDER_SETUP_PROMPT_DEFERRED_KEY,
shouldShowProviderSetupPrompt,
} from '../lib/providerSetup';
import type { SettingsSectionId } from '../pages/Settings';
Expand Down Expand Up @@ -70,8 +70,8 @@ function FloatingShellBody({ os, initialTab, initialSettings }: { os: OS; initia
let cancelled = false;
(async () => {
const credentials = await getCredentials();
const promptSeenValue = window.localStorage.getItem(PROVIDER_SETUP_PROMPT_SEEN_KEY);
if (!cancelled && shouldShowProviderSetupPrompt(credentials, promptSeenValue)) {
const promptDeferredValue = window.sessionStorage.getItem(PROVIDER_SETUP_PROMPT_DEFERRED_KEY);
if (!cancelled && shouldShowProviderSetupPrompt(credentials, promptDeferredValue)) {
setProviderPromptOpen(true);
}
})();
Expand All @@ -81,7 +81,7 @@ function FloatingShellBody({ os, initialTab, initialSettings }: { os: OS; initia
}, []);

const rememberProviderPrompt = () => {
window.localStorage.setItem(PROVIDER_SETUP_PROMPT_SEEN_KEY, '1');
window.sessionStorage.setItem(PROVIDER_SETUP_PROMPT_DEFERRED_KEY, '1');
setProviderPromptOpen(false);
};

Expand Down
2 changes: 1 addition & 1 deletion openless-all/app/src/lib/providerSetup.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ assertEqual(
'1',
),
false,
'do not repeat first-run prompt after the user has seen it',
'do not repeat first-run prompt after the user has deferred it in this session',
);

assertEqual(
Expand Down
6 changes: 3 additions & 3 deletions openless-all/app/src/lib/providerSetup.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { CredentialsStatus } from './types';

export const PROVIDER_SETUP_PROMPT_SEEN_KEY = 'ol.providerSetupPromptSeen';
export const PROVIDER_SETUP_PROMPT_DEFERRED_KEY = 'ol.providerSetupPromptDeferredThisSession';

export function areProvidersConfigured(credentials: CredentialsStatus): boolean {
return credentials.volcengineConfigured && credentials.arkConfigured;
}

export function shouldShowProviderSetupPrompt(
credentials: CredentialsStatus,
promptSeenValue: string | null,
promptDeferredValue: string | null,
): boolean {
return !areProvidersConfigured(credentials) && promptSeenValue !== '1';
return !areProvidersConfigured(credentials) && promptDeferredValue !== '1';
}
Loading