feat(volume): Check if volume is ready before taking snapshot (#546)

bwsw · Sep 19, 2017 · 9d245fe · 9d245fe
1 parent b92225d
commit 9d245fe
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/src/app/shared/models/volume.model.ts b/src/app/shared/models/volume.model.ts
@@ -14,6 +14,11 @@ export enum VolumeType {
   DATADISK = 'DATADISK'
 }
 
+export enum VolumeState {
+  Allocated = 'Allocated',
+  Ready = 'Ready'
+}
+
 export const volumeTypeNames = {
   [VolumeType.ROOT]: 'VOLUME_TYPE.ROOT',
   [VolumeType.DATADISK]: 'VOLUME_TYPE.DATADISK'
@@ -40,7 +45,7 @@ export class Volume extends BaseModel {
   public diskOfferingId: string;
   public loading: boolean;
   public name: string;
-  public state: string;
+  public state: VolumeState;
   public size: number;
   public virtualMachineId: string;
   public provisioningType: string;

diff --git a/...e-sidebar/snapshot-details/snapshot-creation/spare-drive-snapshot-creation.component.html b/...e-sidebar/snapshot-details/snapshot-creation/spare-drive-snapshot-creation.component.html
@@ -1,3 +1,12 @@
-<button md-mini-fab (click)="addSnapshot()">
+<button
+  *ngIf="isVolumeReady"
+  md-mini-fab
+  (click)="addSnapshot()"
+>
   <md-icon>add</md-icon>
 </button>
+
+<cs-no-results
+  *ngIf="!isVolumeReady"
+  [text]="'SPARE_DRIVE_PAGE.SNAPSHOTS.VOLUME_NOT_READY'"
+></cs-no-results>
diff --git a/...ive-sidebar/snapshot-details/snapshot-creation/spare-drive-snapshot-creation.component.ts b/...ive-sidebar/snapshot-details/snapshot-creation/spare-drive-snapshot-creation.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { SpareDriveSnapshotAction } from '../../../../shared/actions/spare-drive-actions/spare-drive-snapshot';
-import { Volume } from '../../../../shared/models/volume.model';
+import { Volume, VolumeState } from '../../../../shared/models/volume.model';
 
 
 @Component({
@@ -13,6 +13,10 @@ export class SpareDriveSnapshotCreationComponent {
 
   constructor(private spareDriveSnapshotAction: SpareDriveSnapshotAction) {}
 
+  public get isVolumeReady(): boolean {
+    return this.volume && this.volume.state === VolumeState.Ready;
+  }
+
   public addSnapshot(): void {
     this.spareDriveSnapshotAction.activate(this.volume).subscribe();
   }

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -496,7 +496,8 @@
     },
 "SNAPSHOTS": {
       "DESCRIPTION": "Description",
-      "DATE": "Date"
+      "DATE": "Date",
+      "VOLUME_NOT_READY": "Can't take snapshot. Volume is not ready"
     },
     "ATTACHMENT": {
       "CHOOSE_VIRTUAL_MACHINE": "Choose a virtual machine",

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
@@ -496,7 +496,8 @@
     },
     "SNAPSHOTS": {
       "DESCRIPTION": "Описание",
-      "DATE": "Дата"
+      "DATE": "Дата",
+      "VOLUME_NOT_READY": "Невозможно сделать снимок. Диск не готов"
     },
     "ATTACHMENT": {
       "CHOOSE_VIRTUAL_MACHINE": "Выберите машину",