nquery 0.1.0 → 0.1.2

data/app/models/nquery/data_source.rb

@@ -2,26 +2,161 @@
 
 module Nquery
   class DataSource < ApplicationRecord
-    ADAPTERS = %w[rails postgresql mysql sqlite].freeze
+    ADAPTER_OPTIONS = [
+      ["Application database", "rails"],
+      ["PostgreSQL", "postgresql"],
+      ["MySQL", "mysql"],
+      ["SQLite", "sqlite"]
+    ].freeze
+    ADAPTERS = ADAPTER_OPTIONS.map(&:last).freeze
+    REMOTE_ADAPTERS = %w[postgresql mysql].freeze
+    SSL_MODES = %w[disable require verify-ca verify-full].freeze
+
+    AR_ADAPTER_NAMES = {
+      "postgresql" => "postgresql",
+      "mysql" => "mysql2",
+      "sqlite" => "sqlite3"
+    }.freeze
+
+    DEFAULT_PORTS = {
+      "postgresql" => 5432,
+      "mysql" => 3306
+    }.freeze
+
+    # serialize must be declared before encrypts for structured attributes.
+    serialize :connection_config, coder: JSON
+    encrypts :connection_config
 
     has_many :data_permissions, class_name: "Nquery::DataPermission", dependent: :destroy
     has_many :queries, class_name: "Nquery::Query", dependent: :nullify
 
+    attr_accessor :host, :port, :database, :username, :password, :database_path, :sslmode, :connection_fields_submitted
+
     validates :name, presence: true
+    validates :key, uniqueness: true, allow_nil: true
     validates :adapter, inclusion: { in: ADAPTERS }
+    validate :validate_connection_fields, if: :connection_fields_submitted?
+
+    before_validation :compose_connection_config
 
     scope :active, -> { all }
 
+    def connection_fields_submitted?
+      ActiveModel::Type::Boolean.new.cast(connection_fields_submitted)
+    end
+
     def connection_config_hash
-      return {} if connection_config.blank?
+      value = connection_config
+      return {} if value.blank?
 
-      JSON.parse(connection_config)
+      hash = value.is_a?(String) ? JSON.parse(value) : value
+      normalize_config_hash(hash)
     rescue JSON::ParserError
       {}
     end
 
     def connection_config_hash=(hash)
-      self.connection_config = hash.to_json
+      self.connection_config = hash.presence
+    end
+
+    def default_port
+      DEFAULT_PORTS.fetch(adapter, DEFAULT_PORTS.fetch("postgresql")).to_s
+    end
+
+    def test_connection
+      compose_connection_config
+      validate_connection_fields if connection_fields_submitted?
+      return false if errors.any?
+
+      DataSources::Adapter.for(self).test_connection
+      true
+    rescue StandardError => e
+      errors.add(:base, e.message)
+      false
+    end
+
+    def assign_connection_fields_from_config
+      hash = connection_config_hash
+      self.host = hash["host"]
+      self.port = hash["port"]&.to_s
+      self.database = hash["database"]
+      self.username = hash["username"]
+      self.database_path = hash["database_path"].presence || hash["database"]
+      self.sslmode = hash["sslmode"]
+      self.password = nil
+    end
+
+  private
+
+    def compose_connection_config
+      if adapter == "rails"
+        self.connection_config = {}
+        return
+      end
+
+      assign_connection_config_from_fields if connection_fields_submitted?
+    end
+
+    def validate_connection_fields
+      case adapter
+      when *REMOTE_ADAPTERS
+        errors.add(:host, "can't be blank") if host.blank?
+        errors.add(:database, "can't be blank") if database.blank?
+        errors.add(:username, "can't be blank") if username.blank?
+        errors.add(:password, "can't be blank") if password.blank? && (new_record? || existing_password.blank?)
+        if sslmode.present? && !SSL_MODES.include?(sslmode)
+          errors.add(:sslmode, "is not included in the list")
+        end
+      when "sqlite"
+        errors.add(:database_path, "can't be blank") if database_path.blank?
+      end
+    end
+
+    def assign_connection_config_from_fields
+      previous = persisted? ? load_persisted_connection_config : {}
+
+      self.connection_config = case adapter
+                               when "sqlite"
+        {
+          "adapter" => AR_ADAPTER_NAMES.fetch(adapter),
+          "database" => database_path.to_s
+        }
+                               when *REMOTE_ADAPTERS
+        config = {
+          "adapter" => AR_ADAPTER_NAMES.fetch(adapter),
+          "host" => host.to_s,
+          "port" => resolved_port,
+          "database" => database.to_s,
+          "username" => username.to_s
+        }
+        config["password"] = resolved_password(previous)
+        config["sslmode"] = sslmode if sslmode.present?
+        config
+                               else
+        {}
+                               end
+    end
+
+    def resolved_port
+      port.presence&.to_i || default_port.to_i
+    end
+
+    def resolved_password(previous)
+      return password if password.present?
+
+      previous["password"]
+    end
+
+    def existing_password
+      connection_config_hash["password"]
+    end
+
+    def load_persisted_connection_config
+      normalize_config_hash(self.class.find(id).connection_config.presence || {})
+    end
+
+    def normalize_config_hash(hash)
+      hash.stringify_keys
     end
   end
 end

