fix: multi tab sql load support

Author: dancixx

README.md

@@ -12,6 +12,7 @@ Welcome to the Tauri-Leptos PostgreSQL GUI, a fully Rust-based application for e
 - [x] **Multi-Connection Support:** Enable the GUI to handle multiple database connections simultaneously.
 - [x] **SQL Query Saving:** Allow users to save and manage their frequently used SQL queries.
 - [x] **Grid and Record View:** Provide a grid view for query results, as well as a record view for individual records.
+- [ ] **Multi Tab Support:** Allow users to open multiple tabs for SQL queries.
 - [ ] **BigQuery Support:** Add support for BigQuery databases.
 
 ## Key Features

src/layout.rs

@@ -1,11 +1,5 @@
 use leptos::{html::*, *};
-use thaw::{
-  Button,
-  Tab,
-  //TabProps,
-  Tabs,
-  // TabsProps
-};
+use thaw::{Button, ButtonProps, Tab, TabProps, Tabs, TabsProps};
 
 use crate::{footer, query_editor, query_table, sidebar, store::tabs};
 
@@ -21,56 +15,52 @@ pub fn component() -> impl IntoView {
         .child(
           main()
             .classes("flex-1 overflow-y-scroll")
-            .child(
-              view! {
-                <Tabs value=tabs.selected_tab>
-                    <For each=move || (0..tabs.active_tabs.get()) key=|index| index.to_string() let:index>
-                        <Tab key=index.to_string() label=(index + 1).to_string()>
-                            {query_editor::component()}
-                            {query_table::component()}
-                        </Tab>
-                    </For>
-                  </Tabs>
-                  <Button on_click=move |_| {
-                    tabs.active_tabs.update(|prev| *prev += 1);
-                    tabs.selected_tab.update(|prev| *prev = (tabs.active_tabs.get() - 1).to_string());
-                  }>"+1"</Button>
-            }),
-            // .child(Tabs(TabsProps {
-            //   value: tabs.selected_tab,
-            //   class: MaybeSignal::Static(String::new()),
-            //   children: Children::to_children(move || {
-            //     Fragment::new(vec![
-            //       For(ForProps {
-            //         each: move || (0..tabs.active_tabs.get()),
-            //         key: |index| index.to_string(),
-            //         children: move |index| {
-            //           Tab(TabProps {
-            //             class: MaybeSignal::Static(String::new()),
-            //             key: index.to_string(),
-            //             label: (index + 1).to_string(),
-            //             children: Children::to_children(move || {
-            //               Fragment::new(vec![
-            //                 query_editor::component().into_view(),
-            //                 query_table::component().into_view(),
-            //               ])
-            //             }),
-            //           })
-            //         },
-            //       })
-            //       .into_view(),
-            //       button()
-            //         .on(ev::click, move |_| {
-            //           tabs.active_tabs.update(|prev| *prev += 1);
-            //           tabs
-            //             .selected_tab
-            //             .update(|prev| *prev = (tabs.active_tabs.get() - 1).to_string());
-            //         })
-            //         .child("+")
-            //         .into_view(),
-            //     ])
-            //   }),
-            // })),
+            .child(div().child(Tabs(TabsProps {
+              value: tabs.selected_tab,
+              class: MaybeSignal::default(),
+              children: Children::to_children(move || {
+                Fragment::new(vec![For(ForProps {
+                  each: move || (0..tabs.active_tabs.get()),
+                  key: |index| index.to_string(),
+                  children: move |index| {
+                    Fragment::new(vec![Tab(TabProps {
+                      class: MaybeSignal::default(),
+                      key: index.to_string(),
+                      label: (index + 1).to_string(),
+                      children: Children::to_children(move || {
+                        Fragment::new(vec![
+                          query_editor::component().into_view(),
+                          query_table::component().into_view(),
+                        ])
+                      }),
+                    })
+                    .into_view()])
+                  },
+                })
+                .into_view()])
+              }),
+            })))
+            .child(Button(ButtonProps {
+              style: MaybeSignal::default(),
+              class: MaybeSignal::Static(String::from("absolute top-2 right-2")),
+              variant: MaybeSignal::default(),
+              color: MaybeSignal::default(),
+              size: MaybeSignal::default(),
+              round: MaybeSignal::default(),
+              circle: MaybeSignal::default(),
+              icon: None,
+              loading: MaybeSignal::default(),
+              disabled: MaybeSignal::default(),
+              on_click: Some(Callback::from(move |_| {
+                tabs.active_tabs.update(|prev| *prev += 1);
+                tabs
+                  .selected_tab
+                  .update(|prev| *prev = (tabs.active_tabs.get() - 1).to_string());
+              })),
+              children: Some(Box::new(move || {
+                Fragment::new(vec![p().child("+").into_view()])
+              })),
+            })),
         )
         .child(footer::component()),
     )

src/store/editor.rs

@@ -21,7 +21,7 @@ impl Default for EditorStore {
 impl EditorStore {
   pub fn new() -> Self {
     Self {
-      editors: create_rw_signal(vec![create_rw_signal(ModelCell::default())]),
+      editors: create_rw_signal(Vec::new()),
     }
   }
 
@@ -31,6 +31,7 @@ impl EditorStore {
     });
   }
 
+  #[allow(dead_code)]
   pub fn remove_editor(&mut self, index: usize) {
     self.editors.update(|prev| {
       prev.remove(index);