Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort unused elements and page types by name #2515

Merged
merged 1 commit into from
Jul 4, 2023
Merged

Sort unused elements and page types by name #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/alchemy/tasks/usage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def elements_count_by_name
.group(:name)
.order("count DESC, name ASC")
.map { |e| {"name" => e.name, "count" => e.count} }
Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.each do |definition|
Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
res << {"name" => definition["name"], "count" => 0}
end
res
Expand All @@ -23,7 +23,7 @@ def pages_count_by_type
.group(:page_layout)
.order("count DESC, page_layout ASC")
.map { |p| {"page_layout" => p.page_layout, "count" => p.count} }
Alchemy::PageLayout.all.reject { |page_layout| res.map { |p| p["page_layout"] }.include? page_layout["name"] }.each do |page_layout|
Alchemy::PageLayout.all.reject { |page_layout| res.map { |p| p["page_layout"] }.include? page_layout["name"] }.sort_by { |d| d["name"] }.each do |page_layout|
res << {"page_layout" => page_layout["name"], "count" => 0}
end
res
Expand Down
30 changes: 15 additions & 15 deletions spec/libraries/alchemy/tasks/usage_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
{"name" => "headline", "count" => 3},
{"name" => "image", "count" => 2},
{"name" => "text", "count" => 1},
{"name" => "header", "count" => 0},
{"name" => "all_you_can_eat", "count" => 0},
{"name" => "article", "count" => 0},
{"name" => "search", "count" => 0},
{"name" => "news", "count" => 0},
{"name" => "download", "count" => 0},
{"name" => "bild", "count" => 0},
{"name" => "contactform", "count" => 0},
{"name" => "all_you_can_eat", "count" => 0},
{"name" => "download", "count" => 0},
{"name" => "element_with_ingredient_groups", "count" => 0},
{"name" => "element_with_warning", "count" => 0},
{"name" => "erb_cell", "count" => 0},
{"name" => "erb_element", "count" => 0},
{"name" => "slide", "count" => 0},
{"name" => "slider", "count" => 0},
{"name" => "gallery", "count" => 0},
{"name" => "gallery_picture", "count" => 0},
{"name" => "right_column", "count" => 0},
{"name" => "header", "count" => 0},
{"name" => "left_column", "count" => 0},
{"name" => "erb_cell", "count" => 0},
{"name" => "menu", "count" => 0},
{"name" => "news", "count" => 0},
{"name" => "old", "count" => 0},
{"name" => "element_with_ingredient_groups", "count" => 0},
{"name" => "element_with_warning", "count" => 0}
{"name" => "right_column", "count" => 0},
{"name" => "search", "count" => 0},
{"name" => "slide", "count" => 0},
{"name" => "slider", "count" => 0}
]
end
end
Expand All @@ -53,12 +53,12 @@
{"page_layout" => "standard", "count" => 2},
{"page_layout" => "home", "count" => 1},
{"page_layout" => "index", "count" => 1},
{"page_layout" => "readonly", "count" => 0},
{"page_layout" => "everything", "count" => 0},
{"page_layout" => "news", "count" => 0},
{"page_layout" => "contact", "count" => 0},
{"page_layout" => "erb_layout", "count" => 0},
{"page_layout" => "everything", "count" => 0},
{"page_layout" => "footer", "count" => 0},
{"page_layout" => "erb_layout", "count" => 0}
{"page_layout" => "news", "count" => 0},
{"page_layout" => "readonly", "count" => 0}
]
end
end
Expand Down