sveltekit-ui 1.0.35 → 1.0.36

package/dist/Components/TableAdvanced/index.svelte

@@ -164,9 +164,7 @@
       <div>
         <FileInput manager={manager?.upload_rows_file_input_manager} />
       </div>
-      {#if !manager?.upload_rows_file_input_manager?.val}
-        <TextInput manager={manager?.upload_rows_text_input_manager} />
-      {/if}
+      <TextInput manager={manager?.upload_rows_text_input_manager} />
       <div style="display: flex; flex-wrap: wrap; gap: 1rem; margin-top: 1rem; margin-bottom: 1rem;">
         <Button manager={manager?.upload_rows_prepare_text_button_manager} />
         {#if manager?.bulk_insert_rows_prepared_data}

package/dist/Components/TableAdvanced/index.svelte.js

@@ -408,8 +408,7 @@ export function create_table_advanced_manager(config) {
               () => {
                 let columns_prepped_copy = deep_copy(columns_prepped)
                 delete columns_prepped_copy[column_id]
-                const columns_prepped_loc = set_columns_prepped(columns_prepped_copy)
-                set_rows_prepped(columns_prepped_loc)
+                set_columns(columns_prepped_copy)
                 if (typeof res.finish == "function") {
                   res.finish()
                 }
@@ -444,8 +443,7 @@ export function create_table_advanced_manager(config) {
                   let cleaned_columns = deep_copy(columns_prepped ?? {})
                   delete cleaned_columns[column_id]
                   cleaned_columns[res?.column_id] = res?.column
-                  const columns_prepped_loc = set_columns_prepped(cleaned_columns)
-                  set_rows_prepped(columns_prepped_loc)
+                  set_columns(cleaned_columns)
                 }
               )
             } else {
@@ -473,8 +471,8 @@ export function create_table_advanced_manager(config) {
                 () => {
                   let cleaned_columns = deep_copy(columns_prepped ?? {})
                   cleaned_columns[res?.column_id] = res?.column
-                  const columns_prepped_loc = set_columns_prepped(cleaned_columns)
-                  set_rows_prepped(columns_prepped_loc)
+                  console.log("cleaned_columns", cleaned_columns, res)
+                  set_columns(cleaned_columns)
                 }
               )
             } else {
@@ -500,6 +498,7 @@ export function create_table_advanced_manager(config) {
     row_edit_content_manager = null
     setTimeout(() => {
       // quick fix for when update row then edit a diff row the data for other doesnt remain in place
+      console.log("edit_row", { row_i, row_input_content })
       row_edit_content_manager = create_content_manager({
         val: row_input_content ?? null,
         definition_stack: row_definition_stack,
@@ -739,9 +738,7 @@ export function create_table_advanced_manager(config) {
     is_more_to_load = attributes?.is_more_to_load ?? false
     table_header_max_height = attributes?.table_header_max_height ?? null
     table_row_max_height = attributes?.table_row_max_height ?? null
-    const columns_prepped_loc = set_columns_prepped(attributes?.columns)
-    set_rows_prepped(columns_prepped_loc)
-    row_input_content = attributes?.row_input_content ?? guess_row_input_content(attributes?.columns)
+    set_columns(attributes?.columns, attributes?.row_input_content)
   }
 
   function reset_definition_stack(input) {
@@ -749,9 +746,10 @@ export function create_table_advanced_manager(config) {
     set_rows_prepped(columns_prepped)
   }
 
-  function set_columns(input) {
+  function set_columns(input, row_input_content_input = null) {
     set_columns_prepped(input)
     set_rows_prepped(columns_prepped)
+    row_input_content = row_input_content_input ?? guess_row_input_content(input)
   }
 
   function init(config) {
@@ -1013,6 +1011,7 @@ export function create_table_advanced_manager(config) {
               () => {
                 upload_rows_file_input_manager.clear_files()
                 bulk_insert_rows_prepared_data = null
+                upload_rows_text_input_manager.set_val(null)
                 set_rows_prepped(columns_prepped)
               }
             )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sveltekit-ui",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "A SvelteKit UI component library for building modern web applications",
   "license": "MIT",
   "type": "module",

package/src/lib/Components/TableAdvanced/index.svelte

@@ -164,9 +164,7 @@
       <div>
         <FileInput manager={manager?.upload_rows_file_input_manager} />
       </div>
-      {#if !manager?.upload_rows_file_input_manager?.val}
-        <TextInput manager={manager?.upload_rows_text_input_manager} />
-      {/if}
+      <TextInput manager={manager?.upload_rows_text_input_manager} />
       <div style="display: flex; flex-wrap: wrap; gap: 1rem; margin-top: 1rem; margin-bottom: 1rem;">
         <Button manager={manager?.upload_rows_prepare_text_button_manager} />
         {#if manager?.bulk_insert_rows_prepared_data}

package/src/lib/Components/TableAdvanced/index.svelte.js

@@ -408,8 +408,7 @@ export function create_table_advanced_manager(config) {
               () => {
                 let columns_prepped_copy = deep_copy(columns_prepped)
                 delete columns_prepped_copy[column_id]
-                const columns_prepped_loc = set_columns_prepped(columns_prepped_copy)
-                set_rows_prepped(columns_prepped_loc)
+                set_columns(columns_prepped_copy)
                 if (typeof res.finish == "function") {
                   res.finish()
                 }
@@ -444,8 +443,7 @@ export function create_table_advanced_manager(config) {
                   let cleaned_columns = deep_copy(columns_prepped ?? {})
                   delete cleaned_columns[column_id]
                   cleaned_columns[res?.column_id] = res?.column
-                  const columns_prepped_loc = set_columns_prepped(cleaned_columns)
-                  set_rows_prepped(columns_prepped_loc)
+                  set_columns(cleaned_columns)
                 }
               )
             } else {
@@ -473,8 +471,8 @@ export function create_table_advanced_manager(config) {
                 () => {
                   let cleaned_columns = deep_copy(columns_prepped ?? {})
                   cleaned_columns[res?.column_id] = res?.column
-                  const columns_prepped_loc = set_columns_prepped(cleaned_columns)
-                  set_rows_prepped(columns_prepped_loc)
+                  console.log("cleaned_columns", cleaned_columns, res)
+                  set_columns(cleaned_columns)
                 }
               )
             } else {
@@ -500,6 +498,7 @@ export function create_table_advanced_manager(config) {
     row_edit_content_manager = null
     setTimeout(() => {
       // quick fix for when update row then edit a diff row the data for other doesnt remain in place
+      console.log("edit_row", { row_i, row_input_content })
       row_edit_content_manager = create_content_manager({
         val: row_input_content ?? null,
         definition_stack: row_definition_stack,
@@ -739,9 +738,7 @@ export function create_table_advanced_manager(config) {
     is_more_to_load = attributes?.is_more_to_load ?? false
     table_header_max_height = attributes?.table_header_max_height ?? null
     table_row_max_height = attributes?.table_row_max_height ?? null
-    const columns_prepped_loc = set_columns_prepped(attributes?.columns)
-    set_rows_prepped(columns_prepped_loc)
-    row_input_content = attributes?.row_input_content ?? guess_row_input_content(attributes?.columns)
+    set_columns(attributes?.columns, attributes?.row_input_content)
   }
 
   function reset_definition_stack(input) {
@@ -749,9 +746,10 @@ export function create_table_advanced_manager(config) {
     set_rows_prepped(columns_prepped)
   }
 
-  function set_columns(input) {
+  function set_columns(input, row_input_content_input = null) {
     set_columns_prepped(input)
     set_rows_prepped(columns_prepped)
+    row_input_content = row_input_content_input ?? guess_row_input_content(input)
   }
 
   function init(config) {
@@ -1013,6 +1011,7 @@ export function create_table_advanced_manager(config) {
               () => {
                 upload_rows_file_input_manager.clear_files()
                 bulk_insert_rows_prepared_data = null
+                upload_rows_text_input_manager.set_val(null)
                 set_rows_prepped(columns_prepped)
               }
             )

package/src/routes/[component]/Showcase/TableAdvanced/index.svelte

@@ -1397,144 +1397,169 @@
     ],
     is_more_to_load: true,
     on_event: async (input) => {
-      console.log("table_on_event", deep_copy({ input, variables }))
+      console.log("table_advanced_on_event", input)
+      if (input?.type == "update_table_server_sort") {
+        console.log("update_table_server_sort", input)
+        return { is_success: true }
+      }
       if (input?.type == "update_row") {
-        const path_to_set = input?.path
-        let variables_loc = deep_copy(variables)
-        let target = variables_loc
-        for (let i = 0; i < path_to_set.length - 1; i++) {
-          if (target[path_to_set[i]] === undefined || target[path_to_set[i]] === null) {
-            target[path_to_set[i]] = {}
+        console.log("update_row_cb", input)
+        const path = input?.path
+        mutate_variables_at_path(path, (parent, last_key) => {
+          parent[last_key] = input?.row
+        })
+        return { is_success: true, row: input?.row }
+      }
+      if (input?.type == "insert_row") {
+        console.log("insert_row", input)
+        const path = input?.path
+        mutate_variables_at_path(path, (parent, last_key) => {
+          if (Array.isArray(parent[last_key])) {
+            if (typeof last_key === "number") {
+              parent[last_key].splice(last_key, 0, input?.row)
+            } else {
+              parent[last_key].push(input?.row)
+            }
+          } else if (Array.isArray(parent)) {
+            parent.splice(last_key, 0, input?.row)
+          } else {
+            parent[last_key] = [input?.row]
           }
-          target = target[path_to_set[i]]
-        }
-        const last_key = path_to_set[path_to_set.length - 1]
-        target[last_key] = input?.row
-        variables = variables_loc
-        table_manager.reset_definition_stack([{ ...variables }])
-        return {
-          is_success: true,
-          row: target?.[last_key],
-        }
-      } else if (input?.type == "insert_row") {
-        const path_to_set = input?.path
-        let variables_loc = deep_copy(variables)
-        let target = variables_loc
-        for (let i = 0; i < path_to_set.length - 1; i++) {
-          if (target[path_to_set[i]] === undefined) {
-            target[path_to_set[i]] = {}
+        })
+        console.log("variables22", deep_copy(variables))
+        return { is_success: true }
+      }
+      if (input?.type == "bulk_insert_rows") {
+        console.log("bulk_insert_rows", input)
+        const path = input?.path
+        let rows_new = null
+        mutate_variables_at_path(path, (parent, last_key) => {
+          const items = Array.isArray(input?.rows) ? input.rows : []
+          if (Array.isArray(parent) && typeof last_key === "number") {
+            parent.splice(last_key, 0, ...items)
+            rows_new = parent
+            return
           }
-          target = target[path_to_set[i]]
-        }
-        const last_key = path_to_set[path_to_set.length - 1]
-        if (!Array.isArray(target)) {
-          throw new Error("Target is not an array")
-        }
-        target.splice(last_key, 0, input?.row)
-        variables = variables_loc
-        table_manager.reset_definition_stack([{ ...variables }])
-        return {
-          is_success: true,
-          row: target?.[last_key],
-        }
-      } else if (input?.type == "bulk_insert_rows") {
-        console.log("bulk_insert_rows")
-        const path_to_set = input?.path
-        let variables_loc = deep_copy(variables)
-        let target = variables_loc
-        for (let i = 0; i < path_to_set.length - 1; i++) {
-          if (target[path_to_set[i]] === undefined) {
-            target[path_to_set[i]] = {}
+          if (Array.isArray(parent[last_key])) {
+            parent[last_key].push(...items)
+            rows_new = parent[last_key]
+            return
           }
-          target = target[path_to_set[i]]
-        }
-        const last_key = path_to_set[path_to_set.length - 1]
-        if (!Array.isArray(target)) {
-          throw new Error("Target is not an array")
-        }
-        target.splice(last_key, 0, input?.value)
-        variables = variables_loc
-        table_manager.reset_definition_stack([{ ...variables }])
-        return {
-          is_success: true,
-          rows: target?.[last_key],
-        }
-      } else if (input?.type == "delete_row") {
-        console.log("delete_row", deep_copy(input))
-        const path_to_delete = input?.path
-        let variables_loc = deep_copy(variables)
-        let target = variables_loc
-        for (let i = 0; i < path_to_delete.length - 1; i++) {
-          if (target[path_to_delete[i]] === undefined) {
-            target[path_to_delete[i]] = {}
+          if (Array.isArray(parent) && last_key === undefined) {
+            parent.push(...items)
+            rows_new = parent
+            return
           }
-          target = target[path_to_delete[i]]
-        }
-        const last_key = path_to_delete[path_to_delete.length - 1]
-        if (Array.isArray(target)) {
-          target.splice(last_key, 1)
-        }
-        variables = variables_loc
-        console.log("variables", deep_copy(variables))
-        table_manager.reset_definition_stack([{ ...variables }])
-        return {
-          is_success: true,
-        }
-      } else if (input?.type == "bulk_delete_rows") {
-        console.log("bulk_delete_rows", deep_copy(input))
+          parent[last_key] = [...items]
+          rows_new = parent[last_key]
+        })
+        console.log("variables22", deep_copy(variables))
+        console.log("rows_new", rows_new)
+        return { is_success: true, rows: rows_new }
+      }
+      if (input?.type == "delete_row") {
+        console.log("delete_row", input)
+        const path = input?.path
+        mutate_variables_at_path(path, (parent, last_key) => {
+          if (Array.isArray(parent)) {
+            parent.splice(last_key, 1)
+          } else if (Array.isArray(parent[last_key])) {
+            parent[last_key].splice(last_key, 1)
+          } else {
+            delete parent[last_key]
+          }
+        })
+        return { is_success: true }
+      }
+      if (input?.type == "bulk_delete_rows") {
+        console.log("bulk_delete_rows")
+        const path = input?.path
+        let deleted_row_ids = []
+        mutate_variables_at_path(path, (parent, last_key) => {
+          let the_arr
+          if (Array.isArray(parent[last_key])) {
+            the_arr = parent[last_key]
+          } else if (Array.isArray(parent)) {
+            the_arr = parent
+          } else {
+            return
+          }
+          const sorted_indexes = (input?.row_indexes || []).slice().sort((a, b) => b - a)
+          for (let idx of sorted_indexes) {
+            const row = the_arr[idx]
+            if (row?.id) deleted_row_ids.push(row.id)
+            the_arr.splice(idx, 1)
+          }
+        })
         return {
           is_success: true,
-          row_ids_deleted: input?.row_ids,
+          deleted_row_ids: deleted_row_ids,
         }
-      } else if (input?.type == "insert_column") {
+      }
+      if (input?.type == "insert_column") {
         console.log("insert_column", deep_copy(input))
-        table_manager.set_columns(data?.columns)
-        return {
-          is_success: true,
-          column: input?.column,
-        }
-      } else if (input?.type == "update_column") {
+        return { is_success: true, column_id: input?.column?.id, column: input?.column }
+      }
+      if (input?.type == "update_column") {
         console.log("update_column", deep_copy(input))
-        return {
-          is_success: true,
-          column: input?.column,
-        }
-      } else if (input?.type == "delete_column") {
+        return { is_success: true, column_id: input?.column_id, column: input?.column }
+      }
+      if (input?.type == "delete_column") {
         console.log("delete_column", deep_copy(input))
-        return {
-          is_success: true,
-          column_id: input?.column_id,
-          column: input?.column,
-        }
-      } else if (input?.type == "update_table_name") {
+        return { is_success: true, column_id: input?.column_id }
+      }
+      if (input?.type == "update_table_name") {
         console.log("update_table_name", deep_copy(input))
-        return {
-          is_success: true,
-          table_name: input?.table_name,
-        }
-      } else if (input?.type == "update_table_description") {
+        return { is_success: true, table_name: input?.table_name }
+      }
+      if (input?.type == "update_table_description") {
         console.log("update_table_description", deep_copy(input))
-        return {
-          is_success: true,
-          table_description: input?.table_description,
-        }
-      } else if (input?.type == "delete_table") {
+        return { is_success: true, table_description: input?.table_description }
+      }
+      if (input?.type == "delete_table") {
         console.log("delete_table", deep_copy(input))
         return {
           is_success: true,
-          table_id: input?.table_id,
+          table_id: "abcdefg",
         }
-      } else if (input?.type == "load_more") {
+      }
+      if (input?.type == "load_more") {
         console.log("load_more", deep_copy(input))
-        return {
-          is_success: true,
-          rows: [],
-          is_more_to_load: true,
-        }
+        current_offset += 100
+        const load_more_res_body = { rows: [], total_rows: current_offset + 100 }
+        console.log("load_more_res_body", load_more_res_body)
+        let is_more_to_load = false
+        const path = input?.path
+        mutate_variables_at_path(path, (parent, last_key) => {
+          if (Array.isArray(parent[last_key])) {
+            parent[last_key].push(...load_more_res_body?.rows)
+            is_more_to_load = parent[last_key].length < load_more_res_body?.total_rows
+          } else {
+            parent[last_key] = [...load_more_res_body?.rows]
+            is_more_to_load = parent[last_key].length < load_more_res_body?.total_rows
+          }
+        })
+        console.log("variables_load_more", variables)
+        return { is_success: true, is_more_to_load }
       }
       console.log("unaccounted event", input)
     },
   })
+
+  function mutate_variables_at_path(path, mutator) {
+    const root = { variables: deep_copy(variables) }
+    let target = root
+    for (let i = 0; i < path.length - 1; i++) {
+      if (target[path[i]] === undefined || target[path[i]] === null) {
+        target[path[i]] = typeof path[i + 1] === "number" ? [] : {}
+      }
+      target = target[path[i]]
+    }
+    const last_key = path[path.length - 1]
+    mutator(target, last_key)
+    variables = root.variables
+    table_manager.reset_definition_stack([{ variables }])
+  }
 </script>
 
 <div>