From 3681a02b716af9588d0c8c35a9f5d420e11701ea Mon Sep 17 00:00:00 2001 From: Rui Rocha Date: Fri, 13 Jan 2023 09:38:59 +0000 Subject: [PATCH 1/5] added pointer-events none style to iframe that's being loaded externally to prevent page interaction blocking --- src/index.js | 10 +++++++++- src/utils/styleHelpers.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 8e13331b..693ca159 100644 --- a/src/index.js +++ b/src/index.js @@ -22,7 +22,7 @@ -------------- ******/ import 'bootstrap/dist/css/bootstrap.min.css'; -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import ReactDOM from 'react-dom'; import reportWebVitals from './reportWebVitals'; @@ -42,6 +42,8 @@ import DemoMonitoring from './views/demos/DemoMonitoring/DemoMonitoring.jsx'; import axios from 'axios'; +import { waitForElementToRender } from './utils/styleHelpers'; + function App() { const { isAuthEnabled } = getConfig(); @@ -79,6 +81,12 @@ function App() { setUser(false); }; + useEffect(() => { + waitForElementToRender('iframe').then((element) => { + element.style.pointerEvents = "none"; + }); + }, []); + return ( { diff --git a/src/utils/styleHelpers.js b/src/utils/styleHelpers.js index 1e8cc7ca..a11e06fb 100644 --- a/src/utils/styleHelpers.js +++ b/src/utils/styleHelpers.js @@ -20,3 +20,25 @@ export const hashRGB = str => { return '#' + '00000'.substring(0, 6 - c.length) + c; }; + +// Added to catch when the external iframe element that is +// blocking the page clicking due to its styling is rendered +export const waitForElementToRender = (selector) => { + return new Promise(resolve => { + if (document.querySelector(selector)) { + return resolve(document.querySelector(selector)); + } + + const observer = new MutationObserver((mutations) => { + if (document.querySelector(selector)) { + resolve(document.querySelector(selector)); + observer.disconnect(); + } + }); + + observer.observe(document.body, { + childList: true, + subtree: true + }); + }); +} \ No newline at end of file From 2e8a8ade0a82ab8879fd2fc389b21b485074889e Mon Sep 17 00:00:00 2001 From: Rui Rocha Date: Wed, 18 Jan 2023 09:22:49 +0000 Subject: [PATCH 2/5] added GHSA-hhq3-ff78-jv3g to audit-ci and updated dependencies with audit check --- audit-ci.jsonc | 4 +- package-lock.json | 209 ++++++++++++++++++++++++++++------------------ package.json | 14 ++-- 3 files changed, 140 insertions(+), 87 deletions(-) diff --git a/audit-ci.jsonc b/audit-ci.jsonc index 2d915439..a7dc2818 100644 --- a/audit-ci.jsonc +++ b/audit-ci.jsonc @@ -58,6 +58,8 @@ "GHSA-76p3-8jx3-jpfq", "GHSA-3rfm-jhwj-7488", // json5. Unable to fix using npm audit fix which is updating mermaid causing build issues - "GHSA-9c47-m6qq-7p4h" + "GHSA-9c47-m6qq-7p4h", + // Unable to fix using npm audit fix --force due to breaking changes + "GHSA-hhq3-ff78-jv3g" ] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index bdcd5069..6bfe6e97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,21 +9,21 @@ "version": "15.1.1", "license": "Apache-2.0", "dependencies": { - "@ant-design/colors": "^6.0.0", - "@ant-design/icons": "^4.8.0", + "@ant-design/colors": "^7.0.0", + "@ant-design/icons": "^5.0.0", "@mojaloop/ml-testing-toolkit-shared-lib": "^13.0.0", "@testing-library/jest-dom": "^5.11.5", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", "ace-builds": "^1.14.0", "ajv": "^8.12.0", - "antd": "^5.1.2", + "antd": "^5.1.5", "array-move": "^4.0.0", - "axios": "^1.2.2", + "axios": "^1.2.3", "bootstrap": "^4.5.3", "brace": "^0.11.1", "core-js": "^3.27.1", - "electron": "^22.0.0", + "electron": "^22.0.2", "idb-keyval": "^6.2.0", "js-file-download": "^0.4.12", "jsoneditor": "^9.9.2", @@ -37,7 +37,7 @@ "react": "^17.0.1", "react-ace": "^9.2.0", "react-dom": "^17.0.1", - "react-markdown": "^8.0.4", + "react-markdown": "^8.0.5", "react-router-dom": "^5.2.0", "react-scripts": "4.0.0", "react-sortable-hoc": "^2.0.0", @@ -49,7 +49,7 @@ "devDependencies": { "@types/markerclustererplus": "2.1.33", "@types/react": "16.8.7", - "audit-ci": "^6.5.0", + "audit-ci": "^6.6.0", "eslint-config-airbnb-typescript": "^17.0.0", "npm-check-updates": "^16.6.2", "replace": "^1.2.2", @@ -84,9 +84,9 @@ } }, "node_modules/@ant-design/colors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz", - "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.0.0.tgz", + "integrity": "sha512-iVm/9PfGCbC0dSMBrz7oiEXZaaGH7ceU40OJEfKmyuzR9R5CRimJYPlRiFtMQGQcbNMea/ePcoIebi4ASGYXtg==", "dependencies": { "@ctrl/tinycolor": "^3.4.0" } @@ -115,11 +115,11 @@ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "node_modules/@ant-design/icons": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.0.tgz", - "integrity": "sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.0.0.tgz", + "integrity": "sha512-dPUlZtsIffBrDyFwM+tuO4PWi1DPgGgd10ASistPhLpr1WyssadfhChWs/mICVkCm5PaRm/foMkE1x3xw4OPZw==", "dependencies": { - "@ant-design/colors": "^6.0.0", + "@ant-design/colors": "^7.0.0", "@ant-design/icons-svg": "^4.2.1", "@babel/runtime": "^7.11.2", "classnames": "^2.2.6", @@ -2974,6 +2974,19 @@ "node": ">=12" } }, + "node_modules/@rc-component/context": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rc-component/context/-/context-1.3.0.tgz", + "integrity": "sha512-6QdaCJ7Wn5UZLJs15IEfqy4Ru3OaL5ctqpQYWd5rlfV9wwzrzdt6+kgAQZV/qdB0MUPN4nhyBfRembQCIvBf+w==", + "dependencies": { + "@babel/runtime": "^7.10.1", + "rc-util": "^5.27.0" + }, + "peerDependencies": { + "react": ">=16.9.0", + "react-dom": ">=16.9.0" + } + }, "node_modules/@rc-component/mini-decimal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.0.1.tgz", @@ -2985,6 +2998,23 @@ "node": ">=8.x" } }, + "node_modules/@rc-component/mutate-observer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rc-component/mutate-observer/-/mutate-observer-1.0.0.tgz", + "integrity": "sha512-okqRJSfNisXdI6CUeOLZC5ukBW/8kir2Ii4PJiKpUt+3+uS7dxwJUMxsUZquxA1rQuL8YcEmKVp/TCnR+yUdZA==", + "dependencies": { + "@babel/runtime": "^7.18.0", + "classnames": "^2.3.2", + "rc-util": "^5.24.4" + }, + "engines": { + "node": ">=8.x" + }, + "peerDependencies": { + "react": ">=16.9.0", + "react-dom": ">=16.9.0" + } + }, "node_modules/@rc-component/portal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.0.tgz", @@ -4653,16 +4683,17 @@ } }, "node_modules/antd": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/antd/-/antd-5.1.2.tgz", - "integrity": "sha512-B6R6Bm0jIOb6v3JhS4DLKghJWqX0OufCOy99+R6F7QtGjbV/0wG/0rqH3DiQ4BHNIHsL+SDUYti9o3cT28lPww==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/antd/-/antd-5.1.5.tgz", + "integrity": "sha512-f1gfmDG8CApTu1h6gtM7i/krMTP6WH55w7pUPAMHlp9jsviKR+ElPqSQeLZV3UjuxVNn0DWvGwWEJ0Rv/kbeEQ==", "dependencies": { - "@ant-design/colors": "^6.0.0", - "@ant-design/cssinjs": "^1.3.0", - "@ant-design/icons": "^4.7.0", + "@ant-design/colors": "^7.0.0", + "@ant-design/cssinjs": "^1.4.0", + "@ant-design/icons": "^5.0.0", "@ant-design/react-slick": "~1.0.0", "@babel/runtime": "^7.18.3", "@ctrl/tinycolor": "^3.4.0", + "@rc-component/mutate-observer": "^1.0.0", "@rc-component/tour": "~1.1.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", @@ -4692,13 +4723,13 @@ "rc-slider": "~10.0.0", "rc-steps": "~6.0.0", "rc-switch": "~4.0.0", - "rc-table": "~7.28.3", + "rc-table": "~7.30.2", "rc-tabs": "~12.5.1", "rc-textarea": "~0.4.5", "rc-tooltip": "~5.2.0", "rc-tree": "~5.7.0", "rc-tree-select": "~5.6.0", - "rc-trigger": "^5.2.10", + "rc-trigger": "^5.3.4", "rc-upload": "~4.3.0", "rc-util": "^5.27.0", "scroll-into-view-if-needed": "^3.0.3", @@ -5043,9 +5074,9 @@ } }, "node_modules/audit-ci": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-6.5.0.tgz", - "integrity": "sha512-mULJtyRrKjgaU9SDZJlClYJ85+0QacvLKljq2MX9Jc4fxsKFlJtSGGYAAkBeVmu/uDlg8YL/nQccX+loNm4OZw==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-6.6.0.tgz", + "integrity": "sha512-WzYlA3yxnisKcFGGlsbsUX5+6MvYdLxgjzoarWhCeJzKN5KDBNGOaIriVYZJtMTIObkSNGYQw0HEIDMrgXQkBA==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -5158,9 +5189,9 @@ } }, "node_modules/axios": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", - "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", + "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -9594,9 +9625,9 @@ } }, "node_modules/electron": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.0.0.tgz", - "integrity": "sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg==", + "version": "22.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-22.0.2.tgz", + "integrity": "sha512-NdJlA2+FMgDJBhQFKMPyWJY8ng/tWpFlrRsW2JkZgSzYPXOnIu9muO3b83YHGoDn+GTyS8ghPsgcAwPMXtxirA==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", @@ -21827,15 +21858,15 @@ } }, "node_modules/rc-table": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.28.3.tgz", - "integrity": "sha512-jiPtBDqcs0wF0KOJgkhDgxN6+vq4jHbteddE15IR6RajlVkAk+kRIecyBY28b+vg199yQiu/NGuSRKJKEGOWBQ==", + "version": "7.30.3", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.30.3.tgz", + "integrity": "sha512-PHe+lZKwPo3qui5j79m54vKu8b4hebk04x+4Hy65NvwUU3+NNFGS5FZpylXQMkueMnE8hgh22ZuScQDkCtzQFQ==", "dependencies": { "@babel/runtime": "^7.10.1", + "@rc-component/context": "^1.3.0", "classnames": "^2.2.5", "rc-resize-observer": "^1.1.0", - "rc-util": "^5.22.5", - "shallowequal": "^1.1.0" + "rc-util": "^5.27.1" }, "engines": { "node": ">=8.x" @@ -22335,9 +22366,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/react-markdown": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.4.tgz", - "integrity": "sha512-2oxHa6oDxc1apg/Gnc1Goh06t3B617xeywqI/92wmDV9FELI6ayRkwge7w7DoEqM0gRpZGTNU6xQG+YpJISnVg==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.5.tgz", + "integrity": "sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==", "dependencies": { "@types/hast": "^2.0.0", "@types/prop-types": "^15.0.0", @@ -22350,7 +22381,7 @@ "remark-parse": "^10.0.0", "remark-rehype": "^10.0.0", "space-separated-tokens": "^2.0.0", - "style-to-object": "^0.3.0", + "style-to-object": "^0.4.0", "unified": "^10.0.0", "unist-util-visit": "^4.0.0", "vfile": "^5.0.0" @@ -26553,9 +26584,9 @@ } }, "node_modules/style-to-object": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", - "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz", + "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==", "dependencies": { "inline-style-parser": "0.1.1" } @@ -30469,9 +30500,9 @@ } }, "@ant-design/colors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz", - "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.0.0.tgz", + "integrity": "sha512-iVm/9PfGCbC0dSMBrz7oiEXZaaGH7ceU40OJEfKmyuzR9R5CRimJYPlRiFtMQGQcbNMea/ePcoIebi4ASGYXtg==", "requires": { "@ctrl/tinycolor": "^3.4.0" } @@ -30498,11 +30529,11 @@ } }, "@ant-design/icons": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.0.tgz", - "integrity": "sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.0.0.tgz", + "integrity": "sha512-dPUlZtsIffBrDyFwM+tuO4PWi1DPgGgd10ASistPhLpr1WyssadfhChWs/mICVkCm5PaRm/foMkE1x3xw4OPZw==", "requires": { - "@ant-design/colors": "^6.0.0", + "@ant-design/colors": "^7.0.0", "@ant-design/icons-svg": "^4.2.1", "@babel/runtime": "^7.11.2", "classnames": "^2.2.6", @@ -32547,6 +32578,15 @@ "config-chain": "^1.1.11" } }, + "@rc-component/context": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rc-component/context/-/context-1.3.0.tgz", + "integrity": "sha512-6QdaCJ7Wn5UZLJs15IEfqy4Ru3OaL5ctqpQYWd5rlfV9wwzrzdt6+kgAQZV/qdB0MUPN4nhyBfRembQCIvBf+w==", + "requires": { + "@babel/runtime": "^7.10.1", + "rc-util": "^5.27.0" + } + }, "@rc-component/mini-decimal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@rc-component/mini-decimal/-/mini-decimal-1.0.1.tgz", @@ -32555,6 +32595,16 @@ "@babel/runtime": "^7.18.0" } }, + "@rc-component/mutate-observer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rc-component/mutate-observer/-/mutate-observer-1.0.0.tgz", + "integrity": "sha512-okqRJSfNisXdI6CUeOLZC5ukBW/8kir2Ii4PJiKpUt+3+uS7dxwJUMxsUZquxA1rQuL8YcEmKVp/TCnR+yUdZA==", + "requires": { + "@babel/runtime": "^7.18.0", + "classnames": "^2.3.2", + "rc-util": "^5.24.4" + } + }, "@rc-component/portal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.0.tgz", @@ -33846,16 +33896,17 @@ } }, "antd": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/antd/-/antd-5.1.2.tgz", - "integrity": "sha512-B6R6Bm0jIOb6v3JhS4DLKghJWqX0OufCOy99+R6F7QtGjbV/0wG/0rqH3DiQ4BHNIHsL+SDUYti9o3cT28lPww==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/antd/-/antd-5.1.5.tgz", + "integrity": "sha512-f1gfmDG8CApTu1h6gtM7i/krMTP6WH55w7pUPAMHlp9jsviKR+ElPqSQeLZV3UjuxVNn0DWvGwWEJ0Rv/kbeEQ==", "requires": { - "@ant-design/colors": "^6.0.0", - "@ant-design/cssinjs": "^1.3.0", - "@ant-design/icons": "^4.7.0", + "@ant-design/colors": "^7.0.0", + "@ant-design/cssinjs": "^1.4.0", + "@ant-design/icons": "^5.0.0", "@ant-design/react-slick": "~1.0.0", "@babel/runtime": "^7.18.3", "@ctrl/tinycolor": "^3.4.0", + "@rc-component/mutate-observer": "^1.0.0", "@rc-component/tour": "~1.1.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", @@ -33885,13 +33936,13 @@ "rc-slider": "~10.0.0", "rc-steps": "~6.0.0", "rc-switch": "~4.0.0", - "rc-table": "~7.28.3", + "rc-table": "~7.30.2", "rc-tabs": "~12.5.1", "rc-textarea": "~0.4.5", "rc-tooltip": "~5.2.0", "rc-tree": "~5.7.0", "rc-tree-select": "~5.6.0", - "rc-trigger": "^5.2.10", + "rc-trigger": "^5.3.4", "rc-upload": "~4.3.0", "rc-util": "^5.27.0", "scroll-into-view-if-needed": "^3.0.3", @@ -34156,9 +34207,9 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "audit-ci": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-6.5.0.tgz", - "integrity": "sha512-mULJtyRrKjgaU9SDZJlClYJ85+0QacvLKljq2MX9Jc4fxsKFlJtSGGYAAkBeVmu/uDlg8YL/nQccX+loNm4OZw==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-6.6.0.tgz", + "integrity": "sha512-WzYlA3yxnisKcFGGlsbsUX5+6MvYdLxgjzoarWhCeJzKN5KDBNGOaIriVYZJtMTIObkSNGYQw0HEIDMrgXQkBA==", "dev": true, "requires": { "cross-spawn": "^7.0.3", @@ -34242,9 +34293,9 @@ "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==" }, "axios": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz", - "integrity": "sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz", + "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -37717,9 +37768,9 @@ "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==" }, "electron": { - "version": "22.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.0.0.tgz", - "integrity": "sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg==", + "version": "22.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-22.0.2.tgz", + "integrity": "sha512-NdJlA2+FMgDJBhQFKMPyWJY8ng/tWpFlrRsW2JkZgSzYPXOnIu9muO3b83YHGoDn+GTyS8ghPsgcAwPMXtxirA==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^16.11.26", @@ -47005,15 +47056,15 @@ } }, "rc-table": { - "version": "7.28.3", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.28.3.tgz", - "integrity": "sha512-jiPtBDqcs0wF0KOJgkhDgxN6+vq4jHbteddE15IR6RajlVkAk+kRIecyBY28b+vg199yQiu/NGuSRKJKEGOWBQ==", + "version": "7.30.3", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.30.3.tgz", + "integrity": "sha512-PHe+lZKwPo3qui5j79m54vKu8b4hebk04x+4Hy65NvwUU3+NNFGS5FZpylXQMkueMnE8hgh22ZuScQDkCtzQFQ==", "requires": { "@babel/runtime": "^7.10.1", + "@rc-component/context": "^1.3.0", "classnames": "^2.2.5", "rc-resize-observer": "^1.1.0", - "rc-util": "^5.22.5", - "shallowequal": "^1.1.0" + "rc-util": "^5.27.1" } }, "rc-tabs": { @@ -47375,9 +47426,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "react-markdown": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.4.tgz", - "integrity": "sha512-2oxHa6oDxc1apg/Gnc1Goh06t3B617xeywqI/92wmDV9FELI6ayRkwge7w7DoEqM0gRpZGTNU6xQG+YpJISnVg==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.5.tgz", + "integrity": "sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==", "requires": { "@types/hast": "^2.0.0", "@types/prop-types": "^15.0.0", @@ -47390,7 +47441,7 @@ "remark-parse": "^10.0.0", "remark-rehype": "^10.0.0", "space-separated-tokens": "^2.0.0", - "style-to-object": "^0.3.0", + "style-to-object": "^0.4.0", "unified": "^10.0.0", "unist-util-visit": "^4.0.0", "vfile": "^5.0.0" @@ -50631,9 +50682,9 @@ } }, "style-to-object": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", - "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz", + "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==", "requires": { "inline-style-parser": "0.1.1" } diff --git a/package.json b/package.json index 592ec0c0..dfb0320e 100644 --- a/package.json +++ b/package.json @@ -57,21 +57,21 @@ ] }, "dependencies": { - "@ant-design/colors": "^6.0.0", - "@ant-design/icons": "^4.8.0", + "@ant-design/colors": "^7.0.0", + "@ant-design/icons": "^5.0.0", "@mojaloop/ml-testing-toolkit-shared-lib": "^13.0.0", "@testing-library/jest-dom": "^5.11.5", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", "ace-builds": "^1.14.0", "ajv": "^8.12.0", - "antd": "^5.1.2", + "antd": "^5.1.5", "array-move": "^4.0.0", - "axios": "^1.2.2", + "axios": "^1.2.3", "bootstrap": "^4.5.3", "brace": "^0.11.1", "core-js": "^3.27.1", - "electron": "^22.0.0", + "electron": "^22.0.2", "idb-keyval": "^6.2.0", "js-file-download": "^0.4.12", "jsoneditor": "^9.9.2", @@ -85,7 +85,7 @@ "react": "^17.0.1", "react-ace": "^9.2.0", "react-dom": "^17.0.1", - "react-markdown": "^8.0.4", + "react-markdown": "^8.0.5", "react-router-dom": "^5.2.0", "react-scripts": "4.0.0", "react-sortable-hoc": "^2.0.0", @@ -97,7 +97,7 @@ "devDependencies": { "@types/markerclustererplus": "2.1.33", "@types/react": "16.8.7", - "audit-ci": "^6.5.0", + "audit-ci": "^6.6.0", "eslint-config-airbnb-typescript": "^17.0.0", "npm-check-updates": "^16.6.2", "replace": "^1.2.2", From 4c19d4d22716a006032baf7c2a730904da78392d Mon Sep 17 00:00:00 2001 From: Rui Rocha Date: Wed, 18 Jan 2023 09:37:47 +0000 Subject: [PATCH 3/5] linting errors fix --- .circleci/config.yml | 36 ++++++++++++++++++------------------ src/index.js | 4 ++-- src/utils/styleHelpers.js | 12 ++++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b1c3475..8a8c66af 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -277,10 +277,10 @@ jobs: name: Build Docker local image command: | echo "Building Docker image: local" - docker build -t $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local . + docker build -t mojaloop-testing-toolkit-ui:local . - run: name: Save docker image to workspace - command: docker save -o /tmp/docker-image-local.tar $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local + command: docker save -o /tmp/docker-image-local.tar mojaloop-testing-toolkit-ui:local - persist_to_workspace: root: /tmp paths: @@ -298,10 +298,10 @@ jobs: name: Re-tag the image command: | echo "Re-tagging Docker image: $CIRCLE_TAG" - docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG + docker tag mojaloop-testing-toolkit-ui:local mojaloop-testing-toolkit-ui:$CIRCLE_TAG - run: name: Save the new docker image to workspace - command: docker save -o /tmp/docker-image.tar $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG + command: docker save -o /tmp/docker-image.tar mojaloop-testing-toolkit-ui:$CIRCLE_TAG - persist_to_workspace: root: /tmp paths: @@ -320,7 +320,7 @@ jobs: # <<: *defaults_license_scanner # - run: # name: Run the license-scanner - # command: cd /tmp/license-scanner && mode=docker dockerImages=$DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG make run + # command: cd /tmp/license-scanner && mode=docker dockerImages=mojaloop-testing-toolkit-ui:$CIRCLE_TAG make run # - store_artifacts: # path: /tmp/license-scanner/results # prefix: licenses @@ -376,7 +376,7 @@ jobs: - anchore/analyze_local_image: # Force the older version, version 0.7.0 was just published, and is broken anchore_version: v0.6.1 - image_name: "docker.io/nginx:1.16.0-alpine $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" + image_name: "docker.io/nginx:1.16.0-alpine mojaloop-testing-toolkit-ui:$CIRCLE_TAG" policy_failure: false timeout: '500' # Note: if the generated policy is invalid, this will fallback to the default policy, which we don't want! @@ -503,18 +503,18 @@ jobs: - run: name: Re-tag pre built image command: | - docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG + docker tag mojaloop-testing-toolkit-ui:$CIRCLE_TAG mojaloop-testing-toolkit-ui:$RELEASE_TAG - run: name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub command: | - echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" - docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" - docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG + echo "Publishing mojaloop-testing-toolkit-ui:$CIRCLE_TAG" + docker push mojaloop-testing-toolkit-ui:$CIRCLE_TAG + echo "Publishing mojaloop-testing-toolkit-ui:$RELEASE_TAG" + docker push mojaloop-testing-toolkit-ui:$RELEASE_TAG - run: name: Set Image Digest command: | - IMAGE_DIGEST=$(docker inspect $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') + IMAGE_DIGEST=$(docker inspect mojaloop-testing-toolkit-ui:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') echo "IMAGE_DIGEST=${IMAGE_DIGEST}" echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - run: @@ -561,18 +561,18 @@ jobs: - run: name: Re-tag pre built image command: | - docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG + docker tag mojaloop-testing-toolkit-ui:$CIRCLE_TAG mojaloop-testing-toolkit-ui:$RELEASE_TAG - run: name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub command: | - echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" - docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" - docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG + echo "Publishing mojaloop-testing-toolkit-ui:$CIRCLE_TAG" + docker push mojaloop-testing-toolkit-ui:$CIRCLE_TAG + echo "Publishing mojaloop-testing-toolkit-ui:$RELEASE_TAG" + docker push mojaloop-testing-toolkit-ui:$RELEASE_TAG - run: name: Set Image Digest command: | - IMAGE_DIGEST=$(docker inspect $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') + IMAGE_DIGEST=$(docker inspect mojaloop-testing-toolkit-ui:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') echo "IMAGE_DIGEST=${IMAGE_DIGEST}" echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - run: diff --git a/src/index.js b/src/index.js index 693ca159..a79a4310 100644 --- a/src/index.js +++ b/src/index.js @@ -81,9 +81,9 @@ function App() { setUser(false); }; - useEffect(() => { + useEffect(function() { waitForElementToRender('iframe').then((element) => { - element.style.pointerEvents = "none"; + element.style.pointerEvents = 'none'; }); }, []); diff --git a/src/utils/styleHelpers.js b/src/utils/styleHelpers.js index a11e06fb..2af39d31 100644 --- a/src/utils/styleHelpers.js +++ b/src/utils/styleHelpers.js @@ -23,14 +23,14 @@ export const hashRGB = str => { // Added to catch when the external iframe element that is // blocking the page clicking due to its styling is rendered -export const waitForElementToRender = (selector) => { +export const waitForElementToRender = selector => { return new Promise(resolve => { - if (document.querySelector(selector)) { + if(document.querySelector(selector)) { return resolve(document.querySelector(selector)); } - const observer = new MutationObserver((mutations) => { - if (document.querySelector(selector)) { + const observer = new MutationObserver(mutations => { + if(document.querySelector(selector)) { resolve(document.querySelector(selector)); observer.disconnect(); } @@ -38,7 +38,7 @@ export const waitForElementToRender = (selector) => { observer.observe(document.body, { childList: true, - subtree: true + subtree: true, }); }); -} \ No newline at end of file +}; \ No newline at end of file From 8e15670c80e8d948a22601d0a086505405a73f65 Mon Sep 17 00:00:00 2001 From: Rui Rocha Date: Wed, 18 Jan 2023 09:55:53 +0000 Subject: [PATCH 4/5] lint fix --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index a79a4310..82512541 100644 --- a/src/index.js +++ b/src/index.js @@ -81,8 +81,8 @@ function App() { setUser(false); }; - useEffect(function() { - waitForElementToRender('iframe').then((element) => { + useEffect(function () { + waitForElementToRender('iframe').then(element => { element.style.pointerEvents = 'none'; }); }, []); From 37d0773a97f14903af4d5f28b300cec025bdb4ef Mon Sep 17 00:00:00 2001 From: Rui Rocha Date: Wed, 18 Jan 2023 11:31:14 +0000 Subject: [PATCH 5/5] reverted config yml --- .circleci/config.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a8c66af..9b1c3475 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -277,10 +277,10 @@ jobs: name: Build Docker local image command: | echo "Building Docker image: local" - docker build -t mojaloop-testing-toolkit-ui:local . + docker build -t $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local . - run: name: Save docker image to workspace - command: docker save -o /tmp/docker-image-local.tar mojaloop-testing-toolkit-ui:local + command: docker save -o /tmp/docker-image-local.tar $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local - persist_to_workspace: root: /tmp paths: @@ -298,10 +298,10 @@ jobs: name: Re-tag the image command: | echo "Re-tagging Docker image: $CIRCLE_TAG" - docker tag mojaloop-testing-toolkit-ui:local mojaloop-testing-toolkit-ui:$CIRCLE_TAG + docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:local $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - run: name: Save the new docker image to workspace - command: docker save -o /tmp/docker-image.tar mojaloop-testing-toolkit-ui:$CIRCLE_TAG + command: docker save -o /tmp/docker-image.tar $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - persist_to_workspace: root: /tmp paths: @@ -320,7 +320,7 @@ jobs: # <<: *defaults_license_scanner # - run: # name: Run the license-scanner - # command: cd /tmp/license-scanner && mode=docker dockerImages=mojaloop-testing-toolkit-ui:$CIRCLE_TAG make run + # command: cd /tmp/license-scanner && mode=docker dockerImages=$DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG make run # - store_artifacts: # path: /tmp/license-scanner/results # prefix: licenses @@ -376,7 +376,7 @@ jobs: - anchore/analyze_local_image: # Force the older version, version 0.7.0 was just published, and is broken anchore_version: v0.6.1 - image_name: "docker.io/nginx:1.16.0-alpine mojaloop-testing-toolkit-ui:$CIRCLE_TAG" + image_name: "docker.io/nginx:1.16.0-alpine $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" policy_failure: false timeout: '500' # Note: if the generated policy is invalid, this will fallback to the default policy, which we don't want! @@ -503,18 +503,18 @@ jobs: - run: name: Re-tag pre built image command: | - docker tag mojaloop-testing-toolkit-ui:$CIRCLE_TAG mojaloop-testing-toolkit-ui:$RELEASE_TAG + docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - run: name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub command: | - echo "Publishing mojaloop-testing-toolkit-ui:$CIRCLE_TAG" - docker push mojaloop-testing-toolkit-ui:$CIRCLE_TAG - echo "Publishing mojaloop-testing-toolkit-ui:$RELEASE_TAG" - docker push mojaloop-testing-toolkit-ui:$RELEASE_TAG + echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" + docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG + echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" + docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - run: name: Set Image Digest command: | - IMAGE_DIGEST=$(docker inspect mojaloop-testing-toolkit-ui:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') + IMAGE_DIGEST=$(docker inspect $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') echo "IMAGE_DIGEST=${IMAGE_DIGEST}" echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - run: @@ -561,18 +561,18 @@ jobs: - run: name: Re-tag pre built image command: | - docker tag mojaloop-testing-toolkit-ui:$CIRCLE_TAG mojaloop-testing-toolkit-ui:$RELEASE_TAG + docker tag $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - run: name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub command: | - echo "Publishing mojaloop-testing-toolkit-ui:$CIRCLE_TAG" - docker push mojaloop-testing-toolkit-ui:$CIRCLE_TAG - echo "Publishing mojaloop-testing-toolkit-ui:$RELEASE_TAG" - docker push mojaloop-testing-toolkit-ui:$RELEASE_TAG + echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" + docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG + echo "Publishing $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" + docker push $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - run: name: Set Image Digest command: | - IMAGE_DIGEST=$(docker inspect mojaloop-testing-toolkit-ui:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') + IMAGE_DIGEST=$(docker inspect $DOCKER_ORG/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') echo "IMAGE_DIGEST=${IMAGE_DIGEST}" echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - run: