Merge pull request #1506 from RoadieHQ/fix-query

Fix query and add story links
RoadieHQ · Jul 26, 2024 · a31f4f6 · a31f4f6
2 parents dace4b2 + 239ab17
commit a31f4f6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.changeset/good-beers-bake.md b/.changeset/good-beers-bake.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-shortcut': patch
+---
+
+Fix stories query where either parameter or annotation is undefined.
diff --git a/...ontend/backstage-plugin-shortcut/src/components/ComponentExtensions/EntityStoriesCard.tsx b/...ontend/backstage-plugin-shortcut/src/components/ComponentExtensions/EntityStoriesCard.tsx
@@ -15,7 +15,12 @@
  */
 
 import React from 'react';
-import { ErrorPanel, Table, TableColumn } from '@backstage/core-components';
+import {
+  ErrorPanel,
+  Table,
+  TableColumn,
+  Link,
+} from '@backstage/core-components';
 import SyncIcon from '@material-ui/icons/Sync';
 import { shortcutApiRef } from '../../api';
 import { useApi } from '@backstage/core-plugin-api';
@@ -29,7 +34,7 @@ const columnsBuilder: (users?: User[]) => TableColumn<Story>[] = (
 ) => [
   {
     title: 'Name',
-    field: 'name',
+    render: story => <Link to={story.app_url}>{story.name}</Link>,
   },
   {
     title: 'Status',
@@ -61,7 +66,9 @@ export const EntityStoriesCard = (props: {
   } = useAsyncRetry(async () => {
     let query = entity.metadata.annotations?.[SHORTCUT_QUERY_ANNOTATION];
     if (props.additionalQuery) {
-      query = `${query} ${props.additionalQuery}`;
+      query = [query, props.additionalQuery]
+        .filter(queryItem => queryItem !== undefined)
+        .join(' ');
     }
     if (query) {
       return (await shortcutApi.fetchStories({ query })).data;