diff --git a/demo-shell/src/app/components/about/about.component.html b/demo-shell/src/app/components/about/about.component.html
index 0bd13a53e3..a0ef038ca4 100644
--- a/demo-shell/src/app/components/about/about.component.html
+++ b/demo-shell/src/app/components/about/about.component.html
@@ -1,51 +1 @@
-
;
- constructor(appExtensions: AppExtensionService) {
- this.extensions$ = appExtensions.references$;
+ constructor() {
+
}
}
diff --git a/docs/core/components/about.component.md b/docs/core/components/about.component.md
index bcee338bdb..93ab208fac 100644
--- a/docs/core/components/about.component.md
+++ b/docs/core/components/about.component.md
@@ -10,10 +10,27 @@ Last reviewed: 2018-11-14
Shows a general version and status overview of the installed ADF library.
## Basic Usage
-
+With default input values
```html
```
+With custom input values:
+
+```html
+
+```
+
+### Properties
+
+| Name | Type | Default value | Description |
+| ---- | ---- | ------------- | ----------- |
+| githubUrlCommitAlpha | `string` | https://githubcom/Alfresco/alfresco-ng2-components/commits/ | Version of ADF to be used |
+| showExtensions | `boolean` | true | Parameter for hide or show extensions block |
+| regexp | `string` | ^(@alfresco) | Regular expression for filtering dependencies packages |
## Details
diff --git a/lib/core/about/about.component.html b/lib/core/about/about.component.html
index 7dfac38db3..a120358b73 100644
--- a/lib/core/about/about.component.html
+++ b/lib/core/about/about.component.html
@@ -1,4 +1,53 @@
+
+
{{ 'ABOUT.TITLE' | translate }}
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.ID' | translate }}
+ {{element.$id}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.NAME' | translate }}
+ {{element.$name}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.VERSION' | translate }}
+ {{element.$version}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.VENDOR' | translate }}
+ {{element.$vendor}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.LICENSE' | translate }}
+ {{element.$license}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.RUNTIME' | translate }}
+ {{element.$runtime}}
+
+
+
+
+ {{ 'ABOUT.TABLE_HEADERS.DESCRIPTION' | translate }}
+ {{element.$description}}
+
+
+
+
+
+
{{ 'ABOUT.SERVER_SETTINGS.TITLE' | translate }}
{{ 'ABOUT.SERVER_SETTINGS.DESCRIPTION' | translate }}
@@ -16,7 +65,8 @@
{{ 'ABOUT.VERSIONS.PROCESS_SERVICE' | translate }}
{{ bpmVersion.edition }}
- {{ bpmVersion.majorVersion }}.{{ bpmVersion.minorVersion }}.{{ bpmVersion.revisionVersion }}
+ {{ bpmVersion.majorVersion }}.{{
+ bpmVersion.minorVersion }}.{{ bpmVersion.revisionVersion }}
{{ 'ABOUT.VERSIONS.CONTENT_SERVICE' | translate }}
diff --git a/lib/core/about/about.component.ts b/lib/core/about/about.component.ts
index e3be18c2ad..a700f352cb 100644
--- a/lib/core/about/about.component.ts
+++ b/lib/core/about/about.component.ts
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation, Input } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { AuthenticationService } from '../services/authentication.service';
import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
import { DiscoveryApiService } from '../services/discovery-api.service';
import { ObjectDataTableAdapter } from '../datatable/data/object-datatable-adapter';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
+import { Observable } from 'rxjs';
+import { ExtensionRef, AppExtensionService } from '@alfresco/adf-extensions';
@Component({
selector: 'adf-about',
@@ -35,7 +37,11 @@ export class AboutComponent implements OnInit {
status: ObjectDataTableAdapter;
license: ObjectDataTableAdapter;
modules: ObjectDataTableAdapter;
- githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
+ extensionColumns: string[] = ['$id', '$name', '$version', '$vendor', '$license', '$runtime', '$description'];
+ extensions$: Observable;
+ @Input() githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
+ @Input() showExtensions = true;
+ @Input() regexp = '^(@alfresco)';
ecmHost = '';
bpmHost = '';
@@ -46,7 +52,9 @@ export class AboutComponent implements OnInit {
constructor(private http: HttpClient,
private appConfig: AppConfigService,
private authService: AuthenticationService,
- private discovery: DiscoveryApiService) {
+ private discovery: DiscoveryApiService,
+ appExtensions: AppExtensionService) {
+ this.extensions$ = appExtensions.references$;
}
ngOnInit() {
@@ -91,10 +99,9 @@ export class AboutComponent implements OnInit {
}
this.http.get('/versions.json?' + new Date()).subscribe((response: any) => {
- const regexp = new RegExp('^(@alfresco)');
const alfrescoPackages = Object.keys(response.dependencies).filter((val) => {
- return regexp.test(val);
+ return new RegExp(this.regexp).test(val);
});
const alfrescoPackagesTableRepresentation = [];