Fix segments query parameters in GET requests (#2967)

Author: joanagmaia

frontend/src/config/integrations/discourse/components/discourse-settings-drawer.vue

@@ -354,7 +354,6 @@ const logoUrl = discourse.image;
 
 const isVisible = computed({
   get() {
-    console.log('isVisible', props);
     return props.modelValue;
   },
   set(value) {
@@ -395,7 +394,6 @@ onMounted(() => {
     webhookSecret.value = props.integration?.settings.webhookSecret;
     payloadURL.value = `${window.location.origin}/api/webhooks/discourse`;
     isAPIConnectionValid.value = true;
-    console.log(props);
   }
   formSnapshot();
 });

frontend/src/config/integrations/github/components/connect/github-connect-modal.vue

@@ -206,7 +206,6 @@ const getGithubInstallations = () => {
   IntegrationService.getGithubInstallations()
     .then((res: GithubInstallation[]) => {
       installations.value = res;
-      console.log(res);
     });
 };
 

frontend/src/modules/activity/activity-service.js

@@ -71,25 +71,27 @@ export class ActivityService {
     return response.data;
   }
 
-  static async listActivityTypes(segments) {
+  static async listActivityTypes(segment) {
+    const segments = segment || getSelectedProjectGroup().id;
     const response = await authAxios.get(
       '/activity/type',
       {
         params: {
-          segments,
+          segments: segments ? [segments] : [],
         },
       },
     );
 
     return response.data;
   }
 
-  static async listActivityChannels(segments) {
+  static async listActivityChannels(segment) {
+    const segments = segment || getSelectedProjectGroup().id;
     const response = await authAxios.get(
       '/activity/channel',
       {
         params: {
-          segments,
+          segments: segments ? [segments] : [],
         },
       },
     );

frontend/src/modules/activity/components/activity-form-drawer.vue

@@ -185,7 +185,6 @@ import Message from '@/shared/message/message';
 import formChangeDetector from '@/shared/form/form-change';
 import AppAutocompleteOneInput from '@/shared/form/autocomplete-one-input.vue';
 import { useActivityStore } from '@/modules/activity/store/pinia';
-import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import useProductTracking from '@/shared/modules/monitoring/useProductTracking';
 import { EventType, FeatureEventKey } from '@/shared/modules/monitoring/types/event';
 import { dateHelper } from '@/shared/date-helper/date-helper';
@@ -223,9 +222,6 @@ const { fetchActivityTypes } = activityTypeStore;
 const activityStore = useActivityStore();
 const { fetchActivities, fetchActivityChannels } = activityStore;
 
-const lsSegmentsStore = useLfSegmentsStore();
-const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
-
 // Form control
 const form = reactive({
   member: null,
@@ -407,8 +403,8 @@ watch(
   () => props.subprojectId,
   (subprojectId) => {
     if (subprojectId) {
-      fetchActivityTypes([selectedProjectGroup.value.id]);
-      fetchActivityChannels([selectedProjectGroup.value.id]);
+      fetchActivityTypes();
+      fetchActivityChannels();
     }
   },
   { immediate: true, deep: true },

frontend/src/modules/activity/store/pinia/actions.ts

@@ -33,8 +33,8 @@ export default {
         return Promise.reject(err);
       });
   },
-  fetchActivityChannels(segments: string[]) {
-    return ActivityService.listActivityChannels(segments)
+  fetchActivityChannels(segment: string) {
+    return ActivityService.listActivityChannels(segment)
       .then((res) => {
         this.activityChannels = res;
         return Promise.resolve(res);

frontend/src/modules/activity/store/type/actions.js

@@ -24,8 +24,8 @@ export default {
       return Promise.resolve(types);
     });
   },
-  fetchActivityTypes(segments) {
-    return ActivityService.listActivityTypes(segments)
+  fetchActivityTypes(segment) {
+    return ActivityService.listActivityTypes(segment)
       .then((types) => {
         this.types = types;
         return Promise.resolve(types);

frontend/src/modules/admin/modules/integration/pages/integration-list.page.vue

@@ -137,7 +137,6 @@ onMounted(() => {
   doFetch();
   findSubProject(id)
     .then((res) => {
-      console.log(res);
       subproject.value = res;
     });
 });

frontend/src/modules/contributor/helpers/contributor.helpers.ts

@@ -68,7 +68,7 @@ const useContributorHelpers = () => {
 
   const activeOrganization = (contributor: Contributor) => {
     const { organizations } = contributor;
-    console.log(organizations);
+
     return organizations.find((org) => org.memberOrganizations.affiliationOverride?.isPrimaryWorkExperience
       && !!org.memberOrganizations.dateStart
       && !org.memberOrganizations.dateEnd)

frontend/src/modules/integration/components/integration-progress-wrapper.vue

@@ -43,7 +43,6 @@ watch(() => props.segments, () => {
 }, { deep: true });
 
 onMounted(() => {
-  console.log('Component mounted');
   resume();
 });
 

frontend/src/modules/integration/integration-routes.js

@@ -32,7 +32,6 @@ export default [
           (to, from, next) => {
             const segmentId = localStorage.getItem('segmentId');
             const segmentGrandparentId = localStorage.getItem('segmentGrandparentId');
-            console.log(to.query.state);
             const state = to.query.state ?? '';
 
             // Redirect to integrations list page with correct id

frontend/src/modules/integration/integration-store.js

@@ -708,8 +708,6 @@ export default {
         grandparentId,
       },
     ) {
-      console.log('doGroupsioConnect', email, token, groups, isUpdate);
-
       try {
         commit('CREATE_STARTED');
 

frontend/src/modules/layout/components/menu/menu.vue

@@ -143,8 +143,8 @@ watch(
   selectedProjectGroup,
   (updatedProjectGroup) => {
     if (updatedProjectGroup) {
-      fetchActivityTypes([selectedProjectGroup.value.id]);
-      fetchActivityChannels([selectedProjectGroup.value.id]);
+      fetchActivityTypes();
+      fetchActivityChannels();
     }
   },
   { immediate: true, deep: true },

frontend/src/modules/member/member-service.js

@@ -1,8 +1,6 @@
 import authAxios from '@/shared/axios/auth-axios';
-import { AuthService } from '@/modules/auth/services/auth.service';
 import { storeToRefs } from 'pinia';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
-import { getSegmentsFromProjectGroup } from '@/utils/segments';
 
 const getSelectedProjectGroup = () => {
   const lsSegmentsStore = useLfSegmentsStore();
@@ -274,7 +272,6 @@ export class MemberService {
 
   static async fetchMergeSuggestions(limit, offset, query) {
     const segments = [
-      ...getSegmentsFromProjectGroup(getSelectedProjectGroup()),
       getSelectedProjectGroup().id,
     ];
 
@@ -293,26 +290,30 @@ export class MemberService {
       .then(({ data }) => Promise.resolve(data));
   }
 
-  static async getCustomAttribute(id, segments) {
+  static async getCustomAttribute(id) {
     const response = await authAxios.get(
       `/settings/members/attributes/${id}`,
       {
-        data: [
-          segments,
-        ],
+        params: {
+          segments: [
+            getSelectedProjectGroup().id,
+          ],
+        },
       },
     );
 
     return response.data;
   }
 
-  static async fetchCustomAttributes(segments) {
+  static async fetchCustomAttributes() {
     const response = await authAxios.get(
       '/settings/members/attributes',
       {
-        data: [
-          segments,
-        ],
+        params: {
+          segments: [
+            getSelectedProjectGroup().id,
+          ],
+        },
       },
     );
 

frontend/src/modules/organization/pages/organization-list-page.vue

@@ -144,8 +144,6 @@ const showLoading = (filter: any, body: any): boolean => {
 const fetch = ({
   filter, orderBy, body,
 }: FilterQuery) => {
-  console.log('fetch', filter, orderBy, body);
-
   if (!loading.value) {
     loading.value = showLoading(filter, body);
   }

frontend/src/shared/modules/merge/services/merge-actions.service.ts

@@ -1,5 +1,14 @@
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import authAxios from '@/shared/axios/auth-axios';
 import { MergeAction } from '@/shared/modules/merge/types/MemberActions';
+import { storeToRefs } from 'pinia';
+
+const getSelectedProjectGroup = () => {
+  const lsSegmentsStore = useLfSegmentsStore();
+  const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+
+  return selectedProjectGroup.value;
+};
 
 export class MergeActionsService {
   static async list(entityId: string, type: string = 'member', limit = 1): Promise<MergeAction[]> {
@@ -10,6 +19,7 @@ export class MergeActionsService {
           entityId,
           type,
           limit,
+          segments: getSelectedProjectGroup()?.id ? [getSelectedProjectGroup()?.id] : [],
         },
       },
     );

frontend/src/shared/modules/saved-views/components/SavedViews.vue

@@ -158,6 +158,8 @@ import usePermissions from '@/shared/modules/permissions/helpers/usePermissions'
 import { LfPermission } from '@/shared/modules/permissions/types/Permissions';
 import LfIcon from '@/ui-kit/icon/Icon.vue';
 import LfButton from '@/ui-kit/button/Button.vue';
+import { useLfSegmentsStore } from '@/modules/lf/segments/store';
+import { storeToRefs } from 'pinia';
 
 const props = defineProps<{
   modelValue: Filter,
@@ -172,6 +174,9 @@ const emit = defineEmits<{(e: 'update:modelValue', value: Filter): any}>();
 
 const { hasPermission } = usePermissions();
 
+const lsSegmentsStore = useLfSegmentsStore();
+const { selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+
 // Drawer
 const isFormOpen = ref<boolean>(false);
 
@@ -268,6 +273,7 @@ const allViews = computed<SavedView[]>(() => [
 const getViews = () => {
   SavedViewsService.query({
     placement: [props.placement],
+    segments: selectedProjectGroup.value?.id ? [selectedProjectGroup.value.id] : [],
   })
     .then((res: SavedView[]) => {
       views.value = [];