fix: Update instance check for attach/detach volume

Update instance check for attach/detach volume

Change-Id: Ie6396b2b9c42d424d0396f9c840fb6182ebd45e5

src/pages/compute/containers/Instance/actions/AttachVolume.jsx

@@ -15,12 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import globalServerStore from 'stores/nova/instance';
 import { ModalAction } from 'containers/Action';
-import {
+import { allowAttachVolumeInstance } from 'resources/instance';
-  isActive,
-  isNotDeleting,
-  isNotLocked,
-  isIronicInstance,
-} from 'resources/instance';
 import { multiTip } from 'resources/volume';
 import { get as _get } from 'lodash';
 
@@ -61,13 +56,7 @@ export class AttachVolume extends ModalAction {
 
   static allowed = (item, containerProps) => {
     const { isAdminPage } = containerProps;
-    return Promise.resolve(
+    return Promise.resolve(!isAdminPage && allowAttachVolumeInstance(item));
-      !isAdminPage &&
-        isActive(item) &&
-        isNotDeleting(item) &&
-        isNotLocked(item) &&
-        !isIronicInstance(item)
-    );
   };
 
   get formItems() {

src/pages/compute/containers/Instance/actions/DetachVolume.jsx

@@ -17,12 +17,7 @@ import { VolumeStore } from 'stores/cinder/volume';
 import globalServerStore from 'stores/nova/instance';
 import { ModalAction } from 'containers/Action';
 import { volumeStatus, isOsDisk } from 'resources/volume';
-import {
+import { allowAttachVolumeInstance } from 'resources/instance';
-  isActive,
-  isNotLocked,
-  isNotDeleting,
-  isIronicInstance,
-} from 'resources/instance';
 
 export class DetachVolume extends ModalAction {
   static id = 'detach-volume';
@@ -66,16 +61,10 @@ export class DetachVolume extends ModalAction {
 
   static policy = 'os_compute_api:os-volumes-attachments:delete';
 
-  // static hasDataVolume = item => item.volumes_attached && item.volumes_attached.length > 1
+  static allowed = (item, containerProps) => {
-
+    const { isAdminPage } = containerProps;
-  // static allowed = item => Promise.resolve(isActive(item) && isNotDeleting(item) && isNotLocked(item) && this.hasDataVolume(item))
+    return Promise.resolve(!isAdminPage && allowAttachVolumeInstance(item));
-  static allowed = (item) =>
+  };
-    Promise.resolve(
-      isActive(item) &&
-        isNotDeleting(item) &&
-        isNotLocked(item) &&
-        !isIronicInstance(item)
-    );
 
   get formItems() {
     return [

src/pages/storage/containers/Volume/actions/Attach.jsx

@@ -17,10 +17,7 @@ import { ModalAction } from 'containers/Action';
 import { ServerStore } from 'stores/nova/instance';
 import globalVolumeStore from 'stores/cinder/volume';
 import {
-  isActive,
+  allowAttachVolumeInstance,
-  isNotDeleting,
-  isNotLockedOrAdmin,
-  isIronicInstance,
   instanceSelectTablePropsBackend,
 } from 'resources/instance';
 import { isAvailable, isMultiAttach } from 'resources/volume';
@@ -51,12 +48,7 @@ export class Attach extends ModalAction {
     return 'large';
   }
 
-  disabledInstance = (ins) =>
+  disabledInstance = (ins) => !allowAttachVolumeInstance(ins);
-    !isActive(ins) ||
-    !isNotDeleting(ins) ||
-    !isNotLockedOrAdmin(ins) ||
-    this.alreadyAttached(ins) ||
-    isIronicInstance(ins);
 
   get defaultValue() {
     const { name, id, size, volume_type } = this.item;
@@ -78,7 +70,6 @@ export class Attach extends ModalAction {
     Promise.resolve(isAvailable(item) || isMultiAttach(item));
 
   get formItems() {
-    // const { multiattach } = this.item;
     return [
       {
         name: 'volume',

src/pages/storage/containers/Volume/actions/Detach.jsx

@@ -16,7 +16,12 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalServerStore from 'stores/nova/instance';
+import { ServerGroupInstanceStore } from 'stores/skyline/server-group-instance';
 import { isInUse, isOsDisk } from 'resources/volume';
+import {
+  instanceColumnsBackend,
+  allowAttachVolumeInstance,
+} from 'resources/instance';
 
 export class Detach extends ModalAction {
   static id = 'detach';
@@ -31,6 +36,8 @@ export class Detach extends ModalAction {
 
   init() {
     this.store = globalServerStore;
+    this.instanceStore = new ServerGroupInstanceStore();
+    this.getInstances();
   }
 
   static get modalSize() {
@@ -40,13 +47,15 @@ export class Detach extends ModalAction {
   getModalSize() {
     return 'large';
   }
-  // get instances() {
-  //   return this.store.list.data || [];
-  // }
 
-  // async getInstances() {
+  get instances() {
-  //   await this.store.fetchList({ limit: Infinity });
+    return this.instanceStore.list.data || [];
-  // }
+  }
+
+  getInstances() {
+    const members = (this.item.attachments || []).map((it) => it.server_id);
+    this.instanceStore.fetchList({ members });
+  }
 
   get defaultValue() {
     const { name, size, volume_type } = this.item;
@@ -66,6 +75,8 @@ export class Detach extends ModalAction {
         item.attachments.length
     );
 
+  disabledInstance = (ins) => !allowAttachVolumeInstance(ins);
+
   get formItems() {
     return [
       {
@@ -79,11 +90,7 @@ export class Detach extends ModalAction {
         label: t('Instance'),
         type: 'select-table',
         required: true,
-        data: (this.item.attachments || []).map((s) => ({
+        data: this.instances,
-          ...s,
-          name: s.server_name,
-          id: s.server_id,
-        })),
         isMulti: true,
         filterParams: [
           {
@@ -91,16 +98,9 @@ export class Detach extends ModalAction {
             name: 'name',
           },
         ],
-        columns: [
+        columns: instanceColumnsBackend,
-          {
+        isLoading: this.instanceStore.list.isLoading,
-            title: t('Name'),
+        disabledFunc: this.disabledInstance,
-            dataIndex: 'name',
-          },
-          {
-            title: t('Attached To'),
-            dataIndex: 'device',
-          },
-        ],
       },
     ];
   }

src/resources/instance.jsx

@@ -309,7 +309,6 @@ export const instanceColumnsBackend = [
     render: (value, record) => (
       <ImageType type={value} title={record.image_name} />
     ),
-    stringify: (_, record) => record.image_name,
   },
   {
     title: t('Fixed IP'),
@@ -350,6 +349,18 @@ export const instanceColumnsBackend = [
     dataIndex: 'flavor',
     sorter: false,
   },
+  {
+    title: t('Status'),
+    dataIndex: 'status',
+    sorter: false,
+    render: (value) => instanceStatus[value && value.toLowerCase()] || '-',
+  },
+  {
+    title: t('Locked'),
+    dataIndex: 'locked',
+    isHideable: true,
+    render: lockRender,
+  },
   {
     title: t('Created At'),
     dataIndex: 'created_at',
@@ -379,6 +390,27 @@ export const instanceSelectTablePropsBackend = {
 export const canCreateIronicByLicense = () =>
   globalRootStore.checkLicense('ironic');
 
+export const allowAttachVolumeInstance = (item) => {
+  const statusResult = checkStatus(
+    [
+      'active',
+      'paused',
+      'stopped',
+      'resized',
+      'soft-delete',
+      'shelved',
+      'shelved_offloaded',
+    ],
+    item
+  );
+  return (
+    statusResult &&
+    isNotDeleting(item) &&
+    isNotLocked(item) &&
+    !isIronicInstance(item)
+  );
+};
+
 export const instanceStatusFilter = {
   label: t('Status'),
   name: 'status',

src/stores/skyline/server-group-instance.js

@@ -27,12 +27,16 @@ export class ServerGroupInstanceStore extends Base {
     };
   }
 
+  get groupArraySize() {
+    return 1;
+  }
+
   async requestList(params, filters) {
     const { members, isServerGroup, all_projects } = filters;
     if (members && isServerGroup && members.length === 0) {
       return [];
     }
-    const memberArrs = groupArray(members, 10);
+    const memberArrs = groupArray(members, this.groupArraySize);
     const results = await Promise.all(
       memberArrs.map((it) => {
         const newParams = { ...params, uuid: it, all_projects };