Skip to content

Commit 2631575

Browse files
phavekesphavekes
committed
Merge branch 'main' of github.com:OpenConext/OpenConext-Invite
2 parents e4541f8 + 6747b4f commit 2631575

60 files changed

Lines changed: 3101 additions & 2294 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/badges/branches.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎.github/badges/jacoco.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,18 @@ jobs:
147147
name: invitebuilds
148148

149149
- name: Set up Docker Buildx
150-
uses: docker/setup-buildx-action@v3
150+
uses: docker/setup-buildx-action@v4
151151

152152
- name: Login to GitHub Container Registry
153-
uses: docker/login-action@v3
153+
uses: docker/login-action@v4
154154
with:
155155
registry: ghcr.io
156156
username: ${{ github.repository_owner }}
157157
password: ${{ secrets.GITHUB_TOKEN }}
158158

159159
- name: Set docker labels and tags
160160
id: meta
161-
uses: docker/metadata-action@v5
161+
uses: docker/metadata-action@v6
162162
with:
163163
images: ${{ matrix.image }}
164164
flavor: |
@@ -171,7 +171,7 @@ jobs:
171171
type=sha
172172
173173
- name: Build and push the ${{ matrix.app }} image
174-
uses: docker/build-push-action@v6
174+
uses: docker/build-push-action@v7
175175
with:
176176
context: ${{ matrix.app }}
177177
file: ${{ matrix.app }}/docker/Dockerfile

‎client/docker/appconf.conf‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RewriteCond %{REQUEST_URI} !\.wav$
1111
RewriteCond %{REQUEST_URI} !\.eot$
1212
RewriteCond %{REQUEST_URI} !^/(asset-)?manifest.json$
1313
RewriteCond %{REQUEST_URI} !^/api/
14+
RewriteCond %{REQUEST_URI} !^/crm/
1415
RewriteCond %{REQUEST_URI} !^/login/
1516
RewriteCond %{REQUEST_URI} !^/oauth2/
1617
RewriteCond %{REQUEST_URI} !^/ui/
@@ -20,16 +21,18 @@ RewriteCond %{REQUEST_URI} !^/fonts/
2021
RewriteRule (.*) /index.html [L]
2122
ProxyPass /api http://inviteserver:8080/api retry=0
2223
ProxyPassReverse /api http://inviteserver:8080/api
23-
ProxyPassMatch ^/oauth2(.*)$ http://inviteserver:8080
24+
ProxyPassMatch ^/oauth2(.*)$ http://inviteserver:8080
2425
ProxyPassReverse /oauth2 http://inviteserver:8080/oauth2
25-
ProxyPassMatch ^/internal(.*)$ http://inviteserver:8080
26+
ProxyPassMatch ^/internal(.*)$ http://inviteserver:8080
2627
ProxyPassReverse /internal http://inviteserver:8080/internal
27-
ProxyPassMatch ^/login(.*)$ http://inviteserver:8080
28+
ProxyPassMatch ^/login(.*)$ http://inviteserver:8080
2829
ProxyPassReverse /login http://inviteserver:8080/login
29-
ProxyPassMatch ^/ui(.*)$ http://inviteserver:8080
30+
ProxyPassMatch ^/ui(.*)$ http://inviteserver:8080
3031
ProxyPassReverse /ui http://inviteserver:8080/ui
31-
ProxyPass /deprovision http://inviteserver:8080/api
32+
ProxyPass /deprovision http://inviteserver:8080/api
3233
ProxyPassReverse /deprovision http://inviteserver:8080/api
34+
ProxyPass /crm http://inviteserver:8080/crm
35+
ProxyPassReverse /crm http://inviteserver:8080/crm
3336

3437
DocumentRoot /var/www/
3538

