diff --git a/app/components/Models.tsx b/app/components/Models.tsx index 2c56cae..d8fe467 100644 --- a/app/components/Models.tsx +++ b/app/components/Models.tsx @@ -1,7 +1,6 @@ -"use client"; -import React, { useState, useEffect } from 'react'; +import React, { useEffect, useState } from 'react'; -// Define all models that should be available. +// Sample modelList definition; replace this with your actual modelList const modelList = { 'Offline Fast': { model_type: 'local', @@ -169,62 +168,54 @@ const selectedAIFunction = [ const ModelSection: React.FC = () => { // Initialize state with value from localStorage or default to '' - const [selectedModelDropdown, setSelectedModelDropdown] = useState(''); - const [radioSelection, setRadioSelection] = useState("") + const [selectedModelDropdown, setSelectedModelDropdown] = useState('Offline Fast'); + const [radioSelection, setRadioSelection] = useState(""); const [activeSelectedAIFunction, setActiveSelectedAIFunction] = useState(''); const [currentSelectedAIFunction, setCurrentSelectedAIFunction] = useState(""); const [isOpenSourceMode, setIsOpenSourceMode] = useState(localStorage.getItem('openSourceMode') || "false") useEffect(() => { - var temp = localStorage.getItem("activeSelectedAIFunction") || "" - setActiveSelectedAIFunction(temp) + // Load initial values from localStorage + const temp = localStorage.getItem("activeSelectedAIFunction") || ""; + setActiveSelectedAIFunction(temp); + + // Check if localStorage keys exist, else set defaults if (!localStorage.getItem('selectedModelDropdown')) { - localStorage.setItem("selectedModelDropdown", "Offline Fast") + localStorage.setItem("selectedModelDropdown", "Offline Fast"); } - if (!localStorage.getItem("activeSelectedAIFunction")) { - setActiveSelectedAIFunction('Code') - localStorage.setItem('activeSelectedAIFunction', 'Code') - } + // Set the dropdown and selected AI function from localStorage + const storedSelectedModel = localStorage.getItem('selectedModelDropdown') as ModelKeys; + const storedActiveFunction = localStorage.getItem("activeSelectedAIFunction") || 'Code'; + + setSelectedModelDropdown(storedSelectedModel); + setCurrentSelectedAIFunction(storedActiveFunction); if (!localStorage.getItem("model")) { - localStorage.setItem("model", 'starcoder2') + localStorage.setItem("model", 'starcoder2'); } if (!localStorage.getItem("radioSelection")) { - localStorage.setItem("radioSelection", 'None') + localStorage.setItem("radioSelection", 'None'); } - if (!localStorage.getItem("type")) { - localStorage.setItem("type", 'local') - } - - const handleStorageChange = () => { - setSelectedModelDropdown(localStorage.getItem('selectedModelDropdown') || ''); - }; - - // Update immediately when localStorage changes - window.addEventListener('storage', handleStorageChange); - + // Load radio selection from localStorage setRadioSelection(localStorage.getItem('radioSelection') || ''); - setSelectedModelDropdown(localStorage.getItem('selectedModelDropdown') || ''); - // Cleanup listener on component unmount - return () => { - window.removeEventListener('storage', handleStorageChange); - }; - }, []); // Dependency array can remain empty if you only want this to run on mount + }, []); - useEffect(() => { - var storedActiveSelectedAIFunction = localStorage.getItem("activeSelectedAIFunction") || ""; - if (storedActiveSelectedAIFunction !== currentSelectedAIFunction) { - setCurrentSelectedAIFunction(storedActiveSelectedAIFunction); - } - }, [activeSelectedAIFunction]); + const filteredModels = Object.keys(modelList).filter(model => modelList[model as ModelKeys]); const handleModelChange = (event: React.ChangeEvent) => { - const newModel = event.target.value; - setSelectedModelDropdown(newModel); - localStorage.setItem('selectedModelDropdown', newModel); // Update localStorage directly + const selectedModel = event.target.value as ModelKeys; + setSelectedModelDropdown(selectedModel); + localStorage.setItem('selectedModelDropdown', selectedModel); + + // Update model and type in local storage + const modelType = modelList[selectedModel].model_type; + const model = modelList[selectedModel][activeSelectedAIFunction as keyof typeof modelList[typeof selectedModel]]; + + localStorage.setItem('model', model); + localStorage.setItem('type', modelType); }; // Determine the filtered models based on current radioSelection @@ -283,12 +274,21 @@ const ModelSection: React.FC = () => { modelDropdown.offlineNonFoss.includes(model) || modelDropdown.offlineFoss.includes(model); const modelClicked = (model: string) => { - localStorage.setItem('activeSelectedAIFunction', model) - setActiveSelectedAIFunction(model) - const selectedAIFunction = selectedModelDropdown as keyof typeof modelList; - localStorage.setItem("model", modelList[selectedAIFunction][model as keyof typeof modelList[typeof selectedAIFunction]]) - localStorage.setItem("type", modelList[selectedAIFunction]['model_type' as keyof typeof modelList[typeof selectedAIFunction]]) - } + const selectedAIFunction = currentSelectedAIFunction as keyof typeof modelList; + + if (modelList[selectedModelDropdown] && modelList[selectedModelDropdown][model as keyof typeof modelList[typeof selectedModelDropdown]]) { + const newModel = modelList[selectedModelDropdown][model as keyof typeof modelList[typeof selectedModelDropdown]]; + const modelType = modelList[selectedModelDropdown]['model_type' as keyof typeof modelList[typeof selectedModelDropdown]]; + + localStorage.setItem('activeSelectedAIFunction', model); + setActiveSelectedAIFunction(model); + localStorage.setItem('model', newModel); + localStorage.setItem('type', modelType); + setCurrentSelectedAIFunction(model); // Ensure to set current function when model is clicked + } else { + console.error(`Model ${model} not found for function ${selectedModelDropdown}`); + } + }; return (
@@ -311,8 +311,9 @@ const ModelSection: React.FC = () => { {/* Model Grid with Cards */}
- {selectedAIFunction.map( - (displayedCategory) => ( + {Object.keys(modelList[selectedModelDropdown]) + .filter((key) => key !== 'model_type') // Exclude model_type from display + .map((displayedCategory) => (
- ) - )} + )) + }
diff --git a/app/components/settings/PrivacySettings.tsx b/app/components/settings/PrivacySettings.tsx index e9cab20..02d551f 100644 --- a/app/components/settings/PrivacySettings.tsx +++ b/app/components/settings/PrivacySettings.tsx @@ -1,5 +1,4 @@ -// PrivacySettings.tsx -import React from 'react'; +import React, { useEffect } from 'react'; interface PrivacySettingsProps { selectedOption: string; // The currently selected option @@ -8,39 +7,42 @@ interface PrivacySettingsProps { } const PrivacySettings: React.FC = ({ selectedOption, handleRadioChange, openSourceMode }) => { + + // Set default option based on openSourceMode if no option is selected + useEffect(() => { + if (!selectedOption) { + handleRadioChange(openSourceMode ? 'Offline (FOSS)' : 'None'); + } + }, [selectedOption, handleRadioChange, openSourceMode]); + + // Define your options + const options = [ + { value: 'Online', label: 'Online' }, + { value: 'Offline', label: 'Offline' }, + { value: 'None', label: 'None' }, + { value: 'Offline (FOSS)', label: 'Offline (FOSS)' }, + { value: 'Online (FOSS)', label: 'Online (FOSS)' }, + { value: 'None (FOSS)', label: 'None (FOSS)' }, + ]; + return ( - <> - {/* AI Mode Radio Options */} -
-

