fix: Runtime detail page clusters columns

openpitrix · Mar 29, 2019 · cd31dba · cd31dba
1 parent 6c964f5
commit cd31dba
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/pages/Dashboard/Clusters/columns/index.js b/src/pages/Dashboard/Clusters/columns/index.js
@@ -23,12 +23,19 @@ export default ({
   runtimes,
   onlyView,
   isAgent,
+  isRuntimeDetail,
   t
 }) => [
   {
     title: 'Status',
     key: 'status',
-    render: cl => <Status type={cl.status} transition={cl.transition_status} transMap={transMap} />
+    render: cl => (
+      <Status
+        type={cl.status}
+        transition={cl.transition_status}
+        transMap={transMap}
+      />
+    )
   },
   {
     title: isAgent ? 'Agent Name ID' : 'Instance Name ID',
@@ -43,7 +50,10 @@ export default ({
     )
   },
   {
-    title: user.isUserPortal ? 'App / Delivery type / Version' : 'Version',
+    title:
+      user.isUserPortal || isRuntimeDetail
+        ? 'App / Delivery type / Version'
+        : 'Version',
     key: 'app_id',
     render: cl => renderAppTdShow(cl.app_id, cl.version_id)
   },
@@ -67,7 +77,9 @@ export default ({
   {
     title: 'Creator',
     key: 'owner',
-    render: cl => <TdUser className={styles.creator} users={users} userId={cl.owner} />
+    render: cl => (
+      <TdUser className={styles.creator} users={users} userId={cl.owner} />
+    )
   },
   {
     title: 'Created At',

diff --git a/src/pages/Dashboard/Clusters/index.jsx b/src/pages/Dashboard/Clusters/index.jsx
@@ -64,7 +64,7 @@ export default class Clusters extends Component {
         runtimeId,
         attachUsers: !user.isUserPortal,
         attachVersions: cluster_type === CLUSTER_TYPE.instance,
-        attachApps: !user.isDevPortal,
+        attachApps: !user.isDevPortal || runtimeId,
         with_detail: true,
         cluster_type: CLUSTER_TYPE.instance, // default fetch instance
         userId: (user.isUserPortal || user.isAdminPortal) && user.user_id
@@ -214,14 +214,16 @@ export default class Clusters extends Component {
   };
 
   renderAppTdShow = (appId, versionId) => {
-    const { appStore, appVersionStore, user } = this.props;
+    const {
+      appStore, appVersionStore, runtimeId, user
+    } = this.props;
     const { apps } = appStore;
     const { versions } = appVersionStore;
 
     const app = _.find(apps, { app_id: appId }) || {};
     const version = _.find(versions, { version_id: versionId }) || {};
 
-    if (user.isUserPortal || user.isAdmin) {
+    if (user.isUserPortal || user.isAdmin || runtimeId) {
       return (
         <div className={styles.appTdShow}>
           <label className={styles.appImage}>
@@ -343,7 +345,7 @@ export default class Clusters extends Component {
           tableType="Clusters"
           columns={columns}
           columnsFilter={cols => {
-            if (user.isUserPortal || user.isAdminPortal) {
+            if (user.isUserPortal || user.isAdminPortal || runtimeId) {
               cols = cols.filter(item => item.key !== 'owner');
             }
             if (isAgent) {
@@ -374,6 +376,7 @@ export default class Clusters extends Component {
             getDetailLink: this.getDetailLink,
             renderAppTdShow: this.renderAppTdShow,
             renderHandleMenu: this.renderHandleMenu,
+            isRuntimeDetail: Boolean(runtimeId),
             users,
             user,
             runtimes,