Merge branch 'KelvinTegelaar:main' into main

spinen · May 14, 2024 · 91020af · 91020af
2 parents af2645f + 561a6b0
commit 91020af
Show file tree

Hide file tree

Showing 18 changed files with 341 additions and 184 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -64,6 +64,7 @@
     "react": "^18.2.0",
     "react-app-polyfill": "^2.0.0",
     "react-bootstrap": "^1.6.5",
+    "react-circular-progressbar": "^2.1.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-data-table-component": "^7.4.5",
     "react-datepicker": "^4.10.0",

diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-5.6.1
+5.6.2
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,16 +1,15 @@
 import React, { Suspense } from 'react'
-import { BrowserRouter, Route, Routes, Navigate } from 'react-router-dom'
+import { BrowserRouter, Route, Routes, Navigate, useLocation } from 'react-router-dom'
 import { PrivateRoute, FullScreenLoading, ErrorBoundary } from 'src/components/utilities'
 import 'src/scss/style.scss'
-import { Helmet } from 'react-helmet-async'
+import { Helmet, HelmetProvider } from 'react-helmet-async'
 import Skeleton from 'react-loading-skeleton'
 import TimeAgo from 'javascript-time-ago'
 import en from 'javascript-time-ago/locale/en.json'
 TimeAgo.addDefaultLocale(en)
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { fas } from '@fortawesome/free-solid-svg-icons'
 import routes from 'src/routes'
-import { useAuthCheck } from './components/utilities/CippauthCheck'
 import importsMap from './importsMap'
 
 library.add(fas)
