nquery 0.1.0 → 0.1.2

data/app/controllers/concerns/nquery/chart_results.rb

@@ -9,14 +9,28 @@ module Nquery
     def chart_result(chart)
       return demo_result unless chart.query&.statement.present?
 
+      chart_query_result(chart)
+    rescue StandardError
+      demo_result
+    end
+
+    def chart_builder_result(chart)
+      return nil unless chart.query&.statement.present?
+
+      chart_query_result(chart, audit: false)
+    rescue QueryRunner::PermissionError, QueryRunner::Error => e
+      { error: e.message }
+    rescue StandardError => e
+      { error: e.message }
+    end
+
+    def chart_query_result(chart, audit: true)
       QueryRunner.new(
         data_source: chart.query.data_source || DataSource.first,
         statement: chart.query.statement,
         user: current_nquery_user,
         query: chart.query
-      ).run
-    rescue StandardError
-      demo_result
+      ).run(audit: audit)
     end
 
     def demo_result

data/app/controllers/nquery/admin/data_sources_controller.rb

@@ -15,6 +15,8 @@ module Nquery
 
       def create
         @data_source = DataSource.new(data_source_params)
+        @data_source.connection_fields_submitted = connection_fields_required?(@data_source.adapter)
+
         if @data_source.save
           redirect_to admin_data_sources_path, notice: "Data source created."
         else
@@ -23,24 +25,69 @@ module Nquery
       end
 
       def edit
+        @data_source.assign_connection_fields_from_config
       end
 
       def update
-        if @data_source.update(data_source_params)
+        @data_source.assign_attributes(data_source_params)
+        @data_source.connection_fields_submitted = connection_fields_required?(@data_source.adapter)
+
+        if @data_source.save
           redirect_to admin_data_sources_path, notice: "Data source updated."
         else
+          @data_source.assign_connection_fields_from_config unless @data_source.connection_fields_submitted?
           render :edit, status: :unprocessable_content
         end
       end
 
+      def test_connection
+        @data_source = data_source_for_connection_test
+        unless @data_source
+          render json: { ok: false, error: "Data source not found." }, status: :not_found
+          return
+        end
+
+        @data_source.assign_attributes(data_source_params)
+        @data_source.connection_fields_submitted = connection_fields_required?(@data_source.adapter)
+
+        if @data_source.test_connection
+          render json: { ok: true, message: "Connection successful." }
+        else
+          render json: { ok: false, error: @data_source.errors.full_messages.to_sentence },
+                 status: :unprocessable_content
+        end
+      end
+
       private
 
       def set_data_source
         @data_source = DataSource.find(params[:id])
       end
 
+      def data_source_for_connection_test
+        id = params[:data_source_id].presence
+        return DataSource.new if id.blank?
+
+        DataSource.find_by(id: id)
+      end
+
       def data_source_params
-        params.require(:data_source).permit(:name, :adapter, :active, :connection_config)
+        params.require(:data_source).permit(
+          :name,
+          :adapter,
+          :active,
+          :host,
+          :port,
+          :database,
+          :username,
+          :password,
+          :database_path,
+          :sslmode
+        )
+      end
+
+      def connection_fields_required?(adapter)
+        DataSource::REMOTE_ADAPTERS.include?(adapter) || adapter == "sqlite"
       end
     end
   end

data/app/controllers/nquery/admin/groups_controller.rb

@@ -10,7 +10,8 @@ module Nquery
       end
 
       def show
-        @available_users = User.active.where.not(id: @group.user_ids).order(:email)
+        @members = @group.users.order(:first_name, :last_name, :email)
+        @available_users = User.active.where.not(id: @group.user_ids).order(:first_name, :last_name, :email)
       end
 
       def new
@@ -44,8 +45,13 @@ module Nquery
       end
 
       def remove_member
+        if @group.system_group == "all_users"
+          redirect_to admin_group_path(@group), alert: "Members cannot be removed from the All Users group."
+          return
+        end
+
         membership = @group.group_memberships.find_by!(user_id: params[:user_id])
-        membership.destroy unless @group.system_group == "all_users"
+        membership.destroy!
         redirect_to admin_group_path(@group), notice: "Member removed."
       end
 

data/app/controllers/nquery/admin/users_controller.rb

