@oneuptime/common 10.2.0 → 10.2.2

package/Tests/Utils/MetricUnitUtil.test.ts

@@ -49,7 +49,19 @@ describe("MetricUnitUtil", () => {
     test("returns percent family for '%'", () => {
       const options: Array<{ value: string; label: string }> =
         MetricUnitUtil.getCompatibleUnits("%");
-      expect(options).toEqual([{ value: "%", label: "Percent (%)" }]);
+      expect(options).toEqual([
+        { value: "%", label: "Percent (%)" },
+        { value: "1", label: "Fraction (0-1)" },
+      ]);
+    });
+
+    test("returns percent family for UCUM '1' (dimensionless / ratio)", () => {
+      const options: Array<{ value: string; label: string }> =
+        MetricUnitUtil.getCompatibleUnits("1");
+      expect(options).toEqual([
+        { value: "%", label: "Percent (%)" },
+        { value: "1", label: "Fraction (0-1)" },
+      ]);
     });
 
     test("returns raw unit as sole option for unknown unit", () => {
@@ -69,6 +81,10 @@ describe("MetricUnitUtil", () => {
       expect(MetricUnitUtil.getCanonicalUnitValue("percent")).toBe("%");
     });
 
+    test("returns '%' for UCUM dimensionless '1' so the threshold UI doesn't default to a literal '1'", () => {
+      expect(MetricUnitUtil.getCanonicalUnitValue("1")).toBe("%");
+    });
+
     test("passes through unknown units", () => {
       expect(MetricUnitUtil.getCanonicalUnitValue("widgets")).toBe("widgets");
     });
@@ -197,6 +213,26 @@ describe("MetricUnitUtil", () => {
         }),
       ).toBe(2e9);
     });
+
+    test("converts '%' to the fraction unit '1' by dividing by 100", () => {
+      expect(
+        MetricUnitUtil.convertToMetricUnit({
+          value: 50,
+          fromUnit: "%",
+          metricUnit: "1",
+        }),
+      ).toBe(0.5);
+    });
+
+    test("converts the fraction unit '1' to '%' by multiplying by 100", () => {
+      expect(
+        MetricUnitUtil.convertToMetricUnit({
+          value: 0.05,
+          fromUnit: "1",
+          metricUnit: "%",
+        }),
+      ).toBe(5);
+    });
   });
 
   describe("hasCompatibleUnitFamily", () => {
@@ -204,6 +240,7 @@ describe("MetricUnitUtil", () => {
       expect(MetricUnitUtil.hasCompatibleUnitFamily("bytes")).toBe(true);
       expect(MetricUnitUtil.hasCompatibleUnitFamily("ms")).toBe(true);
       expect(MetricUnitUtil.hasCompatibleUnitFamily("%")).toBe(true);
+      expect(MetricUnitUtil.hasCompatibleUnitFamily("1")).toBe(true);
       expect(MetricUnitUtil.hasCompatibleUnitFamily("GB")).toBe(true);
     });
 

package/Types/Monitor/MetricMonitor/MetricMonitorResponse.ts

@@ -41,4 +41,12 @@ export default interface MetricMonitorResponse {
    * `metricResult` as before.
    */
   seriesBreakdown?: Array<MetricSeriesResult> | undefined;
+  /**
+   * Native units (UCUM / OTel) per referenced metric name, lowercased.
+   * Loaded once when the monitor data is fetched. The criteria
+   * evaluator falls back to this when the query alias has no explicit
+   * `legendUnit` so threshold unit conversion (e.g. % vs the
+   * dimensionless "1" used by ratio metrics) still works.
+   */
+  nativeUnitsByMetricName?: Dictionary<string> | undefined;
 }

package/Types/OnCallDutyPolicy/UserOverrideUtil.ts

@@ -0,0 +1,155 @@
+import CalendarEvent from "../Calendar/CalendarEvent";
+import OneUptimeDate from "../Date";
+
+export interface UserOverrideRecord {
+  overrideUserId: string;
+  routeAlertsToUserId: string;
+  startsAt: Date;
+  endsAt: Date;
+  // null/undefined means global override (applies to all on-call duty policies)
+  onCallDutyPolicyId?: string | null | undefined;
+}
+
+export interface OverrideEventMeta {
+  isOverride: true;
+  originalUserId: string;
+  overrideUserId: string;
+  overrideStartsAt: Date;
+  overrideEndsAt: Date;
+}
+
+/*
+ * CalendarEvent extends JSONObject so it accepts string-indexed metadata.
+ * We attach the override info under a known key so downstream consumers can
+ * detect and render the substitution distinctly.
+ */
+export const OVERRIDE_META_KEY: string = "_override";
+
+export default class UserOverrideUtil {
+  /**
+   * Returns true when this override should be applied on top of the schedule
+   * events. Global overrides always apply; policy-scoped overrides apply to
+   * any schedule, since a schedule's calendar shows coverage information for
+   * every user who could potentially be paged through it.
+   */
+  public static isOverrideApplicable(_override: UserOverrideRecord): boolean {
+    return true;
+  }
+
+  public static applyOverridesToEvents(data: {
+    events: Array<CalendarEvent>;
+    overrides: Array<UserOverrideRecord>;
+  }): Array<CalendarEvent> {
+    const applicable: Array<UserOverrideRecord> = data.overrides.filter(
+      UserOverrideUtil.isOverrideApplicable,
+    );
+
+    if (applicable.length === 0) {
+      return data.events;
+    }
+
+    let working: Array<CalendarEvent> = data.events;
+
+    for (const override of applicable) {
+      const next: Array<CalendarEvent> = [];
+      for (const event of working) {
+        next.push(...UserOverrideUtil.splitEventByOverride(event, override));
+      }
+      working = next;
+    }
+
+    return UserOverrideUtil.reassignEventIds(working);
+  }
+
+  private static splitEventByOverride(
+    event: CalendarEvent,
+    override: UserOverrideRecord,
+  ): Array<CalendarEvent> {
+    if (event.title !== override.overrideUserId) {
+      return [event];
+    }
+
+    // Override window doesn't overlap event window at all.
+    if (
+      OneUptimeDate.isAfter(override.startsAt, event.end) ||
+      OneUptimeDate.isSame(override.startsAt, event.end) ||
+      OneUptimeDate.isBefore(override.endsAt, event.start) ||
+      OneUptimeDate.isSame(override.endsAt, event.start)
+    ) {
+      return [event];
+    }
+
+    const overrideStart: Date = OneUptimeDate.isAfter(
+      override.startsAt,
+      event.start,
+    )
+      ? override.startsAt
+      : event.start;
+
+    const overrideEnd: Date = OneUptimeDate.isBefore(override.endsAt, event.end)
+      ? override.endsAt
+      : event.end;
+
+    const segments: Array<CalendarEvent> = [];
+
+    // Segment before the override window — original user remains on call.
+    if (OneUptimeDate.isBefore(event.start, overrideStart)) {
+      segments.push({
+        ...event,
+        end: overrideStart,
+      });
+    }
+
+    // Override window — substitute user takes over.
+    const meta: OverrideEventMeta = {
+      isOverride: true,
+      originalUserId: override.overrideUserId,
+      overrideUserId: override.routeAlertsToUserId,
+      overrideStartsAt: override.startsAt,
+      overrideEndsAt: override.endsAt,
+    };
+
+    segments.push({
+      ...event,
+      start: overrideStart,
+      end: overrideEnd,
+      title: override.routeAlertsToUserId,
+      [OVERRIDE_META_KEY]: meta as unknown as never,
+    });
+
+    // Segment after the override window — original user resumes.
+    if (OneUptimeDate.isAfter(event.end, overrideEnd)) {
+      segments.push({
+        ...event,
+        start: overrideEnd,
+      });
+    }
+
+    return segments;
+  }
+
+  private static reassignEventIds(
+    events: Array<CalendarEvent>,
+  ): Array<CalendarEvent> {
+    let id: number = 1;
+    return events.map((event: CalendarEvent) => {
+      return { ...event, id: id++ };
+    });
+  }
+
+  public static getOverrideMeta(
+    event: CalendarEvent,
+  ): OverrideEventMeta | null {
+    const meta: unknown = (event as unknown as Record<string, unknown>)[
+      OVERRIDE_META_KEY
+    ];
+    if (
+      meta &&
+      typeof meta === "object" &&
+      (meta as { isOverride?: boolean }).isOverride === true
+    ) {
+      return meta as OverrideEventMeta;
+    }
+    return null;
+  }
+}

package/Types/Permission.ts

@@ -527,6 +527,11 @@ enum Permission {
   EditProjectSSO = "EditProjectSSO",
   ReadProjectSSO = "ReadProjectSSO",
 
+  CreateProjectOIDC = "CreateProjectOIDC",
+  DeleteProjectOIDC = "DeleteProjectOIDC",
+  EditProjectOIDC = "EditProjectOIDC",
+  ReadProjectOIDC = "ReadProjectOIDC",
+
   CreateStatusPageSSO = "CreateStatusPageSSO",
   DeleteStatusPageSSO = "DeleteStatusPageSSO",
   EditStatusPageSSO = "EditStatusPageSSO",
@@ -2949,6 +2954,43 @@ export class PermissionHelper {
         group: PermissionGroup.Settings,
       },
 
+      {
+        permission: Permission.CreateProjectOIDC,
+        title: "Create Project OIDC",
+        description: "This permission can create Project OIDC in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Settings,
+      },
+      {
+        permission: Permission.DeleteProjectOIDC,
+        title: "Delete Project OIDC",
+        description: "This permission can delete Project OIDC in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Settings,
+      },
+      {
+        permission: Permission.EditProjectOIDC,
+        title: "Edit Project OIDC",
+        description: "This permission can edit Project OIDC in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Settings,
+      },
+      {
+        permission: Permission.ReadProjectOIDC,
+        title: "Read Project OIDC",
+        description: "This permission can read Project OIDC in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Settings,
+      },
+
       {
         permission: Permission.CreateStatusPageSSO,
         title: "Create Status Page SSO",

package/UI/Components/Calendar/Calendar.css

@@ -0,0 +1,257 @@
+/* OneUptime Calendar – modern, minimal overrides for react-big-calendar.
+   Scoped via the .oneuptime-calendar wrapper so we don't leak styles. */
+
+.oneuptime-calendar .rbc-calendar {
+  font-family: inherit;
+  color: #111827; /* gray-900 */
+}
+
+/* ---------- Toolbar ---------- */
+.oneuptime-calendar .rbc-toolbar {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.75rem;
+  margin-bottom: 1rem;
+  padding: 0;
+  font-size: 0.875rem;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-toolbar-label {
+  flex: 1 1 auto;
+  text-align: center;
+  font-size: 1rem;
+  font-weight: 600;
+  color: #111827; /* gray-900 */
+  letter-spacing: -0.01em;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group {
+  display: inline-flex;
+  border: 1px solid #e5e7eb; /* gray-200 */
+  background-color: #ffffff;
+  border-radius: 0.5rem;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.04);
+  overflow: hidden;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button {
+  border: none;
+  background-color: transparent;
+  color: #4b5563; /* gray-600 */
+  padding: 0.4rem 0.85rem;
+  font-size: 0.8125rem;
+  font-weight: 500;
+  line-height: 1.25rem;
+  cursor: pointer;
+  transition:
+    background-color 120ms ease,
+    color 120ms ease;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button + button {
+  border-left: 1px solid #e5e7eb;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button:hover,
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button:focus {
+  background-color: #f9fafb; /* gray-50 */
+  color: #111827;
+  outline: none;
+  box-shadow: none;
+}
+
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button.rbc-active,
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button.rbc-active:hover,
+.oneuptime-calendar .rbc-toolbar .rbc-btn-group button.rbc-active:focus {
+  background-color: #4f46e5; /* indigo-600 */
+  color: #ffffff;
+  box-shadow: none;
+}
+
+/* ---------- Calendar surface ---------- */
+.oneuptime-calendar .rbc-month-view,
+.oneuptime-calendar .rbc-time-view,
+.oneuptime-calendar .rbc-agenda-view {
+  border: 1px solid #e5e7eb; /* gray-200 */
+  border-radius: 0.75rem;
+  background-color: #ffffff;
+  overflow: hidden;
+}
+
+.oneuptime-calendar .rbc-month-view {
+  background-color: #ffffff;
+}
+
+/* ---------- Headers ---------- */
+.oneuptime-calendar .rbc-header,
+.oneuptime-calendar .rbc-time-header-content > .rbc-row > .rbc-header,
+.oneuptime-calendar .rbc-time-header .rbc-header {
+  padding: 0.625rem 0.5rem;
+  font-size: 0.75rem;
+  font-weight: 600;
+  color: #6b7280; /* gray-500 */
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  background-color: #f9fafb; /* gray-50 */
+  border-bottom: 1px solid #e5e7eb;
+}
+
+.oneuptime-calendar .rbc-header + .rbc-header,
+.oneuptime-calendar .rbc-time-header-content .rbc-header + .rbc-header {
+  border-left: 1px solid #f3f4f6; /* gray-100 */
+}
+
+.oneuptime-calendar .rbc-time-header.rbc-overflowing {
+  border-right: none;
+}
+
+.oneuptime-calendar .rbc-time-header-content {
+  border-left: 1px solid #e5e7eb;
+}
+
+/* ---------- Month grid ---------- */
+.oneuptime-calendar .rbc-month-row + .rbc-month-row {
+  border-top: 1px solid #f3f4f6; /* gray-100 */
+}
+
+.oneuptime-calendar .rbc-day-bg + .rbc-day-bg {
+  border-left: 1px solid #f3f4f6;
+}
+
+.oneuptime-calendar .rbc-date-cell {
+  padding: 0.35rem 0.5rem;
+  text-align: right;
+  font-size: 0.8125rem;
+  font-weight: 500;
+  color: #374151; /* gray-700 */
+}
+
+.oneuptime-calendar .rbc-date-cell.rbc-now {
+  color: #4f46e5; /* indigo-600 */
+  font-weight: 600;
+}
+
+.oneuptime-calendar .rbc-off-range {
+  color: #d1d5db; /* gray-300 */
+}
+
+.oneuptime-calendar .rbc-off-range-bg {
+  background-color: #fafafa;
+}
+
+.oneuptime-calendar .rbc-today {
+  background-color: #eef2ff; /* indigo-50 */
+}
+
+/* ---------- Time view (week/day) ---------- */
+.oneuptime-calendar .rbc-time-view .rbc-time-gutter,
+.oneuptime-calendar .rbc-time-view .rbc-time-content > * + * > * {
+  border-color: #f3f4f6;
+}
+
+.oneuptime-calendar .rbc-time-view .rbc-time-gutter .rbc-timeslot-group {
+  font-size: 0.75rem;
+  color: #6b7280;
+}
+
+.oneuptime-calendar .rbc-timeslot-group {
+  border-bottom: 1px solid #f3f4f6;
+}
+
+.oneuptime-calendar .rbc-time-content {
+  border-top: 1px solid #e5e7eb;
+}
+
+.oneuptime-calendar .rbc-time-content > * + * > * {
+  border-left: 1px solid #f3f4f6;
+}
+
+.oneuptime-calendar .rbc-current-time-indicator {
+  background-color: #ef4444; /* red-500 */
+  height: 2px;
+}
+
+.oneuptime-calendar .rbc-time-slot {
+  color: #9ca3af; /* gray-400 */
+}
+
+.oneuptime-calendar .rbc-label {
+  padding: 0 0.5rem;
+  font-size: 0.75rem;
+  color: #6b7280;
+}
+
+/* ---------- Events ---------- */
+.oneuptime-calendar .rbc-event,
+.oneuptime-calendar .rbc-day-slot .rbc-background-event {
+  border: none;
+  border-radius: 0.375rem;
+  padding: 0.2rem 0.5rem;
+  font-size: 0.75rem;
+  font-weight: 500;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.08);
+  transition:
+    transform 120ms ease,
+    box-shadow 120ms ease,
+    filter 120ms ease;
+}
+
+.oneuptime-calendar .rbc-event:hover,
+.oneuptime-calendar .rbc-day-slot .rbc-background-event:hover {
+  filter: brightness(0.97);
+  box-shadow: 0 4px 10px -2px rgb(0 0 0 / 0.12);
+}
+
+.oneuptime-calendar .rbc-event:focus,
+.oneuptime-calendar .rbc-event.rbc-selected {
+  outline: 2px solid #4f46e5; /* indigo-600 */
+  outline-offset: 1px;
+}
+
+.oneuptime-calendar .rbc-event-label {
+  font-size: 0.6875rem;
+  opacity: 0.85;
+}
+
+.oneuptime-calendar .rbc-show-more {
+  color: #4f46e5;
+  font-weight: 500;
+  background-color: transparent;
+  padding: 0.125rem 0.375rem;
+}
+
+/* ---------- Agenda view ---------- */
+.oneuptime-calendar .rbc-agenda-view table.rbc-agenda-table {
+  border: none;
+}
+
+.oneuptime-calendar .rbc-agenda-view table.rbc-agenda-table thead > tr > th {
+  background-color: #f9fafb;
+  color: #6b7280;
+  font-size: 0.75rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  padding: 0.625rem 0.75rem;
+  border-bottom: 1px solid #e5e7eb;
+}
+
+.oneuptime-calendar .rbc-agenda-view table.rbc-agenda-table tbody > tr > td {
+  padding: 0.625rem 0.75rem;
+  font-size: 0.8125rem;
+  color: #374151;
+  border-top: 1px solid #f3f4f6;
+}
+
+.oneuptime-calendar .rbc-agenda-view table.rbc-agenda-table tbody > tr + tr {
+  border-top: none;
+}
+
+.oneuptime-calendar .rbc-agenda-empty {
+  padding: 1.5rem;
+  text-align: center;
+  color: #9ca3af;
+  font-size: 0.875rem;
+}

package/UI/Components/Calendar/Calendar.tsx

@@ -10,8 +10,10 @@ import {
   DateLocalizer,
   EventPropGetter,
   momentLocalizer,
+  View,
 } from "react-big-calendar";
 import "react-big-calendar/lib/css/react-big-calendar.css";
+import "./Calendar.css";
 
 const localizer: DateLocalizer = momentLocalizer(moment);
 
@@ -29,6 +31,8 @@ export enum DefaultCalendarView {
   Agenda = "agenda",
 }
 
+const CALENDAR_VIEWS: View[] = ["month", "week", "day", "agenda"];
+
 const CalendarElement: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
@@ -43,33 +47,40 @@ const CalendarElement: FunctionComponent<ComponentProps> = (
   ): { className?: string | undefined; style?: React.CSSProperties } => {
     const backgroundColor: string =
       event.color?.toString() || Blue500.toString();
+
+    const computedTextColor: string =
+      event.textColor?.toString() ||
+      (Color.shouldUseDarkText(new Color(backgroundColor))
+        ? "#111827"
+        : "#ffffff");
+
     const style: React.CSSProperties = {
-      backgroundColor: backgroundColor,
-      borderRadius: "0px",
-      opacity: 0.8,
-      color:
-        event.textColor?.toString() ||
-        Color.shouldUseDarkText(new Color(backgroundColor))
-          ? "#000000"
-          : "#ffffff",
+      backgroundColor,
+      color: computedTextColor,
+      borderRadius: "0.375rem",
       border: "0px",
       display: "block",
     };
 
     return {
-      style: style,
+      style,
     };
   };
 
   return (
-    <div id={props.id} className="mt-5 h-[42rem]">
+    <div
+      id={props.id}
+      className="oneuptime-calendar mt-5 h-[42rem] rounded-xl bg-white"
+    >
       <Calendar
         defaultDate={defaultDate}
         events={props.events}
         localizer={localizer}
         showMultiDayTimes
-        defaultView={props.defaultCalendarView || "day"}
+        views={CALENDAR_VIEWS}
+        defaultView={props.defaultCalendarView || "week"}
         eventPropGetter={eventStyleGetter}
+        popup
         onRangeChange={(range: Date[] | { start: Date; end: Date }) => {
           if (Array.isArray(range)) {
             return props.onRangeChange({

package/Utils/MetricUnitUtil.ts

@@ -113,6 +113,20 @@ const percentUnits: Array<UnitDefinition> = [
     aliases: ["%", "percent"],
     toCanonical: 1,
   },
+  /*
+   * UCUM "1" is OTel's dimensionless marker for ratio metrics — values in
+   * [0, 1] that represent a fraction (e.g. system.filesystem.utilization).
+   * Treating it as part of the percent family lets the threshold UI offer
+   * both "%" and "Fraction (0-1)" as input units. One unit of "1" equals
+   * 100% in the canonical, so a fraction threshold of 0.5 converts to a
+   * stored canonical value of 50.
+   */
+  {
+    value: "1",
+    label: "Fraction (0-1)",
+    aliases: ["1"],
+    toCanonical: 100,
+  },
 ];
 
 const bitUnits: Array<UnitDefinition> = [
@@ -206,6 +220,11 @@ export default class MetricUnitUtil {
    * is what the threshold dropdown should default to when nothing is
    * selected yet. Returns the input unit unchanged if the family is
    * unknown.
+   *
+   * Special case for fraction metrics (unit "1"): users think in percent,
+   * not 0-1 fractions, so the dropdown defaults to "%" rather than the
+   * raw "1" — which used to render an unlabelled "1" next to the value
+   * input and read as a typo.
    */
   public static getCanonicalUnitValue(
     metricUnit: string | undefined,
@@ -223,6 +242,11 @@ export default class MetricUnitUtil {
       metricUnit,
       family,
     );
+
+    if (family === percentUnits && def?.value === "1") {
+      return "%";
+    }
+
     return def?.value || metricUnit;
   }
 

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

@@ -118,6 +118,7 @@ import ProjectUserProfile from "./ProjectUserProfile";
 import ProjectSmtpConfig from "./ProjectSmtpConfig";
 //SSO
 import ProjectSSO from "./ProjectSso";
+import ProjectOIDC from "./ProjectOidc";
 import PromoCode from "./PromoCode";
 import EnterpriseLicense from "./EnterpriseLicense";
 import OpenSourceDeployment from "./OpenSourceDeployment";
@@ -405,6 +406,7 @@ const AllModelTypes = [
     WorkflowVariables,
     WorkflowLog,
     ProjectSSO,
+    ProjectOIDC,
     StatusPageSSO,
     StatusPageSCIM,
     MonitorProbe,