madmin 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dabaf5123e6b2ffca6ad53b150aa7fd682f3867123229ab194e79379e63ab3d
-  data.tar.gz: 1cc11dbbb97bfdc38c6db838bd3077f3391202afc0e86899e8db41a1f501978a
+  metadata.gz: ea857d0e707bca79172d1bcbecb72cfb939724279ab3f2c08546ff279fd38d03
+  data.tar.gz: c886c8ad0c5d0a11c81f1aecf45463e29205e9bf29dfe00fae4fc94466988ee0
 SHA512:
-  metadata.gz: 91819f3b6fa6913e61cbb47260022b4673e3566c84156bf3c45f43ddc924279346e21c690f6ab7e12ec99593d68a2ffa7142c0ef9c747e47284bcf3033b75304
-  data.tar.gz: d6b666670851c5b2c69d9df5ec07abd4b21e67808d9ede0f85d8e20613b89f84ec538c9ab7ff19edbc80132d50c0b1d1e80c4909175f70c7b6d9328efc829134
+  metadata.gz: 65e7522be423638030455299a70bfdd21cc706e75a5b6624f7a41f869250517474b00dd514551914e86bb3b7e7dac31aa812826461a634649caba8456b73f5c8
+  data.tar.gz: faea74829b0c7e307960dcbe006986f51c064e147c00b17f1234bfc6b72246511c1d206d4891fd773f3f97ea05b96a87dbcdd3e9b709aac1141407a580529b26

data/app/controllers/madmin/application_controller.rb

@@ -0,0 +1,22 @@
+module Madmin
+  class ApplicationController < Madmin::BaseController
+    before_action :authenticate_admin_user
+
+    def authenticate_admin_user
+      # TODO: Add your authentication logic here
+
+      # For example, we could redirect if the user isn't an admin
+      # redirect_to "/", alert: "Not authorized." unless user_signed_in? && current_user.admin?
+    end
+
+    # Authenticate with Clearance
+    # include Clearance::Controller
+    # before_action :require_login
+
+    # Authenticate with Devise
+    # before_action :authenticate_user!
+
+    # Authenticate with Basic Auth
+    # http_basic_authenticate_with(name: Rails.application.credentials.admin_username, password: Rails.application.credentials.admin_password)
+  end
+end

data/app/views/madmin/application/index.html.erb

@@ -47,10 +47,13 @@
           <% resource.attributes.values.each do |attribute| %>
             <% next if attribute.field.nil? %>
             <% next unless attribute.field.visible?(action_name) %>
-            <td class="px-4 py-2"><%= render partial: attribute.field.to_partial_path("index"), locals: { field: attribute.field, record: record } %></td>
+            <td class="px-4 py-2"><%= render partial: attribute.field.to_partial_path("index"), locals: { field: attribute.field, record: record, resource: resource } %></td>
           <% end %>
 
-          <td class="px-4 py-2 text-center"><%= link_to "View", resource.show_path(record), class: "text-indigo-500" %></td>
+          <td class="px-4 py-2 text-center">
+            <%= link_to "View", resource.show_path(record), class: "text-indigo-500" %>
+            <%= link_to "Edit", resource.edit_path(record), class: "text-indigo-500" %>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/app/views/madmin/application/show.html.erb

@@ -24,7 +24,7 @@
       </div>
 
       <div class="md:col-span-3">
-        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record } %>
+        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record, resource: resource } %>
       </div>
     </div>
   <% end %>

data/app/views/madmin/fields/file/_form.html.erb

@@ -0,0 +1,4 @@
+<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
+  <%= render "madmin/shared/label", form: form, field: field %>
+</div>
+<%= form.file_field field.attribute_name, class: "form-input" %>

data/app/views/madmin/fields/file/_index.html.erb

@@ -0,0 +1 @@
+<%= field.value(record) %>

data/app/views/madmin/fields/file/_show.html.erb

@@ -0,0 +1,6 @@
+<% value = field.value(record) %>
+<% if value.respond_to?(:url) %>
+  <%= link_to value.url, value.url, target: :_blank, class: "text-indigo-500 underline" %>
+<% else %>
+  <%= value %>
+<% end %>

data/app/views/madmin/fields/integer/_index.html.erb

@@ -1 +1,5 @@
-<%= field.value(record) %>
+<% if field.attribute_name == :id %>
+  <%= link_to field.value(record), resource.show_path(record), class: "text-indigo-500 underline" %>
+<% else %>
+  <%= field.value(record) %>
+<% end %>

data/app/views/madmin/fields/text/_index.html.erb

