Pull request #23: Develop

Merge in XTSS/xtss-catalogue from develop to master

* commit '1955ad26':
  remove old texts
  Leaving old intro texts to avoid cache problems
  Fixing IE and IE warning
  Unsupported IE message
  Spelling error corrections
  Note about usage with MS Internet Explorer

src/app/subsystem-list/subsystem-list.component.html

 <app-header></app-header>
 
 <h3>{{'subsystemList.heading' | translate}}</h3>
-<p [innerHTML]="'subsystemList.intro.p1' | translate"></p>
-<p [innerHTML]="'subsystemList.intro.p2' | translate"></p>
-<p [innerHTML]="'subsystemList.intro.p3' | translate"></p>
-<p [innerHTML]="'subsystemList.intro.p4' | translate:{'jsonUrl': getApiUrl()}"></p>
-<p [innerHTML]="'subsystemList.intro.p5' | translate"></p>
+<div [innerHTML]="'subsystemList.intro.common' | translate:{'jsonUrl': getApiUrl()}"></div>
+<div *ngIf="isIE()">
+  <p [innerHTML]="'subsystemList.intro.ieWarning' | translate" class="alert alert-danger mt-3 mb-0"></p>
+  <br>
+</div>
 
 <app-messages [message]="message"></app-messages>
 

src/app/subsystem-list/subsystem-list.component.ts

@@ -91,6 +91,14 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
     this.search.setLimit('all');
   }
 
+  isIE() {
+    const ua = window.navigator.userAgent;
+    if (ua.indexOf('MSIE ') >= 0 || ua.indexOf('Trident/') >= 0) {
+      return true;
+    }
+    return false;
+  }
+
   ngOnInit() {
     // Reset message on page load
     this.message = '';
@@ -108,7 +116,7 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
       this.message = '';
 
       // Redirect to default instance if instance is empty or invalid
-      if (!this.subsystemsService.getInstances().includes(params.instance)) {
+      if (this.subsystemsService.getInstances().indexOf(params.instance) < 0) {
         this.router.navigateByUrl('/' + this.subsystemsService.getDefaultInstance(), { replaceUrl: true });
         return;
       }

src/app/subsystem/subsystem.component.ts

@@ -76,7 +76,7 @@ export class SubsystemComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.routeSubscription = this.route.params.subscribe( params => {
       // Checking if instance is correct
-      if (!this.subsystemsService.getInstances().includes(params.instance)) {
+      if (this.subsystemsService.getInstances().indexOf(params.instance) < 0) {
         this.paramsInstance = params.instance;
         this.message = 'subsystem.incorrectInstanceWarning';
         return;

src/assets/i18n/eng.json

@@ -8,11 +8,8 @@
   "subsystemList": {
     "heading": "Catalogue of all X-tee subsystems with methods and WSDL descriptions",
     "intro": {
-      "p1": "This catalogue is generated by making meta-query 'getWsdl' and 'getOpenAPI' requests from RIA Monitoring Security Server to all X-tee subsystems.",
-      "p2": "Subsystems with the <span class=\"badge badge-secondary\">Empty</span> icon do not have X-tee services available.",
-      "p3": "Subsystems with the <span class=\"badge badge-danger\">Error</span> icon either could not be reached by RIA Monitoring Security Server or there was some other error during the request.",
-      "p4": "Latest version of catalogue in <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON form</a>",
-      "p5": "Support: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>"
+      "common": "<p>This catalogue is generated by making meta-query 'getWsdl' and 'getOpenAPI' requests from RIA Monitoring Security Server to all X-tee subsystems.</p><p>Subsystems with the <span class=\"badge badge-secondary\">Empty</span> icon do not have X-tee services available. Subsystems with the <span class=\"badge badge-danger\">Error</span> icon either could not be reached by RIA Monitoring Security Server or there was some other error during the request.</p><p>Latest version of catalogue in <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON form</a></p><p>Support: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>.</p>",
+      "ieWarning": "Catalogue may not work with MS Internet Explorer, please use a modern browser like Google Chrome instead."
     },
     "moreSubsystems": "Some subsystems are not available in this view due to display limit. To see more subsystems change amount of subsystems to display or filter by subsystem or service name.",
     "showAll": "Show all sybsystems",

src/assets/i18n/est.json

@@ -8,16 +8,13 @@
   "subsystemList": {
     "heading": "X-tee alamsüsteemide kataloog teenuste ja WSDL kirjeldustega",
     "intro": {
-      "p1": "Kataloog on genereeritud metapäringute 'getWsdl' ja 'getOpenAPI' tulemustest RIA monitooringu turvaserveri poolt kõigist X-tee alamsüsteemidest.",
-      "p2": "Alamsüsteemid <span class=\"badge badge-secondary\">Tühi</span> ikooniga ei oma X-tee teenuseid.",
-      "p3": "Alamsüsteemid <span class=\"badge badge-danger\">Viga</span> ikooniga kas ei ole ligipääsetavad RIA monitooringu turvaserveri poolt või päringu tegemisel ilmnes muu viga.",
-      "p4": "Värskeim kataloogi versioon <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON kujul</a>",
-      "p5": "Kasutajatugi: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>"
+      "common": "<p>Kataloog on genereeritud metapäringute 'getWsdl' ja 'getOpenAPI' tulemustest RIA monitooringu turvaserveri poolt kõigist X-tee alamsüsteemidest.</p><p>Alamsüsteemid <span class=\"badge badge-secondary\">Tühi</span> ikooniga ei oma X-tee teenuseid. Alamsüsteemid <span class=\"badge badge-danger\">Viga</span> ikooniga kas ei ole ligipääsetavad RIA monitooringu turvaserveri poolt või päringu tegemisel ilmnes muu viga.</p><p>Värskeim kataloogi versioon <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON kujul</a>.</p><p>Kasutajatugi: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>.</p>",
+      "ieWarning": "Kataloog ei pruugi toimida sirvikuga MS Internet Explorer, palun kasutage selle asemel kaasaegset sirvikut, näiteks Google Chrome."
     },
     "moreSubsystems": "Kõiki alamsüsteeme ei kuvatud seoses alamsüsteemide arvu piiranguga. Selleks, et näha rohkem alamsüsteeme, palun muutke määrangut 'Alamsüsteeme lehel' või otsige alamsüsteemi või teenuse nime järgi.",
     "showAll": "Näita kõiki alamsüsteeme",
     "selectInstance": "Vali X-tee keskkond",
-    "selectVersion": "Vali kataloogi versiooni",
+    "selectVersion": "Vali kataloogi versioon",
     "latestVersion": "Värskeim versioon"
   },
   "search": {