Merge branch '299213-project-filter-regression' into 'master'

Global Search - Project Filter sets Group

See merge request gitlab-org/gitlab!52015

app/assets/javascripts/search/topbar/components/project_filter.vue

@@ -27,7 +27,7 @@ export default {
     handleProjectChange(project) {
       // This determines if we need to update the group filter or not
       const queryParams = {
-        ...(project.namespace_id && { [GROUP_DATA.queryParam]: project.namespace_id }),
+        ...(project.namespace?.id && { [GROUP_DATA.queryParam]: project.namespace.id }),
         [PROJECT_DATA.queryParam]: project.id,
       };
 

changelogs/unreleased/299213-project-filter-regression.yml

+---
+title: Global Search - Project Filter sets Group
+merge_request: 52015
+author:
+type: fixed

spec/frontend/search/mock_data.js

@@ -26,7 +26,7 @@ export const MOCK_GROUPS = [
 
 export const MOCK_PROJECT = {
   name: 'test project',
-  namespace_id: MOCK_GROUP.id,
+  namespace: MOCK_GROUP,
   nameWithNamespace: 'test group test project',
   id: 'test_1',
 };
@@ -34,13 +34,13 @@ export const MOCK_PROJECT = {
 export const MOCK_PROJECTS = [
   {
     name: 'test project',
-    namespace_id: MOCK_GROUP.id,
+    namespace: MOCK_GROUP,
     name_with_namespace: 'test group test project',
     id: 'test_1',
   },
   {
     name: 'test project 2',
-    namespace_id: MOCK_GROUP.id,
+    namespace: MOCK_GROUP,
     name_with_namespace: 'test group test project 2',
     id: 'test_2',
   },

spec/frontend/search/topbar/components/project_filter_spec.js

@@ -99,7 +99,7 @@ describe('ProjectFilter', () => {
 
         it('calls setUrlParams with project id, group id, then calls visitUrl', () => {
           expect(setUrlParams).toHaveBeenCalledWith({
-            [GROUP_DATA.queryParam]: MOCK_PROJECT.namespace_id,
+            [GROUP_DATA.queryParam]: MOCK_PROJECT.namespace.id,
             [PROJECT_DATA.queryParam]: MOCK_PROJECT.id,
           });
           expect(visitUrl).toHaveBeenCalled();