‎client/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"test": "vitest"
1111
},
1212
"dependencies": {
13-
"@surfnet/sds": "^0.0.157",
13+
"@surfnet/sds": "^0.0.162",
1414
"@vitejs/plugin-react": "^5.1.0",
15-
"dompurify": "^3.2.6",
15+
"dompurify": "^3.3.1",
1616
"i18n-js": "^4.5.1",
17-
"isomorphic-dompurify": "^2.26.0",
17+
"isomorphic-dompurify": "^3.0.0",
1818
"js-cookie": "^3.0.5",
1919
"lodash.debounce": "^4.0.8",
2020
"luxon": "^3.7.1",
@@ -27,20 +27,20 @@
2727
"react-select": "^5.10.2",
2828
"react-tooltip": "^5.29.1",
2929
"timeago.js": "^4.0.2",
30-
"tough-cookie": "^5.1.2",
30+
"tough-cookie": "^6.0.0",
3131
"word-wrap": "^1.2.5",
3232
"zustand": "^5.0.7"
3333
},
3434
"devDependencies": {
3535
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
36-
"@eslint/js": "^9.39.1",
36+
"@eslint/js": "^10.0.1",
3737
"@testing-library/jest-dom": "^6.7.0",
3838
"@testing-library/react": "^16.3.0",
3939
"@testing-library/user-event": "^14.6.1",
40-
"eslint": "^9.39.1",
40+
"eslint": "^10.0.2",
4141
"eslint-plugin-react": "^7.37.5",
4242
"eslint-plugin-react-hooks": "^7.0.1",
43-
"globals": "^16.5.0",
43+
"globals": "^17.4.0",
4444
"http-proxy-middleware": "^3.0.5",
4545
"nth-check": "^2.1.1",
4646
"react-json-view-lite": "^2.4.2",
@@ -51,7 +51,7 @@
5151
},
5252
"resolutions": {
5353
"nth-check": "^2.1.1",
54-
"tough-cookie": "^5.1.2",
54+
"tough-cookie": "^6.0.0",
5555
"word-wrap": "^1.2.3"
5656
},
5757
"eslintConfig": {

‎client/src/__tests__/validations/regExps.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ describe('regExps', () => {
1010
it('Emails formats', () => {
1111
expect(validEmailRegExp.test("aa")).toBeFalsy();
1212
expect(validEmailRegExp.test("a!@a.c")).toBeFalsy();
13+
expect(validEmailRegExp.test("aa@abc..c")).toBeFalsy();
1314
expect(validEmailRegExp.test("a!@a.c@")).toBeFalsy();
1415

1516
expect(validEmailRegExp.test("a@a")).toBeTruthy();

‎client/src/components/SelectField.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
border: 1px solid var(--sds--color--gray--300);
2626
border-radius: vars.$br;
2727
font-size: 16px;
28-
height: 48px;
28+
min-height: 48px;
2929

3030
&.creatable {
31-
height: 48px;
31+
min-height: 48px;
3232
}
3333

3434
.select-inner__control {
@@ -42,7 +42,7 @@
4242
outline: none;
4343
box-shadow: 3px 3px 3px var(--sds--color--blue--200), -3px -3px 1px var(--sds--color--blue--200);
4444
border: 1px solid var(--sds--color--gray--300) !important;
45-
height: 48px;
45+
min-height: 48px;
4646
}
4747

4848
&[disabled] {

‎client/src/locale/en.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const en = {
136136
roleInfoNoEndDate: "Role has <strong>no end date</strong>",
137137
contactAdmin: "Contact role manager(s)",
138138
institutionAdmin: "Institution admins: {{names}}",
139-
noInstitutionAdmin: "There is not institution admins"
139+
noInstitutionAdmin: "There are no institution admins for this role"
140140
},
141141
roles: {
142142
title: "Access Roles",

‎client/src/locale/nl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ const nl = {
136136
roleInfoNoEndDate: "Rol heeft <strong>geen einddatum</strong>",
137137
contactAdmin: "Contact rolmanager(s)",
138138
institutionAdmin: "Institution admins: {{names}}",
139-
noInstitutionAdmin: "There is not institution admins"
139+
noInstitutionAdmin: "Er zijn geen instellings-admins voor deze rol"
140140

141141
},
142142
roles: {

‎client/src/pages/InvitationForm.jsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,6 @@ export const InvitationForm = () => {
323323
pinnedEmails={[]}
324324
removeMail={removeMail}
325325
required={true}
326-
maxEmails={null} //TODO is there a internal placeholder identifier? then one.
327-
// See https://github.com/OpenConext/OpenConext-Invite/issues/540
328-
maxEmailsMessage={"TODO : localize Not allowed to add more then one email with external identifier"}
329326
error={!initial && isEmpty(invitation.invites)}/>
330327

331328
{(!initial && isEmpty(invitation.invites)) &&

0 commit comments

Comments
 (0)