forked from fixin.me/fixin.me
Compare commits
3 Commits
fix-sqlite
...
pr68-setup
| Author | SHA1 | Date | |
|---|---|---|---|
| 496ca8382d | |||
| 7930ebe719 | |||
| 2d8fe8d297 |
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
|
||||
helper_method :current_user_disguised?
|
||||
helper_method :current_tab
|
||||
|
||||
before_action :redirect_to_setup_if_needed
|
||||
before_action :authenticate_user!
|
||||
|
||||
class AccessForbidden < StandardError; end
|
||||
@@ -55,6 +56,16 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
private
|
||||
|
||||
# Redirect to the web setup wizard when the application has not yet been
|
||||
# initialised (i.e. no admin account exists in the database).
|
||||
def redirect_to_setup_if_needed
|
||||
return if User.exists?(status: :admin)
|
||||
redirect_to new_setup_path
|
||||
rescue ActiveRecord::StatementInvalid
|
||||
# Tables may not exist yet (migrations not run). Fall through and let the
|
||||
# normal request handling surface a meaningful error.
|
||||
end
|
||||
|
||||
def render_no_content(record)
|
||||
helpers.render_errors(record)
|
||||
render html: nil, layout: true
|
||||
|
||||
59
app/controllers/setup_controller.rb
Normal file
59
app/controllers/setup_controller.rb
Normal file
@@ -0,0 +1,59 @@
|
||||
# Handles the one-time web-based installation wizard.
|
||||
#
|
||||
# The wizard is only accessible when no admin account exists yet. Once an
|
||||
# admin has been created the controller redirects every request to the root
|
||||
# path, so it can never be used to overwrite an existing installation.
|
||||
class SetupController < ActionController::Base
|
||||
# Use the full application layout (header, flash, etc.) so the page looks
|
||||
# consistent with the rest of the site.
|
||||
layout "application"
|
||||
|
||||
before_action :redirect_if_installed
|
||||
|
||||
def new
|
||||
end
|
||||
|
||||
def create
|
||||
email = params[:admin_email].to_s.strip
|
||||
password = params[:admin_password].to_s
|
||||
confirm = params[:admin_password_confirmation].to_s
|
||||
|
||||
errors = []
|
||||
errors << t(".email_blank") if email.blank?
|
||||
errors << t(".password_blank") if password.blank?
|
||||
errors << t(".password_mismatch") if password != confirm
|
||||
|
||||
if errors.any?
|
||||
flash.now[:alert] = errors.join(" ")
|
||||
return render :new, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
user = User.new(email: email, password: password, status: :admin)
|
||||
user.skip_confirmation!
|
||||
|
||||
unless user.save
|
||||
flash.now[:alert] = user.errors.full_messages.join(" ")
|
||||
return render :new, status: :unprocessable_entity
|
||||
end
|
||||
|
||||
# Persist runtime settings chosen during setup.
|
||||
Setting.set("skip_email_confirmation",
|
||||
params[:skip_email_confirmation] == "1")
|
||||
|
||||
# Optionally seed the built-in default units.
|
||||
if params[:seed_units] == "1"
|
||||
load Rails.root.join("db/seeds/units.rb")
|
||||
end
|
||||
|
||||
redirect_to new_user_session_path, notice: t(".success")
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def redirect_if_installed
|
||||
redirect_to root_path if User.exists?(status: :admin)
|
||||
rescue ActiveRecord::StatementInvalid
|
||||
# Tables are not yet migrated — stay on the setup page so the user sees a
|
||||
# meaningful error rather than a crash.
|
||||
end
|
||||
end
|
||||
@@ -6,6 +6,15 @@ class User::ProfilesController < Devise::RegistrationsController
|
||||
|
||||
protected
|
||||
|
||||
def build_resource(hash = {})
|
||||
super
|
||||
# Skip the email confirmation step when the admin has enabled this option
|
||||
# via the web setup wizard (stored as the "skip_email_confirmation" Setting).
|
||||
# The account becomes active immediately so the user can sign in right after
|
||||
# registering.
|
||||
resource.skip_confirmation! if Setting.get("skip_email_confirmation") == "true"
|
||||
end
|
||||
|
||||
def update_resource(resource, params)
|
||||
# Based on update_with_password()
|
||||
if params[:password].blank?
|
||||
|
||||
@@ -15,8 +15,8 @@ class Quantity < ApplicationRecord
|
||||
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
||||
end
|
||||
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
||||
length: {maximum: type_for_attribute(:name).limit}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit} if type_for_attribute(:description).limit
|
||||
length: {maximum: type_for_attribute(:name).limit || Float::INFINITY}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||
|
||||
# Update :depths of progenies after parent change
|
||||
before_save if: :parent_changed? do
|
||||
@@ -61,22 +61,18 @@ class Quantity < ApplicationRecord
|
||||
|
||||
# Return: ordered [sub]hierarchy
|
||||
scope :ordered, ->(root: nil, include_root: true) {
|
||||
q_ordered = Arel::Table.new('q_ordered')
|
||||
cast_type = connection.adapter_name == 'Mysql2' ? 'BINARY' : 'BLOB'
|
||||
numbered = Arel::Table.new('numbered')
|
||||
|
||||
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(q_ordered: [
|
||||
Quantity.from(Arel::Table.new('numbered').as(arel_table.name))
|
||||
.select(
|
||||
arel_table[Arel.star],
|
||||
arel_table.cast(arel_table[:child_number], cast_type).as('path')
|
||||
).where(arel_table[root && include_root ? :id : :parent_id].eq(root)),
|
||||
Quantity.from(Arel::Table.new('numbered').as(arel_table.name))
|
||||
.joins("INNER JOIN q_ordered ON quantities.parent_id = q_ordered.id")
|
||||
.select(
|
||||
arel_table[Arel.star],
|
||||
q_ordered[:path].concat(arel_table[:child_number])
|
||||
)
|
||||
]).from(q_ordered.as(arel_table.name)).order(arel_table[:path])
|
||||
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
|
||||
numbered.project(
|
||||
numbered[Arel.star],
|
||||
numbered.cast(numbered[:child_number], 'BINARY').as('path')
|
||||
).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
|
||||
numbered.project(
|
||||
numbered[Arel.star],
|
||||
arel_table[:path].concat(numbered[:child_number])
|
||||
).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
|
||||
]).order(arel_table[:path])
|
||||
}
|
||||
|
||||
# TODO: extract named functions to custom Arel extension
|
||||
@@ -84,24 +80,20 @@ class Quantity < ApplicationRecord
|
||||
# be merged with :ordered
|
||||
# https://gist.github.com/ProGM/c6df08da14708dcc28b5ca325df37ceb#extending-arel
|
||||
scope :numbered, ->(parent_column, order_column) {
|
||||
row_number = Arel::Nodes::NamedFunction.new('ROW_NUMBER', [])
|
||||
.over(Arel::Nodes::Window.new.partition(parent_column).order(order_column))
|
||||
width = Arel::SelectManager.new.project(
|
||||
select(
|
||||
arel_table[Arel.star],
|
||||
Arel::Nodes::NamedFunction.new(
|
||||
'LPAD',
|
||||
[
|
||||
Arel::Nodes::NamedFunction.new('ROW_NUMBER', [])
|
||||
.over(Arel::Nodes::Window.new.partition(parent_column).order(order_column)),
|
||||
Arel::SelectManager.new.project(
|
||||
Arel::Nodes::NamedFunction.new('LENGTH', [Arel.star.count])
|
||||
).from(arel_table)
|
||||
|
||||
pad_expr = if connection.adapter_name == 'Mysql2'
|
||||
Arel::Nodes::NamedFunction.new('LPAD', [row_number, width, Arel::Nodes.build_quoted('0')])
|
||||
else
|
||||
# SQLite: printf('%0' || width || 'd', row_number)
|
||||
fmt = Arel::Nodes::InfixOperation.new('||',
|
||||
Arel::Nodes::InfixOperation.new('||', Arel::Nodes.build_quoted('%0'), width),
|
||||
Arel::Nodes.build_quoted('d')
|
||||
).from(arel_table),
|
||||
Arel::Nodes.build_quoted('0')
|
||||
],
|
||||
).as('child_number')
|
||||
)
|
||||
Arel::Nodes::NamedFunction.new('printf', [fmt, row_number])
|
||||
end
|
||||
|
||||
select(arel_table[Arel.star], pad_expr.as('child_number'))
|
||||
}
|
||||
|
||||
def to_s
|
||||
@@ -110,7 +102,7 @@ class Quantity < ApplicationRecord
|
||||
|
||||
def to_s_with_depth
|
||||
# em space, U+2003
|
||||
' ' * depth + name
|
||||
' ' * depth + name
|
||||
end
|
||||
|
||||
def destroyable?
|
||||
@@ -123,18 +115,16 @@ class Quantity < ApplicationRecord
|
||||
|
||||
# Common ancestors, assuming node is a descendant of itself
|
||||
scope :common_ancestors, ->(of) {
|
||||
q_common = Arel::Table.new('q_common')
|
||||
selected = Arel::Table.new('selected')
|
||||
|
||||
# Take unique IDs, so self can be called with parent nodes of collection to
|
||||
# get common ancestors of collection _excluding_ nodes in collection.
|
||||
uniq_of = of.uniq
|
||||
model.with(selected: self).with_recursive(q_common: [
|
||||
Quantity.from(Arel::Table.new('selected').as(arel_table.name))
|
||||
.where(arel_table[:id].in(uniq_of)),
|
||||
Quantity.from(Arel::Table.new('selected').as(arel_table.name))
|
||||
.joins("INNER JOIN q_common ON selected.id = q_common.parent_id")
|
||||
model.with(selected: self).with_recursive(arel_table.name => [
|
||||
selected.project(selected[Arel.star]).where(selected[:id].in(uniq_of)),
|
||||
selected.project(selected[Arel.star])
|
||||
.join(arel_table).on(selected[:id].eq(arel_table[:parent_id]))
|
||||
]).select(arel_table[Arel.star])
|
||||
.from(q_common.as(arel_table.name))
|
||||
.group(column_names)
|
||||
.having(arel_table[:id].count.eq(uniq_of.size))
|
||||
.order(arel_table[:depth].desc)
|
||||
@@ -142,9 +132,13 @@ class Quantity < ApplicationRecord
|
||||
|
||||
# Return: successive record in order of appearance; used for partial view reload
|
||||
def successive
|
||||
ordered = user.quantities.ordered.to_a
|
||||
idx = ordered.index { |q| q.id == id }
|
||||
ordered[idx + 1] if idx
|
||||
quantities = Quantity.arel_table
|
||||
Quantity.with(
|
||||
quantities: user.quantities.ordered.select(
|
||||
quantities[Arel.star],
|
||||
Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]]).over.as('lag_id')
|
||||
)
|
||||
).where(quantities[:lag_id].eq(id)).first
|
||||
end
|
||||
|
||||
def with_progenies
|
||||
@@ -157,14 +151,13 @@ class Quantity < ApplicationRecord
|
||||
|
||||
# Return: record with ID `of` with its ancestors, sorted by :depth
|
||||
scope :with_ancestors, ->(of) {
|
||||
q_ancestors = Arel::Table.new('q_ancestors')
|
||||
selected = Arel::Table.new('selected')
|
||||
|
||||
model.with(selected: self).with_recursive(q_ancestors: [
|
||||
Quantity.from(Arel::Table.new('selected').as(arel_table.name))
|
||||
.where(arel_table[:id].eq(of)),
|
||||
Quantity.from(Arel::Table.new('selected').as(arel_table.name))
|
||||
.joins("INNER JOIN q_ancestors ON selected.id = q_ancestors.parent_id")
|
||||
]).from(q_ancestors.as(arel_table.name))
|
||||
model.with(selected: self).with_recursive(arel_table.name => [
|
||||
selected.project(selected[Arel.star]).where(selected[:id].eq(of)),
|
||||
selected.project(selected[Arel.star])
|
||||
.join(arel_table).on(selected[:id].eq(arel_table[:parent_id]))
|
||||
])
|
||||
}
|
||||
|
||||
# Return: ancestors of (possibly destroyed) self
|
||||
|
||||
20
app/models/setting.rb
Normal file
20
app/models/setting.rb
Normal file
@@ -0,0 +1,20 @@
|
||||
# Key-value store for runtime application settings that are configured through
|
||||
# the web setup wizard (or updated by an administrator) rather than hard-coded
|
||||
# in application.rb.
|
||||
#
|
||||
# Known keys:
|
||||
# skip_email_confirmation – "true"/"false", mirrors the homonymous option
|
||||
# that was previously in application.rb.
|
||||
class Setting < ApplicationRecord
|
||||
validates :key, presence: true, uniqueness: true
|
||||
|
||||
# Return the string value stored for +key+, or +default+ when absent.
|
||||
def self.get(key, default: nil)
|
||||
find_by(key: key)&.value || default
|
||||
end
|
||||
|
||||
# Persist +value+ for +key+, creating the record if it does not yet exist.
|
||||
def self.set(key, value)
|
||||
find_or_initialize_by(key: key).update!(value: value.to_s)
|
||||
end
|
||||
end
|
||||
@@ -12,8 +12,8 @@ class Unit < ApplicationRecord
|
||||
errors.add(:base, :multilevel_nesting) if base.base_id?
|
||||
end
|
||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||
length: {maximum: type_for_attribute(:symbol).limit}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit} if type_for_attribute(:description).limit
|
||||
length: {maximum: type_for_attribute(:symbol).limit || Float::INFINITY}
|
||||
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
||||
|
||||
@@ -22,23 +22,14 @@ class Unit < ApplicationRecord
|
||||
actionable_units = Arel::Table.new('actionable_units')
|
||||
units = actionable_units.alias('units')
|
||||
bases_units = arel_table.alias('bases_units')
|
||||
# Use 'all_units' alias for correlated subqueries to reference the all_units CTE.
|
||||
# Cannot use arel_table.alias here because the CTE is named 'all_units', not 'units'.
|
||||
other_units = Arel::Table.new('all_units').alias('other_units')
|
||||
other_bases_units = Arel::Table.new('all_units').alias('other_bases_units')
|
||||
other_units = arel_table.alias('other_units')
|
||||
other_bases_units = arel_table.alias('other_bases_units')
|
||||
sub_units = arel_table.alias('sub_units')
|
||||
|
||||
Unit.with_recursive(
|
||||
# Renamed from 'units' to 'all_units' to avoid SQLite circular reference:
|
||||
# SQLite treats any CTE in WITH RECURSIVE that references a table with the same
|
||||
# name as the CTE itself as a circular reference, even for non-recursive CTEs.
|
||||
all_units: self.or(Unit.defaults),
|
||||
actionable_units: [
|
||||
# Read from all_units CTE (user+defaults) aliased as the units table name.
|
||||
# Using AR::Relation (not Arel::SelectManager) to avoid extra parentheses
|
||||
# around the UNION part (visit_Arel_SelectManager always wraps in parens).
|
||||
Unit.from(Arel::Table.new('all_units').as(arel_table.name))
|
||||
.joins("LEFT OUTER JOIN all_units bases_units ON bases_units.id = units.base_id")
|
||||
# TODO: move inner 'with' CTE to outer 'with recursive' - it can have multiple
|
||||
# CTEs, even non recursive ones.
|
||||
Unit.with_recursive(actionable_units: [
|
||||
Unit.with(units: self.or(Unit.defaults)).left_joins(:base)
|
||||
.where.not(
|
||||
# Exclude Units that are/have default counterpart
|
||||
Arel::SelectManager.new.project(1).from(other_units)
|
||||
@@ -74,20 +65,16 @@ class Unit < ApplicationRecord
|
||||
),
|
||||
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
||||
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
||||
# Using AR::Relation instead of Arel::SelectManager to avoid extra parentheses
|
||||
# around the UNION part (visit_Arel_SelectManager always wraps in parens).
|
||||
Unit.from(Arel::Table.new('all_units').as(arel_table.name))
|
||||
.joins("INNER JOIN actionable_units ON actionable_units.base_id = units.id")
|
||||
.select(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||
]
|
||||
).select(units: [:base_id, :symbol])
|
||||
arel_table.join(actionable_units).on(actionable_units[:base_id].eq(arel_table[:id]))
|
||||
.project(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||
]).select(units: [:base_id, :symbol])
|
||||
.select(
|
||||
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
||||
units[:user_id].minimum.as('user_id'), # prefer non-default
|
||||
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
||||
units[:portable].minimum.as('portable')
|
||||
)
|
||||
.from(units).group(units[:base_id], units[:symbol])
|
||||
.from(units).group(:base_id, :symbol)
|
||||
}
|
||||
scope :ordered, ->{
|
||||
left_outer_joins(:base).order(ordering)
|
||||
@@ -97,7 +84,7 @@ class Unit < ApplicationRecord
|
||||
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||
arel_table[:base_id].not_eq(nil),
|
||||
:multiplier,
|
||||
arel_table[:symbol]]
|
||||
:symbol]
|
||||
end
|
||||
|
||||
before_destroy do
|
||||
|
||||
39
app/views/setup/new.html.erb
Normal file
39
app/views/setup/new.html.erb
Normal file
@@ -0,0 +1,39 @@
|
||||
<%= form_with url: setup_path, method: :post, class: "labeled-form main-area" do %>
|
||||
|
||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0;">
|
||||
<%= t(".admin_account") %>
|
||||
</h3>
|
||||
|
||||
<label for="admin_email"><%= t(".admin_email") %></label>
|
||||
<%= email_field_tag :admin_email, params[:admin_email],
|
||||
id: "admin_email", required: true, size: 30, autofocus: true,
|
||||
autocomplete: "email" %>
|
||||
|
||||
<label for="admin_password"><%= t(".admin_password") %></label>
|
||||
<%= password_field_tag :admin_password, nil,
|
||||
id: "admin_password", required: true, size: 30,
|
||||
autocomplete: "new-password" %>
|
||||
|
||||
<label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
|
||||
<%= password_field_tag :admin_password_confirmation, nil,
|
||||
id: "admin_password_confirmation", required: true, size: 30,
|
||||
autocomplete: "off" %>
|
||||
|
||||
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0.5em 0 0 0;">
|
||||
<%= t(".options") %>
|
||||
</h3>
|
||||
|
||||
<label for="skip_email_confirmation" style="grid-column: 1 / 3; text-align: left;">
|
||||
<%= check_box_tag :skip_email_confirmation, "1",
|
||||
params[:skip_email_confirmation] == "1",
|
||||
id: "skip_email_confirmation" %>
|
||||
<%= t(".skip_email_confirmation") %>
|
||||
</label>
|
||||
|
||||
<label for="seed_units" style="grid-column: 1 / 3; text-align: left;">
|
||||
<%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
|
||||
<%= t(".seed_units") %>
|
||||
</label>
|
||||
|
||||
<%= submit_tag t(".submit") %>
|
||||
<% end %>
|
||||
@@ -54,5 +54,9 @@ module FixinMe
|
||||
|
||||
# Sender address of account registration-related messages
|
||||
Devise.mailer_sender = 'noreply@localhost'
|
||||
|
||||
# Whether to skip e-mail confirmation for new registrations is configured
|
||||
# through the web setup wizard and stored in the database (Setting model),
|
||||
# so it does not need to be set here.
|
||||
end
|
||||
end
|
||||
|
||||
@@ -163,6 +163,23 @@ en:
|
||||
<br><em>leave blank to keep unchanged</em>
|
||||
%{password_length_hint_html}
|
||||
actions: Actions
|
||||
setup:
|
||||
new:
|
||||
admin_account: Admin account
|
||||
admin_email: 'E-mail:'
|
||||
admin_password: 'Password:'
|
||||
admin_password_confirmation: 'Retype password:'
|
||||
options: Options
|
||||
skip_email_confirmation: Skip e-mail confirmation for new registrations
|
||||
seed_units: Seed built-in default units
|
||||
submit: Set up
|
||||
create:
|
||||
email_blank: E-mail cannot be blank.
|
||||
password_blank: Password cannot be blank.
|
||||
password_mismatch: Passwords do not match.
|
||||
success: >
|
||||
Installation complete. You can now sign in with the admin account you
|
||||
just created.
|
||||
add: Add
|
||||
apply: Apply
|
||||
back: Back
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
Rails.application.routes.draw do
|
||||
# Web-based installation wizard — only reachable when no admin exists yet.
|
||||
resource :setup, only: [:new, :create], controller: :setup
|
||||
|
||||
resources :measurements
|
||||
|
||||
resources :readouts, only: [:new] do
|
||||
|
||||
12
db/migrate/20260228171524_create_settings.rb
Normal file
12
db/migrate/20260228171524_create_settings.rb
Normal file
@@ -0,0 +1,12 @@
|
||||
class CreateSettings < ActiveRecord::Migration[7.2]
|
||||
def change
|
||||
create_table :settings do |t|
|
||||
t.string :key, null: false
|
||||
t.string :value
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
add_index :settings, :key, unique: true
|
||||
end
|
||||
end
|
||||
11
db/seeds.rb
11
db/seeds.rb
@@ -3,6 +3,17 @@
|
||||
# bin/rails db:seed
|
||||
# command (or created alongside the database with db:setup).
|
||||
# Seeding process should be idempotent.
|
||||
#
|
||||
# Admin account setup
|
||||
# -------------------
|
||||
# The preferred way to create the first admin account is through the web setup
|
||||
# wizard, which is shown automatically on the first visit when no admin exists.
|
||||
# The wizard also lets you configure runtime options (e.g. skip e-mail
|
||||
# confirmation) and seed the default units without using the command line.
|
||||
#
|
||||
# The block below provides an alternative CLI path for headless / automated
|
||||
# deployments. It is skipped when an admin account already exists (e.g. after
|
||||
# the web wizard has run).
|
||||
|
||||
User.transaction do
|
||||
break if User.find_by status: :admin
|
||||
|
||||
Reference in New Issue
Block a user