Skip to content

Commit

Permalink
[ACS-7379] Break About Module dependency on Material Module (#9485)
Browse files Browse the repository at this point in the history
* refactor: convert About to Standalone, break Material Module dependency

* refactor: cleanup unused About mocks [ci:force]
  • Loading branch information
DenysVuika committed Mar 28, 2024
1 parent 88ebd22 commit 31bafc7
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 204 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

lint-staged
npx lint-staged
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,34 @@

import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input } from '@angular/core';
import { ExtensionRef } from '@alfresco/adf-extensions';
import { CommonModule } from '@angular/common';
import { MatTableModule } from '@angular/material/table';
import { TranslateModule } from '@ngx-translate/core';

@Component({
selector: 'adf-about-extension-list',
templateUrl: './about-extension-list.component.html',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
selector: 'adf-about-extension-list',
templateUrl: './about-extension-list.component.html',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [CommonModule, MatTableModule, TranslateModule]
})
export class AboutExtensionListComponent {
columns = [
{
columnDef: 'name',
header: 'ABOUT.PLUGINS.NAME',
cell: (row: ExtensionRef) => `${row.$name}`
},
{
columnDef: 'version',
header: 'ABOUT.PLUGINS.VERSION',
cell: (row: ExtensionRef) => `${row.$version}`
}
];
columns = [
{
columnDef: 'name',
header: 'ABOUT.PLUGINS.NAME',
cell: (row: ExtensionRef) => `${row.$name}`
},
{
columnDef: 'version',
header: 'ABOUT.PLUGINS.VERSION',
cell: (row: ExtensionRef) => `${row.$version}`
}
];

displayedColumns = this.columns.map((x) => x.columnDef);
displayedColumns = this.columns.map((x) => x.columnDef);

@Input()
data: Array<ExtensionRef> = [];
@Input()
data: Array<ExtensionRef> = [];
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@
*/

import { Component, Input, ViewEncapsulation } from '@angular/core';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatCardModule } from '@angular/material/card';

@Component({
selector: 'adf-about-github-link',
templateUrl: './about-github-link.component.html',
encapsulation: ViewEncapsulation.None
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [CommonModule, TranslateModule, MatCardModule]
})
export class AboutGithubLinkComponent {
/** Commit corresponding to the version of ADF to be used. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,18 @@

import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input } from '@angular/core';
import { LicenseData } from '../interfaces';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatTableModule } from '@angular/material/table';

@Component({
selector: 'adf-about-license-list',
templateUrl: './about-license-list.component.html',
styleUrls: ['./about-license-list.component.scss'],
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [CommonModule, TranslateModule, MatTableModule]
})
export class AboutLicenseListComponent {
columns = [
Expand Down
47 changes: 26 additions & 21 deletions lib/core/src/lib/about/about-module-list/module-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,39 @@
*/

import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatTableModule } from '@angular/material/table';

interface ModuleInfo {
title: string;
version: string;
title: string;
version: string;
}

@Component({
selector: 'adf-about-module-list',
templateUrl: './module-list.component.html',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
selector: 'adf-about-module-list',
templateUrl: './module-list.component.html',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [CommonModule, TranslateModule, MatTableModule]
})
export class ModuleListComponent {
columns = [
{
columnDef: 'title',
header: 'ABOUT.MODULES.NAME',
cell: (row: ModuleInfo) => `${row.title}`
},
{
columnDef: 'version',
header: 'ABOUT.MODULES.VERSION',
cell: (row: ModuleInfo) => `${row.version}`
}
];
columns = [
{
columnDef: 'title',
header: 'ABOUT.MODULES.NAME',
cell: (row: ModuleInfo) => `${row.title}`
},
{
columnDef: 'version',
header: 'ABOUT.MODULES.VERSION',
cell: (row: ModuleInfo) => `${row.version}`
}
];

displayedColumns = this.columns.map((x) => x.columnDef);
displayedColumns = this.columns.map((x) => x.columnDef);

@Input()
data: Array<ModuleInfo> = [];
@Input()
data: Array<ModuleInfo> = [];
}
70 changes: 37 additions & 33 deletions lib/core/src/lib/about/about-package/package-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,53 @@

import { Component, ChangeDetectionStrategy, Input, OnInit } from '@angular/core';
import { PackageInfo } from '../interfaces';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatTableModule } from '@angular/material/table';

