Merge pull request opf#18440 from opf/bug/62500-shared-versions-are-not-available-on-version-filter-on-global-wp-page

[#62500] Shared versions are not available on Version filter on global wp page

Author: ulferts

lib/api/v3/versions/versions_api.rb

@@ -36,7 +36,7 @@ class VersionsAPI < ::API::OpenProjectAPI
                                                             # the distinct(false) is added in order to allow ORDER BY LOWER(name)
                                                             # which would otherwise be invalid in postgresql
                                                             # SELECT DISTINCT, ORDER BY expressions must appear in select list
-                                                            Version.visible(current_user).distinct(false)
+                                                            Version.visible(current_user).or(Version.systemwide).distinct(false)
                                                           })
                                                      .mount
 

spec/features/work_packages/table/queries/filter_spec.rb

@@ -70,82 +70,110 @@
     end
   end
 
-  context "by version in project" do
+  context "when filtering version" do
     shared_let(:other_project) { create(:project) }
-    shared_let(:inaccessible_version) { create(:version, project: other_project) }
-    shared_let(:shared_version) { create(:version, project: other_project, sharing: "system") }
+    shared_let(:inaccessible_version) { create(:version, name: "Inaccessible Version", project: other_project) }
+    shared_let(:shared_version) { create(:version, name: "Shared Version", project: other_project, sharing: "system") }
 
-    let(:version) { create(:version, project:) }
-    let(:work_package_with_version) do
+    let!(:version) { create(:version, project:) }
+    let!(:work_package_with_version) do
       create(:work_package, project:, subject: "With version", version:)
     end
-    let(:work_package_without_version) { create(:work_package, subject: "Without version", project:) }
+    let!(:work_package_without_version) { create(:work_package, subject: "Without version", project:) }
 
     before do
-      work_package_with_version
-      work_package_without_version
-
       wp_table.visit!
-    end
 
-    it "allows filtering, saving, retrieving and altering the saved filter" do
       filters.open
-
       # Expect filters to be grouped by project name
       filters.add_filter("Version")
+    end
 
-      expect_ng_option(
-        page.find_by_id("values-version"),
-        version,
-        grouping: project.name,
-        results_selector: "body"
-      )
+    context "in a project" do
+      let(:wp_table) { Pages::WorkPackagesTable.new(project) }
 
-      expect_ng_option(
-        page.find_by_id("values-version"),
-        shared_version,
-        grouping: other_project.name,
-        results_selector: "body"
-      )
+      it "allows filtering, saving, retrieving and altering the saved filter" do
+        expect_ng_option(
+          page.find_by_id("values-version"),
+          version,
+          grouping: project.name,
+          results_selector: "body"
+        )
 
-      expect_no_ng_option(
-        page.find_by_id("values-version"),
-        inaccessible_version,
-        results_selector: "body"
-      )
+        expect_ng_option(
+          page.find_by_id("values-version"),
+          shared_version,
+          grouping: other_project.name,
+          results_selector: "body"
+        )
 
-      filters.remove_filter "version"
+        expect_no_ng_option(
+          page.find_by_id("values-version"),
+          inaccessible_version,
+          results_selector: "body"
+        )
 
-      filters.add_filter_by("Version", "is (OR)", version.name)
+        filters.remove_filter "version"
 
-      loading_indicator_saveguard
-      wp_table.expect_work_package_listed work_package_with_version
-      wp_table.ensure_work_package_not_listed! work_package_without_version
+        filters.add_filter_by("Version", "is (OR)", version.name)
 
-      wp_table.save_as("Some query name")
+        loading_indicator_saveguard
+        wp_table.expect_work_package_listed work_package_with_version
+        wp_table.ensure_work_package_not_listed! work_package_without_version
 
-      filters.remove_filter "version"
+        wp_table.save_as("Some query name")
 
-      loading_indicator_saveguard
-      wp_table.expect_work_package_listed work_package_with_version, work_package_without_version
+        filters.remove_filter "version"
 
-      last_query = Query.last
+        loading_indicator_saveguard
+        wp_table.expect_work_package_listed work_package_with_version, work_package_without_version
 
-      wp_table.visit_query(last_query)
+        last_query = Query.last
 
-      loading_indicator_saveguard
-      wp_table.expect_work_package_listed work_package_with_version
-      wp_table.ensure_work_package_not_listed! work_package_without_version
+        wp_table.visit_query(last_query)
 
-      filters.open
+        loading_indicator_saveguard
+        wp_table.expect_work_package_listed work_package_with_version
+        wp_table.ensure_work_package_not_listed! work_package_without_version
 
-      filters.expect_filter_by("Version", "is (OR)", version.name)
+        filters.open
 
-      filters.set_operator "Version", "is not"
+        filters.expect_filter_by("Version", "is (OR)", version.name)
 
-      loading_indicator_saveguard
-      wp_table.expect_work_package_listed work_package_without_version
-      wp_table.ensure_work_package_not_listed! work_package_with_version
+        filters.set_operator "Version", "is not"
+
+        loading_indicator_saveguard
+        wp_table.expect_work_package_listed work_package_without_version
+        wp_table.ensure_work_package_not_listed! work_package_with_version
+      end
+    end
+
+    context "in the global page" do
+      shared_let(:user) { create(:user, preferences: { time_zone: "Etc/UTC" }) }
+      shared_let(:project) { create(:project, members: { user => role }) }
+      let(:wp_table) { Pages::WorkPackagesTable.new }
+
+      it "allows filtering, saving, retrieving and altering the saved filter" do
+        expect_ng_option(
+          page.find_by_id("values-version"),
+          version,
+          grouping: project.name,
+          results_selector: "body"
+        )
+
+        expect_ng_option(
+          page.find_by_id("values-version"),
+          shared_version,
+          grouping: "Project N/A",
+          results_selector: "body"
+        )
+
+        expect_no_ng_option(
+          page.find_by_id("values-version"),
+          inaccessible_version,
+          results_selector: "body"
+        )
+      end
     end
   end