From 321bea9dcee5cdd4975cc75df86d17e7f7e2c4b7 Mon Sep 17 00:00:00 2001
From: xusongfu <xu.songfu@99cloud.net>
Date: Thu, 1 Sep 2022 16:35:53 +0800
Subject: [PATCH] fix: Fix attachments in volume list and tag in instance list

1.Hide attachments only in instance detail page
2.Remove tag sort in instance list

Change-Id: I415bdacf54ba266b3e8da261a688160bb1b0784b
---
 src/pages/compute/containers/Instance/index.jsx | 1 +
 src/pages/storage/containers/Volume/index.jsx   | 4 ++++
 src/resources/cinder/volume.jsx                 | 7 ++-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/compute/containers/Instance/index.jsx b/src/pages/compute/containers/Instance/index.jsx
index 09de076e..b4ead8da 100644
--- a/src/pages/compute/containers/Instance/index.jsx
+++ b/src/pages/compute/containers/Instance/index.jsx
@@ -198,6 +198,7 @@ export class Instance extends Base {
         dataIndex: 'tags',
         render: (tags) => tags.map((tag, index) => SimpleTag({ tag, index })),
         isHideable: true,
+        sorter: false,
       },
       {
         title: t('Locked'),
diff --git a/src/pages/storage/containers/Volume/index.jsx b/src/pages/storage/containers/Volume/index.jsx
index fd0c4c05..2d71dd81 100644
--- a/src/pages/storage/containers/Volume/index.jsx
+++ b/src/pages/storage/containers/Volume/index.jsx
@@ -54,6 +54,10 @@ export class Volume extends Base {
     return this.inDetailPage && this.path.includes('storage/snapshot');
   }
 
+  get isInstanceDetail() {
+    return this.inDetailPage && this.path.includes('compute/instance');
+  }
+
   get actionConfigs() {
     if (this.isRecycleBinDetail) {
       return emptyActionConfig;
diff --git a/src/resources/cinder/volume.jsx b/src/resources/cinder/volume.jsx
index ff5333e4..393d8dd5 100644
--- a/src/resources/cinder/volume.jsx
+++ b/src/resources/cinder/volume.jsx
@@ -247,7 +247,7 @@ export const snapshotTypeTip = (
 );
 
 export const getVolumeColumnsList = (self) => {
-  const columns = [
+  return [
     {
       title: t('ID/Name'),
       dataIndex: 'name',
@@ -298,6 +298,7 @@ export const getVolumeColumnsList = (self) => {
       dataIndex: 'attachments',
       isHideable: true,
       sorter: false,
+      hidden: self.isInstanceDetail,
       render: (value) => {
         if (value && value.length > 0) {
           return value.map((it) => (
@@ -351,10 +352,6 @@ export const getVolumeColumnsList = (self) => {
       stringify: (value) => toLocalTimeFilter(value),
     },
   ];
-  if (self.inDetailPage) {
-    return columns.filter((it) => it.dataIndex !== 'attachments');
-  }
-  return columns;
 };
 
 // deal with quota