This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch 2975-configurable-documentation-links
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/2975-configurable-documentation-links by this push:
new c87def4552 feat(#2975): Add documentation links to model, modify info
view
c87def4552 is described below
commit c87def4552f8f845741a0be954e42ad9280b2efb
Author: Dominik Riemer <[email protected]>
AuthorDate: Sat Jun 29 21:48:36 2024 +0200
feat(#2975): Add documentation links to model, modify info view
---
.../model/configuration/DefaultGeneralConfig.java | 17 +-
.../model/configuration/DefaultLinkSettings.java | 21 +-
.../configuration/DefaultSpCoreConfiguration.java | 2 +-
.../model/configuration/GeneralConfig.java | 9 +
.../model/configuration/LinkSettings.java | 16 +-
.../src/lib/model/gen/streampipes-model.ts | 71 +++----
ui/src/app/info/about/about.component.html | 198 ------------------
ui/src/app/info/info.component.html | 23 +--
ui/src/app/info/info.component.scss | 29 ---
ui/src/app/info/info.component.ts | 7 -
ui/src/app/info/info.module.ts | 11 +-
ui/src/app/info/license/license.component.html | 226 ---------------------
ui/src/app/info/license/license.component.scss | 23 ---
ui/src/app/info/versions/versions.component.html | 160 +++++++--------
ui/src/app/info/versions/versions.component.scss | 27 ---
ui/src/app/info/versions/versions.component.ts | 1 -
16 files changed, 151 insertions(+), 690 deletions(-)
diff --git a/ui/src/app/info/about/about.component.scss
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
similarity index 75%
rename from ui/src/app/info/about/about.component.scss
rename to
streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
index d7d2abed43..c0b97cfd22 100644
--- a/ui/src/app/info/about/about.component.scss
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
@@ -16,16 +16,13 @@
*
*/
-.about-logo {
- width: 300px;
-}
+package org.apache.streampipes.model.configuration;
-.about-container {
- margin-top: 20px;
- margin-left: auto;
- margin-right: auto;
-}
+public class DefaultGeneralConfig {
-.p-10 {
- padding: 10px;
+ public GeneralConfig make() {
+ var generalConfig = new GeneralConfig();
+ generalConfig.setLinkSettings(new DefaultLinkSettings().make());
+ return generalConfig;
+ }
}
diff --git a/ui/src/app/info/about/about.component.ts
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultLinkSettings.java
similarity index 75%
rename from ui/src/app/info/about/about.component.ts
rename to
streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultLinkSettings.java
index 9fc711462f..6165a601d6 100644
--- a/ui/src/app/info/about/about.component.ts
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultLinkSettings.java
@@ -16,13 +16,18 @@
*
*/
-import { Component } from '@angular/core';
+package org.apache.streampipes.model.configuration;
-@Component({
- selector: 'sp-about',
- templateUrl: './about.component.html',
- styleUrls: ['./about.component.scss'],
-})
-export class AboutComponent {
- constructor() {}
+public class DefaultLinkSettings {
+
+ public LinkSettings make() {
+ return new LinkSettings(
+ "https://streampipes.apache.org";,
+ "",
+ true,
+ true,
+ false,
+ true
+ );
+ }
}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultSpCoreConfiguration.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultSpCoreConfiguration.java
index 4f654bd992..b669b3e4b7 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultSpCoreConfiguration.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultSpCoreConfiguration.java
@@ -29,7 +29,7 @@ public class DefaultSpCoreConfiguration {
public SpCoreConfiguration make() {
var coreCfg = new SpCoreConfiguration();
- coreCfg.setGeneralConfig(new GeneralConfig());
+ coreCfg.setGeneralConfig(new DefaultGeneralConfig().make());
coreCfg.setMessagingSettings(new DefaultMessagingSettings().make());
coreCfg.setEmailConfig(EmailConfig.fromDefaults());
coreCfg.setEmailTemplateConfig(new
DefaultEmailTemplateConfiguration().getDefaultTemplates());
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
index 2f3968d966..188590a196 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
@@ -31,6 +31,7 @@ public class GeneralConfig {
private boolean allowPasswordRecovery;
private List<String> defaultUserRoles;
+ private LinkSettings linkSettings;
public GeneralConfig() {
}
@@ -104,4 +105,12 @@ public class GeneralConfig {
public void setAppName(String appName) {
this.appName = appName;
}
+
+ public LinkSettings getLinkSettings() {
+ return linkSettings;
+ }
+
+ public void setLinkSettings(LinkSettings linkSettings) {
+ this.linkSettings = linkSettings;
+ }
}
diff --git a/ui/src/app/info/license/license.component.ts
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/LinkSettings.java
similarity index 65%
rename from ui/src/app/info/license/license.component.ts
rename to
streampipes-model/src/main/java/org/apache/streampipes/model/configuration/LinkSettings.java
index a0acad09d8..3cb6fea9fc 100644
--- a/ui/src/app/info/license/license.component.ts
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/LinkSettings.java
@@ -16,13 +16,11 @@
*
*/
-import { Component } from '@angular/core';
+package org.apache.streampipes.model.configuration;
-@Component({
- selector: 'sp-license',
- templateUrl: './license.component.html',
- styleUrls: ['./license.component.scss'],
-})
-export class LicenseComponent {
- constructor() {}
-}
+public record LinkSettings(String documentationUrl,
+ String supportUrl,
+ boolean showDocumentationLinkOnStartScreen,
+ boolean showApiDocumentationLinkOnStartScreen,
+ boolean showSupportUrlOnStartScreen,
+ boolean showDocumentationLinkInProfileMenu) {}
diff --git
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
index dac76da020..e2a8c7bd0d 100644
---
a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model.ts
@@ -20,7 +20,7 @@
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
-// Generated using typescript-generator version 3.2.1263 on 2024-06-27
15:00:50.
+// Generated using typescript-generator version 3.2.1263 on 2024-06-29
13:34:41.
export class NamedStreamPipesEntity implements Storable {
'@class':
@@ -30,8 +30,8 @@ export class NamedStreamPipesEntity implements Storable {
| 'org.apache.streampipes.model.base.VersionedNamedStreamPipesEntity'
| 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
| 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
- | 'org.apache.streampipes.model.graph.DataProcessorInvocation'
- | 'org.apache.streampipes.model.graph.DataSinkInvocation';
+ | 'org.apache.streampipes.model.graph.DataSinkInvocation'
+ | 'org.apache.streampipes.model.graph.DataProcessorInvocation';
'appId': string;
'connectedTo': string[];
'description': string;
@@ -81,8 +81,8 @@ export class VersionedNamedStreamPipesEntity extends
NamedStreamPipesEntity {
| 'org.apache.streampipes.model.base.VersionedNamedStreamPipesEntity'
| 'org.apache.streampipes.model.connect.adapter.AdapterDescription'
| 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
- | 'org.apache.streampipes.model.graph.DataProcessorInvocation'
- | 'org.apache.streampipes.model.graph.DataSinkInvocation';
+ | 'org.apache.streampipes.model.graph.DataSinkInvocation'
+ | 'org.apache.streampipes.model.graph.DataProcessorInvocation';
'version': number;
static 'fromData'(
@@ -1169,8 +1169,8 @@ export class InvocableStreamPipesEntity
{
'@class':
| 'org.apache.streampipes.model.base.InvocableStreamPipesEntity'
- | 'org.apache.streampipes.model.graph.DataProcessorInvocation'
- | 'org.apache.streampipes.model.graph.DataSinkInvocation';
+ | 'org.apache.streampipes.model.graph.DataSinkInvocation'
+ | 'org.apache.streampipes.model.graph.DataProcessorInvocation';
'belongsTo': string;
'configured': boolean;
'correspondingPipeline': string;
@@ -1359,32 +1359,6 @@ export class EdgeValidationStatus {
}
}
-export class ElementComposition {
- description: string;
- name: string;
- sepas: DataProcessorInvocation[];
- streams: SpDataStream[];
-
- static fromData(
- data: ElementComposition,
- target?: ElementComposition,
- ): ElementComposition {
- if (!data) {
- return data;
- }
- const instance = target || new ElementComposition();
- instance.description = data.description;
- instance.name = data.name;
- instance.sepas = __getCopyArrayFn(DataProcessorInvocation.fromData)(
- data.sepas,
- );
- instance.streams = __getCopyArrayFn(SpDataStream.fromData)(
- data.streams,
- );
- return instance;
- }
-}
-
export interface EndpointSelectable {
correspondingPipeline: string;
detachPath: string;
@@ -1817,9 +1791,10 @@ export class FieldStatusInfo {
}
}
-export class FileMetadata {
+export class FileMetadata implements Storable {
createdAt: number;
createdByUser: string;
+ elementId: string;
fileId: string;
filename: string;
filetype: string;
@@ -1833,6 +1808,7 @@ export class FileMetadata {
const instance = target || new FileMetadata();
instance.createdAt = data.createdAt;
instance.createdByUser = data.createdByUser;
+ instance.elementId = data.elementId;
instance.fileId = data.fileId;
instance.filename = data.filename;
instance.filetype = data.filetype;
@@ -2447,18 +2423,24 @@ export class PageResult extends DataSeries {
}
}
-export class Pipeline extends ElementComposition {
+export class Pipeline implements Storable {
_id: string;
_rev: string;
actions: DataSinkInvocation[];
createdAt: number;
createdByUser: string;
+ description: string;
+ elementId: string;
healthStatus: PipelineHealthStatus;
+ name: string;
pipelineNotifications: string[];
publicElement: boolean;
restartOnSystemReboot: boolean;
+ rev: string;
running: boolean;
+ sepas: DataProcessorInvocation[];
startedAt: number;
+ streams: SpDataStream[];
valid: boolean;
static fromData(data: Pipeline, target?: Pipeline): Pipeline {
@@ -2466,7 +2448,6 @@ export class Pipeline extends ElementComposition {
return data;
}
const instance = target || new Pipeline();
- super.fromData(data, instance);
instance._id = data._id;
instance._rev = data._rev;
instance.actions = __getCopyArrayFn(DataSinkInvocation.fromData)(
@@ -2474,14 +2455,24 @@ export class Pipeline extends ElementComposition {
);
instance.createdAt = data.createdAt;
instance.createdByUser = data.createdByUser;
+ instance.description = data.description;
+ instance.elementId = data.elementId;
instance.healthStatus = data.healthStatus;
+ instance.name = data.name;
instance.pipelineNotifications =
__getCopyArrayFn(__identity<string>())(
data.pipelineNotifications,
);
instance.publicElement = data.publicElement;
instance.restartOnSystemReboot = data.restartOnSystemReboot;
+ instance.rev = data.rev;
instance.running = data.running;
+ instance.sepas = __getCopyArrayFn(DataProcessorInvocation.fromData)(
+ data.sepas,
+ );
instance.startedAt = data.startedAt;
+ instance.streams = __getCopyArrayFn(SpDataStream.fromData)(
+ data.streams,
+ );
instance.valid = data.valid;
return instance;
}
@@ -3562,8 +3553,9 @@ export class SpQueryResult {
}
}
-export class SpServiceConfiguration {
+export class SpServiceConfiguration implements Storable {
configs: ConfigItem[];
+ elementId: string;
rev: string;
serviceGroup: string;
serviceName: string;
@@ -3577,6 +3569,7 @@ export class SpServiceConfiguration {
}
const instance = target || new SpServiceConfiguration();
instance.configs = __getCopyArrayFn(ConfigItem.fromData)(data.configs);
+ instance.elementId = data.elementId;
instance.rev = data.rev;
instance.serviceGroup = data.serviceGroup;
instance.serviceName = data.serviceName;
@@ -3584,7 +3577,8 @@ export class SpServiceConfiguration {
}
}
-export class SpServiceRegistration {
+export class SpServiceRegistration implements Storable {
+ elementId: string;
firstTimeSeenUnhealthy: number;
healthCheckPath: string;
host: string;
@@ -3607,6 +3601,7 @@ export class SpServiceRegistration {
return data;
}
const instance = target || new SpServiceRegistration();
+ instance.elementId = data.elementId;
instance.firstTimeSeenUnhealthy = data.firstTimeSeenUnhealthy;
instance.healthCheckPath = data.healthCheckPath;
instance.host = data.host;
diff --git a/ui/src/app/info/about/about.component.html
b/ui/src/app/info/about/about.component.html
deleted file mode 100644
index 519957d526..0000000000
--- a/ui/src/app/info/about/about.component.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<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">
- <div class="assemblyOptions sp-blue-bg" style="padding: 5px">
- <h4>Resources</h4>
- </div>
- <div class="sp-blue-border p-10">
- <ul>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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>
- </div>
- </div>
- </li>
- </ul>
- </div>
- </div>
- <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">
- <ul>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <mat-icon>chat</mat-icon>
- </div>
- <div fxFlex="95" fxLayoutAlign="start center">
- <h5>
- Follow us on
- <a href="https://twitter.com/streampipes";
- >Twitter</a
- >
- and
- <a
-
href="https://www.linkedin.com/company/apache-streampipes";
- >LinkedIn</a
- >
- to get the latest news!
- </h5>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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
- >
- or get in touch with us via
- <a
-
href="https://github.com/apache/streampipes/discussions";
- >GitHub discussions</a
- >!
- </h5>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <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>
- </div>
- </div>
- </li>
- <li>
- <div fxLayout="row fill" fxFlex="100">
- <div fxFlex="5" fxLayoutAlign="start center">
- <mat-icon>bug_report</mat-icon>
- </div>
- <div fxFlex="95" fxLayoutAlign="start center">
- <h5>
- If you find a bug within StreamPipes, we
- welcome any report on that. Just file us an
- <a
-
href="https://github.com/apache/streampipes/issues/new/choose";
- >Github issue</a
- >
- with a description of the observed bug.
- </h5>
- </div>
- </div>
- </li>
- </ul>
- </div>
- </div>
- </div>
-</div>
diff --git a/ui/src/app/info/info.component.html
b/ui/src/app/info/info.component.html
index 3be56d585f..58f99d8e2f 100644
--- a/ui/src/app/info/info.component.html
+++ b/ui/src/app/info/info.component.html
@@ -16,23 +16,6 @@
~
-->
-<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-group>
- </div>
- <div class="container-fluid margin-top">
- <div *ngIf="currentTabIndex === 0">
- <sp-about></sp-about>
- </div>
- <div *ngIf="currentTabIndex === 1">
- <sp-versions></sp-versions>
- </div>
- <div *ngIf="currentTabIndex === 2">
- <sp-license></sp-license>
- </div>
- </div>
-</div>
+<sp-basic-view [showBackLink]="false" [padding]="true">
+ <sp-versions></sp-versions>
+</sp-basic-view>
diff --git a/ui/src/app/info/info.component.scss
b/ui/src/app/info/info.component.scss
deleted file mode 100644
index 06b4a2ecdf..0000000000
--- a/ui/src/app/info/info.component.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-.pageheadbar {
- padding: 0 0 0 10px;
- background-color: #f6f6f6;
- font-size: 14px;
- line-height: 24px;
- border-bottom: 1px solid #ccc;
-}
-
-.margin-top {
- margin-top: 5px;
-}
diff --git a/ui/src/app/info/info.component.ts
b/ui/src/app/info/info.component.ts
index b05a79be47..ca65ab3e08 100644
--- a/ui/src/app/info/info.component.ts
+++ b/ui/src/app/info/info.component.ts
@@ -22,18 +22,11 @@ import { SpBreadcrumbService } from
'@streampipes/shared-ui';
@Component({
templateUrl: './info.component.html',
- styleUrls: ['./info.component.scss'],
})
export class InfoComponent implements OnInit {
- currentTabIndex = 0;
-
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 e31210f93d..b69aaf94ec 100644
--- a/ui/src/app/info/info.module.ts
+++ b/ui/src/app/info/info.module.ts
@@ -30,10 +30,9 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { InfoComponent } from './info.component';
-import { LicenseComponent } from './license/license.component';
-import { AboutComponent } from './about/about.component';
import { VersionsComponent } from './versions/versions.component';
import { MatTabsModule } from '@angular/material/tabs';
+import { SharedUiModule } from '@streampipes/shared-ui';
@NgModule({
imports: [
@@ -48,13 +47,9 @@ import { MatTabsModule } from '@angular/material/tabs';
MatTooltipModule,
FormsModule,
MatDividerModule,
+ SharedUiModule,
],
- declarations: [
- InfoComponent,
- LicenseComponent,
- VersionsComponent,
- AboutComponent,
- ],
+ declarations: [InfoComponent, VersionsComponent],
providers: [],
})
export class InfoModule {}
diff --git a/ui/src/app/info/license/license.component.html
b/ui/src/app/info/license/license.component.html
deleted file mode 100644
index 030ea87aec..0000000000
--- a/ui/src/app/info/license/license.component.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-
-<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>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>
-
- <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>
-</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>
diff --git a/ui/src/app/info/license/license.component.scss
b/ui/src/app/info/license/license.component.scss
deleted file mode 100644
index 8fafb2eeac..0000000000
--- a/ui/src/app/info/license/license.component.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-.license-info {
- background: white;
- border-radius: 0px;
- border: 0px;
-}
diff --git a/ui/src/app/info/versions/versions.component.html
b/ui/src/app/info/versions/versions.component.html
index 1617b796c1..7272c2bb4a 100644
--- a/ui/src/app/info/versions/versions.component.html
+++ b/ui/src/app/info/versions/versions.component.html
@@ -16,91 +16,81 @@
~
-->
-<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">
- <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>
- </ul>
- </div>
+<div fxLayout="column" fxLayoutGap="10px">
+ <sp-basic-header-title-component
+ title="Info"
+ ></sp-basic-header-title-component>
+ <sp-basic-inner-panel panelTitle="Versions" fxFlex="90">
+ <div *ngIf="versionInfo">
+ <ul>
+ <li>
+ <div fxFlex="30">Backend Version</div>
+ <div fxFlex="70">{{ versionInfo.backendVersion }}</div>
+ </li>
+ </ul>
</div>
- <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>
- </ul>
- </div>
+ </sp-basic-inner-panel>
+ <sp-basic-inner-panel
+ panelTitle="System Info"
+ innerPadding="0"
+ outerMargin="0"
+ fxFlex="90"
+ >
+ <div *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>
+ </ul>
</div>
- </div>
+ </sp-basic-inner-panel>
</div>
diff --git a/ui/src/app/info/versions/versions.component.scss
b/ui/src/app/info/versions/versions.component.scss
deleted file mode 100644
index 0572bd7b90..0000000000
--- a/ui/src/app/info/versions/versions.component.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-.about-container {
- margin-top: 20px;
- margin-left: auto;
- margin-right: auto;
-}
-
-.md-padding {
- padding: 10px;
-}
diff --git a/ui/src/app/info/versions/versions.component.ts
b/ui/src/app/info/versions/versions.component.ts
index 08985b59bc..815f64e435 100644
--- a/ui/src/app/info/versions/versions.component.ts
+++ b/ui/src/app/info/versions/versions.component.ts
@@ -24,7 +24,6 @@ import { RestApi } from '../../services/rest-api.service';
@Component({
selector: 'sp-versions',
templateUrl: './versions.component.html',
- styleUrls: ['./versions.component.scss'],
})
export class VersionsComponent {
versionInfo: VersionInfo;
