fix: Fix search by app

kubesphere · Feb 22, 2020 · 69336fc · 69336fc
1 parent 7f46a68
commit 69336fc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/src/pages/projects/containers/Pods/index.jsx b/src/pages/projects/containers/Pods/index.jsx
diff --git a/src/pages/projects/containers/Routes/index.jsx b/src/pages/projects/containers/Routes/index.jsx
@@ -158,10 +158,11 @@ export default class Routes extends Base {
     },
     {
       title: t('Application'),
-      dataIndex: 'app',
+      dataIndex: 'app.kubernetes.io/name',
       isHideable: true,
       search: true,
       width: '22%',
+      render: (_, record) => record.app,
     },
     {
       title: t('Created Time'),

diff --git a/src/pages/projects/containers/Services/index.jsx b/src/pages/projects/containers/Services/index.jsx
@@ -176,10 +176,11 @@ export default class Services extends Base {
     },
     {
       title: t('Application'),
-      dataIndex: 'app',
+      dataIndex: 'app.kubernetes.io/name',
       isHideable: true,
       search: true,
       width: '16%',
+      render: (_, record) => record.app,
     },
     {
       title: t('Created Time'),

diff --git a/src/pages/projects/containers/Workloads/Base.jsx b/src/pages/projects/containers/Workloads/Base.jsx
@@ -141,10 +141,11 @@ export default class WorkloadsBaseList extends Base {
     },
     {
       title: t('Application'),
-      dataIndex: 'app',
+      dataIndex: 'app.kubernetes.io/name',
       isHideable: true,
       search: true,
       width: '25%',
+      render: (_, record) => record.app,
     },
     this.module === 'deployments'
       ? {

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -169,7 +169,7 @@ export const getQueryString = params =>
 
 export const getFilterString = (
   params,
-  fuzzyMatchKeys = ['name', 'app', 'label', 'annotation']
+  fuzzyMatchKeys = ['name', 'app.kubernetes.io/name', 'label', 'annotation']
 ) =>
   Object.keys(params)
     .filter(key => !isUndefined(params[key]) && params[key] !== '')