Merge branch 'fix-pa-project-path-with-namespace' into 'master'

Use the project full path with namespace in PA

Closes #32048

See merge request gitlab-org/gitlab!16773

ee/app/assets/javascripts/analytics/productivity_analytics/components/filter_dropdowns.vue

@@ -30,10 +30,15 @@ export default {
       this.setGroupNamespace(full_path);
       this.$emit('groupSelected', full_path);
     },
-    onProjectsSelected([selectedProject]) {
-      const { path } = selectedProject;
-      this.setProjectPath(path);
-      this.$emit('projectSelected', { namespacePath: this.groupNamespace, project: path });
+    onProjectsSelected(selectedProjects) {
+      const pathWithNamespace = selectedProjects.length
+        ? selectedProjects[0].path_with_namespace
+        : null;
+      this.setProjectPath(pathWithNamespace);
+      this.$emit('projectSelected', {
+        namespacePath: this.groupNamespace,
+        project: pathWithNamespace,
+      });
     },
   },
 };

ee/app/assets/javascripts/analytics/productivity_analytics/store/modules/filters/getters.js

@@ -7,7 +7,7 @@ import { urlParamsToObject } from '~/lib/utils/common_utils';
  *
  * {
  *   group_id: 'gitlab-org',
- *   project_id: 'gitlab-test',
+ *   project_id: 'gitlab-org/gitlab-test',
  *   author_username: 'author',
  *   milestone_title: 'my milestone',
  *   label_name: ['my label', 'yet another label'],

ee/spec/frontend/analytics/productivity_analytics/components/filter_dropdowns_spec.js

@@ -18,7 +18,7 @@ describe('FilterDropdowns component', () => {
   };
 
   const groupNamespace = 'gitlab-org';
-  const projectPath = 'gitlab-test';
+  const projectPath = 'gitlab-org/gitlab-test';
 
   beforeEach(() => {
     wrapper = shallowMount(localVue.extend(FilterDropdowns), {
@@ -80,19 +80,39 @@ describe('FilterDropdowns component', () => {
     });
 
     describe('onProjectsSelected', () => {
-      beforeEach(() => {
-        store.state.filters.groupNamespace = groupNamespace;
-        wrapper.vm.onProjectsSelected([{ id: 1, path: `${projectPath}` }]);
-      });
+      describe('when the list of selected projects is not empty', () => {
+        beforeEach(() => {
+          store.state.filters.groupNamespace = groupNamespace;
+          wrapper.vm.onProjectsSelected([{ id: 1, path_with_namespace: `${projectPath}` }]);
+        });
+
+        it('invokes setProjectPath action', () => {
+          expect(actionSpies.setProjectPath).toHaveBeenCalledWith(projectPath);
+        });
 
-      it('invokes setProjectPath action', () => {
-        expect(actionSpies.setProjectPath).toHaveBeenCalledWith(projectPath);
+        it('emits the "projectSelected" event', () => {
+          expect(wrapper.emitted().projectSelected[0][0]).toEqual({
+            namespacePath: groupNamespace,
+            project: projectPath,
+          });
+        });
       });
 
-      it('emits the "projectSelected" event', () => {
-        expect(wrapper.emitted().projectSelected[0][0]).toEqual({
-          namespacePath: groupNamespace,
-          project: projectPath,
+      describe('when the list of selected projects is empty', () => {
+        beforeEach(() => {
+          store.state.filters.groupNamespace = groupNamespace;
+          wrapper.vm.onProjectsSelected([]);
+        });
+
+        it('invokes setProjectPath action with null', () => {
+          expect(actionSpies.setProjectPath).toHaveBeenCalledWith(null);
+        });
+
+        it('emits the "projectSelected" event', () => {
+          expect(wrapper.emitted().projectSelected[0][0]).toEqual({
+            namespacePath: groupNamespace,
+            project: null,
+          });
         });
       });
     });

ee/spec/frontend/analytics/productivity_analytics/store/modules/charts/actions_spec.js

@@ -16,7 +16,7 @@ describe('Productivity analytics chart actions', () => {
   const chartKey = 'main';
   const globalParams = {
     group_id: 'gitlab-org',
-    project_id: 'gitlab-test',
+    project_id: 'gitlab-org/gitlab-test',
   };
 
   beforeEach(() => {

ee/spec/frontend/analytics/productivity_analytics/store/modules/charts/getters_spec.js

@@ -11,7 +11,7 @@ describe('Productivity analytics chart getters', () => {
   let state;
 
   const groupNamespace = 'gitlab-org';
-  const projectPath = 'gitlab-test';
+  const projectPath = 'gitlab-org/gitlab-test';
 
   beforeEach(() => {
     state = createState();

ee/spec/frontend/analytics/productivity_analytics/store/modules/filters/actions_spec.js

@@ -5,7 +5,7 @@ import getInitialState from 'ee/analytics/productivity_analytics/store/modules/f
 
 describe('Productivity analytics filter actions', () => {
   const groupNamespace = 'gitlab-org';
-  const projectPath = 'gitlab-test';
+  const projectPath = 'gitlab-org/gitlab-test';
 
   describe('setGroupNamespace', () => {
     it('commits the SET_GROUP_NAMESPACE mutation', done => {

ee/spec/frontend/analytics/productivity_analytics/store/modules/filters/getters_spec.js

@@ -12,7 +12,7 @@ describe('Productivity analytics filter getters', () => {
     it('returns an object with group_id, project_id and all relevant params from the filters string', () => {
       state = {
         groupNamespace: 'gitlab-org',
-        projectPath: 'gitlab-test',
+        projectPath: 'gitlab-org/gitlab-test',
         filters: '?author_username=root&milestone_title=foo&label_name[]=labelxyz',
       };
 
@@ -23,7 +23,7 @@ describe('Productivity analytics filter getters', () => {
         label_name: ['labelxyz'],
         merged_at_after: '2019-07-16T00:00:00.00Z',
         milestone_title: 'foo',
-        project_id: 'gitlab-test',
+        project_id: 'gitlab-org/gitlab-test',
       };
 
       const result = getters.getCommonFilterParams(state, mockGetters);

ee/spec/frontend/analytics/productivity_analytics/store/modules/filters/mutations_spec.js

@@ -20,7 +20,7 @@ describe('Productivity analytics filter mutations', () => {
 
   describe(types.SET_PROJECT_PATH, () => {
     it('sets the projectPath', () => {
-      const projectPath = 'gitlab-test';
+      const projectPath = 'gitlab-org/gitlab-test';
       mutations[types.SET_PROJECT_PATH](state, projectPath);
 
       expect(state.projectPath).toBe(projectPath);

ee/spec/frontend/analytics/productivity_analytics/store/modules/table/actions_spec.js

@@ -13,7 +13,7 @@ describe('Productivity analytics table actions', () => {
   let mock;
 
   const groupNamespace = 'gitlab-org';
-  const projectPath = 'gitlab-test';
+  const projectPath = 'gitlab-org/gitlab-test';
 
   const filterParams = {
     days_to_merge: [5],