foreman_resource_quota 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed49765e7cc2e0b0c0059798b8b7055e695d31d7f5c01fad2345f560d6e7c17
-  data.tar.gz: 4b45e90aaea503b7b36f33939e60006a352718d81c7e40ccf0a2c21268556e25
+  metadata.gz: acb27059a0b8ca259bce3aeb9c43044fc50f2766d6a9619e5dae66ff2cc4766b
+  data.tar.gz: d50841a42fbc287725a5612b1e7004187c331a8ca82c74ead75511b64dae8c5b
 SHA512:
-  metadata.gz: 5c937a1edd93a174d873c60ef741f96950d1360e0f4886cd6e72ac472ca52839cb1e692d2f2b2148087dda1af60a68e25c87d865b195363dba418caa520c4721
-  data.tar.gz: 35c8bac94244083c54ba64620341b87e4801b1a190fd40b29c6e350b836e79e1dde15760ce995ed86c2d44db4e53a51497c8c0179a308868d9d34ecf5380c983
+  metadata.gz: 6b6dcae25dba0d534f807184573b54df1faebc010f23bde6134cd8a428f34c12c6103f528667ccbfbb42289eadc9a57c965e04927bed929339bc06f95dc431b8
+  data.tar.gz: 03b6d8bb2153880689169d7c73ca36fca03772734a7f086aaed0dd66ae48f9c8d92da53d971fd33bd081b2368f2df3d51f18bb39ca8c3b929bcaed14fdc86301

data/lib/foreman_resource_quota/version.rb

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

data/package.json

@@ -21,19 +21,18 @@
     "url": "http://projects.theforeman.org/projects/foreman_resource_quota/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 6.0.0"
+    "@theforeman/vendor": ">= 12.0.1"
   },
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.24.3",
+    "@babel/core": "^7.7.0",
     "@sheerun/mutationobserver-shim": "^0.3.3",
     "@testing-library/react": "^10.4.9",
-    "@theforeman/builder": "^12.0.1",
-    "@theforeman/eslint-plugin-foreman": "13.0.0",
-    "@theforeman/find-foreman": "^13.0.0",
-    "@theforeman/stories": "^12.2.3",
-    "@theforeman/test": "^13.0.0",
-    "@theforeman/vendor-dev": "^13.0.0",
+    "@theforeman/builder": ">=12.0.1",
+    "@theforeman/eslint-plugin-foreman": ">=12.0.1",
+    "@theforeman/find-foreman": ">=12.0.1",
+    "@theforeman/test": ">=12.0.1",
+    "@theforeman/vendor-dev": ">=12.0.1",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",

data/webpack/components/ResourceQuotaForm/components/Properties/index.js

@@ -16,10 +16,12 @@ import {
   Tooltip,
 } from '@patternfly/react-core';
 
-import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
-import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
-import ClusterIcon from '@patternfly/react-icons/dist/esm/icons/cluster-icon';
-import SyncAltIcon from '@patternfly/react-icons/dist/esm/icons/sync-alt-icon';
+import {
+  UserIcon,
+  UsersIcon,
+  ClusterIcon,
+  SyncAltIcon,
+} from '@patternfly/react-icons';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { dispatchAPICallbackToast } from '../../../../api_helper';

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import {
   Progress,
@@ -7,15 +7,12 @@ import {
   ProgressMeasureLocation,
   Tooltip,
 } from '@patternfly/react-core';
-import SyncAltIcon from '@patternfly/react-icons/dist/esm/icons/sync-alt-icon';
+import SyncAltIcon from '@patternfly/react-icons';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import './UtilizationProgress.scss';
-import {
-  findLargestFittingUnit,
-  areReactElementsEqual,
-} from '../../../../helper';
+import { findLargestFittingUnit } from '../../../../helper';
 
 const UtilizationProgress = ({
   cardId,
@@ -40,7 +37,8 @@ const UtilizationProgress = ({
     else if (resourceUtilizationPercent < 100) return ProgressVariant.warning;
     return ProgressVariant.danger;
   };
-  const updateResourceUtilizationView = () => {
+
+  const updateResourceUtilizationView = useCallback(() => {
     let newPercent;
     let newTooltipText;
 
@@ -93,13 +91,14 @@ const UtilizationProgress = ({
         </div>
       );
     }
-    if (resourceUtilizationPercent !== newPercent)
-      setResourceUtilizationPercent(newPercent);
-    if (!areReactElementsEqual(resourceUtilizationTooltipText, newTooltipText))
-      setResourceUtilizationTooltipText(newTooltipText);
-  };
+    setResourceUtilizationPercent(newPercent);
+    setResourceUtilizationTooltipText(newTooltipText);
+  }, [isNewQuota, resourceUnits, resourceUtilization, resourceValue]);
+
   // call it once
-  updateResourceUtilizationView();
+  useEffect(() => {
+    updateResourceUtilizationView();
+  }, [updateResourceUtilizationView]);
 
   return (
     <div>

data/webpack/helper.js

@@ -1,5 +1,3 @@
-import ReactDOMServer from 'react-dom/server';
-
 /**
  * Performs a deep equality comparison between two objects, including nested objects and arrays.
  * @param {Object} obj1 - The first object to compare.
@@ -37,16 +35,6 @@ const deepEqual = (obj1, obj2) => {
   return true;
 };
 
-const areReactElementsEqual = (element1, element2) => {
-  const elementToStr = element =>
-    element && ReactDOMServer.renderToStaticMarkup(element);
-
-  const element1Str = elementToStr(element1);
-  const element2Str = elementToStr(element2);
-
-  return element1Str === element2Str;
-};
-
 /**
  * Recursively copies values from the source hash (`src`) to the destination hash (`dest`).
  * Only keys that are a member of dest will copied from src.
@@ -83,4 +71,4 @@ const findLargestFittingUnit = (value, unitList) => {
   return unitList[0];
 };
 
-export { deepEqual, deepCopy, findLargestFittingUnit, areReactElementsEqual };
+export { deepEqual, deepCopy, findLargestFittingUnit };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_resource_quota
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Bastian Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies: []
 description: Foreman Plug-in to manage resource usage among users.
 email: