From 0f524f6bdaa99420a3458f752b5323c80dc6496b Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 16:50:50 +0300 Subject: [PATCH 01/10] changes --- packages/login/src/middleware.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/login/src/middleware.ts b/packages/login/src/middleware.ts index a9633a9..fec9259 100644 --- a/packages/login/src/middleware.ts +++ b/packages/login/src/middleware.ts @@ -32,6 +32,7 @@ import { OAuth2ErrorKey } from "./utils/enums"; export function middleware(request: NextRequest) { const requestHeaders = new Headers(request.headers); + console.log("1"); const host = request.headers.get("x-forwarded-host"); const proto = request.headers.get("x-forwarded-proto"); From 5423c24b86fb852bb8c7afa3496c194cfeab6579 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 17:36:16 +0300 Subject: [PATCH 02/10] Fix appsettings --- packages/shared/utils/beforeBuild.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/shared/utils/beforeBuild.js b/packages/shared/utils/beforeBuild.js index 4422099..5b81d9d 100644 --- a/packages/shared/utils/beforeBuild.js +++ b/packages/shared/utils/beforeBuild.js @@ -32,7 +32,14 @@ const path = require("path"); const fs = require("fs"); const { readdir } = require("fs").promises; // @ts-expect-error path is correct -const appSettings = require("../../../../1.work/DocSpace/buildtools/config/appsettings.json"); + +let appSettings = null; + +try { + appSettings = require("../../../1.work/DocSpace/buildtools/config/appsettings.json"); +} catch (e) { + console.log(e); +} const beforeBuild = async ( pathsToLocales, @@ -40,6 +47,18 @@ const beforeBuild = async ( additionalPath, isSSR = false, ) => { + async function getCultures() { + const fileInDir = await readdir(pathsToLocales[0], { + withFileTypes: true, + }); + + const cultures = fileInDir + .filter((dirent) => dirent.isDirectory()) + .map((d) => d.name); + + return cultures; + } + async function* getFiles(dir) { const dirents = await readdir(dir, { withFileTypes: true }); for (const dirent of dirents) { @@ -74,7 +93,7 @@ const beforeBuild = async ( const localesFiles = await getLocalesFiles(); - const cultures = appSettings.web.cultures; + const cultures = appSettings ? appSettings.web.cultures : await getCultures(); const collectionByLng = new Map(); const truthLng = new Map(); From 5dcecc9cd8be052fe816b74d122c05b7477c04a0 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 17:46:40 +0300 Subject: [PATCH 03/10] Fix test workflow --- .github/workflows/e2e-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 11fae0e..e8b0d8e 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -24,4 +24,4 @@ jobs: - name: Build test version run: yarn test:build - name: Start tests - run: yarn test:start + run: yarn test:e2e From 17a30da470b026355aaa338e87f9eb9ec3a429bf Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 17:55:02 +0300 Subject: [PATCH 04/10] Add wrong test --- .github/workflows/e2e-tests.yaml | 2 +- packages/login/__tests__/wizard.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index e8b0d8e..feb7bd7 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -23,5 +23,5 @@ jobs: run: yarn install - name: Build test version run: yarn test:build - - name: Start tests + - name: Run tests run: yarn test:e2e diff --git a/packages/login/__tests__/wizard.spec.ts b/packages/login/__tests__/wizard.spec.ts index 2f108d7..5b5761e 100644 --- a/packages/login/__tests__/wizard.spec.ts +++ b/packages/login/__tests__/wizard.spec.ts @@ -83,7 +83,7 @@ test("wizard error", async ({ page, mockRequest }) => { await expect(page).toHaveScreenshot([ "desktop", "wizard", - "wizard-error.png", + "wizard-success-redirect.png", ]); }); From 726f4a42e08b0e50fb2f3c8f00c2ee56785806e7 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 18:06:22 +0300 Subject: [PATCH 05/10] Fix path --- .github/workflows/e2e-tests.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index feb7bd7..85a2c1c 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -1,4 +1,4 @@ -name: Playwright Tests +name: Login e2e tests on: push: @@ -7,7 +7,7 @@ on: branches: [master, develop] jobs: playwright: - name: "Playwright Tests" + name: "Login e2e tests" runs-on: ubuntu-latest container: image: mcr.microsoft.com/playwright:v1.46.1-jammy @@ -21,7 +21,15 @@ jobs: cache: "yarn" - name: Install dependencies run: yarn install + - name: Enter login client + run: cd packages/login - name: Build test version run: yarn test:build - name: Run tests run: yarn test:e2e + - uses: actions/upload-artifact@v4 + if: ${{ !cancelled() }} + with: + name: playwright-report + path: playwright-report/ + retention-days: 30 From 429849231d83839c46b948678c0f193183967a1d Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 18:13:13 +0300 Subject: [PATCH 06/10] Fix path --- .github/workflows/e2e-tests.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 85a2c1c..486f229 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -27,6 +27,8 @@ jobs: run: yarn test:build - name: Run tests run: yarn test:e2e + - name: Get path + run: pwd - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: From babcb063492595318c1b07743feacf1faab1a256 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 18:19:01 +0300 Subject: [PATCH 07/10] Fix path --- .github/workflows/e2e-tests.yaml | 6 +----- packages/login/playwright.config.ts | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 486f229..c2c49b5 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -1,4 +1,4 @@ -name: Login e2e tests +name: E2e tests on: push: @@ -21,14 +21,10 @@ jobs: cache: "yarn" - name: Install dependencies run: yarn install - - name: Enter login client - run: cd packages/login - name: Build test version run: yarn test:build - name: Run tests run: yarn test:e2e - - name: Get path - run: pwd - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: diff --git a/packages/login/playwright.config.ts b/packages/login/playwright.config.ts index 77e76bf..6b8bee6 100644 --- a/packages/login/playwright.config.ts +++ b/packages/login/playwright.config.ts @@ -21,7 +21,8 @@ export default defineConfig({ /* Opt out of parallel tests on CI. */ workers: process.env.CI ? 1 : undefined, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: "html", + reporter: [["html", { outputFolder: "../../playwright-reporter/login" }]], + /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { /* Base URL to use in actions like `await page.goto('/')`. */ From 50d9d4967ea89e76e1fdf370a2f10e076bd0d820 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 4 Sep 2024 18:19:24 +0300 Subject: [PATCH 08/10] Fix path --- packages/login/playwright.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/login/playwright.config.ts b/packages/login/playwright.config.ts index 6b8bee6..bf552a5 100644 --- a/packages/login/playwright.config.ts +++ b/packages/login/playwright.config.ts @@ -21,7 +21,7 @@ export default defineConfig({ /* Opt out of parallel tests on CI. */ workers: process.env.CI ? 1 : undefined, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: [["html", { outputFolder: "../../playwright-reporter/login" }]], + reporter: [["html", { outputFolder: "../../playwright-report/login" }]], /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { From c61dcbbcd0fdc65a08834827a8e41698ade9d8eb Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 5 Sep 2024 15:03:43 +0300 Subject: [PATCH 09/10] Add warning to eslint --- .vscode/settings.json | 2 +- packages/login/src/hooks/useDeviceType.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5f9ff11..b8d2000 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "files.exclude": { - "**/packages": true, + // "**/packages": true, "**/.nuget": true, "**/common": true, "**/Data": true, diff --git a/packages/login/src/hooks/useDeviceType.ts b/packages/login/src/hooks/useDeviceType.ts index 48cf6a8..014c9d2 100644 --- a/packages/login/src/hooks/useDeviceType.ts +++ b/packages/login/src/hooks/useDeviceType.ts @@ -52,7 +52,7 @@ const useDeviceType = () => { return () => { window.removeEventListener("resize", onResize); }; - }, [onResize]); + }, []); return { currentDeviceType }; }; From 8f73e20b97b368936fd2d9fc70a1d832f832c22e Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 5 Sep 2024 15:06:58 +0300 Subject: [PATCH 10/10] Add failed for warning eslint --- packages/login/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/login/package.json b/packages/login/package.json index be2a7a8..027347d 100644 --- a/packages/login/package.json +++ b/packages/login/package.json @@ -8,7 +8,7 @@ "start-prod": "NODE_ENV=production node server.js", "start:internal": "node ./scripts/buildTranslations.js && NODE_ENV=development API_HOST=http://127.0.0.1 node server.js", "start-prod:internal": "NODE_ENV=production API_HOST=http://127.0.0.1 node server.js", - "lint": "next lint", + "lint": "next lint --max-warnings=0", "clean": "shx rm -rf .next", "deploy": "shx --silent mkdir -p ../../../publish/web/login && shx --silent mkdir -p ../../../publish/web/login/.next && shx --silent mkdir -p ../../../publish/web/login/node_modules && shx --silent mkdir -p ../../../publish/web/login/.next/static && shx cp -r .next/standalone/node_modules/* ../../../publish/web/login/node_modules && shx cp -r .next/static/* ../../../publish/web/login/.next/static && shx cp -r .next/standalone/packages/login/.next/* ../../../publish/web/login/.next && shx cp -f server.prod.js ../../../publish/web/login/server.js", "test:build": "node ./scripts/buildTranslations.js && E2E_TEST=true next build",