data/app/models/nquery/organization.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Nquery
+  class Organization < ApplicationRecord
+    IMAGE_CONTENT_TYPES = %w[image/png image/jpeg image/jpg image/webp].freeze
+    MAX_IMAGE_BYTE_SIZE = 5.megabytes
+
+    has_one_attached :logo
+    has_one_attached :cover_image
+
+    validates :name, presence: true
+    validate :acceptable_logo
+    validate :acceptable_cover_image
+
+    private
+
+    def acceptable_logo
+      validate_image_attachment(:logo)
+    end
+
+    def acceptable_cover_image
+      validate_image_attachment(:cover_image)
+    end
+
+    def validate_image_attachment(name)
+      attachment = public_send(name)
+      return unless attachment.attached?
+
+      unless attachment.blob.content_type.in?(IMAGE_CONTENT_TYPES)
+        errors.add(name, "must be a PNG, JPEG, or WebP")
+      end
+
+      return unless attachment.blob.byte_size > MAX_IMAGE_BYTE_SIZE
+
+      errors.add(name, "is too large (maximum is 5 MB)")
+    end
+  end
+end

data/app/models/nquery/query.rb

@@ -9,11 +9,19 @@ module Nquery
     has_many :audits, class_name: "Nquery::Audit", dependent: :nullify
 
     validates :name, presence: true, on: :update
+    validate :statement_must_be_readonly
 
     before_validation :set_default_name, on: :create
 
     def set_default_name
       self.name ||= "Untitled query"
     end
+
+    private
+
+    def statement_must_be_readonly
+      message = ReadonlySql.error_message(statement, allow_blank: true)
+      errors.add(:statement, message) if message
+    end
   end
 end

data/app/models/nquery/user.rb

@@ -2,7 +2,8 @@
 
 module Nquery
   class User < ApplicationRecord
-    has_secure_password validations: false
+    devise :database_authenticatable, :confirmable, :validatable,
+           confirm_within: 1.hour
 
     has_many :group_memberships, class_name: "Nquery::GroupMembership", dependent: :destroy
     has_many :groups, through: :group_memberships, class_name: "Nquery::Group"
@@ -16,18 +17,32 @@ module Nquery
             class_name: "Nquery::Collection", foreign_key: :owner_id, inverse_of: :owner, dependent: :destroy
 
     validates :email, presence: true, uniqueness: true
-    validates :password, length: { minimum: 8 }, if: -> { password.present? }
 
     scope :active, -> { where(deactivated_at: nil) }
 
+    # Set by #deliver_devise_notification so controllers can flash delivery failures.
+    attr_accessor :last_devise_notification_delivered
+
     def name
       [first_name, last_name].compact_blank.join(" ").presence || email
     end
 
