inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4816] Refactor About component (#5000)

Browse Source 
* [ADF-4816] Refactor About component

* Update package.json
This commit is contained in:
davidcanonieto
2019-08-19 15:29:16 +01:00
committed by Maurizio Vitale
parent f5c5e7cf9e
commit e7c0852051
8 changed files with 196 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
angular.json
View File

@@ -227,7 +227,8 @@
"./demo-shell/src/tsconfig.app.json"
],
"exclude": [
"**/node_modules/**/*"
"**/node_modules/**/*",
"package.json"
]
}
}
@@ -525,7 +526,8 @@
"./demo-shell/src/tsconfig.app.json"
],
"exclude": [
"**/node_modules/**/*"
"**/node_modules/**/*",
"package.json"
]
}
}

6
demo-shell/src/app/components/about/about.component.html
View File

@@ -1 +1,5 @@
<adf-about></adf-about>
<adf-about
[githubUrlCommitAlpha]="githubUrlCommitAlpha"
[version]="version"
[dependencies]="dependencies">
</adf-about>

5
demo-shell/src/app/components/about/about.component.ts
View File

@@ -16,6 +16,7 @@
*/
import { Component } from '@angular/core';
import { name, version, commit, dependencies } from '../../../../../package.json';
@Component({
selector: 'app-about-page',
@@ -24,6 +25,10 @@ import { Component } from '@angular/core';
})
export class AboutComponent {
githubUrlCommitAlpha = `https://github.com/Alfresco/${name}/commits/${commit}`;
version = version;
dependencies = dependencies;
constructor() {
}

1
demo-shell/tsconfig.json
View File

@@ -1,6 +1,7 @@
{
"compileOnSave": false,
"compilerOptions": {
"resolveJsonModule": true,
"outDir": "./dist/out-tsc",
"baseUrl": "src",
"sourceMap": true,

118
lib/core/about/about.component.html
View File

@@ -1,4 +1,74 @@
<div class="adf-about-container">
<h1>{{ application }}</h1>
<div>
<h3>{{ 'ABOUT.SOURCE_CODE.TITLE' | translate }}</h3>
<mat-card>
<p *ngIf="version">{{ 'ABOUT.VERSION' | translate }}: {{ version }}</p>
<div *ngIf="githubUrlCommitAlpha">
<small>{{ 'ABOUT.SOURCE_CODE.DESCRIPTION' | translate }}</small>
<div>
<a [href]="githubUrlCommitAlpha" target="_blank">{{githubUrlCommitAlpha}}</a>
</div>
</div>
</mat-card>
</div>
<h3>{{ 'ABOUT.SERVER_SETTINGS.TITLE' | translate }}</h3>
<small>{{ 'ABOUT.SERVER_SETTINGS.DESCRIPTION' | translate }}</small>
<mat-card>
<p>
{{ 'ABOUT.SERVER_SETTINGS.PROCESS_SERVICE_HOST' | translate: { value: bpmHost } }}
</p>
<p>
{{ 'ABOUT.SERVER_SETTINGS.CONTENT_SERVICE_HOST' | translate: { value: ecmHost } }}
</p>
</mat-card>
<h3>{{ 'ABOUT.VERSIONS.TITLE' | translate }}</h3>
<div *ngIf="bpmVersion">
<mat-card>
<div *ngIf="bpmVersion">
<h3>{{ 'ABOUT.VERSIONS.PROCESS_SERVICE' | translate }}</h3>
<p>
{{ 'ABOUT.VERSIONS.LABELS.EDITION' | translate }}: {{ bpmVersion.edition }}
</p>
<p>
{{ 'ABOUT.VERSIONS.LABELS.VERSION' | translate }}: {{ bpmVersion.majorVersion }}.{{
bpmVersion.minorVersion }}.{{ bpmVersion.revisionVersion }}
</p>
</div>
<div *ngIf="ecmVersion">
<h3>{{ 'ABOUT.VERSIONS.CONTENT_SERVICE' | translate }}</h3>
<p>
{{ 'ABOUT.VERSIONS.LABELS.EDITION' | translate }}: {{ ecmVersion.edition }}
</p>
<p>
{{ 'ABOUT.VERSIONS.LABELS.VERSION' | translate }}: {{ ecmVersion.version.display }}
</p>
</div>
</mat-card>
</div>
<div *ngIf="ecmVersion">
<h3>{{ 'ABOUT.VERSIONS.LABELS.LICENSE' | translate }}</h3>
<adf-datatable [data]="license"></adf-datatable>
<h3> {{ 'ABOUT.VERSIONS.LABELS.STATUS' | translate }}</h3>
<adf-datatable [data]="status"></adf-datatable>
<h3>{{ 'ABOUT.VERSIONS.LABELS.MODULES' | translate }}</h3>
<adf-datatable [data]="modules"></adf-datatable>
</div>
<h3>{{ 'ABOUT.PACKAGES.TITLE' | translate }}</h3>
<small>{{ 'ABOUT.PACKAGES.DESCRIPTION' | translate }}</small>
<adf-datatable [data]="dependencyEntries"></adf-datatable>
<div class="adf-extension-details-container" *ngIf="showExtensions">
<h3>{{ 'ABOUT.TITLE' | translate }}</h3>
<mat-table [dataSource]="extensions$ | async">
@@ -48,52 +118,4 @@
<mat-row *matRowDef="let row; columns: extensionColumns;"></mat-row>
</mat-table>
</div>
<h3>{{ 'ABOUT.SERVER_SETTINGS.TITLE' | translate }}</h3>
<mat-list>
<small>{{ 'ABOUT.SERVER_SETTINGS.DESCRIPTION' | translate }}</small>
<mat-list-item>
<h4 matLine> {{ 'ABOUT.SERVER_SETTINGS.PROCESS_SERVICE_HOST' | translate: { value: bpmHost } }}</h4>
</mat-list-item>
<mat-divider></mat-divider>
<mat-list-item>
<h4 matLine>{{ 'ABOUT.SERVER_SETTINGS.CONTENT_SERVICE_HOST' | translate: { value: ecmHost } }}</h4>
</mat-list-item>
</mat-list>
<h3>{{ 'ABOUT.VERSIONS.TITLE' | translate }}</h3>
<div *ngIf="bpmVersion">
<h3>{{ 'ABOUT.VERSIONS.PROCESS_SERVICE' | translate }}</h3>
<div> {{ 'ABOUT.VERSIONS.divS.EDITION' | translate }} </div> {{ bpmVersion.edition }}
<p></p>
<div> {{ 'ABOUT.VERSIONS.divS.VERSION' | translate }} </div> {{ bpmVersion.majorVersion }}.{{
bpmVersion.minorVersion }}.{{ bpmVersion.revisionVersion }}
</div>
<div *ngIf="ecmVersion">
<h3>{{ 'ABOUT.VERSIONS.CONTENT_SERVICE' | translate }}</h3>
<div>{{ 'ABOUT.VERSIONS.divS.EDITION' | translate }}</div> {{ ecmVersion.edition }}
<p></p>
<div> {{ 'ABOUT.VERSIONS.divS.VERSION' | translate }} </div> {{ ecmVersion.version.display }}
<p></p>
<h4>{{ 'ABOUT.VERSIONS.divS.LICENSE' | translate }}</h4>
<adf-datatable [data]="license"></adf-datatable>
<h4> {{ 'ABOUT.VERSIONS.divS.STATUS' | translate }}</h4>
<adf-datatable [data]="status"></adf-datatable>
<h4>{{ 'ABOUT.VERSIONS.divS.MODULES' | translate }}</h4>
<adf-datatable [data]="modules"></adf-datatable>
</div>
<div *ngIf="githubUrlCommitAlpha">
<h3>{{ 'ABOUT.SOURCE_CODE.TITLE' | translate }}</h3>
<small>{{ 'ABOUT.SOURCE_CODE.DESCRIPTION' | translate }}</small>
<div>
<a [href]="githubUrlCommitAlpha">{{githubUrlCommitAlpha}}</a>
</div>
</div>
<h3>{{ 'ABOUT.PACKAGES.TITLE' | translate }}</h3>
<small>{{ 'ABOUT.PACKAGES.DESCRIPTION' | translate }}</small>
<adf-datatable [data]="data"></adf-datatable>
</div>

91
lib/core/about/about.component.ts
View File

@@ -16,7 +16,6 @@
*/
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';
@@ -33,7 +32,7 @@ import { ExtensionRef, AppExtensionService } from '@alfresco/adf-extensions';
})
export class AboutComponent implements OnInit {
data: ObjectDataTableAdapter;
dependencyEntries: ObjectDataTableAdapter;
status: ObjectDataTableAdapter;
license: ObjectDataTableAdapter;
modules: ObjectDataTableAdapter;
@@ -51,23 +50,57 @@ export class AboutComponent implements OnInit {
/** Regular expression for filtering dependencies packages. */
@Input() regexp = '^(@alfresco)';
/** Current version of the app running */
@Input() version: string;
/** Current version of the app running */
@Input() dependencies: any;
ecmHost = '';
bpmHost = '';
application: string;
ecmVersion: EcmProductVersionModel = null;
bpmVersion: BpmProductVersionModel = null;
constructor(private http: HttpClient,
private appConfig: AppConfigService,
constructor(private appConfig: AppConfigService,
private authService: AuthenticationService,
private discovery: DiscoveryApiService,
appExtensions: AppExtensionService) {
this.extensions$ = appExtensions.references$;
this.ecmHost = this.appConfig.get<string>(AppConfigValues.ECMHOST);
this.bpmHost = this.appConfig.get<string>(AppConfigValues.BPMHOST);
this.application = this.appConfig.get<string>('application.name');
}
ngOnInit() {
if (this.authService.isEcmLoggedIn()) {
this.setECMInfo();
}
if (this.authService.isBpmLoggedIn()) {
this.setBPMInfo();
}
const alfrescoPackages = Object.keys(this.dependencies).filter((val) => {
return new RegExp(this.regexp).test(val);
});
const alfrescoPackagesTableRepresentation = [];
alfrescoPackages.forEach((val) => {
alfrescoPackagesTableRepresentation.push({
name: val,
version: (this.dependencies[val])
});
});
this.dependencyEntries = new ObjectDataTableAdapter(alfrescoPackagesTableRepresentation, [
{ type: 'text', key: 'name', title: 'Name', sortable: true },
{ type: 'text', key: 'version', title: 'Version', sortable: true }
]);
}
setECMInfo() {
this.discovery.getEcmProductInfo().subscribe((ecmVers) => {
this.ecmVersion = ecmVers;
@@ -150,51 +183,9 @@ export class AboutComponent implements OnInit {
});
}
if (this.authService.isBpmLoggedIn()) {
this.discovery.getBpmProductInfo().subscribe((bpmVers) => {
this.bpmVersion = bpmVers;
setBPMInfo() {
this.discovery.getBpmProductInfo().subscribe((bpmVersion) => {
this.bpmVersion = bpmVersion;
});
}
this.http.get('./versions.json?' + new Date()).subscribe((response: any) => {
const alfrescoPackages = Object.keys(response.dependencies).filter((val) => {
return new RegExp(this.regexp).test(val);
});
const alfrescoPackagesTableRepresentation = [];
alfrescoPackages.forEach((val) => {
alfrescoPackagesTableRepresentation.push({
name: val,
version: (response.dependencies[val].version || response.dependencies[val].required.version)
});
});
this.gitHubLinkCreation(alfrescoPackagesTableRepresentation);
this.data = new ObjectDataTableAdapter(alfrescoPackagesTableRepresentation, [
{ type: 'text', key: 'name', title: 'Name', sortable: true },
{ type: 'text', key: 'version', title: 'Version', sortable: true }
]);
});
this.ecmHost = this.appConfig.get<string>(AppConfigValues.ECMHOST);
this.bpmHost = this.appConfig.get<string>(AppConfigValues.BPMHOST);
}
private gitHubLinkCreation(alfrescoPackagesTableRepresentation): void {
const corePackage = alfrescoPackagesTableRepresentation.find((packageUp) => {
return packageUp.name === '@alfresco/adf-core';
});
if (corePackage) {
const commitIsh = corePackage.version.split('-');
if (commitIsh.length > 1) {
this.githubUrlCommitAlpha = this.githubUrlCommitAlpha + commitIsh[1];
} else {
this.githubUrlCommitAlpha = this.githubUrlCommitAlpha + corePackage.version;
}
}
}
}

1
lib/core/i18n/en.json
View File

@@ -386,6 +386,7 @@
}
},
"ABOUT": {
"VERSION": "Version",
"SERVER_SETTINGS": {
"TITLE": "Server settings",
"DESCRIPTION": "The values below are taken from the AppConfigService",

3
package.json
View File

@@ -1,5 +1,6 @@
{
"name": "alfresco-components",
"name": "alfresco-ng2-components",
"commit": "b644b39d17396330d2a67509f58c5b9e890b9b13",
"description": "Alfresco Angular components",
"version": "3.4.0",
"author": "Alfresco Software, Ltd.",