Merge pull request #669 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/pages/tenant/manage/applied-standards.js

@@ -58,7 +58,8 @@ const Page = () => {
   const { templateId } = router.query;
   const [comparisonData, setComparisonData] = useState(null);
   const settings = useSettings();
-  const currentTenant = settings?.currentTenant;
+  // Prioritize URL query parameter, then fall back to settings
+  const currentTenant = router.query.tenantFilter || settings?.currentTenant;
   const formControl = useForm({
     mode: "onBlur",
     defaultValues: {

src/pages/tenant/manage/configuration-backup.js

@@ -42,16 +42,18 @@ const Page = () => {
   const { templateId } = router.query;
   const settings = useSettings();
   const removeDialog = useDialog();
+  // Prioritize URL query parameter, then fall back to settings
+  const currentTenant = router.query.tenantFilter || settings.currentTenant;
 
   // API call to get backup files
   const backupList = ApiGetCall({
     url: "/api/ExecListBackup",
     data: {
-      tenantFilter: settings.currentTenant,
+      tenantFilter: currentTenant,
       Type: "Scheduled",
       NameOnly: true,
     },
-    queryKey: `BackupList-${settings.currentTenant}`,
+    queryKey: `BackupList-${currentTenant}`,
   });
 
   // API call to get existing backup configuration/schedule
@@ -61,7 +63,7 @@ const Page = () => {
       showHidden: true,
       Type: "New-CIPPBackup",
     },
-    queryKey: `BackupTasks-${settings.currentTenant}`,
+    queryKey: `BackupTasks-${currentTenant}`,
   });
 
   // Use the actual backup files as the backup data
@@ -380,7 +382,10 @@ const Page = () => {
           confirmText:
             "Are you sure you want to remove this backup schedule? This will stop automatic backups but won't delete existing backup files.",
         }}
-        relatedQueryKeys={[`BackupTasks-${settings.currentTenant}`, `BackupList-${settings.currentTenant}`]}
+        relatedQueryKeys={[
+          `BackupTasks-${settings.currentTenant}`,
+          `BackupList-${settings.currentTenant}`,
+        ]}
         onSuccess={() => {
           // Refresh both queries when a backup schedule is removed
           setTimeout(() => {

src/pages/tenant/manage/drift.js

@@ -34,7 +34,8 @@ const ManageDriftPage = () => {
   const router = useRouter();
   const { templateId } = router.query;
   const userSettingsDefaults = useSettings();
-  const tenantFilter = userSettingsDefaults.currentTenant || "";
+  // Prioritize URL query parameter, then fall back to settings
+  const tenantFilter = router.query.tenantFilter || userSettingsDefaults.currentTenant || "";
   const [anchorEl, setAnchorEl] = useState({});
   const [bulkActionsAnchorEl, setBulkActionsAnchorEl] = useState(null);
   const createDialog = useDialog();

src/pages/tenant/manage/edit.js

@@ -22,7 +22,8 @@ const Page = () => {
   const router = useRouter();
   const { templateId } = router.query;
   const settings = useSettings();
-  const currentTenant = settings.currentTenant;
+  // Prioritize URL query parameter, then fall back to settings
+  const currentTenant = router.query.tenantFilter || settings.currentTenant;
 
   const formControl = useForm({
     mode: "onChange",

src/pages/tenant/manage/history.js

@@ -40,7 +40,9 @@ const Page = () => {
   const router = useRouter();
   const { templateId } = router.query;
   const [daysToLoad, setDaysToLoad] = useState(5);
-  const tenant = useSettings().currentTenant;
+  const userSettings = useSettings();
+  // Prioritize URL query parameter, then fall back to settings
+  const tenant = router.query.tenantFilter || userSettings.currentTenant;
   const [expandedMessages, setExpandedMessages] = useState(new Set());
 
   // Toggle message expansion

src/pages/tenant/manage/recover-policies.js

@@ -28,7 +28,9 @@ const RecoverPoliciesPage = () => {
   const router = useRouter();
   const { templateId } = router.query;
   const [selectedPolicies, setSelectedPolicies] = useState([]);
-  const currentTenant = useSettings().currentTenant;
+  const userSettings = useSettings();
+  // Prioritize URL query parameter, then fall back to settings
+  const currentTenant = router.query.tenantFilter || userSettings.currentTenant;
 
   const formControl = useForm({ mode: "onChange" });