From ca5660173a933a1a7952e605fa24a197660ee539 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 22 Oct 2024 17:14:12 -0400 Subject: [PATCH 1/2] cipp backup interface --- .../CippSettings/CippBackupSettings.jsx | 8 +- src/pages/cipp/settings/backup.js | 261 ++++++++++++++++++ src/utils/get-cipp-formatting.js | 8 +- 3 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 src/pages/cipp/settings/backup.js diff --git a/src/components/CippSettings/CippBackupSettings.jsx b/src/components/CippSettings/CippBackupSettings.jsx index ebf6620b458a..04db2aabfc9e 100644 --- a/src/components/CippSettings/CippBackupSettings.jsx +++ b/src/components/CippSettings/CippBackupSettings.jsx @@ -3,6 +3,7 @@ import CippButtonCard from "/src/components/CippCards/CippButtonCard"; import { ApiPostCall } from "/src/api/ApiCall"; import { useDialog } from "/src/hooks/use-dialog"; import { SettingsBackupRestore } from "@mui/icons-material"; +import Link from "next/link"; const CippBackupSettings = () => { const createDialog = useDialog(); @@ -16,12 +17,9 @@ const CippBackupSettings = () => { + + {scheduledBackup.isSuccess && + scheduledBackup.data?.[0]?.Name !== "Automated CIPP Backup" && ( + <> + + + )} + + + } + /> + + ) : ( + + + + + + + )} + + + + ); +}; + +Page.getLayout = (page) => {page}; + +export default Page; diff --git a/src/utils/get-cipp-formatting.js b/src/utils/get-cipp-formatting.js index ed6964ade59c..beb510e35804 100644 --- a/src/utils/get-cipp-formatting.js +++ b/src/utils/get-cipp-formatting.js @@ -22,11 +22,11 @@ export const getCippFormatting = (data, cellName, type) => { ); } - const timeAgoArray = ["ExecutedTime", "ScheduledTime"]; + const timeAgoArray = ["ExecutedTime", "ScheduledTime", "Timestamp"]; if (timeAgoArray.includes(cellName)) { - //convert data from unixtime to date. If conversion fails, return "No Data". - const date = new Date(data * 1000); - if (isNaN(date)) { + // Convert data from Unix time to date. If conversion fails, return "No Data". + const date = typeof data === "number" ? new Date(data * 1000) : new Date(data); + if (isNaN(date.getTime())) { return isText ? ( "No Data" ) : ( From 8f96c36ff87e5c5c2b86603fc61508114989247f Mon Sep 17 00:00:00 2001 From: John Duprey Date: Tue, 22 Oct 2024 17:29:04 -0400 Subject: [PATCH 2/2] Update CippBackupSettings.jsx --- src/components/CippSettings/CippBackupSettings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/CippSettings/CippBackupSettings.jsx b/src/components/CippSettings/CippBackupSettings.jsx index 04db2aabfc9e..d45bf6385a85 100644 --- a/src/components/CippSettings/CippBackupSettings.jsx +++ b/src/components/CippSettings/CippBackupSettings.jsx @@ -34,9 +34,9 @@ const CippBackupSettings = () => { <> }> - Use this button to backup the system configuration for CIPP. This will not include - authentication information or extension configuration. You can also set an automated daily - backup schedule by clicking the button below. This will create a scheduled task for you.s + Manage the system configuration backups for CIPP. This will not include authentication + information or extension configuration. You can also set an automated daily backup + schedule.