Merge pull request #647 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippComponents/CippBreadcrumbNav.jsx

@@ -457,9 +457,43 @@ export const CippBreadcrumbNav = () => {
 
   // Render based on mode
   if (mode === "hierarchical") {
-    const breadcrumbs = buildHierarchicalBreadcrumbs();
+    let breadcrumbs = buildHierarchicalBreadcrumbs();
 
-    // Don't show if no breadcrumbs found
+    // Fallback: If no breadcrumbs found in navigation config, generate from URL path
+    if (breadcrumbs.length === 0) {
+      const pathSegments = router.pathname.split("/").filter((segment) => segment);
+
+      if (pathSegments.length > 0) {
+        breadcrumbs = pathSegments.map((segment, index) => {
+          // Build the path up to this segment
+          const path = "/" + pathSegments.slice(0, index + 1).join("/");
+
+          // Format segment as title (replace hyphens with spaces, capitalize words)
+          const title = segment
+            .split("-")
+            .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+            .join(" ");
+
+          return {
+            title,
+            path,
+            type: "fallback",
+            query: index === pathSegments.length - 1 ? { ...router.query } : {},
+          };
+        });
+
+        // If we have a current page title from document.title, use it for the last breadcrumb
+        if (
+          currentPageTitle &&
+          currentPageTitle !== "CIPP" &&
+          !currentPageTitle.toLowerCase().includes("loading")
+        ) {
+          breadcrumbs[breadcrumbs.length - 1].title = currentPageTitle;
+        }
+      }
+    }
+
+    // Don't show if still no breadcrumbs found
     if (breadcrumbs.length === 0) {
       return null;
     }

src/layouts/HeaderedTabbedLayout.jsx

@@ -81,14 +81,18 @@ export const HeaderedTabbedLayout = (props) => {
                 ) : (
                   subtitle && (
                     <Stack alignItems="center" flexWrap="wrap" direction="row" spacing={2}>
-                      {subtitle.map((item, index) => (
-                        <Stack key={index} alignItems="center" direction="row" spacing={1}>
-                          <SvgIcon fontSize="small">{item.icon}</SvgIcon>
-                          <Typography color="text.secondary" variant="body2">
-                            {item.text}
-                          </Typography>
-                        </Stack>
-                      ))}
+                      {subtitle.map((item, index) =>
+                        item.component ? (
+                          <Box key={index}>{item.component}</Box>
+                        ) : (
+                          <Stack key={index} alignItems="center" direction="row" spacing={1}>
+                            <SvgIcon fontSize="small">{item.icon}</SvgIcon>
+                            <Typography color="text.secondary" variant="body2">
+                              {item.text}
+                            </Typography>
+                          </Stack>
+                        )
+                      )}
                     </Stack>
                   )
                 )}

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { Sync, PlayArrow, PictureAsPdf } from "@mui/icons-material";
+import { Edit, Sync, PlayArrow, PictureAsPdf } from "@mui/icons-material";
 
 /**
  * Creates the standard drift management actions array
@@ -9,7 +9,14 @@ import { Sync, PlayArrow, PictureAsPdf } from "@mui/icons-material";
  * @param {Function} options.onGenerateReport - Function to call when generate report is triggered (optional)
  * @returns {Array} Array of action objects
  */
-export const createDriftManagementActions = ({ templateId, onRefresh, onGenerateReport, currentTenant }) => {
+export const createDriftManagementActions = ({
+  templateId,
+  templateType = "classic",
+  showEditTemplate = false,
+  onRefresh,
+  onGenerateReport,
+  currentTenant,
+}) => {
   const actions = [
     {
       label: "Refresh Data",
@@ -31,6 +38,27 @@ export const createDriftManagementActions = ({ templateId, onRefresh, onGenerate
 
   // Add template-specific actions if templateId is available
   if (templateId) {
+    // Conditionally add Edit Template action
+    if (showEditTemplate) {
+      actions.push({
+        label: "Edit Template",
+        icon: <Edit />,
+        color: "info",
+        noConfirm: true,
+        customFunction: () => {
+          // Use Next.js router for internal navigation
+          import("next/router")
+            .then(({ default: router }) => {
+              router.push(`/tenant/standards/template?id=${templateId}&type=${templateType}`);
+            })
+            .catch(() => {
+              // Fallback to window.location if router is not available
+              window.location.href = `/tenant/standards/template?id=${templateId}&type=${templateType}`;
+            });
+        },
+      });
+    }
+
     actions.push(
       {
         label: `Run Standard Now (${currentTenant || "Currently Selected Tenant"})`,

src/pages/tenant/manage/driftManagementActions.js

@@ -31,10 +31,10 @@ import {
   Info as InfoIcon,
   CheckCircle as SuccessIcon,
   ExpandMore,
+  Sync,
 } from "@mui/icons-material";
 import tabOptions from "./tabOptions.json";
 import { useSettings } from "../../../hooks/use-settings";
-import { createDriftManagementActions } from "./driftManagementActions";
 
 const Page = () => {
   const router = useRouter();
@@ -124,14 +124,17 @@ const Page = () => {
     setDaysToLoad((prev) => prev + 7);
   };
 
-  // Actions for the ActionsMenu
-  const actions = createDriftManagementActions({
-    templateId,
-    onRefresh: () => {
-      logsData.refetch();
+  // Actions for the ActionsMenu - just refresh for history page
+  const actions = [
+    {
+      label: "Refresh Data",
+      icon: <Sync />,
+      noConfirm: true,
+      customFunction: () => {
+        logsData.refetch();
+      },
     },
-    currentTenant: tenant,
-  });
+  ];
 
   const title = "View History";
   // Sort logs by date (newest first)

src/pages/tenant/manage/history.js

@@ -353,6 +353,8 @@ const PoliciesDeployedPage = () => {
 
   const actions = createDriftManagementActions({
     templateId,
+    templateType: currentTemplate?.type || "classic",
+    showEditTemplate: true,
     onRefresh: () => {
       standardsApi.refetch();
       comparisonApi.refetch();

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

@@ -19,6 +19,7 @@ import _ from "lodash";
 import { createDriftManagementActions } from "../manage/driftManagementActions";
 import { ActionsMenu } from "/src/components/actions-menu";
 import { useSettings } from "/src/hooks/use-settings";
+import { CippHead } from "../../../components/CippComponents/CippHead";
 
 const Page = () => {
   const router = useRouter();
@@ -311,6 +312,17 @@ const Page = () => {
 
   return (
     <Box sx={{ flexGrow: 1 }}>
+      <CippHead
+        title={
+          editMode
+            ? isDriftMode
+              ? "Edit Drift Template"
+              : "Edit Standards Template"
+            : isDriftMode
+            ? "Add Drift Template"
+            : "Add Standards Template"
+        }
+      />
       <Container maxWidth={"xl"}>
         <Stack spacing={2}>
           <Stack