diff --git a/handshake-nodejs-reporters/apps/docs/package.json b/handshake-nodejs-reporters/apps/docs/package.json index 6e8b71ac..8ec9cf03 100644 --- a/handshake-nodejs-reporters/apps/docs/package.json +++ b/handshake-nodejs-reporters/apps/docs/package.json @@ -31,6 +31,6 @@ "react-dom": "^18.2.0", "typescript": "^5.3.3", "handshake-utils": "0.5.0", - "handshake-dashboard": "0.5.0" + "handshake-dashboard": "0.5.1" } } diff --git a/handshake-nodejs-reporters/apps/test-export/package.json b/handshake-nodejs-reporters/apps/test-export/package.json index d4e6cf26..486b1ae6 100644 --- a/handshake-nodejs-reporters/apps/test-export/package.json +++ b/handshake-nodejs-reporters/apps/test-export/package.json @@ -9,6 +9,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "wdio": "wdio run ./wdio.conf.ts", "export": "cd ../../ && npx handshake export ../TestResults --out ../TestReports", + "run-sanity": "cd ../../ && npm run sanity", "verify-sanity": "npx cross-env TYPE=SANITY wdio run ./wdio.conf.ts --cucumberOpts.tagExpression=\"@sanity\"", "dev-sanity": "npx cross-env PORT=8000 wdio run ./wdio.conf.ts --cucumberOpts.tagExpression=\"@sanity\"" }, diff --git a/handshake-nodejs-reporters/package-lock.json b/handshake-nodejs-reporters/package-lock.json index abdba94c..f119aaf8 100644 --- a/handshake-nodejs-reporters/package-lock.json +++ b/handshake-nodejs-reporters/package-lock.json @@ -31,8 +31,8 @@ "version": "0.4.0", "license": "MIT", "dependencies": { - "handshake-dashboard": "0.4.7", - "handshake-utils": "0.4.3", + "handshake-dashboard": "0.5.0", + "handshake-utils": "0.5.0", "next": "^14.1.0", "nextra": "^2.13.3", "nextra-theme-docs": "^2.13.3", @@ -54,7 +54,7 @@ "@wdio/local-runner": "^8.32.4", "@wdio/spec-reporter": "^8.32.4", "@wdio/static-server-service": "^8.32.4", - "handshake-utils": "0.4.3", + "handshake-utils": "0.5.0", "sqlite": "^5.1.1", "sqlite3": "^5.1.7" } @@ -65,7 +65,7 @@ "dependencies": { "@wdio/cli": "^8.33.1", "@wdio/mocha-framework": "8.33.1", - "wdio-handshake-reporter": "0.4.7" + "wdio-handshake-reporter": "0.5.0" }, "devDependencies": { "@wdio/cucumber-framework": "8.33.1", @@ -143,7 +143,7 @@ "@wdio/mocha-framework": "^8.33.1", "@wdio/spec-reporter": "^8.32.4", "ts-node": "^10.9.2", - "wdio-handshake-reporter": "0.4.7" + "wdio-handshake-reporter": "0.5.0" }, "devDependencies": { "cross-env": "^7.0.3" @@ -15705,9 +15705,9 @@ "integrity": "sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==" }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==" }, "node_modules/ipaddr.js": { "version": "1.9.1", @@ -21978,9 +21978,9 @@ } }, "node_modules/pac-resolver/node_modules/ip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", - "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz", + "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==" }, "node_modules/pad-right": { "version": "0.2.2", @@ -29585,7 +29585,7 @@ } }, "packages/common-handshakes": { - "version": "0.4.7", + "version": "0.5.0", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -29627,7 +29627,7 @@ } }, "packages/handshake-dashboard": { - "version": "0.4.7", + "version": "0.5.0", "license": "MIT", "dependencies": { "@ant-design/icons": "^5.3.1", @@ -29642,7 +29642,7 @@ "dayjs": "^1.11.10", "echarts": "^5.5.0", "echarts-for-react": "^3.0.2", - "handshake-utils": "0.4.3", + "handshake-utils": "0.5.0", "next": "14.1.3", "react": "18.2.0", "react-countup": "^6.5.0", @@ -29698,7 +29698,7 @@ } }, "packages/handshake-utils": { - "version": "0.4.3", + "version": "0.5.0", "license": "MIT", "dependencies": { "@tsconfig/node20": "^20.1.2", @@ -29713,12 +29713,12 @@ } }, "packages/wdio-handshake-reporter": { - "version": "0.4.7", + "version": "0.5.0", "license": "MIT", "dependencies": { "@wdio/reporter": "^8.32.4", "@wdio/types": "^8.32.4", - "common-handshakes": "0.4.7", + "common-handshakes": "0.5.0", "log4js": "^6.9.1", "superagent": "^8.1.2" }, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/CHANGELOG.md b/handshake-nodejs-reporters/packages/handshake-dashboard/CHANGELOG.md index 47d1ebc9..a07c3c51 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/CHANGELOG.md +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/CHANGELOG.md @@ -1,5 +1,11 @@ # handshake +## 0.5.1 + +### Patch Changes + +- bb38cb3: revert: module alias path and feat: use the relative paths from the src + ## 0.5.0 ### Minor Changes diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/README.md b/handshake-nodejs-reporters/packages/handshake-dashboard/README.md index c623a067..de0274a5 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/README.md +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/README.md @@ -10,7 +10,7 @@ Exporting Next-JS app was bit confusing for me at first, have spent a lot of tim - when the command line has this particular directory as its root then it should be able to use the command `npm run export` - after running the export command, it should avoid linting next-js as it would be taken care before deploying the changes. -- First it generates the `antd.min.css` in the `src/styles` directory. the above file is not distributed. `scripts/genAntdCSS.ts` generates the file +- First it generates the `antd.min.css` in the `styles` directory. the above file is not distributed. `scripts/genAntdCSS.ts` generates the file - and then it would generate the html files inside the requested output directory through `next build` command. ### Changes made @@ -62,4 +62,4 @@ Check out our [Next.js deployment documentation](https://nextjs.org/docs/deploym ## Note Windows icon by Icons8 -Linux icons created by Freepik - Flaticon \ No newline at end of file +Linux icons created by Freepik - Flaticon diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/next.config.js b/handshake-nodejs-reporters/packages/handshake-dashboard/next.config.js index 6a6612d6..8aab01b6 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/next.config.js +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/next.config.js @@ -1,11 +1,15 @@ const { PHASE_DEVELOPMENT_SERVER } = require("next/constants"); -const withBundleAnalyzer = require('@next/bundle-analyzer')({ - enabled: process.env.ANALYZE === 'true', -}) module.exports = (phase, { defaultConfig }) => { const is_dev = phase === PHASE_DEVELOPMENT_SERVER; + let withBundleAnalyzer; + + if (process.env.ANALYZE === 'true') + withBundleAnalyzer = require('@next/bundle-analyzer')({ + enabled: true, + }) + /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, @@ -23,5 +27,6 @@ module.exports = (phase, { defaultConfig }) => { distDir: process.env.EXPORT_DIR ?? "dist", typescript: { ignoreBuildErrors: !is_dev } } - return withBundleAnalyzer(nextConfig) + + return withBundleAnalyzer ? withBundleAnalyzer(nextConfig) : nextConfig; } \ No newline at end of file diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/package.json b/handshake-nodejs-reporters/packages/handshake-dashboard/package.json index c9a07756..5cf9d21f 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/package.json +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "handshake-dashboard", - "version": "0.5.0", + "version": "0.5.1", "license": "MIT", "scripts": { "dev": "next dev", @@ -20,7 +20,7 @@ "@tsconfig/node18": "^18.2.2", "@types/echarts": "^4.9.22", "@types/node": "20.11.27", - "@types/react": "^18.2.65", + "@types/react": "^18.2.66", "@types/react-dom": "18.2.22", "@uiw/react-markdown-preview": "^5.0.10", "ansi-to-html": "^0.7.2", @@ -45,7 +45,7 @@ "@ant-design/static-style-extract": "~1.0.2", "@next/eslint-plugin-next": "^14.1.3", "@types/react-highlight-words": "^0.16.7", - "@typescript-eslint/eslint-plugin": "^7.1.1", + "@typescript-eslint/eslint-plugin": "^7.2.0", "@typescript-eslint/parser": "^7.2.0", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/collection-of-runs.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/collection-of-runs.tsx index 493514f2..dff0465a 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/collection-of-runs.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/collection-of-runs.tsx @@ -1,4 +1,4 @@ -import type TestRunRecord from 'src/types/test-run-records'; +import type TestRunRecord from 'types/test-run-records'; import React, { type ReactNode } from 'react'; import dayjs from 'dayjs'; import DayJSUtc from 'dayjs/plugin/utc'; @@ -43,8 +43,8 @@ import { serif, toolTipFormats, } from './constants'; -import { dateTimeFormatUsed } from '../utils/Datetime/format'; -import type { DetailedTestRecord } from '@/types/parsed-records'; +import { dateTimeFormatUsed } from '../datetime/format'; +import type { DetailedTestRecord } from 'types/parsed-records'; import type { GridComponentOption, MarkLineComponentOption, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/counter.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/counter.tsx similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/counter.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/counter.tsx diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/progress-rate.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/progress-rate.tsx similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/progress-rate.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/progress-rate.tsx diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/test-bars.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/test-bars.tsx index 90be7d78..c1571689 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/test-bars.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/test-bars.tsx @@ -31,10 +31,7 @@ import { LabelLayout, UniversalTransition } from 'echarts/features'; // Note that including the CanvasRenderer or SVGRenderer is a required step import { SVGRenderer } from 'echarts/renderers'; import { standingToColors, toolTipFormats } from './constants'; -import type { - ParsedSuiteRecord, - ParsedTestRecord, -} from 'src/types/parsed-records'; +import type { ParsedSuiteRecord, ParsedTestRecord } from 'types/parsed-records'; import type { CallbackDataParams, TopLevelFormatterParams, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/tree-map.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/tree-map.tsx index d7c9e7d0..12a4272e 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/tree-map.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/charts/tree-map.tsx @@ -1,4 +1,4 @@ -import type { specNode } from 'src/types/test-run-records'; +import type { specNode } from 'types/test-run-records'; import React, { Component, type ReactNode } from 'react'; import ReactECharts from 'echarts-for-react'; import * as echarts from 'echarts/core'; @@ -24,8 +24,8 @@ import type { ComposeOption } from 'echarts/core'; import { SVGRenderer } from 'echarts/renderers'; import { standingToColors, toolTipFormats } from './constants'; import type { TreemapSeriesOption } from 'echarts/lib/echarts'; -import type { StatusContext } from 'src/types/transfer-structure-context'; -import type { SuiteDetails } from 'src/types/parsed-records'; +import type { StatusContext } from 'types/transfer-structure-context'; +import type { SuiteDetails } from 'types/parsed-records'; type composed = ComposeOption< | TreemapSeriesOption diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/index.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/index.tsx index e1f310a5..41643a4f 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/index.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/index.tsx @@ -1,11 +1,11 @@ -import type TestRunRecord from 'src/types/test-run-records'; +import type TestRunRecord from 'types/test-run-records'; import React, { useState, type ReactNode } from 'react'; -import { parseDetailedTestRun } from '@/components/parse-utils'; -import AreaChartForRuns from '@/components/charts/collection-of-runs'; -import RenderPassedRate from '@/components/charts/stacked-bar-chart'; +import { parseDetailedTestRun } from 'components/parse-utils'; +import AreaChartForRuns from 'components/charts/collection-of-runs'; +import RenderPassedRate from 'components/charts/stacked-bar-chart'; import crumbs from './test-items'; -import { dateFormatUsed } from '@/components/utils/Datetime/format'; -import HeaderStyles from '@/styles/header.module.css'; +import { dateFormatUsed } from 'components/datetime/format'; +import HeaderStyles from 'styles/header.module.css'; import Switch from 'antd/lib/switch'; import List from 'antd/lib/list'; import Space from 'antd/lib/space'; @@ -27,17 +27,12 @@ import Link from 'antd/lib/typography/Link'; import isBetween from 'dayjs/plugin/isBetween'; import type { RangePickerProps } from 'antd/lib/date-picker'; import Tag from 'antd/lib/tag/index'; -import RelativeTo, { - RenderDuration, -} from '@/components/utils/Datetime/relative-time'; -import { - RenderFrameworkUsed, - RenderStatus, -} from '@/components/utils/renderers'; -import type { DetailedTestRecord } from '@/types/parsed-records'; +import RelativeTo, { RenderDuration } from 'components/datetime/relative-time'; +import { RenderFrameworkUsed, RenderStatus } from 'components/renderers'; +import type { DetailedTestRecord } from 'types/parsed-records'; import { LOCATORS, TEXT } from 'handshake-utils'; -import type { TestRecord } from '@/types/test-run-records'; -import CardStyles from 'src/styles/card.module.css'; +import type { TestRecord } from 'types/test-run-records'; +import CardStyles from 'styles/card.module.css'; import Ribbon from 'antd/lib/badge/Ribbon'; import AboutModal from '../about'; dayjs.extend(isBetween); diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/page.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/page.tsx index 452ce003..4ab24e3a 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/page.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/ListOfRuns/page.tsx @@ -1,8 +1,8 @@ -import GridOfRuns from '@/core/ListOfRuns'; +import GridOfRuns from 'components/core/ListOfRuns'; import React, { type ReactNode } from 'react'; import Head from 'next/head'; import { TEXT } from 'handshake-utils'; -import type { TestRecord } from '@/types/test-run-records'; +import type { TestRecord } from 'types/test-run-records'; export default function AllTestRunsDisplayedHere(properties: { runs: TestRecord[]; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/entity-item.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/entity-item.tsx index ad574a42..417efadb 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/entity-item.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/entity-item.tsx @@ -1,24 +1,19 @@ -import type { Assertion, ErrorRecord } from 'src/types/test-entity-related'; +import type { Assertion, ErrorRecord } from 'types/test-entity-related'; import React from 'react'; import Space from 'antd/lib/space'; import Paragraph from 'antd/lib/typography/Paragraph'; import Text from 'antd/lib/typography/Text'; import type { CollapseProps } from 'antd/lib'; import { Collapse, Tag, Tooltip } from 'antd/lib'; -import type { - ParsedSuiteRecord, - ParsedTestRecord, -} from 'src/types/parsed-records'; +import type { ParsedSuiteRecord, ParsedTestRecord } from 'types/parsed-records'; import { useContext } from 'react'; import Alert from 'antd/lib/alert/Alert'; import Breadcrumb from 'antd/lib/breadcrumb/Breadcrumb'; -import { DetailedContext } from '@/types/records-in-detailed'; -import GalleryOfImages, { - PlainImage, -} from 'src/components/utils/images-with-thumbnails'; +import { DetailedContext } from 'types/records-in-detailed'; +import GalleryOfImages, { PlainImage } from 'components/images-with-thumbnails'; import type { Dayjs } from 'dayjs'; import { DurationLayer } from './header'; -import Counter from '@/components/utils/counter'; +import Counter from 'components/charts/counter'; export default function EntityItem(properties: { entity: ParsedSuiteRecord | ParsedTestRecord; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/extractors.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/extractors.tsx index b0e6de7b..88dbf367 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/extractors.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/extractors.tsx @@ -5,15 +5,15 @@ import type { TextProps } from 'antd/lib/typography/Text'; import Button from 'antd/lib/button/button'; import type { Dayjs } from 'dayjs'; import React from 'react'; -import { RenderTestItem } from '@/components/utils/renderers'; -import type { statusOfEntity } from '@/types/session-records'; +import { RenderTestItem } from 'components/renderers'; +import type { statusOfEntity } from 'types/session-records'; import EntityItem from './entity-item'; import type { ParsedSuiteRecord, ParsedTestRecord, SuiteDetails, TestDetails, -} from '@/types/parsed-records'; +} from 'types/parsed-records'; export function extractNeighborSuite( suites: SuiteDetails, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/header.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/header.tsx index cec0145b..42d9e11a 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/header.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/header.tsx @@ -4,21 +4,16 @@ import CaretRightOutlined from '@ant-design/icons/CaretRightOutlined'; import CaretLeftOutlined from '@ant-design/icons/CaretLeftOutlined'; import Space from 'antd/lib/space'; import Button from 'antd/lib/button/button'; -import RenderTestType from '@/components/utils/test-status-dot'; +import RenderTestType from 'components/test-status-dot'; import Text from 'antd/lib/typography/Text'; import { Badge, Divider, Tooltip } from 'antd/lib'; import { childBadge, parentBadge, retriedBadge } from './constants'; -import { ShowContribution } from '@/components/utils/counter'; -import { RenderEntityType } from '@/components/utils/renderers'; -import { DetailedContext } from '@/types/records-in-detailed'; -import type { - ParsedSuiteRecord, - ParsedTestRecord, -} from 'src/types/parsed-records'; +import { ShowContribution } from 'components/charts/counter'; +import { RenderEntityType } from 'components/renderers'; +import { DetailedContext } from 'types/records-in-detailed'; +import type { ParsedSuiteRecord, ParsedTestRecord } from 'types/parsed-records'; import { extractNeighborSuite } from './extractors'; -import RelativeTo, { - DurationText, -} from '@/components/utils/Datetime/relative-time'; +import RelativeTo, { DurationText } from 'components/datetime/relative-time'; import type { Dayjs } from 'dayjs'; export function NavigationButtons(properties: { diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/index.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/index.tsx index a5c66f21..732f8b3b 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/index.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestEntity/index.tsx @@ -8,18 +8,18 @@ import { } from './extractors'; import Button from 'antd/lib/button/button'; import { Divider, Select, Tag, Tooltip } from 'antd/lib'; -import TestEntitiesBars from 'src/components/charts/test-bars'; +import TestEntitiesBars from 'components/charts/test-bars'; import Layout, { Content, Header } from 'antd/lib/layout/layout'; -import { DetailedContext } from '@/types/records-in-detailed'; +import { DetailedContext } from 'types/records-in-detailed'; import Sider from 'antd/lib/layout/Sider'; -import ProgressPieChart from 'src/components/charts/status-pie-chart'; -import CardStyles from 'src/styles/card.module.css'; +import ProgressPieChart from 'components/charts/status-pie-chart'; +import CardStyles from 'styles/card.module.css'; import PreviewGroup from 'antd/lib/image/PreviewGroup'; import CloseCircleOutlined from '@ant-design/icons/CloseCircleOutlined'; import Paragraph from 'antd/lib/typography/Paragraph'; -import { SwitchValues } from '@/components/charts/stacked-bar-chart'; -import type { ParsedSuiteRecord } from '@/types/parsed-records'; -import { RenderFilePath } from '@/components/utils/renderers'; +import { SwitchValues } from 'components/charts/stacked-bar-chart'; +import type { ParsedSuiteRecord } from 'types/parsed-records'; +import { RenderFilePath } from 'components/renderers'; function RollupPieChart(properties: { suite: ParsedSuiteRecord }) { const [showRollup, setShowRollup] = useState(false); diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/index.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/index.tsx index e01cbcfc..a0cf6638 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/index.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/index.tsx @@ -1,7 +1,7 @@ -import { detailedPage, runPage } from 'src/components/links'; -import RelativeTo from 'src/components/utils/Datetime/relative-time'; -import { dateFormatUsed } from 'src/components/utils/Datetime/format'; -import { menuTabs } from 'src/types/ui-constants'; +import { detailedPage, runPage } from 'components/links'; +import RelativeTo from 'components/datetime/relative-time'; +import { dateFormatUsed } from 'components/datetime/format'; +import { menuTabs } from 'types/ui-constants'; import React, { useContext, type ReactNode } from 'react'; import Layout from 'antd/lib/layout/index'; import Text from 'antd/lib/typography/Text'; @@ -12,9 +12,9 @@ import TableOutlined from '@ant-design/icons/TableOutlined'; import PartitionOutlined from '@ant-design/icons/PartitionOutlined'; import type { MenuProps } from 'antd/lib/menu/menu'; import Menu from 'antd/lib/menu/menu'; -import HeaderStyles from '@/styles/header.module.css'; +import HeaderStyles from 'styles/header.module.css'; import Link from 'next/link'; -import { DetailedContext } from '@/types/records-in-detailed'; +import { DetailedContext } from 'types/records-in-detailed'; export default function LayoutStructureForRunDetails(properties: { children: ReactNode; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/overview-tab.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/overview-tab.tsx index bddd3c10..77d95dfb 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/overview-tab.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/overview-tab.tsx @@ -1,19 +1,15 @@ -import type { SuiteRecordDetails } from 'src/types/test-entity-related'; -import type { statusOfEntity } from 'src/types/session-records'; -import Counter from '@/components/utils/counter'; -import RelativeTo, { - RenderDuration, -} from 'src/components/utils/Datetime/relative-time'; -import ProgressPieChart from 'src/components/charts/status-pie-chart'; +import type { SuiteRecordDetails } from 'types/test-entity-related'; +import type { statusOfEntity } from 'types/session-records'; +import Counter from 'components/charts/counter'; +import RelativeTo, { RenderDuration } from 'components/datetime/relative-time'; +import ProgressPieChart from 'components/charts/status-pie-chart'; import { RenderFrameworkUsed, RenderStatus, RenderSystemType, -} from 'src/components/utils/renderers'; -import RenderPassedRate from 'src/components/charts/stacked-bar-chart'; -import GalleryOfImages, { - PlainImage, -} from 'src/components/utils/images-with-thumbnails'; +} from 'components/renderers'; +import RenderPassedRate from 'components/charts/stacked-bar-chart'; +import GalleryOfImages, { PlainImage } from 'components/images-with-thumbnails'; import React, { useState, type ReactNode, useContext } from 'react'; import dayjs from 'dayjs'; import Space from 'antd/lib/space'; @@ -23,14 +19,14 @@ import Table from 'antd/lib/table/Table'; import Select from 'antd/lib/select/index'; import Tabs from 'antd/lib/tabs/index'; import { Empty, Tag } from 'antd/lib'; -import { standingToColors } from 'src/components/charts/constants'; -import type { OverviewOfEntities } from 'src/types/parsed-overview-records'; -import { OverviewContext } from 'src/types/parsed-overview-records'; -import TextShadow from '@/styles/text-shadow.module.css'; +import { standingToColors } from 'components/charts/constants'; +import type { OverviewOfEntities } from 'types/parsed-overview-records'; +import { OverviewContext } from 'types/parsed-overview-records'; +import TextShadow from 'styles/text-shadow.module.css'; import { LOCATORS } from 'handshake-utils'; -import CardStyles from '@/styles/card.module.css'; +import CardStyles from 'styles/card.module.css'; import Ribbon from 'antd/lib/badge/Ribbon'; -import { TestEntitiesOverTime } from '@/components/charts/collection-of-runs'; +import { TestEntitiesOverTime } from 'components/charts/collection-of-runs'; function TopSuites(properties: { suites: OverviewOfEntities[]; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/structure-tab.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/structure-tab.tsx index 6a9d5462..4e638c7a 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/structure-tab.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/TestRun/structure-tab.tsx @@ -1,17 +1,17 @@ -import Dotted from '@/styles/dotted.module.css'; +import Dotted from 'styles/dotted.module.css'; import React, { useContext, type ReactNode, useState, useMemo } from 'react'; import Space from 'antd/lib/space'; import Text from 'antd/lib/typography/Text'; import Card from 'antd/lib/card/Card'; -import Counter from '@/components/utils/counter'; +import Counter from 'components/charts/counter'; import { Tooltip } from 'antd/lib'; -import TreeMapComponent, { treeData } from '@/components/charts/tree-map'; -import type { StatusContext } from '@/types/transfer-structure-context'; -import { RenderStatus } from '@/components/utils/renderers'; -import RenderTestType from '@/components/utils/test-status-dot'; -import { DetailedContext } from '@/types/records-in-detailed'; -import type { specNode } from '@/types/test-run-records'; -import type { SuiteDetails } from '@/types/parsed-records'; +import TreeMapComponent, { treeData } from 'components/charts/tree-map'; +import type { StatusContext } from 'types/transfer-structure-context'; +import { RenderStatus } from 'components/renderers'; +import RenderTestType from 'components/test-status-dot'; +import { DetailedContext } from 'types/records-in-detailed'; +import type { specNode } from 'types/test-run-records'; +import type { SuiteDetails } from 'types/parsed-records'; function MousedPart(properties: { info?: StatusContext }): ReactNode { if (properties?.info === undefined) diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/test-entities.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/test-entities.tsx index afda01d5..599eb9d0 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/test-entities.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/core/test-entities.tsx @@ -1,11 +1,11 @@ -import { menuTabs } from 'src/types/ui-constants'; -import type { statusOfEntity } from 'src/types/session-records'; -import type { possibleEntityNames } from 'src/types/session-records'; +import { menuTabs } from 'types/ui-constants'; +import type { statusOfEntity } from 'types/session-records'; +import type { possibleEntityNames } from 'types/session-records'; import { RenderEntityType, RenderFilePath, RenderStatus, -} from '../utils/renderers'; +} from 'components/renderers'; import RenderPassedRate, { SwitchValues } from '../charts/stacked-bar-chart'; import React, { useContext, type ReactNode, useState, useRef } from 'react'; import { type Dayjs } from 'dayjs'; @@ -15,22 +15,22 @@ import Space from 'antd/lib/space/index'; import type { Duration } from 'dayjs/plugin/duration'; import Typography from 'antd/lib/typography/Typography'; import Text from 'antd/lib/typography/Text'; -import { timeFormatUsed } from '../utils/Datetime/format'; +import { timeFormatUsed } from '../datetime/format'; import type { InputRef } from 'antd/lib/input'; import Spin from 'antd/lib/spin'; import Tabs from 'antd/lib/tabs'; -import RelativeTo, { RenderDuration } from '../utils/Datetime/relative-time'; -import Counter, { ShowContribution } from '../utils/counter'; -import { DetailedContext } from '@/types/records-in-detailed'; +import RelativeTo, { RenderDuration } from 'components/datetime/relative-time'; +import Counter, { ShowContribution } from 'components/charts/counter'; +import { DetailedContext } from 'types/records-in-detailed'; import Highlighter from 'react-highlight-words'; -import type { ParsedSuiteRecord, SuiteDetails } from 'src/types/parsed-records'; +import type { ParsedSuiteRecord, SuiteDetails } from 'types/parsed-records'; import ProjectStructure from './TestRun/structure-tab'; import DetailedTestEntity from './TestEntity'; -import Dotted from 'src/styles/dotted.module.css'; -import CardStyles from '@/styles/card.module.css'; +import Dotted from 'styles/dotted.module.css'; +import CardStyles from 'styles/card.module.css'; import ExportOutlined from '@ant-design/icons/ExportOutlined'; import SearchOutlined from '@ant-design/icons/SearchOutlined'; -import SearchEntities from '../utils/search-bar'; +import SearchEntities from 'components/search-bar'; export function TestRunStarted(): ReactNode { const context = useContext(DetailedContext); diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/Datetime/format.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/datetime/format.tsx similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/Datetime/format.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/datetime/format.tsx diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/Datetime/relative-time.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/datetime/relative-time.tsx similarity index 97% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/Datetime/relative-time.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/datetime/relative-time.tsx index 44a858ed..d85ada17 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/Datetime/relative-time.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/datetime/relative-time.tsx @@ -7,9 +7,9 @@ import duration from 'dayjs/plugin/duration'; import { type Duration } from 'dayjs/plugin/duration'; import advancedFormat from 'dayjs/plugin/advancedFormat'; import { timeFormatUsed } from './format'; -import carouselStyles from '@/styles/carousel.module.css'; +import carouselStyles from 'styles/carousel.module.css'; import Typography from 'antd/lib/typography/Typography'; -import TextShadow from '@/styles/text-shadow.module.css'; +import TextShadow from 'styles/text-shadow.module.css'; import { LOCATORS } from 'handshake-utils'; import Carousel from 'antd/lib/carousel/index'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/images-with-thumbnails.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/images-with-thumbnails.tsx similarity index 98% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/images-with-thumbnails.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/images-with-thumbnails.tsx index 68d301fe..2319d4bc 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/images-with-thumbnails.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/images-with-thumbnails.tsx @@ -1,5 +1,5 @@ import React, { type ReactNode } from 'react'; -import carouselStyles from '../../styles/carousel.module.css'; +import carouselStyles from 'styles/carousel.module.css'; import Image from 'antd/lib/image'; import Paragraph from 'antd/lib/typography/Paragraph'; import Text from 'antd/lib/typography/Text'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/log.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/log.tsx similarity index 91% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/log.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/log.tsx index 06269da9..72385d7c 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/log.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/log.tsx @@ -1,6 +1,6 @@ import type { AlertProps } from 'antd/lib/alert/Alert'; import Alert from 'antd/lib/alert/Alert'; -import type { logTypes } from 'src/types/test-run-records'; +import type { logTypes } from 'types/test-run-records'; import type { ReactNode } from 'react'; import React from 'react'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/parse-utils.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/parse-utils.ts index 1c934832..f83d5fdb 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/parse-utils.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/parse-utils.ts @@ -1,5 +1,5 @@ -import { runPage } from '@/components/links'; -import type TestRunRecord from '@/types/test-run-records'; +import { runPage } from 'components/links'; +import type TestRunRecord from 'types/test-run-records'; import type { Dayjs } from 'dayjs'; import dayjs from 'dayjs'; import duration from 'dayjs/plugin/duration'; @@ -8,7 +8,7 @@ import type { ParsedRetriedRecords, SuiteDetails, TestDetails, -} from '@/types/parsed-records'; +} from 'types/parsed-records'; import type { Assertion, ErrorRecord, @@ -16,15 +16,15 @@ import type { RetriedRecord, SuiteRecordDetails, TestRecordDetails, -} from '@/types/test-entity-related'; +} from 'types/test-entity-related'; import type { TestRecord, TestRunConfig, possibleFrameworks, specNode, -} from '@/types/test-run-records'; +} from 'types/test-run-records'; import Convert from 'ansi-to-html'; -import { attachmentPrefix } from '@/types/ui-constants'; +import { attachmentPrefix } from 'types/ui-constants'; dayjs.extend(duration); diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/renderers.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/renderers.tsx similarity index 95% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/renderers.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/renderers.tsx index 30fa08cd..0c6223ce 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/renderers.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/renderers.tsx @@ -1,25 +1,22 @@ import type { CSSProperties } from 'react'; import React, { type ReactNode } from 'react'; -import type { statusOfEntity } from '@/types/session-records'; +import type { statusOfEntity } from 'types/session-records'; import ReloadOutlined from '@ant-design/icons/ReloadOutlined'; -import Dotted from '@/styles/dotted.module.css'; +import Dotted from 'styles/dotted.module.css'; import Text from 'antd/lib/typography/Text'; import LoadingOutlined from '@ant-design/icons/LoadingOutlined'; import Space from 'antd/lib/space'; import Card from 'antd/lib/card/Card'; import Tag from 'antd/lib/tag/index'; -import type { possibleEntityNames } from '@/types/session-records'; +import type { possibleEntityNames } from 'types/session-records'; import Avatar from 'antd/lib/avatar/avatar'; -import GraphCardCss from '@/styles/GraphCard.module.css'; +import GraphCardCss from 'styles/GraphCard.module.css'; import { Badge, Tooltip } from 'antd/lib'; -import { showOnly } from '@/types/ui-constants'; -import type { - ParsedSuiteRecord, - ParsedTestRecord, -} from 'src/types/parsed-records'; -import { testStatusText } from '@/core/TestEntity/extractors'; +import { showOnly } from 'types/ui-constants'; +import type { ParsedSuiteRecord, ParsedTestRecord } from 'types/parsed-records'; +import { testStatusText } from 'components/core/TestEntity/extractors'; import { LOCATORS } from 'handshake-utils'; -import type { possibleFrameworks } from 'src/types/test-run-records'; +import type { possibleFrameworks } from 'types/test-run-records'; import { Group } from 'antd/lib/avatar'; export function RenderStatus(properties: { diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/search-bar.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/search-bar.tsx similarity index 96% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/search-bar.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/search-bar.tsx index 53466902..165d5cf5 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/search-bar.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/search-bar.tsx @@ -3,7 +3,7 @@ import Button from 'antd/lib/button/button'; import type { ReactNode, Ref } from 'react'; import React from 'react'; import type { InputRef } from 'antd/lib'; -import TextShadow from '@/styles/text-shadow.module.css'; +import TextShadow from 'styles/text-shadow.module.css'; import type { ChangeEvent, KeyboardEvent, MouseEvent } from 'react'; export default function SearchEntities(properties: { diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/test-status-dot.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/test-status-dot.tsx similarity index 89% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/test-status-dot.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/test-status-dot.tsx index c0cc28c9..a354d77c 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/test-status-dot.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/test-status-dot.tsx @@ -1,7 +1,7 @@ import type { BadgeProps } from 'antd/lib/badge/index'; import Badge from 'antd/lib/badge/index'; import React, { type ReactNode } from 'react'; -import type { suiteType } from 'src/types/test-entity-related'; +import type { suiteType } from 'types/test-entity-related'; export default function RenderTestType(properties: { value: suiteType; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/texts.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/texts.tsx similarity index 80% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/texts.tsx rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/components/texts.tsx index cb7e9af2..935d8d26 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/texts.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/texts.tsx @@ -1,4 +1,4 @@ -import TextShadow from '@/styles/text-shadow.module.css'; +import TextShadow from 'styles/text-shadow.module.css'; import Typography from 'antd/lib/typography/Typography'; import React from 'react'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/converters.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/converters.ts index 4a9a368d..bcb0be69 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/converters.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/converters.ts @@ -1,4 +1,4 @@ -import type { statusOfEntity } from 'src/types/session-records'; +import type { statusOfEntity } from 'types/session-records'; import type { BadgeProps } from 'antd/lib'; import type { TimelineItemProps } from 'antd/lib'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/parse-overview-records.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/parse-overview-records.ts index e0600847..dd09b0d6 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/parse-overview-records.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/utils/parse-overview-records.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs'; -import type { OverviewOfEntities } from 'src/types/parsed-overview-records'; -import type { SuiteRecordDetails } from 'src/types/test-entity-related'; +import type { OverviewOfEntities } from 'types/parsed-overview-records'; +import type { SuiteRecordDetails } from 'types/test-entity-related'; export function parseEntitiesForOverview( records: SuiteRecordDetails[], @@ -17,6 +17,6 @@ export function parseEntitiesForOverview( skipped: record.skipped, standing: record.standing, numberOfErrors: record.numberOfErrors, - numberOfAssertions: record.numberOfAssertions ?? 0 + numberOfAssertions: record.numberOfAssertions ?? 0, })); } diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/detailed.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/detailed.tsx index 7ac18073..19085248 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/detailed.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/detailed.tsx @@ -1,34 +1,34 @@ -import getConnection from 'src/components/scripts/connection'; -import LayoutStructureForRunDetails from 'src/components/core/TestRun'; +import getConnection from 'scripts/connection'; +import LayoutStructureForRunDetails from 'components/core/TestRun'; import React, { useEffect, useMemo, useState } from 'react'; import { type GetStaticPropsResult } from 'next'; import { type ReactNode } from 'react'; -import sqlFile from 'src/components/scripts/RunPage/script'; -import type TestRunRecord from 'src/types/test-run-records'; +import sqlFile from 'scripts/run-page/script'; +import type TestRunRecord from 'types/test-run-records'; import type { TestRecordDetails, ImageRecord, AssertionRecord, RetriedRecord, -} from 'src/types/test-entity-related'; -import { type SuiteRecordDetails } from 'src/types/test-entity-related'; -import type DetailedPageProperties from 'src/types/records-in-detailed'; -import type { ValuesInDetailedContext } from 'src/types/records-in-detailed'; -import { DetailedContext } from '@/types/records-in-detailed'; +} from 'types/test-entity-related'; +import { type SuiteRecordDetails } from 'types/test-entity-related'; +import type DetailedPageProperties from 'types/records-in-detailed'; +import type { ValuesInDetailedContext } from 'types/records-in-detailed'; +import { DetailedContext } from 'types/records-in-detailed'; import { parseDetailedTestRun, parseImageRecords, parseRetriedRecords, parseSuites, parseTests, -} from 'src/components/parse-utils'; -import { menuTabs } from 'src/types/ui-constants'; +} from 'components/parse-utils'; +import { menuTabs } from 'types/ui-constants'; import { useRouter } from 'next/router'; -import TestEntities from 'src/components/core/test-entities'; +import TestEntities from 'components/core/test-entities'; import Head from 'next/head'; import { TEXT } from 'handshake-utils'; -import type DetailedPageParameters from 'src/types/redirection-parameters'; +import type DetailedPageParameters from 'types/redirection-parameters'; export async function getStaticProps(prepareProperties: { params: { @@ -168,4 +168,4 @@ export default function TestRunResults( ); } -export { default as getStaticPaths } from 'src/components/scripts/RunPage/generate-path'; +export { default as getStaticPaths } from 'scripts/run-page/generate-path'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/index.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/index.tsx index 20babad3..dccada32 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/index.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/[id]/index.tsx @@ -1,32 +1,32 @@ -import getConnection from 'src/components/scripts/connection'; -import LayoutStructureForRunDetails from 'src/components/core/TestRun'; +import getConnection from 'scripts/connection'; +import LayoutStructureForRunDetails from 'components/core/TestRun'; import React, { useMemo } from 'react'; import { type GetStaticPropsResult } from 'next'; import { type ReactNode } from 'react'; -import { menuTabs } from 'src/types/ui-constants'; -import Overview from 'src/components/core/TestRun/overview-tab'; -import sqlFile from 'src/components/scripts/RunPage/script'; -import type TestRunRecord from 'src/types/test-run-records'; -import type { TestRunConfig } from 'src/types/test-run-records'; +import { menuTabs } from 'types/ui-constants'; +import Overview from 'components/core/TestRun/overview-tab'; +import sqlFile from 'scripts/run-page/script'; +import type TestRunRecord from 'types/test-run-records'; +import type { TestRunConfig } from 'types/test-run-records'; import type { ImageRecord, SuiteRecordDetails, -} from 'src/types/test-entity-related'; -import { parseEntitiesForOverview } from 'src/components/utils/parse-overview-records'; +} from 'types/test-entity-related'; +import { parseEntitiesForOverview } from 'components/utils/parse-overview-records'; import type { OverallAggResults, OverviewPageProperties, SessionSummary, -} from 'src/types/records-in-overview'; +} from 'types/records-in-overview'; import { OverviewContext, type ValuesInOverviewContext, -} from 'src/types/parsed-overview-records'; +} from 'types/parsed-overview-records'; import { parseDetailedTestRun, parseImageRecords, parseTestConfig, -} from 'src/components/parse-utils'; +} from 'components/parse-utils'; import Head from 'next/head'; import { TEXT } from 'handshake-utils'; @@ -190,4 +190,4 @@ export default function TestRunResults( ); } -export { default as getStaticPaths } from 'src/components/scripts/RunPage/generate-path'; +export { default as getStaticPaths } from 'scripts/run-page/generate-path'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/index.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/index.tsx index 435739ba..653dad8f 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/index.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/RUNS/index.tsx @@ -1,10 +1,10 @@ -export { default } from '@/core/ListOfRuns/page'; -import getConnection from '@/scripts/connection'; +export { default } from 'components/core/ListOfRuns/page'; +import getConnection from 'scripts/connection'; import { type GetStaticPropsResult } from 'next'; -import currentExportConfig from '@/components/scripts/config'; -import sqlFile from '@/components/scripts/RunPage/script'; -import { parseTestConfig } from '@/components/parse-utils'; -import type { TestRecord } from '@/types/test-run-records'; +import currentExportConfig from 'scripts/config'; +import sqlFile from 'scripts/run-page/script'; +import { parseTestConfig } from 'components/parse-utils'; +import type { TestRecord } from 'types/test-run-records'; import { readFileSync } from 'node:fs'; import { join } from 'node:path'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/_app.tsx b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/_app.tsx index 0d9338e6..6e02ec92 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/_app.tsx +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/pages/_app.tsx @@ -1,8 +1,8 @@ import React, { type ReactNode } from 'react'; import type { AppProps } from 'next/app'; -import withTheme from 'src/components/theme'; +import withTheme from 'components/theme'; import '../../public/antd.min.css'; -import 'src/styles/globals.css'; +import 'styles/globals.css'; import { StyleProvider } from '@ant-design/cssinjs'; const App = ({ Component, pageProps }: AppProps): ReactNode => { diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/config.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/config.ts similarity index 82% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/config.ts rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/config.ts index 1de5e197..0b816356 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/config.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/config.ts @@ -1,5 +1,5 @@ -import type { dataBaseConnection } from 'src/components/scripts/connection'; -import type ExportConfig from 'src/types/export-config-records'; +import type { dataBaseConnection } from 'scripts/connection'; +import type ExportConfig from 'types/export-config-records'; export default async function currentExportConfig( connection: dataBaseConnection, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/connection.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/connection.ts similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/connection.ts rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/connection.ts diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/detailed-page.sql b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/detailed-page.sql similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/detailed-page.sql rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/detailed-page.sql diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/generate-path.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/generate-path.ts similarity index 81% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/generate-path.ts rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/generate-path.ts index 2fcc2c09..a6830b58 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/generate-path.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/generate-path.ts @@ -1,5 +1,5 @@ -import getConnection from 'src/components/scripts/connection'; -import currentExportConfig from 'src/components/scripts/config'; +import getConnection from 'scripts/connection'; +import currentExportConfig from 'scripts/config'; import { type GetStaticPathsResult } from 'next'; import sqlFile from './script'; diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/get-test-runs.sql b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/get-test-runs.sql similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/get-test-runs.sql rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/get-test-runs.sql diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/overview-page.sql b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/overview-page.sql similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/overview-page.sql rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/overview-page.sql diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/runs-page.sql b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/runs-page.sql similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/runs-page.sql rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/runs-page.sql diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/script.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/script.ts similarity index 100% rename from handshake-nodejs-reporters/packages/handshake-dashboard/src/components/scripts/RunPage/script.ts rename to handshake-nodejs-reporters/packages/handshake-dashboard/src/scripts/run-page/script.ts diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/src/types/parsed-records.ts b/handshake-nodejs-reporters/packages/handshake-dashboard/src/types/parsed-records.ts index b5e6b027..825111f5 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/src/types/parsed-records.ts +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/src/types/parsed-records.ts @@ -1,5 +1,5 @@ import type { Dayjs } from 'dayjs'; -import type { statusOfEntity } from 'src/types/session-records'; +import type { statusOfEntity } from 'types/session-records'; import type { Duration } from 'dayjs/plugin/duration'; import type { Assertion, diff --git a/handshake-nodejs-reporters/packages/handshake-dashboard/tsconfig.json b/handshake-nodejs-reporters/packages/handshake-dashboard/tsconfig.json index 7bc3c13e..801e8c69 100644 --- a/handshake-nodejs-reporters/packages/handshake-dashboard/tsconfig.json +++ b/handshake-nodejs-reporters/packages/handshake-dashboard/tsconfig.json @@ -1,14 +1,7 @@ { "extends": "handshake-utils/tsconfig.ui.json", "compilerOptions": { - "baseUrl": ".", - "paths": { - "@/scripts/*": ["./src/components/scripts/*"], - "@/components/*": ["./src/components/*"], - "@/core/*": ["./src/components/core/*"], - "@/styles/*": ["./src/styles/*"], - "@/types/*": ["./src/types/*"] - } + "baseUrl": "./src" }, "include": ["./next-env.d.ts", "./src", "./next/types/**/*.ts"], "exclude": ["./node_modules", "./results", "./next"]