@@ -1 +1 @@
-<%= field.value(record) %>
+<%= truncate field.value(record) %>

data/lib/madmin/field.rb

@@ -1,14 +1,15 @@
 module Madmin
   class Field
-    attr_reader :attribute_name, :model, :options
+    attr_reader :attribute_name, :model, :options, :resource
 
     def self.field_type
       to_s.split("::").last.underscore
     end
 
-    def initialize(attribute_name:, model:, **options)
+    def initialize(attribute_name:, model:, resource:, **options)
       @attribute_name = attribute_name
       @model = model
+      @resource = resource
       @options = options
     end
 

data/lib/madmin/fields/file.rb

@@ -0,0 +1,9 @@
+module Madmin
+  module Fields
+    class File < Field
+      def searchable?
+        false
+      end
+    end
+  end
+end

data/lib/madmin/resource.rb

@@ -11,7 +11,7 @@ module Madmin
       end
 
       def model
-        model_name.constantize
+        @model ||= model_name.constantize
       end
 
       def model_find(id)
@@ -37,7 +37,7 @@ module Madmin
         attributes[name] = OpenStruct.new(
           name: name,
           type: type,
-          field: field.new(**options.merge(attribute_name: name, model: model))
+          field: field.new(**options.merge(attribute_name: name, model: model, resource: self))
         )
       rescue => e
         builder = ResourceBuilder.new(model)
@@ -58,28 +58,30 @@ module Madmin
         model_name.gsub("::", " / ")
       end
 
-      def index_path(options = {})
-        route_name = "madmin_#{model.model_name.plural}_path"
+      # Support for isolated namespaces
+      # Finds parent module class to include in polymorphic urls
+      def route_namespace
+        return @route_namespace if instance_variable_defined?(:@route_namespace)
+        namespace = model.module_parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
+        @route_namespace = (namespace ? namespace.name.singularize.underscore.to_sym : nil)
+      end
 
-        url_helpers.send(route_name, options)
+      def index_path(options = {})
+        url_helpers.polymorphic_path([:madmin, route_namespace, model], options)
       end
 
       def new_path
-        route_name = "new_madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name)
+        url_helpers.polymorphic_path([:madmin, route_namespace, model], action: :new)
       end
 
       def show_path(record)
-        route_name = "madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name, record.to_param)
+        url_helpers.polymorphic_path([:madmin, route_namespace, record])
       end
 
       def edit_path(record)
-        route_name = "edit_madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name, record.to_param)
+        url_helpers.polymorphic_path([:madmin, route_namespace, record], action: :edit)
       end
 
       def param_key
@@ -128,6 +130,7 @@ module Madmin
           time: Fields::Time,
           timestamp: Fields::Time,
           password: Fields::Password,
+          file: Fields::File,
 
           # Postgres specific types
           bit: Fields::String,

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/lib/madmin.rb

@@ -18,6 +18,7 @@ module Madmin
     autoload :DateTime, "madmin/fields/date_time"
     autoload :Decimal, "madmin/fields/decimal"
     autoload :Enum, "madmin/fields/enum"
+    autoload :File, "madmin/fields/file"
     autoload :Float, "madmin/fields/float"
     autoload :HasMany, "madmin/fields/has_many"
     autoload :HasOne, "madmin/fields/has_one"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,7 @@ files:
 - app/assets/config/manifest.js
 - app/assets/stylesheets/actiontext.scss
 - app/assets/stylesheets/application.css
+- app/controllers/madmin/application_controller.rb
 - app/controllers/madmin/base_controller.rb
 - app/controllers/madmin/dashboard_controller.rb
 - app/controllers/madmin/resource_controller.rb
@@ -98,6 +99,9 @@ files:
 - app/views/madmin/fields/enum/_form.html.erb
 - app/views/madmin/fields/enum/_index.html.erb
 - app/views/madmin/fields/enum/_show.html.erb
+- app/views/madmin/fields/file/_form.html.erb
+- app/views/madmin/fields/file/_index.html.erb
+- app/views/madmin/fields/file/_show.html.erb
 - app/views/madmin/fields/float/_form.html.erb
 - app/views/madmin/fields/float/_index.html.erb
 - app/views/madmin/fields/float/_show.html.erb
@@ -167,6 +171,7 @@ files:
 - lib/madmin/fields/date_time.rb
 - lib/madmin/fields/decimal.rb
 - lib/madmin/fields/enum.rb
+- lib/madmin/fields/file.rb
 - lib/madmin/fields/float.rb
 - lib/madmin/fields/has_many.rb
 - lib/madmin/fields/has_one.rb