Merge branch 'main' into docs/CM-1333-akrites-cdp-auth-adr

Author: joanagmaia

backend/src/database/repositories/segmentRepository.ts

@@ -463,7 +463,12 @@ class SegmentRepository extends RepositoryBase<
       if (adminSegments.length === 0) {
         return { count: 0, rows: [], limit: criteria.limit, offset: criteria.offset }
       }
-      segmentsSearchQuery += `AND sp.id IN (:adminSegments)`
+      segmentsSearchQuery += `AND EXISTS (
+        SELECT 1 FROM segments sp
+        WHERE sp."grandparentSlug" = f.slug
+          AND sp."tenantId" = f."tenantId"
+          AND sp.id IN (:adminSegments)
+      )`
       replacements.adminSegments = adminSegments
     }
 
@@ -474,23 +479,7 @@ class SegmentRepository extends RepositoryBase<
                   SELECT
                       f.id AS foundation_id,
                       f.name AS foundation_name,
-                      f.status,
-                      f."createdAt",
-                      f."updatedAt",
-                      f."sourceId",
-                      f."sourceParentId",
-                      f.slug,
-                      p.name AS project_name,
-                      p.id AS project_id,
-                      p.status AS project_status,
-                      p.slug AS project_slug,
-                      COUNT(DISTINCT sp.id) AS subproject_count,
-                      JSONB_AGG(JSONB_BUILD_OBJECT(
-                          'id', sp.id,
-                          'name', sp.name,
-                          'status', sp.status,
-                          'slug', sp.slug
-                          )) AS subprojects
+                      COUNT(DISTINCT p.id)::int AS project_count
                   FROM segments f
                   JOIN segments p
                       ON p."parentSlug" = f."slug"
@@ -503,22 +492,15 @@ class SegmentRepository extends RepositoryBase<
                   WHERE f."parentSlug" IS NULL
                     AND f."tenantId" = :tenantId
                     ${segmentsSearchQuery}
-                  GROUP BY f."id", p.id
+                  GROUP BY f.id
               )
           SELECT
               s.*,
               COUNT(*) OVER () AS "totalCount",
-              JSONB_AGG(JSONB_BUILD_OBJECT(
-                      'id', f.project_id,
-                      'name', f.project_name,
-                      'status', f.project_status,
-                      'slug', f.project_slug,
-                      'subprojects', f.subprojects
-                  )) AS projects
+              f.project_count AS "projectCount"
           FROM segments s
           JOIN foundations f ON s.id = f.foundation_id
           ${searchQuery}
