fixed service schema

Author: jan hof

src/hooks/configHook.tsx

@@ -1,9 +1,10 @@
 import Axios from "axios";
 import { JSONSchema6 } from "json-schema";
 import { useEffect, useState } from "react";
+import { ServiceSchema } from "../types/ServiceTypes";
 
 const useConfig = (namespace: string) => {
-  const [config, setConfig] = useState<JSONSchema6>();
+  const [config, setConfig] = useState<ServiceSchema>();
 
   useEffect(() => {
     Axios.get("/api/webinterface/service/" + namespace).then((res) =>

src/types/ServiceTypes.ts

@@ -1,3 +1,5 @@
+import { JSONSchema6 } from "json-schema";
+
 interface Service {
   namespace: string;
   name: string;
@@ -9,6 +11,11 @@ interface Service {
   error?: string; 
 }
 
+interface ServiceSchema{
+  schema: JSONSchema6
+  uiSchema: JSONSchema6
+}
+
 enum ServiceState {
   RUNNNING = 0,
   IDLE = 1,
@@ -22,4 +29,4 @@ interface SocketMessage{
 }
 
 export {ServiceState}
-export type { Service, SocketMessage };
+export type { Service, ServiceSchema, SocketMessage };

src/views/service/ServiceDetails.tsx

@@ -12,14 +12,15 @@ type ServiceDetailsProps = {
 
 const ServiceDetails = (props: RouteComponentProps<ServiceDetailsProps>) => {
   const namespace = props.match.params.namespace;
-  const [config, setConfig] = useConfig(namespace);
+  const [config, setConfig]: any = useConfig(namespace);
 
   return (
     <>
       <CRow>
         {config && (
           <Form
-            schema={config as JSONSchema6}
+            schema={config.schema}
+            uiSchema={config.uiSchema}
             onChange={() => console.log("changed")}
             onSubmit={(e) =>
               Axios.post("/api/webinterface/service/" + namespace, e.formData)