five-two-nw-olivander 0.1.2.30 → 0.1.2.32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/adminlte.css +7 -1
- data/app/components/olivander/components/portlet_component.html.haml +1 -1
- data/app/components/olivander/components/portlet_component.rb +1 -1
- data/app/components/olivander/components/table_portlet_component/table_component.html.haml +18 -0
- data/app/components/olivander/components/table_portlet_component.html.haml +25 -0
- data/app/components/olivander/components/table_portlet_component.rb +59 -0
- data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb +14 -12
- data/app/datatables/olivander/datatable.rb +17 -12
- data/app/helpers/olivander/application_helper.rb +18 -0
- data/lib/olivander/version.rb +1 -1
- metadata +5 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 37e0a7cf2d36201b7ac2aebff9146a6158b25c379ca15ce0b9d21a49e650c9e6
|
4
|
+
data.tar.gz: a917d32e38deb6075ab2e879126fe859775c6f8da538e5402950518d48318e35
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e329f896993ef107fa04e45ab3a4e78cc1719d9c453154c040e5d7f3f4cced42e3a758718734c35b6d40409a4f3af2a8b0e2b5fb6992960044df27ae1bcdcb70
|
7
|
+
data.tar.gz: 89d10674362a00e7cbf4e5dd154fc721ca5f4d8dbb83f488b7359df44358531d15023b2b37cd57553d20a3461fc605dbe570e6ebbc4af5cf6c146505070dbf85
|
@@ -3,7 +3,7 @@
|
|
3
3
|
module Olivander
|
4
4
|
module Components
|
5
5
|
class PortletComponent < ViewComponent::Base
|
6
|
-
def initialize(title, background: nil, header_background: 'bg-
|
6
|
+
def initialize(title, background: nil, header_background: 'bg-secondary', turbo_frame: nil, src: nil, loading: nil)
|
7
7
|
super
|
8
8
|
@title = title
|
9
9
|
@background = background
|
@@ -0,0 +1,18 @@
|
|
1
|
+
- if @item_iteration.first?
|
2
|
+
%table.table.table-striped.table-hover.table-fixed_header/
|
3
|
+
- if @headers
|
4
|
+
%thead
|
5
|
+
%tr
|
6
|
+
- @builder.field_blocks.each do |field_block|
|
7
|
+
%th{ class: field_block.alignment }
|
8
|
+
- if field_block.key.present?
|
9
|
+
= I18n.t(['activerecord.attributes', @item.class.name.underscore, field_block.key].join('.'))
|
10
|
+
%tbody/
|
11
|
+
%tr
|
12
|
+
- @builder.field_blocks.each do |field_block|
|
13
|
+
%td{ class: field_block.alignment }
|
14
|
+
= capture do
|
15
|
+
- instance_exec(@item, &field_block.block)
|
16
|
+
- if @item_iteration.last?
|
17
|
+
</tbody>
|
18
|
+
</table>
|
@@ -0,0 +1,25 @@
|
|
1
|
+
- if @turbo_frame.present?
|
2
|
+
<turbo-frame id="#{@turbo_frame}">
|
3
|
+
|
4
|
+
.card{ class: @background }
|
5
|
+
.card-header{ class: @header_background }
|
6
|
+
%h3.card-title= @title
|
7
|
+
.card-tools
|
8
|
+
- if header_tools?
|
9
|
+
= header_tools
|
10
|
+
-# %button.btn.btn-tool{ type: :button, 'data-card-widget': :collapse }
|
11
|
+
-# %i.fas.fa-minus
|
12
|
+
-# %button.btn.btn-tool{ type: :button, 'data-card-widget': :maximize }
|
13
|
+
-# %i.fas.fa-expand
|
14
|
+
.card-body
|
15
|
+
- if @collection&.size&.positive?
|
16
|
+
%div{style: @max_height.present? ? "max-height: #{@max_height}; overflow-y: auto; overflow-x: hidden" : ""}
|
17
|
+
= render Olivander::Components::TablePortletComponent::TableComponent.with_collection(@collection, builder: @builder, headers: @headers)
|
18
|
+
- else
|
19
|
+
No #{@title.downcase} to display.
|
20
|
+
- if footer_buttons?
|
21
|
+
.card-footer.text-right
|
22
|
+
= footer_buttons
|
23
|
+
|
24
|
+
- if @turbo_frame.present?
|
25
|
+
</turbo-frame>
|
@@ -0,0 +1,59 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Olivander
|
4
|
+
module Components
|
5
|
+
class TablePortletComponent < ViewComponent::Base
|
6
|
+
renders_one :header_tools
|
7
|
+
renders_one :footer_buttons
|
8
|
+
|
9
|
+
def initialize(collection, headers: true, builder:, title: '', background: nil, header_background: 'bg-secondary', turbo_frame: nil, max_height: nil)
|
10
|
+
super
|
11
|
+
@collection = collection
|
12
|
+
@builder = builder
|
13
|
+
@title = title
|
14
|
+
@background = background
|
15
|
+
@header_background = header_background
|
16
|
+
@turbo_frame = turbo_frame
|
17
|
+
@max_height = max_height
|
18
|
+
@headers = headers
|
19
|
+
end
|
20
|
+
|
21
|
+
class TableComponent < ViewComponent::Base
|
22
|
+
with_collection_parameter :item
|
23
|
+
delegate :can?, :cannot?, to: :helpers
|
24
|
+
|
25
|
+
def initialize(item:, item_iteration:, builder:, headers:)
|
26
|
+
super
|
27
|
+
@item = item
|
28
|
+
@item_iteration = item_iteration
|
29
|
+
@builder = builder
|
30
|
+
@headers = headers
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
class Builder
|
35
|
+
attr_accessor :field_blocks, :header_tools, :footer_buttons
|
36
|
+
|
37
|
+
def initialize(collection, &block)
|
38
|
+
self.field_blocks = []
|
39
|
+
block.call(self) if block_given?
|
40
|
+
end
|
41
|
+
|
42
|
+
def field(key, alignment = 'text-left', &block)
|
43
|
+
unless block_given?
|
44
|
+
block = Proc.new{ |x| x.send(key).to_s.html_safe }
|
45
|
+
end
|
46
|
+
field_blocks << OpenStruct.new(key: key, alignment: alignment, block: block)
|
47
|
+
end
|
48
|
+
|
49
|
+
def with_header_tools(&block)
|
50
|
+
self.header_tools = block
|
51
|
+
end
|
52
|
+
|
53
|
+
def with_footer_buttons(&block)
|
54
|
+
self.footer_buttons = block
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
@@ -44,19 +44,21 @@ module Olivander
|
|
44
44
|
end
|
45
45
|
else
|
46
46
|
only = self.columns.collect{ |x| x.name.to_sym } - SKIPPED_ATTRIBUTES if only.size.zero?
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
47
|
+
only.each do |inc|
|
48
|
+
self.columns.each do |att|
|
49
|
+
sym = att.name.to_sym
|
50
|
+
type = att.type
|
51
|
+
next unless inc == sym
|
52
|
+
|
53
|
+
reflections.map{ |x| x[1] }
|
54
|
+
.filter{ |x| x.foreign_key == att.name }
|
55
|
+
.each do |r|
|
56
|
+
sym = r.name
|
57
|
+
type = :association
|
58
|
+
end
|
59
|
+
|
60
|
+
resource_field sym, type
|
57
61
|
end
|
58
|
-
|
59
|
-
resource_field sym, type
|
60
62
|
end
|
61
63
|
end
|
62
64
|
end
|
@@ -22,6 +22,8 @@ module Olivander
|
|
22
22
|
column_attributes = klazz_attributes
|
23
23
|
column_attributes &&= only if only.size.positive?
|
24
24
|
column_attributes -= except if except.size.positive?
|
25
|
+
resources_sym = klazz.table_name.to_sym
|
26
|
+
bulk_action_list = self::ROUTE_BUILDER.resources[resources_sym].datatable_bulk_actions
|
25
27
|
|
26
28
|
default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
|
27
29
|
|
@@ -35,23 +37,26 @@ module Olivander
|
|
35
37
|
dc
|
36
38
|
end
|
37
39
|
|
40
|
+
if bulk_action_list.size.positive?
|
41
|
+
bulk_actions do
|
42
|
+
bulk_action_list.each do |ma|
|
43
|
+
if ma.confirm
|
44
|
+
bulk_action ma.sym, url_for(controller: ma.controller, action: "confirm_#{ma.action}")
|
45
|
+
else
|
46
|
+
bulk_action ma.sym, url_for(controller: ma.controller, action: ma.action), data: { turbo_frame: ma.turbo_frame }
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
38
52
|
datatable do
|
39
53
|
order(order_by[0], order_by[1]) if order_by.size == 2
|
40
|
-
|
54
|
+
Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size}"
|
55
|
+
Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size.positive?}"
|
56
|
+
# bulk_actions_col if datatable._bulk_actions.size.positive?
|
41
57
|
column_attributes.each do |key|
|
42
58
|
label = field_label_for(klazz, key)
|
43
59
|
sym = key.gsub('_id', '')
|
44
|
-
|
45
|
-
# modifiers = STRIP OFF ANY PUNCTUATION MARKS
|
46
|
-
# modifiers.each do |modifier|
|
47
|
-
# case !:
|
48
|
-
# visible = false
|
49
|
-
# case $:
|
50
|
-
# type = currency
|
51
|
-
# end
|
52
|
-
# end
|
53
|
-
|
54
|
-
|
55
60
|
visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
|
56
61
|
if link_path.present? && sym == :id
|
57
62
|
link_col sym, link_path, 'id', visible: visible
|
@@ -146,5 +146,23 @@ module Olivander
|
|
146
146
|
"fas fa-question-circle"
|
147
147
|
end
|
148
148
|
end
|
149
|
+
|
150
|
+
def collection_component_builder_for(klass, collection, *args, &block)
|
151
|
+
builder = klass::Builder.new(self, &block)
|
152
|
+
options = args.extract_options!
|
153
|
+
options[:builder] = builder
|
154
|
+
render klass.new(collection, *(args + [options])) do |component|
|
155
|
+
if builder.header_tools.present?
|
156
|
+
component.with_header_tools do
|
157
|
+
builder.header_tools.call
|
158
|
+
end
|
159
|
+
end
|
160
|
+
if builder.footer_buttons.present?
|
161
|
+
component.with_footer_buttons do
|
162
|
+
builder.footer_buttons.call
|
163
|
+
end
|
164
|
+
end
|
165
|
+
end
|
166
|
+
end
|
149
167
|
end
|
150
168
|
end
|
data/lib/olivander/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: five-two-nw-olivander
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.2.
|
4
|
+
version: 0.1.2.32
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eric Dennis
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-08-
|
11
|
+
date: 2023-08-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chartkick
|
@@ -192,6 +192,9 @@ files:
|
|
192
192
|
- app/components/olivander/components/resource_show_component.rb
|
193
193
|
- app/components/olivander/components/small_box_component.html.haml
|
194
194
|
- app/components/olivander/components/small_box_component.rb
|
195
|
+
- app/components/olivander/components/table_portlet_component.html.haml
|
196
|
+
- app/components/olivander/components/table_portlet_component.rb
|
197
|
+
- app/components/olivander/components/table_portlet_component/table_component.html.haml
|
195
198
|
- app/controllers/concerns/olivander/resources/auto_form_attributes.rb
|
196
199
|
- app/controllers/concerns/olivander/resources/model_registrar.rb
|
197
200
|
- app/controllers/concerns/olivander/resources/model_registry.rb
|