-          GROUP BY s.id, f.foundation_name
           ORDER BY f.foundation_name
           ${this.getPaginationString(criteria)};
       `,

frontend/nginx.kube.conf

@@ -18,6 +18,20 @@ http {
 
     charset utf-8;
 
+    gzip on;
+    gzip_comp_level 5;
+    gzip_min_length 1024;
+    gzip_proxied any;
+    gzip_vary on;
+    gzip_types
+        text/plain
+        text/css
+        text/javascript
+        application/javascript
+        application/json
+        application/xml
+        image/svg+xml;
+
     server {
         listen 8081 default_server;
         listen [::]:8081;

frontend/src/app.vue

@@ -23,9 +23,7 @@
 <script>
 import { mapActions } from 'vuex';
 import AppResizePage from '@/modules/layout/pages/resize-page.vue';
-import { mapActions as piniaMapActions, storeToRefs } from 'pinia';
-import { useActivityStore } from '@/modules/activity/store/pinia';
-import { useActivityTypeStore } from '@/modules/activity/store/type';
+import { storeToRefs } from 'pinia';
 import { useAuthStore } from '@/modules/auth/store/auth.store';
 import useSessionTracking from '@/shared/modules/monitoring/useSessionTracking';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
@@ -58,8 +56,10 @@ export default {
     tenant: {
       handler(tenant, oldTenant) {
         if (tenant?.id && tenant.id !== oldTenant?.id) {
-          this.fetchActivityTypes();
-          this.fetchActivityChannels();
+          this.listProjectGroups({
+            limit: 20,
+            reset: true,
+          });
         }
       },
     },
@@ -72,10 +72,6 @@ export default {
     if (queryParameters.get('state') === 'noconnect' && window.location.pathname.includes('/integration')) {
       return;
     }
-    this.listProjectGroups({
-      limit: null,
-      reset: true,
-    });
     if (['/auth/callback'].includes(window.location.pathname)) {
       return;
     }
@@ -91,12 +87,6 @@ export default {
     ...mapActions({
       resize: 'layout/resize',
     }),
-    ...piniaMapActions(useActivityStore, {
-      fetchActivityChannels: 'fetchActivityChannels',
-    }),
-    ...piniaMapActions(useActivityTypeStore, {
-      fetchActivityTypes: 'fetchActivityTypes',
-    }),
 
     handleResize() {
       this.resize({

frontend/src/modules/activity/components/activity-timeline.vue

@@ -257,7 +257,7 @@ const props = defineProps({
 });
 
 const lsSegmentsStore = useLfSegmentsStore();
-const { projectGroups, selectedProjectGroup } = storeToRefs(lsSegmentsStore);
+const { selectedProjectGroup, selectedProjectGroupSubprojects } = storeToRefs(lsSegmentsStore);
 
 const enabledPlatforms: IdentityConfig[] = Object.values(lfIdentities);
 
@@ -274,16 +274,8 @@ const selectedSegment = ref(props.selectedSegment || null);
 
 const isMemberEntity = computed(() => props.entityType === 'member');
 
-const subprojects = computed(() => projectGroups.value.list.reduce((acc, projectGroup) => {
-  projectGroup.projects.forEach((project) => {
-    project.subprojects.forEach((subproject) => {
-      acc[subproject.id] = {
-        id: subproject.id,
-        name: subproject.name,
-      };
-    });
-  });
-
+const subprojects = computed(() => selectedProjectGroupSubprojects.value.reduce((acc, sp) => {
+  acc[sp.id] = { id: sp.id, name: sp.name };
   return acc;
 }, {}));
 
@@ -292,7 +284,7 @@ const segments = computed(() => {
     return (
       getSegmentsFromProjectGroup(selectedProjectGroup.value)?.map(
         (s) => subprojects.value[s],
-      ) || []
+      ).filter((s) => !!s) || []
     );
   }
   return (

frontend/src/modules/admin/modules/projects/components/view/lf-project-groups-table.vue

@@ -26,7 +26,10 @@
             </div>
           </lf-table-cell>
           <lf-table-cell>
-            <app-lf-project-column :projects="projectGroup.projects" />
+            <app-lf-project-column
+              :projects="projectGroup.projects || []"
+              :project-count="projectGroup.projectCount"
+            />
           </lf-table-cell>
           <lf-table-cell class="pr-2 flex justify-end">
             <app-lf-project-groups-dropdown

frontend/src/modules/admin/modules/projects/pages/project-groups-list.page.vue

@@ -84,7 +84,7 @@
 
             <div class="mb-8 flex flex-wrap gap-2.5">
               <div class="bg-gray-200 text-gray-900 text-2xs px-2 h-6 flex items-center w-fit rounded-md">
-                {{ pluralize('project', projectGroup.projects.length, true) }}
+                {{ pluralize('project', projectGroup.projectCount ?? projectGroup.projects?.length ?? 0, true) }}
               </div>
             </div>
 

frontend/src/modules/contributor/components/edit/identity/contributor-identity-add.vue

@@ -166,7 +166,10 @@ const isModalOpen = computed<boolean>({
 
 const addIdentities = () => {
   sending.value = true;
-  createContributorIdentities(props.contributor.id, form)
+  createContributorIdentities(
+    props.contributor.id,
+    form.map(({ id, ...identity }) => identity),
+  )
     .then(() => {
       ToastStore.success('Identities successfully added');
       isModalOpen.value = false;

frontend/src/modules/contributor/services/contributor.identities.api.service.ts

@@ -1,5 +1,5 @@
 import authAxios from '@/shared/axios/auth-axios';
-import { ContributorIdentity, UpdateContributorIdentityPayload } from '@/modules/contributor/types/Contributor';
+import { CreateContributorIdentity, UpdateContributorIdentityPayload } from '@/modules/contributor/types/Contributor';
 import { storeToRefs } from 'pinia';
 import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 
@@ -22,7 +22,7 @@ export class ContributorIdentitiesApiService {
     ).then(({ data }) => Promise.resolve(data));
   }
 
-  static async createMultiple(memberId: string, identities: ContributorIdentity[]) {
+  static async createMultiple(memberId: string, identities: CreateContributorIdentity[]) {
     return authAxios.put(
       `/member/${memberId}/identity`,
       {

frontend/src/modules/contributor/store/contributor.actions.ts

@@ -2,7 +2,7 @@ import { useLfSegmentsStore } from '@/modules/lf/segments/store';
 import { storeToRefs } from 'pinia';
 import { ContributorApiService } from '@/modules/contributor/services/contributor.api.service';
 import {
-  Contributor, ContributorAffiliation, ContributorIdentity, UpdateContributorIdentityPayload,
+  Contributor, ContributorAffiliation, ContributorIdentity, CreateContributorIdentity, UpdateContributorIdentityPayload,
 } from '@/modules/contributor/types/Contributor';
 import { ContributorIdentitiesApiService } from '@/modules/contributor/services/contributor.identities.api.service';
 import { MergeActionsService } from '@/shared/modules/merge/services/merge-actions.service';
@@ -70,7 +70,7 @@ export default {
     return ContributorIdentitiesApiService.list(id, [selectedProjectGroup.value?.id as string])
       .then(this.setIdentities);
   },
-  createContributorIdentities(memberId: string, identities: ContributorIdentity[]): Promise<ContributorIdentity[]> {
+  createContributorIdentities(memberId: string, identities: CreateContributorIdentity[]): Promise<ContributorIdentity[]> {
     return ContributorIdentitiesApiService.createMultiple(memberId, identities)
       .then(this.setIdentities);
   },

frontend/src/modules/contributor/types/Contributor.ts

@@ -73,6 +73,11 @@ export interface ContributorIdentity {
   duplicatedIdentities?: ContributorIdentity[];
 }
 
+export type CreateContributorIdentity = Omit<
+  ContributorIdentity,
+  'id' | 'platforms' | 'url' | 'duplicatedIdentities'
+>;
+
 export interface UpdateContributorIdentityPayload {
   value?: string;
   type?: string;