Fix build with unit tests

smp-angular/src/app/domain/domain.component.ts → smp-angular/src/app/system-settings/domain/domain.component.ts

@@ -7,21 +7,21 @@ import {
   TemplateRef,
   ViewChild
 } from '@angular/core';
-import {ColumnPicker} from '../common/column-picker/column-picker.model';
+import {ColumnPicker} from '../../common/column-picker/column-picker.model';
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 
-import {AlertMessageService} from '../common/alert-message/alert-message.service';
+import {AlertMessageService} from '../../common/alert-message/alert-message.service';
 import {DomainController} from './domain-controller';
 import {HttpClient} from '@angular/common/http';
-import {SmpConstants} from "../smp.constants";
-import {GlobalLookups} from "../common/global-lookups";
-import {SearchTableComponent} from "../common/search-table/search-table.component";
-import {SecurityService} from "../security/security.service";
+import {SmpConstants} from "../../smp.constants";
+import {GlobalLookups} from "../../common/global-lookups";
+import {SearchTableComponent} from "../../common/search-table/search-table.component";
+import {SecurityService} from "../../security/security.service";
 import {DomainRo} from "./domain-ro.model";
-import {ConfirmationDialogComponent} from "../common/dialogs/confirmation-dialog/confirmation-dialog.component";
-import {EntityStatus} from "../common/model/entity-status.model";
+import {ConfirmationDialogComponent} from "../../common/dialogs/confirmation-dialog/confirmation-dialog.component";
+import {EntityStatus} from "../../common/model/entity-status.model";
 import {KeystoreEditDialogComponent} from "./keystore-edit-dialog/keystore-edit-dialog.component";
-import {SmpInfoService} from "../app-info/smp-info.service";
+import {SmpInfoService} from "../../app-info/smp-info.service";
 import {SmlIntegrationService} from "./sml-integration.service";
 import {SMLResult} from "./sml-result.model";
 

smp-angular/src/app/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts → smp-angular/src/app/system-settings/domain/keystore-edit-dialog/keystore-edit-dialog.component.ts

 import {AfterViewChecked, AfterViewInit, ChangeDetectorRef, Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder} from "@angular/forms";
-import {AlertMessageService} from "../../common/alert-message/alert-message.service";
-import {GlobalLookups} from "../../common/global-lookups";
+import {AlertMessageService} from "../../../common/alert-message/alert-message.service";
+import {GlobalLookups} from "../../../common/global-lookups";
 import {HttpClient} from "@angular/common/http";
-import {SecurityService} from "../../security/security.service";
-import {CertificateDialogComponent} from "../../common/dialogs/certificate-dialog/certificate-dialog.component";
-import {ConfirmationDialogComponent} from "../../common/dialogs/confirmation-dialog/confirmation-dialog.component";
+import {SecurityService} from "../../../security/security.service";
+import {CertificateDialogComponent} from "../../../common/dialogs/certificate-dialog/certificate-dialog.component";
+import {ConfirmationDialogComponent} from "../../../common/dialogs/confirmation-dialog/confirmation-dialog.component";
 import {KeystoreImportDialogComponent} from "../keystore-import-dialog/keystore-import-dialog.component";
-import {InformationDialogComponent} from "../../common/dialogs/information-dialog/information-dialog.component";
+import {InformationDialogComponent} from "../../../common/dialogs/information-dialog/information-dialog.component";
 import {KeystoreService} from "../keystore.service";
 import {KeystoreResult} from "../keystore-result.model";
 

smp-angular/src/app/domain/keystore-import-dialog/keystore-import-dialog.component.ts → smp-angular/src/app/system-settings/domain/keystore-import-dialog/keystore-import-dialog.component.ts

 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms";
-import {AlertMessageService} from "../../common/alert-message/alert-message.service";
-import {GlobalLookups} from "../../common/global-lookups";
+import {AlertMessageService} from "../../../common/alert-message/alert-message.service";
+import {GlobalLookups} from "../../../common/global-lookups";
 import {CertificateService} from "../../user/certificate.service";
 import {CertificateRo} from "../../user/certificate-ro.model";
-import {SmpConstants} from "../../smp.constants";
+import {SmpConstants} from "../../../smp.constants";
 import {HttpClient, HttpHeaders, HttpParams} from "@angular/common/http";
-import {User} from "../../security/user.model";
-import {SecurityService} from "../../security/security.service";
+import {User} from "../../../security/user.model";
+import {SecurityService} from "../../../security/security.service";
 import {KeystoreResult} from "../keystore-result.model";
 import {KeystoreService} from "../keystore.service";
 

smp-angular/src/app/domain/keystore.service.ts → smp-angular/src/app/system-settings/domain/keystore.service.ts

@@ -2,9 +2,9 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 
 import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
-import {SmpConstants} from "../smp.constants";
-import {SecurityService} from "../security/security.service";
-import {User} from "../security/user.model";
+import {SmpConstants} from "../../smp.constants";
+import {SecurityService} from "../../security/security.service";
+import {User} from "../../security/user.model";
 import {KeystoreResult} from "./keystore-result.model";
 
 @Injectable()