+    def name_with_email
+      "#{name} (#{email})"
+    end
+
     def active?
       deactivated_at.nil?
     end
 
+    def active_for_authentication?
+      super && active?
+    end
+
+    def inactive_message
+      active? ? super : :inactive
+    end
+
     def deactivate!
       update!(deactivated_at: Time.current)
     end
@@ -36,14 +51,6 @@ module Nquery
       Permissions::Resolver.new(self).admin?
     end
 
-    def self.find_or_create_from_sso!(host_user)
-      external_id = host_user.id.to_s
-      find_or_create_by!(external_id: external_id) do |user|
-        user.email = host_user.try(:email) || "#{external_id}@sso.local"
-        user.first_name = host_user.try(:first_name) || host_user.try(:name)
-      end.tap(&:ensure_all_users_membership!)
-    end
-
     def ensure_all_users_membership!
       all_users = Group.find_by!(system_group: "all_users")
       group_memberships.find_or_create_by!(group: all_users)
@@ -54,5 +61,33 @@ module Nquery
 
       create_personal_collection!(name: "#{name}'s Personal Collection", kind: "personal")
     end
+
+    def password_required?
+      return false if new_record? && password.blank?
+
+      super
+    end
+
+    def confirmation_expired?
+      confirmation_period_expired?
+    end
+
+    # Returns false when delivery fails so callers can flash a warning instead of 500ing.
+    def deliver_devise_notification(notification, *args)
+      Nquery::DeviseMailer.send(notification, self, *args).deliver_now
+      self.last_devise_notification_delivered = true
+    rescue StandardError => error
+      self.last_devise_notification_delivered = false
+      Rails.logger.error(
+        "[nquery] Failed to deliver Devise #{notification} to #{email}: #{error.class}: #{error.message}"
+      )
+      false
+    end
+
+    protected
+
+    def send_devise_notification(notification, *args)
+      deliver_devise_notification(notification, *args)
+    end
   end
 end

data/app/views/nquery/admin/data_sources/_form.html.erb

