Merge branch 'release-5.10'

Author: andriimurashkin

.env

@@ -1,6 +1,6 @@
 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-----
-SANDBOX_VERSION=5.9
-LEDGERS_VERSION=4.10
-XS2A_CONNECTOR_VERSION=11.1
-XS2A_ASPSP_PROFILE_VERSION=11.1
-XS2A_CONSENT_MANAGEMENT_VERSION=11.1
+SANDBOX_VERSION=5.10
+LEDGERS_VERSION=4.11
+XS2A_CONNECTOR_VERSION=11.2
+XS2A_ASPSP_PROFILE_VERSION=11.2
+XS2A_CONSENT_MANAGEMENT_VERSION=11.2

developer-portal-ui/angular.json

@@ -20,17 +20,16 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies": ["uuid"],
             "aot": true,
             "outputPath": "dist/developer-portal",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
+            "assets": ["src/favicon.ico", "src/assets"],
             "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "src/styles.scss",
               "node_modules/ngx-toastr/toastr.css"
             ],
@@ -89,7 +88,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
-            "styles": ["src/styles.scss"],
+            "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
             "scripts": ["node_modules/marked/lib/marked.js"],
             "assets": ["src/favicon.ico", "src/assets"]
           }

developer-portal-ui/info.json

@@ -1,5 +1,5 @@
 {
   "name": "developer-portal",
-  "version": "5.9",
+  "version": "5.10",
   "build_number": "null"
 }

developer-portal-ui/package-lock.json

@@ -22,17 +22,20 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^11.1.1",
+    "@angular/cdk": "^11.2.9",
     "@angular/common": "^11.1.1",
     "@angular/compiler": "^11.1.1",
     "@angular/core": "^11.1.1",
     "@angular/forms": "^11.1.1",
+    "@angular/material": "^11.2.9",
     "@angular/platform-browser": "^11.1.1",
     "@angular/platform-browser-dynamic": "^11.1.1",
     "@angular/router": "^11.1.1",
     "@ng-bootstrap/ng-bootstrap": "^5.3.0",
     "@ngx-translate/core": "^13.0.0",
     "@ngx-translate/http-loader": "^6.0.0",
     "bootstrap-scss": "^4.4.1",
+    "browser-detect": "^0.2.28",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.6.11",
     "css-vars-ponyfill": "^2.2.0",

developer-portal-ui/package.json

@@ -13,6 +13,7 @@ import { NavComponent } from './components/common/nav/nav.component';
 import { FooterComponent } from './components/common/footer/footer.component';
 import { of } from 'rxjs';
 import { MarkdownModule, MarkdownService } from 'ngx-markdown';