smp-angular/src/app/domain/sml-integration.service.ts → smp-angular/src/app/system-settings/domain/sml-integration.service.ts

@@ -2,9 +2,9 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 
 import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
-import {SmpConstants} from "../smp.constants";
-import {SecurityService} from "../security/security.service";
-import {User} from "../security/user.model";
+import {SmpConstants} from "../../smp.constants";
+import {SecurityService} from "../../security/security.service";
+import {User} from "../../security/user.model";
 import {KeystoreResult} from "./keystore-result.model";
 import {SMLResult} from "./sml-result.model";
 

smp-angular/src/app/system-settings/extension/extension.component.css

+/* --- Select ---*/
+.mat-select{
+  padding:20px 0;
+}
+
+/* --- Button  ---*/
+.group-btn {
+   margin-top:20px;
+ }
+
+#hiddenButtonId {
+  position: fixed;
+}
+
+::ng-deep .missingKey {
+  text-decoration: line-through !important;
+  font-weight: bold;
+  color:red;
+}
+
+::ng-deep .domainWarning {
+  text-decoration: line-through !important;
+  font-weight: bold;
+  color:#c6c639;
+}
+
+::ng-deep .deleted  {
+  text-decoration: line-through !important;
+  font-weight: bold;
+}
+::ng-deep .table-row-new  {
+
+  color: darkgreen !important;
+  font-weight: bold;
+}
+::ng-deep .table-row-updated  {
+  font-weight: bold;
+}
+::ng-deep .table-row  {
+  font-weight: normal;
+}

smp-angular/src/app/system-settings/extension/extension.component.html

+<smp-search-table
+  #searchTable
+  page_id= 'extension_id'
+  [title]= "'Extensions'"
+  [columnPicker] = "columnPicker"
+  [url]="baseUrl"
+
+
+  [showSearchPanel]="false"
+  [filter]="filter"
+  [allowNewItems]="securityService.isCurrentUserSystemAdmin()"
+  [allowDeleteItems]="securityService.isCurrentUserSystemAdmin()"
+>
+
+  <ng-template #domainCodeColumnTemplate let-row="row" let-value="value"  ngx-datatable-cell-template>
+    <span [class]='aliasCssForDomainCodeClass(row)'   >{{value}}</span>
+  </ng-template>
+
+  <ng-template #certificateAliasTemplate let-row="row" let-value="value" ngx-datatable-cell-template>
+    <span [class]='aliasCssClass(value, row)'>{{value}}</span>
+  </ng-template>
+
+
+</smp-search-table>

smp-angular/src/app/system-settings/extension/extension.component.ts

