keystone_ui 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a0b5685fe1dc1107e8e75d274e80401826ed52616ae95c20d6a288fdc5c647
-  data.tar.gz: 8220957d8d617f0c32c71b264c84c5bf8b992a3cc2e3bb512f3f4e0a1cbf8bb0
+  metadata.gz: f1534a3f721376c82b75b22a653e8bcee3a0509bcd3b09cd137c93c78e15110f
+  data.tar.gz: 0df6e2e29387563688ba68bc53d8c29dc69aa322aa86c84b6416c0e3af36f703
 SHA512:
-  metadata.gz: 58889e18335df436f8b13caad57648caf6ed3e13e17b50dc5d6011ae0f8fa85ceb98a9e9fd682f90cd10729ed3d3f20603ed34e438afb09a33090ec4d7493c95
-  data.tar.gz: c79c624b0a0a09e83b1f6fcee1566df17c7adf96f8141a20c8ee3ed20b361ab7faa1135be33bcf41f780e68e663e78d9ba833d27af09e72c782d4763a09463da
+  metadata.gz: 1869494c71af590cd1fa49fcd1062b024df02950f571e5dcbd7deaaa508574ad0f0aa2bfc8e23b0dc10d35ca440a50bc12e5d18063c62888de9eb29c42c09b45
+  data.tar.gz: 45563016cb89280c2e97cca008236c9fc50ba4681486a53f0d82fc4066e7db68368ad412c43b512cb2ca4ccd4f359dd29339890e24854eae2ead04ed9db7f6db

data/app/assets/javascripts/keystone_ui/column_picker_controller.js

@@ -1,10 +1,11 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["menu", "option"]
+  static targets = ["menu", "option", "error"]
   static values = { saveUrl: String }
 
   connect() {
+    this.shown = this.optionTargets.map(option => [ option, this.checkboxIn(option).checked ])
     this._close = this.close.bind(this)
     document.addEventListener("click", this._close)
   }
@@ -66,6 +67,10 @@ export default class extends Controller {
 
   moved() {
     this.changed = true
+    this.refreshMoveButtons()
+  }
+
+  refreshMoveButtons() {
     const options = this.optionTargets
     options.forEach((option, index) => {
       option.querySelector('[data-action="click->column-picker#moveUp"]').disabled = index === 0
@@ -99,8 +104,20 @@ export default class extends Controller {
         "X-CSRF-Token": token
       },
       body: JSON.stringify({ hidden_columns: this.hiddenColumns(), column_order: this.columnOrder() })
-    }).then(() => {
+    }).then((response) => {
+      if (!response.ok) return this.failed()
+
       Turbo.visit(window.location.href, { action: "replace" })
+    }).catch(() => this.failed())
+  }
+
+  failed() {
+    this.errorTarget.classList.remove("hidden")
+    this.shown.forEach(([ option, checked ]) => {
+      option.parentNode.insertBefore(option, null)
+      this.checkboxIn(option).checked = checked
+      option.querySelector("label").classList.toggle("ks-menu-option-hidden", !checked)
     })
+    this.refreshMoveButtons()
   }
 }

data/app/components/keystone/ui/column_picker_component.html.erb

@@ -29,4 +29,5 @@
       </div>
     <% end %>
   </div>
+  <p data-column-picker-target="error" role="alert" class="<%= ERROR_CLASSES %>">Your column changes were not saved.</p>
 </div>

data/app/components/keystone/ui/column_picker_component.rb

@@ -11,6 +11,7 @@ module Keystone
       OPTION_HIDDEN_CLASSES = "ks-menu-option-hidden"
       OPTION_ROW_CLASSES = "flex items-center"
       MOVE_BUTTON_CLASSES = "ks-menu-move text-sm"
+      ERROR_CLASSES = "ks-error hidden"
 
       COLUMNS_ICON = <<~SVG.freeze
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4">
@@ -20,18 +21,17 @@ module Keystone
 
       attr_reader :save_url
 
-      def initialize(columns:, hidden_columns: [], save_url: nil)
-        @columns = columns
-        @hidden_keys = Array(hidden_columns).map(&:to_sym).to_set
+      def initialize(columns:, hidden_columns: [], save_url: nil, layout: nil)
+        @layout = layout || SavedLayout.new(columns: columns, value: nil, default_hidden: hidden_columns)
         @save_url = save_url
       end
 
       def hideable_columns
