fix(console): change metadata.labels to spec.selector.matchlabels (tk…

…estack#955)
k8ssphere · Nov 30, 2020 · 5211c56 · 5211c56
1 parent 333673d
commit 5211c56
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/web/console/src/modules/cluster/actions/resourcePodActions.ts b/web/console/src/modules/cluster/actions/resourcePodActions.ts
@@ -69,23 +69,9 @@ const fetchPodActions = generateFetcherActionCreator({
  }
  };
  } else {
- const k8sapp = resourceDetailState?.resourceDetailInfo?.selection?.metadata?.labels?.['k8s-app'];
- // hold special case
- if (!k8sapp) {
- let { records } = await WebAPI.fetchExtraResourceList(podQuery, resourceInfo, isClearData, 'pods');
- records = records.filter(item => item.status.reason !== 'Evicted');
- dispatch(resourcePodActions.changeContinueToken(''));
- return {
- records,
- recordCount: records.length
- };
- }
-
  podResourceInfo.namespaces = 'namespaces';
  k8sQueryObj = {
- labelSelector: {
- 'k8s-app': k8sapp
- },
+ labelSelector: resourceDetailState?.resourceDetailInfo?.selection?.spec?.selector?.matchlabels,
  fieldSelector: {
  'metadata.name': podName ? podName : undefined,
  'status.phase': phase ? phase : undefined,

diff --git a/...console/src/modules/cluster/components/resource/resourceDetail/ResourcePodActionPanel.tsx b/...console/src/modules/cluster/components/resource/resourceDetail/ResourcePodActionPanel.tsx
@@ -154,13 +154,7 @@ export class ResourcePodActionPanel extends React.Component<RootProps, ResourceP
  const type = urlParams['type'];
  const isInNodeManage = IsInNodeManageDetail(type);
  const { subRoot, namespaceList } = this.props,
- { podList, podQuery } = subRoot.resourceDetailState;
-
- // 如果当前pods数目大于指定pageSize，说明当前没有采用分页
-
- if (podList?.data?.recordCount > podQuery?.paging?.pageSize) {
- return <noscript />;
- }
+ { podList } = subRoot.resourceDetailState;
 
  /** podFilter的选择项 */
  const podNameValues: any[] = [];

diff --git a/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodTable.tsx b/web/console/src/modules/cluster/components/resource/resourceDetail/ResourcePodTable.tsx
@@ -57,7 +57,6 @@ export function PodTabel({
  stateText={`第${paging.pageIndex}页`}
  pageIndexVisible={false}
  endJumpVisible={false}
- pageSizeVisible={podList?.data?.recordCount <= paging.pageSize}
  />
  </Card.Body>
  </Card>