Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(web-client): update to latest #696

Merged
merged 5 commits into from
Sep 30, 2021
Merged

chore(web-client): update to latest #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13fc487
chore(web-client): update to latest
andrewazores Sep 29, 2021
e6fc232
chore(pom): update node/yarn versions for latest web-client
andrewazores Sep 29, 2021
01d3ce6
chore(web-client): update to latest
andrewazores Sep 30, 2021
ddf6d76
test(clientassets): update for index.html format
andrewazores Sep 30, 2021
f4c21fd
chore(web-client): update to latest
andrewazores Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<baseImage>quay.io/cryostat/cryostat-base</baseImage>
<baseImageTag>@sha256:2f9383116a556e1d5e431e58831e7eae40496eb72990595df2da0578a050b5b2</baseImageTag><!-- 0.3.0 -->
<baseImageJdkVersion>java-11-openjdk-11.0.11.0.9-2.el8_4.x86_64</baseImageJdkVersion>
<node.version>v12.5.0</node.version>
<yarn.version>v1.22.10</yarn.version>
<node.version>v14.17.0</node.version>
<yarn.version>v1.22.13</yarn.version>

<skipTests>false</skipTests>
<skipITs>${skipTests}</skipITs>
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/itest/ClientAssetsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ public void indexHtmlShouldHaveScriptTag() {
Elements body = doc.getElementsByTag("body");
MatcherAssert.assertThat("Expected one <body>", body.size(), Matchers.equalTo(1));

Elements script = head.first().getElementsByTag("script");
Elements scripts = head.first().getElementsByTag("script");
MatcherAssert.assertThat(
"Expected at least one <script>", script.size(), Matchers.greaterThanOrEqualTo(1));
"Expected at least one <script>", scripts.size(), Matchers.greaterThanOrEqualTo(1));

boolean anyMatch = false;
for (Element el : script) {
anyMatch |= el.attr("src").matches("app(?:.\\w*)?\\.bundle\\.js");
boolean foundAppBundle = false;
for (Element el : scripts) {
foundAppBundle |= el.attr("src").matches("^/app(?:.\\w*)?\\.bundle\\.js$");
}
Assertions.assertTrue(anyMatch, "No app.bundle.js script tag found");
Assertions.assertTrue(foundAppBundle, "No app.bundle.js script tag found");
}
}
2 changes: 1 addition & 1 deletion web-client
Open in desktop
Submodule web-client updated 36 files
+3 −3 .mergify.yml
+1 −1 license-config.json
+46 −46 package.json
+59 −0 src/app/About/About.tsx
+57 −0 src/app/About/AboutCryostatModal.tsx
+119 −0 src/app/About/AboutDescription.tsx
+12 −83 src/app/AppLayout/AppLayout.tsx
+11 −10 src/app/Login/Login.tsx
+6 −6 src/app/NotFound/NotFound.tsx
+88 −24 src/app/Notifications/NotificationCenter.tsx
+60 −12 src/app/Notifications/Notifications.tsx
+122 −205 src/app/Recordings/ActiveRecordingsTable.tsx
+0 −0 src/app/Recordings/ArchiveUploadModal.tsx
+69 −35 src/app/Recordings/ArchivedRecordingsTable.tsx
+119 −0 src/app/Recordings/RecordingActions.tsx
+6 −6 src/app/Recordings/Recordings.tsx
+37 −19 src/app/Recordings/RecordingsTable.tsx
+1 −1 src/app/Recordings/ReportFrame.tsx
+25 −23 src/app/Shared/Services/Api.service.tsx
+87 −19 src/app/Shared/Services/NotificationChannel.service.tsx
+20 −17 src/app/Shared/Services/Report.service.tsx
+5 −7 src/app/Shared/Services/Targets.service.tsx
+29 −4 src/app/TargetSelect/TargetSelect.tsx
+6 −7 src/app/TargetView/TargetView.tsx
+8 −0 src/app/app.css
+ − src/app/assets/cryostat-3-icon-16px.png
+1 −0 src/app/assets/icon-cryostat-3-white.svg
+1 −0 src/app/assets/icon-cryostat-3.svg
+1 −0 src/app/assets/logo-cryostat-3-horizontal.svg
+1 −0 src/app/assets/logo-cryostat-3.svg
+12 −11 src/app/routes.tsx
+0 −1 src/index.html
+143 −135 webpack.common.js
+9 −9 webpack.dev.js
+12 −17 webpack.prod.js
+1,981 −2,064 yarn.lock