@Component({
selector: 'adf-about-package-list',
templateUrl: './package-list.component.html',
styleUrls: ['./package-list.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
selector: 'adf-about-package-list',
templateUrl: './package-list.component.html',
styleUrls: ['./package-list.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [CommonModule, TranslateModule, MatTableModule]
})
export class PackageListComponent implements OnInit {
@Input()
dependencies: any;

@Input()
dependencies: any;
columns = [
{
columnDef: 'title',
header: 'ABOUT.PACKAGES.NAME',
cell: (row: PackageInfo) => `${row.name}`
},
{
columnDef: 'version',
header: 'ABOUT.PACKAGES.VERSION',
cell: (row: PackageInfo) => `${row.version}`
}
];

columns = [
{
columnDef: 'title',
header: 'ABOUT.PACKAGES.NAME',
cell: (row: PackageInfo) => `${row.name}`
},
{
columnDef: 'version',
header: 'ABOUT.PACKAGES.VERSION',
cell: (row: PackageInfo) => `${row.version}`
}
];

displayedColumns = this.columns.map((x) => x.columnDef);
displayedColumns = this.columns.map((x) => x.columnDef);

@Input()
data: Array<PackageInfo> = [];
@Input()
data: Array<PackageInfo> = [];

ngOnInit() {
const regexp = new RegExp('^(@alfresco)');
ngOnInit() {
const regexp = new RegExp('^(@alfresco)');

if (this.dependencies) {
const libs = Object.keys(this.dependencies).filter((val) => regexp.test(val));
this.data = [];
if (this.dependencies) {
const libs = Object.keys(this.dependencies).filter((val) => regexp.test(val));
this.data = [];

libs.forEach((val) => {
this.data.push({
name: val,
version: (this.dependencies[val])
libs.forEach((val) => {
this.data.push({
name: val,
version: this.dependencies[val]
});
});
});
}
}
}
}
3 changes: 2 additions & 1 deletion lib/core/src/lib/about/about-panel.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
import { ContentChild, Directive, Input, TemplateRef } from '@angular/core';

@Directive({
selector: 'adf-about-panel'
selector: 'adf-about-panel',
standalone: true
})
export class AboutPanelDirective {
@Input() label!: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ 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';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';

interface VersionInfo {
display: string;
Expand All @@ -34,10 +36,11 @@ interface RepositoryInfo {
@Component({
selector: 'adf-about-platform-version',
templateUrl: './about-platform-version.component.html',
encapsulation: ViewEncapsulation.None
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [CommonModule, TranslateModule]
})
export class AboutPlatformVersionComponent {

/** repository info. */
@Input()
repository: RepositoryInfo = null;
Expand All @@ -51,10 +54,7 @@ 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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,22 @@
* limitations under the License.
*/

import { Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import { ObjectUtils, StringUtils } from '../../common/utils';
import { LicenseData, StatusData } from '../interfaces';
import { RepositoryInfo } from './repository-info.interface';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { AboutLicenseListComponent } from '../about-license-list/about-license-list.component';
import { ModuleListComponent } from '../about-module-list/module-list.component';
import { AboutStatusListComponent } from '../about-status-list/about-status-list.component';

@Component({
selector: 'adf-about-repository-info',
templateUrl: './about-repository-info.component.html'
templateUrl: './about-repository-info.component.html',
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [CommonModule, TranslateModule, AboutLicenseListComponent, ModuleListComponent, AboutStatusListComponent]
})
export class AboutRepositoryInfoComponent implements OnInit {
@Input()
Expand All @@ -47,13 +55,13 @@ export class AboutRepositoryInfoComponent implements OnInit {
property: key,
value: ObjectUtils.booleanPrettify(repository.license[key], StringUtils.prettifyBooleanEnabled)
};
};
}

return {
property: key,
value: repository.license[key]
};
});
});
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@
* limitations under the License.
*/

import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatCardModule } from '@angular/material/card';

@Component({
selector: 'adf-about-server-settings',
templateUrl: './about-server-settings.component.html',
styleUrls: ['./about-server-settings.component.scss']
styleUrls: ['./about-server-settings.component.scss'],
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [CommonModule, TranslateModule, MatCardModule]
})
export class AboutServerSettingsComponent implements OnInit {
ecmHost = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@

import { Component, ViewEncapsulation, ChangeDetectionStrategy, Input } from '@angular/core';
import { StatusData } from '../interfaces';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { MatTableModule } from '@angular/material/table';

@Component({
selector: 'adf-about-status-list',
templateUrl: './about-status-list.component.html',
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [CommonModule, TranslateModule, MatTableModule]
})
export class AboutStatusListComponent {
columns = [
Expand Down
6 changes: 5 additions & 1 deletion lib/core/src/lib/about/about.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@

import { Component, ContentChildren, QueryList, ViewEncapsulation } from '@angular/core';
import { AboutPanelDirective } from './about-panel.directive';
import { CommonModule } from '@angular/common';
import { MatExpansionModule } from '@angular/material/expansion';

@Component({
selector: 'adf-about',
templateUrl: './about.component.html',
styleUrls: ['about.component.scss'],
encapsulation: ViewEncapsulation.None
encapsulation: ViewEncapsulation.None,
standalone: true,
imports: [CommonModule, MatExpansionModule]
})
export class AboutComponent {
@ContentChildren(AboutPanelDirective)
Expand Down

0 comments on commit 31bafc7

Please sign in to comment.