@oneuptime/common 8.0.5571 → 8.0.5573

package/Models/DatabaseModels/AlertFeed.ts

@@ -10,6 +10,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -418,6 +419,7 @@ export default class AlertFeed extends BaseModel {
     ],
     update: [],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     required: true,

package/Models/DatabaseModels/AlertSeverity.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -378,6 +379,7 @@ export default class AlertSeverity extends BaseModel {
       Permission.EditAlertSeverity,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/AlertState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -356,6 +357,7 @@ export default class AlertState extends BaseModel {
       Permission.EditAlertState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts

@@ -15,6 +15,7 @@ import TableColumn, {
   getTableColumns,
 } from "../../../Types/Database/TableColumn";
 import TableColumnType from "../../../Types/Database/TableColumnType";
+import { getFirstColorFieldColumn } from "../../../Types/Database/ColorField";
 import Dictionary from "../../../Types/Dictionary";
 import Email from "../../../Types/Email";
 import BadDataException from "../../../Types/Exception/BadDataException";
@@ -203,6 +204,10 @@ export default class DatabaseBaseModel extends BaseEntity {
     return new Columns(Object.keys(getTableColumns(this)));
   }
 
+  public getFirstColorColumn(): string | null {
+    return getFirstColorFieldColumn(this);
+  }
+
   public canQueryMultiTenant(): boolean {
     return Boolean(this.isMultiTenantRequestAllowed);
   }

package/Models/DatabaseModels/IncidentSeverity.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -378,6 +379,7 @@ export default class IncidentSeverity extends BaseModel {
       Permission.EditIncidentSeverity,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/IncidentState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -380,6 +381,7 @@ export default class IncidentState extends BaseModel {
       Permission.EditIncidentState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/Label.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -365,6 +366,7 @@ export default class Label extends AccessControlModel {
       Permission.EditProjectLabel,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/MonitorStatus.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -379,6 +380,7 @@ export default class MonitorStatus extends BaseModel {
       Permission.EditProjectMonitorStatus,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/ScheduledMaintenanceFeed.ts

@@ -10,6 +10,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -422,6 +423,7 @@ export default class ScheduledMaintenanceFeed extends BaseModel {
     ],
     update: [],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     required: true,

package/Models/DatabaseModels/ScheduledMaintenanceState.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -380,6 +381,7 @@ export default class ScheduledMaintenanceState extends BaseModel {
       Permission.EditScheduledMaintenanceState,
     ],
   })
+  @ColorField()
   @TableColumn({
     title: "Color",
     required: true,

package/Models/DatabaseModels/ServiceCatalog.ts

@@ -14,6 +14,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -448,6 +449,7 @@ export default class ServiceCatalog extends BaseModel {
       Permission.EditServiceCatalog,
     ],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     title: "Service Color",

package/Models/DatabaseModels/TelemetryService.ts

@@ -12,6 +12,7 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
+import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -505,6 +506,7 @@ export default class TelemetryService extends BaseModel {
       Permission.EditTelemetryService,
     ],
   })
+  @ColorField()
   @TableColumn({
     type: TableColumnType.Color,
     title: "Service Color",

package/Server/Services/TeamMemberService.ts

@@ -345,7 +345,12 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
           },
         });
 
-        if (membersInTeam.toNumber() <= 1) {
+        // Skip the one-member guard when SCIM manages membership for the project.
+        const isSCIMEnabled: boolean = await this.isSCIMEnabled(
+          member.projectId!,
+        );
+
+        if (!isSCIMEnabled && membersInTeam.toNumber() <= 1) {
           throw new BadDataException(
             Errors.TeamMemberService.ONE_MEMBER_REQUIRED,
           );

package/Tests/UI/Components/Pill.test.tsx

@@ -2,6 +2,7 @@ import Pill, { PillSize } from "../../../UI/Components/Pill/Pill";
 import "@testing-library/jest-dom/extend-expect";
 import { render, screen } from "@testing-library/react";
 import Color from "../../../Types/Color";
+import IconProp from "../../../Types/Icon/IconProp";
 import * as React from "react";
 import { describe, expect, test } from "@jest/globals";
 
@@ -46,4 +47,11 @@ describe("<Pill />", () => {
     render(<Pill text="Love" color={color} size={PillSize.ExtraLarge} />);
     expect(screen.getByTestId("pill")).toHaveStyle("backgroundColor:  #786598");
   });
+  test("renders icon when provided", () => {
+    const color: Color = new Color("#807149");
+    const { container } = render(
+      <Pill text="Love" color={color} icon={IconProp.Label} />,
+    );
+    expect(container.querySelector('[role="icon"]')).not.toBeNull();
+  });
 });

package/Types/Color.ts

@@ -19,9 +19,9 @@ export default class Color extends DatabaseProperty {
     this._color = v;
   }
 
-  public constructor(color: string) {
+  public constructor(color: string | Color) {
     super();
-    this.color = color;
+    this.color = color.toString();
   }
 
   public override toString(): string {

package/Types/Database/ColorField.ts

@@ -0,0 +1,64 @@
+import type BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import { ReflectionMetadataType } from "../Reflection";
+import "reflect-metadata";
+
+const colorFieldSymbol: symbol = Symbol("ColorField");
+
+type ColorFieldColumnsFunction = <T extends BaseModel>(
+  target: T,
+) => Array<string>;
+
+type FirstColorFieldColumnFunction = <T extends BaseModel>(
+  target: T,
+) => string | null;
+
+type IsColorFieldColumnFunction = <T extends BaseModel>(
+  target: T,
+  propertyKey: string,
+) => boolean;
+
+const ColorField: () => ReflectionMetadataType = () => {
+  return Reflect.metadata(colorFieldSymbol, true);
+};
+
+export const isColorFieldColumn: IsColorFieldColumnFunction = <
+  T extends BaseModel,
+>(
+  target: T,
+  propertyKey: string,
+): boolean => {
+  return Boolean(Reflect.getMetadata(colorFieldSymbol, target, propertyKey));
+};
+
+export const getColorFieldColumns: ColorFieldColumnsFunction = <
+  T extends BaseModel,
+>(
+  target: T,
+): Array<string> => {
+  const columns: Array<string> = [];
+  const keys: Array<string> = Object.keys(target);
+
+  for (const key of keys) {
+    if (isColorFieldColumn(target, key)) {
+      columns.push(key);
+    }
+  }
+
+  return columns;
+};
+
+export const getFirstColorFieldColumn: FirstColorFieldColumnFunction = <
+  T extends BaseModel,
+>(
+  target: T,
+): string | null => {
+  const columns: Array<string> = getColorFieldColumns(target);
+
+  if (columns.length === 0) {
+    return null;
+  }
+
+  return columns[0] as string;
+};
+
+export default ColorField;

package/Types/Icon/IconProp.ts

@@ -98,6 +98,7 @@ enum IconProp {
   False = "False",
   Text = "Text",
   Circle = "Circle",
+  EmptyCircle = "EmptyCircle",
   Webhook = "Webhook",
   SendMessage = "SendMessage",
   ExternalLink = "ExternalLink",