Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2025-11-08 22:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix default values for modules

Browse Source 
The default value was not set correctly for modules. This has been fixed. It was also fixed in the Weather Module and the Date Module.
This commit is contained in:
Thomas Camlong
2022-06-28 12:10:46 +02:00
parent e93a3a3b5f
commit 41be0e6362
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modules/date/DateModule.tsx
View File

@@ -23,7 +23,7 @@ export default function DateComponent(props: any) {
const [date, setDate] = useState(new Date()); const [date, setDate] = useState(new Date());
const setSafeInterval = useSetSafeInterval(); const setSafeInterval = useSetSafeInterval();
const { config } = useConfig(); const { config } = useConfig();
const isFullTime = config?.modules?.[DateModule.title]?.options?.full?.value ?? false; const isFullTime = config?.modules?.[DateModule.title]?.options?.full?.value ?? true;
const formatString = isFullTime ? 'HH:mm' : 'h:mm A'; const formatString = isFullTime ? 'HH:mm' : 'h:mm A';
// Change date on minute change // Change date on minute change
// Note: Using 10 000ms instead of 1000ms to chill a little :) // Note: Using 10 000ms instead of 1000ms to chill a little :)

17
src/components/modules/moduleWrapper.tsx
View File

@@ -28,8 +28,11 @@ function getItems(module: IModule) {
<MultiSelect <MultiSelect
label={module.options?.[keys[index]].name} label={module.options?.[keys[index]].name}
data={module.options?.[keys[index]].options ?? []} data={module.options?.[keys[index]].options ?? []}
defaultValue={(moduleInConfig?.options?.[keys[index]]?.value as string[]) ?? []} defaultValue={
clearable (moduleInConfig?.options?.[keys[index]]?.value as string[]) ??
(values[index].value as string[]) ??
[]
}
searchable searchable
onChange={(value) => { onChange={(value) => {
setConfig({ setConfig({
@@ -81,7 +84,11 @@ function getItems(module: IModule) {
id={optionName} id={optionName}
name={optionName} name={optionName}
label={values[index].name} label={values[index].name}
defaultValue={(moduleInConfig?.options?.[keys[index]]?.value as string) ?? ''} defaultValue={
(moduleInConfig?.options?.[keys[index]]?.value as string) ??
(values[index].value as string) ??
''
}
onChange={(e) => {}} onChange={(e) => {}}
/> />
@@ -96,7 +103,9 @@ function getItems(module: IModule) {
<Switch <Switch
defaultChecked={ defaultChecked={
// Set default checked to the value of the option if it exists // Set default checked to the value of the option if it exists
(moduleInConfig?.options?.[keys[index]]?.value as boolean) ?? false (moduleInConfig?.options?.[keys[index]]?.value as boolean) ??
(values[index].value as boolean) ??
false
} }
key={keys[index]} key={keys[index]}
onClick={(e) => { onClick={(e) => {

4
src/components/modules/weather/WeatherModule.tsx
View File

@@ -29,7 +29,7 @@ export const WeatherModule: IModule = {
}, },
location: { location: {
name: 'Current location', name: 'Current location',
value: '', value: 'Paris',
}, },
}, },
}; };
@@ -135,7 +135,7 @@ export default function WeatherComponent(props: any) {
const { config } = useConfig(); const { config } = useConfig();
const [weather, setWeather] = useState({} as WeatherResponse); const [weather, setWeather] = useState({} as WeatherResponse);
const cityInput: string = const cityInput: string =
(config?.modules?.[WeatherModule.title]?.options?.location?.value as string) ?? ''; (config?.modules?.[WeatherModule.title]?.options?.location?.value as string) ?? 'Paris';
const isFahrenheit: boolean = const isFahrenheit: boolean =
(config?.modules?.[WeatherModule.title]?.options?.freedomunit?.value as boolean) ?? false; (config?.modules?.[WeatherModule.title]?.options?.freedomunit?.value as boolean) ?? false;