five-two-nw-olivander 0.2.0.5 → 0.2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8143b2faef8f3a4a66f49a4de75815c3e4f31cb92cae9f66017cb5bb928e7f7
-  data.tar.gz: 5d03f6db29f5435a04c83d1be27ae67b81922aa267b4203dc507b73cfafe1963
+  metadata.gz: 2b23f7bab4f40d25ff84742a1e66c4d8d658c19697d4c3a02eb95a31ea5b6c3c
+  data.tar.gz: 14147a7fa4bd820a3dfc6b42ff22e5046a64a61de5e53cf387c8fd78c2938f1f
 SHA512:
-  metadata.gz: 11dcfc173f945d1100f793d7b749842e0e4b5be5ea1e010ae40ad1044366f8766a0368d7bd0c641561863c5437127686638cd107d0b86d9f281dc7be31c192ad
-  data.tar.gz: b241c425f3bff5e26e9409584a242e7f3952eb0b0f9edbd833f8a855d0893f446d39688e69e0127c845eb46bf96c2f8cdc2466c412356574bad57316088b0e4a
+  metadata.gz: e25a94a5a33cd5a66b0f10c45b514d0652a693abd91daea7c3150d388b82ac394ab5bb34ac99299debeea5b2c2979ba52e8355132d0d970051ef176549f1127d
+  data.tar.gz: 19fc5469c3f3643a499c94558388187ab98170f2b1d5fc620ddf5941692c0e6f42f2fef05332c46878787a13b9006eca6c21200bcdbd7e0a61a018194e7122f9

data/app/assets/javascripts/controllers/input_control_association_controller.js

@@ -15,7 +15,11 @@ export default class extends Controller {
           dataType: 'json',
           processResults: function(data) {
             return { results: data.map(function(map) {
-              return { id: map.id, text: map.text || map.name || map.description };
+              return {
+                id: map.id,
+                text: map.text || map.name || map.description,
+                children: map.children
+              };
             }) };
           }
         }

data/app/controllers/concerns/olivander/resources/crud_controller.rb

@@ -6,6 +6,7 @@ module Olivander
       included do
         include Effective::CrudController
         layout 'olivander/adminlte/main'
+        before_action :fix_date_params
 
         def index
           if request.format == :json && params[:_type].present? && params[:_type] == 'query'
@@ -17,6 +18,25 @@ module Olivander
 
         def index_search
           self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
+          index_term_search if params[:term].present?
+          index_param_search
+          if resources.order_values.size.zero? && resources.model.implicit_order_column.present?
+            self.resources = resources.order(resources.model.implicit_order_column.to_sym)
+          end
+          self.resources = self.resources.limit(25)
+        end
+
+        def index_param_search
+          params.each do |param|
+            effective_resource.klass.columns.each do |col|
+              next unless col.name == param[0] #&& !param[1].blank?
+
+              self.resources = self.resources.where(param[0].to_sym => param[1])
+            end
+          end
+        end
+
+        def index_term_search
           if resource_scope.respond_to?(:search_for)
             self.resources = self.resources.search_for(params[:term])
           else
@@ -31,7 +51,6 @@ module Olivander
             self.resources = self.resources.where(clauses) if clauses.present? && clauses.length.positive?
             self.resources = self.resources.order(orders) if orders.length.positive?
           end
-          self.resources = self.resources.limit(25)
         end
 
         def permitted_params
@@ -93,6 +112,73 @@ module Olivander
             end
           end
         end
