diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue index 6c3a0d01a..2eefad0ea 100644 --- a/app/javascript/vue/repositories/table.vue +++ b/app/javascript/vue/repositories/table.vue @@ -130,8 +130,7 @@ export default { }, { field: 'nr_of_rows', - headerName: this.i18n.t('libraries.index.table.number_of_items'), - sortable: true + headerName: this.i18n.t('libraries.index.table.number_of_items') }, { field: 'shared_label', diff --git a/app/javascript/vue/shared/datatable/modals/columns.vue b/app/javascript/vue/shared/datatable/modals/columns.vue index 4a149b58d..3854bbaf4 100644 --- a/app/javascript/vue/shared/datatable/modals/columns.vue +++ b/app/javascript/vue/shared/datatable/modals/columns.vue @@ -98,7 +98,7 @@ export default { this.close(); }, columnVisbile(column) { - return !this.currentTableState.columnsState?.find((col) => col.colId === column.field)?.hide; + return !this.currentTableState.columnsState?.find((col) => col.colId === column.field).hide; }, columnPinned(column) { return this.currentTableState.columnsState?.find((col) => col.colId === column.field).pinned; diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue index 2a62ecef1..ca9679e79 100644 --- a/app/javascript/vue/shared/datatable/table.vue +++ b/app/javascript/vue/shared/datatable/table.vue @@ -197,9 +197,7 @@ export default { }, gridOptions() { return { - suppressCellFocus: true, - suppressPinning: true, - suppressMovableColumns: true + suppressCellFocus: true }; }, extendedColumnDefs() { diff --git a/app/javascript/vue/shared/filters/filter_dropdown.vue b/app/javascript/vue/shared/filters/filter_dropdown.vue index 94273c1b2..b10336955 100644 --- a/app/javascript/vue/shared/filters/filter_dropdown.vue +++ b/app/javascript/vue/shared/filters/filter_dropdown.vue @@ -19,7 +19,7 @@ -
+
-
+
{{ i18n.t('filters_modal.clear_btn') }}
diff --git a/app/services/lists/repositories_service.rb b/app/services/lists/repositories_service.rb index fdb40898b..57bb91c60 100644 --- a/app/services/lists/repositories_service.rb +++ b/app/services/lists/repositories_service.rb @@ -14,15 +14,11 @@ module Lists 'ON repositories.archived_by_id = archivers.id' ) .includes(:repository_rows) - .joins(:repository_rows) .joins(:team) .select('repositories.* AS repositories') .select('teams.name AS team_name') .select('creators.full_name AS created_by_user') .select('archivers.full_name AS archived_by_user') - .group('repositories.id', 'teams.name', 'creators.full_name', 'archivers.full_name') - .select('COUNT(repository_rows.id) OVER (PARTITION BY repositories.id) AS repository_row_count') - .group('repository_rows.id', 'repositories.id', 'teams.name', 'creators.full_name', 'archivers.full_name') view_mode = @params[:view_mode] || 'active' @@ -51,8 +47,7 @@ module Lists created_by: 'creators.full_name', created_at: 'repositories.created_at', archived_on: 'repositories.archived_on', - archived_by: 'archivers.full_name', - nr_of_rows: 'repository_row_count' + archived_by: 'archivers.full_name' } end end