Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] dev from KelvinTegelaar:dev #170

Merged
merged 4 commits into from
May 2, 2024
Merged

[pull] dev from KelvinTegelaar:dev #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
361dedd
Merge pull request #2391 from JohnDuprey/dev
JohnDuprey May 1, 2024
17a4b8a
Merge pull request #2392 from JohnDuprey/dev
JohnDuprey May 1, 2024
cdc867d
add pretty card, fix dashboord calc
KelvinTegelaar May 2, 2024
d8662fa
secure score pimpin'
KelvinTegelaar May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/components/contentcards/CippPrettyCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ export default function CippPrettyCard({
{!isFetching && (
<CRow>
<CCol>
<CircularProgressbar
styles={{ width: '50%', path: { stroke: ringcolor }, text: { fill: ringcolor } }}
strokeWidth={3}
value={percentage}
text={`${percentage}%`}
/>
<div style={{ width: '50%', height: '50%' }}>
<CircularProgressbar
styles={{ path: { stroke: ringcolor }, text: { fill: ringcolor } }}
strokeWidth={3}
value={percentage}
text={`${percentage}%`}
/>
</div>
</CCol>
<CCol className="my-5">
<CCol className="m-2">
<h4>{topLabel}</h4>
<small className="text-medium-emphasis">{smallLabel}</small>
</CCol>
Expand Down
10 changes: 8 additions & 2 deletions src/views/home/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,14 +422,20 @@ const TenantDashboard = () => {
<CChart
type="pie"
data={{
labels: ['Used', 'Free'],
labels: [
`Used (${sharepoint.GeoUsedStorageMB}MB)`,
`Free (${sharepoint.TenantStorageMB - sharepoint.GeoUsedStorageMB}MB)`,
],
datasets: [
{
backgroundColor: [
getStyle('--cyberdrain-warning'),
getStyle('--cyberdrain-info'),
],
data: [sharepoint.GeoUsedStorageMB, sharepoint.TenantStorageMB],
data: [
sharepoint.GeoUsedStorageMB,
sharepoint.TenantStorageMB - sharepoint.GeoUsedStorageMB,
],
borderWidth: 3,
},
],
Expand Down
123 changes: 40 additions & 83 deletions src/views/tenant/administration/SecureScore.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { useNavigate } from 'react-router-dom'
import { ModalService } from 'src/components/utilities'
import { CellTip, cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
import { CippCallout } from 'src/components/layout'
import CippPrettyCard from 'src/components/contentcards/CippPrettyCard'

const SecureScore = () => {
const textRef = useRef()
Expand Down Expand Up @@ -220,93 +221,49 @@ const SecureScore = () => {
</CCard>
</CCol>
<CCol xs={3} className="mb-3">
<CCard className="content-card h-100">
<CCardHeader className="d-flex justify-content-between align-items-center">
<CCardTitle>Current Score</CCardTitle>
</CCardHeader>
<CCardBody>
<CCardText>
{isFetching && <Skeleton />}
{translateState && (
<>
<h3>
{Math.round(
(translateData?.currentScore / translateData?.maxScore) * 100 * 10,
) / 10}
%
</h3>
<small className="text-medium-emphasis">
{translateData?.currentScore} of {translateData?.maxScore} points
</small>
</>
)}
</CCardText>
</CCardBody>
</CCard>
<CippPrettyCard
title="Current Score"
percentage={
Math.round((translateData?.currentScore / translateData?.maxScore) * 100 * 10) / 10
}
topLabel={translateData?.currentScore}
smallLabel={`of ${translateData?.maxScore} points`}
isFetching={isFetching}
/>
</CCol>
<CCol xs={3} className="mb-3">
<CCard className="content-card h-100">
<CCardHeader className="d-flex justify-content-between align-items-center">
<CCardTitle>Compared Score (Similiar sized business)</CCardTitle>
</CCardHeader>
<CCardBody>
<CCardText>
{isFetching && <Skeleton />}
{translateState && (
<>
<h3>
{
//calculate percentage, round to 1 dec.
Math.round(
(translateData?.averageComparativeScores[1]?.averageScore /
translateData?.maxScore) *
100 *
10,
) / 10
}
%
</h3>
<small className="text-medium-emphasis">
{translateData?.averageComparativeScores[1]?.averageScore} of{' '}
{translateData?.maxScore} points
</small>
</>
)}
</CCardText>
</CCardBody>
</CCard>
<CippPrettyCard
title="Compared Score (Similiar sized business)"
percentage={
//calculate percentage, round to 1 dec.
Math.round(
(translateData?.averageComparativeScores[1]?.averageScore /
translateData?.maxScore) *
100 *
10,
) / 10
}
topLabel={translateData?.averageComparativeScores[1]?.averageScore}
smallLabel={`of ${translateData?.maxScore} points`}
isFetching={isFetching}
/>
</CCol>
<CCol xs={3} className="mb-3">
<CCard className="content-card h-100">
<CCardHeader className="d-flex justify-content-between align-items-center">
<CCardTitle>Compared Score (All businesses)</CCardTitle>
</CCardHeader>
<CCardBody>
<CCardText>
{isFetching && <Skeleton />}
{translateState && (
<>
<h3>
{
//calculate percentage, round to 1 dec.
Math.round(
(translateData?.averageComparativeScores[0]?.averageScore /
translateData?.maxScore) *
100 *
10,
) / 10
}
%
</h3>
<small className="text-medium-emphasis">
{translateData?.averageComparativeScores[0]?.averageScore} of{' '}
{translateData?.maxScore} points
</small>
</>
)}
</CCardText>
</CCardBody>
</CCard>
<CippPrettyCard
title="Compared Score (Similiar sized business)"
percentage={
//calculate percentage, round to 1 dec.
Math.round(
(translateData?.averageComparativeScores[0]?.averageScore /
translateData?.maxScore) *
100 *
10,
) / 10
}
topLabel={translateData?.averageComparativeScores[0]?.averageScore}
smallLabel={`of ${translateData?.maxScore} points`}
isFetching={isFetching}
/>
</CCol>
</CRow>
<CippPage title="Report Results" tenantSelector={false}>
Expand Down