@@ -0,0 +1,121 @@
+<% cancel_path = local_assigns.fetch(:cancel_path) %>
+<% submit_label = local_assigns.fetch(:submit_label) %>
+
+<%= form_with model: data_source, url: data_source_form_url(data_source), method: data_source_form_method(data_source), class: "nq-form nq-card",
+              data: {
+                controller: "data-source-form",
+                data_source_form_adapter_value: data_source.adapter,
+                data_source_form_test_url_value: test_connection_admin_data_sources_path,
+                data_source_form_id_value: data_source.persisted? ? data_source.id : nil
+              } do |f| %>
+  <% if data_source.errors.any? %>
+    <div class="nq-form-errors" role="alert">
+      <p><strong>Please fix the following:</strong></p>
+      <ul>
+        <% data_source.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <section class="nq-form-section">
+    <h2 class="nq-form-section-title">Details</h2>
+
+    <div class="nq-grid nq-grid-2 nq-form-grid">
+      <div class="nq-form-row">
+        <%= f.label :name %>
+        <%= f.text_field :name, class: "nq-input", placeholder: "e.g. Warehouse, Analytics", autofocus: !data_source.persisted? %>
+        <p class="nq-field-hint">A short label shown when picking a data source.</p>
+      </div>
+
+      <div class="nq-form-row">
+        <%= f.label :adapter %>
+        <%= f.select :adapter,
+                     options_for_select(Nquery::DataSource::ADAPTER_OPTIONS, data_source.adapter),
+                     {},
+                     class: "nq-input",
+                     data: { action: "change->data-source-form#toggle", data_source_form_target: "adapter" } %>
+        <p class="nq-field-hint">Choose how nquery connects to the database.</p>
+      </div>
+    </div>
+
+    <p data-data-source-form-target="railsHint" class="nq-field-hint" hidden>
+      Uses the host Rails application database connection. No additional credentials are required.
+    </p>
+  </section>
+
+  <section class="nq-form-section" data-data-source-form-target="remoteFields" hidden>
+    <h2 class="nq-form-section-title">Connection</h2>
+
+    <div class="nq-grid nq-grid-2 nq-form-grid">
+      <div class="nq-form-row">
+        <%= f.label :host %>
+        <%= f.text_field :host, class: "nq-input", placeholder: "localhost", autocomplete: "off" %>
+      </div>
+
+      <div class="nq-form-row">
+        <%= f.label :port %>
+        <%= f.number_field :port, class: "nq-input", placeholder: data_source.default_port, min: 1, max: 65_535,
+                           data: { data_source_form_target: "port" } %>
+        <p class="nq-field-hint">Leave blank to use the default port.</p>
+      </div>
+    </div>
+
+    <div class="nq-grid nq-grid-2 nq-form-grid">
+      <div class="nq-form-row">
+        <%= f.label :database %>
+        <%= f.text_field :database, class: "nq-input", autocomplete: "off" %>
+      </div>
+
+      <div class="nq-form-row">
+        <%= f.label :sslmode, "SSL mode (optional)" %>
+        <%= f.select :sslmode,
+                     options_for_select([["Default", ""]] + Nquery::DataSource::SSL_MODES.map { |mode| [mode, mode] }, data_source.sslmode),
+                     {},
+                     class: "nq-input" %>
+      </div>
+    </div>
+
+    <div class="nq-grid nq-grid-2 nq-form-grid">
+      <div class="nq-form-row">
+        <%= f.label :username %>
+        <%= f.text_field :username, class: "nq-input", autocomplete: "off" %>
+      </div>
+
+      <div class="nq-form-row">
+        <%= f.label :password %>
+        <%= f.password_field :password, class: "nq-input", autocomplete: "new-password",
+                             placeholder: data_source.persisted? ? "Leave blank to keep current password" : nil %>
+      </div>
+    </div>
+  </section>
+
+  <section class="nq-form-section" data-data-source-form-target="sqliteFields" hidden>
+    <h2 class="nq-form-section-title">SQLite database</h2>
+
+    <div class="nq-form-row">
+      <%= f.label :database_path, "Database path" %>
+      <%= f.text_field :database_path, class: "nq-input", placeholder: "/path/to/database.sqlite3" %>
+      <p class="nq-field-hint">Absolute path to the SQLite file on the server.</p>
+    </div>
+  </section>
+
+  <% if data_source.persisted? %>
+    <section class="nq-form-section">
+      <div class="nq-form-row">
+        <label><%= f.check_box :active %> Active</label>
+        <p class="nq-field-hint">Inactive data sources are hidden from query and chart builders.</p>
+      </div>
+    </section>
+  <% end %>
+
+  <div class="nq-form-actions">
+    <button type="button" class="nq-btn nq-form-actions-start" data-data-source-form-target="testButton" data-manages-loading="true">
+      Test Connection
+    </button>
+    <%= link_to "Cancel", cancel_path, class: "nq-btn" %>
+    <%= f.submit submit_label, class: "nq-btn nq-btn-primary" %>
+  </div>
+  <p class="nq-connection-status" data-data-source-form-target="testStatus" role="status" hidden></p>
+<% end %>

data/app/views/nquery/admin/data_sources/edit.html.erb

@@ -1,8 +1,6 @@
-<div class="nq-page-header"><h1>Edit data source</h1></div>
-<%= form_with model: @data_source, url: admin_data_source_path(@data_source), method: :patch, class: "nq-form nq-card" do |f| %>
-  <div class="nq-form-row"><%= f.label :name %><%= f.text_field :name, class: "nq-input" %></div>
-  <div class="nq-form-row"><%= f.label :adapter %><%= f.select :adapter, Nquery::DataSource::ADAPTERS, {}, class: "nq-input" %></div>
-  <div class="nq-form-row"><%= f.label :connection_config %><%= f.text_area :connection_config, class: "nq-textarea", rows: 4 %></div>
-  <div class="nq-form-row"><label><%= f.check_box :active %> Active</label></div>
-  <%= f.submit "Update", class: "nq-btn nq-btn-primary" %>
-<% end %>
+<div class="nq-page-header">
+  <h1>Edit data source</h1>
+  <p class="nq-muted nq-resource-meta">Update connection settings for <%= @data_source.name %>.</p>
+</div>
+
+<%= render "form", data_source: @data_source, cancel_path: admin_data_sources_path, submit_label: "Save changes" %>

