workbenches/show.html.slim: Convert table_builder to new columns

Use our new column syntax to build the table, creating
`TableBuilderHelper::Column` objects for each column. This gets our
table rendering again with the new `table_builder_2` code.

Remove the old table builder code as we're going to switch entirely to
this one.

Get rid of the TODO about the =>s as it's no longer relevant.

Refs #3479

1 files changed, 34 insertions, 21 deletions

diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 61b9395fa..3c2bb26ec 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -22,28 +22,41 @@
     - if @wbench_refs.any?
       .row
         .col-lg-12
-          /= table_builder @wbench_refs,
-            { :name => 'name',
-              :status => Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='sb sb-lg sb-preparing'></span><span>En préparation</span></div>").html_safe},
-              :organisation => Proc.new {|w| w.organisation.name},
-              :validity_period => Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))},
-              :lines => Proc.new {|w| w.lines.count},
-              :created_at => Proc.new {|w| l(w.created_at, format: :short)},
-              :updated_at => Proc.new {|w| l(w.updated_at, format: :short)},
-              :published_at => ''},
-            [:show, :edit, :archive, :unarchive, :delete],
-            [:delete],
-            'table has-filter has-search'
-          / TODO: change => to :
           = table_builder_2 @wbench_refs,
-            { :name => 'name',
-              :status => Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='sb sb-lg sb-preparing'></span><span>En préparation</span></div>").html_safe},
-              :organisation => Proc.new {|w| w.organisation.name},
-              :validity_period => Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))},
-              :lines => Proc.new {|w| w.lines.count},
-              :created_at => Proc.new {|w| l(w.created_at, format: :short)},
-              :updated_at => Proc.new {|w| l(w.updated_at, format: :short)},
-              :published_at => ''},
+            [ \
+              TableBuilderHelper::Column.new( \
+                key: :name, \
+                attribute: 'name' \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :status, \
+                attribute: Proc.new {|w| w.archived? ? ("<div class='td-block'><span class='fa fa-archive'></span><span>Conservé</span></div>").html_safe : ("<div class='td-block'><span class='sb sb-lg sb-preparing'></span><span>En préparation</span></div>").html_safe} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :organisation, \
+                attribute: Proc.new {|w| w.organisation.name} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :validity_period, \
+                attribute: Proc.new {|w| w.validity_period.nil? ? '-' : t('validity_range', debut: l(w.try(:validity_period).try(:begin), format: :short), end: l(w.try(:validity_period).try(:end), format: :short))} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :lines, \
+                attribute: Proc.new {|w| w.lines.count} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :created_at, \
+                attribute: Proc.new {|w| l(w.created_at, format: :short)} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :updated_at, \
+                attribute: Proc.new {|w| l(w.updated_at, format: :short)} \
+              ), \
+              TableBuilderHelper::Column.new( \
+                key: :published_at, \
+                attribute: '' \
+              ) \
+            ],
             selectable: true,
             links: [:show, :edit, :archive, :unarchive, :delete],
             cls: 'table has-filter has-search'