refactor unchecked visible columns

wri · Apr 20, 2023 · 130d8f8 · 130d8f8
1 parent 636765e
commit 130d8f8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/app/admin/observations_dashboard.rb b/app/admin/observations_dashboard.rb
@@ -131,10 +131,10 @@
  panel "Visible columns" do
  render partial: "fields", locals: {
  attributes: [
- ["date", I18n.t("activerecord.attributes.operator_document_statistic.date")],
- ["country", I18n.t("activerecord.attributes.operator_document_statistic.country.one")],
- ["is_active", I18n.t("activerecord.attributes.observation.is_active")],
- ["hidden", I18n.t("activerecord.attributes.observation.hidden")],
+ ["date", I18n.t("activerecord.attributes.operator_document_statistic.date"), :checked],
+ ["country", I18n.t("activerecord.attributes.operator_document_statistic.country.one"), :checked],
+ ["is_active", I18n.t("activerecord.attributes.observation.is_active"), :checked],
+ ["hidden", I18n.t("activerecord.attributes.observation.hidden"), :checked],
  ["observation_type", I18n.t("activerecord.attributes.observation.observation_type")],
  ["operator", I18n.t("activerecord.models.operator")],
  ["severity_level", I18n.t("activerecord.attributes.severity.level")],
@@ -151,12 +151,8 @@
  ["published_no_comments", I18n.t("activerecord.enums.observation.statuses.Published (no comments)")],
  ["published_modified", I18n.t("activerecord.enums.observation.statuses.Published (modified)")],
  ["published_not_modified", I18n.t("activerecord.enums.observation.statuses.Published (not modified)")],
- ["published_all", I18n.t("active_admin.observations_dashboard_page.published_all")],
+ ["published_all", I18n.t("active_admin.observations_dashboard_page.published_all"), :checked],
  ["total_count", I18n.t("active_admin.observation_reports_dashboard_page.total_count")]
- ],
- unchecked: %w[
- operator severity_level observation_type category subcategory fmu_forest_type ready_for_qc approved rejected needs_revision ready_for_publication
- published_no_comments published_modified published_not_modified total_count created qc_in_progress
  ]
  }
  end

diff --git a/app/admin/operator_documents_dashboard.rb b/app/admin/operator_documents_dashboard.rb
@@ -89,20 +89,19 @@
  panel I18n.t("active_admin.producer_documents_dashboard_page.visible_columns") do
  render partial: "fields", locals: {
  attributes: [
- ["date", I18n.t("activerecord.attributes.operator_document_statistic.date")],
- ["country", I18n.t("activerecord.attributes.operator_document_statistic.country.one")],
+ ["date", I18n.t("activerecord.attributes.operator_document_statistic.date"), :checked],
+ ["country", I18n.t("activerecord.attributes.operator_document_statistic.country.one"), :checked],
  ["required_operator_document_group", I18n.t("activerecord.models.required_operator_document_group.one")],
  ["fmu_forest_type", I18n.t("activerecord.attributes.fmu.forest_type")],
  ["document_type", I18n.t("activerecord.attributes.required_gov_document.document_type")],
- ["valid_expired", I18n.t("active_admin.producer_documents_dashboard_page.valid_expired")],
- ["valid", I18n.t("active_admin.producer_documents_dashboard_page.valid")],
- ["expired", I18n.t("active_admin.producer_documents_dashboard_page.expired")],
+ ["valid_expired", I18n.t("active_admin.producer_documents_dashboard_page.valid_expired"), :checked],
+ ["valid", I18n.t("active_admin.producer_documents_dashboard_page.valid"), :checked],
+ ["expired", I18n.t("active_admin.producer_documents_dashboard_page.expired"), :checked],
  ["invalid", I18n.t("active_admin.producer_documents_dashboard_page.invalid")],
  ["pending", I18n.t("active_admin.producer_documents_dashboard_page.pending")],
  ["not_provided", I18n.t("active_admin.producer_documents_dashboard_page.not_provided")],
  ["not_required", I18n.t("active_admin.producer_documents_dashboard_page.not_required")]
- ],
- unchecked: %w[required_operator_document_group fmu_forest_type document_type invalid pending not_provided not_required]
+ ]
  }
  end
  end

diff --git a/app/views/active_admin/resource/_fields.html.erb b/app/views/active_admin/resource/_fields.html.erb
@@ -1,14 +1,13 @@
 <% save_to_localstorage ||= true %>
 <div class="observation-attributes" data-save-to-localstorage="<%= save_to_localstorage %>">
- <% unchecked ||= [] %>
- <% attributes.each do |column, name| %>
+ <% attributes.each do |column, name, checked| %>
  <%
  column_id = column.gsub('_&_', '_')
  name = column if name.blank?
  %>
  <div class="observations-checkbox" id="attribute-<%= column_id %>">
  <label>
- <input type="checkbox" class="observation-checkbox" id="<%= column_id %>" <%= unchecked.exclude?(column) ? 'checked' : '' %>>
+ <input type="checkbox" class="observation-checkbox" id="<%= column_id %>" <%= checked == :checked ? 'checked' : '' %>>
  <%=name %>
  </label>
  </div>