Disable Options:

-
- {/* Offline */} -
handleRadioChange('Offline')} // Allow selection only if not in open-source mode - > - Offline tools{openSourceMode ? ' (FOSS)' : ''} -
- - {/* Online */} -
handleRadioChange('Online')} - > - Online tools{openSourceMode ? ' (FOSS)' : ''} -
- - {/* None */} -
handleRadioChange('None')} - > - None{openSourceMode ? ' (FOSS)' : ''} -
+
+

Select Privacy Mode:

+ {options.map((option) => ( +
+
-
-
- + ))} +
); }; diff --git a/app/components/settings/Settings.tsx b/app/components/settings/Settings.tsx index 530b3da..da0c407 100644 --- a/app/components/settings/Settings.tsx +++ b/app/components/settings/Settings.tsx @@ -56,7 +56,14 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [timeZone, setTimeZone] = useState(() => localStorage.getItem('timeZone') || 'GMT'); // Online AI and chat history settings - const [selectedOption, setSelectedOption] = useState('Offline'); // Default to 'Offline' + const [selectedOption, setSelectedOption] = useState(() => { + // Check if openSourceMode exists in localStorage + const openSourceMode = localStorage.getItem("openSourceMode"); + + // If it exists and is "true", set selectedOption to None (Foss), otherwise set it to None + return openSourceMode === "true" ? "None (FOSS)" : "None"; + }); + const [disableChatHistory, setDisableChatHistory] = useState(() => getItemFromLocalStorage('disableChatHistory')); const [disableAIMemory, setDisableAIMemory] = useState(() => getItemFromLocalStorage('disableAIMemory')); const [openSourceMode, setOpenSourceMode] = useState(() => getItemFromLocalStorage('openSourceMode')); @@ -105,7 +112,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [closeButtonHoverColor, setCloseButtonHoverColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--close-button-hover-color').trim()); const [applyButtonColor, setApplyButtonColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--apply-button-color').trim()); const [applyButtonHoverColor, setApplyButtonHoverColor] = useState(() => getComputedStyle(document.documentElement).getPropertyValue('--apply-button-hover-color').trim()); - // Per default a purple color gradient const [primaryColor, setPrimaryColor] = useState(localStorage.getItem("primaryColor") || "#dc8add"); const [secondaryColor, setSecondaryColor] = useState(localStorage.getItem("secondaryColor") || "#c061cb"); @@ -117,7 +123,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( const [selectedTheme, setSelectedTheme] = useState(''); // API Keys - const [mistral, setMistral] = useState(localStorage.getItem('mistral') || ""); const [openai, setOpenai] = useState(localStorage.getItem('openai') || ""); const [anthropic, setAnthropic] = useState(localStorage.getItem('anthropic') || ""); @@ -450,7 +455,6 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = ( return (

Privacy Settings

- void; accountName: string }> = (