Move table default_order from Redis to PG

Gemfile.lock

@@ -117,7 +117,7 @@ GEM
     crass (1.0.6)
     database_cleaner (1.8.5)
     date (3.3.3)
-    debug_inspector (1.0.0)
+    debug_inspector (1.1.0)
     docile (1.4.0)
     dry-cli (1.0.0)
     encryptor (3.0.0)

app/controllers/settings_controller.rb

@@ -6,7 +6,6 @@ def update
     end
     table_configuration.update! table_configuration_params if table_configuration.present?
     resource.per_page = params[:per_page] if params[:per_page]
-    resource.default_order = params[:default_order].join(' ') if params[:default_order].present?
     resource.save
     redirect_back fallback_location: resources_path(resource.table), success: 'Settings successfully saved'
   end
@@ -56,6 +55,7 @@ def table_configuration_params
     end
     res[:label_column] = params[:label_column].presence if params[:label_column]
     res[:validations] = params[:validations].delete_if(&:empty?) if params[:validations]
+    res[:default_order] = params[:default_order].join(' ').strip if params[:default_order].present?
     res
   end
 end

app/models/resource.rb

@@ -3,7 +3,7 @@ class Resource
   VALIDATES_UNIQUENESS_OF = 'validates_uniqueness_of'.freeze
   VALIDATORS = [VALIDATES_PRESENCE_OF, VALIDATES_UNIQUENESS_OF].freeze
 
-  attr_accessor :default_order, :enum_values, :table, :datas
+  attr_accessor :enum_values, :table, :datas
   delegate :validations, :export_col_sep, :export_skip_header, to: :table_configuration
 
   def initialize generic, table
@@ -19,13 +19,9 @@ def load
       @datas = JSON.parse(value).symbolize_keys!
       @columns = datas[:columns].symbolize_keys!
       @column = datas[:column] || {}
-      if datas[:default_order].present? && column_names.include?(datas[:default_order].to_s.split(' ').first.to_sym)
-        @default_order = datas[:default_order]
-      end
       @per_page = datas[:per_page] || @generic.account.per_page
       @enum_values = datas[:enum_values] || []
     end
-    @default_order ||= default_primary_keys_order
     set_missing_columns_conf
   end
 
@@ -37,6 +33,15 @@ def default_primary_keys_order
     primary_keys.map {|key| "#{key} desc"}.join ',' if primary_keys.any?
   end
 
+  def default_order
+    return @default_order if @default_order
+    @default_order = table_configuration.default_order
+    if @default_order.present? && column_names.exclude?(default_order.split(' ').first.to_sym)
+      @default_order = nil
+    end
+    @default_order ||= default_primary_keys_order
+  end
+
   def default_order_column
     default_order&.split(' ')&.first
   end
@@ -104,7 +109,7 @@ def column_names
   end
 
   def save
-    settings = { columns: @columns, column: @column, default_order: @default_order, enum_values: @enum_values }
+    settings = { columns: @columns, column: @column, enum_values: @enum_values }
     settings[:per_page] = @per_page if @generic.account.per_page != @per_page
     REDIS.set settings_key, settings.to_json
     table_configuration.save!

app/views/resources/panels/_misc.slim

@@ -9,7 +9,7 @@
       options_from_collection_for_select(resource.schema, :first, :first, resource.default_order_column), class: 'select2 form-control'
   .col-sm-3
     = label_tag 'default_order__asc', class: 'radio-inline' do
-      = radio_button_tag 'default_order[]', 'asc', (resource.default_order_direction == 'asc')
+      = radio_button_tag 'default_order[]', '', (resource.default_order_direction == 'asc')
       ' asc
     = label_tag 'default_order__desc', class: 'radio-inline' do
       = radio_button_tag 'default_order[]', 'desc', (resource.default_order_direction == 'desc')

db/schema.rb

@@ -10,18 +10,17 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_10_17_184959) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_10_23_091541) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
   create_table "accounts", force: :cascade do |t|
     t.string "name"
     t.text "encrypted_db_url"
     t.string "adapter"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "last_tip_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "last_tip_at", precision: nil
     t.string "last_tip_identifier"
     t.boolean "tips_opt_in", default: true
     t.string "application_time_zone", default: "UTC", null: false
@@ -36,8 +35,8 @@
   create_table "collaborators", force: :cascade do |t|
     t.integer "user_id"
     t.integer "account_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "is_administrator", default: false, null: false
     t.string "email"
     t.string "token", null: false
@@ -55,8 +54,8 @@
     t.string "external_id"
     t.string "public_key"
     t.bigint "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.bigint "sign_count", default: 0, null: false
     t.index ["external_id"], name: "index_credentials_on_external_id", unique: true
     t.index ["user_id"], name: "index_credentials_on_user_id"
@@ -66,38 +65,39 @@
     t.string "name"
     t.integer "account_id"
     t.text "permissions"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "searches", force: :cascade do |t|
     t.string "name"
     t.string "table"
     t.integer "account_id"
     t.jsonb "conditions"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_searches_on_account_id"
   end
 
   create_table "table_configurations", force: :cascade do |t|
     t.integer "account_id"
     t.string "table"
     t.jsonb "polymorphic_associations", default: []
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.jsonb "validations", default: [], null: false
     t.string "label_column"
     t.string "export_col_sep"
     t.boolean "export_skip_header"
+    t.string "default_order"
     t.index ["account_id"], name: "index_table_configurations_on_account_id"
   end
 
   create_table "users", force: :cascade do |t|
     t.string "name"
     t.string "email"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "webauthn_id"
     t.index ["webauthn_id"], name: "index_users_on_webauthn_id", unique: true
   end
@@ -108,8 +108,8 @@
     t.string "order"
     t.string "columns"
     t.integer "account_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "type"
     t.string "grouping"
   end