@oneuptime/common 10.4.16 → 10.5.0

package/Types/Permission.ts

@@ -281,6 +281,11 @@ enum Permission {
   EditMonitorCustomField = "EditMonitorCustomField",
   ReadMonitorCustomField = "ReadMonitorCustomField",
 
+  CreateTeamCustomField = "CreateTeamCustomField",
+  DeleteTeamCustomField = "DeleteTeamCustomField",
+  EditTeamCustomField = "EditTeamCustomField",
+  ReadTeamCustomField = "ReadTeamCustomField",
+
   CreateOnCallDutyPolicyCustomField = "CreateOnCallDutyPolicyCustomField",
   DeleteOnCallDutyPolicyCustomField = "DeleteOnCallDutyPolicyCustomField",
   EditOnCallDutyPolicyCustomField = "EditOnCallDutyPolicyCustomField",
@@ -1124,11 +1129,6 @@ enum Permission {
   EditService = "EditService",
   ReadService = "ReadService",
 
-  CreateServiceMonitor = "CreateServiceMonitor",
-  DeleteServiceMonitor = "DeleteServiceMonitor",
-  EditServiceMonitor = "EditServiceMonitor",
-  ReadServiceMonitor = "ReadServiceMonitor",
-
   CreateServiceTelemetryService = "CreateServiceTelemetryService",
   DeleteServiceTelemetryService = "DeleteServiceTelemetryService",
   EditServiceTelemetryService = "EditServiceTelemetryService",
@@ -1475,29 +1475,62 @@ export class PermissionHelper {
     );
   }
 
+  /*
+   * Returns permissions that grant access WITHOUT a label restriction.
+   * A permission row grants unrestricted access when:
+   *   - scope === All, OR
+   *   - scope is unset/undefined AND labelIds is empty (legacy: empty
+   *     labels meant no restriction regardless of the permission type).
+   *
+   * Owned-scoped rows are NOT unrestricted — they restrict to owned
+   * resources via OwnedScopePermission — but they also don't contribute
+   * a label filter, so they are excluded here. AccessControlPermission's
+   * early return treats "any unrestricted row" as a broader grant; Owned
+   * rows must not trigger that path.
+   *
+   * We intentionally do NOT consult `isAccessControlPermission` here.
+   * The UI allows attaching labels to role permissions like
+   * IncidentViewer via the role-based form (with scope=Labels); honoring
+   * that requires the filter to look at `scope` + `labelIds`, not the
+   * legacy per-permission flag.
+   */
   public static getNonAccessControlPermissions(
     userPermissions: Array<UserPermission>,
   ): Array<Permission> {
     return userPermissions
       .filter((i: UserPermission) => {
-        return (
-          i.labelIds.length === 0 ||
-          !PermissionHelper.isAccessControlPermission(i.permission)
-        );
+        if (i.scope === PermissionScope.All) {
+          return true;
+        }
+        if (i.scope === PermissionScope.Owned) {
+          return false;
+        }
+        // scope === Labels OR scope === undefined (legacy default)
+        return i.labelIds.length === 0;
       })
       .map((i: UserPermission) => {
         return i.permission;
       });
   }
 
+  /*
+   * Returns permission rows that apply a label-based restriction. Rows
+   * count as label-restricting when they have at least one labelId AND
+   * the scope is `Labels` (explicitly) or unset (legacy default).
+   * All/Owned scopes are excluded — All grants unconditionally and Owned
+   * is handled separately by OwnedScopePermission.
+   */
   public static getAccessControlPermissions(
     userPermissions: Array<UserPermission>,
   ): Array<UserPermission> {
     return userPermissions.filter((i: UserPermission) => {
-      return (
-        i.labelIds.length > 0 &&
-        PermissionHelper.isAccessControlPermission(i.permission)
-      );
+      if (
+        i.scope === PermissionScope.All ||
+        i.scope === PermissionScope.Owned
+      ) {
+        return false;
+      }
+      return i.labelIds.length > 0;
     });
   }
 
@@ -6109,6 +6142,47 @@ export class PermissionHelper {
         group: PermissionGroup.Monitor,
       },
 
+      {
+        permission: Permission.CreateTeamCustomField,
+        title: "Create Team Custom Field",
+        description:
+          "This permission can create Team Custom Field this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Team,
+      },
+      {
+        permission: Permission.DeleteTeamCustomField,
+        title: "Delete Team Custom Field",
+        description:
+          "This permission can delete Team Custom Field of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Team,
+      },
+      {
+        permission: Permission.EditTeamCustomField,
+        title: "Edit Team Custom Field",
+        description:
+          "This permission can edit Team Custom Field of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Team,
+      },
+      {
+        permission: Permission.ReadTeamCustomField,
+        title: "Read Team Custom Field",
+        description:
+          "This permission can read Team Custom Field of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        isRolePermission: false,
+        group: PermissionGroup.Team,
+      },
+
       {
         permission: Permission.CreateIncidentCustomField,
         title: "Create Incident Custom Field",
@@ -7523,47 +7597,6 @@ export class PermissionHelper {
         group: PermissionGroup.ServiceCatalog,
       },
 
-      {
-        permission: Permission.CreateServiceMonitor,
-        title: "Create Service Monitor",
-        description:
-          "This permission can create Service Monitor in this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.DeleteServiceMonitor,
-        title: "Delete Service Monitor",
-        description:
-          "This permission can delete Service Monitor of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.EditServiceMonitor,
-        title: "Edit Service Monitor",
-        description:
-          "This permission can edit Service Monitor of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.ReadServiceMonitor,
-        title: "Read Service Monitor",
-        description:
-          "This permission can read Service Monitor of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-
       {
         permission: Permission.CreateServiceTelemetryService,
         title: "Create Service Telemetry Service",

package/Types/StatusPage/StatusPageLanguage.ts

@@ -20,7 +20,16 @@ export const SUPPORTED_STATUS_PAGE_LANGUAGES: Array<StatusPageLanguage> = [
   { code: "ru", nativeName: "Русский", englishName: "Russian" },
   { code: "ja", nativeName: "日本語", englishName: "Japanese" },
   { code: "ko", nativeName: "한국어", englishName: "Korean" },
-  { code: "zh", nativeName: "中文", englishName: "Chinese" },
+  {
+    code: "zh-CN",
+    nativeName: "简体中文",
+    englishName: "Chinese (Simplified)",
+  },
+  {
+    code: "zh-TW",
+    nativeName: "繁體中文",
+    englishName: "Chinese (Traditional)",
+  },
   { code: "hi", nativeName: "हिन्दी", englishName: "Hindi" },
 ];
 

package/UI/Components/Charts/Area/AreaChart.tsx

@@ -139,7 +139,7 @@ const AreaChartElement: FunctionComponent<AreaInternalProps> = (
         className={className}
         style={style}
         data={records}
-        tickGap={1}
+        tickGap={30}
         index={"Time"}
         categories={categories}
         colors={AreaChartPalette}

package/UI/Components/Charts/Bar/BarChart.tsx

@@ -72,7 +72,7 @@ const BarChartElement: FunctionComponent<BarInternalProps> = (
         className={className}
         style={style}
         data={records}
-        tickGap={1}
+        tickGap={30}
         index={"Time"}
         categories={categories}
         colors={BarChartPalette}

package/UI/Components/Charts/ChartLibrary/AreaChart/AreaChart.tsx

@@ -704,7 +704,11 @@ const AreaChart: React.ForwardRefExoticComponent<
                 : () => {}
             }
             margin={{
-              bottom: (xAxisLabel ? 30 : 8) as unknown as number,
+              bottom: (xAxisLabel
+                ? 40
+                : showXAxis
+                  ? 24
+                  : 8) as unknown as number,
               left: (yAxisLabel ? 20 : 0) as unknown as number,
               right: (yAxisLabel ? 5 : 8) as unknown as number,
               top: 5,

package/UI/Components/Charts/ChartLibrary/BarChart/BarChart.tsx

@@ -794,7 +794,7 @@ const BarChart: React.ForwardRefExoticComponent<
                 }
               : {})}
             margin={{
-              bottom: xAxisLabel ? 30 : 8,
+              bottom: xAxisLabel ? 40 : showXAxis ? 24 : 8,
               left: yAxisLabel ? 20 : 0,
               right: yAxisLabel ? 5 : 8,
               top: 5,

package/UI/Components/Charts/ChartLibrary/LineChart/LineChart.tsx

@@ -710,7 +710,17 @@ const LineChart: React.ForwardRefExoticComponent<
                 : () => {} // do nothing
             }
             margin={{
-              bottom: (xAxisLabel ? 30 : 8) as unknown as number,
+              /*
+               * Tick labels are 10px font with a translate(0, 6) — they
+               * need ~20px of bottom space, plus another ~20px for the
+               * optional axis label. 8px (the no-axis case) is only
+               * valid when the axis is hidden entirely.
+               */
+              bottom: (xAxisLabel
+                ? 40
+                : showXAxis
+                  ? 24
+                  : 8) as unknown as number,
               left: (yAxisLabel ? 20 : 0) as unknown as number,
               right: (yAxisLabel ? 5 : 8) as unknown as number,
               top: 5,

package/UI/Components/Charts/Line/LineChart.tsx

@@ -119,7 +119,7 @@ const LineChartElement: FunctionComponent<LineInternalProps> = (
         className={className}
         style={style}
         data={records}
-        tickGap={1}
+        tickGap={30}
         index={"Time"}
         categories={categories}
         colors={LineChartPalette}

package/UI/Components/Charts/Utils/XAxis.ts

@@ -32,10 +32,15 @@ export default class XAxisUtil {
     const totalMonths: number = totalDays / 30;
 
     /*
-     * Thresholds are chosen so that the number of tick labels
-     * stays between ~6 and ~15 for any range, keeping the axis readable.
+     * Mirror the server's aggregation interval (see
+     * AggregateUtil.getAggregationInterval) so the chart renders one
+     * point per backend bucket instead of re-bucketing them into
+     * coarser groups. Previously a 1h range was rendered with EVERY_
+     * FIVE_MINUTES (~12 points) even though the server returned 60
+     * per-minute rows. Recharts thins the X-axis label set via
+     * `interval="equidistantPreserveStart"`, so high point counts do
+     * not crowd the labels.
      */
-
     if (totalSeconds <= 15) {
       return XAxisPrecision.EVERY_SECOND;
     }
@@ -48,57 +53,21 @@ export default class XAxisUtil {
     if (totalSeconds <= 450) {
       return XAxisPrecision.EVERY_THIRTY_SECONDS;
     }
-    if (totalMinutes <= 15) {
+    if (totalHours <= 3) {
       return XAxisPrecision.EVERY_MINUTE;
     }
-    if (totalMinutes <= 75) {
-      return XAxisPrecision.EVERY_FIVE_MINUTES;
-    }
-    if (totalMinutes <= 150) {
-      return XAxisPrecision.EVERY_TEN_MINUTES;
-    }
-    if (totalMinutes <= 450) {
-      return XAxisPrecision.EVERY_THIRTY_MINUTES;
-    }
-    if (totalHours <= 15) {
+    if (totalDays <= 7) {
       return XAxisPrecision.EVERY_HOUR;
     }
-    if (totalHours <= 30) {
-      return XAxisPrecision.EVERY_TWO_HOURS;
-    }
-    if (totalHours <= 45) {
-      return XAxisPrecision.EVERY_THREE_HOURS;
-    }
-    if (totalHours <= 90) {
-      return XAxisPrecision.EVERY_SIX_HOURS;
-    }
-    if (totalHours <= 180) {
-      return XAxisPrecision.EVERY_TWELVE_HOURS;
-    }
-    if (totalDays <= 15) {
+    if (totalWeeks <= 6) {
       return XAxisPrecision.EVERY_DAY;
     }
-    if (totalDays <= 30) {
-      return XAxisPrecision.EVERY_TWO_DAYS;
-    }
-    if (totalWeeks <= 15) {
+    if (totalMonths <= 6) {
       return XAxisPrecision.EVERY_WEEK;
     }
-    if (totalWeeks <= 30) {
-      return XAxisPrecision.EVERY_TWO_WEEKS;
-    }
-    if (totalMonths <= 15) {
+    if (totalMonths <= 72) {
       return XAxisPrecision.EVERY_MONTH;
     }
-    if (totalMonths <= 30) {
-      return XAxisPrecision.EVERY_TWO_MONTHS;
-    }
-    if (totalMonths <= 45) {
-      return XAxisPrecision.EVERY_THREE_MONTHS;
-    }
-    if (totalMonths <= 90) {
-      return XAxisPrecision.EVERY_SIX_MONTHS;
-    }
     return XAxisPrecision.EVERY_YEAR;
   }
 
@@ -283,11 +252,15 @@ export default class XAxisUtil {
           return OneUptimeDate.getLocalTimeString(roundedValue);
         };
       case XAxisPrecision.EVERY_HOUR:
+        /*
+         * Include date — hourly buckets can span multiple days, where
+         * a bare "HH" repeats and is ambiguous.
+         */
         return (value: Date) => {
-          return OneUptimeDate.getLocalTimeString(value, {
-            includeMinutes: false,
-          });
-        }; // HH:00
+          const roundedValue: Date = this.cloneDate(value);
+          roundedValue.setMinutes(0, 0, 0);
+          return OneUptimeDate.getDateAsLocalDayMonthHourString(roundedValue);
+        };
       case XAxisPrecision.EVERY_TWO_HOURS:
         return (value: Date) => {
           const roundedValue: Date = this.cloneDate(value);