Skip to content

Commit f64503c

Browse files
Merge branch 'release-5.11'
2 parents 79abfb8 + f4ce894 commit f64503c

File tree

144 files changed

+1534
-1583
lines changed

Some content is hidden

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

144 files changed

+1534
-1583
lines changed

.env

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QWAC_CERTIFICATE_MOCK=-----BEGIN CERTIFICATE-----MIIFNjCCAx6gAwIBAgIERd3y8TANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJERTEQMA4GA1UECAwHQkFWQVJJQTESMBAGA1UEBwwJTnVyZW1iZXJnMSIwIAYDVQQKDBlUcnVzdCBTZXJ2aWNlIFByb3ZpZGVyIEFHMR8wHQYDVQQLDBZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MB4XDTIwMDMwNTEzMzk1MFoXDTMwMDMwMzAwMDAwMFowgcExITAfBgNVBAoMGEZpY3Rpb25hbCBDb3Jwb3JhdGlvbiBBRzElMCMGCgmSJomT8ixkARkWFXB1YmxpYy5jb3Jwb3JhdGlvbi5kZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEQMA4GA1UEBhMHR2VybWFueTEPMA0GA1UECAwGQmF5ZXJuMRIwEAYDVQQHDAlOdXJlbWJlcmcxHTAbBgNVBGEMFFBTRERFLUZBS0VOQ0EtODdCMkFDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHAdLWn7pEAlD5daEjKv7hE4FW+vMJRrA/Bw2M/Zsu8VFfW1ARmbTgTy7rGLFBK/Y2SToEj60+5GEkCgCvi+vI/Bdykk8XqjpVsJjTW67np1b2Av8F61zvCnn2UOxBtXBHCzR1j2yz2om1IMYieGu/cDTWLNkbuoGSnj0dq4CbHp2f8ch++goffqLRXr642j8cVlqZYsapB8y+Z8IydbtNBd/XAmRTAprmdRv9B4PC7P+lIYX8QbXw77f+9/2Kty7oVHtjle+GnTR8wH5nCiMQsA9V564/34lKwuEkzuryV1HzitQ/X7FSZoiSQRTxbxjVO+xdzI3hjF2FZjVvkqywIDAQABo34wfDB6BggrBgEFBQcBAwRuMGwGBgQAgZgnAjBiMDkwEQYHBACBmCcBAwwGUFNQX0FJMBEGBwQAgZgnAQIMBlBTUF9QSTARBgcEAIGYJwEEDAZQU1BfSUMMGVRydXN0IFNlcnZpY2UgUHJvdmlkZXIgQUcMCkRFLUZBS0VOQ0EwDQYJKoZIhvcNAQELBQADggIBACKUQc3O3TOFG8tWk4sQd3f9SGlOcBOMekSXCxRgskcYkjhWW4+EN1FYzlGuXPfq1yngKaM3ss9yCDVep0MFa4hDJ/hzSSD5upExzwWDkUa97AHCjZd39W6kLaCMAc5vTbR9r7zBvMKBcAmhZ9mWCvrvbHUOURv5yBfrrEk4AM1Vakf5l+fWP4JhA779+7JlwpQRpy5dgqROwKQ2L634d2osgXUV4CkqhSUQ5LcYI4uBFyKnM0pyGaNYdKhBC95J0y5GYa7NpKJNZXf+clTbe33gCt2SFSOMa7CV5NYpnohS201uNd/ffWLzGtFBnHLNpX8qTfFc16mtIcJo6Iiof2CYgfYAyJByBC1gZHf1wAtfQzAn6JcEaJzmehXKKl9x7X62aaGan7l+MblUT65Gd+Yed+rXLF6svefbrcIbZwt/W+v1fbfnip9QEFPV3VLjg0vk9Y30ftZCcFRSHLD3mdxcVEtmVxDDxyzDUwXF7J/mi4RQhZBb3OtwwEIWC2zUaycNMZWJRI+RqfLvanlDFFMoYeSZKTFf8jS/PPcfpKOAiTGu21iuuv+gYxh/rgjW419w26ya+Q3jabaz3E9Im/opSU5sQ9W92ALA14J9VZs6v8BVmqKTB5APKfeTYoXg9MjP9fjVM/hP26kIgQVs5Bz15ov8uQlQC+OTO+2y5ozs-----END CERTIFICATE-----
2-
SANDBOX_VERSION=5.10
3-
LEDGERS_VERSION=4.11
4-
XS2A_CONNECTOR_VERSION=11.2
5-
XS2A_ASPSP_PROFILE_VERSION=11.2
6-
XS2A_CONSENT_MANAGEMENT_VERSION=11.2
2+
SANDBOX_VERSION=5.11
3+
LEDGERS_VERSION=4.12
4+
XS2A_CONNECTOR_VERSION=11.4
5+
XS2A_ASPSP_PROFILE_VERSION=11.4
6+
XS2A_CONSENT_MANAGEMENT_VERSION=11.4

