about and package fixes (#1746)

This commit is contained in:
Denys Vuika
2020-10-15 11:24:10 +01:00
committed by GitHub
parent 20f1752b48
commit 84eb628ac7
3 changed files with 510 additions and 235 deletions

717
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
{ {
"name": "alfresco-content-app", "name": "alfresco-content-app",
"version": "2.1.0", "version": "2.1.0",
"commit": "<build-generated-commit>", "commit": "",
"license": "LGPL-3.0", "license": "LGPL-3.0",
"scripts": { "scripts": {
"postinstall": "ngcc", "postinstall": "ngcc",
@@ -34,7 +34,6 @@
"@alfresco/adf-core": "4.1.0", "@alfresco/adf-core": "4.1.0",
"@alfresco/adf-extensions": "4.1.0", "@alfresco/adf-extensions": "4.1.0",
"@alfresco/js-api": "4.1.0", "@alfresco/js-api": "4.1.0",
"@angular-custom-builders/lite-serve": "^0.2.2",
"@angular/animations": "10.0.4", "@angular/animations": "10.0.4",
"@angular/cdk": "^10.0.2", "@angular/cdk": "^10.0.2",
"@angular/common": "10.0.4", "@angular/common": "10.0.4",
@@ -54,23 +53,18 @@
"@ngrx/store": "^9.2.0", "@ngrx/store": "^9.2.0",
"@ngrx/store-devtools": "^9.2.0", "@ngrx/store-devtools": "^9.2.0",
"@ngx-translate/core": "^13.0.0", "@ngx-translate/core": "^13.0.0",
"browser-sync": "^2.26.12",
"chalk": "^4.1.0",
"http-server": "^0.12.3",
"inquirer": "^7.3.3",
"minimatch-browser": "^1.0.0", "minimatch-browser": "^1.0.0",
"moment": "^2.27.0", "moment": "^2.27.0",
"moment-es6": "1.0.0", "moment-es6": "1.0.0",
"ora": "^5.0.0",
"pdfjs-dist": "2.5.207", "pdfjs-dist": "2.5.207",
"rxjs": "^6.6.3", "rxjs": "^6.6.3",
"tslib": "^2.0.1", "tslib": "^2.0.1",
"winston": "^3.3.3",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "4.1.0", "@alfresco/adf-cli": "4.1.0",
"@alfresco/adf-testing": "4.1.0", "@alfresco/adf-testing": "4.1.0",
"@angular-custom-builders/lite-serve": "^0.2.2",
"@angular-devkit/build-angular": "~0.1001.4", "@angular-devkit/build-angular": "~0.1001.4",
"@angular-devkit/build-ng-packagr": "~0.1001.3", "@angular-devkit/build-ng-packagr": "~0.1001.3",
"@angular/cli": "^10.1.4", "@angular/cli": "^10.1.4",
@@ -84,13 +78,17 @@
"@types/superagent": "^4.1.10", "@types/superagent": "^4.1.10",
"adf-tslint-rules": "0.0.7", "adf-tslint-rules": "0.0.7",
"ajv-cli": "^3.3.0", "ajv-cli": "^3.3.0",
"browser-sync": "^2.26.12",
"chalk": "^4.1.0",
"codelyzer": "^6.0.1", "codelyzer": "^6.0.1",
"commander": "^6.1.0", "commander": "^6.1.0",
"connect-history-api-fallback": "^1.6.0", "connect-history-api-fallback": "^1.6.0",
"cpr": "^3.0.1", "cpr": "^3.0.1",
"cspell": "^4.1.0", "cspell": "^4.1.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"http-server": "^0.12.3",
"husky": "^4.3.0", "husky": "^4.3.0",
"inquirer": "^7.3.3",
"jasmine-core": "~3.6.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~6.0.0", "jasmine-spec-reporter": "~6.0.0",
"karma": "^5.2.3", "karma": "^5.2.3",
@@ -103,6 +101,7 @@
"lite-server": "^2.4.0", "lite-server": "^2.4.0",
"ng-packagr": "^10.1.2", "ng-packagr": "^10.1.2",
"node-stream-zip": "^1.11.3", "node-stream-zip": "^1.11.3",
"ora": "^5.1.0",
"prettier": "^2.1.2", "prettier": "^2.1.2",
"protractor": "^7.0.0", "protractor": "^7.0.0",
"protractor-retry": "^1.2.13", "protractor-retry": "^1.2.13",
@@ -118,7 +117,8 @@
"tslint-config-prettier": "^1.18.0", "tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.3.0", "tslint-plugin-prettier": "^2.3.0",
"typescript": "3.9.7", "typescript": "3.9.7",
"webdriver-manager": "12.1.7" "webdriver-manager": "12.1.7",
"winston": "^3.3.3"
}, },
"lint-staged": { "lint-staged": {
"*.{ts,js,css,scss,html}": [ "*.{ts,js,css,scss,html}": [

View File

@@ -30,6 +30,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared'; import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
import { dependencies, version, name, commit } from 'package.json'; import { dependencies, version, name, commit } from 'package.json';
@Component({ @Component({
selector: 'app-about', selector: 'app-about',
templateUrl: './about.component.html', templateUrl: './about.component.html',
@@ -44,7 +45,7 @@ export class AboutComponent implements OnInit {
statusEntries: Array<{ property: string; value: string }>; statusEntries: Array<{ property: string; value: string }>;
licenseEntries: Array<{ property: string; value: string }>; licenseEntries: Array<{ property: string; value: string }>;
adfRepoUrl = 'https://github.com/Alfresco/alfresco-ng2-components/commits'; adfRepoUrl = 'https://github.com/Alfresco/alfresco-ng2-components/commits';
appRepoUrl = `https://github.com/Alfresco/${name}/commits/${commit}`; appRepoUrl = !!commit ? `https://github.com/Alfresco/${name}/commits/${commit}` : null;
adfVersion = ''; adfVersion = '';
appVersion = version; appVersion = version;
@@ -57,7 +58,12 @@ export class AboutComponent implements OnInit {
if (key === '@alfresco/adf-core') { if (key === '@alfresco/adf-core') {
this.adfVersion = dependencies[key].split('-')[0]; this.adfVersion = dependencies[key].split('-')[0];
const adfCurrentCommit = dependencies[key].split('-')[1] || ''; const adfCurrentCommit = dependencies[key].split('-')[1] || '';
this.adfRepoUrl = this.adfRepoUrl.concat('/', adfCurrentCommit);
if (adfCurrentCommit) {
this.adfRepoUrl = this.adfRepoUrl.concat('/', adfCurrentCommit);
} else {
this.adfRepoUrl = null;
}
} }
return { return {
name: key, name: key,