katalyst-koi 4.10.2 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d353682a7508a9cb09164c404b77c7f9a6f6eb581c2312c3af0160ae3e2ec7
-  data.tar.gz: 3b45058189a7ba04b89c28c50653724e7a4ed8a5423d5ab8bca569dcb654688e
+  metadata.gz: 9e93ae67d5b7a194d086ac058e4ce50b719a6b09f8683cc75a77a3bbe65ba540
+  data.tar.gz: 57cf5e6fecd3feda7033316da41920a9018e423d87ed953618ce1ee32ce6101d
 SHA512:
-  metadata.gz: fe9716dcb12c3c67ef97ae43e95c5356519b23cfd2b5f8a5ee69f63cf2a4ba7473fcb5f3647b90d7d828896d8bf26f9f98d2f4162085f0f5ea9969e35b4e6f2a
-  data.tar.gz: c1152404ac4844f7a21a9903e6998b4cd4b0aa48bf83205b013e3aa8c139d04444c039c3de2ed64190a7936b496be9b86164f38800e96eeb6eb41e030666b22d
+  metadata.gz: 2951257ff44bb56a689d18dbae88a1644f6e4840b0a3d0fb5718821a023d4a04ea4bf9ffeaf0be714b8240170510da04356ec1f25f9e98c4426927087df3662e
+  data.tar.gz: 70946f90ec2799e9076041b99154b389d03e699f4fe746f72bccb17c9b49ade2c1bd6e311427708c3ee13d01003f5eb2c484944f145869e6e40258d361c517ef

data/app/controllers/admin/admin_users_controller.rb

@@ -12,6 +12,12 @@ module Admin
       render locals: { collection: }
     end
 
+    def archived
+      collection = Collection.new.with_params(params).apply(Admin::User.archived.strict_loading)
+
+      render locals: { collection: }
+    end
+
     def show
       render :show, locals: { admin: }
     end
@@ -78,7 +84,6 @@ module Admin
 
       attribute :name, :string
       attribute :email, :string
-      attribute :status, :archivable, default: :active
       attribute :last_sign_in_at, :date
       attribute :sign_in_count, :integer
     end

data/app/models/concerns/koi/model/archivable.rb

@@ -14,15 +14,6 @@ module Koi
     #     Model.all # default scope, excludes archived
     #     Model.archived # only returns archived records
     #     Model.with_archived # returns all records
-    #
-    # Filtering:
-    # Use the custom `:archivable` enum attribute in Admin::Collections to
-    # filter on this property, e.g.
-    #
-    #     attribute :status, :archivable, default: :active
-    #
-    # Note: although it's theoretically possible to archive something in the
-    # future, this module does not support queries using dates.
     module Archivable
       extend ActiveSupport::Concern
 
@@ -31,17 +22,6 @@ module Koi
         scope :archived, -> { unscope(where: :archived_at).where.not(archived_at: nil) }
         scope :with_archived, -> { unscope(where: :archived_at) }
 
-        scope :status, ->(status) do
-          case status.to_s
-          when "active"
-            not_archived
-          when "archived"
-            archived
-          else
-            with_archived
-          end
-        end
-
         default_scope { not_archived }
 
         alias_method :archived?, :archived
@@ -70,6 +50,7 @@ module Koi
       def archive!
         archive
         save!(validate: false) if persisted?
+        self
       end
 
       # Mark a record as no longer archived. It will appear in default queries.
@@ -81,6 +62,7 @@ module Koi
       def restore!
         restore
         save!(validate: false) if persisted?
+        self
       end
     end
   end

data/app/views/admin/admin_users/archived.html.erb

@@ -0,0 +1,19 @@
+<% content_for :header do %>
+  <%= render Koi::Header::IndexComponent.new(model: Admin::User, title: "Archived") do |component| %>
+    <% component.with_breadcrumb "Admins", admin_admin_users_path %>
+  <% end %>
+<% end %>
+
+<%= table_query_with(collection:) %>
+
+<%= table_selection_with(collection:) do %>
+  <%= tag.button "Restore", formaction: restore_admin_admin_users_path, formmethod: :put %>
+<% end %>
+
+<%= table_with(collection:) do |row| %>
+  <% row.select %>
+  <% row.link :name, url: :admin_admin_user_path %>
+  <% row.text :email %>
+<% end %>
+
+<%== pagy_nav(collection.pagination) %>

