From e93a3a3b5f7caa0f213c000951016d0ab9e5c847 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <ajnart@pm.me>
Date: Tue, 28 Jun 2022 11:27:23 +0200
Subject: [PATCH 1/2] :sparkles: Add support for lists in module option

This feature allows a module maker to use a list as the different possible values for a module integration.
---
 src/components/modules/moduleWrapper.tsx | 41 ++++++++++++++++++++++--
 src/components/modules/modules.tsx       |  3 +-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/components/modules/moduleWrapper.tsx b/src/components/modules/moduleWrapper.tsx
index a28cde8a8..c7423f658 100644
--- a/src/components/modules/moduleWrapper.tsx
+++ b/src/components/modules/moduleWrapper.tsx
@@ -1,10 +1,18 @@
-import { Button, Card, Group, Menu, Switch, TextInput, useMantineColorScheme } from '@mantine/core';
+import {
+  Button,
+  Card,
+  Group,
+  Menu,
+  MultiSelect,
+  Switch,
+  TextInput,
+  useMantineColorScheme,
+} from '@mantine/core';
 import { useConfig } from '../../tools/state';
 import { IModule } from './modules';
 
 function getItems(module: IModule) {
   const { config, setConfig } = useConfig();
-  const enabledModules = config.modules ?? {};
   const items: JSX.Element[] = [];
   if (module.options) {
     const keys = Object.keys(module.options);
@@ -15,6 +23,35 @@ function getItems(module: IModule) {
     types.forEach((type, index) => {
       const optionName = `${module.title}.${keys[index]}`;
       const moduleInConfig = config.modules?.[module.title];
+      if (type === 'object') {
+        items.push(
+          <MultiSelect
+            label={module.options?.[keys[index]].name}
+            data={module.options?.[keys[index]].options ?? []}
+            defaultValue={(moduleInConfig?.options?.[keys[index]]?.value as string[]) ?? []}
+            clearable
+            searchable
+            onChange={(value) => {
+              setConfig({
+                ...config,
+                modules: {
+                  ...config.modules,
+                  [module.title]: {
+                    ...moduleInConfig,
+                    options: {
+                      ...moduleInConfig?.options,
+                      [keys[index]]: {
+                        ...moduleInConfig?.options?.[keys[index]],
+                        value,
+                      },
+                    },
+                  },
+                },
+              });
+            }}
+          />
+        );
+      }
       if (type === 'string') {
         items.push(
           <form
diff --git a/src/components/modules/modules.tsx b/src/components/modules/modules.tsx
index 7e0617063..e1303ae33 100644
--- a/src/components/modules/modules.tsx
+++ b/src/components/modules/modules.tsx
@@ -16,5 +16,6 @@ interface Option {
 
 export interface OptionValues {
   name: string;
-  value: boolean | string;
+  value: boolean | string | string[];
+  options?: string[];
 }

From 41be0e63626af482d71fd3aa99941b21238b92d4 Mon Sep 17 00:00:00 2001
From: Thomas Camlong <ajnart@pm.me>
Date: Tue, 28 Jun 2022 12:10:46 +0200
Subject: [PATCH 2/2] :bug: Fix default values for modules

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.
---
 src/components/modules/date/DateModule.tsx      |  2 +-
 src/components/modules/moduleWrapper.tsx        | 17 +++++++++++++----
 .../modules/weather/WeatherModule.tsx           |  4 ++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/modules/date/DateModule.tsx b/src/components/modules/date/DateModule.tsx
index ad5991736..3e212af83 100644
--- a/src/components/modules/date/DateModule.tsx
+++ b/src/components/modules/date/DateModule.tsx
@@ -23,7 +23,7 @@ export default function DateComponent(props: any) {
   const [date, setDate] = useState(new Date());
   const setSafeInterval = useSetSafeInterval();
   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';
   // Change date on minute change
   // Note: Using 10 000ms instead of 1000ms to chill a little :)
diff --git a/src/components/modules/moduleWrapper.tsx b/src/components/modules/moduleWrapper.tsx
index c7423f658..6bbd69c86 100644
--- a/src/components/modules/moduleWrapper.tsx
+++ b/src/components/modules/moduleWrapper.tsx
@@ -28,8 +28,11 @@ function getItems(module: IModule) {
           <MultiSelect
             label={module.options?.[keys[index]].name}
             data={module.options?.[keys[index]].options ?? []}
-            defaultValue={(moduleInConfig?.options?.[keys[index]]?.value as string[]) ?? []}
-            clearable
+            defaultValue={
+              (moduleInConfig?.options?.[keys[index]]?.value as string[]) ??
+              (values[index].value as string[]) ??
+              []
+            }
             searchable
             onChange={(value) => {
               setConfig({
@@ -81,7 +84,11 @@ function getItems(module: IModule) {
                 id={optionName}
                 name={optionName}
                 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) => {}}
               />
 
@@ -96,7 +103,9 @@ function getItems(module: IModule) {
           <Switch
             defaultChecked={
               // 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]}
             onClick={(e) => {
diff --git a/src/components/modules/weather/WeatherModule.tsx b/src/components/modules/weather/WeatherModule.tsx
index 1d2a522a0..8a6f6c98f 100644
--- a/src/components/modules/weather/WeatherModule.tsx
+++ b/src/components/modules/weather/WeatherModule.tsx
@@ -29,7 +29,7 @@ export const WeatherModule: IModule = {
     },
     location: {
       name: 'Current location',
-      value: '',
+      value: 'Paris',
     },
   },
 };
@@ -135,7 +135,7 @@ export default function WeatherComponent(props: any) {
   const { config } = useConfig();
   const [weather, setWeather] = useState({} as WeatherResponse);
   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 =
     (config?.modules?.[WeatherModule.title]?.options?.freedomunit?.value as boolean) ?? false;