Fix IDL struct

Web3-Builders-Alliance · Jul 25, 2023 · b6c8c5d · b6c8c5d
1 parent 9c18b8e
commit b6c8c5d
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 38 deletions.
diff --git a/crate/src/helpers.rs b/crate/src/helpers.rs
@@ -1,6 +1,6 @@
 use crate::{structs, Error};
 use handlebars::{handlebars_helper, Handlebars};
-use structs::{InstructionType, InstructionTypeVec, TemplateHelper, VecEnum, IDL};
+use structs::{InstructionType, TemplateHelper, IDL};
 
 pub(crate) fn create_handlebars_registry() -> Handlebars<'static> {
     handlebars_helper!(snakecase: |name: String| name.chars().fold(

diff --git a/crate/src/structs.rs b/crate/src/structs.rs
@@ -136,6 +136,7 @@ pub struct Accounts {
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct Types {
+    #[serde(default)]
     pub(crate) name: String,
     #[serde(default)]
     #[serde(rename = "type")]
@@ -144,6 +145,7 @@ pub struct Types {
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct Event {
+    #[serde(default)]
     pub(crate) name: String,
     #[serde(default)]
     pub(crate) fields: Vec<Field>,
@@ -210,6 +212,7 @@ impl Default for Kind {
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct Field {
+    #[serde(default)]
     pub(crate) name: String,
     #[serde(rename = "type")]
     pub(crate) type_: InstructionType,

diff --git a/ui/helpers/selectTemplateFolder.ts b/ui/helpers/selectTemplateFolder.ts
@@ -9,14 +9,16 @@ const selectTemplateFolder = (setTemplateFolder: Function) => {
         multiple: false,
         title: "Select a template file",
       });
-      invoke("update_template", { templatePath: result }).then(async () => {
-        setTemplateFolder(result)
-        await message(`Template path: ${result}`, "Template Selected");
-      })
-      .catch(async (e) => {
-        await message(e?.error ?? "update_template Error", { title: "Error Trying to open selected file as a template", type: "error" });
-    });
-      ;
+      if (typeof result === "string") {
+      invoke("update_template", { templatePath: result })
+        .then(async () => {
+          setTemplateFolder(result)
+          await message(`Template path: ${result}`, "Template Selected");
+        })
+        .catch(async (e) => {
+          await message(e?.error ?? "update_template Error", { title: "Error Trying to open selected file as a template", type: "error" });
+        });
+      }
     }
     catch (e) {
       await message(`${e}`, {

diff --git a/ui/helpers/templateFromFolder.ts b/ui/helpers/templateFromFolder.ts
@@ -9,12 +9,14 @@ const templateFromFolder = async () => {
             multiple: false,
             title: "Select a template file",
         });
+        if (typeof result === "string") {
         invoke("update_template", { templatePath: result })
             .then(async () => {
                 await message(`Template path: ${result}`, "Template Selected");
             }).catch(async (e) => {
                 await message(e?.error ?? "update_template Error", { title: "Error Trying to open the selected folder as a template", type: "error" });
             });
+        }
     }
     catch (e) {
         await message(`${e}`, {

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock
diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "soda"
-version = "0.1.0"
+version = "0.1.1"
 description = "Generates source code from an IDL"
 authors = ["Juan Patricio Marchetto"]
 license = "Apache-2.0"
@@ -19,7 +19,7 @@ tauri = { version = "1.2.5", features = ["dialog-all", "fs-create-dir", "fs-read
 serde_json = "1.0.93"
 serde = "1.0.164"
 thiserror = "1.0.40"
-soda_sol = "0.0.6"
+soda_sol = { path="../../crate"}
 
 [features]
 # by default Tauri runs in production mode

diff --git a/ui/src-tauri/src/default_template.rs b/ui/src-tauri/src/default_template.rs
diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "soda",
-    "version": "0.1.0"
+    "version": "0.1.1"
   },
   "tauri": {
     "allowlist": {