This is an automated email from the ASF dual-hosted git repository. bossenti pushed a commit to branch chore/formatting-linting-info in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit d6c6a88b2deb5cc51417ba8d574f1e8efad46223 Author: bossenti <[email protected]> AuthorDate: Fri Jan 20 21:40:16 2023 +0100 [#877] apply formatting and linting to info module --- ui/.eslintignore | 1 - ui/.prettierignore | 1 - ui/src/app/info/about/about.component.css | 10 +- ui/src/app/info/about/about.component.html | 87 ++++-- ui/src/app/info/about/about.component.ts | 10 +- ui/src/app/info/info.component.css | 4 +- ui/src/app/info/info.component.html | 17 +- ui/src/app/info/info.component.ts | 25 +- ui/src/app/info/info.module.ts | 9 +- ui/src/app/info/license/license.component.css | 2 +- ui/src/app/info/license/license.component.html | 348 ++++++++++++--------- ui/src/app/info/license/license.component.ts | 10 +- .../info/versions/service/version-info.model.ts | 12 +- ui/src/app/info/versions/versions.component.css | 8 +- ui/src/app/info/versions/versions.component.html | 91 ++++-- ui/src/app/info/versions/versions.component.ts | 26 +- 16 files changed, 394 insertions(+), 267 deletions(-) diff --git a/ui/.eslintignore b/ui/.eslintignore index c980966c1..fef9f9360 100644 --- a/ui/.eslintignore +++ b/ui/.eslintignore @@ -27,5 +27,4 @@ src/app/dashboard src/app/data-explorer src/app/editor src/app/files -src/app/info src/app/login diff --git a/ui/.prettierignore b/ui/.prettierignore index 3930e91ee..6839c40b1 100644 --- a/ui/.prettierignore +++ b/ui/.prettierignore @@ -27,5 +27,4 @@ src/app/dashboard src/app/data-explorer src/app/editor src/app/files -src/app/info src/app/login diff --git a/ui/src/app/info/about/about.component.css b/ui/src/app/info/about/about.component.css index c05e1cc37..d7d2abed4 100644 --- a/ui/src/app/info/about/about.component.css +++ b/ui/src/app/info/about/about.component.css @@ -17,15 +17,15 @@ */ .about-logo { - width:300px; + width: 300px; } .about-container { - margin-top:20px; - margin-left:auto; - margin-right:auto; + margin-top: 20px; + margin-left: auto; + margin-right: auto; } .p-10 { padding: 10px; -} \ No newline at end of file +} diff --git a/ui/src/app/info/about/about.component.html b/ui/src/app/info/about/about.component.html index f01a808c7..22111f186 100644 --- a/ui/src/app/info/about/about.component.html +++ b/ui/src/app/info/about/about.component.html @@ -16,16 +16,29 @@ ~ --> -<div fxLayout="row wrap" fxFlex="90" fxLayoutAlign="center center" - class="about-container"> - <div fxFlex="50" fxLayoutAlign="center center" fxLayout="column" - style="color:white;"><img - alt="icon" src="assets/img/sp/logo.png" class="about-logo"> +<div + fxLayout="row wrap" + fxFlex="90" + fxLayoutAlign="center center" + class="about-container" +> + <div + fxFlex="50" + fxLayoutAlign="center center" + fxLayout="column" + style="color: white" + > + <img alt="icon" src="assets/img/sp/logo.png" class="about-logo" /> </div> - <div fxFlex="100" fxLayout="row wrap" fxLayoutAlign="start stretch" style="margin-top:20px;"> + <div + fxFlex="100" + fxLayout="row wrap" + fxLayoutAlign="start stretch" + style="margin-top: 20px" + > <div fxFlex="100"> - <div class="assemblyOptions sp-blue-bg" style="padding:5px;"> + <div class="assemblyOptions sp-blue-bg" style="padding: 5px"> <h4>Resources</h4> </div> <div class="sp-blue-border p-10"> @@ -36,7 +49,12 @@ <mat-icon>description</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5>Find the documentation at <a href="https://streampipes.apache.org/docs/";>https://streampipes.apache.org/docs/</a> + <h5> + Find the documentation at + <a + href="https://streampipes.apache.org/docs/"; + >https://streampipes.apache.org/docs/</a + > </h5> </div> </div> @@ -47,8 +65,11 @@ <mat-icon>language</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5> Find our website at <a - href="https://streampipes.apache.org";>https://streampipes.apache.org</a> + <h5> + Find our website at + <a href="https://streampipes.apache.org"; + >https://streampipes.apache.org</a + > </h5> </div> </div> @@ -59,8 +80,12 @@ <mat-icon>code</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5> Find the source - code at <a href="https://github.com/apache/streampipes";>https://github.com/apache/streampipes</a> + <h5> + Find the source code at + <a + href="https://github.com/apache/streampipes"; + >https://github.com/apache/streampipes</a + > </h5> </div> </div> @@ -71,9 +96,12 @@ <mat-icon>local_shipping</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5> Find the docker - images at <a - href="https://hub.docker.com/u/apachestreampipes";>https://hub.docker.com/u/apachestreampipes</a> + <h5> + Find the docker images at + <a + href="https://hub.docker.com/u/apachestreampipes"; + >https://hub.docker.com/u/apachestreampipes</a + > </h5> </div> </div> @@ -81,8 +109,8 @@ </ul> </div> </div> - <div fxFlex="100" style="margin-top:10px;"> - <div class="assemblyOptions sp-blue-bg" style="padding:5px;"> + <div fxFlex="100" style="margin-top: 10px"> + <div class="assemblyOptions sp-blue-bg" style="padding: 5px"> <h4>Community & Support</h4> </div> <div class="sp-blue-border p-10"> @@ -93,8 +121,12 @@ <mat-icon>chat</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5>Follow us on <a - href="https://twitter.com/streampipes";>Twitter</a> to get the latest news! + <h5> + Follow us on + <a href="https://twitter.com/streampipes"; + >Twitter</a + > + to get the latest news! </h5> </div> </div> @@ -105,8 +137,12 @@ <mat-icon>email</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5>Drop us an email if you'd like to give <a - href="mailto:[email protected]";>feedback</a>! + <h5> + Drop us an email if you'd like to give + <a + href="mailto:[email protected]"; + >feedback</a + >! </h5> </div> </div> @@ -117,9 +153,12 @@ <mat-icon>star_rate</mat-icon> </div> <div fxFlex="95" fxLayoutAlign="start center"> - <h5>If you like - StreamPipes, give us a star on <a - href="https://github.com/apache/streampipes";>Github</a> + <h5> + If you like StreamPipes, give us a star on + <a + href="https://github.com/apache/streampipes"; + >Github</a + > </h5> </div> </div> diff --git a/ui/src/app/info/about/about.component.ts b/ui/src/app/info/about/about.component.ts index c85941558..8e76c7483 100644 --- a/ui/src/app/info/about/about.component.ts +++ b/ui/src/app/info/about/about.component.ts @@ -21,12 +21,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'sp-about', templateUrl: './about.component.html', - styleUrls: ['./about.component.css'] + styleUrls: ['./about.component.css'], }) -export class AboutComponent { - - constructor() { - - } - +export class AboutComponent { + constructor() {} } diff --git a/ui/src/app/info/info.component.css b/ui/src/app/info/info.component.css index fe85bb3a8..06b4a2ecd 100644 --- a/ui/src/app/info/info.component.css +++ b/ui/src/app/info/info.component.css @@ -25,5 +25,5 @@ } .margin-top { - margin-top:5px; -} \ No newline at end of file + margin-top: 5px; +} diff --git a/ui/src/app/info/info.component.html b/ui/src/app/info/info.component.html index 777645da5..3be56d585 100644 --- a/ui/src/app/info/info.component.html +++ b/ui/src/app/info/info.component.html @@ -19,25 +19,20 @@ <div class="page-container page-container-padding"> <div class="page-container-nav"> <mat-tab-group (selectedTabChange)="tabChanged($event)" color="accent"> - <mat-tab label="About"> - </mat-tab> - <mat-tab label="System Info"> - </mat-tab> - <mat-tab label="License"> - </mat-tab> - + <mat-tab label="About"> </mat-tab> + <mat-tab label="System Info"> </mat-tab> + <mat-tab label="License"> </mat-tab> </mat-tab-group> </div> <div class="container-fluid margin-top"> - <div *ngIf="currentTabIndex==0"> + <div *ngIf="currentTabIndex === 0"> <sp-about></sp-about> </div> - <div *ngIf="currentTabIndex==1"> + <div *ngIf="currentTabIndex === 1"> <sp-versions></sp-versions> </div> - <div *ngIf="currentTabIndex==2"> + <div *ngIf="currentTabIndex === 2"> <sp-license></sp-license> </div> </div> - </div> diff --git a/ui/src/app/info/info.component.ts b/ui/src/app/info/info.component.ts index 6a7c12196..a8438a719 100644 --- a/ui/src/app/info/info.component.ts +++ b/ui/src/app/info/info.component.ts @@ -21,24 +21,19 @@ import { MatTabChangeEvent } from '@angular/material/tabs'; import { SpBreadcrumbService } from '@streampipes/shared-ui'; @Component({ - templateUrl: './info.component.html', - styleUrls: ['./info.component.css'] + templateUrl: './info.component.html', + styleUrls: ['./info.component.css'], }) export class InfoComponent implements OnInit { + currentTabIndex = 0; - currentTabIndex = 0; - - constructor(private breadcrumbService: SpBreadcrumbService) { - - } - - ngOnInit() { - this.breadcrumbService.updateBreadcrumb([{label: 'Info'}]); - } - - tabChanged(tabChangeEvent: MatTabChangeEvent): void { - this.currentTabIndex = tabChangeEvent.index; - } + constructor(private breadcrumbService: SpBreadcrumbService) {} + ngOnInit() { + this.breadcrumbService.updateBreadcrumb([{ label: 'Info' }]); + } + tabChanged(tabChangeEvent: MatTabChangeEvent): void { + this.currentTabIndex = tabChangeEvent.index; + } } diff --git a/ui/src/app/info/info.module.ts b/ui/src/app/info/info.module.ts index 4f7efa8ce..733db7e4f 100644 --- a/ui/src/app/info/info.module.ts +++ b/ui/src/app/info/info.module.ts @@ -47,15 +47,14 @@ import { VersionsComponent } from './versions/versions.component'; MatTooltipModule, FormsModule, CustomMaterialModule, - MatDividerModule + MatDividerModule, ], declarations: [ InfoComponent, LicenseComponent, VersionsComponent, - AboutComponent + AboutComponent, ], - providers: [] + providers: [], }) -export class InfoModule { -} +export class InfoModule {} diff --git a/ui/src/app/info/license/license.component.css b/ui/src/app/info/license/license.component.css index 1b163bfca..8fafb2eea 100644 --- a/ui/src/app/info/license/license.component.css +++ b/ui/src/app/info/license/license.component.css @@ -20,4 +20,4 @@ background: white; border-radius: 0px; border: 0px; -} \ No newline at end of file +} diff --git a/ui/src/app/info/license/license.component.html b/ui/src/app/info/license/license.component.html index 412e53967..030ea87ae 100644 --- a/ui/src/app/info/license/license.component.html +++ b/ui/src/app/info/license/license.component.html @@ -18,157 +18,209 @@ <h1>Apache License, Version 2.0</h1> -<p>January 2004<br> - <a href="http://www.apache.org/licenses/";>http://www.apache.org/licenses/</a> </p> +<p> + January 2004<br /> + <a href="http://www.apache.org/licenses/"; + >http://www.apache.org/licenses/</a + > +</p> <p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p> -<p><strong><a name="definitions">1. Definitions</a></strong>.</p> -<p>"License" shall mean the terms and conditions for use, reproduction, and - distribution as defined by Sections 1 through 9 of this document.</p> -<p>"Licensor" shall mean the copyright owner or entity authorized by the - copyright owner that is granting the License.</p> -<p>"Legal Entity" shall mean the union of the acting entity and all other - entities that control, are controlled by, or are under common control with - that entity. For the purposes of this definition, "control" means (i) the - power, direct or indirect, to cause the direction or management of such - entity, whether by contract or otherwise, or (ii) ownership of fifty - percent (50%) or more of the outstanding shares, or (iii) beneficial - ownership of such entity.</p> -<p>"You" (or "Your") shall mean an individual or Legal Entity exercising - permissions granted by this License.</p> -<p>"Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation source, - and configuration files.</p> -<p>"Object" form shall mean any form resulting from mechanical transformation - or translation of a Source form, including but not limited to compiled - object code, generated documentation, and conversions to other media types.</p> -<p>"Work" shall mean the work of authorship, whether in Source or Object form, - made available under the License, as indicated by a copyright notice that - is included in or attached to the work (an example is provided in the - Appendix below).</p> -<p>"Derivative Works" shall mean any work, whether in Source or Object form, - that is based on (or derived from) the Work and for which the editorial - revisions, annotations, elaborations, or other modifications represent, as - a whole, an original work of authorship. For the purposes of this License, - Derivative Works shall not include works that remain separable from, or - merely link (or bind by name) to the interfaces of, the Work and Derivative - Works thereof.</p> -<p>"Contribution" shall mean any work of authorship, including the original - version of the Work and any modifications or additions to that Work or - Derivative Works thereof, that is intentionally submitted to Licensor for - inclusion in the Work by the copyright owner or by an individual or Legal - Entity authorized to submit on behalf of the copyright owner. For the - purposes of this definition, "submitted" means any form of electronic, - verbal, or written communication sent to the Licensor or its - representatives, including but not limited to communication on electronic - mailing lists, source code control systems, and issue tracking systems that - are managed by, or on behalf of, the Licensor for the purpose of discussing - and improving the Work, but excluding communication that is conspicuously - marked or otherwise designated in writing by the copyright owner as "Not a - Contribution."</p> -<p>"Contributor" shall mean Licensor and any individual or Legal Entity on - behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work.</p> -<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the - terms and conditions of this License, each Contributor hereby grants to You - a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, publicly - display, publicly perform, sublicense, and distribute the Work and such - Derivative Works in Source or Object form.</p> -<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms - and conditions of this License, each Contributor hereby grants to You a - perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, use, - offer to sell, sell, import, and otherwise transfer the Work, where such - license applies only to those patent claims licensable by such Contributor - that are necessarily infringed by their Contribution(s) alone or by - combination of their Contribution(s) with the Work to which such - Contribution(s) was submitted. If You institute patent litigation against - any entity (including a cross-claim or counterclaim in a lawsuit) alleging - that the Work or a Contribution incorporated within the Work constitutes - direct or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate as of the - date such litigation is filed.</p> -<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and - distribute copies of the Work or Derivative Works thereof in any medium, - with or without modifications, and in Source or Object form, provided that - You meet the following conditions:</p> -<ol style="list-style: lower-latin;"> - <li>You must give any other recipients of the Work or Derivative Works a - copy of this License; and</li> +<p> + <strong><a name="definitions">1. Definitions</a></strong + >. +</p> +<p> + "License" shall mean the terms and conditions for use, reproduction, and + distribution as defined by Sections 1 through 9 of this document. +</p> +<p> + "Licensor" shall mean the copyright owner or entity authorized by the + copyright owner that is granting the License. +</p> +<p> + "Legal Entity" shall mean the union of the acting entity and all other + entities that control, are controlled by, or are under common control with + that entity. For the purposes of this definition, "control" means (i) the + power, direct or indirect, to cause the direction or management of such + entity, whether by contract or otherwise, or (ii) ownership of fifty percent + (50%) or more of the outstanding shares, or (iii) beneficial ownership of + such entity. +</p> +<p> + "You" (or "Your") shall mean an individual or Legal Entity exercising + permissions granted by this License. +</p> +<p> + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation source, and + configuration files. +</p> +<p> + "Object" form shall mean any form resulting from mechanical transformation + or translation of a Source form, including but not limited to compiled + object code, generated documentation, and conversions to other media types. +</p> +<p> + "Work" shall mean the work of authorship, whether in Source or Object form, + made available under the License, as indicated by a copyright notice that is + included in or attached to the work (an example is provided in the Appendix + below). +</p> +<p> + "Derivative Works" shall mean any work, whether in Source or Object form, + that is based on (or derived from) the Work and for which the editorial + revisions, annotations, elaborations, or other modifications represent, as a + whole, an original work of authorship. For the purposes of this License, + Derivative Works shall not include works that remain separable from, or + merely link (or bind by name) to the interfaces of, the Work and Derivative + Works thereof. +</p> +<p> + "Contribution" shall mean any work of authorship, including the original + version of the Work and any modifications or additions to that Work or + Derivative Works thereof, that is intentionally submitted to Licensor for + inclusion in the Work by the copyright owner or by an individual or Legal + Entity authorized to submit on behalf of the copyright owner. For the + purposes of this definition, "submitted" means any form of electronic, + verbal, or written communication sent to the Licensor or its + representatives, including but not limited to communication on electronic + mailing lists, source code control systems, and issue tracking systems that + are managed by, or on behalf of, the Licensor for the purpose of discussing + and improving the Work, but excluding communication that is conspicuously + marked or otherwise designated in writing by the copyright owner as "Not a + Contribution." +</p> +<p> + "Contributor" shall mean Licensor and any individual or Legal Entity on + behalf of whom a Contribution has been received by Licensor and subsequently + incorporated within the Work. +</p> +<p> + <strong><a name="copyright">2. Grant of Copyright License</a></strong + >. Subject to the terms and conditions of this License, each Contributor + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable copyright license to reproduce, prepare Derivative + Works of, publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. +</p> +<p> + <strong><a name="patent">3. Grant of Patent License</a></strong + >. Subject to the terms and conditions of this License, each Contributor + hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable (except as stated in this section) patent license + to make, have made, use, offer to sell, sell, import, and otherwise transfer + the Work, where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their Contribution(s) + alone or by combination of their Contribution(s) with the Work to which such + Contribution(s) was submitted. If You institute patent litigation against + any entity (including a cross-claim or counterclaim in a lawsuit) alleging + that the Work or a Contribution incorporated within the Work constitutes + direct or contributory patent infringement, then any patent licenses granted + to You under this License for that Work shall terminate as of the date such + litigation is filed. +</p> +<p> + <strong><a name="redistribution">4. Redistribution</a></strong + >. You may reproduce and distribute copies of the Work or Derivative Works + thereof in any medium, with or without modifications, and in Source or + Object form, provided that You meet the following conditions: +</p> +<ol style="list-style: lower-latin"> + <li> + You must give any other recipients of the Work or Derivative Works a + copy of this License; and + </li> - <li>You must cause any modified files to carry prominent notices stating - that You changed the files; and</li> + <li> + You must cause any modified files to carry prominent notices stating + that You changed the files; and + </li> - <li>You must retain, in the Source form of any Derivative Works that You - distribute, all copyright, patent, trademark, and attribution notices from - the Source form of the Work, excluding those notices that do not pertain to - any part of the Derivative Works; and</li> - - <li>If the Work includes a "NOTICE" text file as part of its distribution, - then any Derivative Works that You distribute must include a readable copy - of the attribution notices contained within such NOTICE file, excluding - those notices that do not pertain to any part of the Derivative Works, in - at least one of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or documentation, - if provided along with the Derivative Works; or, within a display generated - by the Derivative Works, if and wherever such third-party notices normally - appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. You may add Your own attribution notices - within Derivative Works that You distribute, alongside or as an addendum to - the NOTICE text from the Work, provided that such additional attribution - notices cannot be construed as modifying the License. - <br/> - <br/> - You may add Your own copyright statement to Your modifications and may - provide additional or different license terms and conditions for use, - reproduction, or distribution of Your modifications, or for any such - Derivative Works as a whole, provided Your use, reproduction, and - distribution of the Work otherwise complies with the conditions stated in - this License. - </li> + <li> + You must retain, in the Source form of any Derivative Works that You + distribute, all copyright, patent, trademark, and attribution notices + from the Source form of the Work, excluding those notices that do not + pertain to any part of the Derivative Works; and + </li> + <li> + If the Work includes a "NOTICE" text file as part of its distribution, + then any Derivative Works that You distribute must include a readable + copy of the attribution notices contained within such NOTICE file, + excluding those notices that do not pertain to any part of the + Derivative Works, in at least one of the following places: within a + NOTICE text file distributed as part of the Derivative Works; within the + Source form or documentation, if provided along with the Derivative + Works; or, within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents of the + NOTICE file are for informational purposes only and do not modify the + License. You may add Your own attribution notices within Derivative + Works that You distribute, alongside or as an addendum to the NOTICE + text from the Work, provided that such additional attribution notices + cannot be construed as modifying the License. + <br /> + <br /> + You may add Your own copyright statement to Your modifications and may + provide additional or different license terms and conditions for use, + reproduction, or distribution of Your modifications, or for any such + Derivative Works as a whole, provided Your use, reproduction, and + distribution of the Work otherwise complies with the conditions stated + in this License. + </li> </ol> -<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You - explicitly state otherwise, any Contribution intentionally submitted for - inclusion in the Work by You to the Licensor shall be under the terms and - conditions of this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify the - terms of any separate license agreement you may have executed with Licensor - regarding such Contributions.</p> -<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant - permission to use the trade names, trademarks, service marks, or product - names of the Licensor, except as required for reasonable and customary use - in describing the origin of the Work and reproducing the content of the - NOTICE file.</p> -<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by - applicable law or agreed to in writing, Licensor provides the Work (and - each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, - without limitation, any warranties or conditions of TITLE, - NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You - are solely responsible for determining the appropriateness of using or - redistributing the Work and assume any risks associated with Your exercise - of permissions under this License.</p> -<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and - under no legal theory, whether in tort (including negligence), contract, or - otherwise, unless required by applicable law (such as deliberate and - grossly negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a result - of this License or out of the use or inability to use the Work (including - but not limited to damages for loss of goodwill, work stoppage, computer - failure or malfunction, or any and all other commercial damages or losses), - even if such Contributor has been advised of the possibility of such - damages.</p> -<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>. - While redistributing the Work or Derivative Works thereof, You may choose - to offer, and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this License. - However, in accepting such obligations, You may act only on Your own behalf - and on Your sole responsibility, not on behalf of any other Contributor, - and only if You agree to indemnify, defend, and hold each Contributor - harmless for any liability incurred by, or claims asserted against, such - Contributor by reason of your accepting any such warranty or additional - liability.</p> -<p>END OF TERMS AND CONDITIONS</p> \ No newline at end of file +<p> + <strong><a name="contributions">5. Submission of Contributions</a></strong + >. Unless You explicitly state otherwise, any Contribution intentionally + submitted for inclusion in the Work by You to the Licensor shall be under + the terms and conditions of this License, without any additional terms or + conditions. Notwithstanding the above, nothing herein shall supersede or + modify the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. +</p> +<p> + <strong><a name="trademarks">6. Trademarks</a></strong + >. This License does not grant permission to use the trade names, + trademarks, service marks, or product names of the Licensor, except as + required for reasonable and customary use in describing the origin of the + Work and reproducing the content of the NOTICE file. +</p> +<p> + <strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong + >. Unless required by applicable law or agreed to in writing, Licensor + provides the Work (and each Contributor provides its Contributions) on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + or implied, including, without limitation, any warranties or conditions of + TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR + PURPOSE. You are solely responsible for determining the appropriateness of + using or redistributing the Work and assume any risks associated with Your + exercise of permissions under this License. +</p> +<p> + <strong><a name="no-liability">8. Limitation of Liability</a></strong + >. In no event and under no legal theory, whether in tort (including + negligence), contract, or otherwise, unless required by applicable law (such + as deliberate and grossly negligent acts) or agreed to in writing, shall any + Contributor be liable to You for damages, including any direct, indirect, + special, incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the Work + (including but not limited to damages for loss of goodwill, work stoppage, + computer failure or malfunction, or any and all other commercial damages or + losses), even if such Contributor has been advised of the possibility of + such damages. +</p> +<p> + <strong + ><a name="additional" + >9. Accepting Warranty or Additional Liability</a + ></strong + >. While redistributing the Work or Derivative Works thereof, You may choose + to offer, and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this License. + However, in accepting such obligations, You may act only on Your own behalf + and on Your sole responsibility, not on behalf of any other Contributor, and + only if You agree to indemnify, defend, and hold each Contributor harmless + for any liability incurred by, or claims asserted against, such Contributor + by reason of your accepting any such warranty or additional liability. +</p> +<p>END OF TERMS AND CONDITIONS</p> diff --git a/ui/src/app/info/license/license.component.ts b/ui/src/app/info/license/license.component.ts index de723997e..d63434b62 100644 --- a/ui/src/app/info/license/license.component.ts +++ b/ui/src/app/info/license/license.component.ts @@ -21,12 +21,8 @@ import { Component } from '@angular/core'; @Component({ selector: 'sp-license', templateUrl: './license.component.html', - styleUrls: ['./license.component.css'] + styleUrls: ['./license.component.css'], }) -export class LicenseComponent { - - constructor() { - - } - +export class LicenseComponent { + constructor() {} } diff --git a/ui/src/app/info/versions/service/version-info.model.ts b/ui/src/app/info/versions/service/version-info.model.ts index 3efb89200..c1f4b3dcd 100644 --- a/ui/src/app/info/versions/service/version-info.model.ts +++ b/ui/src/app/info/versions/service/version-info.model.ts @@ -18,9 +18,11 @@ export interface VersionInfo { backendVersion: string; - itemVersions: [{ - itemType: string; - itemName: string; - itemVersion: string; - }]; + itemVersions: [ + { + itemType: string; + itemName: string; + itemVersion: string; + }, + ]; } diff --git a/ui/src/app/info/versions/versions.component.css b/ui/src/app/info/versions/versions.component.css index 25090d34f..0572bd7b9 100644 --- a/ui/src/app/info/versions/versions.component.css +++ b/ui/src/app/info/versions/versions.component.css @@ -17,11 +17,11 @@ */ .about-container { - margin-top:20px; - margin-left:auto; - margin-right:auto; + margin-top: 20px; + margin-left: auto; + margin-right: auto; } .md-padding { padding: 10px; -} \ No newline at end of file +} diff --git a/ui/src/app/info/versions/versions.component.html b/ui/src/app/info/versions/versions.component.html index c441ba967..1617b796c 100644 --- a/ui/src/app/info/versions/versions.component.html +++ b/ui/src/app/info/versions/versions.component.html @@ -16,38 +16,91 @@ ~ --> -<div fxLayout="row wrap" fxFlex="90" fxLayoutAlign="center center" - class="about-container"> - - <div fxFlex="100" fxLayout="row wrap" fxLayoutAlign="center center" style="margin-top:20px;"> +<div + fxLayout="row wrap" + fxFlex="90" + fxLayoutAlign="center center" + class="about-container" +> + <div + fxFlex="100" + fxLayout="row wrap" + fxLayoutAlign="center center" + style="margin-top: 20px" + > <div fxFlex="100"> - <div class="assemblyOptions sp-blue-bg" style="padding:5px;"> + <div class="assemblyOptions sp-blue-bg" style="padding: 5px"> <h4>Versions</h4> </div> <div class="sp-blue-border md-padding" *ngIf="versionInfo"> <ul> - <li><div fxFlex="30">Backend Version</div><div fxFlex="70">{{versionInfo.backendVersion}}</div></li> + <li> + <div fxFlex="30">Backend Version</div> + <div fxFlex="70">{{ versionInfo.backendVersion }}</div> + </li> </ul> </div> </div> - <div fxFlex="100" style="margin-top:10px;"> - <div class="assemblyOptions sp-blue-bg" style="padding:5px;"> + <div fxFlex="100" style="margin-top: 10px"> + <div class="assemblyOptions sp-blue-bg" style="padding: 5px"> <h4>System Info</h4> </div> <div class="sp-blue-border md-padding" *ngIf="systemInfo"> <ul> - <li><div fxFlex="30">Java VM Vendor</div><div fxFlex="70">{{systemInfo.javaVmVendor}}</div></li> - <li><div fxFlex="30">Java VM Name</div><div fxFlex="70">{{systemInfo.javaVmName}}</div></li> - <li><div fxFlex="30">Java VM Version</div><div fxFlex="70">{{systemInfo.javaVmVersion}}</div></li> - <li><div fxFlex="30">Java Runtime Name</div><div fxFlex="70">{{systemInfo.javaRuntimeName}}</div></li> - <li><div fxFlex="30">Java Runtime Version</div><div fxFlex="70">{{systemInfo.javaRuntimeVersion}}</div></li> - <li><div fxFlex="30">CPU</div><div fxFlex="70">{{systemInfo.cpu}}</div></li> - <li><div fxFlex="30">OS Name</div><div fxFlex="70">{{systemInfo.osName}}</div></li> - <li><div fxFlex="30">OS Version</div><div fxFlex="70">{{systemInfo.osVersion}}</div></li> - <li><div fxFlex="30">Total Memory</div><div fxFlex="70">{{systemInfo.totalMemory}} ({{systemInfo.totalMemoryKB}} KB)</div></li> - <li><div fxFlex="30">Free Memory</div><div fxFlex="70">{{systemInfo.freeMemory}} ({{systemInfo.freeMemoryKB}} KB)</div></li> + <li> + <div fxFlex="30">Java VM Vendor</div> + <div fxFlex="70">{{ systemInfo.javaVmVendor }}</div> + </li> + <li> + <div fxFlex="30">Java VM Name</div> + <div fxFlex="70">{{ systemInfo.javaVmName }}</div> + </li> + <li> + <div fxFlex="30">Java VM Version</div> + <div fxFlex="70">{{ systemInfo.javaVmVersion }}</div> + </li> + <li> + <div fxFlex="30">Java Runtime Name</div> + <div fxFlex="70">{{ systemInfo.javaRuntimeName }}</div> + </li> + <li> + <div fxFlex="30">Java Runtime Version</div> + <div fxFlex="70"> + {{ systemInfo.javaRuntimeVersion }} + </div> + </li> + <li> + <div fxFlex="30">CPU</div> + <div fxFlex="70">{{ systemInfo.cpu }}</div> + </li> + <li> + <div fxFlex="30">OS Name</div> + <div fxFlex="70">{{ systemInfo.osName }}</div> + </li> + <li> + <div fxFlex="30">OS Version</div> + <div fxFlex="70">{{ systemInfo.osVersion }}</div> + </li> + <li> + <div fxFlex="30">Total Memory</div> + <div fxFlex="70"> + {{ systemInfo.totalMemory }} ({{ + systemInfo.totalMemoryKB + }} + KB) + </div> + </li> + <li> + <div fxFlex="30">Free Memory</div> + <div fxFlex="70"> + {{ systemInfo.freeMemory }} ({{ + systemInfo.freeMemoryKB + }} + KB) + </div> + </li> </ul> </div> </div> </div> -</div> \ No newline at end of file +</div> diff --git a/ui/src/app/info/versions/versions.component.ts b/ui/src/app/info/versions/versions.component.ts index 06bb18c5c..7346088e7 100644 --- a/ui/src/app/info/versions/versions.component.ts +++ b/ui/src/app/info/versions/versions.component.ts @@ -24,10 +24,9 @@ import { RestApi } from '../../services/rest-api.service'; @Component({ selector: 'sp-versions', templateUrl: './versions.component.html', - styleUrls: ['./versions.component.css'] + styleUrls: ['./versions.component.css'], }) -export class VersionsComponent { - +export class VersionsComponent { versionInfo: VersionInfo; systemInfo: SystemInfo; @@ -37,21 +36,24 @@ export class VersionsComponent { } getVersionInfo(): void { - this.restApi.getVersionInfo() - .subscribe(response => { + this.restApi.getVersionInfo().subscribe( + response => { this.versionInfo = response as VersionInfo; - }, error => { + }, + error => { console.error(error); - }); + }, + ); } getSystemInfo(): void { - this.restApi.getSystemInfo() - .subscribe(response => { + this.restApi.getSystemInfo().subscribe( + response => { this.systemInfo = response as SystemInfo; - }, error => { + }, + error => { console.error(error); - }); + }, + ); } - }
