Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/plugin-awesome/src/generators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export const generateTree = async (
const tree = createTreeByLabels<AwesomeTestResult, AwesomeTreeLeaf, AwesomeTreeGroup>(
visibleTests,
labels,
({ id, name, status, duration, flaky, start, retries }) => {
({ id, name, status, duration, flaky, start, retries ,error}) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run prettier

return {
nodeId: id,
retry: !!retries?.length,
Expand All @@ -187,6 +187,7 @@ export const generateTree = async (
duration,
flaky,
start,
error
};
},
undefined,
Expand Down
14 changes: 12 additions & 2 deletions packages/sandbox/test/legacy.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference types="allure-vitest" />
import { it } from "vitest";
import { expect, it } from "vitest";

it("sample test", async () => {
await allure.owner("John Doe x");
Expand All @@ -9,5 +9,15 @@ it("sample test", async () => {
await allure.attachment("text attachment", "some data", "text/plain");
});
});
await allure.step("step 2", async () => {});
await allure.step("step 2", async () => {
await allure.step("step 2.2", async () => {
await allure.step("step 2.3", async () => {
try {
await allure.step("step 2.3-1", async () => {
expect(true).toBe(false);
});
} catch (err) {}
});
});
});
});
4 changes: 4 additions & 0 deletions packages/web-awesome/src/components/Tree/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Button, Loadable, PageLoader, Text, Tree, TreeStatusBar } from "@allure
import type { AwesomeStatus } from "types";
import { MetadataButton } from "@/components/MetadataButton";
import { useTabsContext } from "@/components/Tabs";
import { TrError } from "@/components/TestResult/TrError";
import { reportStatsStore, statsByEnvStore } from "@/stores";
import { collapsedEnvironments, currentEnvironment, environmentsStore } from "@/stores/env";
import { useI18n } from "@/stores/locale";
Expand Down Expand Up @@ -70,6 +71,7 @@ export const TreeList = () => {
navigateTo={navigateTo}
tree={filteredTree.value.default}
statusFilter={currentTab as AwesomeStatus}
ErrorComponent={TrError}
root
/>
</div>
Expand All @@ -89,6 +91,7 @@ export const TreeList = () => {
navigateTo={navigateTo}
tree={currentTree}
statusFilter={currentTab as AwesomeStatus}
ErrorComponent={TrError}
root
/>
</div>
Expand Down Expand Up @@ -139,6 +142,7 @@ export const TreeList = () => {
statusFilter={currentTab}
navigateTo={navigateTo}
tree={value}
ErrorComponent={TrError}
root
/>
</div>
Expand Down
7 changes: 6 additions & 1 deletion packages/web-components/src/components/Tree/Tree.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Statistic } from "@allurereport/core-api";
import cx from "clsx";
import type { RecursiveTree, Status } from "global";
import type { FunctionalComponent } from "preact";
import type { FunctionComponent, FunctionalComponent } from "preact";
import { useState } from "preact/hooks";
import { TreeItem } from "@/components/Tree/TreeItem";
import { TreeHeader } from "./TreeHeader";
Expand All @@ -18,6 +18,7 @@ interface TreeProps {
toggleTree: (id: string) => void;
navigateTo: (id: string) => void;
routeId?: string;
ErrorComponent: FunctionComponent;
}

export const Tree: FunctionalComponent<TreeProps> = ({
Expand All @@ -31,6 +32,7 @@ export const Tree: FunctionalComponent<TreeProps> = ({
toggleTree,
routeId,
navigateTo,
ErrorComponent,
}) => {
const isEarlyCollapsed = collapsedTrees.has(tree.nodeId as string);
const haveFailedSteps = statistic === undefined || !!statistic?.failed || !!statistic?.broken;
Expand Down Expand Up @@ -65,6 +67,7 @@ export const Tree: FunctionalComponent<TreeProps> = ({
toggleTree={toggleTree}
routeId={routeId}
navigateTo={navigateTo}
ErrorComponent={ErrorComponent}
/>
))}
{tree?.leaves?.map?.((leaf) => (
Expand All @@ -78,6 +81,8 @@ export const Tree: FunctionalComponent<TreeProps> = ({
duration={leaf.duration}
marked={leaf.nodeId === routeId}
navigateTo={navigateTo}
error={leaf.error}
ErrorComponent={ErrorComponent}
/>
))}
</div>
Expand Down
41 changes: 24 additions & 17 deletions packages/web-components/src/components/Tree/TreeItem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { type TestStatus, formatDuration } from "@allurereport/core-api";
import type { TestError, TestStatus } from "@allurereport/core-api";
import { formatDuration } from "@allurereport/core-api";
import clsx from "clsx";
import type { FunctionComponent } from "preact";
import { TreeItemIcon } from "@/components/Tree/TreeItemIcon";
Expand All @@ -13,6 +14,8 @@ interface TreeItemProps {
groupOrder: number;
marked?: boolean;
navigateTo: (id: string) => void;
error?: TestError;
ErrorComponent: FunctionComponent<TestError & { status?: TestStatus }>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use render props function (like renderError) instead of component itself

}

export const TreeItem: FunctionComponent<TreeItemProps> = ({
Expand All @@ -23,27 +26,31 @@ export const TreeItem: FunctionComponent<TreeItemProps> = ({
id,
marked,
navigateTo,
error,
ErrorComponent,
...rest
}) => {
const formattedDuration = formatDuration(duration);

return (
<div
{...rest}
className={clsx(styles["tree-item"], marked ? styles["tree-item-marked"] : "")}
onClick={() => navigateTo(id)}
id={id}
>
<TreeItemIcon status={status} />
<Code data-testid="tree-leaf-order" size={"s"} className={styles.order}>
{groupOrder}
</Code>
<Text data-testid="tree-leaf-title" className={styles["item-title"]}>
{name}
</Text>
<Text data-testid="tree-leaf-duration" type="ui" size={"m"} className={styles["item-time"]}>
{formattedDuration}
</Text>
<div {...rest}>
<div
className={clsx(styles["tree-item"], marked ? styles["tree-item-marked"] : "")}
id={id}
onClick={() => navigateTo(id)}
>
<TreeItemIcon status={status} />
<Code data-testid="tree-leaf-order" size={"s"} className={styles.order}>
{groupOrder}
</Code>
<Text data-testid="tree-leaf-title" className={styles["item-title"]}>
{name}
</Text>
<Text data-testid="tree-leaf-duration" type="ui" size={"m"} className={styles["item-time"]}>
{formattedDuration}
</Text>
</div>
<div>{error?.message && ErrorComponent && <ErrorComponent {...error} status={status} />}</div>
</div>
);
};
Loading