data/app/views/nquery/admin/data_sources/new.html.erb

@@ -1,7 +1,6 @@
-<div class="nq-page-header"><h1>New data source</h1></div>
-<%= form_with model: @data_source, url: admin_data_sources_path, class: "nq-form nq-card" do |f| %>
-  <div class="nq-form-row"><%= f.label :name %><%= f.text_field :name, class: "nq-input" %></div>
-  <div class="nq-form-row"><%= f.label :adapter %><%= f.select :adapter, Nquery::DataSource::ADAPTERS, {}, class: "nq-input" %></div>
-  <div class="nq-form-row"><%= f.label :connection_config, "Connection (JSON)" %><%= f.text_area :connection_config, class: "nq-textarea", rows: 4, placeholder: '{"host":"localhost","database":"mydb"}' %></div>
-  <%= f.submit "Create", class: "nq-btn nq-btn-primary" %>
-<% end %>
+<div class="nq-page-header">
+  <h1>New data source</h1>
+  <p class="nq-muted nq-resource-meta">Connect a database so your team can query and chart data.</p>
+</div>
+
+<%= render "form", data_source: @data_source, cancel_path: admin_data_sources_path, submit_label: "Create data source" %>

data/app/views/nquery/admin/groups/_form.html.erb

@@ -0,0 +1,47 @@
+<% cancel_path = local_assigns.fetch(:cancel_path) %>
+<% submit_label = local_assigns.fetch(:submit_label) %>
+<% form_url = group.persisted? ? admin_group_path(group) : admin_groups_path %>
+<% form_method = group.persisted? ? :patch : :post %>
+
+<%= form_with model: group, url: form_url, method: form_method, class: "nq-form nq-form-card" do |f| %>
+  <% if group.errors.any? %>
+    <div class="nq-form-errors" role="alert">
+      <p><strong>Please fix the following:</strong></p>
+      <ul>
+        <% group.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <% if group.persisted? && group.system? %>
+    <%= nq_flash_card "This is a system group. The name is fixed, but you can update the description.", type: :info, toast: false %>
+  <% end %>
+
+  <section class="nq-form-section">
+    <h2 class="nq-form-section-title">Group details</h2>
+
+    <div class="nq-form-row">
+      <%= f.label :name %>
+      <% if group.system? %>
+        <%= f.text_field :name, class: "nq-input", disabled: true %>
+        <p class="nq-field-hint">System group names cannot be changed.</p>
+      <% else %>
+        <%= f.text_field :name, class: "nq-input", placeholder: "e.g. Finance, Engineering", autofocus: !group.persisted? %>
+        <p class="nq-field-hint">Choose a name members will recognize.</p>
+      <% end %>
+    </div>
+
+    <div class="nq-form-row">
+      <%= f.label :description, "Description (optional)" %>
+      <%= f.text_area :description, class: "nq-input nq-textarea-prose", rows: 3, placeholder: "What this group is for and who should belong to it." %>
+      <p class="nq-field-hint">Shown on the group page and helps others understand its purpose.</p>
+    </div>
+  </section>
+
+  <div class="nq-form-actions">
+    <%= link_to "Cancel", cancel_path, class: "nq-btn" %>
+    <%= f.submit submit_label, class: "nq-btn nq-btn-primary" %>
+  </div>
+<% end %>

data/app/views/nquery/admin/groups/edit.html.erb

