refactor(Storage): move utility functions to general utils

Author: ariser

src/containers/Storage/StorageGroups/StorageGroups.tsx

@@ -14,9 +14,10 @@ import {VisibleEntities} from '../../../store/reducers/storage';
 import {bytesToGB, bytesToSpeed} from '../../../utils/utils';
 //@ts-ignore
 import {stringifyVdiskId} from '../../../utils';
+import {getUsage, isFullDonorData} from '../../../utils/storage';
 
 import Vdisk from '../Vdisk/Vdisk';
-import {isFullDonorData, getDegradedSeverity, getUsageSeverity, getUsage} from '../utils';
+import {getDegradedSeverity, getUsageSeverity} from '../utils';
 
 import './StorageGroups.scss';
 

src/containers/Storage/utils/index.ts

@@ -1,11 +1,7 @@
-import type {TVDiskStateInfo, TVSlotId} from '../../../types/api/storage';
 import type {IStoragePoolGroup} from '../../../types/store/storage';
 
 export * from './constants';
 
-export const isFullDonorData = (donor: TVDiskStateInfo | TVSlotId): donor is TVDiskStateInfo =>
-    'VDiskId' in donor;
-
 const generateEvaluator = <
     OkLevel extends string,
     WarnLevel extends string,
@@ -47,10 +43,3 @@ export const getDegradedSeverity = (group: IStoragePoolGroup) => {
 
 export const getUsageSeverity = generateEvaluator(80, 85, ['success', 'warning', 'danger']);
 export const getUsageSeverityForEntityStatus = generateEvaluator(80, 85, ['Green', 'Yellow', 'Red']);
-
-export const getUsage = (data: IStoragePoolGroup, step = 1) => {
-    // if limit is 0, display 0
-    const usage = Math.round((data.Used * 100) / data.Limit) || 0;
-
-    return Math.floor(usage / step) * step;
-};

src/store/reducers/storage.js

@@ -3,7 +3,7 @@ import '../../services/api';
 import _ from 'lodash';
 import {createSelector} from 'reselect';
 import {calcUptime} from '../../utils';
-import {getUsage} from '../../containers/Storage/utils';
+import {getUsage} from '../../utils/storage';
 
 export const VisibleEntities = {
     All: 'All',

src/utils/storage.ts

@@ -0,0 +1,12 @@
+import type {TVDiskStateInfo, TVSlotId} from '../types/api/storage';
+import type {IStoragePoolGroup} from '../types/store/storage';
+
+export const isFullDonorData = (donor: TVDiskStateInfo | TVSlotId): donor is TVDiskStateInfo =>
+    'VDiskId' in donor;
+
+export const getUsage = (data: IStoragePoolGroup, step = 1) => {
+    // if limit is 0, display 0
+    const usage = Math.round((data.Used * 100) / data.Limit) || 0;
+
+    return Math.floor(usage / step) * step;
+};