+import { SanitizeHtmlPipe } from './pipes/sanitize-html.pipe';
 
 describe('AppComponent', () => {
   let comp: AppComponent;
@@ -110,7 +111,7 @@ describe('AppComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        declarations: [AppComponent, TranslatePipe, NavComponent, FooterComponent],
+        declarations: [AppComponent, TranslatePipe, NavComponent, FooterComponent, SanitizeHtmlPipe],
         imports: [
           MarkdownModule.forRoot(),
           RouterTestingModule,
@@ -139,7 +140,6 @@ describe('AppComponent', () => {
     waitForAsync(() => {
       fixture = TestBed.createComponent(AppComponent);
       comp = fixture.componentInstance;
-      fixture.detectChanges();
     })
   );
 

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

@@ -30,10 +30,16 @@ import { CustomPageComponent } from './components/custom-page/custom-page.compon
 import { GoogleAnalyticsService } from './services/google-analytics.service';
 import { CustomizeService } from './services/customize.service';
 import { SettingsHttpService } from './services/settings-http.service';
+import { UrlLoadService } from './services/url-load.service';
+import { UrlService } from './services/url.service';
+import { SanitizeHtmlPipe } from './pipes/sanitize-html.pipe';
 
 export function app_Init(settingsHttpService: SettingsHttpService) {
   return () => settingsHttpService.initializeApp();
 }
+export function url_Init(urlLoadService: UrlLoadService) {
+  return () => urlLoadService.initializeUrls();
+}
 
 @NgModule({
   declarations: [
@@ -50,6 +56,7 @@ export function app_Init(settingsHttpService: SettingsHttpService) {
     NavComponent,
     FooterComponent,
     CustomPageComponent,
+    SanitizeHtmlPipe,
   ],
   imports: [
     BrowserModule,
@@ -81,13 +88,20 @@ export function app_Init(settingsHttpService: SettingsHttpService) {
     DataService,
     LanguageService,
     CustomizeService,
+    UrlService,
     GoogleAnalyticsService,
     {
       provide: APP_INITIALIZER,
       useFactory: app_Init,
       deps: [SettingsHttpService],
       multi: true,
     },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: url_Init,
+      deps: [UrlLoadService],
+      multi: true,
+    },
   ],
   bootstrap: [AppComponent],
 })

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

@@ -1 +1 @@
-<div id="markdown"><markdown [src]="pathToFile"></markdown></div>
+<div id="markdown" [innerHTML]="compiledMarkDown | sanitizeHtml"></div>

developer-portal-ui/src/app/components/common/footer/footer.component.html

@@ -8,6 +8,7 @@ import { MarkdownModule } from 'ngx-markdown';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { HttpLoaderFactory } from '../../../services/language.service';
 import { HttpClient } from '@angular/common/http';
+import { SanitizeHtmlPipe } from 'src/app/pipes/sanitize-html.pipe';
 
 describe('FooterComponent', () => {
   let component: FooterComponent;
@@ -93,7 +94,7 @@ describe('FooterComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        declarations: [FooterComponent, TranslatePipe],
+        declarations: [FooterComponent, TranslatePipe, SanitizeHtmlPipe],
         imports: [
           HttpClientTestingModule,
           MarkdownModule.forRoot(),
@@ -113,7 +114,6 @@ describe('FooterComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(FooterComponent);
     component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
   it('should create', () => {

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

@@ -1,26 +1,48 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, AfterViewChecked } from '@angular/core';
 import { CustomizeService } from '../../../services/customize.service';
 import { MarkdownStylingService } from '../../../services/markdown-styling.service';
 import { LanguageService } from '../../../services/language.service';
+import { UrlService } from 'src/app/services/url.service';
+import { EnvLink } from 'src/app/models/envLink.model';
+import { MarkdownService } from 'ngx-markdown';
 
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
   styleUrls: ['./footer.component.scss'],
 })
-export class FooterComponent implements OnInit {
+export class FooterComponent implements OnInit, AfterViewChecked {
   pathToFile = `./assets/content/i18n/en/footer.md`;
+  compiledMarkDown = '';
 
   constructor(
     private customizeService: CustomizeService,
     private markdownStylingService: MarkdownStylingService,
-    private languageService: LanguageService
+    private languageService: LanguageService,
+    private urlService: UrlService,
+    private markdownService: MarkdownService
   ) {}
 
   ngOnInit() {
     this.languageService.currentLanguage.subscribe((data) => {
       this.pathToFile = `${this.customizeService.currentLanguageFolder}/${data}/footer.md`;
       this.markdownStylingService.createTableOfContent(true);
+      this.markdownService.getSource(this.pathToFile).subscribe((result) => {
+        this.compiledMarkDown = this.markdownService.compile(result);
+      });
     });
   }
+
+  ngAfterViewChecked() {
+    this.urlService.getUrl().subscribe((data: EnvLink) => {
+      Object.keys(data.servicesAvailable).forEach((key) => this.setLink(key, data.servicesAvailable[key].environmentLink));
+    });
+  }
+
+  setLink(id: string, link: string) {
+    const anchorNode = document.getElementById(id);
+    if (anchorNode) {
+      anchorNode.setAttribute('href', link);
+    }
+  }
 }