From b73c1a5774d41322421bc48b41c94affd1f9661b Mon Sep 17 00:00:00 2001 From: Roberto T <61755417+RobertGlobant20@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:02:21 -0800 Subject: [PATCH] DYN-8121 SplashScreen Disable Close Button (#81) * DYN-8121 SplashScreen Disable Close Button Remove all the code related to Close Button in SplashScreen * Fixing playwright/test package Updating the playwright/test package to 1.49.0 * Fixing CodeCoverage report bumping : zgosalvez/github-actions-report-lcov action to v2 just to see if now it passes. * Fixing CodeCoverage report github action bumping : zgosalvez/github-actions-report-lcov action to v3 just to see if now it passes. * Fixing CodeCoverage report adding more code for the github action zgosalvez/github-actions-report-lcov@v3 * Fixing CodeCoverage report removing lcov data * Revert "Fixing CodeCoverage report" This reverts commit 5b03d4bdf698c1dbdeb6a6843fcaabc53c2aee03. * Fixing CodeCoverage report bumping up version * Fixing CodeCoverage report - update action versions - add step to setup lcov * Bumping up version bumping up version from 1.0.26 to 1.0.27 --- .github/workflows/build.yml | 10 ++++-- package-lock.json | 70 +++++++++++++++++++++++++------------ package.json | 4 +-- src/App.css | 31 ---------------- src/App.js | 15 -------- 5 files changed, 57 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ff2502..a2b06a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,9 +18,9 @@ jobs: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version: ${{ matrix.node-version }} cache: "npm" @@ -34,8 +34,12 @@ jobs: run: npx playwright install chromium --with-deps - name: E2E tests run: npm run test:e2e + - name: Setup LCOV + uses: hrishikesh-kadam/setup-lcov@6c1aa0cc9e1c02f9f58f01ac599f1064ccc83470 # v1.1.0 + with: + ref: v1.16 - name: Code Coverage Report - uses: zgosalvez/github-actions-report-lcov@v1 + uses: zgosalvez/github-actions-report-lcov@5989987f8058a03137e90bc16f9c0baaac5e069a # v4.1.22 with: coverage-files: coverage/lcov.info # minimum-coverage: 50 diff --git a/package-lock.json b/package-lock.json index 2457930..a6967a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dynamods/splash-screen", - "version": "1.0.26", + "version": "1.0.27", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dynamods/splash-screen", - "version": "1.0.26", + "version": "1.0.27", "license": "MIT", "dependencies": { "bootstrap": "^5.2.1", @@ -16,7 +16,7 @@ "react-scripts": "5.0.1" }, "devDependencies": { - "@playwright/test": "^1.27.1", + "@playwright/test": "^1.49.0", "@testing-library/react": "^13.4.0", "html-webpack-plugin": "^4.5.2", "webpack": "^5.74.0", @@ -3087,19 +3087,18 @@ } }, "node_modules/@playwright/test": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.27.1.tgz", - "integrity": "sha512-mrL2q0an/7tVqniQQF6RBL2saskjljXzqNcCOVMUjRIgE6Y38nCNaP+Dc2FBW06bcpD3tqIws/HT9qiMHbNU0A==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.0.tgz", + "integrity": "sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==", "dev": true, "dependencies": { - "@types/node": "*", - "playwright-core": "1.27.1" + "playwright": "1.50.0" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/@pmmmwh/react-refresh-webpack-plugin": { @@ -13755,16 +13754,34 @@ "node": ">=4" } }, - "node_modules/playwright-core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.27.1.tgz", - "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==", + "node_modules/playwright": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz", + "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==", "dev": true, + "dependencies": { + "playwright-core": "1.50.0" + }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=14" + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz", + "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==", + "dev": true, + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" } }, "node_modules/postcss": { @@ -21155,13 +21172,12 @@ } }, "@playwright/test": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.27.1.tgz", - "integrity": "sha512-mrL2q0an/7tVqniQQF6RBL2saskjljXzqNcCOVMUjRIgE6Y38nCNaP+Dc2FBW06bcpD3tqIws/HT9qiMHbNU0A==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.0.tgz", + "integrity": "sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==", "dev": true, "requires": { - "@types/node": "*", - "playwright-core": "1.27.1" + "playwright": "1.50.0" } }, "@pmmmwh/react-refresh-webpack-plugin": { @@ -28987,10 +29003,20 @@ } } }, + "playwright": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz", + "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==", + "dev": true, + "requires": { + "fsevents": "2.3.2", + "playwright-core": "1.50.0" + } + }, "playwright-core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.27.1.tgz", - "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz", + "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==", "dev": true }, "postcss": { diff --git a/package.json b/package.json index c549138..c1234f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dynamods/splash-screen", - "version": "1.0.26", + "version": "1.0.27", "description": "Splash Screen maintained by Dynamo Team@Autodesk", "author": "Autodesk Inc.", "license": "MIT", @@ -56,7 +56,7 @@ ] }, "devDependencies": { - "@playwright/test": "^1.27.1", + "@playwright/test": "^1.49.0", "@testing-library/react": "^13.4.0", "html-webpack-plugin": "^4.5.2", "webpack": "^5.74.0", diff --git a/src/App.css b/src/App.css index e3d4ff2..5469ccd 100644 --- a/src/App.css +++ b/src/App.css @@ -19,35 +19,4 @@ .screenBackground { height: 412px; width: 394px; -} - -.close { - position: absolute; - cursor: pointer; - right: 32px; - top: 15px; - width: 16px; - height: 16px; - opacity: 0.3; -} - -.close:hover { - opacity: 1; -} - -.close:before, .close:after { - position: absolute; - left: 25px; - content: ' '; - height: 16px; - width: 2px; - background-color: #333; -} - -.close:before { - transform: rotate(45deg); -} - -.close:after { - transform: rotate(-45deg); } \ No newline at end of file diff --git a/src/App.js b/src/App.js index e66e536..e5ff81f 100644 --- a/src/App.js +++ b/src/App.js @@ -26,7 +26,6 @@ class App extends React.Component { window.setLoadingDone = this.setLoadingDone.bind(this); window.setSignInStatus = this.setSignInStatus.bind(this); this.handleCheckedChange = this.handleCheckedChange.bind(this); - this.closeDynamo = this.closeDynamo.bind(this); } handleCheckedChange = (checked) => { @@ -45,14 +44,6 @@ class App extends React.Component { //TODO : As alternative we can receive the event from the Childs like the Static component } - handleKeyDown = (e) => { - if (e.key === 'Escape') { - if (this.state.loadingDone) { - this.closeDynamo(); - } - } - }; - render() { return ( @@ -132,12 +123,6 @@ class App extends React.Component { loadingDone: true }); }; - - closeDynamo() { - if (chrome.webview !== undefined) { - chrome.webview.hostObjects.scriptObject.CloseWindowPreserve(this.state.isChecked); - } - } } export default App;