@@ -23,7 +23,12 @@ module Nquery
           assign_groups(@user)
           @user.ensure_all_users_membership!
           @user.ensure_personal_collection!
-          redirect_to admin_users_path, notice: "User created."
+          if @user.last_devise_notification_delivered == false
+            redirect_to admin_users_path,
+                        alert: "User invited, but the confirmation email could not be sent. Check your mailer settings."
+          else
+            redirect_to admin_users_path, notice: "User invited. A confirmation email was sent."
+          end
         else
           @groups = Group.order(:name)
           render :new, status: :unprocessable_content

data/app/controllers/nquery/application_controller.rb

@@ -2,6 +2,7 @@
 
 module Nquery
   class ApplicationController < ActionController::Base
+    include Devise::Controllers::Helpers
     include Nquery::AuthorizesCollection
     include Nquery::Breadcrumbs
     include Nquery::Engine.routes.url_helpers
@@ -9,50 +10,66 @@ module Nquery
     protect_from_forgery with: :exception
     layout "nquery/application"
 
-    helper_method :current_nquery_user, :permission_resolver
+    helper_method :current_nquery_user, :permission_resolver, :login_path, :logout_path
 
-    before_action :_authenticate!
+    before_action :redirect_to_onboarding, unless: :skip_onboarding_redirect?
+    before_action :authenticate_nquery_user!, unless: :auth_exempt?
     before_action :set_current_user_context
 
+    rescue_from StandardError, with: :render_internal_server_error
+    rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
     private
 
-    def _authenticate!
-      if Nquery.configuration.authenticate
-        instance_eval(&Nquery.configuration.authenticate)
-      else
-        default_authenticate!
-      end
-    end
+    def redirect_to_onboarding
+      return if Onboarding.complete?
 
-    def default_authenticate!
-      return if current_nquery_user
-      return if auth_exempt?
+      redirect_to new_onboarding_company_path
+    end
 
-      redirect_to login_path, alert: "Please sign in to continue."
+    def skip_onboarding_redirect?
+      auth_exempt? || Onboarding.complete?
     end
 
     def auth_exempt?
-      controller_path.in?(%w[nquery/sessions nquery/registrations nquery/embed/charts nquery/embed/dashboards])
+      controller_path.in?(%w[
+        nquery/sessions
+        nquery/onboarding/companies
+        nquery/onboarding/admins
+        nquery/onboarding/congrats
+        nquery/onboarding/confirmations
+        nquery/embed/charts
+        nquery/embed/dashboards
+        nquery/errors
+      ])
     end
 
-    def current_nquery_user
-      @current_nquery_user ||= resolve_current_user
+    def render_not_found(_error = nil)
+      render template: "nquery/errors/not_found", layout: "nquery/auth", status: :not_found
     end
 
-    def resolve_current_user
-      if session[:nquery_user_id]
-        return User.active.find_by(id: session[:nquery_user_id])
-      end
+    def render_internal_server_error(error)
+      raise error if show_detailed_exceptions?
 
-      if Nquery.configuration.authentication_mode.in?(%i[sso hybrid])
-        host_method = Nquery.configuration.current_user_method
-        host_user = host_method.is_a?(Symbol) ? send(host_method) : instance_eval(&host_method)
-        if host_user && Nquery.configuration.resolve_user
-          return instance_eval { Nquery.configuration.resolve_user.call(host_user) }
-        end
-      end
+      Rails.logger.error("[nquery] #{error.class}: #{error.message}\n#{error.backtrace&.first(15)&.join("\n")}")
+      render template: "nquery/errors/internal_server_error", layout: "nquery/auth", status: :internal_server_error
+    end
+
+    def show_detailed_exceptions?
+      Rails.application.config.consider_all_requests_local
+    end
+
+
+    def login_path(**options)
+      new_nquery_user_session_path(**options)
+    end
+
+    def logout_path(**options)
+      destroy_nquery_user_session_path(**options)
+    end
 
-      nil
+    def sign_in_nquery_user(user)
+      sign_in(:nquery_user, user)
     end
 
     def set_current_user_context

data/app/controllers/nquery/dashboards_controller.rb