data/app/views/admin/admin_users/index.html.erb

@@ -1,6 +1,7 @@
 <% content_for :header do %>
   <%= render Koi::Header::IndexComponent.new(model: Admin::User) do |component| %>
     <% component.with_action "New", new_admin_admin_user_path %>
+    <% component.with_action "Archived", archived_admin_admin_users_path %>
   <% end %>
 <% end %>
 
@@ -8,10 +9,9 @@
 
 <%= table_selection_with(collection:) do %>
   <%= tag.button "Archive", formaction: archive_admin_admin_users_path, formmethod: :put %>
-  <%= tag.button "Restore", formaction: restore_admin_admin_users_path, formmethod: :put %>
 <% end %>
 
-<%= table_with(collection:) do |row, admin| %>
+<%= table_with(collection:) do |row| %>
   <% row.select %>
   <% row.link :name, url: :admin_admin_user_path %>
   <% row.text :email %>

data/config/locales/koi.en.yml

@@ -15,11 +15,6 @@ en:
     labels:
       new: New
       search: Search
-    view:
-      status:
-        active: "%{model} that are not archived"
-        archived: "%{model} that are archived"
-        all: "All %{model}, archived or not"
   helpers:
     hint:
       default:

data/config/routes.rb

@@ -10,6 +10,7 @@ Rails.application.routes.draw do
     resources :admin_users do
       resources :credentials, only: %i[new create destroy]
       post :invite, on: :member, to: "tokens#create"
+      get :archived, on: :collection
       put :archive, on: :collection
       put :restore, on: :collection
     end

data/lib/koi/engine.rb

@@ -63,10 +63,6 @@ module Koi
       Pagy::I18n.load(locale: "en", filepath: root.join("config/locales/pagy.en.yml"))
     end
 
-    initializer "koi.tables" do
-      Katalyst::Tables.config.collection_types[:archivable] = "Koi::Collection::Type::Archivable"
-    end
-
     initializer "koi.views" do
       ActiveSupport.on_load(:action_view) do
         # Workaround for de-duplicating nested module paths for admin controllers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 4.10.2
+  version: 4.11.0
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -364,6 +364,7 @@ files:
 - app/models/concerns/koi/model/archivable.rb
 - app/models/url_rewrite.rb
 - app/views/admin/admin_users/_fields.html.erb
+- app/views/admin/admin_users/archived.html.erb
 - app/views/admin/admin_users/edit.html.erb
 - app/views/admin/admin_users/index.html.erb
 - app/views/admin/admin_users/new.html.erb
@@ -445,7 +446,6 @@ files:
 - lib/katalyst/koi.rb
 - lib/koi.rb
 - lib/koi/caching.rb
-- lib/koi/collection/type/archivable.rb
 - lib/koi/config.rb
 - lib/koi/engine.rb
 - lib/koi/extensions/object_rendering.rb

data/lib/koi/collection/type/archivable.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Koi
-  module Collection
-    module Type
-      # Add support for `attribute :status, :archivable, default: :active` to
-      # Koi collections to support filtering on Koi::Model::Archivable models.
-      class Archivable < Katalyst::Tables::Collection::Type::Enum
-        def initialize(scope: :status)
-          super(multiple: false, scope:)
-        end
-
-        def type
-          :archivable
-        end
-
-        def examples_for(scope, attribute)
-          _, model, = model_and_column_for(scope, attribute)
-
-          %i[active archived all].map do |key|
-            example(key, describe_key(model, attribute, key))
-          end
-        end
-
-        private
-
-        def describe_key(model, attribute, key)
-          description = I18n.t("koi.view.#{attribute.name}.#{key}", model: model.model_name.human)
-          description += " (default)" if key.to_s.eql?(attribute.original_value.to_s)
-          description
-        end
-      end
-    end
-  end
-end