.github/workflows/release.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Release CI
22

3-
on:
3+
on:
44
push:
55
tags:
66
- '*.*.*'
@@ -41,17 +41,17 @@ jobs:
4141
- name: Build Modelbank
4242
run: mvn -ntp -DskipTests -DskipITs -Dmaven.javadoc.skip=true clean install
4343

44-
- name: Check pmd
44+
- name: Check pmd
4545
run: mvn -ntp pmd:check
4646

47-
- name: Generate javadocs
47+
- name: Generate javadocs
4848
run: mvn -ntp javadoc:javadoc
4949

50-
- name: Run UI tests
50+
- name: Run UI tests
5151
run: mvn -ntp -DskipITs --fail-at-end clean install
5252

53-
- name: Run IT tests
54-
run: mvn -ntp failsafe:integration-test failsafe:verify
53+
- name: Run IT tests
54+
run: mvn -ntp failsafe:integration-test failsafe:verify
5555

5656
sonar:
5757
name: Publish code coverage to Sonar Cloud
@@ -115,6 +115,10 @@ jobs:
115115
run: |
116116
gpg --version
117117
export GPG_TTY="$( tty )" #need to run to sign artifacts with maven
118-
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch
118+
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch
119119
echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --batch --import-ownertrust
120-
mvn -ntp --settings scripts/mvn-release-settings.xml -Prelease -DskipTests -U deploy
120+
mvn -ntp --settings scripts/mvn-release-settings.xml \
121+
-Dhttp.keepAlive=false \
122+
-Dmaven.wagon.http.pool=false \
123+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
124+
-Prelease -DskipTests -U deploy

developer-portal-ui/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "developer-portal",
3-
"version": "5.10",
3+
"version": "5.11",
44
"build_number": "null"
55
}

developer-portal-ui/src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { SettingsHttpService } from './services/settings-http.service';
3333
import { UrlLoadService } from './services/url-load.service';
3434
import { UrlService } from './services/url.service';
3535
import { SanitizeHtmlPipe } from './pipes/sanitize-html.pipe';
36+
import { MatSnackBarModule } from '@angular/material/snack-bar';
3637

