foreman_resource_quota 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a959b75793d21e8a5cc861335fc1db2a1a6d462714e1c74228b4cfc8b67498
-  data.tar.gz: 34086e312df966c02a8b260e3d89e29dd1c167b3935d6dd50c129a49c694a3e3
+  metadata.gz: 0fc7d72bb33cb797328a1656add6ef5861b91c7ad4273da69a1faf53cfe3005c
+  data.tar.gz: ed425c2df6ba263e4314bb6ccef97812102d0703ab41c08d4aaebfc382df4bf4
 SHA512:
-  metadata.gz: 0f422cf04766a2a6ec62f9fb4294ecc6b7a63c38542b8990ffcdd82fadb584c5b22d74eb168103914a4a7121144bd5129229d75d63920def6144dc01164743c8
-  data.tar.gz: 04b9dfdc75b555718bcebca5a765fc14e37cb89cd19512ad86babb795025b1173fa13f6a735601b9f40d67d7647350af9d07d14f3e35ba7c690e441f9e99f2aa
+  metadata.gz: 99e464800af7f2e48219666453d1c7958d7826478c60ef09753764af87e034374fd651c07d22d0c23b6a3b770bb84e8589684050a41b6f3ab9d1214378762213
+  data.tar.gz: c60c8b5231acb3ec2d9a2dcc41c46884c30ebe82b200212bcace9cd706419975c5b0206bddca6ee750e91ec8afdabb09cf18754a3e6136d22e76a9d72723d61a

data/lib/foreman_resource_quota/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanResourceQuota
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/webpack/components/ResourceQuotaEmptyState/__test__/__snapshots__/ResourceQuotaEmptyState.test.js.snap

@@ -30,6 +30,7 @@ exports[`ResourceQuotaEmptyState should render 1`] = `
     icon="pficon pficon-cluster"
     iconType="pf"
     secondaryActions={Array []}
+    variant="xl"
   />
   <Modal
     actions={Array []}

data/webpack/components/ResourceQuotaForm/components/Resource/UtilizationProgress.js

@@ -14,6 +14,10 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import './UtilizationProgress.scss';
 import { findLargestFittingUnit } from '../../../../helper';
 
+const UTILIZATION_DANGER_THRESHOLD = 80;
+const UTILIZATION_MAX_VALUE = 100;
+const UTILIZATION_MIN_VALUE = 0;
+
 const UtilizationProgress = ({
   cardId,
   resourceValue,
@@ -33,8 +37,9 @@ const UtilizationProgress = ({
 
   /* resource utilization bar */
   const resourceProgressVariant = () => {
-    if (resourceUtilizationPercent < 80) return null;
-    else if (resourceUtilizationPercent < 100) return ProgressVariant.warning;
+    if (resourceUtilizationPercent < UTILIZATION_DANGER_THRESHOLD) return null;
+    else if (resourceUtilizationPercent < UTILIZATION_MAX_VALUE)
+      return ProgressVariant.warning;
     return ProgressVariant.danger;
   };
 
@@ -50,7 +55,7 @@ const UtilizationProgress = ({
         </div>
       );
     } else if (resourceUtilization == null) {
-      newPercent = 0;
+      newPercent = UTILIZATION_MIN_VALUE;
       newTooltipText = (
         <div>
           <div>{__('No consumption to display.')}</div>
@@ -68,7 +73,7 @@ const UtilizationProgress = ({
       );
       const utilizationInUnit = resourceUtilization / utilizationUnit.factor;
       const valueInUnit = resourceValue / valueUnit.factor;
-      newPercent = 100;
+      newPercent = UTILIZATION_MAX_VALUE;
       newTooltipText = (
         <div>
           {`${utilizationInUnit} ${utilizationUnit.symbol} / ${valueInUnit} ${valueUnit.symbol}`}
@@ -82,7 +87,8 @@ const UtilizationProgress = ({
       );
       const utilizationInUnit = resourceUtilization / utilizationUnit.factor;
       const valueInUnit = resourceValue / valueUnit.factor;
-      const percent = (100 * resourceUtilization) / resourceValue;
+      const percent =
+        (UTILIZATION_MAX_VALUE * resourceUtilization) / resourceValue;
       if (Number.isFinite(percent)) newPercent = percent;
       else newPercent = 0;
       newTooltipText = (

data/webpack/global_test_setup.js

@@ -8,4 +8,6 @@ global.console.error = (error, stack) => {
 };
 
 // Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
-jest.setTimeout(10000);
+const JEST_TIMEOUT_MS = 10000;
+
+jest.setTimeout(JEST_TIMEOUT_MS);

data/webpack/lib/react-testing-lib-wrapper.js

@@ -7,7 +7,6 @@ import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
 import { APIMiddleware, reducers as apiReducer } from 'foremanReact/redux/API';
 import { reducers as fillReducers } from 'foremanReact/components/common/Fill';
-import { reducers as foremanModalReducer } from 'foremanReact/components/ForemanModal';
 import { STATUS } from 'foremanReact/constants';
 import {
   render,
@@ -36,7 +35,6 @@ function renderWithRedux(
   // Adding the reducer in the expected namespaced format
   const combinedReducers = combineReducers({
     ...apiReducer,
-    ...foremanModalReducer,
     ...fillReducers,
   });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_resource_quota
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - ATIX AG
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman plugin for resource quota
 test_files: []