-        @columns.select(&:hideable?)
+        @layout.columns.select(&:hideable?)
       end
 
       def hidden?(key)
-        @hidden_keys.include?(key.to_sym)
+        @layout.hidden?(key)
       end
 
       def option_classes(key)

data/app/components/keystone/ui/data_table_component.rb

@@ -32,8 +32,9 @@ module Keystone
       def initialize(items:, columns:, empty_message: nil, sort: nil, sort_direction: nil, sort_url: nil, hidden_columns: [], key: nil)
         @items = items.to_a
         @all_columns = columns.map { |col| normalize_column(col) }
-        @hidden_columns = hidden_columns
-        @columns = visible_columns(hidden_columns)
+        @default_hidden = hidden_columns
+        @layout = SavedLayout.new(columns: @all_columns, value: nil, default_hidden: hidden_columns)
+        @columns = @layout.visible_columns
         @key = key
         @empty_message = empty_message
         @sort = sort&.to_sym
@@ -63,7 +64,7 @@ module Keystone
       def column_picker
         return unless @save_url
 
-        @column_picker ||= ColumnPickerComponent.new(columns: @all_columns, hidden_columns: @hidden_columns, save_url: @save_url)
+        @column_picker ||= ColumnPickerComponent.new(columns: @all_columns, layout: @layout, save_url: @save_url)
       end
 
       def column_keys
@@ -151,25 +152,11 @@ module Keystone
         saved = KeystoneUi.configuration.supplied_preference(helpers, @key)
         return unless saved
 
-        @hidden_columns = saved[:value].to_h.fetch("hidden_columns", @hidden_columns)
-        @all_columns = ordered_columns(saved[:value].to_h["column_order"])
-        @columns = visible_columns(@hidden_columns)
+        @layout = SavedLayout.new(columns: @all_columns, value: saved[:value], default_hidden: @default_hidden)
+        @columns = @layout.visible_columns
         @save_url = saved[:save_url]
       end
 
-      def ordered_columns(column_order)
-        return @all_columns unless column_order
-
-        positions = Array(column_order).map(&:to_sym).each_with_index.to_h
-        hideable = @all_columns.select(&:hideable?).sort_by.with_index { |col, index| [ positions.fetch(col.key, positions.size + index) ] }
-        @all_columns.map { |col| col.hideable? ? hideable.shift : col }
-      end
-
-      def visible_columns(hidden_columns)
-        hidden_keys = Array(hidden_columns).map(&:to_sym).to_set
-        @all_columns.reject { |col| col.hideable? && hidden_keys.include?(col.key) }
-      end
-
       def visual_column_count
         @columns.length + (actions? ? 1 : 0)
       end

data/app/components/keystone/ui/saved_layout.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Keystone
+  module Ui
+    class SavedLayout
+      def initialize(columns:, value:, default_hidden:)
+        @columns = columns
+        @value = value.is_a?(Hash) ? value : {}
+        @default_hidden = default_hidden
+      end
+
+      def columns
+        @ordered_columns ||= ordered_columns
+      end
+
+      def visible_columns
+        columns.reject { |column| hidden?(column.key) }
+      end
+
+      def hidden?(key)
+        column = @columns.find { |col| col.key == key.to_sym }
+        column&.hideable? && hidden_keys.include?(key.to_sym)
+      end
+
+      private
+
+      def ordered_columns
+        column_order = saved_list("column_order")
+        return @columns unless column_order
+
+        positions = Array(column_order).map(&:to_sym).each_with_index.to_h
+        hideable = @columns.select(&:hideable?).sort_by.with_index { |col, index| positions.fetch(col.key, positions.size + index) }
+        @columns.map { |col| col.hideable? ? hideable.shift : col }
+      end
+
+      def hidden_keys
+        @hidden_keys ||= Array(saved_list("hidden_columns") || @default_hidden).map(&:to_sym).to_set
+      end
+
+      def saved_list(name)
+        list = @value[name]
+        list if list.is_a?(Array)
+      end
+    end
+  end
+end