@@ -11,6 +11,29 @@ module Nquery
 
     def index
       @dashboards = filter_viewable_dashboards(Dashboard.active.includes(:collection).order(:name))
+      @collections = assignable_collections
+    end
+
+    def new
+      @collections = assignable_collections
+      if @collections.empty?
+        redirect_to dashboards_path, alert: "You do not have permission to create a dashboard."
+        return
+      end
+      @dashboard = Dashboard.new(collection: default_dashboard_collection)
+    end
+
+    def create
+      @collections = assignable_collections
+      @dashboard = Dashboard.new(dashboard_params.merge(creator: current_nquery_user))
+      authorize_collection_access!(@dashboard.collection, required: :curate) if @dashboard.collection
+      return if performed?
+
+      if @dashboard.save
+        redirect_to dashboard_path(@dashboard), notice: "Dashboard created."
+      else
+        render :new, status: :unprocessable_content
+      end
     end
 
     def show
@@ -86,5 +109,12 @@ module Nquery
     def dashboard_params
       params.require(:dashboard).permit(:name, :description, :collection_id, settings: {})
     end
+
+    def default_dashboard_collection
+      root = Collection.roots.first
+      return root if root && @collections.include?(root)
+
+      @collections.first
+    end
   end
 end

data/app/controllers/nquery/embed/charts_controller.rb

@@ -4,6 +4,7 @@ module Nquery
   module Embed
     class ChartsController < ActionController::Base
       include Nquery::Engine.routes.url_helpers
+      protect_from_forgery with: :exception
       layout "nquery/embed"
 
       def show

data/app/controllers/nquery/embed/dashboards_controller.rb

@@ -4,6 +4,7 @@ module Nquery
   module Embed
     class DashboardsController < ActionController::Base
       include Nquery::Engine.routes.url_helpers
+      protect_from_forgery with: :exception
       layout "nquery/embed"
 
       def show

data/app/controllers/nquery/errors_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Nquery
+  class ErrorsController < ApplicationController
+    layout "nquery/auth"
+
+    def not_found
+      render status: :not_found
+    end
+  end
+end

data/app/controllers/nquery/home_controller.rb

@@ -11,6 +11,7 @@ module Nquery
       @recent_charts = filter_viewable_charts(charts).first(6)
       @recent_dashboards = filter_viewable_dashboards(dashboards).first(6)
       @root_collection = Collection.roots.first
+      @collections = assignable_collections
     end
   end
 end

data/app/controllers/nquery/onboarding/admins_controller.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Nquery
+  module Onboarding
+    class AdminsController < BaseController
+      before_action :redirect_if_pending_confirmation!, only: %i[new create]
+      before_action :require_organization!
+
+      def new
+        @user = User.new
+      end
+
+      def create
+        @user = User.new(admin_params)
+        if @user.valid?
+          result = Onboarding::AdminProvisioner.call(@user)
+          session[:onboarding_admin_email] = result.user.email
+          if result.mail_delivered?
+            redirect_to onboarding_congrats_path
+          else
+            redirect_to onboarding_congrats_path,
+                        alert: "Your admin account was created, but the confirmation email could not be sent. Check your mailer settings."
+          end
+        else
+          render :new, status: :unprocessable_content
+        end
+      end
+
+      private
+
+      def require_organization!
+        return if session[:onboarding_organization_id].present? && Organization.exists?(id: session[:onboarding_organization_id])
+
+        redirect_to new_onboarding_company_path, alert: "Please set up your company first."
+      end
+
+      def admin_params
+        params.require(:user).permit(:email, :first_name, :last_name)
+      end
+    end
+  end
+end

data/app/controllers/nquery/onboarding/base_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Nquery
+  module Onboarding
+    class BaseController < ApplicationController
+      skip_before_action :authenticate_nquery_user!
+      skip_before_action :redirect_to_onboarding
+      before_action :ensure_onboarding_available!
+
+      layout "nquery/auth"
+
+      private
+
+      def ensure_onboarding_available!
+        return unless Onboarding.complete?
+
+        redirect_to login_path, alert: "Onboarding has already been completed."
+      end
+
+      def redirect_if_pending_confirmation!
+        return unless Onboarding.pending_admin_confirmation?
+
+        redirect_to onboarding_congrats_path, alert: "Please confirm your email to continue setup."
+      end
+    end
+  end
+end

