minor update

VREMSoftwareDevelopment · Oct 14, 2024 · 903200c · 903200c
1 parent 234e899
commit 903200c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/react/src/App.js b/react/src/App.js
@@ -17,6 +17,7 @@
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { HashRouter } from 'react-router-dom';
 import { DateTime } from 'luxon';
 import theme from './theme';
@@ -55,4 +56,10 @@ App.defaultProps = {
     currentTime: DateTime.local().toLocaleString(DateTime.DATETIME_FULL_WITH_SECONDS),
 };
 
+App.propTypes = {
+    name: PropTypes.string,
+    version: PropTypes.string,
+    currentTime: PropTypes.string,
+};
+
 export default App;
diff --git a/react/src/services/Usage.js b/react/src/services/Usage.js
@@ -20,10 +20,10 @@ import Data from './Data';
 
 const process = (response) =>
     response
-        .replace(/\r/g, '')
+        .replaceAll('\r', '')
         .split('\n')
         .map((line, index) => {
-            const elements = line.replace(/\n/g, '').split(',');
+            const elements = line.replaceAll('\n', '').split(',');
             if (elements.length < 8) {
                 return null;
             }

diff --git a/react/src/utils/SortUtils.js b/react/src/utils/SortUtils.js
@@ -17,8 +17,16 @@
  */
 
 export const comparator = (isAscending, orderBy) => {
-    const ascending = (a, b, orderBy) => (a[orderBy] < b[orderBy] ? -1 : a[orderBy] > b[orderBy] ? 1 : 0);
-    const descending = (a, b, orderBy) => (a[orderBy] > b[orderBy] ? -1 : a[orderBy] < b[orderBy] ? 1 : 0);
+    const ascending = (a, b, orderBy) => {
+        if (a[orderBy] < b[orderBy]) return -1;
+        if (a[orderBy] > b[orderBy]) return 1;
+        return 0;
+    };
+    const descending = (a, b, orderBy) => {
+        if (a[orderBy] > b[orderBy]) return -1;
+        if (a[orderBy] < b[orderBy]) return 1;
+        return 0;
+    };
     return isAscending ? (a, b) => ascending(a, b, orderBy) : (a, b) => descending(a, b, orderBy);
 };