+
+        def respond_with_error(resource, action)
+          return if response.body.present?
+
+          flash.delete(:success)
+          flash.now[:danger] ||= resource_flash(:danger, resource, action)
+
+          respond_to do |format|
+            case action_name.to_sym
+            when :create
+              format.html { render :new }
+            when :update
+              format.html { render :edit }
+            when :destroy
+              format.html do
+                redirect_flash
+                redirect_to(resource_redirect_path(resource, action))
+              end
+            else
+              if template_present?(action)
+                format.html { render(action, locals: { action: action }) }
+              elsif request.referer.to_s.end_with?('/edit')
+                format.html { render :edit }
+              elsif request.referer.to_s.end_with?('/new')
+                format.html { render :new }
+              else
+                format.html do
+                  redirect_flash
+                  redirect_to(resource_redirect_path(resource, action))
+                end
+              end
+            end
+
+            format.js do
+              view = template_present?(action) ? action : :member_action
+              render(view, locals: { action: action }) # action.js.erb
+            end
+
+            format.turbo_stream do
+            end
+          end
+        end
+
+        def date_params
+          []
+        end
+
+        def fix_date_params
+          recurse_and_fix_date_params(params)
+        end
+
+        def recurse_and_fix_date_params(params)
+          params.keys.each do |k|
+            if params[k].is_a? ActionController::Parameters
+              recurse_and_fix_date_params(params[k])
+            else
+              params[k] = rearrange_date_param(params[k]) if date_params.include?(k.to_sym)
+            end
+          end
+        end
+
+        def rearrange_date_param(value)
+          return nil if value.blank?
+
+          parts = value.split('/')
+          "#{parts[2]}-#{parts[0]}-#{parts[1]}"
+        end
       end
     end
   end

data/app/views/layouts/olivander/adminlte/login.html.haml

@@ -3,8 +3,8 @@
   = render partial: 'layouts/olivander/adminlte/head'
   %body.hold-transition.login-page
     .login-box
-      -# .login-logo
-      -#   %img.brand-image.img-circle.elevation-3{:alt => Olivander::CurrentContext.application_context.logo.alt, :src => Olivander::CurrentContext.application_context.logo.url, :style => "opacity: .8"}
+      - unless Olivander::CurrentContext.application_context.login_logo.url.blank?
+        %img{ alt: Olivander::CurrentContext.application_context.login_logo.alt, src: Olivander::CurrentContext.application_context.login_logo.url, style: "max-width: 100%; opacity: 1.0" }
       .card
         .card-header.text-center{ class: sidebar_background_class }
           %a.h1{ href: '/' }

data/config/initializers/simple_form.rb

@@ -125,7 +125,7 @@ SimpleForm.setup do |config|
     b.optional :min_max
     b.optional :readonly
     b.use :input, class: 'custom-control-input'
-    #b.use :label, class: 'custom-control-label'
+    b.use :label, class: 'custom-control-label'
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: "text-danger" }
   end

data/lib/olivander/application_context.rb

@@ -1,10 +1,11 @@
 module Olivander
   class ApplicationContext
-    attr_accessor :name, :logo, :company, :menu_items, :route_builder, :sign_out_path, :sidebar_background_class
+    attr_accessor :name, :logo, :login_logo, :company, :menu_items, :route_builder, :sign_out_path, :sidebar_background_class
 
     def initialize(**kwargs)
       self.name = kwargs[:name] || ENV['OLIVANDER_APP_NAME'] || 'Application Name'
       self.logo = kwargs[:logo] || Logo.new(url: kwargs[:logo_url], alt: kwargs[:logo_alt])
+      self.login_logo = kwargs[:login_logo] || LoginLogo.new(url: kwargs[:login_logo_url], alt: kwargs[:login_logo_alt])
       self.company = kwargs[:company] || Company.new(name: kwargs[:company_name], url: kwargs[:company_url])
       self.sign_out_path = kwargs[:sign_out_path] || '/sign_out'
       self.menu_items = kwargs[:menu_items] || []
@@ -41,6 +42,15 @@ module Olivander
       end
     end
 
+    class LoginLogo
+      attr_accessor :url, :alt
+
+      def initialize(**kwargs)
+        self.url = kwargs[:url] || ENV['OLIVANDER_LOGIN_LOGO_URL'] || '/images/olivander_login_logo.png'
+        self.alt = kwargs[:alt] || ENV['OLIVANDER_LOGIN_LOGO_ALT'] || 'Login Logo Image'
+      end
+    end
+
     class Company
       attr_accessor :name, :url
 

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.5'.freeze
+  VERSION = '0.2.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.5
+  version: 0.2.0.7
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick