fix: Fix project resources search by app

kubesphere · Jul 10, 2020 · c71d050 · c71d050
1 parent 1d18e4b
commit c71d050
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 78 deletions.
diff --git a/src/components/Modals/ProjectSelect/index.jsx b/src/components/Modals/ProjectSelect/index.jsx
@@ -185,21 +185,21 @@ export default class ProjectSelectModal extends React.Component {
       rootStore.triggerAction('project.create', {
         store: this.projectStore,
         workspace,
-        success: this.fetchData,
+        success: () => this.fetchData(),
       })
     } else if (this.state.type === 'federatedprojects') {
       rootStore.triggerAction('federated.project.create', {
         store: this.projectStore,
         workspace,
         clusters: this.store.clusters.data.slice(),
-        success: this.fetchData,
+        success: () => this.fetchData(),
       })
     } else {
       rootStore.triggerAction('devops.create', {
         store: this.devopsStore,
         cluster,
         workspace,
-        success: this.fetchData,
+        success: () => this.fetchData(),
       })
     }
   }

diff --git a/src/locales/zh/base.js b/src/locales/zh/base.js
@@ -87,7 +87,7 @@ export default {
   PLATFORM_SETTINGS_DESC: '定制化平台设置，如平台基本信息等',
 
   Loading: '加载中',
-  Active: '已启用',
+  Active: '活跃',
   Running: '运行中',
   Succeeded: '运行中',
   'Not Running': '未运行',
@@ -108,7 +108,7 @@ export default {
   Completed: '已完成',
   Unfinished: '未完成',
   Healthy: '健康',
-  active: '已启用',
+  active: '活跃',
   running: '运行中',
   waiting: '等待中',
   pending: '等待中',

diff --git a/src/pages/devops/containers/Pipelines/Detail/Sider/pipeline-sider.jsx b/src/pages/devops/containers/Pipelines/Detail/Sider/pipeline-sider.jsx
@@ -72,13 +72,6 @@ export default class PipelineDetail extends Base {
     return this.props.rootStore.routing
   }
 
-  get application() {
-    const { detail } = this.store
-    return detail.labels && detail.labels.chart && detail.labels.release
-      ? `${detail.labels.release}/${detail.labels.chart}`
-      : '-'
-  }
-
   get creator() {
     return get(this.store.detail, 'creator', t('unknown'))
   }

diff --git a/src/pages/devops/containers/Pipelines/Detail/Sider/runs-sider.jsx b/src/pages/devops/containers/Pipelines/Detail/Sider/runs-sider.jsx
@@ -155,13 +155,6 @@ class RunSider extends Base {
     return this.props.rootStore.routing
   }
 
-  get application() {
-    const { detail } = this.store
-    return detail.labels && detail.labels.chart && detail.labels.release
-      ? `${detail.labels.release}/${detail.labels.chart}`
-      : '-'
-  }
-
   get creator() {
     return get(this.store.detail, 'creator', t('unknown'))
   }

diff --git a/src/pages/fedprojects/containers/Deployments/Detail/index.jsx b/src/pages/fedprojects/containers/Deployments/Detail/index.jsx
@@ -124,7 +124,7 @@ export default class DeploymentDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Created Time'),

diff --git a/src/pages/fedprojects/containers/Routes/Detail/index.jsx b/src/pages/fedprojects/containers/Routes/Detail/index.jsx
@@ -153,7 +153,7 @@ export default class RouteDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Created Time'),

diff --git a/src/pages/fedprojects/containers/Routes/index.jsx b/src/pages/fedprojects/containers/Routes/index.jsx
@@ -111,10 +111,9 @@ export default class Routers extends React.Component {
       },
       {
         title: t('Application'),
-        dataIndex: 'app.kubernetes.io/name',
+        dataIndex: 'app',
         isHideable: true,
         width: '22%',
-        render: (_, record) => record.app,
       },
       {
         title: t('Created Time'),

diff --git a/src/pages/fedprojects/containers/Services/index.jsx b/src/pages/fedprojects/containers/Services/index.jsx
@@ -145,6 +145,13 @@ export default class Services extends React.Component {
           />
         ),
       },
+      {
+        title: t('Application'),
+        dataIndex: 'app',
+        isHideable: true,
+        search: true,
+        width: '22%',
+      },
       {
         title: t('Created Time'),
         dataIndex: 'createTime',

diff --git a/src/pages/fedprojects/containers/StatefulSets/Detail/index.jsx b/src/pages/fedprojects/containers/StatefulSets/Detail/index.jsx
@@ -124,7 +124,7 @@ export default class DeploymentDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Created Time'),

diff --git a/src/pages/fedprojects/containers/StatefulSets/index.jsx b/src/pages/fedprojects/containers/StatefulSets/index.jsx
@@ -174,10 +174,9 @@ export default class StatefulSets extends React.Component {
       },
       {
         title: t('Application'),
-        dataIndex: 'app.kubernetes.io/name',
+        dataIndex: 'app',
         isHideable: true,
         width: '22%',
-        render: (_, record) => record.app,
       },
       {
         title: t('Updated Time'),

diff --git a/src/pages/projects/containers/DaemonSets/Detail/index.jsx b/src/pages/projects/containers/DaemonSets/Detail/index.jsx
@@ -152,10 +152,6 @@ export default class DaemonSetDetail extends React.Component {
         name: t('Project'),
         value: namespace,
       },
-      {
-        name: t('Application'),
-        value: detail.application,
-      },
       {
         name: t('Created Time'),
         value: getLocalTime(detail.createTime).format('YYYY-MM-DD HH:mm:ss'),

diff --git a/src/pages/projects/containers/DaemonSets/index.jsx b/src/pages/projects/containers/DaemonSets/index.jsx
@@ -184,14 +184,6 @@ export default class DaemonSets extends React.Component {
           <WorkloadStatus data={record} module={module} />
         ),
       },
-      {
-        title: t('Application'),
-        dataIndex: 'app.kubernetes.io/name',
-        isHideable: true,
-        search: true,
-        width: '22%',
-        render: (_, record) => record.app,
-      },
       {
         title: t('Created Time'),
         dataIndex: 'createTime',

diff --git a/src/pages/projects/containers/Deployments/Detail/index.jsx b/src/pages/projects/containers/Deployments/Detail/index.jsx
@@ -165,7 +165,7 @@ export default class DeploymentDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Created Time'),

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

diff --git a/src/pages/projects/containers/Pods/Containers/Detail.jsx b/src/pages/projects/containers/Pods/Containers/Detail.jsx
diff --git a/src/pages/projects/containers/Pods/Detail/index.jsx b/src/pages/projects/containers/Pods/Detail/index.jsx
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/Detail/index.jsx b/src/pages/projects/containers/Routes/Detail/index.jsx
@@ -155,7 +155,7 @@ export default class RouteDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Gateway Address'),

diff --git a/src/pages/projects/containers/Routes/index.jsx b/src/pages/projects/containers/Routes/index.jsx
@@ -157,11 +157,10 @@ export default class Routers extends React.Component {
       },
       {
         title: t('Application'),
-        dataIndex: 'app.kubernetes.io/name',
+        dataIndex: 'app',
         isHideable: true,
         search: true,
         width: '22%',
-        render: (_, record) => record.app,
       },
       {
         title: t('Created Time'),
@@ -224,16 +223,13 @@ export default class Routers extends React.Component {
     return (
       <ListPage {...this.props}>
         <Banner {...bannerProps} tips={this.tips} />
-        {isEmpty(data) && !isLoading ? (
-          this.renderCreateGateway()
-        ) : (
-          <Table
-            {...tableProps}
-            itemActions={this.itemActions}
-            columns={this.getColumns()}
-            onCreate={this.showCreate}
-          />
-        )}
+        {isEmpty(data) && !isLoading && this.renderCreateGateway()}
+        <Table
+          {...tableProps}
+          itemActions={this.itemActions}
+          columns={this.getColumns()}
+          onCreate={this.showCreate}
+        />
       </ListPage>
     )
   }

diff --git a/src/pages/projects/containers/Services/Detail/index.jsx b/src/pages/projects/containers/Services/Detail/index.jsx
@@ -178,7 +178,7 @@ export default class ServiceDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Virtual IP'),

diff --git a/src/pages/projects/containers/Services/index.jsx b/src/pages/projects/containers/Services/index.jsx
@@ -161,6 +161,13 @@ export default class Services extends React.Component {
           />
         ),
       },
+      {
+        title: t('Application'),
+        dataIndex: 'app',
+        isHideable: true,
+        search: true,
+        width: '22%',
+      },
       {
         title: t('Internet Access'),
         dataIndex: 'specType',

diff --git a/src/pages/projects/containers/StatefulSets/Detail/index.jsx b/src/pages/projects/containers/StatefulSets/Detail/index.jsx
@@ -166,7 +166,7 @@ export default class StatefulSetDetail extends React.Component {
       },
       {
         name: t('Application'),
-        value: detail.application,
+        value: detail.app,
       },
       {
         name: t('Created Time'),

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

diff --git a/src/pages/workspaces/containers/FedProjects/index.jsx b/src/pages/workspaces/containers/FedProjects/index.jsx
@@ -159,9 +159,7 @@ export default class Projects extends React.Component {
     this.props.trigger('federated.project.create', {
       ...this.props.match.params,
       store: this.projectStore,
-      success: () => {
-        this.getData()
-      },
+      success: () => this.getData(),
     })
 
   render() {

diff --git a/src/stores/base.js b/src/stores/base.js
@@ -77,6 +77,16 @@ export default class BaseStore {
       this.module
     }`
 
+  getFilterParams = params => {
+    const result = { ...params }
+    if (result.app) {
+      result.labelSelector = result.labelSelector || ''
+      result.labelSelector += `app.kubernetes.io/name=${result.app}`
+      delete result.app
+    }
+    return result
+  }
+
   @action
   setModule(module) {
     this.module = module
@@ -121,7 +131,7 @@ export default class BaseStore {
 
     const result = await request.get(
       this.getResourceUrl({ cluster, workspace, namespace, devops }),
-      params
+      this.getFilterParams(params)
     )
     const data = get(result, 'items', []).map(item => ({
       cluster,

diff --git a/src/utils/object.mapper.js b/src/utils/object.mapper.js
@@ -170,9 +170,7 @@ const WorkLoadMapper = item => ({
   availableCondition:
     get(item, 'status.conditions', []).find(cd => cd.type === 'Available') ||
     {},
-  app:
-    get(item, 'metadata.labels.release') ||
-    get(item, 'metadata.labels["app.kubernetes.io/name"]'),
+  app: get(item, 'metadata.labels["app.kubernetes.io/name"]'),
   ownerReference: get(item, 'metadata.ownerReferences[0]', {}),
   hasS2i: Object.keys(get(item, 'metadata.labels', {})).some(labelKey =>
     labelKey.startsWith('s2ibuilder')
@@ -382,9 +380,7 @@ const PodsMapper = item => ({
   node: get(item, 'spec.nodeName', ''),
   nodeIp: get(item, 'status.hostIP', 'none'),
   podIp: get(item, 'status.podIP'),
-  app:
-    get(item, 'metadata.labels.release') ||
-    get(item, 'metadata.labels["app.kubernetes.io/name"]'),
+  app: get(item, 'metadata.labels["app.kubernetes.io/name"]'),
   containers: getContainers(
     get(item, 'spec.containers', []),
     get(item, 'status.containerStatuses', []),
@@ -514,9 +510,7 @@ const ServiceMapper = item => {
     loadBalancerIngress:
       get(item, 'status.loadBalancer.ingress[0].ip') ||
       get(item, 'status.loadBalancer.ingress[0].hostname'),
-    app:
-      get(item, 'metadata.labels.release') ||
-      get(item, 'metadata.labels["app.kubernetes.io/name"]'),
+    app: get(item, 'metadata.labels["app.kubernetes.io/name"]'),
     _originData: getOriginData(item),
   }
 }
@@ -624,9 +618,7 @@ const IngressMapper = item => ({
   rules: get(item, 'spec.rules', []),
   tls: get(item, 'spec.tls', []),
   loadBalancerIngress: get(item, 'status.loadBalancer.ingress', []),
-  app:
-    get(item, 'metadata.labels.release') ||
-    get(item, 'metadata.labels["app.kubernetes.io/name"]'),
+  app: get(item, 'metadata.labels["app.kubernetes.io/name"]'),
   _originData: getOriginData(item),
 })