3738
export function app_Init(settingsHttpService: SettingsHttpService) {
3839
return () => settingsHttpService.initializeApp();
@@ -81,6 +82,7 @@ export function url_Init(urlLoadService: UrlLoadService) {
8182
MarkdownModule.forRoot({
8283
sanitize: SecurityContext.NONE,
8384
}),
85+
MatSnackBarModule,
8486
],
8587
exports: [],
8688
providers: [

developer-portal-ui/src/app/components/home/home.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ div ::ng-deep {
223223
margin: 64px 0;
224224

225225
.product-history-header-wrapper {
226-
width: 50vw;
226+
width: 91vw;
227227
margin: 0 auto;
228228

229229
.title {
@@ -389,7 +389,7 @@ div ::ng-deep {
389389

390390
.any-questions {
391391
padding: 0 25px;
392-
width: 50%;
392+
width: 94vw;
393393
margin: 0 auto;
394394
font-weight: normal;
395395

developer-portal-ui/src/app/components/home/home.component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { HttpLoaderFactory, LanguageService } from '../../services/language.serv
99
import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
1010
import { HttpClient } from '@angular/common/http';
1111
import { of } from 'rxjs';
12+
import { MatSnackBarModule } from '@angular/material/snack-bar';
1213

1314
describe('HomeComponent', () => {
1415
let component: HomeComponent;
@@ -86,6 +87,7 @@ describe('HomeComponent', () => {
8687
imports: [
8788
MarkdownModule.forRoot(),
8889
HttpClientTestingModule,
90+
MatSnackBarModule,
8991
TranslateModule.forRoot({
9092
loader: {
9193
provide: TranslateLoader,

developer-portal-ui/src/app/components/home/home.component.ts

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { AfterViewInit, Component, OnInit } from '@angular/core';
33
import { CustomizeService } from '../../services/customize.service';
44
import { ContactInfo, Theme } from '../../models/theme.model';
55
import { LanguageService } from '../../services/language.service';
6+
import { MatSnackBarHorizontalPosition, MatSnackBarVerticalPosition, MatSnackBar } from '@angular/material/snack-bar';
7+
import browser from 'browser-detect';
68

79
@Component({
810
selector: 'app-home',
@@ -16,42 +18,42 @@ export class HomeComponent implements OnInit, AfterViewInit {
1618
{
1719
title: 'HOME.FEATURES.SLIDES.SLIDE_1.TITLE',
1820
description: 'HOME.FEATURES.SLIDES.SLIDE_1.CONTENT',
19-
photoUrl: '../../assets/icons/plug&play.png',
21+
photoUrl: '../../assets/icons/plug&play.svg',
2022
},
2123
{
2224
title: 'HOME.FEATURES.SLIDES.SLIDE_2.TITLE',
2325
description: 'HOME.FEATURES.SLIDES.SLIDE_2.CONTENT',
24-
photoUrl: '../../assets/icons/developer.png',
26+
photoUrl: '../../assets/icons/developer.svg',
2527
},
2628
{
2729
title: 'HOME.FEATURES.SLIDES.SLIDE_3.TITLE',
2830
description: 'HOME.FEATURES.SLIDES.SLIDE_3.CONTENT',
29-
photoUrl: '../../assets/icons/tested.png',
31+
photoUrl: '../../assets/icons/tested.svg',
3032
},
3133
{
3234
title: 'HOME.FEATURES.SLIDES.SLIDE_4.TITLE',
3335
description: 'HOME.FEATURES.SLIDES.SLIDE_4.CONTENT',
34-
photoUrl: '../../assets/icons/customized.png',
36+
photoUrl: '../../assets/icons/customized.svg',
3537
},
3638
{
3739
title: 'HOME.FEATURES.SLIDES.SLIDE_5.TITLE',
3840
description: 'HOME.FEATURES.SLIDES.SLIDE_5.CONTENT',
39-
photoUrl: '../../assets/icons/user-centered.png',
41+
photoUrl: '../../assets/icons/user-centered.svg',
4042
},
4143
{
4244
title: 'HOME.FEATURES.SLIDES.SLIDE_6.TITLE',
4345
description: 'HOME.FEATURES.SLIDES.SLIDE_6.CONTENT',
44-
photoUrl: '../../assets/icons/prototyp.png',
46+
photoUrl: '../../assets/icons/prototyp.svg',
4547
},
4648
{
4749
title: 'HOME.FEATURES.SLIDES.SLIDE_7.TITLE',
4850
description: 'HOME.FEATURES.SLIDES.SLIDE_7.CONTENT',
49-
photoUrl: '../../assets/icons/service.png',
51+
photoUrl: '../../assets/icons/service.svg',
5052
},
5153
{
5254
title: 'HOME.FEATURES.SLIDES.SLIDE_8.TITLE',
5355
description: 'HOME.FEATURES.SLIDES.SLIDE_8.CONTENT',
54-
photoUrl: '../../assets/icons/open_source.png',
56+
photoUrl: '../../assets/icons/open_source.svg',
5557
},
5658
];
5759
productHistory = [
@@ -98,8 +100,11 @@ export class HomeComponent implements OnInit, AfterViewInit {
98100
showSlider: boolean;
99101

100102
private carouselInterval = 3000;
103+
horizontalPosition: MatSnackBarHorizontalPosition = 'right';
104+
verticalPosition: MatSnackBarVerticalPosition = 'top';
105+
durationInSeconds = 5000;
101106

102-
constructor(private languageService: LanguageService, private customizeService: CustomizeService) {
107+
constructor(private languageService: LanguageService, private customizeService: CustomizeService, private _snackBar: MatSnackBar) {
103108
if (this.customizeService.currentTheme) {
104109
this.customizeService.currentTheme.subscribe((theme: Theme) => {
105110
if (theme.pagesSettings) {
@@ -116,6 +121,18 @@ export class HomeComponent implements OnInit, AfterViewInit {
116121
}
117122

118123
ngOnInit() {
124+
const result = browser();
125+
if (result.name !== 'chrome' && result.name !== 'edge' && result.name !== 'safari' && result.name !== 'firefox') {
126+
this._snackBar.open(
127+
`Unfortunately, you are using an outdated browser. Our website may not look quite right in it. Please consider updating your browser to enjoy an optimal experience.`,
128+
'Close',
129+
{
130+
horizontalPosition: this.horizontalPosition,
131+
verticalPosition: this.verticalPosition,
132+
duration: this.durationInSeconds,
133+
}
134+
);
135+
}
119136
this.languageService.currentLanguage.subscribe((data) => {
120137
this.pathToFile = `${this.customizeService.currentLanguageFolder}/${data}/home.md`;
121138
});

developer-portal-ui/src/app/components/test-cases/components/api-endpoints/emb-consent-put/emb-consent-put.component.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
<div class="endpoint-documentation" *ngIf="activeSegment === 'documentation'; else play_with_data">
2424
<h1>{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.TITLE' | translate }}</h1>
2525
<span class="bold-text">{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.SUBTITLE_1' | translate }}</span>
26-
<p>
27-
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_1' | translate }}
28-
<span class="italic-text">{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.ITALIC' | translate }}</span>
29-
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_2' | translate }}
30-
</p>
26+
3127
<p>
3228
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_3' | translate }} <span class="bold-text">PUT</span> endpoint
3329
<app-line-command title="/v1/consents/{consentId}/authorisations/{authorisationId}"></app-line-command>.

developer-portal-ui/src/app/components/test-cases/components/play-with-data/play-wth-data.component.html

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,17 @@
165165
</select>
166166

167167
<ng-template #regularInput>
168-
<input
169-
[(ngModel)]="headers[item.key]"
170-
type="text"
171-
[id]="item.key"
172-
class="mr-1"
173-
[disabled]="item.key === 'TPP-QWAC-Certificate' && default"
174-
/>
175-
168+
<div class="input-group mb-3">
169+
<input
170+
[(ngModel)]="headers[item.key]"
171+
type="text"
172+
[id]="item.key"
173+
class="form-control"
174+
[disabled]="item.key === 'TPP-QWAC-Certificate' && default"
175+
/>
176+
</div>
176177
<app-pop-up
177-
class="ml-1"
178+
class="ml-1 pb-3"
178179
[default]="default"
179180
*ngIf="item.key === 'TPP-QWAC-Certificate'"
180181
[certificate]="headers['TPP-QWAC-Certificate']"
@@ -188,9 +189,11 @@
188189

189190
<div class="play-with-data-table bg" *ngIf="consentTypeFlag">
190191
<span>Select consent type</span>
191-
<select id="consentTypeSelector" [(ngModel)]="selectedConsentType" (ngModelChange)="handleConsentSelected($event)">
192-
<option *ngFor="let consent of consentTypes | keyvalue; let i = index" [value]="consent.key">{{ consent.key }}</option>
193-
</select>
192+
<mat-form-field appearance="fill" style="width: 24vw">
193+
<mat-select id="consentTypeSelector" [(ngModel)]="selectedConsentType" (ngModelChange)="handleConsentSelected($event)">
194+
<mat-option *ngFor="let consent of consentTypes | keyvalue; let i = index" [value]="consent.key">{{ consent.key }}</mat-option>
195+
</mat-select>
196+
</mat-form-field>
194197
</div>
195198

196199
<textarea name="" id="textAreaXml" cols="30" rows="10" *ngIf="body && xml" [value]="body"></textarea>
@@ -199,7 +202,7 @@
199202

200203
<ng-container *ngIf="response">
201204
<div *ngIf="response.status || response.statusText" class="response-status">
202-
<button class="clear-button" (click)="onClear()">Clear</button> <span class="status-style">Status</span>
205+
<button mat-button-raised class="clear-button" (click)="onClear()">Clear</button> <span class="status-style">Status</span>
203206
<div class="response-status-wrapper">
204207
<span>{{ response.status }}</span> <span>{{ getStatusText(response.status) }}</span>
205208
</div>

developer-portal-ui/src/app/components/test-cases/components/play-with-data/play-wth-data.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,3 +257,6 @@ select {
257257
display: inline;
258258
vertical-align: inherit;
259259
}
260+
.example-form-field {
261+
width: 100%;
262+
}

0 commit comments

Comments
 (0)