@@ -32,59 +31,58 @@ const Logout = React.lazy(() => import('./views/pages/login/Logout'))
 const App = () => {
   return (
     <BrowserRouter>
-      <Suspense fallback={<FullScreenLoading />}>
-        <Helmet>
-          <title>CIPP</title>
-        </Helmet>
-        <Routes>
-          <Route exact path="/LogoutRedirect" name="LogoutRedirect" element={<PageLogOut />} />
-          <Route exact path="/401" name="Page 401" element={<Page401 />} />
-          <Route exact path="/403" name="Page 403" element={<Page403 />} />
-          <Route exact path="/404" name="Page 404" element={<Page404 />} />
-          <Route exact path="/500" name="Page 500" element={<Page500 />} />
-          <Route exact path="/login" name="Login" element={<Login />} />
-          <Route exact path="/logout" name="Logout" element={<Logout />} />
-          <Route
-            path="/"
-            element={
-              <PrivateRoute>
-                <DefaultLayout />
-              </PrivateRoute>
-            }
-          >
-            {routes.map((route, idx) => {
-              const allowedRoles = route.allowedRoles
-              const Routecomponent = dynamicImport(route.path)
-              //console.log('route', route)
-              //console.log('Routecomponent', Routecomponent)
-              return (
-                route.component && (
-                  <Route
-                    key={`route-${idx}`}
-                    path={route.path}
-                    exact={route.exact}
-                    name={route.name}
-                    element={
-                      <PrivateRoute allowedRoles={allowedRoles}>
-                        <Suspense fallback={<Skeleton />}>
-                          <Helmet>
-                            <title>CIPP - {route.name}</title>
-                          </Helmet>
-                          <ErrorBoundary key={route.name}>
-                            <Routecomponent />
-                          </ErrorBoundary>
-                        </Suspense>
-                      </PrivateRoute>
-                    }
-                  />
+      <HelmetProvider>
+        <Suspense fallback={<FullScreenLoading />}>
+          <Helmet>
+            <title>CIPP</title>
+          </Helmet>
+          <Routes>
+            <Route exact path="/LogoutRedirect" name="LogoutRedirect" element={<PageLogOut />} />
+            <Route exact path="/401" name="Page 401" element={<Page401 />} />
+            <Route exact path="/403" name="Page 403" element={<Page403 />} />
+            <Route exact path="/404" name="Page 404" element={<Page404 />} />
+            <Route exact path="/500" name="Page 500" element={<Page500 />} />
+            <Route exact path="/login" name="Login" element={<Login />} />
+            <Route exact path="/logout" name="Logout" element={<Logout />} />
+            <Route
+              path="/"
+              element={
+                <PrivateRoute>
+                  <DefaultLayout />
+                </PrivateRoute>
+              }
+            >
+              {routes.map((route, idx) => {
+                const allowedRoles = route.allowedRoles
+                const Routecomponent = dynamicImport(route.path)
+                //console.log('route', route)
+                //console.log('Routecomponent', Routecomponent)
+                return (
+                  route.component && (
+                    <Route
+                      key={`route-${idx}`}
+                      path={route.path}
+                      exact={route.exact}
+                      name={route.name}
+                      element={
+                        <PrivateRoute allowedRoles={allowedRoles}>
+                          <Suspense fallback={<Skeleton />}>
+                            <ErrorBoundary key={route.name}>
+                              <Routecomponent />
+                            </ErrorBoundary>
+                          </Suspense>
+                        </PrivateRoute>
+                      }
+                    />
+                  )
                 )
-              )
-            })}
-            <Route path="/" element={<Navigate to="/home" replace={true} />} />
-          </Route>
-          <Route path="*" name="Page 404" element={<Page404 />} />
-        </Routes>
-      </Suspense>
+              })}
+              <Route path="/" element={<Navigate to="/home" replace={true} />} />
+            </Route>
+            <Route path="*" name="Page 404" element={<Page404 />} />
+          </Routes>
+        </Suspense>
+      </HelmetProvider>
     </BrowserRouter>
   )
 }

diff --git a/src/components/contentcards/CippButtonCard.jsx b/src/components/contentcards/CippButtonCard.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { CCard, CCardBody, CCardFooter, CCardHeader, CCardTitle } from '@coreui/react'
 import Skeleton from 'react-loading-skeleton'
+import PropTypes from 'prop-types'
 
 export default function CippButtonCard({
   title,
@@ -25,3 +25,11 @@ export default function CippButtonCard({
     </CCard>
   )
 }
+
+CippButtonCard.propTypes = {
+  title: PropTypes.string.isRequired,
+  titleType: PropTypes.string,
+  CardButton: PropTypes.element.isRequired,
+  children: PropTypes.element.isRequired,
+  isFetching: PropTypes.bool.isRequired,
+}
diff --git a/src/components/contentcards/CippChartCard.jsx b/src/components/contentcards/CippChartCard.jsx
@@ -0,0 +1,61 @@
+import React from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { CCard, CCardBody, CCardFooter, CCardHeader, CCardTitle } from '@coreui/react'
+import Skeleton from 'react-loading-skeleton'
+import { CChart } from '@coreui/react-chartjs'
+import { getStyle } from '@coreui/utils'
+
+export default function CippChartCard({
+  title,
+  titleType = 'normal',
+  ChartData,
+  ChartLabels,
+  ChartType = 'pie',
+  LegendLocation = 'bottom',
+  isFetching,
+}) {
+  return (
+    <CCard className="h-100 mb-3">
+      <CCardHeader>
+        <CCardTitle>
+          {titleType === 'big' ? <h3 className="underline mb-3">{title}</h3> : title}
+        </CCardTitle>
+      </CCardHeader>
+      <CCardBody>
+        {isFetching && <Skeleton />}
+        {!isFetching && (
+          <CChart
+            type={ChartType}
+            data={{
+              labels: ChartLabels,
+              datasets: [
+                {
+                  backgroundColor: [
+                    getStyle('--cyberdrain-warning'),
+                    getStyle('--cyberdrain-info'),
+                    getStyle('--cyberdrain-success'),
+                    getStyle('--cyberdrain-danger'),
+                    getStyle('--cyberdrain-primary'),
+                    getStyle('--cyberdrain-secondary'),
+                  ],
+                  data: ChartData,
+                  borderWidth: 3,
+                },
+              ],
+            }}
+            options={{
+              plugins: {
+                legend: {
+                  position: LegendLocation,
+                  labels: {
+                    color: getStyle('--cui-body-color'),
+                  },
+                },
+              },
+            }}
+          />
+        )}
+      </CCardBody>
+    </CCard>
+  )
+}
diff --git a/src/components/contentcards/CippPrettyCard.jsx b/src/components/contentcards/CippPrettyCard.jsx
@@ -0,0 +1,46 @@
+import React from 'react'
+import { CCard, CCardBody, CCardFooter, CCardHeader, CCardTitle, CCol, CRow } from '@coreui/react'
+import Skeleton from 'react-loading-skeleton'
+import { CircularProgressbar } from 'react-circular-progressbar'
+import 'react-circular-progressbar/dist/styles.css'
+
+export default function CippPrettyCard({
+  title,
+  titleType = 'normal',
+  percentage,
+  topLabel,
+  smallLabel,
+  ringcolor = '#f89226',
+  isFetching,
+}) {
+  return (
+    <CCard className="h-100 mb-3">
+      <CCardHeader>
+        <CCardTitle>
+          {titleType === 'big' ? <h3 className="underline mb-3">{title}</h3> : title}
+        </CCardTitle>
+      </CCardHeader>
+      <CCardBody>
+        {isFetching && <Skeleton />}
+        {!isFetching && (
+          <CRow>
+            <CCol>
+              <div style={{ width: '50%', height: '50%' }}>
+                <CircularProgressbar
+                  styles={{ path: { stroke: ringcolor }, text: { fill: ringcolor } }}
+                  strokeWidth={3}
+                  value={percentage}
+                  text={`${percentage}%`}
+                />
+              </div>
+            </CCol>
+            <CCol className="m-2">
+              <h4>{topLabel}</h4>
+              <small className="text-medium-emphasis">{smallLabel}</small>
+            </CCol>
+          </CRow>
+        )}
+      </CCardBody>
+    </CCard>
+  )
+}
diff --git a/src/components/tables/CellTable.jsx b/src/components/tables/CellTable.jsx
@@ -20,20 +20,24 @@ export default function cellTable(
     columnProp = column
   }
 
-  if (!Array.isArray(columnProp) && typeof columnProp === 'object') {
-    columnProp = Object.keys(columnProp).map((key) => {
-      return {
-        Key: key,
-        Value: columnProp[key],
-      }
-    })
+  if (columnProp === undefined || columnProp === null) {
+    columnProp = []
   } else {
-    if (Array.isArray(columnProp) && typeof columnProp[0] !== 'object') {
-      columnProp = columnProp.map((row) => {
+    if (!Array.isArray(columnProp) && typeof columnProp === 'object') {
+      columnProp = Object.keys(columnProp).map((key) => {
         return {
-          Value: row,
+          Key: key,
+          Value: columnProp[key],
         }
       })
+    } else {
+      if (Array.isArray(columnProp) && typeof columnProp[0] !== 'object') {
+        columnProp = columnProp.map((row) => {
+          return {
+            Value: row,
+          }
+        })
+      }
     }
   }
 

diff --git a/src/components/utilities/CippCopyToClipboard.jsx b/src/components/utilities/CippCopyToClipboard.jsx
@@ -14,7 +14,7 @@ function CippCopyToClipboard({ text }) {
     <CopyToClipboard text={text} onCopy={() => onCodeCopied()}>
       <CButton
         color={codeCopied ? 'success' : 'info'}
-        className="cipp-code-copy-button"
+        className="cipp-code-copy-button ms-1"
         size="sm"
         variant="ghost"
       >

diff --git a/src/hooks/useNavFavouriteCheck.jsx b/src/hooks/useNavFavouriteCheck.jsx
@@ -28,7 +28,7 @@ export const useNavFavouriteCheck = (navigation) => {
     var items = []
 
     recentPages.map((path) => {
-      const item = routes.find((route) => route.path === path)
+      const item = routes.find((route) => route.path.toLowerCase() === path.toLowerCase())
       if (item?.path) {
         items.push({
           name: item.name,