@oneuptime/common 9.3.8 → 9.3.10

package/Server/Utils/Telemetry/Telemetry.ts

@@ -3,7 +3,7 @@ import ObjectID from "../../../Types/ObjectID";
 import CaptureSpan from "./CaptureSpan";
 import MetricType from "../../../Models/DatabaseModels/MetricType";
 import MetricTypeService from "../../Services/MetricTypeService";
-import TelemetryService from "../../../Models/DatabaseModels/TelemetryService";
+import Service from "../../../Models/DatabaseModels/Service";
 import Dictionary from "../../../Types/Dictionary";
 
 export type AttributeType = string | number | boolean | null;
@@ -22,7 +22,7 @@ export default class TelemetryUtil {
           name: metricName,
         },
         select: {
-          telemetryServices: true,
+          services: true,
           name: true,
           description: true,
           unit: true,
@@ -35,21 +35,22 @@ export default class TelemetryUtil {
       const metricTypeInMap: MetricType =
         data.metricNameServiceNameMap[metricName]!;
 
-      // check if telemetry services are same as the ones in the map
-      const telemetryServicesInMap: Array<ObjectID> =
-        metricTypeInMap?.telemetryServices?.map((service: TelemetryService) => {
+      // check if services are same as the ones in the map
+      const servicesInMap: Array<ObjectID> =
+        metricTypeInMap?.services?.map((service: Service) => {
           return service.id!;
         }) || [];
 
       if (metricType) {
-        if (!metricType.telemetryServices) {
-          metricType.telemetryServices = [];
+        if (!metricType.services) {
+          metricType.services = [];
         }
 
-        const telemetryServiceIds: Array<ObjectID> =
-          metricType.telemetryServices!.map((service: TelemetryService) => {
+        const serviceIds: Array<ObjectID> = metricType.services!.map(
+          (service: Service) => {
             return service.id!;
-          });
+          },
+        );
 
         let isSame: boolean = true;
 
@@ -65,19 +66,19 @@ export default class TelemetryUtil {
           metricType.unit = metricTypeInMap.unit || "";
         }
 
-        // check if telemetry services are same
+        // check if services are same
 
-        for (const telemetryServiceId of telemetryServicesInMap) {
+        for (const serviceId of servicesInMap) {
           if (
-            telemetryServiceIds.filter((serviceId: ObjectID) => {
-              return serviceId.toString() === telemetryServiceId.toString();
+            serviceIds.filter((existingServiceId: ObjectID) => {
+              return existingServiceId.toString() === serviceId.toString();
             }).length === 0
           ) {
             isSame = false;
             // add the service id to the list
-            const telemetryService: TelemetryService = new TelemetryService();
-            telemetryService.id = telemetryServiceId;
-            metricType.telemetryServices!.push(telemetryService);
+            const service: Service = new Service();
+            service.id = serviceId;
+            metricType.services!.push(service);
           }
         }
 
@@ -88,7 +89,7 @@ export default class TelemetryUtil {
           await MetricTypeService.updateOneById({
             id: metricType.id!,
             data: {
-              telemetryServices: metricType.telemetryServices || [],
+              services: metricType.services || [],
               description: metricTypeInMap.description || "",
               unit: metricTypeInMap.unit || "",
             },
@@ -104,12 +105,12 @@ export default class TelemetryUtil {
         metricType.description = metricTypeInMap.description || "";
         metricType.unit = metricTypeInMap.unit || "";
         metricType.projectId = data.projectId;
-        metricType.telemetryServices = [];
+        metricType.services = [];
 
-        for (const telemetryServiceId of telemetryServicesInMap) {
-          const telemetryService: TelemetryService = new TelemetryService();
-          telemetryService.id = telemetryServiceId;
-          metricType.telemetryServices!.push(telemetryService);
+        for (const serviceId of servicesInMap) {
+          const service: Service = new Service();
+          service.id = serviceId;
+          metricType.services!.push(service);
         }
 
         // save metric type

package/Types/AI/AIAgentTaskMetadata.ts

@@ -9,7 +9,7 @@ export interface AIAgentTaskMetadataBase {
 export interface FixExceptionTaskMetadata extends AIAgentTaskMetadataBase {
   taskType: AIAgentTaskType.FixException;
   exceptionId: string;
-  telemetryServiceId?: string;
+  serviceId?: string;
   stackTrace?: string;
   errorMessage?: string;
 }

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -19,7 +19,7 @@ import API from "../../Utils/API/API";
 import { APP_API_URL } from "../../Config";
 import PageLoader from "../Loader/PageLoader";
 import ErrorMessage from "../ErrorMessage/ErrorMessage";
-import TelemetryService from "../../../Models/DatabaseModels/TelemetryService";
+import Service from "../../../Models/DatabaseModels/Service";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import SortOrder from "../../../Types/BaseDatabase/SortOrder";
 import ListResult from "../../../Types/BaseDatabase/ListResult";
@@ -99,9 +99,7 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
   const [isPageLoading, setIsPageLoading] = useState<boolean>(true);
   const [pageError, setPageError] = useState<string>("");
 
-  const [serviceMap, setServiceMap] = useState<Dictionary<TelemetryService>>(
-    {},
-  );
+  const [serviceMap, setServiceMap] = useState<Dictionary<Service>>({});
 
   const [selectedLogId, setSelectedLogId] = useState<string | null>(null);
 
@@ -237,29 +235,28 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     }
   }, [displayedLogs, selectedLogId]);
 
-  const loadTelemetryServices: PromiseVoidFunction =
+  const loadServices: PromiseVoidFunction =
     useCallback(async (): Promise<void> => {
       try {
         setIsPageLoading(true);
         setPageError("");
 
-        const telemetryServices: ListResult<TelemetryService> =
-          await ModelAPI.getList({
-            modelType: TelemetryService,
-            query: {},
-            select: {
-              name: true,
-              serviceColor: true,
-            },
-            limit: LIMIT_PER_PROJECT,
-            skip: 0,
-            sort: {
-              name: SortOrder.Ascending,
-            },
-          });
-        const services: Dictionary<TelemetryService> = {};
+        const telemetryServices: ListResult<Service> = await ModelAPI.getList({
+          modelType: Service,
+          query: {},
+          select: {
+            name: true,
+            serviceColor: true,
+          },
+          limit: LIMIT_PER_PROJECT,
+          skip: 0,
+          sort: {
+            name: SortOrder.Ascending,
+          },
+        });
+        const services: Dictionary<Service> = {};
 
-        telemetryServices.data.forEach((service: TelemetryService) => {
+        telemetryServices.data.forEach((service: Service) => {
           if (!service.id) {
             return;
           }
@@ -315,8 +312,8 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     }, []);
 
   useEffect(() => {
-    void loadTelemetryServices();
-  }, [loadTelemetryServices]);
+    void loadServices();
+  }, [loadServices]);
 
   const resetPage: () => void = (): void => {
     if (props.onPageChange) {

package/UI/Components/LogsViewer/components/LogDetailsPanel.tsx

@@ -1,6 +1,6 @@
 import React, { FunctionComponent, ReactElement, useMemo } from "react";
 import Log from "../../../../Models/AnalyticsModels/Log";
-import TelemetryService from "../../../../Models/DatabaseModels/TelemetryService";
+import Service from "../../../../Models/DatabaseModels/Service";
 import Dictionary from "../../../../Types/Dictionary";
 import Route from "../../../../Types/API/Route";
 import URL from "../../../../Types/API/URL";
@@ -14,7 +14,7 @@ import SeverityBadge from "./SeverityBadge";
 
 export interface LogDetailsPanelProps {
   log: Log;
-  serviceMap: Dictionary<TelemetryService>;
+  serviceMap: Dictionary<Service>;
   onClose?: () => void;
   getTraceRoute?:
     | ((traceId: string, log: Log) => Route | URL | undefined)
@@ -69,7 +69,7 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
 ): ReactElement => {
   const variant: "floating" | "embedded" = props.variant || "floating";
   const serviceId: string = props.log.serviceId?.toString() || "";
-  const service: TelemetryService | undefined = props.serviceMap[serviceId];
+  const service: Service | undefined = props.serviceMap[serviceId];
   const serviceName: string = service?.name || serviceId || "Unknown service";
   const serviceColor: string =
     (service?.serviceColor && service?.serviceColor.toString()) || "#64748b";

package/UI/Components/LogsViewer/components/LogsTable.tsx

@@ -1,6 +1,6 @@
 import React, { Fragment, FunctionComponent, ReactElement } from "react";
 import Log from "../../../../Models/AnalyticsModels/Log";
-import TelemetryService from "../../../../Models/DatabaseModels/TelemetryService";
+import Service from "../../../../Models/DatabaseModels/Service";
 import Dictionary from "../../../../Types/Dictionary";
 import OneUptimeDate from "../../../../Types/Date";
 import CopyTextButton from "../../CopyTextButton/CopyTextButton";
@@ -13,7 +13,7 @@ import IconProp from "../../../../Types/Icon/IconProp";
 
 export interface LogsTableProps {
   logs: Array<Log>;
-  serviceMap: Dictionary<TelemetryService>;
+  serviceMap: Dictionary<Service>;
   isLoading: boolean;
   emptyMessage?: string | undefined;
   onRowClick: (log: Log, rowId: string) => void;
@@ -151,8 +151,7 @@ const LogsTable: FunctionComponent<LogsTableProps> = (
             {props.logs.map((log: Log, index: number) => {
               const rowId: string = resolveLogIdentifier(log, index);
               const serviceId: string = log.serviceId?.toString() || "";
-              const service: TelemetryService | undefined =
-                props.serviceMap[serviceId];
+              const service: Service | undefined = props.serviceMap[serviceId];
               const serviceName: string =
                 service?.name || serviceId || "Unknown";
               const serviceColor: string =

package/UI/Components/Navbar/NavBar.tsx

@@ -13,6 +13,7 @@ import NavBarMenuItem from "./NavBarMenuItem";
 import Button, { ButtonStyleType } from "../Button/Button";
 import Navigation from "../../Utils/Navigation";
 import useComponentOutsideClick from "../../Types/UseComponentOutsideClick";
+import Icon, { ThickProp } from "../Icon/Icon";
 
 export interface NavItem {
   id: string;
@@ -29,13 +30,16 @@ export interface MoreMenuItem {
   description: string;
   route: Route;
   icon: IconProp;
-  iconColor?: string; // Tailwind color class like "bg-blue-500"
+  iconColor?: string; // Tailwind color name like "blue", "purple", "amber"
+  category?: string; // Category for grouping items (e.g., "Essentials", "Observability")
+  activeRoute?: Route | undefined; // Route to check for active state
 }
 
 export interface ComponentProps {
   items?: NavItem[];
   rightElement?: NavItem;
   moreMenuItems?: MoreMenuItem[];
+  moreMenuTitle?: string; // Title for the more menu (default: "More")
   moreMenuFooter?: {
     title: string;
     description: string;
@@ -246,12 +250,150 @@ const Navbar: FunctionComponent<ComponentProps> = (
   // Desktop view
   const className: string =
     props.className ||
-    "bg-white flex text-center lg:space-x-8 lg:py-2 hidden md:flex";
+    "bg-white flex text-center items-center lg:py-2 hidden md:flex";
+
+  // Find active item in more menu items (needed for breadcrumb)
+  const activeMoreItem: MoreMenuItem | undefined = props.moreMenuItems?.find(
+    (item: MoreMenuItem) => {
+      const routeToCheck: Route = item.activeRoute || item.route;
+      return Navigation.isStartWith(routeToCheck);
+    },
+  );
+
+  // Group items by category for the menu
+  const categories: Map<string, MoreMenuItem[]> = new Map();
+  props.moreMenuItems?.forEach((item: MoreMenuItem) => {
+    const cat: string = item.category || "Other";
+    if (!categories.has(cat)) {
+      categories.set(cat, []);
+    }
+    categories.get(cat)!.push(item);
+  });
+
+  // Convert to sections array for NavBarMenu
+  const sections: Array<{ title: string; items: Array<ReactElement> }> = [];
+  categories.forEach((items: MoreMenuItem[], category: string) => {
+    sections.push({
+      title: category,
+      items: items.map((item: MoreMenuItem) => {
+        return (
+          <NavBarMenuItem
+            key={item.title}
+            title={item.title}
+            description={item.description}
+            route={item.route}
+            icon={item.icon}
+            iconColor={item.iconColor}
+            onClick={forceHideMoreMenu}
+          />
+        );
+      }),
+    });
+  });
+
+  // Find Home item from navItems
+  const homeItem: NavItem | undefined = props.items.find((item: NavItem) => {
+    return item.title === "Home";
+  });
+  const otherNavItems: NavItem[] = props.items.filter((item: NavItem) => {
+    return item.title !== "Home";
+  });
 
   return (
-    <nav className={props.rightElement ? `flex justify-between` : ""}>
+    <nav
+      className={props.rightElement ? `flex justify-between items-center` : ""}
+    >
       <div data-testid="nav-children" className={className}>
-        {props.items.map((item: any) => {
+        {/* Combined Home > Product breadcrumb */}
+        <div className="flex items-center">
+          {/* Home link */}
+          {homeItem && (
+            <NavBarItem
+              key={homeItem.id}
+              id={homeItem.id}
+              title={homeItem.title}
+              icon={homeItem.icon}
+              activeRoute={homeItem.activeRoute}
+              route={homeItem.route}
+              exact={true}
+            />
+          )}
+
+          {/* Separator and active product */}
+          {activeMoreItem && (
+            <>
+              <span className="text-gray-400 mx-1">/</span>
+              <div
+                onMouseOver={showMoreMenu}
+                onMouseLeave={hideMoreMenu}
+                className="relative"
+              >
+                <button
+                  onClick={showMoreMenu}
+                  onMouseOver={showMoreMenu}
+                  className="bg-gray-100 text-gray-900 hover:bg-gray-200 rounded-md py-2 px-3 inline-flex items-center text-sm font-medium transition-colors cursor-pointer"
+                >
+                  <Icon
+                    icon={activeMoreItem.icon}
+                    className="mr-1.5 h-4 w-4"
+                    thick={ThickProp.Thick}
+                  />
+                  <span>{activeMoreItem.title}</span>
+                  <Icon
+                    icon={IconProp.ChevronDown}
+                    className="ml-1.5 h-3 w-3 text-gray-500"
+                  />
+                </button>
+                {isMoreMenuVisible && (
+                  <NavBarMenu
+                    sections={sections}
+                    footer={props.moreMenuFooter}
+                  />
+                )}
+              </div>
+            </>
+          )}
+
+          {/* Show Products button when no product is selected */}
+          {!activeMoreItem &&
+            props.moreMenuItems &&
+            props.moreMenuItems.length > 0 && (
+              <>
+                <span className="text-gray-400 mx-1">/</span>
+                <div
+                  onMouseOver={showMoreMenu}
+                  onMouseLeave={hideMoreMenu}
+                  className="relative"
+                >
+                  <button
+                    onClick={showMoreMenu}
+                    onMouseOver={showMoreMenu}
+                    className="text-gray-500 hover:bg-gray-50 hover:text-gray-900 rounded-md py-2 px-3 inline-flex items-center text-sm font-medium transition-colors cursor-pointer"
+                  >
+                    <Icon
+                      icon={IconProp.Squares}
+                      className="mr-1.5 h-4 w-4"
+                      thick={ThickProp.Thick}
+                    />
+                    <span>{props.moreMenuTitle || "Products"}</span>
+                    <Icon
+                      icon={IconProp.ChevronDown}
+                      className="ml-1.5 h-3 w-3 text-gray-400"
+                    />
+                  </button>
+                  {isMoreMenuVisible && (
+                    <NavBarMenu
+                      sections={sections}
+                      footer={props.moreMenuFooter}
+                    />
+                  )}
+                </div>
+              </>
+            )}
+        </div>
+
+        {/* Other nav items */}
+        {otherNavItems.map((item: NavItem) => {
           return (
             <NavBarItem
               key={item.id}
@@ -264,54 +406,6 @@ const Navbar: FunctionComponent<ComponentProps> = (
             />
           );
         })}
-
-        {/* More menu for desktop */}
-        {props.moreMenuItems && props.moreMenuItems.length > 0 && (
-          <NavBarItem
-            title="More"
-            icon={IconProp.More}
-            onMouseLeave={hideMoreMenu}
-            onMouseOver={showMoreMenu}
-            onClick={showMoreMenu}
-          >
-            <div onMouseOver={showMoreMenu} onMouseLeave={hideMoreMenu}>
-              {isMoreMenuVisible &&
-                (props.moreMenuFooter ? (
-                  <NavBarMenu footer={props.moreMenuFooter}>
-                    {props.moreMenuItems.map((item: MoreMenuItem) => {
-                      return (
-                        <NavBarMenuItem
-                          key={item.title}
-                          title={item.title}
-                          description={item.description}
-                          route={item.route}
-                          icon={item.icon}
-                          iconColor={item.iconColor}
-                          onClick={forceHideMoreMenu}
-                        />
-                      );
-                    })}
-                  </NavBarMenu>
-                ) : (
-                  <NavBarMenu>
-                    {props.moreMenuItems.map((item: MoreMenuItem) => {
-                      return (
-                        <NavBarMenuItem
-                          key={item.title}
-                          title={item.title}
-                          description={item.description}
-                          route={item.route}
-                          icon={item.icon}
-                          iconColor={item.iconColor}
-                          onClick={forceHideMoreMenu}
-                        />
-                      );
-                    })}
-                  </NavBarMenu>
-                ))}
-            </div>
-          </NavBarItem>
-        )}
       </div>
 
       {props.rightElement && (

package/UI/Components/Navbar/NavBarMenu.tsx

@@ -6,11 +6,12 @@ import React, { FunctionComponent, ReactElement } from "react";
 
 export interface MenuSection {
   title: string;
-  children: ReactElement | Array<ReactElement>;
+  items: Array<ReactElement>;
 }
 
 export interface ComponentProps {
-  children: ReactElement | Array<ReactElement>;
+  children?: ReactElement | Array<ReactElement>;
+  sections?: MenuSection[];
   footer?: {
     title: string;
     description: string;
@@ -21,11 +22,90 @@ export interface ComponentProps {
 const NavBarMenu: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
-  let children: Array<ReactElement>;
-  if (!Array.isArray(props.children) && props.children) {
-    children = [props.children];
-  } else {
-    children = props.children;
+  // If sections are provided, render categorized menu
+  if (props.sections && props.sections.length > 0) {
+    // Separate Settings section from other sections
+    const mainSections: MenuSection[] = props.sections.filter(
+      (section: MenuSection) => {
+        return section.title !== "Settings";
+      },
+    );
+    const settingsSection: MenuSection | undefined = props.sections.find(
+      (section: MenuSection) => {
+        return section.title === "Settings";
+      },
+    );
+
+    return (
+      <div className="absolute left-0 z-10 mt-8 w-screen max-w-5xl transform px-2 sm:px-0">
+        <div className="overflow-hidden rounded-2xl shadow-xl ring-1 ring-black ring-opacity-5 bg-white">
+          {/* Sections */}
+          <div className="p-6">
+            <div className="flex gap-6">
+              {/* Main sections grid */}
+              <div className="flex-1 grid grid-cols-1 md:grid-cols-3 gap-6">
+                {mainSections.map((section: MenuSection, index: number) => {
+                  return (
+                    <div key={index} className="space-y-3">
+                      <h3 className="text-xs font-semibold uppercase tracking-wider text-gray-500 px-2.5 text-left">
+                        {section.title}
+                      </h3>
+                      <div className="space-y-1">{section.items}</div>
+                    </div>
+                  );
+                })}
+              </div>
+
+              {/* Settings section on the side */}
+              {settingsSection && (
+                <div className="border-l border-gray-100 pl-6 space-y-3 min-w-[200px]">
+                  <h3 className="text-xs font-semibold uppercase tracking-wider text-gray-500 px-2.5 text-left">
+                    {settingsSection.title}
+                  </h3>
+                  <div className="space-y-1">{settingsSection.items}</div>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {/* Footer */}
+          {props.footer && (
+            <div className="border-t border-gray-100 bg-gray-50 px-4 py-4">
+              <Link
+                to={props.footer.link}
+                openInNewTab={true}
+                className="group flex items-center gap-3 rounded-lg p-2.5 -m-2 transition-colors hover:bg-gray-100"
+              >
+                <div className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg bg-gray-100 ring-1 ring-gray-200 group-hover:bg-gray-200 group-hover:ring-gray-300 transition-all">
+                  <Icon
+                    icon={IconProp.GitHub}
+                    className="h-5 w-5 text-gray-700"
+                  />
+                </div>
+                <div className="flex-1 min-w-0 text-left">
+                  <p className="text-sm font-medium text-gray-900">
+                    {props.footer.title}
+                  </p>
+                  <p className="text-xs text-gray-500">
+                    {props.footer.description}
+                  </p>
+                </div>
+              </Link>
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  // Legacy: render children directly
+  let children: Array<ReactElement> = [];
+  if (props.children) {
+    if (!Array.isArray(props.children)) {
+      children = [props.children];
+    } else {
+      children = props.children;
+    }
   }
 
   // Calculate number of columns based on items count

package/UI/Components/Navbar/NavBarMenuItem.tsx

@@ -102,6 +102,18 @@ const NavBarMenuItem: FunctionComponent<ComponentProps> = (
       hoverBg: "hover:bg-sky-50",
       hoverRing: "group-hover:ring-sky-300",
     },
+    emerald: {
+      bg: "bg-emerald-50",
+      ring: "ring-emerald-200",
+      hoverBg: "hover:bg-emerald-50",
+      hoverRing: "group-hover:ring-emerald-300",
+    },
+    cyan: {
+      bg: "bg-cyan-50",
+      ring: "ring-cyan-200",
+      hoverBg: "hover:bg-cyan-50",
+      hoverRing: "group-hover:ring-cyan-300",
+    },
   };
 
   const colors: {

package/build/dist/Models/DatabaseModels/AIAgentTask.js

@@ -189,7 +189,12 @@ __decorate([
 ], AIAgentTask.prototype, "description", void 0);
 __decorate([
     ColumnAccessControl({
-        create: [],
+        create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectAIAgentTask,
+        ],
         read: [
             Permission.ProjectOwner,
             Permission.ProjectAdmin,
@@ -224,7 +229,12 @@ __decorate([
 ], AIAgentTask.prototype, "aiAgent", void 0);
 __decorate([
     ColumnAccessControl({
-        create: [],
+        create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectAIAgentTask,
+        ],
         read: [
             Permission.ProjectOwner,
             Permission.ProjectAdmin,
@@ -505,7 +515,12 @@ __decorate([
 ], AIAgentTask.prototype, "createdByUserId", void 0);
 __decorate([
     ColumnAccessControl({
-        create: [],
+        create: [
+            Permission.ProjectOwner,
+            Permission.ProjectAdmin,
+            Permission.ProjectMember,
+            Permission.CreateProjectAIAgentTask,
+        ],
         read: [
             Permission.ProjectOwner,
             Permission.ProjectAdmin,