Merge branch 'main' into scripts/enrich

CrowdDotDev · Jul 13, 2023 · 3284d76 · 3284d76
2 parents 8bbe3fb + 8b2f03f
commit 3284d76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/backend/src/database/repositories/segmentRepository.ts b/backend/src/database/repositories/segmentRepository.ts
@@ -493,7 +493,7 @@ class SegmentRepository extends RepositoryBase<
     }
 
     if (criteria.filter?.parentSlug) {
-      searchQuery += ` AND s."parentSlug" ilike :parent_slug `
+      searchQuery += ` AND s."parentSlug" = :parent_slug `
     }
 
     const projects = await this.options.database.sequelize.query(
@@ -560,11 +560,11 @@ class SegmentRepository extends RepositoryBase<
     }
 
     if (criteria.filter?.parentSlug) {
-      searchQuery += ` AND s."parentSlug" ilike :parent_slug `
+      searchQuery += ` AND s."parentSlug" = :parent_slug `
     }
 
     if (criteria.filter?.grandparentSlug) {
-      searchQuery += ` AND s."grandparentSlug" ilike :grandparent_slug `
+      searchQuery += ` AND s."grandparentSlug" = :grandparent_slug `
     }
 
     const subprojects = await this.options.database.sequelize.query(

diff --git a/backend/src/services/auth/authService.ts b/backend/src/services/auth/authService.ts
@@ -576,6 +576,7 @@ class AuthService {
           {
             provider,
             providerId,
+            emailVerified: true,
           },
           options,
         )

diff --git a/frontend/src/modules/member/components/suggestions/member-merge-suggestions-details.vue b/frontend/src/modules/member/components/suggestions/member-merge-suggestions-details.vue
@@ -198,7 +198,7 @@
           </a>
         </div>
         <a
-          v-for="email of member.emails?.filter((e) => e.length)"
+          v-for="email of member.emails?.filter((e) => e && e.length)"
           :key="email"
           :href="`mailto:${email}`"
           class="pb-2 pt-3 flex items-center text-gray-900"