data/app/controllers/nquery/onboarding/companies_controller.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Nquery
+  module Onboarding
+    class CompaniesController < BaseController
+      before_action :redirect_if_pending_confirmation!, only: %i[new create]
+
+      def new
+        @organization = Organization.new
+      end
+
+      def create
+        @organization = Organization.first_or_initialize
+        @organization.assign_attributes(organization_params)
+        if @organization.save
+          session[:onboarding_organization_id] = @organization.id
+          redirect_to new_onboarding_admin_path
+        else
+          render :new, status: :unprocessable_content
+        end
+      end
+
+      private
+
+      def organization_params
+        params.require(:organization).permit(:name, :website, :logo, :cover_image)
+      end
+    end
+  end
+end

data/app/controllers/nquery/onboarding/confirmations_controller.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Nquery
+  module Onboarding
+    class ConfirmationsController < BaseController
+      skip_before_action :ensure_onboarding_available!
+
+      def show
+        @user = find_confirmable_user
+        redirect_to login_path, alert: "Invalid confirmation link." unless @user
+      end
+
+      def update
+        @user = find_confirmable_user
+        return redirect_to login_path, alert: "Invalid confirmation link." unless @user
+
+        result = Onboarding::PasswordConfirmation.call(
+          user: @user,
+          password: confirmation_params[:password],
+          password_confirmation: confirmation_params[:password_confirmation]
+        )
+
+        if result.success?
+          sign_in_nquery_user(result.user)
+          redirect_to root_path, notice: "Your account is ready. Welcome to nquery!"
+        else
+          render :show, status: :unprocessable_content
+        end
+      end
+
+      private
+
+      def find_confirmable_user
+        token = params[:confirmation_token].to_s
+        return if token.blank?
+
+        user = User.find_by(confirmation_token: token, confirmed_at: nil)
+        return if user.nil? || user.confirmation_expired?
+
+        user
+      end
+
+      def confirmation_params
+        params.require(:user).permit(:password, :password_confirmation)
+      end
+    end
+  end
+end

data/app/controllers/nquery/onboarding/congrats_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Nquery
+  module Onboarding
+    class CongratsController < BaseController
+      def show
+        @email = session[:onboarding_admin_email]
+        return if @email.present?
+        return if Onboarding.pending_admin_confirmation?
+
+        redirect_to new_onboarding_company_path, alert: "Please complete onboarding."
+      end
+    end
+  end
+end

data/app/controllers/nquery/queries_controller.rb

@@ -2,7 +2,6 @@
 
 module Nquery
   class QueriesController < ApplicationController
-    skip_before_action :_authenticate!, only: [] # always auth
     before_action :set_query, only: %i[show edit update]
     before_action :authorize_query_collection!, only: %i[show edit update]
     before_action :set_data_source_for_run, only: %i[run schema]

data/app/controllers/nquery/sessions_controller.rb

@@ -1,28 +1,25 @@
 # frozen_string_literal: true
 
 module Nquery
-  class SessionsController < ApplicationController
-    skip_before_action :_authenticate!
+  # Inherits Devise::SessionsController (→ host ApplicationController via Devise's
+  # global parent_controller). Intentionally does NOT inherit Nquery::ApplicationController
+  # so engine auth/onboarding callbacks are not applied to the sign-in flow.
+  class SessionsController < Devise::SessionsController
+    include Nquery::Engine.routes.url_helpers
+
+    helper Nquery::ComponentsHelper
+    helper Nquery::IconHelper
+
     layout "nquery/auth"
 
-    def new
-      redirect_to root_path if current_nquery_user
-    end
+    private
 
-    def create
-      user = User.active.find_by(email: params[:email]&.downcase)
-      if user&.authenticate(params[:password])
-        session[:nquery_user_id] = user.id
-        redirect_to root_path, notice: "Signed in successfully."
-      else
-        flash.now[:alert] = "Invalid email or password."
-        render :new, status: :unprocessable_content
-      end
+    def after_sign_in_path_for(_resource)
+      stored_location_for(:nquery_user) || root_path
     end
 
-    def destroy
-      session.delete(:nquery_user_id)
-      redirect_to login_path, notice: "Signed out."
+    def after_sign_out_path_for(_resource_or_scope)
+      new_nquery_user_session_path
     end
   end
 end

