pr corrections

SeedCompany · Mar 5, 2025 · a73c727 · a73c727
1 parent 63106bd
commit a73c727
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/components/language/language.edgedb.repository.ts b/src/components/language/language.edgedb.repository.ts
@@ -52,9 +52,6 @@ export class LanguageEdgeDBRepository
 
   async languageByEth(ethnologueId: ID) {
     const ethnologue = e.cast(e.Language.ethnologue, e.uuid(ethnologueId));
-    const language = e.select(e.Language, () => ({
-      filter_single: { id: ethnologue.language.id },
-    }));
-    return await this.db.run(language.id);
+    return await this.db.run(ethnologue.language.id);
   }
 }
diff --git a/src/components/search/dto/search-results.dto.ts b/src/components/search/dto/search-results.dto.ts
@@ -75,7 +75,6 @@ const searchableAbstracts = {
   TranslationProject,
   Product,
   PeriodicReport,
-  EthnologueLanguage,
 } as const;
 
 /*******************************************************************************

diff --git a/src/components/search/search.service.ts b/src/components/search/search.service.ts
@@ -55,6 +55,10 @@ export class SearchService {
       // Add Organization label when searching for Partners we can search for
       // Partner by organization name
       ...(inputTypes.includes('Partner') ? (['Organization'] as const) : []),
+      // Add EthnologueLanguage label when searching for Languages
+      ...(inputTypes.includes('Language')
+        ? (['EthnologueLanguage'] as const)
+        : []),
     ];
 
     // Search for nodes based on input, only returning their id and "type"
@@ -74,19 +78,21 @@ export class SearchService {
           id: node.properties.id,
           matchedProps,
         }))
-        // Map Org results to Org & Partner results based on types asked for
         .flatMap((result) => {
           // Map to be used for search results that don't follow standard pattern, add to this as needed
           const inputTypeMap = {
-            EthnologueLanguage: inputTypes.includes('Language')
-              ? [
-                  {
-                    id: result.id,
-                    type: 'LanguageByEth' as const,
-                    matchedProps: ['ethnologue'] as const,
-                  },
-                ]
-              : [],
+            EthnologueLanguage: [
+              ...(inputTypes.includes('EthnologueLanguage') ? [result] : []),
+              ...(inputTypes.includes('Language')
+                ? [
+                    {
+                      id: result.id,
+                      type: 'LanguageByEth' as const,
+                      matchedProps: ['ethnologue'] as const,
+                    },
+                  ]
+                : []),
+            ],
             Organization: [
               ...(inputTypes.includes('Organization') ? [result] : []),
               ...(inputTypes.includes('Partner')