Commit 63f71047 authored by Vitali Stupin's avatar Vitali Stupin
Browse files

Merge pull request #14 in XTSS/xtss-catalogue from release to master

* commit '4f8faec4':
  statusWsdlSkipped: leatud => laetud
  dataLoadingError clarification
  Sõnastuse parandused
  Sõnastuste kohendamised. Adjustment of texts.
  Adding link to display hidden subsystems
  New API location
  est.json better wording
  eng.json typo
  Display REST services
parents c14fa2a8 4f8faec4
......@@ -25,6 +25,7 @@ export class SearchComponent implements OnInit {
}
setLimit(limit: string) {
this.limit = limit;
this.subsystemsService.setLimit(limit);
}
......
......@@ -15,6 +15,7 @@
{{method.fullMethodName}}
<a href="{{getApiUrlBase()}}{{method.wsdl}}" class="badge badge-success"
*ngIf="method.wsdl" [target]="'_blank'">WSDL</a>
<span class="badge badge-info" *ngIf="method.methodStatus == 'REST'">REST</span>
<span class="badge badge-danger" *ngIf="method.methodStatus == 'ERROR'">{{'subsystem.statusWsdlError' | translate}}</span>
<span class="badge badge-danger" *ngIf="method.methodStatus == 'TIMEOUT'">{{'subsystem.statusWsdlTimeout' | translate}}</span>
<span class="badge badge-warning" *ngIf="method.methodStatus == 'SKIPPED'">{{'subsystem.statusWsdlSkipped' | translate}}</span>
......
......@@ -37,7 +37,11 @@
<app-subsystem-item *ngFor="let subsystem of filteredSubsystems | async" [subsystem]="subsystem"></app-subsystem-item>
<br>
<p *ngIf="isPartialList()">{{'subsystemList.moreSubsystems' | translate}}</p>
<p *ngIf="isPartialList()">
{{'subsystemList.moreSubsystems' | translate}}<br>
<a class="font-weight-bold"
onClick="return false" href="#" (click)="setMaxLimit()">{{'subsystemList.showAll' | translate}}</a>.
</p>
<p *ngIf="filteredSubsystems.value?.length">
<button type="button" [ngClass]="'btn btn-secondary'" (click)="scrollToTop()">{{'scrollToTop' | translate}}</button>
......
......@@ -167,6 +167,16 @@ describe('SubsystemListComponent', () => {
component.setInstanceVersion();
expect(TestBed.get(Router).navigateByUrl).toHaveBeenCalledWith('/INST');
});
it('setMaxLimit should work', () => {
fixture = TestBed.createComponent(SubsystemListComponent);
component = fixture.componentInstance;
component.search = TestBed.createComponent(SearchStubComponent).componentInstance;
fixture.detectChanges();
component.search.setLimit = jasmine.createSpy();
component.setMaxLimit();
expect(component.search.setLimit).toHaveBeenCalledWith('all');
});
});
describe('SubsystemListComponent (with instance version)', () => {
......
import { Component, OnInit, AfterViewInit, OnDestroy } from '@angular/core';
import { Component, OnInit, AfterViewInit, OnDestroy, ViewChild } from '@angular/core';
import { Subsystem } from '../subsystem';
import { SubsystemsService } from '../subsystems.service';
import { ActivatedRoute, Router, Scroll } from '@angular/router';
......@@ -6,6 +6,7 @@ import { Subscription, BehaviorSubject } from 'rxjs';
import { ViewportScroller } from '@angular/common';
import { filter } from 'rxjs/operators';
import { InstanceVersion } from '../instance-version';
import { SearchComponent } from './search/search.component';
@Component({
selector: 'app-subsystem-list',
......@@ -22,6 +23,8 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
instanceVersions: BehaviorSubject<InstanceVersion[]>;
instanceVersion: string;
@ViewChild(SearchComponent) search;
constructor(
private subsystemsService: SubsystemsService,
private route: ActivatedRoute,
......@@ -84,6 +87,10 @@ export class SubsystemListComponent implements OnInit, AfterViewInit, OnDestroy
this.subsystemsService.setInstance(this.subsystemsService.getInstance(), this.instanceVersion);
}
setMaxLimit() {
this.search.setLimit('all');
}
ngOnInit() {
// Reset message on page load
this.message = '';
......
......@@ -25,6 +25,7 @@
{{method.fullMethodName}}
<a href="{{getApiUrlBase()}}{{method.wsdl}}" class="badge badge-success"
*ngIf="method.wsdl" [target]="'_blank'">WSDL</a>
<span class="badge badge-info" *ngIf="method.methodStatus == 'REST'">REST</span>
<span class="badge badge-danger" *ngIf="method.methodStatus == 'ERROR'">{{'subsystem.statusWsdlError' | translate}}</span>
<span class="badge badge-danger" *ngIf="method.methodStatus == 'TIMEOUT'">{{'subsystem.statusWsdlTimeout' | translate}}</span>
<span class="badge badge-warning" *ngIf="method.methodStatus == 'SKIPPED'">{{'subsystem.statusWsdlSkipped' | translate}}</span>
......
......@@ -7,9 +7,9 @@
"50": 50
},
"INSTANCES": {
"EE": "https://www.x-tee.ee/catalogue/EE/wsdls/",
"ee-test": "https://www.x-tee.ee/catalogue/ee-test/wsdls/",
"ee-dev": "https://www.x-tee.ee/catalogue/ee-dev/wsdls/"
"EE": "https://www.x-tee.ee/catalogue-data/EE/",
"ee-test": "https://www.x-tee.ee/catalogue-data/EE/",
"ee-dev": "https://www.x-tee.ee/catalogue-data/EE/"
},
"API_SERVICE": "index.json",
"API_HISTORY": "history.json",
......
{
"index": {
"title": "X-tee Subsystems and Methods catalogue"
"title": "Catalogue of X-tee Subsystems and Methods"
},
"service": {
"dataLoadingError": "Error while loading data from server!"
"dataLoadingError": "Error while loading data from application server! Possible solution - please refresh your browser cache."
},
"subsystemList": {
"heading": "Catalogue of all X-tee subsystems with methods and WSDL descriptions",
"intro": {
"p1": "This catalogue is generated by making getWsdl requests from RIA's Monitoring Security Server to all X-tee subsystems.",
"p2": "Subsystems with the <span class=\"badge badge-secondary\">Empty</span> icon have no X-Tee services available.",
"p3": "Subsystems with the <span class=\"badge badge-danger\">Error</span> icon either could not be reached by RIA's Monitoring Security Server or there was some other error during the request.",
"p4": "Latest catalogue version in JSON form: <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON</a>",
"p1": "This catalogue is generated by making meta-query 'getWsdl' 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>"
},
"moreSubsystems": "To see more subsystems change amount of subsystems to display or filter by subsystem or service name.",
"selectInstance": "Select X-tee instance",
"selectVersion": "Select methods catalogue version",
"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",
"selectVersion": "Filter by version of catalogue",
"latestVersion": "Latest version"
},
"search": {
"searchFilters": "Search filters",
"nameFilter": "Filter by name",
"limit": "Amount of subsystems to display",
"nonEmpty": "Show only producer subsystems",
"nonEmpty": "Show only data producer subsystems",
"allOption": "All"
},
"subsystem": {
......@@ -35,10 +36,10 @@
"statusError": "Error",
"statusWsdlError": "Error while downloading or parsing of WSDL",
"statusWsdlTimeout": "WSDL query timed out",
"statusWsdlSkipped": "WSDL skipped due to previous Timeout",
"statusWsdlSkipped": "WSDL skipped due to previous timeout",
"allSystemsBtn": "Show all subsystems",
"statusErrorInfo": "Subsystem either could not be reached by RIA's Monitoring Security Server or there was some other error during the request.",
"statusEmptyInfo": "Subsystem does not have any methods.",
"statusErrorInfo": "Subsystem either could not be reached by RIA Monitoring Security Server or there was some other error during the request.",
"statusEmptyInfo": "Subsystem does not have any methods available.",
"moreMethods": "{{count}} more ...",
"incorrectInstanceWarning": "Incorrect instance!",
"subsystemNotFoundWarning": "Subsystem \"{{subsystem}}\" cannot be found!"
......
......@@ -3,31 +3,32 @@
"title": "X-tee alamsüsteemide ja teenuste kataloog"
},
"service": {
"dataLoadingError": "Viga andmete laadimisel serverist!"
"dataLoadingError": "Viga andmete laadimisel! Võimalik lahendus - palun värskendage sirviku vahemälu (refresh browser cache)."
},
"subsystemList": {
"heading": "X-tee alamsüsteemide kataloog teenuste ja WSDL kirjeldustega",
"intro": {
"p1": "Antud kataloog on genereeritud saates getWsdl päringud RIA monitooringu turvaserverist kõigi X-tee alamsüsteemide pihta.",
"p1": "Kataloog on genereeritud metapäringute 'getWsdl' 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": "Kõige värskem kataloogi versioon JSON kujul: <a href=\"{{jsonUrl}}\" target=\"_blank\">JSON</a>",
"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>"
},
"moreSubsystems": "Selleks, et näha rohkem alamsüsteeme, muutke alamsüsteemide näitamise piirangu või otsige alamsüsteemi või teenuse nime järgi.",
"selectInstance": "Vali X-tee instants",
"selectVersion": "Vali teenuste kataloogi versiooni",
"latestVersion": "Viimane versioon"
"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",
"latestVersion": "Värskeim versioon"
},
"search": {
"searchFilters": "Otsingu filtrid",
"nameFilter": "Filtreeri nime järgi",
"limit": "Alamsüsteemide näitamise piirang",
"limit": "Alamsüsteeme lehel",
"nonEmpty": "Näita vaid teenusepakkujaid",
"allOption": "Kõik"
},
"subsystem": {
"heading": "Alamsüsteem {{subsystem}} teenuste ja WSDL kirjeldustega X-tee instantsi \"{{instance}}\" jaoks",
"heading": "Alamsüsteem {{subsystem}} teenuste ja WSDL kirjeldustega X-tee keskkonna \"{{instance}}\" jaoks",
"intro": {
"p1": "Kasutajatugi: <a href=\"mailto:help@ria.ee\">help@ria.ee</a>"
},
......@@ -35,13 +36,13 @@
"statusError": "Viga",
"statusWsdlError": "Viga WSDL'i laadimisel või töötlemisel",
"statusWsdlTimeout": "WSDL'i laadimine aegus",
"statusWsdlSkipped": "Eelneva aegumise tõttu WSDL'i laadimine pole teostatud",
"statusWsdlSkipped": "WSDL'i ei laetud eelneva aegumise tõttu",
"allSystemsBtn": "Näita kõiki alamsüsteeme",
"statusErrorInfo": "Alamsüsteem kas ei ole ligipääsetav RIA monitooringu turvaserveri poolt, või päringu tegemisel ilmnes muu viga.",
"statusErrorInfo": "Alamsüsteem ei ole ligipääsetav RIA monitooringu turvaserveri poolt või ilmnes päringu tegemisel muu viga.",
"statusEmptyInfo": "Alamsüsteem ei oma X-tee teenuseid.",
"moreMethods": "veel {{count}} ...",
"incorrectInstanceWarning": "Vale instants!",
"subsystemNotFoundWarning": "Alamsüsteem \"{{subsystem}}\" ei ole leitud!"
"incorrectInstanceWarning": "Vale keskkond!",
"subsystemNotFoundWarning": "Alamsüsteemi \"{{subsystem}}\" ei leitud!"
},
"scrollToTop": "Lehe algusesse"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment