Merge branch 'KelvinTegelaar:main' into main

public/version_latest.txt

@@ -1 +1 @@
-4.9.1
+5.0.1

src/_nav.jsx

@@ -239,6 +239,11 @@ const _nav = [
         name: 'Deploy CA Policies',
         to: '/tenant/conditional/deploy',
       },
+      {
+        component: CNavItem,
+        name: 'CA Vacation Mode',
+        to: '/tenant/conditional/deploy-vacation',
+      },
       {
         component: CNavItem,
         name: 'CA Templates',

src/components/forms/RFFComponents.jsx

@@ -137,10 +137,17 @@ export const RFFCFormInput = ({
   disabled = false,
   spellCheck = true,
   autoFocus = false,
+  onChange,
 }) => {
   return (
     <Field name={name} validate={validate}>
       {({ input, meta }) => {
+        const handleChange = onChange
+          ? (e) => {
+              input.onChange(e)
+              onChange(e)
+            }
+          : input.onChange
         return (
           <div className={className}>
             {label && <CFormLabel htmlFor={name}>{label}</CFormLabel>}
@@ -155,6 +162,7 @@ export const RFFCFormInput = ({
               placeholder={placeholder}
               spellCheck={spellCheck}
               autoFocus={autoFocus}
+              onChange={handleChange}
             />
             <RFFCFormFeedback meta={meta} />
           </div>

src/components/layout/AppHeader.jsx

@@ -16,17 +16,8 @@ import {
 } from '@coreui/react'
 import { AppHeaderSearch } from 'src/components/header'
 import { TenantSelector } from '../utilities'
-import cyberdrainlogolight from 'src/assets/images/CIPP.png'
-import cyberdrainlogodark from 'src/assets/images/CIPP_Dark.png'
-
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {
-  faBars,
-  faCaretSquareLeft,
-  faCaretSquareRight,
-  faHamburger,
-  faStroopwafel,
-} from '@fortawesome/free-solid-svg-icons'
+import { faBars } from '@fortawesome/free-solid-svg-icons'
 import { setCurrentTheme, setUserSettings, toggleSidebarShow } from 'src/store/features/app'
 import { useMediaPredicate } from 'react-media-hook'
 import { useGenericGetRequestQuery, useLoadAlertsDashQuery } from 'src/store/api/app'

src/components/tables/CellMathFormatter.jsx

@@ -0,0 +1,59 @@
+import React from 'react'
+import { CBadge, CTooltip } from '@coreui/react'
+import CellBoolean from 'src/components/tables/CellBoolean.jsx'
+import cellTable from './CellTable'
+
+export function CellTip(cell, overflow = false) {
+  return (
+    <CTooltip content={String(cell)}>
+      <div className="celltip-content-nowrap">{String(cell)}</div>
+    </CTooltip>
+  )
+}
+export const cellMathFormatter =
+  ({ col } = {}) =>
+  (row) => {
+    const evaluateCalculation = (calculation, row) => {
+      try {
+        const formattedCalculation = calculation.replace(/\b\w+(\.\w+|\[\d+\])*\b/g, (key) => {
+          if (!isNaN(key)) {
+            return parseFloat(key)
+          }
+
+          const path = key.split(/\.|\[(\d+)\]/).filter(Boolean) // Splits keys and array indices
+          let currentObject = row
+          for (const prop of path) {
+            if (currentObject && prop in currentObject) {
+              currentObject = currentObject[prop]
+            } else if (!isNaN(prop)) {
+              // Checks if the prop is an array index
+              currentObject = currentObject[parseInt(prop, 10)]
+            } else {
+              throw new Error(`Property '${prop}' not found in row`)
+            }
+          }
+
+          return parseFloat(currentObject)
+        })
+
+        return Number(eval(formattedCalculation))
+      } catch (e) {
+        console.error(e)
+        return null
+      }
+    }
+
+    const result = evaluateCalculation(col.value, row)
+
+    if (result === null) {
+      return 'N/A'
+    }
+
+    if (col.showAs === 'percentage') {
+      return `${result.toFixed(2)}%`
+    } else {
+      return result.toFixed(2)
+    }
+  }
+
+export default cellMathFormatter

src/components/utilities/CippActionsOffcanvas.jsx

@@ -38,6 +38,34 @@ export default function CippActionsOffcanvas(props) {
   }
   const handleModal = useCallback(
     (modalMessage, modalUrl, modalType = 'GET', modalBody, modalInput, modalDropdown) => {
+      const handlePostConfirm = () => {
+        const selectedValue = inputRef.current.value
+        console.log(inputRef)
+        let additionalFields = {}
+
+        if (inputRef.current.nodeName === 'SELECT') {
+          const selectedItem = dropDownInfo.data.find(
+            (item) => item[modalDropdown.valueField] === selectedValue,
+          )
+          if (selectedItem && modalDropdown.addedField) {
+            Object.keys(modalDropdown.addedField).forEach((key) => {
+              additionalFields[key] = selectedItem[modalDropdown.addedField[key]]
+            })
+          }
+        }
+        const postRequestBody = {
+          ...modalBody,
+          ...additionalFields,
+          input: selectedValue,
+        }
+        // Send the POST request
+        genericPostRequest({
+          path: modalUrl,
+          values: postRequestBody,
+        })
+      }
+
+      // Modal setup for GET, codeblock, and other types
       if (modalType === 'GET') {
         ModalService.confirm({
           body: (
@@ -82,12 +110,7 @@ export default function CippActionsOffcanvas(props) {
             </div>
           ),
           title: 'Confirm',
-          onConfirm: () => [
-            genericPostRequest({
-              path: modalUrl,
-              values: { ...modalBody, ...{ input: inputRef.current.value } },
-            }),
-          ],
+          onConfirm: handlePostConfirm,
         })
       }
     },
@@ -99,7 +122,6 @@ export default function CippActionsOffcanvas(props) {
       modalContent,
     ],
   )
-
   useEffect(() => {
     if (dropDownInfo.isFetching) {
       handleModal(

src/data/BPAField.schema.v1.json

@@ -87,6 +87,10 @@
               {
                 "const": "number",
                 "title": "Displays as a numerical value"
+              },
+              {
+                "const": "math",
+                "title": "Displays as a calculated value"
               }
             ]
           }