Merge pull request #1465 from codyrancher/logging-links

Fixing logging overview broken links
rancher · Sep 28, 2020 · 8fef508 · 8fef508
2 parents 851f8db + a3e80cb
commit 8fef508
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/components/formatter/ListLink.vue b/components/formatter/ListLink.vue
@@ -4,18 +4,26 @@ import Link from './Link';
 export default {
   components: { Link },
   props:      {
+    row: {
+      type:     Object,
+      required: true,
+    },
     value: {
       type:     Array,
       default: () => []
-    }
+    },
+    options: {
+      type:    [Object, String],
+      default: null,
+    },
   },
 };
 </script>
 
 <template>
   <span>
     <span v-for="(el, i) in value" :key="el.key">
-      <Link :value="el" /><span v-if="i != value.length - 1">, </span>
+      <Link :row="row" :value="el" :options="options" /><span v-if="i != value.length - 1">, </span>
     </span>
   </span>
 </template>
diff --git a/config/table-headers.js b/config/table-headers.js
@@ -52,24 +52,27 @@ export const EFFECT = {
 };
 
 export const FLOW = {
-  name:      'flow',
-  labelKey:  'tableHeaders.flow',
-  value:     'flow',
-  sort:      ['flow.name'],
-  formatter: 'Link'
+  name:          'flow',
+  labelKey:      'tableHeaders.flow',
+  value:         'flow',
+  sort:          ['flow.name'],
+  formatter:     'Link',
+  formatterOpts: { options: 'internal' },
 };
 
 export const CLUSTER_FLOW = {
   ...FLOW,
-  labelKey: 'tableHeaders.clusterFlow'
+  labelKey:      'tableHeaders.clusterFlow',
+  formatterOpts: { options: 'internal' },
 };
 
 export const OUTPUT = {
-  name:      'output',
-  labelKey:  'tableHeaders.output',
-  value:     'outputs',
-  sort:      'outputs.text',
-  formatter: 'ListLink'
+  name:          'output',
+  labelKey:      'tableHeaders.output',
+  value:         'outputs',
+  sort:          'outputs.text',
+  formatter:     'ListLink',
+  formatterOpts: { options: 'internal' },
 };
 
 export const CONFIGURED_PROVIDERS = {

diff --git a/pages/c/_cluster/logging/index.vue b/pages/c/_cluster/logging/index.vue
@@ -63,7 +63,6 @@ export default {
       return {
         text:    resource.nameDisplay,
         url:     resource.detailLocation,
-        options: 'internal',
         ...resource
       };
     }