From 1c029e301badaf30a64c345e8928682c92264fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mose=20M=C3=BCller?= <mosemueller@gmail.com>
Date: Tue, 20 Feb 2024 16:38:44 +0100
Subject: [PATCH] updates types

---
 frontend/src/App.tsx                         |  6 +++---
 frontend/src/components/GenericComponent.tsx |  8 ++++----
 frontend/src/components/MethodComponent.tsx  |  3 ++-
 frontend/src/utils/stateUtils.ts             | 10 ++--------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 13cfc91..6a509a1 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -8,9 +8,9 @@ import {
   LevelName
 } from './components/NotificationsComponent';
 import { ConnectionToast } from './components/ConnectionToast';
-import { SerializedValue, setNestedValueByPath, State } from './utils/stateUtils';
+import { setNestedValueByPath, State } from './utils/stateUtils';
 import { WebSettingsContext, WebSetting } from './WebSettings';
-import { Attribute, GenericComponent } from './components/GenericComponent';
+import { SerializedValue, GenericComponent } from './components/GenericComponent';
 
 type Action =
   | { type: 'SET_DATA'; data: State }
@@ -187,7 +187,7 @@ const App = () => {
           <GenericComponent
             name=""
             parentPath=""
-            attribute={state as Attribute}
+            attribute={state as SerializedValue}
             isInstantUpdate={isInstantUpdate}
             addNotification={addNotification}
           />
diff --git a/frontend/src/components/GenericComponent.tsx b/frontend/src/components/GenericComponent.tsx
index cd40029..9149301 100644
--- a/frontend/src/components/GenericComponent.tsx
+++ b/frontend/src/components/GenericComponent.tsx
@@ -28,8 +28,8 @@ type AttributeType =
   | 'Image'
   | 'ColouredEnum';
 
-type ValueType = boolean | string | number | object;
-export type Attribute = {
+type ValueType = boolean | string | number | Record<string, unknown>;
+export type SerializedValue = {
   type: AttributeType;
   value?: ValueType | ValueType[];
   readonly: boolean;
@@ -39,7 +39,7 @@ export type Attribute = {
   enum?: Record<string, string>;
 };
 type GenericComponentProps = {
-  attribute: Attribute;
+  attribute: SerializedValue;
   name: string;
   parentPath: string;
   isInstantUpdate: boolean;
@@ -177,7 +177,7 @@ export const GenericComponent = React.memo(
       return (
         <ListComponent
           name={name}
-          value={attribute.value as Attribute[]}
+          value={attribute.value as SerializedValue[]}
           docString={attribute.doc}
           parentPath={parentPath}
           isInstantUpdate={isInstantUpdate}
diff --git a/frontend/src/components/MethodComponent.tsx b/frontend/src/components/MethodComponent.tsx
index b0e8b4a..4161e8d 100644
--- a/frontend/src/components/MethodComponent.tsx
+++ b/frontend/src/components/MethodComponent.tsx
@@ -5,11 +5,12 @@ import { Button, InputGroup, Form, Collapse } from 'react-bootstrap';
 import { DocStringComponent } from './DocStringComponent';
 import { getIdFromFullAccessPath } from '../utils/stringUtils';
 import { LevelName } from './NotificationsComponent';
+import { GenericComponent, SerializedValue } from './GenericComponent';
 
 type MethodProps = {
   name: string;
   parentPath: string;
-  parameters: Record<string, string>;
+  parameters: Record<string, SerializedValue>;
   docString?: string;
   hideOutput?: boolean;
   addNotification: (message: string, levelname?: LevelName) => void;
diff --git a/frontend/src/utils/stateUtils.ts b/frontend/src/utils/stateUtils.ts
index 474daea..a9f3cf3 100644
--- a/frontend/src/utils/stateUtils.ts
+++ b/frontend/src/utils/stateUtils.ts
@@ -1,11 +1,5 @@
-export interface SerializedValue {
-  type: string;
-  value: Record<string, unknown> | Array<Record<string, unknown>>;
-  readonly: boolean;
-  doc: string | null;
-  async?: boolean;
-  parameters?: unknown;
-}
+import { SerializedValue } from '../components/GenericComponent';
+
 export type State = {
   type: string;
   value: Record<string, SerializedValue> | null;