Merge pull request #2374 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

package.json

@@ -1 +1 @@
-5.5.0
+5.6.0

public/version_latest.txt

@@ -55,8 +55,8 @@ const App = () => {
             {routes.map((route, idx) => {
               const allowedRoles = route.allowedRoles
               const Routecomponent = dynamicImport(route.path)
-              console.log('route', route)
-              console.log('Routecomponent', Routecomponent)
+              //console.log('route', route)
+              //console.log('Routecomponent', Routecomponent)
               return (
                 route.component && (
                   <Route

src/App.jsx

@@ -142,6 +142,11 @@ const _nav = [
         name: 'Enterprise Applications',
         to: '/tenant/administration/enterprise-apps',
       },
+      {
+        component: CNavItem,
+        name: 'Secure Score',
+        to: '/tenant/administration/securescore',
+      },
       {
         component: CNavItem,
         name: 'App Consent Requests',
@@ -157,6 +162,11 @@ const _nav = [
         name: 'Tenant Offboarding',
         to: '/tenant/administration/tenant-offboarding-wizard',
       },
+      {
+        component: CNavItem,
+        name: 'Partner Relationships',
+        to: '/tenant/administration/partner-relationships',
+      },
     ],
   },
   {

src/_nav.jsx

@@ -0,0 +1,27 @@
+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'
+
+export default function CippButtonCard({
+  title,
+  titleType = 'normal',
+  CardButton,
+  children,
+  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 />}
+        {children}
+      </CCardBody>
+      <CCardFooter>{CardButton}</CCardFooter>
+    </CCard>
+  )
+}

src/components/contentcards/CippButtonCard.jsx

@@ -27,6 +27,7 @@ export default function DatatableContentCard({
           path={path}
           columns={columns}
           params={params}
+          sortable
           {...rest}
         />
       )}

src/components/contentcards/DatatableContentCard.jsx

@@ -193,7 +193,7 @@ export const RFFCFormInput = ({
 }
 RFFCFormInput.propTypes = {
   ...sharedPropTypes,
-  type: PropTypes.oneOf(['color', 'file', 'text', 'password']),
+  type: PropTypes.oneOf(['color', 'file', 'text', 'password', 'number']),
   placeholder: PropTypes.string,
 }
 
@@ -444,6 +444,12 @@ export const RFFSelectSearch = ({
   return (
     <Field name={name} validate={validate}>
       {({ meta, input }) => {
+        const handleChange = onChange
+          ? (e) => {
+              input.onChange(e)
+              onChange(e)
+            }
+          : input.onChange
         return (
           <div>
             <CFormLabel htmlFor={name}>
@@ -473,7 +479,7 @@ export const RFFSelectSearch = ({
                 options={selectSearchvalues}
                 placeholder={placeholder}
                 isMulti={multi}
-                onChange={onChange}
+                onChange={handleChange}
                 onInputChange={debounceOnInputChange}
                 inputValue={inputText}
                 isLoading={isLoading}
@@ -510,7 +516,7 @@ export const RFFSelectSearch = ({
                 options={selectSearchvalues}
                 placeholder={placeholder}
                 isMulti={multi}
-                onChange={onChange}
+                onChange={handleChange}
                 onInputChange={debounceOnInputChange}
                 inputValue={inputText}
                 isLoading={isLoading}

src/components/forms/RFFComponents.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import {
   CAlert,
@@ -72,8 +72,29 @@ const AppHeader = () => {
     loadCippQueue()
   }
 
+  function useInterval(callback, delay, state) {
+    const savedCallback = useRef()
+
+    // Remember the latest callback.
+    useEffect(() => {
+      savedCallback.current = callback
+    })
+
+    // Set up the interval.
+    useEffect(() => {
+      function tick() {
+        savedCallback.current()
+      }
+
+      if (delay !== null) {
+        let id = setInterval(tick, delay)
+        return () => clearInterval(id)
+      }
+    }, [delay, state])
+  }
+
   useEffect(() => {
-    if (cippQueueList.isFetching || cippQueueList.isLoading) {
+    if (cippQueueList.isUninitialized && (cippQueueList.isFetching || cippQueueList.isLoading)) {
       setCippQueueExtendedInfo([
         {
           label: 'Fetching recent jobs',
@@ -82,26 +103,41 @@ const AppHeader = () => {
           link: '#',
         },
       ])
-    }
-    if (
-      cippQueueList.isSuccess &&
-      Array.isArray(cippQueueList.data) &&
-      cippQueueList.data.length > 0
-    ) {
-      setCippQueueExtendedInfo(
-        cippQueueList.data?.map((job) => ({
-          label: `${job.Name}`,
-          value: job.Status,
-          link: job.Link,
-          timestamp: job.Timestamp,
-        })),
-      )
     } else {
-      setCippQueueExtendedInfo([
-        { label: 'No jobs to display', value: '', timpestamp: Date(), link: '#' },
-      ])
+      if (
+        cippQueueList.isSuccess &&
+        Array.isArray(cippQueueList.data) &&
+        cippQueueList.data.length > 0
+      ) {
+        setCippQueueExtendedInfo(
+          cippQueueList.data?.map((job) => ({
+            label: `${job.Name}`,
+            value: job.Status,
+            link: job.Link,
+            timestamp: job.Timestamp,
+            percent: job.PercentComplete,
+            progressText: `${job.PercentComplete}%`,
+            detailsObject: job.Tasks,
+          })),
+        )
+      } else {
+        setCippQueueExtendedInfo([
+          { label: 'No jobs to display', value: '', timestamp: Date(), link: '#' },
+        ])
+      }
     }
-  }, [cippQueueList])
+  }, [cippQueueList, setCippQueueExtendedInfo])
+
+  useInterval(
+    async () => {
+      if (cippQueueVisible) {
+        setCippQueueRefresh((Math.random() + 1).toString(36).substring(7))
+        getCippQueueList({ path: 'api/ListCippQueue', params: { refresh: cippQueueRefresh } })
+      }
+    },
+    5000,
+    cippQueueVisible,
+  )
 
   const SwitchTheme = () => {
     let targetTheme = preferredTheme
@@ -197,6 +233,7 @@ const AppHeader = () => {
         extendedInfo={[]}
         cards={cippQueueExtendedInfo}
         refreshFunction={refreshCippQueue}
+        isRefreshing={cippQueueList.isFetching || cippQueueList.isLoading}
         actions={[
           {
             label: 'Clear History',

src/components/layout/AppHeader.jsx

@@ -5,6 +5,7 @@ import { CCard, CCardBody, CCardHeader, CCardTitle } from '@coreui/react'
 
 export default function CippContentCard({
   title,
+  titleType = 'small',
   children,
   icon,
   button,
@@ -14,7 +15,9 @@ export default function CippContentCard({
   return (
     <CCard className={`content-card h-100 ${className ?? ''}`}>
       <CCardHeader className="d-flex justify-content-between align-items-center">
-        <CCardTitle>{title}</CCardTitle>
+        <CCardTitle>
+          {titleType === 'big' ? <h3 className="underline mb-3">{title}</h3> : title}
+        </CCardTitle>
         {icon ? <FontAwesomeIcon icon={icon} /> : null}
         {button ? button : null}
       </CCardHeader>