split changes and imps

allure-framework · Feb 17, 2025 · f589ad4 · f589ad4
1 parent 9e0717c
commit f589ad4
Show file tree

Hide file tree

Showing 45 changed files with 914 additions and 396 deletions.
diff --git a/packages/plugin-awesome/src/generators.ts b/packages/plugin-awesome/src/generators.ts
@@ -303,6 +303,7 @@ export const generateStaticFiles = async (
     reportUuid,
     groupBy: groupBy?.length ? groupBy : ["parentSuite", "suite", "subSuite"],
     layout,
+    allureVersion,
   };
   const html = compile({
     headTags: headTags.join("\n"),

diff --git a/packages/web-awesome/src/assets/scss/_common.scss b/packages/web-awesome/src/assets/scss/_common.scss
@@ -140,20 +140,19 @@ body {
   background: var(--bg-base-secondary);
   font-family: var(--font-family);
   -webkit-text-size-adjust: 100%;
-  * > * {
-    &::-webkit-scrollbar {
-      width: 16px;
-      margin-right: 8px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      border-radius: 10px;
-      background: var(--scrollbar-color);
-      border: 4px solid var(--bg-base-primary);
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      cursor: pointer;
-    }
-  }
+  //* > * {
+  //  &::-webkit-scrollbar {
+  //    width: 16px;
+  //  }
+  //
+  //  &::-webkit-scrollbar-thumb {
+  //    border-radius: 10px;
+  //    background: var(--scrollbar-color);
+  //    border: 4px solid var(--bg-base-primary);
+  //  }
+  //
+  //  &::-webkit-scrollbar-thumb:hover {
+  //    cursor: pointer;
+  //  }
+  //}
 }
diff --git a/packages/web-awesome/src/components/BaseLayout/index.tsx b/packages/web-awesome/src/components/BaseLayout/index.tsx
@@ -1,9 +1,9 @@
-import { Loadable, PageLoader } from "@allurereport/web-components";
+import { Loadable, Modal, PageLoader } from "@allurereport/web-components";
 import { useEffect } from "preact/hooks";
 import { Footer } from "@/components/Footer";
 import MainReport from "@/components/MainReport";
-import Modal from "@/components/Modal";
 import TestResult from "@/components/TestResult";
+import { modalData } from "@/stores/modal";
 import { route } from "@/stores/router";
 import { fetchTestResult, fetchTestResultNav, testResultStore } from "@/stores/testResults";
 import { treeStore } from "@/stores/tree";
@@ -29,7 +29,7 @@ export const BaseLayout = () => {
       transformData={(data) => data[testResultId]}
       renderData={(testResult) => (
         <>
-          <Modal testResult={testResult} />
+          <Modal {...modalData.value} />
           <div className={styles.wrapper} key={testResult?.id}>
             <TestResult testResult={testResult} />
             <Footer />

diff --git a/packages/web-awesome/src/components/Footer/FooterVersion.tsx b/packages/web-awesome/src/components/Footer/FooterVersion.tsx
@@ -7,12 +7,16 @@ import * as styles from "./styles.scss";
 
 export const FooterVersion = () => {
   const [createdAt, setCreatedAt] = useState<number | null>(null);
+  const [currentVersion, setCurrentVersion] = useState<string>();
 
   useEffect(() => {
     const reportOptions = getReportOptions<AllureAwesomeReportOptions>();
     if (reportOptions?.createdAt) {
       setCreatedAt(Number(reportOptions.createdAt));
     }
+    if (reportOptions?.allureVersion) {
+      setCurrentVersion(reportOptions.allureVersion as string);
+    }
   }, []);
 
   const formattedCreatedAt = new Date(createdAt as number).toLocaleDateString(currentLocaleIso.value as string, {
@@ -27,7 +31,7 @@ export const FooterVersion = () => {
   return (
     <Text type="paragraph" size="m" className={styles.version}>
       {formattedCreatedAt}
-      <span> Ver: 3.0.0</span>
+      <span> Ver: {currentVersion}</span>
     </Text>
   );
 };
diff --git a/packages/web-awesome/src/components/Header/index.tsx b/packages/web-awesome/src/components/Header/index.tsx
@@ -1,16 +1,14 @@
-import { IconButton, allureIcons } from "@allurereport/web-components";
 import { LanguagePicker } from "@/components/LanguagePicker";
 import { ThemeButton } from "@/components/ThemeButton/ThemeButton";
-import { layoutStore, toggleLayout } from "@/stores/layout";
+import ToggleLayout from "@/components/ToggleLayout";
 import * as styles from "./styles.scss";
 
 export const Header = () => {
-  const isSplitMode = layoutStore.value === "split";
   return (
     <div className={styles.above}>
-      <div className={isSplitMode ? styles.left : styles.right}>
-        <IconButton size={"s"} icon={allureIcons.reportLogo} style={"ghost"} onClick={() => toggleLayout()} />
+      <div className={styles.right}>
         <LanguagePicker />
+        <ToggleLayout />
         <ThemeButton />
       </div>
     </div>

diff --git a/packages/web-awesome/src/components/Header/styles.scss b/packages/web-awesome/src/components/Header/styles.scss
@@ -28,6 +28,6 @@
 .right {
   margin-left: auto;
   display: flex;
-  gap: 12px;
+  gap: 4px;
   align-items: center;
 }
diff --git a/packages/web-awesome/src/components/MainReport/index.tsx b/packages/web-awesome/src/components/MainReport/index.tsx
@@ -3,16 +3,14 @@ import { Header } from "@/components/Header";
 import { ReportBody } from "@/components/ReportBody";
 import { ReportHeader } from "@/components/ReportHeader";
 import { ReportMetadata } from "@/components/ReportMetadata";
-import { layoutStore } from "@/stores/layout";
+import { isSplitMode, layoutStore } from "@/stores/layout";
 import * as styles from "./styles.scss";
 
 const MainReport = () => {
-  const isSplitMode = layoutStore.value === "split";
-
   return (
     <>
       <Header />
-      <div className={clsx(styles.content, isSplitMode && styles["scroll-inside"])}>
+      <div className={clsx(styles.content, isSplitMode.value && styles["scroll-inside"])}>
         <ReportHeader />
         <ReportMetadata />
         <ReportBody />

diff --git a/packages/web-awesome/src/components/Modal/index.tsx b/packages/web-awesome/src/components/Modal/index.tsx