-
{label}
+
+ {label}
+ {refreshFunction && (
+
+
+
+
+ )}
+
{onChange && (
)}
{!onChange && (
@@ -444,6 +467,7 @@ export const RFFSelectSearch = ({
isMulti={multi}
inputValue={inputText}
isLoading={isLoading}
+ {...props}
/>
)}
{meta.error && meta.touched &&
{meta.error} }
@@ -460,6 +484,7 @@ RFFSelectSearch.propTypes = {
placeholder: PropTypes.string,
onInputChange: PropTypes.func,
isLoading: PropTypes.bool,
+ refreshFunction: PropTypes.func,
values: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.string, name: PropTypes.string }))
.isRequired,
}
diff --git a/src/components/layout/AppFooter.jsx b/src/components/layout/AppFooter.jsx
index 1830b0201999..2c27efe8efd3 100644
--- a/src/components/layout/AppFooter.jsx
+++ b/src/components/layout/AppFooter.jsx
@@ -1,32 +1,40 @@
import React from 'react'
import { CFooter, CImage, CLink } from '@coreui/react'
import { Link } from 'react-router-dom'
-import huntressLogo from 'src/assets/images/huntress_teal.png'
-import dattoLogo from 'src/assets/images/datto.png'
-import rewstLogo from 'src/assets/images/rewst.png'
-import netfriends from 'src/assets/images/netfriends.png'
-import ninjaLogo from 'src/assets/images/ninjaone.png'
-//todo: Add darkmode detection and change logos accordingly.
+import { useSelector } from 'react-redux'
+import { useMediaPredicate } from 'react-media-hook'
+
const AppFooter = () => {
+ const currentTheme = useSelector((state) => state.app.currentTheme)
+ const preferredTheme = useMediaPredicate('(prefers-color-scheme: dark)') ? 'impact' : 'cyberdrain'
+ const isDark =
+ currentTheme === 'impact' || (currentTheme === 'default' && preferredTheme === 'impact')
+
+ const netfriends = isDark ? '/img/netfriends_dark.png' : '/img/netfriends.png'
+ const datto = isDark ? '/img/datto.png' : '/img/datto.png'
+ const huntress = isDark ? '/img/huntress_teal.png' : '/img/huntress_teal.png'
+ const rewst = isDark ? '/img/rewst_dark.png' : '/img/rewst.png'
+ const ninjaone = isDark ? '/img/ninjaone_dark.png' : '/img/ninjaone.png'
+
return (
- This application is sponsored by{' '}
-
- {' '}
-
- {' '}
-
- {' '}
-
+ This application is sponsored by
+
+
+
+
+
+
+
-
-
+
diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx
index 9dcc3bd54c2c..f31d73a124e0 100644
--- a/src/components/layout/AppHeader.jsx
+++ b/src/components/layout/AppHeader.jsx
@@ -16,11 +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 { faCaretSquareLeft, faCaretSquareRight } 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'
@@ -75,29 +72,15 @@ const AppHeader = () => {
return (
<>
-
-
- dispatch(toggleSidebarShow({ sidebarShow }))}
- >
-
-
-
+
+ dispatch(toggleSidebarShow({ sidebarShow }))}
+ style={{ marginInlineStart: '-50x' }}
+ >
+
+
@@ -140,24 +123,17 @@ const AppHeader = () => {
-
- {dashboard &&
- dashboard.length >= 1 &&
- dashboard.map((item, index) => (
-
-
- {item.Alert} Link
-
-
- ))}
+
+ {dashboard &&
+ dashboard.length >= 1 &&
+ dashboard.map((item, index) => (
+
+
+ {item.Alert} Link
+
+
+ ))}
+
{
- dispatch(setSidebarVisible({ visible }))
+ dispatch({ type: 'set', sidebarShow: visible })
}}
+ position="fixed"
+ unfoldable={false}
+ visible={sidebarShow}
>
+
+
+ dispatch({ type: 'set', sidebarShow: false })}
+ />
Submit
diff --git a/src/components/tables/CellGenericFormat.jsx b/src/components/tables/CellGenericFormat.jsx
index 7bb0236d0030..465a7dd25f37 100644
--- a/src/components/tables/CellGenericFormat.jsx
+++ b/src/components/tables/CellGenericFormat.jsx
@@ -7,6 +7,7 @@ import {
} from '@fortawesome/free-solid-svg-icons'
import { CBadge, CTooltip } from '@coreui/react'
import CellBoolean from 'src/components/tables/CellBoolean.jsx'
+import cellTable from './CellTable'
const IconWarning = () => {CellTip('Failed to retrieve from API')}
}
if (cell.toLowerCase().startsWith('http')) {
- return URL
+ return (
+
+ URL
+
+ )
}
return CellTip(cell)
}
@@ -52,6 +57,7 @@ export const cellGenericFormatter =
return {CellTip(cell)}
}
if (Array.isArray(cell) || typeof cell === 'object') {
- return CellTip(JSON.stringify(cell))
+ //return CellTip(JSON.stringify(cell))
+ return cellTable(row, cell)
}
}
diff --git a/src/components/tables/CellMathFormatter.jsx b/src/components/tables/CellMathFormatter.jsx
new file mode 100644
index 000000000000..590d180d8641
--- /dev/null
+++ b/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 (
+
+ {String(cell)}
+
+ )
+}
+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
diff --git a/src/components/tables/CellTable.jsx b/src/components/tables/CellTable.jsx
index c9a13391bebe..6da1d1339b93 100644
--- a/src/components/tables/CellTable.jsx
+++ b/src/components/tables/CellTable.jsx
@@ -2,7 +2,7 @@ import React from 'react'
import { CButton } from '@coreui/react'
import { ModalService } from '../utilities'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faCheckCircle, faTimesCircle } from '@fortawesome/free-solid-svg-icons' // 1. Import the required FontAwesome icon
+import { faCheckCircle, faTimesCircle } from '@fortawesome/free-solid-svg-icons'
import { cellGenericFormatter } from './CellGenericFormat'
export default function cellTable(
@@ -11,10 +11,31 @@ export default function cellTable(
propertyName,
checkWhenZero = false,
crossWhenZero = false,
+ dangerButton = false, // Added 4th parameter for btn-danger class
) {
- const handleTable = ({ row }) => {
+ var columnProp = ''
+ if (propertyName) {
+ columnProp = row[propertyName]
+ } else {
+ columnProp = column
+ }
+
+ if (!Array.isArray(columnProp) && typeof columnProp === 'object') {
+ columnProp = Object.entries(columnProp).map((row) => {
+ return { Name: row[0], Value: row[1] }
+ })
+ } else if (Array.isArray(columnProp) && typeof Object.entries(columnProp)[0][1] !== 'object') {
+ columnProp = columnProp.map((row) => {
+ return {
+ Value: row,
+ }
+ })
+ }
+
+ const handleTable = ({ columnProp }) => {
const QueryColumns = []
- const columns = Object.keys(row[propertyName][0]).map((key) => {
+
+ const columns = Object.keys(columnProp[0]).map((key) => {
QueryColumns.push({
name: key,
selector: (row) => row[key],
@@ -23,8 +44,9 @@ export default function cellTable(
cell: cellGenericFormatter(),
})
})
+
ModalService.open({
- data: row[propertyName],
+ data: columnProp,
componentType: 'table',
componentProps: {
columns: QueryColumns,
@@ -34,16 +56,16 @@ export default function cellTable(
size: 'lg',
})
}
- //if the row propertyName is a bool, then return a check or cross
- if (typeof row[propertyName] === 'boolean') {
- if (row[propertyName]) {
+
+ if (typeof columnProp === 'boolean') {
+ if (columnProp) {
return handleTable({ row })}>
- {row[propertyName].length} Items
+ handleTable({ columnProp })}
+ >
+ {columnProp.length} Items
)
}
export const cellTableFormatter =
- (propertyName, checkWhenZero = false, crossWhenZero = false) =>
+ (propertyName, checkWhenZero = false, crossWhenZero = false, dangerButton = false) =>
(row, index, column, id) => {
- return cellTable(row, column, propertyName, checkWhenZero, crossWhenZero)
+ return cellTable(row, column, propertyName, checkWhenZero, crossWhenZero, dangerButton)
}
diff --git a/src/components/tables/CippOffcanvasTable.jsx b/src/components/tables/CippOffcanvasTable.jsx
index fe2f7e0e1c7c..b990c28366cb 100644
--- a/src/components/tables/CippOffcanvasTable.jsx
+++ b/src/components/tables/CippOffcanvasTable.jsx
@@ -10,7 +10,7 @@ export default function CippOffcanvasTable({ rows }) {
))
return (
-
+
{tableRows}
)
diff --git a/src/components/tables/WizardTableField.jsx b/src/components/tables/WizardTableField.jsx
index 3e61e1e4d1a8..bb6ba35a9da1 100644
--- a/src/components/tables/WizardTableField.jsx
+++ b/src/components/tables/WizardTableField.jsx
@@ -13,6 +13,7 @@ export default class WizardTableField extends React.Component {
reportName: PropTypes.string.isRequired,
keyField: PropTypes.string.isRequired,
path: PropTypes.string.isRequired,
+ params: PropTypes.object,
columns: PropTypes.array.isRequired,
fieldProps: PropTypes.object,
}
@@ -56,7 +57,7 @@ export default class WizardTableField extends React.Component {
}
render() {
- const { reportName, keyField, columns, path } = this.props
+ const { reportName, keyField, columns, path, params, ...props } = this.props
return (