GUI: form fixes; chore: version updated

pixlie · Jul 5, 2024 · da32d10 · da32d10
1 parent e0dbd3f
commit da32d10
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dwata",
-  "version": "0.1.2",
-  "description": "A general purpose, multi-model and multi-modal AI studio",
+  "version": "0.1.3",
+  "description": "AI assistants for everyone",
   "type": "module",
   "author": {
     "name": "Sumit Datta",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -3,8 +3,8 @@ members = ["openai"]
 
 [package]
 name = "dwata"
-version = "0.1.2"
-description = "A general purpose, multi-model and multi-modal AI studio"
+version = "0.1.3"
+description = "AI assistants for everyone"
 authors = ["Sumit Datta <sumitdatta@gmail.com>"]
 license = "Apache-2.0 license"
 repository = "https://github.com/brainless/dwata"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,6 +1,6 @@
 {
   "productName": "dwata",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "identifier": "com.dwata.app",
   "build": {
     "beforeDevCommand": "pnpm dev",

diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx
@@ -30,7 +30,7 @@ const Home: Component = () => {
       <p style={{ color: getColors().colors["editor.foreground"] }}>
         To get started, please{" "}
         <Button
-          href="/settings/ai-provider/add"
+          href="/settings/ai-integration/add"
           size="sm"
           label="add an AI provider"
         />

diff --git a/src/routes/Settings.tsx b/src/routes/Settings.tsx
@@ -54,7 +54,7 @@ const SettingsIndex: Component = () => {
       <div class="mb-2" />
       <Button
         label="Add an AI provider"
-        href="/settings/ai-provider/add"
+        href="/settings/ai-integration/add"
         size="sm"
       ></Button>
       <div class="mb-6" />
@@ -85,8 +85,8 @@ const SettingsRoutes: Component = () => {
         component={DirectorySourceForm}
       />
 
-      <Route path="/ai-provider/add" component={AIIntegrationForm} />
-      <Route path="/ai-provider/edit/:id" component={AIIntegrationForm} />
+      <Route path="/ai-integration/add" component={AIIntegrationForm} />
+      <Route path="/ai-integration/edit/:id" component={AIIntegrationForm} />
 
       <Route path="/" component={SettingsIndex} />
     </>

diff --git a/src/widgets/chat/ReplyItem.tsx b/src/widgets/chat/ReplyItem.tsx
@@ -4,7 +4,6 @@ import { Chat } from "../../api_types/Chat";
 import { marked } from "marked";
 import { Role } from "../../api_types/Role";
 import { useChat } from "../../stores/chat";
-import { invoke } from "@tauri-apps/api/core";
 
 interface IPropTypes extends Chat {
   index: number;

diff --git a/src/widgets/interactable/ConfiguredForm.tsx b/src/widgets/interactable/ConfiguredForm.tsx
@@ -3,7 +3,6 @@ import {
   For,
   JSX,
   createComputed,
-  createEffect,
   createResource,
   createSignal,
   onMount,
@@ -57,37 +56,49 @@ const Form: Component<IPropTypes> = (props) => {
       });
     });
 
-  createEffect((previousData) => {
-    if (previousData !== props.initialData) {
+  onMount(() => {
+    refetchModuleConfiguration();
+    if (props.initialData !== undefined) {
       setFormData((state) => ({ ...state, ...props.initialData }));
 
       setDirty((state) => [
         ...state,
-        ...Object.keys(props.initialData).filter((x) => !state.includes(x)),
+        ...Object.keys(props.initialData!).filter((x) => !state.includes(x)),
       ]);
     }
-  }, {});
-
-  onMount(() => {
-    refetchModuleConfiguration();
-    // setFormConfiguration(config() as Configuration);
 
     if (props.existingItemId) {
       refetchModuleData();
+    }
+  });
 
-      if (!!moduleData() && props.module in moduleData()!) {
-        for (const [key, value] of Object.entries(
-          moduleData()![props.module as keyof ModuleDataRead],
-        )) {
-          if (key in formData()) {
-            setFormData((state) => ({
-              ...state,
-              [key as string]: value as IFormFieldValue,
-            }));
-          }
+  createComputed((isSet) => {
+    if (!props.existingItemId) {
+      return false;
+    }
+
+    if (
+      !isSet &&
+      moduleData.state === "ready" &&
+      moduleData() !== undefined &&
+      props.module in moduleData()!
+    ) {
+      let _data: { [key: string]: IFormFieldValue } = {};
+      for (const [key, value] of Object.entries(
+        moduleData()![props.module as keyof ModuleDataRead],
+      )) {
+        if (key in formData()) {
+          _data[key] = value as IFormFieldValue;
         }
       }
+
+      setFormData((state) => ({
+        ...state,
+        ..._data,
+      }));
+      return true;
     }
+    return false;
   });
 
   const handleChange = (name: string, value: IFormFieldValue) => {
@@ -147,7 +158,7 @@ const Form: Component<IPropTypes> = (props) => {
 
           nextTaskStore[1].initiateTask({
             name: response.nextTask,
-            arguments: response.arguments,
+            arguments: response.arguments || undefined,
           });
           if (!!props.postSaveNavigateTo) {
             navigate(

diff --git a/src/widgets/settings/SettingsIntegrationList.tsx b/src/widgets/settings/SettingsIntegrationList.tsx
@@ -9,7 +9,7 @@ const SettingsAIIntegrationItem: Component<AIIntegration> = (props) => {
   const navigate = useNavigate();
 
   const handleClick = () => {
-    navigate(`/settings/ai-provider/edit/${props.id}`);
+    navigate(`/settings/ai-integration/edit/${props.id}`);
   };
 
   return (