Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/download-a…
Browse files Browse the repository at this point in the history
…rtifact-4
  • Loading branch information
antgamdia authored Dec 18, 2023
2 parents 00ae26c + b4b1e06 commit 1c75c18
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 36 deletions.
6 changes: 3 additions & 3 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"modern-normalize": "^2.0.0",
"monaco-editor": "^0.43.0",
"monaco-editor": "^0.45.0",
"prop-types": "^15.8.1",
"protobufjs": "^7.2.5",
"qs": "^6.11.2",
Expand All @@ -56,7 +56,7 @@
"react-intl": "^6.5.5",
"react-markdown": "^8.0.7",
"react-minimal-pie-chart": "^8.4.0",
"react-monaco-editor": "^0.54.0",
"react-monaco-editor": "^0.55.0",
"react-redux": "^7.2.9",
"react-router-dom": "^6.21.0",
"react-router-hash-link": "^2.4.3",
Expand Down Expand Up @@ -121,7 +121,7 @@
"resize-observer-polyfill": "^1.5.1",
"sass": "^1.69.5",
"shx": "^0.3.4",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-idiomatic-order": "^9.0.0",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard-scss": "^11.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@

.secret-datum-text {
display: flex;
overflow: auto hidden;
width: 100%;
height: 100%;
align-items: center;
justify-content: flex-start;
padding-left: 0.3rem;
overflow-x: auto;
overflow-y: hidden;
}

.secret-datum-icon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ beforeEach(() => {
});
});

// Mocking react-monaco-editor to a simple empty <div> to prevent issues with Jest
// otherwise, an error with while registering the diff webworker is thrown
// rel: https://github.com/microsoft/vscode/pull/192151
jest.mock("react-monaco-editor", () => {
return {
MonacoDiffEditor: () => <div />,
};
});

afterEach(() => {
jest.restoreAllMocks();
});
Expand Down
3 changes: 1 addition & 2 deletions dashboard/src/components/Layout/Layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,10 @@
flex: 1 1 auto;

.content-area {
overflow: hidden auto;
flex: 1 1 auto;
padding: 0 0.6rem;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
overflow-y: auto;
}
}

Expand Down
3 changes: 1 addition & 2 deletions dashboard/src/components/Tabs/Tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
// SPDX-License-Identifier: Apache-2.0