@@ -1,6 +1,15 @@
-<div class="nq-page-header"><h1>Edit group</h1></div>
-<%= form_with model: @group, url: admin_group_path(@group), method: :patch, class: "nq-form nq-card" do |f| %>
-  <div class="nq-form-row"><%= f.label :name %><%= f.text_field :name, class: "nq-input", disabled: @group.system? %></div>
-  <div class="nq-form-row"><%= f.label :description %><%= f.text_area :description, class: "nq-textarea" %></div>
-  <%= f.submit "Update", class: "nq-btn nq-btn-primary" unless @group.system? && @group.system_group != "custom" %>
-<% end %>
+<div class="nq-page-header">
+  <h1>Edit group</h1>
+  <p class="nq-muted nq-resource-meta">
+    <%= @group.name %>
+    · <%= group_type_label(@group) %>
+    · <%= pluralize(@group.users.size, "member") %>
+  </p>
+  <div class="nq-actions">
+    <%= link_to admin_group_path(@group), class: "nq-btn" do %>
+      <span>View members</span>
+    <% end %>
+  </div>
+</div>
+
+<%= render "form", group: @group, cancel_path: admin_group_path(@group), submit_label: "Save changes" %>

data/app/views/nquery/admin/groups/index.html.erb

@@ -1,21 +1,26 @@
-<div class="nq-page-header"><h1>Groups</h1><%= link_to "New group", new_admin_group_path, class: "nq-btn nq-btn-primary" %></div>
-
-<div class="nq-card nq-card-table">
-  <table class="nq-table">
-    <thead><tr><th>Name</th><th>Type</th><th>Members</th><th></th></tr></thead>
-    <tbody>
-      <% @groups.each do |group| %>
-        <tr>
-          <td><%= link_to group.name, admin_group_path(group) %></td>
-          <td><span class="nq-badge"><%= group.system_group %></span></td>
-          <td><%= group.users.count %></td>
-          <td>
-            <div class="nq-actions">
-              <%= link_to "Edit", edit_admin_group_path(group), class: "nq-btn" unless group.system? && group.system_group != "custom" %>
-            </div>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+<div class="nq-page-header">
+  <h1>Groups</h1>
+  <p class="nq-muted nq-resource-meta">Organize users into groups to manage access and permissions.</p>
+  <%= link_to new_admin_group_path, class: "nq-btn nq-btn-primary" do %>
+    <%= nq_icon(:plus) %>
+    <span>New group</span>
+  <% end %>
 </div>
+
+<%= nq_card_table columns: ["Name", "Description", "Type", "Members", ""] do %>
+  <% @groups.each do |group| %>
+    <tr>
+      <td><%= link_to group.name, admin_group_path(group) %></td>
+      <td class="nq-muted"><%= group.description.presence || "—" %></td>
+      <td>
+        <span class="nq-badge <%= group_type_badge_class(group) %>"><%= group_type_label(group) %></span>
+      </td>
+      <td><%= group.users.size %></td>
+      <td>
+        <div class="nq-actions">
+          <%= link_to "Edit", edit_admin_group_path(group), class: "nq-btn" %>
+        </div>
+      </td>
+    </tr>
+  <% end %>
+<% end %>

data/app/views/nquery/admin/groups/new.html.erb

@@ -1,6 +1,6 @@
-<div class="nq-page-header"><h1>New group</h1></div>
-<%= form_with model: @group, url: admin_groups_path, class: "nq-form nq-card" do |f| %>
-  <div class="nq-form-row"><%= f.label :name %><%= f.text_field :name, class: "nq-input" %></div>
-  <div class="nq-form-row"><%= f.label :description %><%= f.text_area :description, class: "nq-textarea" %></div>
-  <%= f.submit "Create", class: "nq-btn nq-btn-primary" %>
-<% end %>
+<div class="nq-page-header">
+  <h1>New group</h1>
+  <p class="nq-muted nq-resource-meta">Create a group to organize users and manage permissions together.</p>
+</div>
+
+<%= render "form", group: @group, cancel_path: admin_groups_path, submit_label: "Create group" %>