From 9277d646ac7eef61176e5549062af199ad0fa3b9 Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 23 Jan 2024 11:08:42 +0100 Subject: [PATCH] Small fixes for table [SCI-10045] --- app/javascript/vue/experiments/list.vue | 1 + app/javascript/vue/my_modules/list.vue | 1 + app/javascript/vue/projects/list.vue | 1 + app/javascript/vue/shared/datatable/table.vue | 5 +++-- app/views/experiments/canvas.html.erb | 1 - app/views/protocols/show.html.erb | 1 - 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/javascript/vue/experiments/list.vue b/app/javascript/vue/experiments/list.vue index 81caa2d23..ef5e66e30 100644 --- a/app/javascript/vue/experiments/list.vue +++ b/app/javascript/vue/experiments/list.vue @@ -11,6 +11,7 @@ :currentViewMode="currentViewMode" :filters="filters" :viewRenders="viewRenders" + scrollMode="infinite" @tableReloaded="reloadingTable = false" @archive="archive" @restore="restore" diff --git a/app/javascript/vue/my_modules/list.vue b/app/javascript/vue/my_modules/list.vue index 359ef77e1..d6554cf86 100644 --- a/app/javascript/vue/my_modules/list.vue +++ b/app/javascript/vue/my_modules/list.vue @@ -12,6 +12,7 @@ :currentViewMode="currentViewMode" :filters="filters" :viewRenders="viewRenders" + scrollMode="infinite" @tableReloaded="reloadingTable = false" @create="newModalOpen = true" @edit="edit" diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue index 644eacceb..5ab1389c7 100644 --- a/app/javascript/vue/projects/list.vue +++ b/app/javascript/vue/projects/list.vue @@ -8,6 +8,7 @@ :activePageUrl="activePageUrl" :archivedPageUrl="archivedPageUrl" :currentViewMode="currentViewMode" + scrollMode="infinite" :filters="filters" :viewRenders="viewRenders" @tableReloaded="reloadingTable = false" diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue index a48b7961a..884b9de55 100644 --- a/app/javascript/vue/shared/datatable/table.vue +++ b/app/javascript/vue/shared/datatable/table.vue @@ -146,7 +146,7 @@ export default { }, scrollMode: { type: String, - default: 'infinite' + default: 'pages' } }, data() { @@ -219,7 +219,8 @@ export default { width: 48, minWidth: 48, resizable: false, - pinned: 'left' + pinned: 'left', + lockPosition: 'left' }); } diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb index 7e5871fcc..932ac1096 100644 --- a/app/views/experiments/canvas.html.erb +++ b/app/views/experiments/canvas.html.erb @@ -69,7 +69,6 @@ <%= javascript_include_tag("my_modules/tags") %> -<%= javascript_include_tag("experiments/dropdown_actions") %> <%= javascript_include_tag("experiments/show") %> diff --git a/app/views/protocols/show.html.erb b/app/views/protocols/show.html.erb index 69fd29399..d426cb8ba 100644 --- a/app/views/protocols/show.html.erb +++ b/app/views/protocols/show.html.erb @@ -38,7 +38,6 @@ :protocol-url="protocolUrl" /> - <%= render partial: "protocols/index/delete_draft_modal" %>