data/app/helpers/nquery/data_sources_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Nquery
+  module DataSourcesHelper
+    def data_source_form_url(data_source)
+      data_source.persisted? ? admin_data_source_path(data_source) : admin_data_sources_path
+    end
+
+    def data_source_form_method(data_source)
+      data_source.persisted? ? :patch : :post
+    end
+  end
+end

data/app/helpers/nquery/groups_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Nquery
+  module GroupsHelper
+    GROUP_TYPE_LABELS = {
+      "administrators" => "Administrators",
+      "all_users" => "All users",
+      "custom" => "Custom"
+    }.freeze
+
+    def group_type_label(group)
+      GROUP_TYPE_LABELS.fetch(group.system_group, group.system_group.humanize)
+    end
+
+    def group_type_badge_class(group)
+      group.system? ? "nq-badge-system" : "nq-badge-custom"
+    end
+  end
+end

data/app/javascript/nquery/controllers/data_source_form_controller.js

@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["adapter", "remoteFields", "sqliteFields", "railsHint", "port", "testButton", "testStatus"]
+  static values = { adapter: String, testUrl: String, id: String }
+
+  connect() {
+    this.toggle()
+  }
+
+  toggle() {
+    const adapter = this.adapterTarget?.value || this.element.dataset.dataSourceFormAdapterValue || "postgresql"
+    const isRemote = adapter === "postgresql" || adapter === "mysql"
+    const isSqlite = adapter === "sqlite"
+    const isRails = adapter === "rails"
+
+    this.remoteFieldsTarget?.toggleAttribute("hidden", !isRemote)
+    this.sqliteFieldsTarget?.toggleAttribute("hidden", !isSqlite)
+    this.railsHintTarget?.toggleAttribute("hidden", !isRails)
+
+    if (this.hasPortTarget) {
+      this.portTarget.placeholder = adapter === "mysql" ? "3306" : "5432"
+    }
+  }
+}

data/app/mailers/nquery/application_mailer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Nquery
+  class ApplicationMailer < ActionMailer::Base
+    default from: -> { Nquery.configuration.mailer_sender || "noreply@example.com" }
+  end
+end

data/app/mailers/nquery/devise_mailer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Nquery
+  class DeviseMailer < Devise::Mailer
+    include Nquery::Engine.routes.url_helpers
+
+    default template_path: "nquery/devise_mailer"
+  end
+end

data/app/models/nquery/audit.rb

@@ -11,9 +11,9 @@ module Nquery
       pattern = "%#{sanitize_sql_like(term.downcase)}%"
       full_name_sql = if connection.adapter_name.downcase.include?("mysql")
         "CONCAT(nquery_users.first_name, ' ', nquery_users.last_name)"
-      else
+                      else
         "nquery_users.first_name || ' ' || nquery_users.last_name"
-      end
+                      end
 
       joins(:user).where(
         "LOWER(nquery_users.email) LIKE :q OR LOWER(#{full_name_sql}) LIKE :q",

data/app/models/nquery/collection.rb

@@ -10,7 +10,7 @@ module Nquery
     has_many :collection_permissions, class_name: "Nquery::CollectionPermission", dependent: :destroy
     has_many :queries, class_name: "Nquery::Query", dependent: :nullify
     has_many :charts, class_name: "Nquery::Chart", dependent: :nullify
-    has_many :dashboards, class_name: "Nquery::Dashboard", dependent: :nullify
+    has_many :dashboards, class_name: "Nquery::Dashboard", dependent: :destroy
 
     validates :name, presence: true
     validates :kind, inclusion: { in: KINDS }

data/app/models/nquery/dashboard.rb

@@ -2,7 +2,7 @@
 
 module Nquery
   class Dashboard < ApplicationRecord
-    belongs_to :collection, class_name: "Nquery::Collection", optional: true
+    belongs_to :collection, class_name: "Nquery::Collection"
     belongs_to :creator, class_name: "Nquery::User", optional: true
     has_many :dashboard_cards, class_name: "Nquery::DashboardCard", dependent: :destroy
     has_many :charts, through: :dashboard_cards, class_name: "Nquery::Chart"