Merge pull request #1487 from jay-hodgson/SWC-7067

SWC-7067

packages/synapse-react-client/src/components/GenericCard/Linkify.tsx

@@ -18,7 +18,15 @@ const synapseIdRule: LinkifyRule = {
 }
 
 const httpRule: LinkifyRule = {
-  regex: /((ftp|http|https):\/\/[^ ",]+)/,
+  regex: /(http:\/\/[^ ",]+)/,
+  onMatch: value => value,
+}
+const httpsRule: LinkifyRule = {
+  regex: /(https:\/\/[^ ",]+)/,
+  onMatch: value => value,
+}
+const ftpRule: LinkifyRule = {
+  regex: /(ftp:\/\/[^ ",]+)/,
   onMatch: value => value,
 }
 
@@ -78,6 +86,8 @@ const cbioPortalRule: LinkifyRule = {
 
 const rules: LinkifyRule[] = [
   httpRule,
+  httpsRule,
+  ftpRule,
   synapseIdRule,
   pubMedRule,
   sciCrunchResolverRule,

packages/synapse-react-client/src/components/QueryWrapperPlotNav/QueryWrapperPlotNav.stories.tsx

@@ -1,5 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 import {
+  DATASET,
   EXPERIMENTAL_TOOL,
   GENERIC_CARD,
   MEDIUM_USER_CARD,
@@ -58,6 +59,28 @@ const handlePlotClick = (event: QueryWrapperSynapsePlotRowClickEvent) => {
   ]
   executeQueryRequest(requestCopy)
 }
+export const DataCatalogCards: Story = {
+  args: {
+    name: 'Data Catalog',
+    sql: "SELECT * FROM syn61609402 where includedInDataCatalog = 'true'",
+    defaultShowPlots: false,
+    defaultShowSearchBox: true,
+    hideCopyToClipboard: true,
+    hideDownload: true,
+    cardConfiguration: {
+      type: GENERIC_CARD,
+      secondaryLabelLimit: 4,
+      genericCardSchema: {
+        type: DATASET,
+        title: 'name',
+        subTitle: 'community',
+        description: 'description',
+        secondaryLabels: ['contributors', 'individuals', 'id', 'link'],
+      },
+    },
+  },
+}
+
 export const Cards: Story = {
   args: {
     name: 'Tools',