Skip to content

Commit 88fd15a

Browse files
blocknotesblocknotes
committed
refactor(views): extract shared Attributes, ActionsButtons, and ErrorPage
DRY up duplicated update_attributes into a Views::Attributes module shared by BasicLayout and BasicComponent. Extract inline actions_buttons methods from Index and Show into a reusable ActionsButtons component. Consolidate three identical error page view_templates into an ErrorPage base class. Also adds nil guard on field access in Index and Show table/record iteration.
1 parent 97aabff commit 88fd15a

10 files changed

Lines changed: 115 additions & 97 deletions

File tree

‎lib/tiny_admin/views/actions/index.rb‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ module Views
55
module Actions
66
class Index < DefaultLayout
77
attr_accessor :actions,
8-
:fields,
9-
:filters,
10-
:links,
11-
:pagination_component,
12-
:prepare_record,
13-
:records,
14-
:slug
8+
:fields,
9+
:filters,
10+
:links,
11+
:pagination_component,
12+
:prepare_record,
13+
:records,
14+
:slug
1515

1616
def view_template
1717
super do
18-
div(class: 'index') {
19-
div(class: 'row') {
20-
div(class: 'col-4') {
21-
h1(class: 'title') {
18+
div(class: "index") {
19+
div(class: "row") {
20+
div(class: "col-4") {
21+
h1(class: "title") {
2222
title
2323
}
2424
}
25-
div(class: 'col-8') {
25+
div(class: "col-8") {
2626
actions_buttons
2727
}
2828
}
2929

30-
div(class: 'row') {
31-
div_class = filters&.any? ? 'col-9' : 'col-12'
30+
div(class: "row") {
31+
div_class = filters&.any? ? "col-9" : "col-12"
3232
div(class: div_class) {
33-
table(class: 'table') {
33+
table(class: "table") {
3434
table_header if fields.any?
3535

3636
table_body
@@ -40,7 +40,7 @@ def view_template
4040
}
4141

4242
if filters&.any?
43-
div(class: 'col-3') {
43+
div(class: "col-3") {
4444
filters_form = TinyAdmin::Views::Components::FiltersForm.new
4545
filters_form.update_attributes(section_path: TinyAdmin.route_for(slug), filters: filters)
4646
render filters_form
@@ -75,20 +75,22 @@ def table_body
7575
attributes = prepare_record.call(record)
7676
attributes.each do |key, value|
7777
field = fields[key]
78+
next unless field
79+
7880
td(class: "field-value-#{field.name} field-value-type-#{field.type}") {
7981
render TinyAdmin.settings.components[:field_value].new(field, value, record: record)
8082
}
8183
end
8284

83-
td(class: 'actions p-1') {
84-
div(class: 'btn-group btn-group-sm') {
85-
link_class = 'btn btn-outline-secondary'
85+
td(class: "actions p-1") {
86+
div(class: "btn-group btn-group-sm") {
87+
link_class = "btn btn-outline-secondary"
8688
if links
8789
links.each do |link|
8890
whitespace
89-
if link == 'show'
91+
if link == "show"
9092
a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) {
91-
label_for('Show', options: ['actions.index.links.show'])
93+
label_for("Show", options: ["actions.index.links.show"])
9294
}
9395
else
9496
a(href: TinyAdmin.route_for(slug, reference: record.id, action: link), class: link_class) {
@@ -99,7 +101,7 @@ def table_body
99101
end
100102
else
101103
a(href: TinyAdmin.route_for(slug, reference: record.id), class: link_class) {
102-
label_for('Show', options: ['actions.index.links.show'])
104+
label_for("Show", options: ["actions.index.links.show"])
103105
}
104106
end
105107
}
@@ -110,16 +112,9 @@ def table_body
110112
end
111113

112114
def actions_buttons
113-
ul(class: 'nav justify-content-end') {
114-
(actions || {}).each do |action, action_class|
115-
li(class: 'nav-item mx-1') {
116-
href = TinyAdmin.route_for(slug, action: action)
117-
a(href: href, class: 'nav-link btn btn-outline-secondary') {
118-
action_class.respond_to?(:title) ? action_class.title : action
119-
}
120-
}
121-
end
122-
}
115+
buttons = TinyAdmin::Views::Components::ActionsButtons.new
116+
buttons.update_attributes(actions: actions, slug: slug)
117+
render buttons
123118
end
124119
end
125120
end

‎lib/tiny_admin/views/actions/show.rb‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@ module Views
55
module Actions
66
class Show < DefaultLayout
77
attr_accessor :actions,
8-
:fields,
9-
:prepare_record,
10-
:record,
11-
:reference,
12-
:slug
8+
:fields,
9+
:prepare_record,
10+
:record,
11+
:reference,
12+
:slug
1313

1414
def view_template
1515
super do
16-
div(class: 'show') {
17-
div(class: 'row') {
18-
div(class: 'col-4') {
19-
h1(class: 'title') { title }
16+
div(class: "show") {
17+
div(class: "row") {
18+
div(class: "col-4") {
19+
h1(class: "title") { title }
2020
}
21-
div(class: 'col-8') {
21+
div(class: "col-8") {
2222
actions_buttons
2323
}
2424
}
2525

2626
prepare_record.call(record).each do |key, value|
2727
field = fields[key]
28+
next unless field
29+
2830
div(class: "field-#{field.name} row lh-lg") {
29-
if field
30-
div(class: 'field-header col-2') { field.options[:header] || field.title }
31-
end
32-
div(class: 'field-value col-10') {
31+
div(class: "field-header col-2") { field.options[:header] || field.title }
32+
div(class: "field-value col-10") {
3333
render TinyAdmin.settings.components[:field_value].new(field, value, record: record)
3434
}
3535
}
@@ -43,16 +43,9 @@ def view_template
4343
private
4444

4545
def actions_buttons
46-
ul(class: 'nav justify-content-end') {
47-
(actions || {}).each do |action, action_class|
48-
li(class: 'nav-item mx-1') {
49-
href = TinyAdmin.route_for(slug, reference: reference, action: action)
50-
a(href: href, class: 'nav-link btn btn-outline-secondary') {
51-
action_class.respond_to?(:title) ? action_class.title : action
52-
}
53-
}
54-
end
55-
}
46+
buttons = TinyAdmin::Views::Components::ActionsButtons.new
47+
buttons.update_attributes(actions: actions, slug: slug, reference: reference)
48+
render buttons
5649
end
5750
end
5851
end

‎lib/tiny_admin/views/attributes.rb‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# frozen_string_literal: true
2+
3+
module TinyAdmin
4+
module Views
5+
module Attributes
6+
def update_attributes(attributes)
7+
attributes.each do |key, value|
8+
send("#{key}=", value)
9+
end
10+
end
11+
end
12+
end
13+
end

‎lib/tiny_admin/views/basic_layout.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@
33
module TinyAdmin
44
module Views
55
class BasicLayout < Phlex::HTML
6+
include Attributes
67
include Utils
78

89
attr_accessor :content, :params, :widgets
910

1011
def label_for(value, options: [])
1112
TinyAdmin.settings.helper_class.label_for(value, options: options)
1213
end
13-
14-
def update_attributes(attributes)
15-
attributes.each do |key, value|
16-
send("#{key}=", value)
17-
end
18-
end
1914
end
2015
end
2116
end

‎lib/tiny_admin/views/components/actions_buttons.rb‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# frozen_string_literal: true
2+
3+
module TinyAdmin
4+
module Views
5+
module Components
6+
class ActionsButtons < BasicComponent
7+
attr_accessor :actions, :slug, :reference
8+
9+
def view_template
10+
ul(class: "nav justify-content-end") {
11+
(actions || {}).each do |action, action_class|
12+
li(class: "nav-item mx-1") {
13+
href = TinyAdmin.route_for(slug, reference: reference, action: action)
14+
a(href: href, class: "nav-link btn btn-outline-secondary") {
15+
action_class.respond_to?(:title) ? action_class.title : action
16+
}
17+
}
18+
end
19+
}
20+
end
21+
end
22+
end
23+
end
24+
end

‎lib/tiny_admin/views/components/basic_component.rb‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ module TinyAdmin
44
module Views
55
module Components
66
class BasicComponent < Phlex::HTML
7-
def update_attributes(attributes)
8-
attributes.each do |key, value|
9-
send("#{key}=", value)
10-
end
11-
end
7+
include Attributes
128
end
139
end
1410
end

‎lib/tiny_admin/views/pages/error_page.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# frozen_string_literal: true
2+
3+
module TinyAdmin
4+
module Views
5+
module Pages
6+
class ErrorPage < DefaultLayout
7+
def view_template
8+
super do
9+
div(class: css_class) {
10+
h1(class: "title") { title }
11+
}
12+
end
13+
end
14+
15+
private
16+
17+
def css_class
18+
self.class.name.split("::").last
19+
.gsub(/([A-Z])/, '_\1')
20+
.sub(/^_/, "")
21+
.downcase
22+
end
23+
end
24+
end
25+
end
26+
end

‎lib/tiny_admin/views/pages/page_not_allowed.rb‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@
33
module TinyAdmin
44
module Views
55
module Pages
6-
class PageNotAllowed < DefaultLayout
7-
def view_template
8-
super do
9-
div(class: 'page_not_allowed') {
10-
h1(class: 'title') { title }
11-
}
12-
end
13-
end
14-
6+
class PageNotAllowed < ErrorPage
157
def title
16-
'Page not allowed'
8+
"Page not allowed"
179
end
1810
end
1911
end

‎lib/tiny_admin/views/pages/page_not_found.rb‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@
33
module TinyAdmin
44
module Views
55
module Pages
6-
class PageNotFound < DefaultLayout
7-
def view_template
8-
super do
9-
div(class: 'page_not_found') {
10-
h1(class: 'title') { title }
11-
}
12-
end
13-
end
14-
6+
class PageNotFound < ErrorPage
157
def title
16-
'Page not found'
8+
"Page not found"
179
end
1810
end
1911
end

‎lib/tiny_admin/views/pages/record_not_found.rb‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@
33
module TinyAdmin
44
module Views
55
module Pages
6-
class RecordNotFound < DefaultLayout
7-
def view_template
8-
super do
9-
div(class: 'record_not_found') {
10-
h1(class: 'title') { title }
11-
}
12-
end
13-
end
14-
6+
class RecordNotFound < ErrorPage
157
def title
16-
'Record not found'
8+
"Record not found"
179
end
1810
end
1911
end

0 commit comments

Comments
 (0)