Skip to content

Commit f626be4

Browse files
authored
Update activities texts (#5958)
* update texts * update ui * update tests
1 parent 885f0da commit f626be4

File tree

5 files changed

+10
-21
lines changed

5 files changed

+10
-21
lines changed

frontend/app/src/entities/events/ui/event-details-popover.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function EventDetailsPopover(props: EventType) {
77
return (
88
<Popover>
99
<PopoverTrigger className="flex items-center gap-1 text-xs text-gray-600">
10-
View all <InfoIcon className="size-3" />
10+
View more <InfoIcon className="size-3" />
1111
</PopoverTrigger>
1212

1313
<PopoverContent className="w-full">

frontend/app/src/entities/events/ui/global-event.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const Event = (props: EventType) => {
4848
<GlobalEventDisplay {...props} />
4949
</div>
5050

51-
<div className="text-xs font-medium text-gray-500 flex items-center gap-1">
51+
<div className="text-xs font-medium text-gray-500 flex items-center gap-1 whitespace-nowrap overflow-hidden text-ellipsis">
5252
{props.branch && (
5353
<>
5454
<Icon icon={"mdi:source-branch"} />
@@ -60,7 +60,7 @@ export const Event = (props: EventType) => {
6060

6161
<div className="relative">
6262
<Link to={`/activities/${props.id}`} className="text-xs text-gray-500">
63-
View more
63+
View details
6464
</Link>
6565

6666
{props.has_children && (

frontend/app/src/entities/events/ui/node-events/node-event-title.tsx

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,16 @@ export const NodeEventTitle = ({
4747
{schemaLabels[payload.data.node_kind] ?? "-"}
4848
</div>
4949
{event.includes("deleted") ? (
50-
<NodeLabel
51-
id={primary_node.id}
52-
kind={primary_node?.kind}
53-
branch={branch}
54-
className="overflow-hidden text-ellipsis whitespace-nowrap"
55-
/>
50+
<NodeLabel id={primary_node.id} kind={primary_node?.kind} branch={branch} />
5651
) : (
5752
<Link
5853
to={getLink({
5954
kind: primary_node?.kind,
6055
id: primary_node.id,
6156
branch,
6257
})}
63-
className="overflow-hidden text-ellipsis"
6458
>
65-
<NodeLabel
66-
id={primary_node.id}
67-
kind={primary_node?.kind}
68-
branch={branch}
69-
className="overflow-hidden text-ellipsis whitespace-nowrap"
70-
/>
59+
<NodeLabel id={primary_node.id} kind={primary_node?.kind} branch={branch} />
7160
</Link>
7261
)}
7362
</div>

frontend/app/tests/e2e/activity-log/global-activity-log.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ test.describe("Global Activities - List view and filter usage", () => {
5858
});
5959

6060
await test.step("View Event details with children", async () => {
61-
const viewMoreLink = page.getByRole("link", { name: /View more/i }).first();
61+
const viewMoreLink = page.getByRole("link", { name: /View details/i }).first();
6262
await viewMoreLink.click();
6363

64-
// Check that at least one "View all" button is present in the details page
65-
await expect(page.locator("#root")).toContainText("View all");
64+
// Check that at least one "View more" button is present in the details page
65+
await expect(page.getByRole("button", { name: "View more" }).first()).toBeVisible();
6666
await saveScreenshotForDocs(page, "activity_log_global_details_children");
6767
});
6868
});

frontend/app/tests/e2e/activity-log/object-activity-log.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ test.describe("Object Activities - Timeline and Details", () => {
2222
await saveScreenshotForDocs(page, "activity_log_device");
2323
});
2424

25-
await test.step("Open additional details via the 'View all' button", async () => {
26-
const viewMoreButton = page.getByRole("button", { name: "View all" }).first();
25+
await test.step("Open additional details via the 'View more' button", async () => {
26+
const viewMoreButton = page.getByRole("button", { name: "View more" }).first();
2727
await expect(viewMoreButton).toBeVisible();
2828
await viewMoreButton.click();
2929

0 commit comments

Comments
 (0)