fix: Release metadata keys returns array string

ctrlplanedev · Oct 19, 2024 · 60e15a7 · 60e15a7
1 parent 77b589d
commit 60e15a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/...service/src/app/[workspaceSlug]/_components/release-condition/MetadataConditionRender.tsx b/...service/src/app/[workspaceSlug]/_components/release-condition/MetadataConditionRender.tsx
@@ -76,14 +76,14 @@ export const MetadataConditionRender: React.FC<
                 <Button
                   variant="ghost"
                   size="sm"
-                  key={k.key}
+                  key={k}
                   className="w-full rounded-none text-left"
                   onClick={() => {
-                    setKey(k.key);
+                    setKey(k);
                     setOpen(false);
                   }}
                 >
-                  <div className="w-full">{k.key}</div>
+                  <div className="w-full">{k}</div>
                 </Button>
               ))}
             </PopoverContent>

diff --git a/packages/api/src/router/release.ts b/packages/api/src/router/release.ts
@@ -495,13 +495,17 @@ export const releaseRouter = createTRPCRouter({
         .innerJoin(workspace, eq(system.workspaceId, workspace.id));
 
       if (input.systemSlug != null)
-        return baseQuery.where(
-          and(
-            eq(system.slug, input.systemSlug),
-            eq(workspace.slug, input.workspaceSlug),
-          ),
-        );
+        return baseQuery
+          .where(
+            and(
+              eq(system.slug, input.systemSlug),
+              eq(workspace.slug, input.workspaceSlug),
+            ),
+          )
+          .then((r) => r.map((row) => row.key));
 
-      return baseQuery.where(eq(workspace.slug, input.workspaceSlug));
+      return baseQuery
+        .where(eq(workspace.slug, input.workspaceSlug))
+        .then((r) => r.map((row) => row.key));
     }),
 });