From c348b7ce7a062ebfda1797f4fad7c51343278c99 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 14 Mar 2024 18:33:25 -0400 Subject: [PATCH 1/4] fix button --- src/components/layout/AppHeader.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx index e3fd84295859..2f203a5cb7ad 100644 --- a/src/components/layout/AppHeader.jsx +++ b/src/components/layout/AppHeader.jsx @@ -151,8 +151,8 @@ const AppHeader = () => { - loadCippQueue()}> - + loadCippQueue()} className="me-1"> + From b511e620d5684802672b6605255f58e94f6bb572 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 14 Mar 2024 18:35:53 -0400 Subject: [PATCH 2/4] cleanup imports --- src/components/layout/AppHeader.jsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx index 2f203a5cb7ad..09535ae9bd12 100644 --- a/src/components/layout/AppHeader.jsx +++ b/src/components/layout/AppHeader.jsx @@ -3,17 +3,12 @@ import { useSelector, useDispatch } from 'react-redux' import { CAlert, CAlertLink, - CContainer, - CCollapse, CHeader, CHeaderNav, CNavItem, CHeaderToggler, - CImage, - CSidebarBrand, CButton, CFormSwitch, - CLink, } from '@coreui/react' import { AppHeaderSearch } from 'src/components/header' import { CippActionsOffcanvas, TenantSelector } from '../utilities' From f53a3487185ee91e741a94795305c765a62a2d99 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 14 Mar 2024 18:38:37 -0400 Subject: [PATCH 3/4] Pretty MEM policy list json --- src/views/endpoint/intune/MEMListPolicies.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/endpoint/intune/MEMListPolicies.jsx b/src/views/endpoint/intune/MEMListPolicies.jsx index c07216317afc..980d68010132 100644 --- a/src/views/endpoint/intune/MEMListPolicies.jsx +++ b/src/views/endpoint/intune/MEMListPolicies.jsx @@ -13,7 +13,7 @@ import { import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { CippPageList } from 'src/components/layout' import { Link } from 'react-router-dom' -import { CippActionsOffcanvas } from 'src/components/utilities' +import { CippActionsOffcanvas, CippCodeBlock } from 'src/components/utilities' import { TitleButton } from 'src/components/buttons' const Actions = (row, rowIndex, formatExtraData) => { @@ -116,7 +116,7 @@ const IntuneList = () => { // eslint-disable-next-line react/prop-types const ExpandedComponent = ({ data }) => ( // eslint-disable-next-line react/prop-types -
{JSON.stringify(data, null, 2)}
+ ) return ( From 377a6628b1b93b27cffa4d38956fbee1bf4b88a5 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 14 Mar 2024 19:28:20 -0400 Subject: [PATCH 4/4] Add tooltips --- src/components/header/AppHeaderSearch.jsx | 10 ++++++---- src/components/layout/AppHeader.jsx | 17 +++++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/components/header/AppHeaderSearch.jsx b/src/components/header/AppHeaderSearch.jsx index 6b4ab4b50d9a..20f917470d10 100644 --- a/src/components/header/AppHeaderSearch.jsx +++ b/src/components/header/AppHeaderSearch.jsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react' import { faSearch } from '@fortawesome/free-solid-svg-icons' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { toggleSwitcher } from 'src/store/features/switcher' -import { CButton } from '@coreui/react' +import { CButton, CTooltip } from '@coreui/react' import { useDispatch } from 'react-redux' const AppHeaderSearch = () => { @@ -12,9 +12,11 @@ const AppHeaderSearch = () => { }, [dispatch]) return ( <> - - - + + + + + ) } diff --git a/src/components/layout/AppHeader.jsx b/src/components/layout/AppHeader.jsx index 09535ae9bd12..43ec9c476d35 100644 --- a/src/components/layout/AppHeader.jsx +++ b/src/components/layout/AppHeader.jsx @@ -9,6 +9,7 @@ import { CHeaderToggler, CButton, CFormSwitch, + CTooltip, } from '@coreui/react' import { AppHeaderSearch } from 'src/components/header' import { CippActionsOffcanvas, TenantSelector } from '../utilities' @@ -137,18 +138,22 @@ const AppHeader = () => { target="_blank" href={`https://docs.cipp.app/user-documentation${location.pathname}`} > - - - + + + + +
- loadCippQueue()} className="me-1"> - - + + loadCippQueue()} className="me-1"> + + +