Skip to content

Commit d445b64

Browse files
jrkkpjrkkp
committed
Merge branch 'fix/OPHKIOS-91_further-deps-upgrades' into feature/OPHKIOS-100
2 parents 679a75a + 2f7c9ce commit d445b64

File tree

30 files changed

+594
-476
lines changed

30 files changed

+594
-476
lines changed

‎.github/workflows/common-frontend.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ jobs:
7373
wait-on: ${{ inputs.cypress-base-url }}
7474
command: yarn ${{ inputs.app-name }}:test:cypress
7575
timeout-minutes: 10
76+
- name: Upload screenshots
77+
uses: actions/upload-artifact@v4
78+
if: failure()
79+
with:
80+
name: cypress-screenshots
81+
path: ${{ env.FRONTEND_DIR }}/packages/${{ inputs.app-name }}/src/tests/cypress/screenshots
7682
- name: Build
7783
working-directory: ${{ env.FRONTEND_DIR }}
7884
run: yarn ${{ inputs.app-name }}:build

‎backend/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<plugin.prettier.goal>write</plugin.prettier.goal>
3232

3333
<!-- openai v2 https://springdoc.org/#migrating-from-springdoc-v1 -->
34-
<springdoc-openapi.version>2.5.0</springdoc-openapi.version>
34+
<springdoc-openapi.version>2.6.0</springdoc-openapi.version>
3535
<!-- latest version for Java 17 https://github.com/lukas-krecan/ShedLock#versions -->
36-
<shedlock.version>4.47.0</shedlock.version>
36+
<shedlock.version>4.48.0</shedlock.version>
3737
<poi.version>5.3.0</poi.version>
38-
<liquibase.version>4.27.0</liquibase.version>
38+
<liquibase.version>4.29.1</liquibase.version>
3939
</properties>
4040

4141
<dependencies>
@@ -51,17 +51,17 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-security</artifactId>
5353
</dependency>
54-
<!-- Force 6.3.2 since there is vulnerability in 6.3.1 -->
54+
<!-- Force 6.3.3 since there is vulnerability in 6.3.1 -->
5555
<dependency>
5656
<groupId>org.springframework.security</groupId>
5757
<artifactId>spring-security-config</artifactId>
58-
<version>6.3.2</version>
58+
<version>6.3.3</version>
5959
</dependency>
60-
<!-- Force 6.3.2 since there is vulnerability in 6.3.1 -->
60+
<!-- Force 6.3.3 since there is vulnerability in 6.3.1 -->
6161
<dependency>
6262
<groupId>org.springframework.security</groupId>
6363
<artifactId>spring-security-web</artifactId>
64-
<version>6.3.2</version>
64+
<version>6.3.3</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.springframework.boot</groupId>
@@ -139,7 +139,7 @@
139139
<dependency>
140140
<groupId>org.jsoup</groupId>
141141
<artifactId>jsoup</artifactId>
142-
<version>1.17.2</version>
142+
<version>1.18.1</version>
143143
</dependency>
144144
<dependency>
145145
<groupId>net.minidev</groupId>

‎backend/vkt/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.github.jhonnymertz</groupId>
3434
<artifactId>java-wkhtmltopdf-wrapper</artifactId>
35-
<version>1.2.0-RELEASE</version>
35+
<version>1.3.1-RELEASE</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.springframework.session</groupId>
@@ -41,17 +41,17 @@
4141
<dependency>
4242
<groupId>com.fasterxml.jackson.dataformat</groupId>
4343
<artifactId>jackson-dataformat-xml</artifactId>
44-
<version>2.15.3</version>
44+
<version>2.17.2</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.fasterxml.woodstox</groupId>
4848
<artifactId>woodstox-core</artifactId>
49-
<version>6.5.0</version>
49+
<version>6.7.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>io.netty</groupId>
5353
<artifactId>netty-resolver-dns-native-macos</artifactId>
54-
<version>4.1.100.Final</version>
54+
<version>4.1.112.Final</version>
5555
<classifier>osx-aarch_64</classifier>
5656
<scope>runtime</scope>
5757
</dependency>

