@oneuptime/common 14.0.3 → 14.0.6

package/Tests/App/Dashboard/AIInsightsResourcePageContext.test.ts

@@ -7,6 +7,7 @@ import { encodeServiceNameForUrl } from "../../../../App/FeatureSet/Dashboard/sr
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import CephCluster from "../../../Models/DatabaseModels/CephCluster";
 import CloudResource from "../../../Models/DatabaseModels/CloudResource";
+import DatabaseServer from "../../../Models/DatabaseModels/DatabaseServer";
 import DockerHost from "../../../Models/DatabaseModels/DockerHost";
 import DockerSwarmCluster from "../../../Models/DatabaseModels/DockerSwarmCluster";
 import Host from "../../../Models/DatabaseModels/Host";
@@ -116,6 +117,12 @@ const RESOURCES: Array<ResourceCase> = [
     modelType: NetworkDevice,
     chip: "This network device",
   },
+  {
+    type: AIResourceType.DatabaseServer,
+    path: "databases",
+    modelType: DatabaseServer,
+    chip: "This database",
+  },
 ];
 
 interface ChildCase {
@@ -521,6 +528,40 @@ describe("AI Insights infrastructure routes", () => {
     },
   );
 
+  test("every tab of a database is the database itself - never a child identity", () => {
+    for (const tab of [
+      "endpoints",
+      "traces",
+      "owners",
+      "recommendations",
+      "documentation",
+      "feed",
+    ]) {
+      expect(navigateTo(`databases/${ENTITY_ID}/${tab}`)).toMatchObject({
+        type: AIChatPageContextType.Resource,
+        resourceType: AIResourceType.DatabaseServer,
+        entityId: ENTITY_ID,
+        noun: "database",
+        chipLabel: "This database",
+        isEntity: true,
+      });
+      expect(PageContextUtil.detectPageContext()?.subresource).toBeUndefined();
+    }
+  });
+
+  test("a database page's context survives sanitization for the server", () => {
+    const context: DashboardPageContext = requireContext(
+      `databases/${ENTITY_ID}/metrics`,
+    );
+    expect(
+      AIChatPageContextHelper.sanitize(context as unknown as JSONObject),
+    ).toEqual({
+      type: AIChatPageContextType.Resource,
+      resourceType: AIResourceType.DatabaseServer,
+      entityId: ENTITY_ID,
+    });
+  });
+
   test("does not invent a namespace or confuse a Kubernetes pod name with a UUID", () => {
     const context: DashboardPageContext = requireContext(
       `kubernetes/${ENTITY_ID}/pods/api`,
@@ -574,6 +615,7 @@ describe("AI Insights infrastructure routes", () => {
     "hostile",
     "podman-other",
     "kubernetes-other",
+    "databases-other",
   ])("does not claim unsupported resource page %s", (path: string) => {
     expect(navigateTo(path)).toBeNull();
   });

package/Tests/App/Dashboard/AffectedResourcesDisplay.test.tsx

@@ -34,9 +34,11 @@ jest.mock(
 import AffectedResourcesDisplay, {
   getAffectedResourcesGridClassName,
 } from "../../../../App/FeatureSet/Dashboard/src/Components/AffectedResources/AffectedResourcesDisplay";
+import AffectedResourcesCell from "../../../../App/FeatureSet/Dashboard/src/Components/AffectedResources/AffectedResourcesCell";
 import Monitor from "../../../Models/DatabaseModels/Monitor";
 import Service from "../../../Models/DatabaseModels/Service";
 import Host from "../../../Models/DatabaseModels/Host";
+import DatabaseServer from "../../../Models/DatabaseModels/DatabaseServer";
 import Color from "../../../Types/Color";
 
 const LONG_MONITOR_NAME: string =
@@ -240,3 +242,101 @@ describe("AffectedResourcesDisplay item names", () => {
     expect(count).toHaveClass("flex-shrink-0");
   });
 });
+
+describe("AffectedResourcesDisplay databases", () => {
+  const DATABASE_ID: string = "dddddddd-dddd-4ddd-8ddd-ddddddddddd1";
+
+  const buildDatabase: (id: string, name: string) => DatabaseServer = (
+    id: string,
+    name: string,
+  ): DatabaseServer => {
+    const database: DatabaseServer = new DatabaseServer();
+    database._id = id;
+    database.name = name;
+    return database;
+  };
+
+  test("attached databases get their own card, counted with the rest", () => {
+    render(
+      <AffectedResourcesDisplay
+        monitors={MONITORS}
+        databaseServers={[
+          buildDatabase(DATABASE_ID, "PostgreSQL db.prod:5432"),
+          buildDatabase(
+            "dddddddd-dddd-4ddd-8ddd-ddddddddddd2",
+            "Redis cache.prod:6379",
+          ),
+        ]}
+      />,
+    );
+
+    const grid: HTMLElement = screen.getByTestId("affected-resources-grid");
+    expect(within(grid).getByText("Databases")).toBeInTheDocument();
+    expect(
+      within(grid).getByText("PostgreSQL db.prod:5432"),
+    ).toBeInTheDocument();
+    expect(within(grid).getByText("Redis cache.prod:6379")).toBeInTheDocument();
+    expect(screen.getByText("4 resources")).toBeInTheDocument();
+    expect(screen.getByText("across 2 categories")).toBeInTheDocument();
+  });
+
+  test("a database links to its own page", () => {
+    render(
+      <AffectedResourcesDisplay
+        databaseServers={[
+          buildDatabase(DATABASE_ID, "PostgreSQL db.prod:5432"),
+        ]}
+      />,
+    );
+
+    const link: HTMLElement | null = screen
+      .getByText("PostgreSQL db.prod:5432")
+      .closest("a");
+    expect(link).not.toBeNull();
+    expect(link!.getAttribute("href")).toContain(`/databases/${DATABASE_ID}`);
+  });
+
+  test("databases alone are not the empty state", () => {
+    render(
+      <AffectedResourcesDisplay
+        databaseServers={[buildDatabase(DATABASE_ID, "MySQL orders:3306")]}
+        emptyMessage="Nothing hit."
+      />,
+    );
+
+    expect(screen.queryByText("Nothing hit.")).toBeNull();
+    expect(screen.getByText("1 resource")).toBeInTheDocument();
+    expect(screen.getByText("across 1 category")).toBeInTheDocument();
+  });
+
+  test("the table cell lists a database beside the other resources", () => {
+    render(
+      <AffectedResourcesCell
+        services={SERVICES}
+        databaseServers={[
+          buildDatabase(DATABASE_ID, "PostgreSQL db.prod:5432"),
+        ]}
+      />,
+    );
+
+    expect(screen.getByText("checkout-api")).toBeInTheDocument();
+    const database: HTMLElement = screen.getByText("PostgreSQL db.prod:5432");
+    expect(database.closest("a")!.getAttribute("href")).toContain(
+      `/databases/${DATABASE_ID}`,
+    );
+  });
+
+  test("hideDatabaseServers drops the card", () => {
+    render(
+      <AffectedResourcesDisplay
+        monitors={MONITORS}
+        databaseServers={[buildDatabase(DATABASE_ID, "MySQL orders:3306")]}
+        hideDatabaseServers={true}
+      />,
+    );
+
+    expect(screen.queryByText("Databases")).toBeNull();
+    expect(screen.queryByText("MySQL orders:3306")).toBeNull();
+    expect(screen.getByText("2 resources")).toBeInTheDocument();
+  });
+});

package/Tests/App/Dashboard/AffectedResourcesPicker.test.tsx

@@ -66,6 +66,7 @@ import AffectedResourcesPicker, {
 } from "../../../../App/FeatureSet/Dashboard/src/Components/AffectedResources/AffectedResourcesPicker";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import CephCluster from "../../../Models/DatabaseModels/CephCluster";
+import DatabaseServer from "../../../Models/DatabaseModels/DatabaseServer";
 import DockerHost from "../../../Models/DatabaseModels/DockerHost";
 import DockerSwarmCluster from "../../../Models/DatabaseModels/DockerSwarmCluster";
 import Host from "../../../Models/DatabaseModels/Host";
@@ -222,6 +223,7 @@ const ALL_RESOURCE_TYPES: Array<AffectedResourceType> = [
   "CephCluster",
   "DockerSwarmCluster",
   "IoTFleet",
+  "DatabaseServer",
   "NetworkSite",
   "Service",
 ];
@@ -426,6 +428,7 @@ describe("toItems", () => {
       cephClusters: [],
       dockerSwarmClusters: [],
       iotFleets: [],
+      databaseServers: [],
       networkSites: [],
       services: [],
     };
@@ -540,6 +543,7 @@ describe("AffectedResourcesPicker chips for resources that arrive as bare IDs",
       CephCluster: CephCluster,
       DockerSwarmCluster: DockerSwarmCluster,
       IoTFleet: IoTFleet,
+      DatabaseServer: DatabaseServer,
       NetworkSite: NetworkSite,
       Service: Service,
     };
@@ -564,6 +568,7 @@ describe("AffectedResourcesPicker chips for resources that arrive as bare IDs",
       cephClusters: idFor("CephCluster"),
       dockerSwarmClusters: idFor("DockerSwarmCluster"),
       iotFleets: idFor("IoTFleet"),
+      databaseServers: idFor("DatabaseServer"),
       networkSites: idFor("NetworkSite"),
       services: idFor("Service"),
       resourceTypes: ALL_RESOURCE_TYPES,
@@ -608,6 +613,87 @@ describe("AffectedResourcesPicker chips for resources that arrive as bare IDs",
     expect(screen.queryByText("web-01")).toBeNull();
   });
 
+  test("a database chip is named from the DatabaseServer table", async () => {
+    seed(DatabaseServer, [{ _id: id(60), name: "PostgreSQL db.prod:5432" }]);
+
+    renderPicker({
+      databaseServers: asModels<DatabaseServer>([id(60)]),
+      resourceTypes: ["Monitor", "DatabaseServer"],
+    });
+
+    expect(
+      await screen.findByText("PostgreSQL db.prod:5432"),
+    ).toBeInTheDocument();
+    const calls: Array<GetListArgs> = lookupCalls();
+    expect(calls).toHaveLength(1);
+    expect(calls[0]!.modelType).toBe(DatabaseServer);
+    expect(lookedUpIds(calls[0]!)).toEqual([id(60)]);
+  });
+
+  test("Databases are not in the default set: a saved database is neither looked up nor dropped", async () => {
+    seed(Monitor, [{ _id: MONITOR_ID, name: MONITOR_NAME }]);
+    seed(DatabaseServer, [{ _id: id(61), name: "MySQL orders:3306" }]);
+    const payloads: Array<AffectedResourcesPayload> = [];
+
+    render(
+      <AffectedResourcesPicker
+        monitors={asModels<Monitor>([MONITOR_ID])}
+        databaseServers={asModels<DatabaseServer>([id(61)])}
+        onChange={(payload: AffectedResourcesPayload) => {
+          payloads.push(payload);
+        }}
+      />,
+    );
+
+    await screen.findByText(MONITOR_NAME);
+    expect(screen.queryByText("MySQL orders:3306")).toBeNull();
+    expect(
+      lookupCalls().map((call: GetListArgs) => {
+        return call.modelType;
+      }),
+    ).not.toContain(DatabaseServer);
+
+    fireEvent.click(
+      screen.getByRole("button", { name: `Remove ${MONITOR_NAME}` }),
+    );
+
+    expect(payloads).toHaveLength(1);
+    expect(payloads[0]!.monitors).toEqual([]);
+    // Handed back untouched, or saving would detach the database.
+    expect(payloads[0]!.databaseServers).toEqual([id(61)]);
+  });
+
+  test("a page that offers Databases writes the selection back under databaseServers", async () => {
+    seed(DatabaseServer, [
+      { _id: id(62), name: "PostgreSQL db.prod:5432" },
+      { _id: id(63), name: "Redis cache.prod:6379" },
+    ]);
+    const payloads: Array<AffectedResourcesPayload> = [];
+
+    render(
+      <AffectedResourcesPicker
+        databaseServers={asModels<DatabaseServer>([id(62), id(63)])}
+        resourceTypes={["DatabaseServer"]}
+        onChange={(payload: AffectedResourcesPayload) => {
+          payloads.push(payload);
+        }}
+      />,
+    );
+
+    fireEvent.click(
+      await screen.findByRole("button", {
+        name: "Remove PostgreSQL db.prod:5432",
+      }),
+    );
+
+    expect(payloads[payloads.length - 1]!.databaseServers).toEqual([id(63)]);
+  });
+
+  test("an unnamed or unreadable database reads as a Database", () => {
+    expect(getUnnamedResourceLabel("DatabaseServer")).toBe("Unnamed Database");
+    expect(getUnknownResourceLabel("DatabaseServer")).toBe("Unknown Database");
+  });
+
   test(`splits a large selection into batches of ${NAME_LOOKUP_BATCH_SIZE}`, async () => {
     const count: number = NAME_LOOKUP_BATCH_SIZE * 2 + 50;
     const ids: Array<string> = [];

package/Tests/App/Dashboard/AffectedResourcesPickerHiddenTypes.test.tsx

@@ -167,6 +167,7 @@ const INCIDENT_PAGE_TYPES: Array<AffectedResourceType> = [
   "CephCluster",
   "DockerSwarmCluster",
   "IoTFleet",
+  "DatabaseServer",
   "Service",
 ];
 
@@ -637,6 +638,7 @@ const AFFECTED_RESOURCE_FIELDS: Array<ModelField<Incident>> = [
             cephClusters: payload.cephClusters,
             dockerSwarmClusters: payload.dockerSwarmClusters,
             iotFleets: payload.iotFleets,
+            databaseServers: payload.databaseServers,
             services: payload.services,
           } as FormValues<Incident>);
         });

package/Tests/App/Dashboard/AffectedResourcesSummaryStep.test.tsx

@@ -112,6 +112,7 @@ const RESOURCE_PROPS: Record<ResourceProp, true> = {
   cephClusters: true,
   dockerSwarmClusters: true,
   iotFleets: true,
+  databaseServers: true,
   networkSites: true,
   services: true,
 };
@@ -288,6 +289,24 @@ describe("the Resources Affected summary step", () => {
       );
     });
 
+    test("offers databases and names them, singular and plural", async () => {
+      const [step] = findPickerSteps(await openForm(page));
+
+      expect(step!.resourceProps).toContain("databaseServers");
+      expect(renderSummary(step!, { databaseServers: ids(1) })).toContain(
+        "1 database",
+      );
+      expect(renderSummary(step!, { databaseServers: ids(1) })).not.toContain(
+        "1 databases",
+      );
+      expect(renderSummary(step!, { databaseServers: ids(2) })).toContain(
+        "2 databases",
+      );
+      expect(renderSummary(step!, { databaseServers: ids(2) })).not.toMatch(
+        NOTHING_SELECTED_PATTERN,
+      );
+    });
+
     test("lists Podman hosts alongside the other resource types", async () => {
       const [step] = findPickerSteps(await openForm(page));
 

package/Tests/App/Dashboard/BreadcrumbCoverage.test.tsx

@@ -6,6 +6,7 @@ import { matchRoutes } from "react-router-dom";
 import PageMap from "../../../../App/FeatureSet/Dashboard/src/Utils/PageMap";
 import RouteMap, {
   AlertsRoutePath,
+  DatabaseRoutePath,
   IncidentsRoutePath,
   MonitorsRoutePath,
   ScheduledMaintenanceEventsRoutePath,
@@ -16,6 +17,7 @@ import RouteMap, {
 } from "../../../../App/FeatureSet/Dashboard/src/Utils/RouteMap";
 import { getSloBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Pages/Slo/Utils/Breadcrumbs";
 import { getAlertsBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Utils/Breadcrumbs/AlertBreadcrumbs";
+import { getDatabaseBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Utils/Breadcrumbs/DatabaseBreadcrumbs";
 import { getIncidentsBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Utils/Breadcrumbs/IncidentBreadcrumbs";
 import { getMonitorBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Utils/Breadcrumbs/MonitorBreadcrumbs";
 import { getScheduleMaintenanceBreadcrumbs } from "../../../../App/FeatureSet/Dashboard/src/Utils/Breadcrumbs/ScheduledMaintenanceBreadcrumbs";
@@ -82,6 +84,18 @@ const products: Array<Product> = [
     routes: SloRoutePath,
     getBreadcrumbs: getSloBreadcrumbs,
   },
+  {
+    /*
+     * DatabaseRoutePath mixes list-layout pages (archived, documentation,
+     * settings/label-rules/:id) with the `:id` view pages, so this also
+     * proves `archived` and `documentation` are not matched as a database
+     * id — and the Archived list, unlike some older products, has a trail.
+     */
+    name: "Databases",
+    landing: PageMap.DATABASE_SERVERS,
+    routes: DatabaseRoutePath,
+    getBreadcrumbs: getDatabaseBreadcrumbs,
+  },
   {
     /*
      * WorkflowRoutePath puts the global variable view page

package/Tests/App/Dashboard/CorrelateFilterBuilder.test.tsx

@@ -21,6 +21,12 @@ import {
   CorrelationOperator,
 } from "../../../../App/FeatureSet/Dashboard/src/Utils/SecurityEventCorrelation";
 import OcsfSeverity from "../../../Types/SecurityEvent/OcsfSeverity";
+import {
+  LAPTOP_WIDTH_IN_PX,
+  PHONE_WIDTH_IN_PX,
+  TABLET_WIDTH_IN_PX,
+  isVisibleAtWidth,
+} from "../../ResponsiveVisibility";
 
 /*
  * The correlate filter builder rows (issue #3395): field + operator + value
@@ -474,8 +480,27 @@ describe("CorrelateFilterBuilder layout", () => {
     expect(lead).toHaveTextContent("Where");
     // Stacked rows on small screens: the cell collapses instead of a gap.
     expect(classTokens(lead)).toEqual(
-      expect.arrayContaining(["hidden", "md:block", "md:w-14", "shrink-0"]),
+      expect.arrayContaining([
+        "max-md:hidden",
+        "md:block",
+        "md:w-14",
+        "shrink-0",
+      ]),
     );
+    expect(isVisibleAtWidth(lead, PHONE_WIDTH_IN_PX)).toBe(false);
+    expect(isVisibleAtWidth(lead, TABLET_WIDTH_IN_PX)).toBe(true);
+    /*
+     * `max-md:hidden`, never the bare `hidden`: a foreign
+     * `.hidden { display: none !important }` rule on the page would beat
+     * `md:block` and drop the label from every width, leaving the first row
+     * without its "Where" and the dropdowns out of line with the rows below.
+     */
+    expect(classTokens(lead)).not.toContain("hidden");
+    expect(
+      isVisibleAtWidth(lead, LAPTOP_WIDTH_IN_PX, {
+        withForeignHiddenRule: true,
+      }),
+    ).toBe(true);
     // The first row never carries a connector badge.
     expect(
       elementsWithOwnText(