-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
209 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,63 @@ | ||
| import { ensureReportDataReady } from "@allurereport/web-commons"; | ||
| import { Loadable, PageLoader } from "@allurereport/web-components"; | ||
| import { Loadable, PageLoader, Text } from "@allurereport/web-components"; | ||
| import type { JSX } from "preact"; | ||
| import { useEffect } from "preact/compat"; | ||
| import { useState } from "preact/hooks"; | ||
| import { Footer } from "@/components/Footer"; | ||
| import MainReport from "@/components/MainReport"; | ||
| import Modal from "@/components/Modal"; | ||
| import SideBySide from "@/components/SideBySide"; | ||
| import TestResult from "@/components/TestResult"; | ||
| import { fetchStats, getLocale, getTheme } from "@/stores"; | ||
| import { fetchPieChartData } from "@/stores/chart"; | ||
| import { fetchEnvInfo } from "@/stores/envInfo"; | ||
| import { route } from "@/stores/router"; | ||
| import { fetchTestResult, fetchTestResultNav, testResultStore } from "@/stores/testResults"; | ||
| import { fetchTreeData, treeStore } from "@/stores/tree"; | ||
| import { treeStore } from "@/stores/tree"; | ||
| import * as styles from "./styles.scss"; | ||
|
|
||
| export type BaseLayoutProps = { | ||
| testResultId?: string; | ||
| }; | ||
|
|
||
| export const BaseLayout = ({ testResultId }: BaseLayoutProps) => { | ||
| useEffect(() => { | ||
| getTheme(); | ||
| getLocale(); | ||
| }, []); | ||
| export const BaseLayout = () => { | ||
| const { id: testResultId, params } = route.value; | ||
|
|
||
| useEffect(() => { | ||
| if (testResultId) { | ||
| fetchTestResult(testResultId); | ||
| fetchTestResultNav(); | ||
| } else { | ||
| ensureReportDataReady(); | ||
| fetchStats(); | ||
| fetchPieChartData(); | ||
| fetchTreeData(); | ||
| fetchEnvInfo(); | ||
| } | ||
| }, [testResultId]); | ||
|
|
||
| const [cachedMain, setCachedMain] = useState<JSX.Element | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| if (!cachedMain) { | ||
| setCachedMain( | ||
| <div className={styles.wrapper}> | ||
| <Loadable source={treeStore} renderLoader={() => <PageLoader />} renderData={() => <MainReport />} /> | ||
| </div>, | ||
| ); | ||
| } | ||
| }, [cachedMain]); // Устанавливаем `cachedMain` только один раз | ||
|
|
||
| const testResult = testResultId ? ( | ||
| <Loadable | ||
| source={testResultStore} | ||
| renderLoader={() => <PageLoader />} | ||
| transformData={(data) => data[testResultId]} | ||
| renderData={(testResult) => ( | ||
| renderData={(tr) => ( | ||
| <> | ||
| <Modal testResult={testResult} /> | ||
| <div className={styles.wrapper} key={testResult?.id}> | ||
| <TestResult testResult={testResult} /> | ||
| <Footer /> | ||
| <Modal testResult={tr} /> | ||
| <div className={styles.wrapper}> | ||
| <TestResult testResult={tr} /> | ||
| </div> | ||
| </> | ||
| )} | ||
| /> | ||
| ) : ( | ||
| <div>notest</div> | ||
| <div className={styles.empty}> | ||
| <Text>Here will be test result</Text> | ||
| </div> | ||
| ); | ||
|
|
||
| const Main = () => ( | ||
| <div className={styles.wrapper}> | ||
| <Loadable source={treeStore} renderLoader={() => <PageLoader />} renderData={() => <MainReport />} /> | ||
| return ( | ||
| <div className={styles["side-by-side"]}> | ||
| <SideBySide left={cachedMain} right={testResult} /> | ||
| <Footer /> | ||
| </div> | ||
| ); | ||
|
|
||
| // const content = testResultId ? ( | ||
| // <Loadable | ||
| // source={testResultStore} | ||
| // renderLoader={() => <PageLoader />} | ||
| // transformData={(data) => data[testResultId]} | ||
| // renderData={(testResult) => ( | ||
| // <> | ||
| // <Modal testResult={testResult} /> | ||
| // <div className={styles.wrapper} key={testResult?.id}> | ||
| // <TestResult testResult={testResult} /> | ||
| // <Footer /> | ||
| // </div> | ||
| // </> | ||
| // )} | ||
| // /> | ||
| // ) : ( | ||
| // <div className={styles.wrapper}> | ||
| // <Loadable source={treeStore} renderLoader={() => <PageLoader />} renderData={() => <MainReport />} /> | ||
| // <Footer /> | ||
| // </div> | ||
| // ); | ||
| return <SideBySide left={<Main />} right={testResult} />; | ||
|
|
||
| // { | ||
| /* return <div className={styles.layout}>{content}</div>;*/ | ||
| // } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 2 additions & 5 deletions
7
packages/web-awesome/src/components/TestResult/TestResultNavigation/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.