data/lib/keystone_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KeystoneUi
-  VERSION = "0.36.0"
+  VERSION = "0.37.0"
 end

data/the_local/agents/keystone_ui-develop.md

@@ -240,8 +240,11 @@ outer element. See Conventions before using it.
   and the hideable ones fill the remaining places. With no `"column_order"` the
   columns keep their declared order. Whenever the supplier
   returns a save address, the table renders a "Columns" menu in a row above
-  itself, aligned right, that saves to it as `ui_column_picker` does, including
-  for a person with nothing saved yet. When the
+  itself, aligned right, that saves to it as `ui_column_picker` does and shows
+  the same message when a save fails, including for a person with nothing saved
+  yet. That menu lists the hideable columns in
+  the order the table shows them and leaves ticked exactly the ones the table
+  shows. When the
   supplier returns nothing, when no supplier is set, or when no `key:` is
   passed, the table renders from `hidden_columns:` with no Columns menu. In
   every case `hidden_columns:` is the table's default layout.
@@ -269,7 +272,11 @@ outer element. See Conventions before using it.
   `X-CSRF-Token` header, then reloads the page. A menu closed with nothing
   changed sends nothing. `column_order` lists every hideable column's key in
   the menu's order when it closes. With no `save_url:` it sends nothing. The app must provide that endpoint and persist
-  both lists. The picker does not reorder the table: beside a table without
+  both lists. The endpoint must answer with a success status when it has saved
+  them. When it answers with an error status, or the request cannot reach the
+  server, the menu does not reload the page: it shows "Your column changes were
+  not saved." under the Columns button, and puts its boxes and its order back
+  to what the table shows. The picker does not reorder the table: beside a table without
   `key:`, the app must pass the table and the picker its columns in the saved
   order itself. A table
   given `key:` renders its own Columns menu when the supplier gives a save

data/the_local/agents/keystone_ui-info.md

@@ -150,11 +150,15 @@ holds the catalog.
   table, at its right, and saves the user's choice there, even before anything
   has been saved. The menu lists the hideable columns in the order the table
   shows them, each with a box to show or hide it and buttons to move it up or
-  down. An unticked column's name is greyed at once. Ticking boxes and moving
+  down. The menu and the table read the same saved layout, so the menu's
+  ticked boxes and order always match the columns the table shows. An unticked column's name is greyed at once. Ticking boxes and moving
   columns sends nothing while the menu is open. Closing the menu, with its
   Columns button or by clicking anywhere outside it, saves the hidden columns
   and the order together once, then reloads the page. Closing it with nothing
-  changed saves nothing.
+  changed saves nothing. When the save is refused or cannot reach the server,
+  the page does not reload. The Columns menu shows the message "Your
+  column changes were not saved." and puts its boxes and order back to what
+  the table shows.
   A table with no key, or an app with no supplier, renders from its own call
   alone. Setting up the supplier belongs to the install local.
 - **Suggestions.** A form field can carry a list of suggested values. The

data/the_local/agents/keystone_ui-install.md

@@ -282,6 +282,11 @@ built on ViewComponent; hook it in before building any screen with those helpers
      string keys, `"hidden_columns"` and `"column_order"`, or the saved order
      is not applied. With no `save_url`, the saved layout applies and no menu
      is shown.
+   - The action at `save_url` must answer a stored layout with a 2xx status.
+     Any other status, or a request that cannot reach the server, leaves the
+     page unreloaded. The table then shows "Your column changes were not
+     saved." beside its Columns button, and the menu's boxes and order go back
+     to what the table shows.
    - A companion preferences gem may set this supplier for the app. Ask the
      developer whether the app uses one, or which code stores each user's table
      layouts, before writing the callable.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keystone_ui
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Tyler Schneider
@@ -175,6 +175,7 @@ files:
 - app/components/keystone/ui/progress_component.rb
 - app/components/keystone/ui/radio_card_component.html.erb
 - app/components/keystone/ui/radio_card_component.rb
+- app/components/keystone/ui/saved_layout.rb
 - app/components/keystone/ui/section_component.html.erb
 - app/components/keystone/ui/section_component.rb
 - app/components/keystone/ui/select_component.html.erb