mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 15:36:22 +08:00
Revert "Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]"
This commit is contained in:
parent
f5fee23f7d
commit
7ac549e20d
|
@ -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',
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -197,9 +197,7 @@ export default {
|
|||
},
|
||||
gridOptions() {
|
||||
return {
|
||||
suppressCellFocus: true,
|
||||
suppressPinning: true,
|
||||
suppressMovableColumns: true
|
||||
suppressCellFocus: true
|
||||
};
|
||||
},
|
||||
extendedColumnDefs() {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<i class="sn-icon sn-icon-close"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="max-h-[400px] p-3.5 pt-0.5 overflow-y-auto">
|
||||
<div class="max-h-[400px] p-3.5 pt-0">
|
||||
<div v-for="filter in filters" :key="filter.key">
|
||||
<Component
|
||||
:is="`${filter.type}Filter`"
|
||||
|
@ -28,7 +28,7 @@
|
|||
@update="updateFilter" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-3.5 pt-0.5 flex items-center justify-end gap-4 sticky-buttons">
|
||||
<div class="p-3.5 pt-0.5 flex items-center justify-end gap-4">
|
||||
<div @click.prevent="clearFilters" class="btn btn-secondary">
|
||||
{{ i18n.t('filters_modal.clear_btn') }}
|
||||
</div>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue