scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-29 07:26:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge Hotfix/1.41.1.2 to Develop (#8569)

Browse source 
* Merge Develop to Master (#8515)

* Bump rack from 2.2.13 to 2.2.14 (#8494)

Bumps [rack](https://github.com/rack/rack) from 2.2.13 to 2.2.14.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.13...v2.2.14)

---
updated-dependencies:
- dependency-name: rack
  dependency-version: 2.2.14
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump version to 1.41.1.1 (#8514)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Optimize joins in RepositoryDatatableService for better performance on task table [SCI-11998] (#8562)

* Bump version to 1.41.1.2

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Alex Kriuchykhin 2025-06-11 13:19:08 +02:00 • committed by GitHub
parent 887337bd16
commit ec6eaf3723
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.41.1.1
1.41.1.2

45
app/services/repository_datatable_service.rb
View file

@ -47,37 +47,25 @@ class RepositoryDatatableService
repository_rows = fetch_rows(search_value)
# filter only rows with reminders if filter param is present
repository_rows = repository_rows.with_active_reminders(@repository, @user) if @params[:only_reminders]
# Aliased my_module_repository_rows join for consistent assigned counts
repository_rows =
repository_rows.joins(
'LEFT OUTER JOIN "my_module_repository_rows" AS "all_my_module_repository_rows" ON '\
'"all_my_module_repository_rows"."repository_row_id" = "repository_rows"."id"'
)
# Adding assigned counters
if @my_module
if @assigned_view
repository_rows = repository_rows.joins(:my_module_repository_rows)
repository_rows = repository_rows.joins(my_module_repository_rows: { my_module: :experiment })
.where(my_module_repository_rows: { my_module_id: @my_module })
if @repository.has_stock_management?
repository_rows = repository_rows
.select('SUM(DISTINCT my_module_repository_rows.stock_consumption) AS "consumed_stock"')
end
else
repository_rows = repository_rows
.joins(:repository)
.joins('LEFT OUTER JOIN "my_module_repository_rows" "current_my_module_repository_rows"'\
'ON "current_my_module_repository_rows"."repository_row_id" = "repository_rows"."id" '\
'AND "current_my_module_repository_rows"."my_module_id" = ' + @my_module.id.to_s)
.where('current_my_module_repository_rows.id IS NOT NULL '\
'OR (repository_rows.archived = FALSE AND repositories.archived = FALSE)')
.select('CASE WHEN current_my_module_repository_rows.id IS NOT NULL '\
'THEN true ELSE false END as row_assigned')
.group('current_my_module_repository_rows.id')
repository_rows = repository_rows.left_outer_joins(my_module_repository_rows: { my_module: :experiment })
repository_rows = repository_rows.where(my_module_repository_rows: { my_module: @my_module })
.or(repository_rows.active)
repository_rows = repository_rows.select("EXISTS (SELECT 1 FROM my_module_repository_rows " \
"WHERE my_module_repository_rows.repository_row_id = repository_rows.id " \
"AND my_module_repository_rows.my_module_id = #{@my_module.id}) AS row_assigned")
end
else
repository_rows = repository_rows.left_outer_joins(my_module_repository_rows: { my_module: :experiment })
end
if Repository.reminders_enabled? && !@disable_reminders
@ -86,19 +74,21 @@ class RepositoryDatatableService
# don't load reminders for archived repositories or snapshots
repository_rows.select('FALSE AS has_active_reminders')
else
repository_rows.left_outer_joins_active_reminders(@repository, @user)
.select('COUNT(repository_cells_with_active_reminders.id) > 0 AS has_active_reminders')
repository_rows.select("EXISTS (#{RepositoryCell.with_active_reminder(@user)
.joins(:repository_column)
.where(repository_column: { repository: @repository })
.where('repository_cells.repository_row_id = repository_rows.id')
.select(1)
.to_sql}) AS has_active_reminders")
end
end
repository_rows = repository_rows
.left_outer_joins(my_module_repository_rows: { my_module: :experiment })
.select('COUNT(DISTINCT all_my_module_repository_rows.id) AS "assigned_my_modules_count"')
.select('COUNT(DISTINCT my_module_repository_rows.id) AS "assigned_my_modules_count"')
.select('COUNT(DISTINCT my_modules.experiment_id) AS "assigned_experiments_count"')
.select('COUNT(DISTINCT experiments.project_id) AS "assigned_projects_count"')
.select('COALESCE(parent_connections_count, 0) + COALESCE(child_connections_count, 0)
AS "relationships_count"')
repository_rows = repository_rows.preload(Extends::REPOSITORY_ROWS_PRELOAD_RELATIONS)
repository_rows = repository_rows.preload(:repository_columns, repository_cells: { value: @repository.cell_preload_includes }) if @preload_cells
repository_rows = repository_rows.preload(:repository_stock_cell, :repository_stock_value) if @repository.has_stock_management?
@ -122,6 +112,9 @@ class RepositoryDatatableService
repository_rows = repository_rows.where(external_id: @params[:external_ids]) if @params[:external_ids]
# filter only rows with reminders if filter param is present
repository_rows = repository_rows.with_active_reminders(@repository, @user) if @params[:only_reminders]
if search_value.present?
if @repository.default_search_fileds.include?('users.full_name')
repository_rows = repository_rows.joins(:created_by)