fix: Fix cluster API

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Aug 7, 2020 · b811ad7 · b811ad7
1 parent fe9e89b
commit b811ad7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/stores/cluster/index.js b/src/stores/cluster/index.js
@@ -50,6 +50,9 @@ export default class ClusterStore extends Base {
   getAgentUrl = ({ cluster }) =>
     `kapis/cluster.kubesphere.io/v1alpha1/clusters/${cluster}/agent/deployment`
 
+  getTenantUrl = (params = {}) =>
+    `kapis/tenant.kubesphere.io/v1alpha2${this.getPath(params)}/${this.module}`
+
   @action
   async fetchList({ cluster, workspace, namespace, more, ...params } = {}) {
     this.list.isLoading = true

diff --git a/src/utils/object.mapper.js b/src/utils/object.mapper.js
@@ -403,6 +403,9 @@ const PodsMapper = item => ({
 
 const EventsMapper = item => {
   const now = Date.now()
+
+  item.lastTimestamp = item.lastTimestamp || now
+
   const age =
     item.count > 1
       ? `${moment(item.lastTimestamp).to(now, true)} (x${
@@ -1072,7 +1075,7 @@ const ClusterMapper = item => {
 const FederatedMapper = resourceMapper => item => {
   const baseInfo = getBaseInfo(item)
   const overrides = get(item, 'spec.overrides', [])
-  const template = get(item, 'spec.template', {})
+  const template = cloneDeep(get(item, 'spec.template', {}))
   const clusters = get(item, 'spec.placement.clusters', [])
   const overrideClusterMap = keyBy(overrides, 'clusterName')
   const clusterTemplates = {}