Retrieving a queue is working well

Author: matt-aitken

apps/webapp/app/routes/api.v1.queues.$queueParam.ts

@@ -11,7 +11,7 @@ const SearchParamsSchema = z.object({
 export const loader = createLoaderApiRoute(
   {
     params: z.object({
-      queueParam: z.string(),
+      queueParam: z.string().transform((val) => val.replace(/%2F/g, "/")),
     }),
     searchParams: SearchParamsSchema,
     findResource: async () => 1, // This is a dummy function, we don't need to find a resource
@@ -22,7 +22,7 @@ export const loader = createLoaderApiRoute(
         ? params.queueParam
         : {
             type: searchParams.type,
-            name: decodeURIComponent(params.queueParam),
+            name: decodeURIComponent(params.queueParam).replace(/%2F/g, "/"),
           };
 
     const presenter = new QueueRetrievePresenter();

packages/core/src/v3/apiClient/index.ts

@@ -749,9 +749,12 @@ export class ApiClient {
     const type = typeof queue === "string" ? "id" : queue.type;
     const value = typeof queue === "string" ? queue : queue.name;
 
+    // Explicitly encode slashes before encoding the rest of the string
+    const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+
     return zodfetch(
       QueueItem,
-      `${this.baseUrl}/api/v1/queues/${encodeURIComponent(value)}?type=${type}`,
+      `${this.baseUrl}/api/v1/queues/${encodedValue}?type=${type}`,
       {
         method: "GET",
         headers: this.#getHeaders(false),

packages/trigger-sdk/src/v3/queues.ts

@@ -3,6 +3,7 @@ import {
   apiClientManager,
   ApiPromise,
   ApiRequestOptions,
+  flattenAttributes,
   ListQueueOptions,
   mergeRequestOptions,
   OffsetLimitPagePromise,
@@ -68,7 +69,7 @@ export function retrieve(
       name: "queues.retrieve()",
       icon: "queue",
       attributes: {
-        queue: typeof queue === "string" ? queue : queue.name,
+        ...flattenAttributes({ queue }),
         ...accessoryAttributes({
           items: [
             {

references/hello-world/src/trigger/queues.ts

@@ -12,10 +12,16 @@ export const queuesTester = task({
     const retrievedFromId = await queues.retrieve(ctx.queue.id);
     logger.log("Retrieved from ID", { retrievedFromId });
 
-    const retrievedFromName = await queues.retrieve({
+    const retrievedFromCtxName = await queues.retrieve({
       type: "task",
       name: ctx.queue.name,
     });
+    logger.log("Retrieved from name", { retrievedFromCtxName });
+
+    const retrievedFromName = await queues.retrieve({
+      type: "task",
+      name: "queues-tester",
+    });
     logger.log("Retrieved from name", { retrievedFromName });
   },
 });