‎frontend/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@
2525
"packages/*"
2626
],
2727
"dependencies": {
28-
"@emotion/react": "^11.11.1",
29-
"@emotion/styled": "^11.11.0",
30-
"@fontsource/roboto": "^5.0.8",
31-
"@mui/icons-material": "^5.14.16",
32-
"@mui/material": "^5.14.17",
33-
"@mui/system": "^5.14.17",
28+
"@emotion/react": "^11.13.0",
29+
"@emotion/styled": "^11.13.0",
30+
"@fontsource/roboto": "^5.0.14",
31+
"@mui/icons-material": "^5.16.7",
32+
"@mui/material": "^5.16.7",
33+
"@mui/system": "^5.16.7",
3434
"@mui/x-date-pickers": "^5.0.20",
3535
"@reduxjs/toolkit": "^1.9.7",
36-
"@types/js-cookie": "^3.0.5",
36+
"@types/js-cookie": "^3.0.6",
3737
"axios": "^1.7.4",
38-
"dayjs": "^1.11.10",
38+
"dayjs": "^1.11.13",
3939
"finnish-personal-identity-code-validator": "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters",
4040
"history": "^5.3.0",
41-
"i18next": "^23.6.0",
42-
"i18next-browser-languagedetector": "^7.1.0",
41+
"i18next": "^23.14.0",
42+
"i18next-browser-languagedetector": "^7.2.1",
4343
"js-cookie": "^3.0.5",
4444
"normalize.css": "^8.0.1",
45-
"react": "^18.2.0",
46-
"react-dom": "^18.2.0",
47-
"react-i18next": "^13.3.1",
45+
"react": "^18.3.1",
46+
"react-dom": "^18.3.1",
47+
"react-i18next": "^13.5.0",
4848
"react-redux": "^8.1.3",
49-
"react-router-dom": "6.13.0",
50-
"redux-saga": "^1.2.3"
49+
"react-router-dom": "6.26.1",
50+
"redux-saga": "^1.3.0"
5151
},
5252
"devDependencies": {
5353
"@babel/core": "^7.23.2",
@@ -106,7 +106,7 @@
106106
"stylelint-webpack-plugin": "^4.1.1",
107107
"ts-unused-exports": "^10.0.1",
108108
"typescript": "^5.2.2",
109-
"webpack": "^5.89.0",
109+
"webpack": "^5.94.0",
110110
"webpack-cli": "^5.1.4",
111111
"webpack-dev-server": "^4.15.1"
112112
},

‎frontend/packages/akr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"akr:tslint": "yarn g:tsc --pretty --noEmit"
2323
},
2424
"dependencies": {
25-
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.10.6"
25+
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.1"
2626
}
2727
}

‎frontend/packages/akr/src/pages/ContactRequestPage.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ControlButtons } from 'components/contactRequest/ControlButtons';
99
import { useAppTranslation, useCommonTranslation } from 'configs/i18n';
1010
import { useAppDispatch, useAppSelector } from 'configs/redux';
1111
import { ContactRequestFormStep } from 'enums/contactRequest';
12-
import { useNavigationProtection } from 'hooks/useNavigationProtection';
1312
import { updateContactRequest } from 'redux/reducers/contactRequest';
1413
import { contactRequestSelector } from 'redux/selectors/contactRequest';
1514
import { publicTranslatorsSelector } from 'redux/selectors/publicTranslator';
@@ -45,8 +44,6 @@ export const ContactRequestPage = () => {
4544
);
4645
}, [dispatch, from, to, selectedTranslators]);
4746

48-
useNavigationProtection(hasLocalChanges);
49-
5047
const disableNextCb = (disabled: boolean) => setDisableNext(disabled);
5148
const showControlButtons =
5249
activeStep <= ContactRequestFormStep.PreviewAndSend;

