Fixing IE and IE warning

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

@@ -2,7 +2,10 @@
 
 <h3>{{'subsystemList.heading' | translate}}</h3>
 <div [innerHTML]="'subsystemList.intro' | translate:{'jsonUrl': getApiUrl()}"></div>
-<p *ngIf="isIE()" [innerHTML]="'subsystemList.ieWarning' | translate" class="alert alert-danger mt-3 mb-0"></p>
+<div *ngIf="isIE()">
+  <p [innerHTML]="'subsystemList.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

@@ -92,7 +92,8 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
   }
 
   isIE() {
-    if (window.navigator.userAgent.indexOf('MSIE ') > 0) {
+    const ua = window.navigator.userAgent;
+    if (ua.indexOf('MSIE ') >= 0 || ua.indexOf('Trident/') >= 0) {
       return true;
     }
     return false;
@@ -115,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

@@ -7,8 +7,8 @@
   },
   "subsystemList": {
     "heading": "Catalogue of all X-tee subsystems with methods and WSDL descriptions",
-    "intro": "<p>This catalogue is generated by making meta-query 'getWsdl' and 'getOpenAPI' requests from RIA Monitoring Security Server to all X-tee subsystems.</p>\n<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>\n<p>Latest version of catalogue in <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON form</a></p>\n<p>Support: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>.</p>",
-    "ieWarning": "Catalogue does not work with MS Internet Explorer, please use a modern browser like Google Chrome instead.",
+    "intro": "<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",
     "selectInstance": "Filter by X-tee instance",

src/assets/i18n/est.json

@@ -7,8 +7,8 @@
   },
   "subsystemList": {
     "heading": "X-tee alamsüsteemide kataloog teenuste ja WSDL kirjeldustega",
-    "intro": "<p>Kataloog on genereeritud metapäringute 'getWsdl' ja 'getOpenAPI' tulemustest RIA monitooringu turvaserveri poolt kõigist X-tee alamsüsteemidest.</p>\n<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>\n<p>Värskeim kataloogi versioon <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON kujul</a>.</p>\n<p>Kasutajatugi: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>.</p>",
-    "ieWarning": "Kataloog ei toimi sirvikuga MS Internet Explorer, palun kasutage selle asemel kaasaegse sirviku nagu Google Chrome.",
+    "intro": "<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",