fix(): findItemsBySlug short-circuits to resolve empty array when slu…

…g is falsey (#1420)
Esri · Feb 22, 2024 · f255f6e · f255f6e
1 parent 85469a8
commit f255f6e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 39 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/src/items/slugs.ts b/packages/common/src/items/slugs.ts
@@ -106,13 +106,16 @@ export function getItemBySlug(
  * @param requestOptions
  * @returns
  */
-export function findItemsBySlug(
+export async function findItemsBySlug(
   slugInfo: {
     slug: string;
     exclude?: string;
   },
   requestOptions: IRequestOptions
 ): Promise<IItem[]> {
+  if (!slugInfo.slug) {
+    return [];
+  }
   const filter = slugInfo.slug.startsWith(`${TYPEKEYWORD_SLUG_PREFIX}|`)
     ? slugInfo.slug
     : [TYPEKEYWORD_SLUG_PREFIX, slugInfo.slug].join("|");
@@ -133,13 +136,12 @@ export function findItemsBySlug(
   if (slugInfo.exclude) {
     opts.q = `NOT id:${slugInfo.exclude}`;
   }
-  return searchItems(opts)
-    .then((response) => {
-      return response.results;
-    })
-    .catch((e) => {
-      throw e;
-    });
+  try {
+    const response = await searchItems(opts);
+    return response.results;
+  } catch (e) {
+    throw e;
+  }
 }
 
 /**

diff --git a/packages/common/test/items/slugs.test.ts b/packages/common/test/items/slugs.test.ts
@@ -150,6 +150,20 @@ describe("slug utils: ", () => {
   });
 
   describe("findItemsBySlug:", () => {
+    it("short-circuits with an empty array when slugInfo.slug is falsey", async () => {
+      const searchSpy = spyOn(portalModule, "searchItems").and.returnValue(
+        Promise.resolve({ results: [] })
+      );
+
+      const results = await slugModule.findItemsBySlug(
+        { slug: "", exclude: "bc3" },
+        {
+          authentication: MOCK_AUTH,
+        }
+      );
+      expect(results).toEqual([]);
+      expect(searchSpy.calls.count()).toBe(0);
+    });
     it("excludes specific item", async () => {
       const searchSpy = spyOn(portalModule, "searchItems").and.returnValue(
         Promise.resolve({
@@ -166,7 +180,6 @@ describe("slug utils: ", () => {
         }
       );
       expect(results[0].id).toBe("3ef");
-      // check if
       expect(searchSpy.calls.count()).toBe(1);
       const args = searchSpy.calls.argsFor(0)[0] as unknown as ISearchOptions;
       expect(args.filter).toBe(`typekeywords:"slug|foo-bar"`);