[Fleet] Fix package category count (#99677)

elastic · May 12, 2021 · 9907903 · 9907903
1 parent bc2b846
commit 9907903
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/registry/index.ts b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
@@ -77,8 +77,6 @@ export const pkgToPkgKey = ({ name, version }: { name: string; version: string }
 export async function fetchList(params?: SearchParams): Promise<RegistrySearchResults> {
   const registryUrl = getRegistryUrl();
   const url = new URL(`${registryUrl}/search`);
-  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
-  const kibanaBranch = appContextService.getKibanaBranch();
   if (params) {
     if (params.category) {
       url.searchParams.set('category', params.category);
@@ -88,10 +86,7 @@ export async function fetchList(params?: SearchParams): Promise<RegistrySearchRe
     }
   }
 
-  // on master, request all packages regardless of version
-  if (kibanaVersion && kibanaBranch !== 'master') {
-    url.searchParams.set('kibana.version', kibanaVersion);
-  }
+  setKibanaVersion(url);
 
   return fetchUrl(url.toString()).then(JSON.parse);
 }
@@ -145,6 +140,16 @@ export async function fetchFile(filePath: string): Promise<Response> {
   return getResponse(`${registryUrl}${filePath}`);
 }
 
+function setKibanaVersion(url: URL) {
+  const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
+  const kibanaBranch = appContextService.getKibanaBranch();
+
+  // on master, request all packages regardless of version
+  if (kibanaVersion && kibanaBranch !== 'master') {
+    url.searchParams.set('kibana.version', kibanaVersion);
+  }
+}
+
 export async function fetchCategories(params?: CategoriesParams): Promise<CategorySummaryList> {
   const registryUrl = getRegistryUrl();
   const url = new URL(`${registryUrl}/categories`);
@@ -154,6 +159,8 @@ export async function fetchCategories(params?: CategoriesParams): Promise<Catego
     }
   }
 
+  setKibanaVersion(url);
+
   return fetchUrl(url.toString()).then(JSON.parse);
 }