inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-10766] Remove js-api imports from core about module (#7947)

Browse Source 
* [AAE-10766] Remove js-api imports from core about module

* [AAE-10766] Nest RepositoryInfo interface in about component

* Add inline ModuleInfo in RepositoryInfo interface

Co-authored-by: Popovics András <popovicsandras@users.noreply.github.com>

* [AAE-10766] Fixed github auto commit suggestion

* try fix the testing lib issues

Co-authored-by: Popovics András <popovicsandras@users.noreply.github.com>
Co-authored-by: Denys Vuika <denys.vuika@gmail.com>
This commit is contained in:
Diogo Bastos 2022-11-08 17:57:04 +00:00 committed by GitHub
parent d571943274
commit e67b2aaed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/src/lib/about/about-module-list/module-list.component.ts
View File

@ -16,7 +16,11 @@
*/
import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input } from '@angular/core';
import { ModuleInfo } from '@alfresco/js-api';
interface ModuleInfo {
title: string;
version: string;
}
@Component({
selector: 'adf-about-module-list',

15
lib/core/src/lib/about/about-platform-version/about-platform-version.component.ts
View File

@ -16,13 +16,21 @@
*/
import { Component, Input, ViewEncapsulation } from '@angular/core';
import { RepositoryInfo } from '@alfresco/js-api';
import { Observable } from 'rxjs';
import { BpmProductVersionModel } from '../../models/product-version.model';
import { AaeInfoService, ActivitiDependencyInfo } from '../services/aae-info.service';
import { AppConfigService } from '../../app-config/app-config.service';
interface VersionInfo {
display: string;
}
interface RepositoryInfo {
edition: string;
version: VersionInfo;
}
@Component({
selector: 'adf-about-platform-version',
templateUrl: './about-platform-version.component.html',
@ -43,7 +51,10 @@ export class AboutPlatformVersionComponent {
rb$: Observable<ActivitiDependencyInfo>;
query$: Observable<ActivitiDependencyInfo>;
constructor(private aaeInfoService: AaeInfoService, private appConfigService: AppConfigService) {
constructor(
private aaeInfoService: AaeInfoService,
private appConfigService: AppConfigService
) {
this.modelingInfo();
this.deploymentInfo();
this.rbInfo();

4
lib/core/src/lib/about/about-server-settings/about-server-settings.component.ts
View File

@ -30,7 +30,7 @@ export class AboutServerSettingsComponent implements OnInit {
constructor(private appConfig: AppConfigService) {}
ngOnInit() {
this.ecmHost = this.appConfig.get<string>(AppConfigValues.ECMHOST);
this.bpmHost = this.appConfig.get<string>(AppConfigValues.BPMHOST);
this.ecmHost = this.appConfig.get(AppConfigValues.ECMHOST);
this.bpmHost = this.appConfig.get(AppConfigValues.BPMHOST);
}
}

34
lib/core/src/lib/about/about.component.ts
View File

@ -19,7 +19,6 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { AppExtensionService, ExtensionRef } from '@alfresco/adf-extensions';
import { Observable } from 'rxjs';
import { AppConfigService } from '../app-config/app-config.service';
import { RepositoryInfo } from '@alfresco/js-api';
import { BpmProductVersionModel } from '../models/product-version.model';
import { AuthenticationService } from '../services/authentication.service';
@ -28,6 +27,37 @@ import { LicenseData, PackageInfo, StatusData } from './interfaces';
import { ObjectUtils } from '../utils/object-utils';
import { StringUtils } from '../utils/string-utils';
interface RepositoryInfo {
status: {
isReadOnly: boolean;
isAuditEnabled: boolean;
isQuickShareEnabled: boolean;
isThumbnailGenerationEnabled: boolean;
isDirectAccessUrlEnabled: boolean;
};
edition: string;
version: {
display: string;
};
license?: {
issuedAt: Date;
expiresAt: Date;
remainingDays: number;
holder: string;
mode: string;
entitlements?: {
maxUsers?: number;
maxDocs?: number;
isClusterEnabled?: boolean;
isCryptodocEnabled?: boolean;
};
};
modules?: Array<{
title: string;
version: string;
}>;
}
@Component({
selector: 'adf-about',
templateUrl: './about.component.html',
@ -92,7 +122,7 @@ export class AboutComponent implements OnInit {
setECMInfo() {
this.discovery.getEcmProductInfo().subscribe((repository) => {
this.repository = repository;
this.repository = repository as RepositoryInfo;
this.statusEntries = Object.keys(repository.status).map((key) => ({
property: key,

5
scripts/ci/job_hooks/before_e2e.sh
View File

@ -3,4 +3,9 @@
# Download protractor-smartrunner artifact related to this particular job from S3, if exists
./scripts/ci/utils/artifact-from-s3.sh -a "$S3_SMART_RUNNER_PATH/$TRAVIS_JOB_ID.tar.bz2" -o "$SMART_RUNNER_DIRECTORY"
# The adf-testing is not installed through NPM for this reason it needs to be built
# in addition the dist folder needs to be moved as part of the node modules
# in this way the protractor.config.js can use require('@alfresco/adf-testing');
nx run testing:bundle
exit 0