databasium 0.1.0 → 0.1.1

data/app/assets/javascript/databasium/controllers/table_controller.js

@@ -48,6 +48,10 @@ export default class extends Controller {
     if (!e.target.closest("input, label, a, button")) {
       checkbox.checked = !checkbox.checked;
     }
+    // new records were rendered
+    if (this.deleteButtonTarget.parentElement.classList.contains("hidden")) {
+      this.resetDeleteButton();
+    }
     this.updateDeleteButton(checkbox.checked);
     this.allRecordsSelected = this.checkboxTargets.length === this.selectedRecords;
     this.updateStyleOfToggleAllRecordsButton();
@@ -159,6 +163,7 @@ export default class extends Controller {
 
   createAddRecordForm(row) {
     const form = this.element.querySelector("#addRecord").cloneNode(true);
+    this.uniquifyTurboFrames(form, `_${row.id}`);
     form.id = `record-form-${row.id}`;
     form.classList.remove("hidden", "max-h-100");
     // 135px is the space up to the open form cant define as constants because of tailwind dynamic classes
@@ -202,6 +207,27 @@ export default class extends Controller {
 
     return form;
   }
+  // this need to be done as also add tab contains the model froms and the ids would fight
+  uniquifyTurboFrames(root, suffix) {
+    root.querySelectorAll("turbo-frame[id]").forEach((frame) => {
+      frame.id = `${frame.id}${suffix}`;
+    });
+
+    root.querySelectorAll("[data-turbo-frame]").forEach((el) => {
+      const frame = el.getAttribute("data-turbo-frame");
+      if (frame && frame !== "_top") {
+        el.setAttribute("data-turbo-frame", `${frame}${suffix}`);
+      }
+    });
+
+    root.querySelectorAll("a[href]").forEach((link) => {
+      const url = new URL(link.href, window.location.origin);
+      const frameId = url.searchParams.get("frame_id");
+      if (!frameId) return;
+      url.searchParams.set("frame_id", `${frameId}${suffix}`);
+      link.href = url.toString();
+    });
+  }
 
   openTab(e, givenRecordId = null) {
     const recordId = givenRecordId || e.currentTarget.dataset.recordId;

data/app/components/databasium/records/foreign_records.rb

@@ -23,10 +23,7 @@ module Components
             div(
               class:
                 "relative bg-panel p-4 rounded-xl border-1 border-border w-fit max-w-[50vw] flex flex-col h-[90dvh] overflow-auto shadow-2xl",
-              id: @frame_id,
-              data: {
-                action: "click->table-select#stopPropagation"
-              }
+              id: @frame_id
             ) do
               render_title
               render_selected_record

data/app/components/databasium/type_select.rb

@@ -27,7 +27,7 @@ module Components
             %w[binary Binary],
             %w[boolean Boolean],
             %w[references Reference]
-          ].each { |value, label| option(value: value, selected: @value == value) { label } }
+          ].each { |value, label| option(value: value, selected: @value.to_s == value.to_s) { label } }
         end
       end
     end

data/app/controllers/databasium/application_controller.rb

@@ -14,9 +14,6 @@ module Databasium
     end
 
     def render_error_flash(error)
-      Rails.logger.error("[Databasium] #{error.class}: #{error.message}")
-      Rails.logger.error(error.backtrace.join("\n")) if error.backtrace
-
       return if performed?
 
       message, details = error_message_parts(error)
@@ -53,12 +50,20 @@ module Databasium
       end
     end
 
+    def raise_user_error(message)
+      raise Databasium::UserFacingError, message
+    end
+
     def error_message_parts(error)
       lines = strip_ansi(error.message.to_s).lines.map(&:chomp)
       message = lines.shift.presence || "Something went wrong"
-      details = lines.join("\n")
+      details = lines.join("\n").presence
+
+      unless error.is_a?(Databasium::UserFacingError)
+        details ||= strip_ansi(error.backtrace&.join("\n").to_s).presence
+      end
 
-      [ message, details.presence || strip_ansi(error.backtrace&.join("\n").to_s).presence ]
+      [ message, details ]
     end
 
     def strip_ansi(text)

data/app/controllers/databasium/migrations_controller.rb

@@ -43,6 +43,7 @@ class Databasium::MigrationsController < Databasium::ApplicationController
       success = @migration_service.save_migration(migration_params)
     else
       content = @migration_service.generate_migration(migration_params)
+      raise_user_error("Please provide a table name to generate a migration") unless content
     end
 
     if success
@@ -61,7 +62,7 @@ class Databasium::MigrationsController < Databasium::ApplicationController
 
   def sidebar
     pagy, migrations =
-      pagy(@migration_service.get_migrations(params[:search]), limit: 5, root_key: "migrations")
+      pagy(@migration_service.get_migrations(params[:search]), limit: 7, root_key: "migrations")
     pending_migrations = @migration_service.pending_migrations
 
     render Components::Databasium::SearchResults::Migrations.new(

data/app/controllers/databasium/models_controller.rb

@@ -12,6 +12,7 @@ class Databasium::ModelsController < Databasium::ApplicationController
   def show
     model = params[:id]
     content = @model_service.read_model_file(model)
+    raise_user_error("Model file not found for #{model}.") unless content
     attributes = @model_service.get_model_data_from_file(model)
     models = @model_service.get_all_models_from_db(search: params[:search])
 

data/app/controllers/databasium/records_controller.rb

@@ -10,7 +10,9 @@ class Databasium::RecordsController < Databasium::ApplicationController
 
   def create
     new_record = @record_service.create_new(attributes: model_columns_params)
-    raise ActiveRecord::RecordInvalid, new_record.errors.full_messages.join(", ") unless new_record
+    unless new_record && new_record.valid?
+      return raise_user_error(new_record.errors.full_messages.join(", "))
+    end
 
     render turbo_stream: [
              turbo_stream.append(
@@ -25,13 +27,10 @@ class Databasium::RecordsController < Databasium::ApplicationController
   end
 
   def records
+    raise_user_error("Missing model for #{params[:table]} table.") if @model.blank?
     @context = records_context
-    pagy, records =
-      pagy(
-        @record_service.filter_records(filter_params),
-        limit: params[:limit].presence || 10,
-        root_key: "records"
-      )
+    raw_records = @record_service.filter_records(filter_params)
+    pagy, records = pagy(raw_records, limit: params[:limit].presence || 10, root_key: "records")
 
     if foreign_records_frame?(@context[:turbo_frame])
       render_foreign_records_table
@@ -45,7 +44,7 @@ class Databasium::RecordsController < Databasium::ApplicationController
 
   def update
     record = @record_service.update_by_id(params[:id], attributes: model_columns_params)
-    raise ActiveRecord::RecordInvalid, record.errors.full_messages.join(", ") unless record
+    raise_user_error(record.errors.full_messages.join(", ")) unless record
     render turbo_stream:
              turbo_stream.replace(
                dom_id(record),
@@ -58,9 +57,7 @@ class Databasium::RecordsController < Databasium::ApplicationController
 
   def bulk_destroy
     deleted_records = @record_service.bulk_destroy(params[:ids])
-    unless deleted_records
-      raise ActiveRecord::RecordInvalid, deleted_records.errors.full_messages.join(", ")
-    end
+    raise_user_error(deleted_records.errors.full_messages.join(", ")) unless deleted_records
 
     doms_ids = deleted_records.map { |record| dom_id(record) }
 

data/app/services/databasium/migration.rb

@@ -74,7 +74,7 @@ class Databasium::Migration
   def generate_migration(params)
     unless params[:table_name_from].present? || params[:table_name_to].present? ||
              params[:table_name].present?
-      raise "Please provide a table name to generate a migration"
+      return nil
     end
 
     require "rails/generators/active_record/migration/migration_generator"

data/app/services/databasium/model.rb

@@ -30,7 +30,11 @@ class Databasium::Model
   end
 
   def read_model_file(model_name)
-    File.read(model_file_path(model_name))
+    begin
+      File.read(model_file_path(model_name))
+    rescue Errno::ENOENT
+      nil
+    end
   end
 
   def get_model_data_from_file(model_name)

data/app/services/databasium/record.rb

@@ -29,7 +29,7 @@ class Databasium::Record
 
   def filter_records(filter)
     records = @model&.all
-    return records if filter.nil? || @model.nil?
+    return [] if filter.nil? || @model.nil? || records.blank?
     connectors = Array(filter[:operator_types]).map(&:to_s)
     allowed_operators = %w[eq not_eq gt lt gteq lteq matches does_not_match]
     combined_predicate = nil

data/app/services/databasium/schema.rb

@@ -9,7 +9,7 @@ class Databasium::Schema
   def sync!(schema: nil)
     path = Rails.root.join("storage")
     FileUtils.mkdir_p(path) unless Dir.exist?(path)
-    File.write(path.join("schema_graph.json"), schema || build_schema.to_json)
+    File.write(path.join("schema_graph.json"), (schema || build_schema).to_json)
   end
 
   def get_associations(table)

data/lib/databasium/engine.rb

@@ -2,6 +2,7 @@
 
 require "databasium/engine_mount"
 require "databasium/middleware/conditional_check_pending"
+require "databasium/user_facing_error"
 
 module Databasium
   class Engine < ::Rails::Engine

data/lib/databasium/user_facing_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Databasium
+  class UserFacingError < StandardError
+  end
+end

data/lib/databasium/version.rb

@@ -1,3 +1,3 @@
 module Databasium
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: databasium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Róbert Švihla
@@ -242,6 +242,7 @@ files:
 - lib/databasium/templates/create_table_migration.rb.tt
 - lib/databasium/templates/migration.rb.tt
 - lib/databasium/templates/model.rb.tt
+- lib/databasium/user_facing_error.rb
 - lib/databasium/version.rb
 - lib/tasks/databasium_tasks.rake
 homepage: https://github.com/Unitato1/databasium