.tabs {
overflow: auto hidden;
max-width: 100%;
margin-bottom: 1em;
overflow-x: auto;
overflow-y: hidden;

.tab-button {
&:focus {
Expand Down
9 changes: 9 additions & 0 deletions dashboard/src/components/UpgradeForm/UpgradeForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ beforeEach(() => {
spyOnUseNavigate = jest.spyOn(ReactRouter, "useNavigate").mockReturnValue(mockNavigate);
});

// Mocking react-monaco-editor to a simple empty <div> to prevent issues with Jest
// otherwise, an error with while registering the diff webworker is thrown
// rel: https://github.com/microsoft/vscode/pull/192151
jest.mock("react-monaco-editor", () => {
return {
MonacoDiffEditor: () => <div />,
};
});

afterEach(() => {
jest.restoreAllMocks();
spyOnUseNavigate.mockRestore();
Expand Down
65 changes: 38 additions & 27 deletions dashboard/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5222,10 +5222,10 @@ css-declaration-sorter@^6.3.1:
resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"
integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==

css-functions-list@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.0.tgz#8290b7d064bf483f48d6559c10e98dc4d1ad19ee"
integrity sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==
css-functions-list@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea"
integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==

css-has-pseudo@^3.0.4:
version "3.0.4"
Expand Down Expand Up @@ -6856,6 +6856,13 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"

file-entry-cache@^7.0.0:
version "7.0.2"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-7.0.2.tgz#2d61bb70ba89b9548e3035b7c9173fe91deafff0"
integrity sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==
dependencies:
flat-cache "^3.2.0"

file-loader@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
Expand Down Expand Up @@ -6964,7 +6971,16 @@ flat-cache@^3.0.4:
keyv "^4.5.3"
rimraf "^3.0.2"

flatted@^3.2.7:
flat-cache@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
dependencies:
flatted "^3.2.9"
keyv "^4.5.3"
rimraf "^3.0.2"

flatted@^3.2.7, flatted@^3.2.9:
version "3.2.9"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
Expand Down Expand Up @@ -9331,11 +9347,6 @@ klona@^2.0.4, klona@^2.0.5:
resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==

known-css-properties@^0.28.0:
version "0.28.0"
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.28.0.tgz#8a8be010f368b3036fe6ab0ef4bbbed972bd6274"
integrity sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==

known-css-properties@^0.29.0:
version "0.29.0"
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
Expand Down Expand Up @@ -10401,10 +10412,10 @@ monaco-editor-webpack-plugin@^7.1.0:
dependencies:
loader-utils "^2.0.2"

monaco-editor@^0.43.0:
version "0.43.0"
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.43.0.tgz#cb02a8d23d1249ad00b7cffe8bbecc2ac09d4baf"
integrity sha512-cnoqwQi/9fml2Szamv1XbSJieGJ1Dc8tENVMD26Kcfl7xGQWp7OBKMjlwKVGYFJ3/AXJjSOGvcqK7Ry/j9BM1Q==
monaco-editor@^0.45.0:
version "0.45.0"
resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.45.0.tgz#6939123a6254aea9fea2d647697f846306dd4448"
integrity sha512-mjv1G1ZzfEE3k9HZN0dQ2olMdwIfaeAAjFiwNprLfYNRSz7ctv9XuCT7gPtBGrMUeV1/iZzYKj17Khu1hxoHOA==

moo@^0.5.0:
version "0.5.2"
Expand Down Expand Up @@ -11790,7 +11801,7 @@ postcss@^7.0.35:
picocolors "^0.2.1"
source-map "^0.6.1"

postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.27, postcss@^8.4.32, postcss@^8.4.4:
postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.28, postcss@^8.4.32, postcss@^8.4.4:
version "8.4.32"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.32.tgz#1dac6ac51ab19adb21b8b34fd2d93a86440ef6c9"
integrity sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==
Expand Down Expand Up @@ -12294,10 +12305,10 @@ react-minimal-pie-chart@^8.4.0:
dependencies:
"@types/svg-path-parser" "^1.1.3"

react-monaco-editor@^0.54.0:
version "0.54.0"
resolved "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.54.0.tgz#ec9293249a991b08264be723c1ec0ca3a6d480d8"
integrity sha512-9JwO69851mfpuhYLHlKbae7omQWJ/2ICE2lbL0VHyNyZR8rCOH7440u+zAtDgiOMpLwmYdY1sEZCdRefywX6GQ==
react-monaco-editor@^0.55.0:
version "0.55.0"
resolved "https://registry.yarnpkg.com/react-monaco-editor/-/react-monaco-editor-0.55.0.tgz#8933e8acc28e177b8b2aaf23593716b8cebf27a8"
integrity sha512-GdEP0Q3Rn1dczfKEEyY08Nes5plWwIYU4sWRBQO0+jsQWQsKMHKCC6+hPRwR7G/4aA3V/iU9jSmWPzVJYMVFSQ==
dependencies:
prop-types "^15.8.1"

Expand Down Expand Up @@ -13977,10 +13988,10 @@ stylelint-scss@^5.3.0, stylelint-scss@^5.3.1:
postcss-selector-parser "^6.0.13"
postcss-value-parser "^4.2.0"

stylelint@^15.10.3:
version "15.10.3"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.3.tgz#995e4512fdad450fb83e13f3472001f6edb6469c"
integrity sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==
stylelint@^15.11.0:
version "15.11.0"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.11.0.tgz#3ff8466f5f5c47362bc7c8c9d382741c58bc3292"
integrity sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==
dependencies:
"@csstools/css-parser-algorithms" "^2.3.1"
"@csstools/css-tokenizer" "^2.2.0"
Expand All @@ -13989,12 +14000,12 @@ stylelint@^15.10.3:
balanced-match "^2.0.0"
colord "^2.9.3"
cosmiconfig "^8.2.0"
css-functions-list "^3.2.0"
css-functions-list "^3.2.1"
css-tree "^2.3.1"
debug "^4.3.4"
fast-glob "^3.3.1"
fastest-levenshtein "^1.0.16"
file-entry-cache "^6.0.1"
file-entry-cache "^7.0.0"
global-modules "^2.0.0"
globby "^11.1.0"
globjoin "^0.1.4"
Expand All @@ -14003,13 +14014,13 @@ stylelint@^15.10.3:
import-lazy "^4.0.0"
imurmurhash "^0.1.4"
is-plain-object "^5.0.0"
known-css-properties "^0.28.0"
known-css-properties "^0.29.0"
mathml-tag-names "^2.1.3"
meow "^10.1.5"
micromatch "^4.0.5"
normalize-path "^3.0.0"
picocolors "^1.0.0"
postcss "^8.4.27"
postcss "^8.4.28"
postcss-resolve-nested-selector "^0.1.1"
postcss-safe-parser "^6.0.0"
postcss-selector-parser "^6.0.13"
Expand Down

0 comments on commit 1c75c18

Please sign in to comment.