‎frontend/packages/akr/src/pages/clerk/ClerkSendEmailPage.tsx

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,35 @@ export const ClerkSendEmailPage = () => {
147147
const initialFieldErrors = { subject: '', message: '' };
148148
const [fieldErrors, setFieldErrors] =
149149
useState<typeof initialFieldErrors>(initialFieldErrors);
150+
151+
const emptyBody = StringUtils.isBlankString(email.body);
152+
const emptySubject = StringUtils.isBlankString(email.subject);
150153
const submitDisabled =
151154
isLoading ||
152-
StringUtils.isBlankString(email.subject) ||
153-
StringUtils.isBlankString(email.body) ||
155+
emptySubject ||
156+
emptyBody ||
154157
fieldErrors.message.length > 0 ||
155158
translators.length == 0;
156159

157160
// Navigation
158161
const navigate = useNavigate();
159162

160163
const { showToast } = useToast();
164+
165+
// Enable navigation protection when subject or body are modified.
166+
// Disable navigation protection if API request succeeds or is cancelled.
167+
useNavigationProtection(
168+
(!emptyBody || !emptySubject) &&
169+
!(
170+
status === APIResponseStatus.Success ||
171+
status === APIResponseStatus.Cancelled
172+
),
173+
);
174+
175+
// Show toast on success.
176+
// If an error occurs, a corresponding toast is shown from within the saga.
177+
// Finally, if API request succeeds or is cancelled, reset input fields and
178+
// navigate back to the clerk registry view.
161179
useEffect(() => {
162180
if (status == APIResponseStatus.Success) {
163181
showToast({
@@ -216,8 +234,6 @@ export const ClerkSendEmailPage = () => {
216234
[t],
217235
);
218236

219-
useNavigationProtection(isLoading);
220-
221237
return (
222238
<Box className="clerk-send-email-page">
223239
<H1>{t('pages.clerkSendEmailPage.title')}</H1>

‎frontend/packages/akr/src/tests/jest/components/layouts/__snapshots__/Footer.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ exports[`Footer should render Footer correctly 1`] = `
5252
viewBox="0 0 24 24"
5353
>
5454
<path
55-
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
55+
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z"
5656
/>
5757
</svg>
5858
</a>
@@ -127,7 +127,7 @@ exports[`Footer should render Footer correctly 1`] = `
127127
className="footer__logo-row"
128128
>
129129
<div
130-
className="MuiDivider-root MuiDivider-fullWidth MuiDivider-withChildren footer__logo-row__divider css-1puturl-MuiDivider-root"
130+
className="MuiDivider-root MuiDivider-fullWidth MuiDivider-withChildren footer__logo-row__divider css-1h4w97w-MuiDivider-root"
131131
role="separator"
132132
>
133133
<span

‎frontend/packages/akr/src/tests/jest/components/layouts/__snapshots__/Header.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ exports[`Header should render Header correctly 1`] = `
6161
viewBox="0 0 24 24"
6262
>
6363
<path
64-
d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2s.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2s.07-1.35.16-2h4.68c.09.65.16 1.32.16 2s-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2s-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z"
64+
d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2m6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56M12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96M4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2s.06 1.34.14 2zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56m2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8M12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96M14.34 14H9.66c-.09-.66-.16-1.32-.16-2s.07-1.35.16-2h4.68c.09.65.16 1.32.16 2s-.07 1.34-.16 2m.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56M16.36 14c.08-.66.14-1.32.14-2s-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2z"
6565
/>
6666
</svg>
6767
<button
6868
aria-current="true"
69-
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1e6y48t-MuiButtonBase-root-MuiButton-root"
69+
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1e6y48t-MuiButtonBase-root-MuiButton-root"
7070
disabled={false}
7171
lang="fi-FI"
7272
onBlur={[Function]}
@@ -99,7 +99,7 @@ exports[`Header should render Header correctly 1`] = `
9999
/>
100100
<button
101101
aria-current="false"
102-
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1e6y48t-MuiButtonBase-root-MuiButton-root"
102+
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1e6y48t-MuiButtonBase-root-MuiButton-root"
103103
disabled={false}
104104
lang="sv-SE"
105105
onBlur={[Function]}
@@ -130,7 +130,7 @@ exports[`Header should render Header correctly 1`] = `
130130
/>
131131
<button
132132
aria-current="false"
133-
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1e6y48t-MuiButtonBase-root-MuiButton-root"
133+
className="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1e6y48t-MuiButtonBase-root-MuiButton-root"
134134
disabled={false}
135135
lang="en-GB"
136136
onBlur={[Function]}

‎frontend/packages/otr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
"otr:tslint": "yarn g:tsc --pretty --noEmit"
2626
},
2727
"dependencies": {
28-
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.10.5"
28+
"shared": "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.1"
2929
}
3030
}

0 commit comments

Comments
 (0)