OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
[#59079] Remove deprecated ordering versions by semver_name
Ivan Kuchin352547cd85ed
diff --git a/app/controllers/projects/settings/versions_controller.rb b/app/controllers/projects/settings/versions_controller.rbindex 175963af1bc..e2f5249fa44 100644--- a/app/controllers/projects/settings/versions_controller.rb+++ b/app/controllers/projects/settings/versions_controller.rb@@ -30,6 +30,6 @@ class Projects::Settings::VersionsController < Projects::SettingsControllermenu_item :settings_versionsdef show- @versions = @project.shared_versions.order_by_semver_name+ @versions = @project.shared_versions.order(:name)endenddiff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rbindex 2c2a189a32d..077d40ba996 100644--- a/app/controllers/versions_controller.rb+++ b/app/controllers/versions_controller.rb@@ -168,7 +168,7 @@ class VersionsController < ApplicationControllerversions = versions.or(@project.rolled_up_versions.includes(:custom_values))end- versions = versions.visible.order_by_semver_name.except(:distinct).uniq+ versions = versions.visible.order(:name).except(:distinct).uniqversions.reject! { |version| version.closed? || version.completed? } unless completedversionsenddiff --git a/app/models/projects/versions.rb b/app/models/projects/versions.rbindex d26e0661da3..47e3794c217 100644--- a/app/models/projects/versions.rb+++ b/app/models/projects/versions.rb@@ -68,10 +68,10 @@ module Projects::Versionsdef assignable_versions(only_open: true)if only_open@assignable_versions ||=- shared_versions.references(:project).with_status_open.order_by_semver_name.to_a+ shared_versions.references(:project).with_status_open.order(:name).to_aelse@assignable_versions_including_non_open ||= # rubocop:disable Naming/MemoizedInstanceVariableName- shared_versions.references(:project).order_by_semver_name.to_a+ shared_versions.references(:project).order(:name).to_aendendenddiff --git a/app/models/queries/versions/orders/default_order.rb b/app/models/queries/versions/orders/default_order.rbindex b86f38ef6d5..3df05b570f3 100644--- a/app/models/queries/versions/orders/default_order.rb+++ b/app/models/queries/versions/orders/default_order.rb@@ -30,16 +30,10 @@ class Queries::Versions::Orders::DefaultOrder < Queries::Orders::Baseself.model = Versiondef self.key- /\A(id|name|semver_name)\z/+ /\A(id|name)\z/enddef initialize(attribute)- if attribute == :semver_name- OpenProject::Deprecation.warn("Sorting by semver_name is deprecated, name should be used instead")-- super(:name)- else- super- end+ superendenddiff --git a/app/models/version.rb b/app/models/version.rbindex 8b545c02259..3ced699230a 100644--- a/app/models/version.rb+++ b/app/models/version.rb@@ -46,8 +46,7 @@ class Version < ApplicationRecordvalidates :status, inclusion: { in: VERSION_STATUSES }validate :validate_start_date_before_effective_date- scopes :order_by_semver_name,- :rolled_up,+ scopes :rolled_up,:shared_with# Returns versions that are either:diff --git a/app/models/versions/scopes/order_by_semver_name.rb b/app/models/versions/scopes/order_by_semver_name.rbdeleted file mode 100644index b4affc08d6f..00000000000--- a/app/models/versions/scopes/order_by_semver_name.rb+++ /dev/null@@ -1,39 +0,0 @@-#-- copyright-# OpenProject is an open source project management software.-# Copyright (C) the OpenProject GmbH-#-# This program is free software; you can redistribute it and/or-# modify it under the terms of the GNU General Public License version 3.-#-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:-# Copyright (C) 2006-2013 Jean-Philippe Lang-# Copyright (C) 2010-2013 the ChiliProject Team-#-# This program is free software; you can redistribute it and/or-# modify it under the terms of the GNU General Public License-# as published by the Free Software Foundation; either version 2-# of the License, or (at your option) any later version.-#-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.-#-# You should have received a copy of the GNU General Public License-# along with this program; if not, write to the Free Software-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.-#-# See COPYRIGHT and LICENSE files for more details.-#++--module Versions::Scopes- module OrderBySemverName- extend ActiveSupport::Concern-- class_methods do- def order_by_semver_name- order :name- end- end- end-enddiff --git a/app/views/work_packages/bulk/edit.html.erb b/app/views/work_packages/bulk/edit.html.erbindex b6a6d423e8f..d00594d5426 100644--- a/app/views/work_packages/bulk/edit.html.erb+++ b/app/views/work_packages/bulk/edit.html.erb@@ -132,7 +132,7 @@ See COPYRIGHT and LICENSE files for more details.<%= styled_select_tag("work_package[version_id]",content_tag("option", t(:label_none), value: "none") +- version_options_for_select(@project.shared_versions.with_status_open.order_by_semver_name),+ version_options_for_select(@project.shared_versions.with_status_open.order(:name)),include_blank: t(:label_no_change_option)) %></div>diff --git a/docs/api/apiv3/paths/versions.yml b/docs/api/apiv3/paths/versions.ymlindex e69e05a9acc..7e36aa043cf 100644--- a/docs/api/apiv3/paths/versions.yml+++ b/docs/api/apiv3/paths/versions.yml@@ -20,7 +20,6 @@ get:+ id: Sort by the version id+ name: Sort by the version name using numeric collation, comparing sequences of decimal digits by their numeric value- + semver_name: Deprecated, use name insteadexample: '[["name", "desc"]]'in: queryname: sortBydiff --git a/lib/api/v3/queries/schemas/version_filter_dependency_representer.rb b/lib/api/v3/queries/schemas/version_filter_dependency_representer.rbindex 7fec1d2ad0f..2f0e25a5279 100644--- a/lib/api/v3/queries/schemas/version_filter_dependency_representer.rb+++ b/lib/api/v3/queries/schemas/version_filter_dependency_representer.rb@@ -37,7 +37,7 @@ module APIenddef href_callback- query_params = "sortBy=#{to_query [%i(semver_name asc)]}&pageSize=-1"+ query_params = "sortBy=#{to_query [%i(name asc)]}&pageSize=-1"if filter.project.nil?"#{api_v3_paths.versions}?#{query_params}"diff --git a/spec/lib/api/v3/queries/schemas/version_filter_dependency_representer_spec.rb b/spec/lib/api/v3/queries/schemas/version_filter_dependency_representer_spec.rbindex 2bef434838f..73f505a977f 100644--- a/spec/lib/api/v3/queries/schemas/version_filter_dependency_representer_spec.rb+++ b/spec/lib/api/v3/queries/schemas/version_filter_dependency_representer_spec.rb@@ -51,7 +51,7 @@ RSpec.describe API::V3::Queries::Schemas::VersionFilterDependencyRepresenter dodescribe "values" dolet(:path) { "values" }let(:type) { "[]Version" }- let(:order) { "sortBy=#{CGI.escape(JSON.dump([%i(semver_name asc)]))}&pageSize=-1" }+ let(:order) { "sortBy=#{CGI.escape(JSON.dump([%i(name asc)]))}&pageSize=-1" }context "for operator 'Queries::Operators::All'" dolet(:operator) { Queries::Operators::All }diff --git a/spec/models/queries/versions/version_query_spec.rb b/spec/models/queries/versions/version_query_spec.rbindex 9076d2e6827..bc32574d1f2 100644--- a/spec/models/queries/versions/version_query_spec.rb+++ b/spec/models/queries/versions/version_query_spec.rb@@ -110,43 +110,5 @@ RSpec.describe Queries::Versions::VersionQuery doendendend-- describe "by semver_name" do- let(:attribute) { :semver_name }-- describe "ascending" do- let(:direction) { :asc }-- it "is the same as handwriting the query" do- expected = Version.order(name: :asc).order(id: :desc)-- expect(instance.results.to_sql).to eql expected.to_sql- end-- it "warns about being deprecated" do- instance.results-- expect(OpenProject::Deprecation)- .to have_received(:warn).with("Sorting by semver_name is deprecated, name should be used instead")- end- end-- describe "descending" do- let(:direction) { :desc }-- it "is the same as handwriting the query" do- expected = Version.order(name: :desc).order(id: :desc)-- expect(instance.results.to_sql).to eql expected.to_sql- end-- it "warns about being deprecated" do- instance.results-- expect(OpenProject::Deprecation)- .to have_received(:warn).with("Sorting by semver_name is deprecated, name should be used instead")- end- end- endendenddiff --git a/spec/models/versions/scopes/order_by_semver_name_spec.rb b/spec/models/versions/order_by_name_spec.rbsimilarity index 80%rename from spec/models/versions/scopes/order_by_semver_name_spec.rbrename to spec/models/versions/order_by_name_spec.rbindex 7e43924c6d8..541ac7bbda4 100644--- a/spec/models/versions/scopes/order_by_semver_name_spec.rb+++ b/spec/models/versions/order_by_name_spec.rb@@ -2,7 +2,7 @@require "spec_helper"-RSpec.describe Versions::Scopes::OrderBySemverName do+RSpec.describe Version, "order by name" dolet(:project) { create(:project) }let(:names) do[@@ -21,7 +21,7 @@ RSpec.describe Versions::Scopes::OrderBySemverName doendlet!(:versions) { names.map { |name| create(:version, name:, project:) } }- subject { Version.order_by_semver_name.order(id: :desc).to_a }+ subject { Version.order(:name, id: :desc).to_a }it "returns the versions in semver order" doexpect(subject)