Merge pull request #11 from k-grube/master

Add redux hot reload and immutable state middleware

Author: redanthrax

package-lock.json

@@ -65,6 +65,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "prettier": "2.4.1",
     "react-scripts": "^4.0.3",
+    "redux-immutable-state-invariant": "^2.1.0",
     "sass": "^1.43.2"
   },
   "engines": {

package.json

@@ -1 +1 @@
-1.3.0
+1.5.0

public/version_latest.txt

@@ -0,0 +1,10 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+export default function CellNullText({ cell }) {
+  return cell ?? 'n/a'
+}
+
+CellNullText.propTypes = {
+  cell: PropTypes.string,
+}

src/components/cipp/CellNullText.js

@@ -2,20 +2,33 @@ import { CProgress, CProgressBar } from '@coreui/react'
 import PropTypes from 'prop-types'
 import React from 'react'
 
-const CellProgressBar = ({ value }) => {
+const CellProgressBar = ({ value, reverse = false }) => {
   let color
-  switch (value) {
-    case value <= 40:
-      color = 'danger'
-      break
-    case value <= 75:
-      color = 'warning'
-      break
-    case value > 75:
-      color = 'success'
-      break
-    default:
-      color = 'danger'
+  if (!reverse) {
+    switch (value) {
+      case value <= 40:
+        color = 'danger'
+        break
+      case value <= 75:
+        color = 'warning'
+        break
+      case value > 75:
+        color = 'success'
+        break
+      default:
+        color = 'danger'
+    }
+  } else {
+    switch (value) {
+      case value >= 95:
+        color = 'danger'
+        break
+      case value >= 90:
+        color = 'warning'
+        break
+      default:
+        color = 'success'
+    }
   }
   return (
     <CProgress className="mb-3">
@@ -28,6 +41,7 @@ const CellProgressBar = ({ value }) => {
 
 CellProgressBar.propTypes = {
   value: PropTypes.number,
+  reverse: PropTypes.bool,
 }
 
 export default CellProgressBar

src/components/cipp/CellProgressBar.js

@@ -0,0 +1,10 @@
+import React from 'react'
+import { useLocation } from 'react-router-dom'
+
+function useQuery() {
+  const { search } = useLocation()
+
+  return React.useMemo(() => new URLSearchParams(search), [search])
+}
+
+export default useQuery

src/hooks/useQuery.js

@@ -4,6 +4,8 @@ const Home = React.lazy(() => import('./views/home/Home'))
 const ViewProfile = React.lazy(() => import('./views/profile/ViewProfile'))
 const Settings = React.lazy(() => import('./views/profile/Settings'))
 const Users = React.lazy(() => import('./views/identity/administration/Users'))
+const EditUser = React.lazy(() => import('./views/identity/administration/EditUser'))
+const ViewUser = React.lazy(() => import('./views/identity/administration/ViewUser'))
 const Groups = React.lazy(() => import('./views/identity/administration/Groups'))
 const Devices = React.lazy(() => import('./views/identity/reports/Devices'))
 const MFAReport = React.lazy(() => import('./views/identity/reports/MFAReport'))
@@ -61,6 +63,8 @@ const routes = [
   { path: '/profile/view', name: 'View', component: ViewProfile },
   { path: '/profile/settings', name: 'Settings', component: Settings },
   { path: '/identity', name: 'Identity' },
+  { path: '/identity/administration/users/edit', name: 'Edit User', component: EditUser },
+  { path: '/identity/administration/users/view', name: 'View User', component: ViewUser },
   { path: '/identity/administration', name: 'Administration' },
   { path: '/identity/administration/users', name: 'Users', component: Users },
   { path: '/identity/administration/groups', name: 'Groups', component: Groups },

src/routes.js

@@ -36,11 +36,12 @@ export default function clientMiddleware(client) {
 }
 
 // this will catch all errors, or any actions with prop `error` set
+// set action.hideToastError to `true` to ignore this middleware
 export function errorMiddleware() {
   return ({ dispatch, getState }) =>
     (next) =>
     (action) => {
-      if (action.error) {
+      if (action.error && !action.hideToastError) {
         console.error(action)
         const message =
           (action && action.error && action.error.message) || 'A generic error has occurred.'