[pull] main from KelvinTegelaar:main

.gitignore

@@ -27,4 +27,8 @@ yarn-error.log*
 
 # vscode debug logs
 debug.log
-app.log
+app.log
+
+# Cursor IDE
+.cursor/rules
+

cspell.json

@@ -1,65 +1,78 @@
 {
-    "version": "0.2",
-    "ignorePaths": [],
-    "dictionaryDefinitions": [],
-    "dictionaries": [],
-    "words": [
-        "ADMS",
-        "AITM",
-        "Augmentt",
-        "Autotask",
-        "Choco",
-        "CIPP",
-        "CIPP-API",
-        "Datto",
-        "Entra",
-        "ESET",
-        "GDAP",
-        "HIBP",
-        "Hudu",
-        "ImmyBot",
-        "Intune",
-        "LCID",
-        "OBEE",
-        "Passwordless",
-        "pwpush",
-        "Rewst",
-        "Sherweb",
-        "Syncro",
-        "TERRL",
-        "Yubikey"
-    ],
-    "ignoreWords": [
-        "Addins",
-        "CIPPAPI",
-        "PSTN",
-        "TNEF",
-        "exo_individualsharing",
-        "exo_mailboxaudit",
-        "exo_mailtipsenabled",
-        "exo_outlookaddins",
-        "exo_storageproviderrestricted",
-        "locationcipp",
-        "mdo_antiphishingpolicies",
-        "mdo_autoforwardingmode",
-        "mdo_blockmailforward",
-        "mdo_commonattachmentsfilter",
-        "mdo_highconfidencephishaction",
-        "mdo_highconfidencespamaction",
-        "mdo_phishthresholdlevel",
-        "mdo_phisspamacation",
-        "mdo_safeattachmentpolicy",
-        "mdo_safeattachments",
-        "mdo_safedocuments",
-        "mdo_safelinksforOfficeApps",
-        "mdo_safelinksforemail",
-        "mdo_spam_notifications_only_for_admins",
-        "mdo_zapmalware",
-        "mdo_zapphish",
-        "mdo_zapspam",
-        "microsoftonline",
-        "mip_search_auditlog",
-        "winmail"
-    ],
-    "import": []
+  "version": "0.2",
+  "ignorePaths": [],
+  "dictionaryDefinitions": [],
+  "dictionaries": [],
+  "words": [
+    "ADMS",
+    "AITM",
+    "Augmentt",
+    "Automapping",
+    "Autotask",
+    "Choco",
+    "cipp",
+    "CIPP",
+    "CIPP-API",
+    "Datto",
+    "Entra",
+    "ESET",
+    "GDAP",
+    "HIBP",
+    "Hudu",
+    "ImmyBot",
+    "Intune",
+    "LCID",
+    "OBEE",
+    "passwordless",
+    "Passwordless",
+    "pwpush",
+    "Reshare",
+    "Rewst",
+    "Sherweb",
+    "Syncro",
+    "TERRL",
+    "Yubikey",
+    "DMARC"
+  ],
+  "ignoreWords": [
+    "Addins",
+    "Disablex",
+    "Displayname",
+    "CIPPAPI",
+    "PSTN",
+    "TNEF",
+    "Equivio",
+    "defaultvalues",
+    "Excludedfile",
+    "exo_individualsharing",
+    "exo_mailboxaudit",
+    "exo_mailtipsenabled",
+    "exo_outlookaddins",
+    "exo_storageproviderrestricted",
+    "donotchange",
+    "locationcipp",
+    "mdo_antiphishingpolicies",
+    "mdo_autoforwardingmode",
+    "mdo_blockmailforward",
+    "mdo_commonattachmentsfilter",
+    "mdo_highconfidencephishaction",
+    "mdo_highconfidencespamaction",
+    "mdo_phishthresholdlevel",
+    "mdo_phisspamacation",
+    "mdo_safeattachmentpolicy",
+    "mdo_safeattachments",
+    "mdo_safedocuments",
+    "mdo_safelinksforOfficeApps",
+    "mdo_safelinksforemail",
+    "mdo_spam_notifications_only_for_admins",
+    "mdo_zapmalware",
+    "mdo_zapphish",
+    "mdo_zapspam",
+    "microsoftonline",
+    "mip_search_auditlog",
+    "winmail",
+    "onmicrosoft.com",
+    "MOERA"
+  ],
+  "import": []
 }

generate-placeholders.js

@@ -70,6 +70,8 @@ const pages = [
   { title: "Defender Deployment", path: "/security/defender/deployment" },
   { title: "Vulnerabilities", path: "/security/defender/list-defender-tvm" },
   { title: "Device Compliance", path: "/security/reports/list-device-compliance" },
+  { title: "Safe Links", path: "/security/safelinks/safelinks" },
+  { title: "Safe Links Templates", path: "/security/safelinks/safelinks-template" },
   { title: "Applications", path: "/endpoint/applications/list" },
   { title: "Application Queue", path: "/endpoint/applications/queue" },
   { title: "Add Choco App", path: "/endpoint/applications/add-choco-app" },
@@ -99,6 +101,7 @@ const pages = [
   { title: "Deleted Mailboxes", path: "/email/administration/deleted-mailboxes" },
   { title: "Mailbox Rules", path: "/email/administration/mailbox-rules" },
   { title: "Contacts", path: "/email/administration/contacts" },
+  { title: "Contact Templates", path: "/email/administration/contacts-template" },
   { title: "Quarantine", path: "/email/administration/quarantine" },
   { title: "Tenant Allow/Block Lists", path: "/email/administration/tenant-allow-block-lists" },
   { title: "Mailbox Restore Wizard", path: "/email/tools/mailbox-restore-wizard" },
@@ -121,7 +124,6 @@ const pages = [
   { title: "Message Trace", path: "/email/reports/message-trace" },
   { title: "Anti-Phishing Filters", path: "/email/reports/antiphishing-filters" },
   { title: "Malware Filters", path: "/email/reports/malware-filters" },
-  { title: "Safe Links Filters", path: "/email/reports/safelinks-filters" },
   { title: "Safe Attachments Filters", path: "/email/reports/safeattachments-filters" },
   {
     title: "Shared Mailbox with Enabled Account",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -36,7 +36,7 @@
     "@mui/system": "6.4.7",
     "@mui/x-date-pickers": "7.27.3",
     "@musement/iso-duration": "^1.0.0",
-    "@react-pdf/renderer": "4.3.0",
+    "@react-pdf/renderer": "^4.3.0",
     "@reduxjs/toolkit": "2.6.1",
     "@tanstack/query-sync-storage-persister": "^5.76.0",
     "@tanstack/react-query": "^5.51.11",
@@ -112,4 +112,4 @@
     "eslint": "9.22.0",
     "eslint-config-next": "15.2.2"
   }
-}
+}

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "8.0.3"
-}
+  "version": "8.1.0"
+}

src/api/ApiCall.jsx

@@ -1,5 +1,4 @@
 import {
-  keepPreviousData,
   useInfiniteQuery,
   useMutation,
   useQuery,