Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view

Fix ordering in simple table view [SCI-4621]

app/assets/javascripts/my_modules/repositories.js

@@ -98,7 +98,7 @@ var MyModuleRepositories = (function() {
       serverSide: true,
       responsive: true,
       pageLength: 5,
-      order: [[1, 'asc']],
+      order: [[0, 'asc']],
       sScrollY: '100%',
       sScrollX: '100%',
       sScrollXInner: '100%',
@@ -106,6 +106,7 @@ var MyModuleRepositories = (function() {
       ajax: {
         url: $(tableContainer).data('source'),
         data: function(d) {
+          d.order[0].column = tableContainer.data('name-column-id');
           d.assigned = 'assigned';
           d.view_mode = true;
           d.simple_view = true;
@@ -113,11 +114,8 @@ var MyModuleRepositories = (function() {
         global: false,
         type: 'POST'
       },
-      columns: [
-        { data: '1' }
-      ],
       columnDefs: [{
-        targets: 1,
+        targets: 0,
         render: function(data, type, row) {
           return "<a href='" + row.recordInfoUrl + "'"
                  + "class='record-info-link'>" + data + '</a>';
@@ -283,11 +281,12 @@ var MyModuleRepositories = (function() {
   }
 
   function initSimpleTable() {
-    $('#assigned-items-container').on('show.bs.collapse', '.assigned-repository-container', function() {
+    $('#assigned-items-container').on('shown.bs.collapse', '.assigned-repository-container', function() {
       var repositoryContainer = $(this);
       var repositoryTemplate = $($('#myModuleRepositorySimpleTemplate').html());
       repositoryTemplate.attr('data-source', $(this).data('repository-url'));
       repositoryTemplate.attr('data-version-label', $(this).data('footer-label'));
+      repositoryTemplate.attr('data-name-column-id', $(this).data('name-column-id'));
       repositoryContainer.html(repositoryTemplate);
       renderSimpleTable(repositoryTemplate);
     });

app/helpers/my_modules_helper.rb

@@ -96,4 +96,8 @@ module MyModulesHelper
 
     t('my_modules.repository.snapshots.simple_view.live_bottom_label')
   end
+
+  def assigned_repository_simple_view_name_column_id(repository)
+    repository.is_a?(RepositorySnapshot) ? 2 : 3
+  end
 end

app/helpers/repository_datatable_helper.rb

@@ -37,7 +37,7 @@ module RepositoryDatatableHelper
     repository_rows.map do |record|
       {
         'DT_RowId': record.id,
-        '1': escape_input(record.name),
+        '0': escape_input(record.name),
         'recordInfoUrl': Rails.application.routes.url_helpers.repository_repository_row_path(record.repository, record)
       }
     end

app/views/my_modules/repositories/_repositories_list.html.erb

@@ -21,6 +21,7 @@
          id="assigned-repository-items-container-<%= repository.id %>"
          data-repository-url="<%= assigned_repository_simple_view_index_path(@my_module, repository) %>"
          data-footer-label="<%= assigned_repository_simple_view_footer_label(repository) %>"
+         data-name-column-id="<%=  assigned_repository_simple_view_name_column_id(repository) %>"
     >
     </div>
   </div>
@@ -30,7 +31,6 @@
   <table class="table hidden">
     <thead>
       <tr>
-        <th class="never"></th>
         <th class="row-name"><%= t("repositories.table.row_name") %></th>
       </tr>
     </thead>