+import {
+  AfterViewChecked,
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  OnInit,
+  TemplateRef,
+  ViewChild
+} from '@angular/core';
+import {ColumnPicker} from '../../common/column-picker/column-picker.model';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
+
+import {AlertMessageService} from '../../common/alert-message/alert-message.service';
+import {HttpClient} from '@angular/common/http';
+import {SmpConstants} from "../../smp.constants";
+import {GlobalLookups} from "../../common/global-lookups";
+import {SearchTableComponent} from "../../common/search-table/search-table.component";
+import {SecurityService} from "../../security/security.service";
+import {EntityStatus} from "../../common/model/entity-status.model";
+
+@Component({
+  moduleId: module.id,
+  templateUrl: './extension.component.html',
+  styleUrls: ['./extension.component.css']
+})
+export class ExtensionComponent implements OnInit, AfterViewInit, AfterViewChecked {
+
+  @ViewChild('rowMetadataAction') rowMetadataAction: TemplateRef<any>;
+  @ViewChild('certificateAliasTemplate') certificateAliasColumn: TemplateRef<any>;
+  @ViewChild('domainCodeColumnTemplate') domainCodeColumnTemplate: TemplateRef<any>;
+  @ViewChild('rowActions') rowActions: TemplateRef<any>;
+  @ViewChild('searchTable') searchTable: SearchTableComponent;
+
+
+  baseUrl = SmpConstants.REST_INTERNAL_DOMAIN_MANAGE;
+  columnPicker: ColumnPicker = new ColumnPicker();
+  filter: any = {};
+
+  constructor(public securityService: SecurityService,
+
+              protected lookups: GlobalLookups,
+              protected http: HttpClient,
+              protected alertService: AlertMessageService,
+              public dialog: MatDialog,
+              private changeDetector: ChangeDetectorRef) {
+
+    // check application settings
+
+
+  }
+
+  ngOnInit() {
+
+  }
+
+  initColumns() {
+    this.columnPicker.allColumns = [
+      {
+        name: 'Domain code',
+        title: "Unique domain code.",
+        prop: 'domainCode',
+        showInitially: true,
+        cellTemplate: this.domainCodeColumnTemplate,
+        width: 250
+
+      },
+      {
+        name: 'SML Domain',
+        title: "Informative: SML domain name.",
+        prop: 'smlSubdomain',
+        showInitially: true,
+      },
+      {
+        name: 'Signature CertAlias',
+        title: "Certificate for signing REST responses",
+        prop: 'signatureKeyAlias',
+        showInitially: true,
+        cellTemplate: this.certificateAliasColumn,
+        width: 150
+      },
+      {
+        name: 'SML SMP Id',
+        title: "SMP identifier for SML integration",
+        prop: 'smlSmpId',
+        showInitially: true,
+        width: 150
+      },
+      {
+        name: 'SML ClientCert Alias',
+        prop: 'smlClientKeyAlias',
+        showInitially: true,
+        cellTemplate: this.certificateAliasColumn,
+        width: 150
+      },
+      {
+        name: 'Is SML Registered',
+        prop: 'smlRegistered',
+        showInitially: true,
+        width: 120
+      },
+      {
+        name: 'SML ClientCert Auth.',
+        prop: 'smlClientCertAuth',
+        showInitially: true,
+        width: 130
+      },
+    ];
+    this.searchTable.tableColumnInit();
+  }
+
+  ngAfterViewChecked() {
+    this.changeDetector.detectChanges();
+  }
+
+  ngAfterViewInit() {
+    this.initColumns();
+    // if system admin refresh certificate list!
+    if (this.securityService.isCurrentUserSystemAdmin()) {
+      this.lookups.refreshCertificateLookup();
+    }
+  }
+
+  certificateAliasExists(alias: string): boolean {
+    if (alias) {
+      return this.lookups.cachedCertificateAliasList.includes(alias);
+    } else {
+      return false;
+    }
+  }
+
+  aliasCssClass(alias: string, row) {
+    if (!this.certificateAliasExists(alias)) {
+      return 'missingKey';
+    } else if (row.status === EntityStatus.NEW) {
+      return 'table-row-new';
+    } else if (row.status === EntityStatus.UPDATED) {
+      return 'table-row-updated';
+    } else if (row.status === EntityStatus.REMOVED) {
+      return 'deleted';
+    }
+  }
+
+  aliasCssForDomainCodeClass(domain) {
+    /*
+    let domainWarning = this.getDomainConfigurationWarning(domain)
+    if (!!domainWarning) {
+      return 'domainWarning';
+    } else if (domain.status === EntityStatus.NEW) {
+      return 'table-row-new';
+    } else if (domain.status === EntityStatus.UPDATED) {
+      return 'table-row-updated';
+    } else if (domain.status === EntityStatus.REMOVED) {
+      return 'deleted';
+    }
+
+     */
+  }
+
+
+  details(row: any) {
+
+  }
+
+  // for dirty guard...
+  isDirty(): boolean {
+    return this.searchTable.isDirty();
+  }
+
+}

smp-angular/src/app/property/property-controller.ts → smp-angular/src/app/system-settings/property/property-controller.ts

-import {SearchTableController} from '../common/search-table/search-table-controller';
+import {SearchTableController} from '../../common/search-table/search-table-controller';
 import {MatDialog, MatDialogConfig, MatDialogRef} from '@angular/material/dialog';
-import {GlobalLookups} from "../common/global-lookups";
-import {SearchTableEntity} from "../common/search-table/search-table-entity.model";
+import {GlobalLookups} from "../../common/global-lookups";
+import {SearchTableEntity} from "../../common/search-table/search-table-entity.model";
 import {HttpClient} from "@angular/common/http";
 import {DomainDetailsDialogComponent} from "../domain/domain-details-dialog/domain-details-dialog.component";
 import {PropertyDetailsDialogComponent} from "./property-details-dialog/property-details-dialog.component";

smp-angular/src/app/property/property-details-dialog/property-details-dialog.component.ts → smp-angular/src/app/system-settings/property/property-details-dialog/property-details-dialog.component.ts

@@ -2,11 +2,11 @@ import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup} from "@angular/forms";
 import {PropertyRo} from "../property-ro.model";
-import {AlertMessageService} from "../../common/alert-message/alert-message.service";
-import {EntityStatus} from "../../common/model/entity-status.model";
-import {ServiceGroupValidationRo} from "../../service-group-edit/service-group-details-dialog/service-group-validation-edit-ro.model";
-import {SmpConstants} from "../../smp.constants";
-import {ServiceGroupValidationErrorCodeModel} from "../../service-group-edit/service-group-details-dialog/service-group-validation-error-code.model";
+import {AlertMessageService} from "../../../common/alert-message/alert-message.service";
+import {EntityStatus} from "../../../common/model/entity-status.model";
+import {ServiceGroupValidationRo} from "../../../service-group-edit/service-group-details-dialog/service-group-validation-edit-ro.model";
+import {SmpConstants} from "../../../smp.constants";
+import {ServiceGroupValidationErrorCodeModel} from "../../../service-group-edit/service-group-details-dialog/service-group-validation-error-code.model";
 import {PropertyValidationRo} from "../property-validate-ro.model";
 import {HttpClient} from "@angular/common/http";