@@ -79,6 +79,9 @@ describe("OnCallFiringHistory", () => {
it("explains an empty history rather than showing a bare frame", () => {
const wrapper = render([]);
expect(wrapper.find('[data-test="oncall-firing-history-empty"]').exists()).toBe(true);
+ expect(wrapper.text()).toContain("No earlier firings");
+ // A pager reading "0 - 0 of 0" under an empty state says nothing.
+ expect(wrapper.findComponent({ name: "OTable" }).props("pagination")).toBe("none");
});
/// Before `loading` existed, an in-flight fetch and a genuinely first-ever
diff --git a/web/src/components/oncall/OnCallFiringHistory.vue b/web/src/components/oncall/OnCallFiringHistory.vue
index 4b267cb321..95d865fdea 100644
--- a/web/src/components/oncall/OnCallFiringHistory.vue
+++ b/web/src/components/oncall/OnCallFiringHistory.vue
@@ -33,7 +33,7 @@ along with this program. If not, see
.
row-key="id"
:frame="false"
:loading="loading"
- pagination="client"
+ :pagination="firings.length ? 'client' : 'none'"
:show-global-filter="false"
table-id="oncall-firing-history"
data-test="oncall-firing-history-table"
@@ -61,13 +61,12 @@ along with this program. If not, see
.
{{ ABSENT }}
-
diff --git a/web/src/components/oncall/OnCallMyDeliveries.spec.ts b/web/src/components/oncall/OnCallMyDeliveries.spec.ts
index c949b01d28..15c3bfed77 100644
--- a/web/src/components/oncall/OnCallMyDeliveries.spec.ts
+++ b/web/src/components/oncall/OnCallMyDeliveries.spec.ts
@@ -151,7 +151,13 @@ describe("OnCallMyDeliveries", () => {
answer([
delivery({ event_id: "ev_1", response_id: "resp_1", at: AT }),
delivery({ event_id: "ev_2", response_id: "resp_2", at: AT + 1 }),
- delivery({ event_id: "ev_3", response_id: "resp_3", subject_id: "al_other", at: AT + 2 }),
+ delivery({
+ event_id: "ev_3",
+ response_id: "resp_3",
+ subject_id: "al_other",
+ title: "disk full",
+ at: AT + 2,
+ }),
]);
const wrapper = render();
await flushPromises();
@@ -160,6 +166,35 @@ describe("OnCallMyDeliveries", () => {
expect(historyRows(wrapper)[1].text()).toContain("×2");
});
+ /// An alert and the incident it opened page under one name; two rows the reader cannot tell apart are one.
+ it("groups pages that share a name across subjects and teams", async () => {
+ answer([
+ delivery({ event_id: "ev_1", response_id: "resp_1", team_id: "team_dev", at: AT }),
+ delivery({
+ event_id: "ev_2",
+ response_id: "resp_2",
+ subject_type: "incident",
+ subject_id: "inc_1#1",
+ team_id: "team_dev",
+ at: AT + 1,
+ }),
+ delivery({
+ event_id: "ev_3",
+ response_id: "resp_3",
+ subject_type: "incident",
+ subject_id: "inc_2#1",
+ team_id: "team_sre",
+ at: AT + 2,
+ }),
+ ]);
+ const wrapper = render({ teamNames: { team_dev: "Dev Team", team_sre: "Platform SRE" } });
+ await flushPromises();
+
+ expect(historyRows(wrapper)).toHaveLength(1);
+ expect(historyRows(wrapper)[0].text()).toContain("×3");
+ expect(historyRows(wrapper)[0].text()).toContain("Platform SRE, Dev Team");
+ });
+
/// The subject id ends in the firing number, so two firings of one alert are still one row.
it("groups an alert's firings into one row", async () => {
answer([
@@ -296,7 +331,9 @@ describe("OnCallMyDeliveries", () => {
answer([delivery({ read: true, response_state: "resolved" })]);
const wrapper = render();
await flushPromises();
- expect(wrapper.find('[data-test="oncall-my-deliveries-unread-toggle"]').exists()).toBe(false);
+ expect(wrapper.find('[data-test="oncall-my-deliveries-controls"]').classes()).toContain(
+ "invisible",
+ );
expect(wrapper.find('[data-test="oncall-my-delivery-more-ev_88"]').exists()).toBe(true);
const toggle = wrapper.findComponent('[data-test="oncall-my-delivery-toggle-ev_88"]');
expect(toggle.props("iconLeft")).toBe("mail");
@@ -307,11 +344,35 @@ describe("OnCallMyDeliveries", () => {
);
});
- /// An empty list has nothing to narrow, so it offers no filter.
- it("offers no unread filter on an empty list", async () => {
+ /// An empty list has nothing to narrow, so the filter is hidden; it keeps its slot so the header never reflows.
+ it("hides the unread filter on an empty list without removing its slot", async () => {
const wrapper = render();
await flushPromises();
- expect(wrapper.find('[data-test="oncall-my-deliveries-unread-toggle"]').exists()).toBe(false);
+ expect(wrapper.find('[data-test="oncall-my-deliveries-controls"]').classes()).toContain(
+ "invisible",
+ );
+ });
+
+ it("shows the filter and Mark all read once something is unread", async () => {
+ answer([delivery({ read: false })]);
+ const wrapper = render();
+ await flushPromises();
+ expect(wrapper.find('[data-test="oncall-my-deliveries-controls"]').classes()).not.toContain(
+ "invisible",
+ );
+ expect(wrapper.find('[data-test="oncall-my-deliveries-read-all"]').classes()).not.toContain(
+ "invisible",
+ );
+ });
+
+ /// A reader on no team has no page to test, so the empty history points them at a team instead.
+ it("offers Join a team on an empty history when the reader is on no team", async () => {
+ const wrapper = render({ noTeam: true });
+ await flushPromises();
+ const action = wrapper.find('[data-test="empty-action"]');
+ expect(action.text()).toBe("Join a team");
+ await action.trigger("click");
+ expect(wrapper.emitted("join-team")).toHaveLength(1);
});
/// Unticking answers from the cache at once, so the slower "unread only" answer must not narrow a widened inbox.
@@ -476,8 +537,8 @@ describe("OnCallMyDeliveries", () => {
);
});
- /// A column of empty dots says nothing, so the unread column only exists while something is unread.
- it("leaves out the unread column when nothing is unread", async () => {
+ /// The dot column is always there: arriving with the first unread row shifted every other column. Actions are not pinned.
+ it("keeps the unread column when nothing is unread", async () => {
answer([delivery({ read: true })]);
const wrapper = render();
await flushPromises();
@@ -486,13 +547,15 @@ describe("OnCallMyDeliveries", () => {
id: string;
}[];
expect(columns.map((c) => c.id)).toEqual([
+ "unread",
"page",
"team",
"state",
"channels",
"at",
- "actions",
+ "row-actions",
]);
+ expect(columns.some((c) => "pinned" in c)).toBe(false);
});
it("names the team that the empty history's test page goes to", async () => {
diff --git a/web/src/components/oncall/OnCallMyDeliveries.vue b/web/src/components/oncall/OnCallMyDeliveries.vue
index 6347239bee..c363be0bc6 100644
--- a/web/src/components/oncall/OnCallMyDeliveries.vue
+++ b/web/src/components/oncall/OnCallMyDeliveries.vue
@@ -109,7 +109,12 @@ along with this program. If not, see
.
{{ t("oncall.myDeliveriesUnread", { count: unread }, unread) }}
-
+
+
.
@update:model-value="(v: CheckboxModelValue) => setUnreadOnly(!!v)"
/>
.
{{ raw(clock(row.latest.at)) }}
-
+
.
size="block"
icon="notifications-active"
:title="unreadOnly ? t('oncall.myDeliveriesNoUnread') : t('oncall.myDeliveriesNone')"
- :action-label="
- unreadOnly || !canTest
- ? undefined
- : testTeamName
- ? t('oncall.mineTestTeam', { team: raw(testTeamName) })
- : t('oncall.mineTestTeamPage')
- "
- action-icon="campaign"
+ :action-label="emptyAction?.label"
+ :action-icon="emptyAction?.icon"
data-test="oncall-my-deliveries-empty"
- @action="emit('test-page')"
+ @action="emptyAction?.run()"
/>
@@ -307,7 +306,7 @@ import {
} from "@/services/oncall.queries";
import type { Channel, MyDeliveries, MyDelivery } from "@/ts/interfaces/oncall";
import type { IconName } from "@/lib/core/Icon/OIcon.types";
-import { raw, useI18nTyped } from "@/types/i18n";
+import { raw, useI18nTyped, type I18nText } from "@/types/i18n";
import { useOnCallClock } from "@/composables/useOnCallClock";
import { formatOnCallInstant, isEscalating } from "@/utils/oncall";
@@ -321,11 +320,19 @@ const props = withDefaults(
canTest?: boolean;
/** The team that test page goes to, named on the button so it is never ambiguous. */
testTeamName?: string | null;
+ /** The reader is on no team, so the empty history points them at one instead. */
+ noTeam?: boolean;
}>(),
- { teamNames: () => ({}), teamsState: "loaded", canTest: false, testTeamName: null },
+ {
+ teamNames: () => ({}),
+ teamsState: "loaded",
+ canTest: false,
+ testTeamName: null,
+ noTeam: false,
+ },
);
-const emit = defineEmits<{ unread: [count: number]; "test-page": [] }>();
+const emit = defineEmits<{ unread: [count: number]; "test-page": []; "join-team": [] }>();
/// A first visit has a handful of pages, so more skeleton rows would only collapse when they land.
const HISTORY_SKELETON_ROWS = 3;
@@ -401,6 +408,23 @@ const teamsPending = (...ids: string[]) =>
const countsAsUnread = (row: MyDelivery) => !row.read;
+/// An empty history always says what to do next: test a team's page, or find a team to be paged by.
+const emptyAction = computed<{ label: I18nText; icon: IconName; run: () => void } | null>(() => {
+ if (unreadOnly.value) return null;
+ if (props.canTest) {
+ return {
+ label: props.testTeamName
+ ? t("oncall.mineTestTeam", { team: raw(props.testTeamName) })
+ : t("oncall.mineTestTeamPage"),
+ icon: "campaign",
+ run: () => emit("test-page"),
+ };
+ }
+ return props.noTeam
+ ? { label: t("oncall.mineJoinTeam"), icon: "group", run: () => emit("join-team") }
+ : null;
+});
+
/// The open pages, one row per page with its newest send.
const openRows = computed
(() => {
const byPage = new Map();
@@ -415,8 +439,10 @@ const openRows = computed(() => {
const historyRows = computed(() => {
const groups = new Map();
for (const row of rows.value) {
- // The id carries the firing ("…#2"); without it every firing of one alert is its own row.
- const key = `${row.subject_type}:${row.subject_id.replace(/#\d+$/, "")}`;
+ // By name: an alert and the incident it opened page under one title, and the reader cannot tell them apart.
+ const key = row.title
+ ? `title:${row.title}`
+ : `${row.subject_type}:${row.subject_id.replace(/#\d+$/, "")}`;
groups.set(key, [...(groups.get(key) ?? []), row]);
}
return [...groups.entries()]
@@ -463,10 +489,8 @@ const openColumns = computed[]>(() => [
]);
const historyColumns = computed[]>(() => [
- // Only while something is unread: a column of empty dots says nothing.
- ...(historyRows.value.some((row) => row.unread)
- ? [{ id: "unread", header: raw(""), size: 32, sortable: false }]
- : []),
+ // Always present: a column that arrived with the first unread row shifted every other column.
+ { id: "unread", header: raw(""), size: 32, sortable: false },
{
id: "page",
header: t("oncall.myDeliveriesPage"),
@@ -479,14 +503,13 @@ const historyColumns = computed[]>(() => [
{ id: "state", header: t("oncall.myDeliveriesStatus"), size: 128, sortable: false },
{ id: "channels", header: t("oncall.myDeliveriesChannels"), size: 104, sortable: false },
{ id: "at", header: t("oncall.myDeliveriesWhen"), size: 176, sortable: false },
+ // Not `isAction`: that pins the column, and its divider reads as a stray border on a table this narrow.
{
- id: "actions",
+ id: "row-actions",
header: t("oncall.actions"),
- isAction: true,
- pinned: "right",
sortable: false,
size: 64,
- meta: { align: "center", actionCount: 1 },
+ meta: { align: "center" },
},
]);
diff --git a/web/src/components/oncall/OnCallRoutingSimulator.spec.ts b/web/src/components/oncall/OnCallRoutingSimulator.spec.ts
index 42c5a58535..6c9b96f390 100644
--- a/web/src/components/oncall/OnCallRoutingSimulator.spec.ts
+++ b/web/src/components/oncall/OnCallRoutingSimulator.spec.ts
@@ -284,6 +284,7 @@ describe("OnCallRoutingSimulator", () => {
expect(next).toBe("then Kim after 5m");
});
+ /// The server's reason can run to a sentence; it sits in the tooltip so the answer stays on one line.
it("says why when nobody on the first step can receive a page", async () => {
vi.useRealTimers();
escalationPreview.mockResolvedValue({
@@ -311,7 +312,8 @@ describe("OnCallRoutingSimulator", () => {
await flushPromises();
await flushPromises();
const responder = wrapper.find('[data-test="oncall-simulator-responder"]');
- expect(responder.text()).toBe("no verified channel");
+ expect(responder.text()).toBe("No channel can carry a page");
+ expect(responder.findComponent(OTooltip).props("content")).toBe("no verified channel");
expect(responder.classes()).toContain("text-status-error-text");
});
diff --git a/web/src/components/oncall/OnCallRoutingSimulator.vue b/web/src/components/oncall/OnCallRoutingSimulator.vue
index d8a8a9182a..af6f2767c8 100644
--- a/web/src/components/oncall/OnCallRoutingSimulator.vue
+++ b/web/src/components/oncall/OnCallRoutingSimulator.vue
@@ -104,6 +104,12 @@ along with this program. If not, see .
{{ responderNote }}
+
{{ raw(" · ") }}
@@ -537,18 +543,27 @@ const responderNote = computed(() => {
const step = firstStep.value;
if (step) {
if (!step.recipients.length) return t("oncall.simulatorNobodyOnCall");
- const blocked = step.recipients.find((one) => !one.would_a_page_land);
- if (!step.recipients.some((one) => one.would_a_page_land)) {
- return raw(blocked?.why_not) || t("oncall.contactNoChannel");
- }
+ if (!step.recipients.some((one) => one.would_a_page_land)) return t("oncall.contactNoChannel");
return t("oncall.simulatorSendsNothing");
}
const person = responder.value;
if (!person) return t("oncall.simulatorNobodyOnCall");
- if (!person.would_a_page_land) return raw(person.why_not) || t("oncall.contactNoChannel");
+ if (!person.would_a_page_land) return t("oncall.contactNoChannel");
return t("oncall.simulatorSendsNothing");
});
+/// The server's reason a page cannot land runs to a sentence, so it rides the tooltip and the answer stays one line.
+const responderWhy = computed(() => {
+ if (ladderEntry.value && !ladderEntry.value.pages_anyone) return null;
+ const step = firstStep.value;
+ if (step) {
+ if (step.recipients.some((one) => one.would_a_page_land)) return null;
+ return raw(step.recipients.find((one) => !one.would_a_page_land)?.why_not) || null;
+ }
+ const person = responder.value;
+ return person && !person.would_a_page_land ? raw(person.why_not) || null : null;
+});
+
const responderTone = computed(() => {
if (ladderEntry.value && !ladderEntry.value.pages_anyone) return "text-text-secondary";
if (firstStep.value) {
diff --git a/web/src/components/oncall/OnCallSetupBanner.spec.ts b/web/src/components/oncall/OnCallSetupBanner.spec.ts
index 5e0d055f13..3c0e50a414 100644
--- a/web/src/components/oncall/OnCallSetupBanner.spec.ts
+++ b/web/src/components/oncall/OnCallSetupBanner.spec.ts
@@ -107,6 +107,31 @@ describe("OnCallSetupBanner", () => {
expect(wrapper.find('[data-test="oncall-setup-banner-host"]').exists()).toBe(false);
});
+ /// One answering policy settles the step, so an org with many teams costs one policy read, not one per team.
+ it("stops reading policies at the first team that has one", async () => {
+ answer({
+ teams: [
+ { id: "team_1", name: "A" },
+ { id: "team_2", name: "B" },
+ { id: "team_3", name: "C" },
+ ],
+ });
+ await render();
+ expect(service.getPolicy).toHaveBeenCalledTimes(1);
+ });
+
+ /// A dismissed bar never shows, so it asks the server nothing.
+ it("reads nothing once dismissed", async () => {
+ answer();
+ const wrapper = await render();
+ await wrapper.find('[data-test="oncall-setup-dismiss"]').trigger("click");
+ vi.clearAllMocks();
+ queryClient.clear();
+ await render();
+ expect(service.listTeams).not.toHaveBeenCalled();
+ expect(service.getPolicy).not.toHaveBeenCalled();
+ });
+
/// A read that failed is not a step left undone, so the bar stays away.
it("stays away when a read fails", async () => {
answer();
diff --git a/web/src/components/oncall/OnCallSetupBanner.vue b/web/src/components/oncall/OnCallSetupBanner.vue
index b1e1cdb326..1961e56d5a 100644
--- a/web/src/components/oncall/OnCallSetupBanner.vue
+++ b/web/src/components/oncall/OnCallSetupBanner.vue
@@ -106,9 +106,21 @@ async function read(
return queryClient.fetchQuery(options as any) as Promise;
}
+/// One answering policy is enough, so teams are asked in turn rather than all at once.
+async function anyPolicy(org: string, teamList: OnCallTeam[], force: boolean) {
+ for (const team of teamList) {
+ const policy = await read(teamPolicyQuery(org, team.id), force).catch(
+ () => null,
+ );
+ if (policy) return true;
+ }
+ return false;
+}
+
async function load(force = false) {
const org = orgId.value;
- if (!org) return;
+ // A dismissed bar never shows, so its facts are not worth a request.
+ if (!org || dismissed.value) return;
try {
const [teamList, gaps, rules, pages] = await Promise.all([
read(oncallTeamsQuery(org), force),
@@ -116,15 +128,13 @@ async function load(force = false) {
read(ownershipRulesQuery(org), force),
read(responsesQuery(org, { include_resolved: true, limit: 20 }), force),
]);
- const policies = await Promise.allSettled(
- teamList.map((team) => read(teamPolicyQuery(org, team.id), force)),
- );
+ const hasPolicy = await anyPolicy(org, teamList, force);
teams.value = teamList;
facts.value = {
hasTeam: teamList.length > 0,
hasStaffedRotation: teamList.length > 0 && (gaps?.total ?? 0) < teamList.length,
// The server creates the default ladder on first read, so a policy that answers is one that pages.
- hasPolicy: policies.some((p) => p.status === "fulfilled" && !!p.value),
+ hasPolicy,
// An alert bound straight to a team counts: it is routing without a rule.
hasRouting: rules.length > 0 || pages.some((page) => !!page.team_id),
};
diff --git a/web/src/components/settings/SlackConnectEmpty.spec.ts b/web/src/components/settings/SlackConnectEmpty.spec.ts
index 7e68396f2e..bf97c3f8ee 100644
--- a/web/src/components/settings/SlackConnectEmpty.spec.ts
+++ b/web/src/components/settings/SlackConnectEmpty.spec.ts
@@ -94,15 +94,12 @@ describe("SlackConnectEmpty on Cloud (A1)", () => {
const w = mountEmpty();
const text = w.text();
expect(text).toContain("Connect a Slack workspace");
- expect(text).toContain(
- "Your team asks OpenObserve questions from Slack and gets answers with their own permissions.",
- );
- expect(text).not.toContain("creates and installs your own Slack app");
- expect(text).toContain("What happens next");
+ expect(text).not.toContain("Your team asks OpenObserve questions from Slack");
+ expect(text).not.toContain("What happens next");
const steps = w.findAll('[data-test="slack-connect-step"]').map((s) => s.text());
expect(steps).toHaveLength(2);
expect(steps[0]).toContain("Add to Slack");
- expect(steps[0]).toContain("Opens Slack in a popup: pick a channel for alerts, then Allow");
+ expect(steps[0]).not.toContain("Opens Slack in a popup");
expect(steps[1]).toContain("Link people");
expect(text).not.toMatch(/Acknowledge|unfurl|Phase/);
// A privacy fact rides behind one info icon, not a banner under the steps.
@@ -284,13 +281,11 @@ describe("SlackConnectEmpty self-hosted (A1)", () => {
const w = mountEmpty({ isCloud: false });
const text = w.text();
expect(text).not.toContain("nothing is shared with a third party");
- expect(text).toContain("What happens next · about 5 minutes");
+ expect(text).not.toContain("What happens next");
const steps = w.findAll('[data-test="slack-connect-step"]').map((s) => s.text());
expect(steps).toHaveLength(3);
expect(steps[0]).toContain("Check this server");
- expect(steps[0]).toContain("Encryption key, web URL and AI agent");
expect(steps[1]).toContain("Create the app");
- expect(steps[1]).toContain("Paste one configuration token from Slack");
expect(steps[2]).toContain("Install and link people");
expect(text).not.toContain("Ask questions; answers use your own permissions");
expect(text).toContain("Needs the Manage Slack permission");
@@ -298,15 +293,12 @@ describe("SlackConnectEmpty self-hosted (A1)", () => {
expect(w.find('[data-test="slack-connect-steps"]').attributes("role")).toBe("list");
});
- /// One short line per step at every width: the long details made the empty state a wall of text.
- it("keeps every step detail to one short line", () => {
+ /// A step is its title alone: the sub-lines under each made the empty state a wall of text.
+ it("shows each step as its title only", () => {
const steps = mountEmpty({ isCloud: false })
.findAll('[data-test="slack-connect-step"]')
.map((s) => s.text());
- expect(steps[0]).toContain("Encryption key, web URL and AI agent");
- expect(steps[0]).not.toContain("verified before anything touches Slack");
- expect(steps[1]).not.toContain("builds the app for you");
- expect(steps[2]).toContain("Allow it in Slack, then link members");
+ expect(steps).toEqual(["1Check this server", "2Create the app", "3Install and link people"]);
});
it("offers Connect this org to an existing workspace before the setup wizard", () => {
diff --git a/web/src/components/settings/SlackConnectEmpty.vue b/web/src/components/settings/SlackConnectEmpty.vue
index 6cb3da493e..c8679dc942 100644
--- a/web/src/components/settings/SlackConnectEmpty.vue
+++ b/web/src/components/settings/SlackConnectEmpty.vue
@@ -163,28 +163,13 @@ const connectWithTicket = async (): Promise => {
const candidate = computed(() => props.upgradeCandidates[0] ?? null);
const addToSlackSrcset = `${addToSlackImage2x} 2x`;
-const nextSteps = computed<{ title: I18nText; detail: I18nText }[]>(() =>
+const nextSteps = computed(() =>
props.isCloud
- ? [
- { title: t("slackApp.connect.stepAddTitle"), detail: t("slackApp.connect.popupHint") },
- {
- title: t("slackApp.connect.stepLinkTitle"),
- detail: t("slackApp.connect.stepLinkDetail"),
- },
- ]
+ ? [t("slackApp.connect.stepAddTitle"), t("slackApp.connect.stepLinkTitle")]
: [
- {
- title: t("slackApp.connect.stepCheckTitle"),
- detail: t("slackApp.connect.stepCheckDetailShort"),
- },
- {
- title: t("slackApp.connect.stepCreateTitle"),
- detail: t("slackApp.connect.stepCreateDetailShort"),
- },
- {
- title: t("slackApp.connect.stepInstallTitle"),
- detail: t("slackApp.connect.stepInstallDetailShort"),
- },
+ t("slackApp.connect.stepCheckTitle"),
+ t("slackApp.connect.stepCreateTitle"),
+ t("slackApp.connect.stepInstallTitle"),
],
);
@@ -290,14 +275,9 @@ const nextSteps = computed<{ title: I18nText; detail: I18nText }[]>(() =>
class="gap-3 p-5"
data-test="slack-available"
>
-
-
- {{ t("slackApp.connect.existingTitle") }}
-
-
- {{ t("slackApp.connect.existingDescriptionShort") }}
-
-
+ {{ t("slackApp.connect.existingTitle") }}
+
(() =>
size="block"
illustration="connect"
:title="t('slackApp.connect.title')"
- :description="t('slackApp.connect.description')"
:backdrop="false"
>
@@ -355,9 +334,6 @@ const nextSteps = computed<{ title: I18nText; detail: I18nText }[]>(() =>
-
- {{ t("slackApp.connect.nextTitle", { minutes: isCloud ? 2 : 5 }) }}
-
(() =>
-
(() =>
>
{{ index + 1 }}
-
- {{ item.title }}
- {{ item.detail }}
-
+ {{ item }}
diff --git a/web/src/components/settings/SlackLinkingSection.spec.ts b/web/src/components/settings/SlackLinkingSection.spec.ts
index 41f91b0d71..46a5488285 100644
--- a/web/src/components/settings/SlackLinkingSection.spec.ts
+++ b/web/src/components/settings/SlackLinkingSection.spec.ts
@@ -85,7 +85,7 @@ describe("SlackLinkingSection (row 11)", () => {
it("AC-12.1 manual: edits domains and refuses a public email domain", async () => {
const w = await mountSection(linkingView({ source: "manual", domains: ["acme.example"] }));
- expect(w.find('[data-test="slack-linking-summary"]').text()).toBe("Automatic for acme.example");
+ expect(w.find('[data-test="slack-linking-summary"]').exists()).toBe(false);
await w.find('[data-test="slack-linking-edit"]').trigger("click");
const input = w.find('[data-test="slack-linking-domains"] [data-test="tag-input-field"]');
await input.setValue("gmail.com");
@@ -164,7 +164,7 @@ describe("SlackLinkingSection (row 11)", () => {
const w = await mountSection(linkingView({ domains: c.domains, counts }));
const warning = w.find('[data-test="slack-linking-no-domains"]');
expect(warning.exists() ? warning.text().replace(/\s+/g, " ") : null).toBe(c.warning);
- expect(w.find('[data-test="slack-linking-summary"]').exists()).toBe(!c.warning);
+ expect(w.find('[data-test="slack-linking-summary"]').exists()).toBe(false);
expect(w.find('[data-test="slack-linking-edit"]').exists()).toBe(true);
});
@@ -198,7 +198,7 @@ describe("SlackLinkingSection (row 11)", () => {
await error.find("button").trigger("click");
await flushPromises();
expect(slack.getLinking).toHaveBeenCalledTimes(2);
- expect(w.find('[data-test="slack-linking-summary"]').exists()).toBe(true);
+ expect(w.find('[data-test="slack-linking-counts"]').exists()).toBe(true);
});
it("a managed workspace shows linking read-only, set by your instance admin", async () => {
diff --git a/web/src/components/settings/SlackLinkingSection.vue b/web/src/components/settings/SlackLinkingSection.vue
index 4c62428cec..88f0887cbf 100644
--- a/web/src/components/settings/SlackLinkingSection.vue
+++ b/web/src/components/settings/SlackLinkingSection.vue
@@ -60,9 +60,10 @@ const summary = computed(() => {
const current = view.value;
if (!current) return "";
if (!current.enabled) return t("slackApp.linking.offSummary");
+ // Typed-in domains are one Edit domains click away; only a mapping's domains need saying, since they cannot be edited here.
return current.source === "mapping"
? t("slackApp.linking.mappedSummary", { domains: domainsText.value })
- : t("slackApp.linking.manualSummary", { domains: domainsText.value });
+ : "";
});
const noDomains = computed(() => !!view.value?.enabled && !view.value.domains.length);
const autoCount = computed(() =>
@@ -175,7 +176,11 @@ const runLinkAll = async (): Promise => {
}}
-
+
{{ summary }}
@@ -256,14 +261,9 @@ const runLinkAll = async (): Promise => {
-
-
- {{ t("slackApp.linking.appHome") }}
-
-
- {{ t("slackApp.linking.appHomeDescription") }}
-
-
+
+ {{ t("slackApp.linking.appHome") }}
+
@@ -302,15 +306,22 @@ along with this program. If not, see .
-
+
+
+
-
- {{ t("oncall.mineShiftsMore", { count: shiftsBelow }, shiftsBelow) }}
-
-
+
+ {{ t("oncall.mineShiftsMore", { count: shiftsBelow }, shiftsBelow) }}
+
-
+
(null);
+/// True once the alert lookup answers 404: the page outlived its alert, and the server can no longer release it.
+const subjectAlertMissing = ref(false);
+/// Why the last Unacknowledge left the page held; cleared when another page loads.
+const unackRefusedReason = ref(null);
+const unackBlockedReason = computed(() =>
+ subjectAlertMissing.value ? t("oncall.unackAlertDeleted") : unackRefusedReason.value,
+);
const escalation = ref(null);
/// False until the progress has answered, so the header makes no paging claim from a missing value.
const escalationLoaded = ref(false);
@@ -1463,11 +1502,19 @@ async function unacknowledgeRecord() {
acking.value = true;
try {
const res = await unackWrite.mutateAsync(responseId.value);
+ // The server answers 200 unchanged when it cannot find the alert to release, so the page stays held.
+ const stillHeld = res.data.ack?.changed === false && res.data.state === "acknowledged";
+ const refused = subjectAlertMissing.value
+ ? t("oncall.unackAlertDeleted")
+ : t("oncall.unackRefused");
+ if (stillHeld) unackRefusedReason.value = refused;
toast(
- res.data.ack?.changed === false
- ? (resolvedToast(res.data, false) ??
+ stillHeld
+ ? { variant: "warning", message: refused }
+ : res.data.ack?.changed === false
+ ? (resolvedToast(res.data, false) ??
notAckedToast(res.data.title || res.data.subject.source_id, t))
- : { variant: "success", message: ackWords.value.unacked },
+ : { variant: "success", message: ackWords.value.unacked },
);
await fetchResponse();
} catch (err: any) {
@@ -1580,12 +1627,14 @@ async function fetchHandoffTargets() {
// Uncached: the page links to the alert editor, which seeds its form from the cached alert entry.
async function fetchSubjectAlert() {
subjectAlert.value = null;
+ subjectAlertMissing.value = false;
if (response.value?.subject.subject_type !== "alert") return;
try {
const res = await alertsService.get_by_alert_id(orgId.value, response.value.subject.source_id);
subjectAlert.value = res.data ?? null;
- } catch {
+ } catch (err: any) {
subjectAlert.value = null;
+ subjectAlertMissing.value = err?.response?.status === 404;
}
}
@@ -1905,6 +1954,8 @@ watch(
incidentLoading.value = true;
timelineReady.value = false;
subjectAlert.value = null;
+ subjectAlertMissing.value = false;
+ unackRefusedReason.value = null;
priorCauses.value = [];
firingHistory.value = [];
report.value = null;
diff --git a/web/src/views/OnCall/OnCallResponses.spec.ts b/web/src/views/OnCall/OnCallResponses.spec.ts
index 23f139a3bf..b23fc8ae5b 100644
--- a/web/src/views/OnCall/OnCallResponses.spec.ts
+++ b/web/src/views/OnCall/OnCallResponses.spec.ts
@@ -313,6 +313,17 @@ describe("OnCallResponses", () => {
service.getResponse.mockResolvedValue({ data: { events: [] } } as any);
});
+ /// Mounts the real page layout so the tag is proven to reach the rendered header.
+ it("tags the page title as Beta", async () => {
+ const wrapper = mountTracked(OnCallResponses, {
+ global: { plugins: [i18n, store], stubs: { ...stubs, OPageLayout: false } },
+ });
+ await flushPromises();
+ const badge = wrapper.find('[data-test="beta-badge"]');
+ expect(badge.exists()).toBe(true);
+ expect(badge.text()).toBe(String(i18n.global.t("common.beta")));
+ });
+
function page(over: Record = {}, source = "al_ckt") {
return {
id: "resp_1",
@@ -767,8 +778,8 @@ describe("OnCallResponses", () => {
expect(wrapper.find('[data-test^="oncall-row-snooze-"]').exists()).toBe(true);
});
- /// Pages are forward-only, so a resolved row has no Acknowledge or Resolve, yet its ⋯ still opens, expands and links it.
- it("gives a resolved row only the ⋯ menu: open, timeline, copy link", async () => {
+ /// Pages are forward-only, so a resolved row has no Acknowledge or Resolve; the row click opens it, so ⋯ only expands and links it.
+ it("gives a resolved row only the ⋯ menu: timeline, copy link", async () => {
const wrapper = await withPages([
page({ state: "resolved", closed_at: Date.now() * 1000, acked_by: "ana@o2.ai" }),
]);
@@ -776,7 +787,7 @@ describe("OnCallResponses", () => {
expect(wrapper.find('[data-test^="oncall-row-ack-"]').exists()).toBe(false);
expect(wrapper.find('[data-test^="oncall-row-resolve-"]').exists()).toBe(false);
expect(wrapper.find('[data-test="oncall-row-more-alert:al_ckt"]').exists()).toBe(true);
- expect(wrapper.find('[data-test="oncall-row-open-alert:al_ckt"]').exists()).toBe(true);
+ expect(wrapper.find('[data-test="oncall-row-open-alert:al_ckt"]').exists()).toBe(false);
expect(wrapper.find('[data-test="oncall-row-copy-link-alert:al_ckt"]').exists()).toBe(true);
const timeline = wrapper.findComponent('[data-test="oncall-row-show-timeline-alert:al_ckt"]');
expect(timeline.text()).toBe("Show timeline");
diff --git a/web/src/views/OnCall/OnCallResponses.vue b/web/src/views/OnCall/OnCallResponses.vue
index f5e6dedc83..92effa9fac 100644
--- a/web/src/views/OnCall/OnCallResponses.vue
+++ b/web/src/views/OnCall/OnCallResponses.vue
@@ -21,6 +21,9 @@ along with this program. If not, see .
:title="t('oncall.responsesTitle')"
icon="notifications-active"
>
+
+
+
@@ -708,13 +711,6 @@ along with this program. If not, see .
>
{{ t("oncall.resolve") }}
-
- {{ t("oncall.rowOpenPage") }}
-
{
correlation.getDimensionAnalytics.mockResolvedValue({ data: { dimensions: [] } } as any);
});
+ /// Mounts the real page layout so the tag is proven to reach the rendered header.
+ it("tags the page title as Beta", async () => {
+ const wrapper = mount(OnCallRouting, {
+ global: { plugins: [i18n, store], stubs: { ...stubs, OPageLayout: false } },
+ });
+ await flushPromises();
+ const badge = wrapper.find('[data-test="beta-badge"]');
+ expect(badge.exists()).toBe(true);
+ expect(badge.text()).toBe(String(i18n.global.t("common.beta")));
+ });
+
/// The whole point of the org screen: no team_id, so shadowing is computed
/// across every team's rules, not one team's slice.
it("asks for the org-wide rules, not one team's", async () => {
diff --git a/web/src/views/OnCall/OnCallRouting.vue b/web/src/views/OnCall/OnCallRouting.vue
index f895e5b945..8f3bfa2725 100644
--- a/web/src/views/OnCall/OnCallRouting.vue
+++ b/web/src/views/OnCall/OnCallRouting.vue
@@ -23,6 +23,7 @@ along with this program. If not, see .
icon="alt-route"
>
+
{
service.getRoutingConfig.mockResolvedValue({ data: { default_team_id: null } } as any);
});
+ /// Mounts the real page layout so the tag is proven to reach the rendered header.
+ it("tags the page title as Beta", async () => {
+ const wrapper = mount(OnCallTeams, {
+ global: { plugins: [i18n, store], stubs: { ...stubs, OPageLayout: false } },
+ });
+ await flushPromises();
+ const badge = wrapper.find('[data-test="beta-badge"]');
+ expect(badge.exists()).toBe(true);
+ expect(badge.text()).toBe(String(i18n.global.t("common.beta")));
+ });
+
/// The setup checklist's first step sends somebody here already meaning to
/// create a team. Landing them on the list to hunt for the button is the same
/// click asked twice.
diff --git a/web/src/views/OnCall/OnCallTeams.vue b/web/src/views/OnCall/OnCallTeams.vue
index 7a5d6b5762..070acccb29 100644
--- a/web/src/views/OnCall/OnCallTeams.vue
+++ b/web/src/views/OnCall/OnCallTeams.vue
@@ -21,6 +21,9 @@ along with this program. If not, see .
:title="t('oncall.teamsTitle')"
icon="group-work"
>
+
+
+