Fix build with unit tests

smp-angular/src/app/app.component.ts

@@ -5,7 +5,7 @@ import {Authority} from "./security/authority.model";
 import {AlertMessageService} from "./common/alert-message/alert-message.service";
 import {MatDialog} from "@angular/material/dialog";
 import {GlobalLookups} from "./common/global-lookups";
-import {UserController} from "./user/user-controller";
+import {UserController} from "./system-settings/user/user-controller";
 import {HttpClient} from "@angular/common/http";
 import {SidenavComponent} from "./window/sidenav/sidenav.component";
 import {ToolbarComponent} from "./window/toolbar/toolbar.component";

smp-angular/src/app/app.module.ts

@@ -18,7 +18,7 @@ import {CancelDialogComponent} from './common/dialogs/cancel-dialog/cancel-dialo
 import {CapitalizeFirstPipe} from './common/capitalize-first.pipe';
 import {CertificateDialogComponent} from "./common/dialogs/certificate-dialog/certificate-dialog.component";
 import {CertificatePanelComponent} from "./user-settings/user-certificates/certificate-panel/certificate-panel.component";
-import {CertificateService} from './user/certificate.service';
+import {CertificateService} from './system-settings/user/certificate.service';
 import {ClearInvalidDirective} from './custom-date/clear-invalid.directive';
 import {ColumnPickerComponent} from './common/column-picker/column-picker.component';
 import {ConfirmationDialogComponent} from './common/dialogs/confirmation-dialog/confirmation-dialog.component';
@@ -27,8 +27,8 @@ import {DatePipe} from './custom-date/date.pipe';
 import {DefaultPasswordDialogComponent} from './security/default-password-dialog/default-password-dialog.component';
 import {DialogComponent} from './common/dialogs/dialog/dialog.component';
 import {DirtyGuard} from './common/dirty.guard';
-import {DomainComponent} from './domain/domain.component';
-import {DomainDetailsDialogComponent} from './domain/domain-details-dialog/domain-details-dialog.component';
+import {DomainComponent} from './system-settings/domain/domain.component';
+import {DomainDetailsDialogComponent} from './system-settings/domain/domain-details-dialog/domain-details-dialog.component';
 import {DomainSelectorComponent} from './common/domain-selector/domain-selector.component';
 import {DomainService} from './security/domain.service';
 import {DownloadService} from './download/download.service';
@@ -42,9 +42,9 @@ import {HttpClient, HttpClientModule, HttpClientXsrfModule} from '@angular/commo
 import {HttpEventService} from './http/http-event.service';
 import {InformationDialogComponent} from "./common/dialogs/information-dialog/information-dialog.component";
 import {IsAuthorized} from './security/is-authorized.directive';
-import {KeystoreEditDialogComponent} from "./domain/keystore-edit-dialog/keystore-edit-dialog.component";
-import {KeystoreImportDialogComponent} from "./domain/keystore-import-dialog/keystore-import-dialog.component";
-import {KeystoreService} from "./domain/keystore.service";
+import {KeystoreEditDialogComponent} from "./system-settings/domain/keystore-edit-dialog/keystore-edit-dialog.component";
+import {KeystoreImportDialogComponent} from "./system-settings/domain/keystore-import-dialog/keystore-import-dialog.component";
+import {KeystoreService} from "./system-settings/domain/keystore.service";
 import {LoginComponent} from './login/login.component';
 import {MatButtonModule} from "@angular/material/button";
 import {MatCardModule} from "@angular/material/card";
@@ -73,8 +73,8 @@ import {NgModule} from '@angular/core';
 import {NgxDatatableModule} from '@swimlane/ngx-datatable';
 import {ObjectPropertiesDialogComponent} from "./common/dialogs/object-properties-dialog/object-properties-dialog.component";
 import {PasswordChangeDialogComponent} from "./common/dialogs/password-change-dialog/password-change-dialog.component";
-import {PropertyComponent} from "./property/property.component";
-import {PropertyDetailsDialogComponent} from "./property/property-details-dialog/property-details-dialog.component";
+import {PropertyComponent} from "./system-settings/property/property.component";
+import {PropertyDetailsDialogComponent} from "./system-settings/property/property-details-dialog/property-details-dialog.component";
 import {RowLimiterComponent} from './common/row-limiter/row-limiter.component';
 import {SaveDialogComponent} from './common/dialogs/save-dialog/save-dialog.component';
 import {SearchTableComponent} from './common/search-table/search-table.component';
@@ -88,22 +88,23 @@ import {ServiceGroupSearchComponent} from './service-group-search/service-group-
 import {ServiceMetadataWizardDialogComponent} from './service-group-edit/service-metadata-wizard-dialog/service-metadata-wizard-dialog.component';
 import {SharedModule} from './common/module/shared.module';
 import {SidenavComponent} from './window/sidenav/sidenav.component';
-import {SmlIntegrationService} from "./domain/sml-integration.service";
+import {SmlIntegrationService} from "./system-settings/domain/sml-integration.service";
 import {SmpInfoService} from './app-info/smp-info.service';
 import {SpacerComponent} from "./common/spacer/spacer.component";
 import {SpinnerComponent} from './common/spinner/spinner.component';
 import {ThemeService} from "./common/theme-service/theme.service";
 import {ToolbarComponent} from "./window/toolbar/toolbar.component";
-import {TruststoreEditDialogComponent} from "./user/truststore-edit-dialog/truststore-edit-dialog.component";
-import {TruststoreService} from "./user/truststore.service";
+import {TruststoreEditDialogComponent} from "./system-settings/user/truststore-edit-dialog/truststore-edit-dialog.component";
+import {TruststoreService} from "./system-settings/user/truststore.service";
 import {UserAccessTokensComponent} from "./user-settings/user-access-tokens/user-access-tokens.component";
 import {UserCertificatesComponent} from "./user-settings/user-certificates/user-certificates.component";
-import {UserComponent} from './user/user.component';
-import {UserDetailsDialogComponent} from './user/user-details-dialog/user-details-dialog.component';
-import {UserDetailsService} from './user/user-details-dialog/user-details.service';
+import {UserComponent} from './system-settings/user/user.component';
+import {UserDetailsDialogComponent} from './system-settings/user/user-details-dialog/user-details-dialog.component';
+import {UserDetailsService} from './system-settings/user/user-details-dialog/user-details.service';
 import {UserProfileComponent} from "./user-settings/user-profile/user-profile.component";
-import {UserService} from './user/user.service';
+import {UserService} from './system-settings/user/user.service';
 import {routing} from './app.routes';
+import {ExtensionComponent} from "./system-settings/extension/extension.component";
 
 
 @NgModule({
@@ -132,6 +133,7 @@ import {routing} from './app.routes';
     DomainDetailsDialogComponent,
     DomainSelectorComponent,
     ExpiredPasswordDialogComponent,
+    ExtensionComponent,
     FooterComponent,
     InformationDialogComponent,
     IsAuthorized,

smp-angular/src/app/app.routes.ts

@@ -2,17 +2,18 @@ import {RouterModule, Routes} from '@angular/router';
 import {LoginComponent} from './login/login.component';
 import {ServiceGroupSearchComponent} from './service-group-search/service-group-search.component';
 import {ServiceGroupEditComponent} from './service-group-edit/service-group-edit.component';
-import {DomainComponent} from './domain/domain.component';
+import {DomainComponent} from './system-settings/domain/domain.component';
 import {AuthenticatedGuard} from './guards/authenticated.guard';
-import {UserComponent} from './user/user.component';
+import {UserComponent} from './system-settings/user/user.component';
 import {DirtyGuard} from "./common/dirty.guard";
 import {AuthorizedAdminGuard} from "./guards/authorized-admin.guard";
 import {AlertComponent} from "./alert/alert.component";
-import {PropertyComponent} from "./property/property.component";
+import {PropertyComponent} from "./system-settings/property/property.component";
 import {UserProfileComponent} from "./user-settings/user-profile/user-profile.component";
-import { authGuard} from "./guards/auth.guard";
+import {authGuard} from "./guards/auth.guard";
 import {UserAccessTokensComponent} from "./user-settings/user-access-tokens/user-access-tokens.component";
 import {UserCertificatesComponent} from "./user-settings/user-certificates/user-certificates.component";
+import {ExtensionComponent} from "./system-settings/extension/extension.component";
 
 
 const appRoutes: Routes = [
@@ -20,32 +21,22 @@ const appRoutes: Routes = [
   {path: '', component: ServiceGroupSearchComponent},
   {path: 'search', redirectTo: ''},
   {path: 'edit', component: ServiceGroupEditComponent, canActivate: [AuthenticatedGuard], canDeactivate: [DirtyGuard]},
-  {
-    path: 'domain',
-    component: DomainComponent,
-    canActivate: [AuthenticatedGuard, AuthorizedAdminGuard],
-    canDeactivate: [DirtyGuard]
-  },
-  {
-    path: 'user',
-    component: UserComponent,
-    canActivate: [AuthenticatedGuard, AuthorizedAdminGuard],
-    canDeactivate: [DirtyGuard]
-  },
-  {
-    path: 'alert',
-    component: AlertComponent,
-    canActivate: [AuthenticatedGuard, AuthorizedAdminGuard],
-    canDeactivate: [DirtyGuard]
-  },
-  {
-    path: 'property',
-    component: PropertyComponent,
-    canActivate: [AuthenticatedGuard, AuthorizedAdminGuard],
-    canDeactivate: [DirtyGuard]
-  },
   {path: 'login', component: LoginComponent},
   {
+    path: 'system-settings',
+    canActivateChild: [authGuard],
+    canDeactivate: [DirtyGuard],
+    children: [
+      { path: 'domain', component: DomainComponent  },
+      { path: 'user', component: UserComponent  },
+      { path: 'properties', component: PropertyComponent  },
+      { path: 'keystore', component: DomainComponent  },
+      { path: 'truststore', component: DomainComponent  },
+      { path: 'extension', component: ExtensionComponent  },
+      { path: 'alert', component: AlertComponent  },
+    ]
+  },
+{
     path: 'user-settings',
     canActivateChild: [authGuard],
     children: [

smp-angular/src/app/common/dialogs/access-token-generation-dialog/access-token-generation-dialog.component.ts

@@ -3,7 +3,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms";
 import {User} from "../../../security/user.model";
 import {GlobalLookups} from "../../global-lookups";
-import {UserDetailsService} from "../../../user/user-details-dialog/user-details.service";
+import {UserDetailsService} from "../../../system-settings/user/user-details-dialog/user-details.service";
 import {AccessTokenRo} from "./access-token-ro.model";
 import {SecurityService} from "../../../security/security.service";
 import {SmpConstants} from "../../../smp.constants";

smp-angular/src/app/common/dialogs/certificate-dialog/certificate-dialog.component.ts

 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup} from "@angular/forms";
-import {CertificateRo} from "../../../user/certificate-ro.model";
+import {CertificateRo} from "../../../system-settings/user/certificate-ro.model";
 import {SecurityService} from "../../../security/security.service";
 import {SmpConstants} from "../../../smp.constants";
 

smp-angular/src/app/common/dialogs/credential-dialog/credential-dialog.component.ts

@@ -3,10 +3,10 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {FormBuilder, FormControl, FormGroup} from "@angular/forms";
 import {SmpConstants} from "../../../smp.constants";
 import {AccessTokenRo} from "../access-token-generation-dialog/access-token-ro.model";
-import {UserService} from "../../../user/user.service";
+import {UserService} from "../../../system-settings/user/user.service";
 import {Credential} from "../../../security/credential.model";
-import {CertificateRo} from "../../../user/certificate-ro.model";
-import {CertificateService} from "../../../user/certificate.service";
+import {CertificateRo} from "../../../system-settings/user/certificate-ro.model";
+import {CertificateService} from "../../../system-settings/user/certificate.service";
 
 
 @Component({

smp-angular/src/app/common/dialogs/password-change-dialog/password-change-dialog.component.ts

@@ -3,11 +3,11 @@ import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog
 import {AbstractControl, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, ValidatorFn, Validators} from "@angular/forms";
 import {User} from "../../../security/user.model";
 import {GlobalLookups} from "../../global-lookups";
-import {UserDetailsService} from "../../../user/user-details-dialog/user-details.service";
+import {UserDetailsService} from "../../../system-settings/user/user-details-dialog/user-details.service";
 import {AlertMessageService} from "../../alert-message/alert-message.service";
 import {SecurityService} from "../../../security/security.service";
 import {InformationDialogComponent} from "../information-dialog/information-dialog.component";
-import {UserRo} from "../../../user/user-ro.model";
+import {UserRo} from "../../../system-settings/user/user-ro.model";
 
 @Component({
   selector: 'smp-password-change-dialog',

smp-angular/src/app/login/login.component.ts

@@ -11,7 +11,7 @@ import {Subscription} from 'rxjs';
 import {ExpiredPasswordDialogComponent} from '../common/dialogs/expired-password-dialog/expired-password-dialog.component';
 import {GlobalLookups} from "../common/global-lookups";
 import {PasswordChangeDialogComponent} from "../common/dialogs/password-change-dialog/password-change-dialog.component";
-import {UserDetailsDialogMode} from "../user/user-details-dialog/user-details-dialog.component";
+import {UserDetailsDialogMode} from "../system-settings/user/user-details-dialog/user-details-dialog.component";
 import {InformationDialogComponent} from "../common/dialogs/information-dialog/information-dialog.component";
 import {DatePipe, formatDate} from "@angular/common";
 

smp-angular/src/app/security/credential.model.ts

 import {Authority} from "./authority.model";
 import {EntityStatus} from "../common/model/entity-status.model";
-import {CertificateRo} from "../user/certificate-ro.model";
+import {CertificateRo} from "../system-settings/user/certificate-ro.model";
 
 export interface Credential {
 

smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts

@@ -10,11 +10,11 @@ import {ServiceGroupEditRo} from "../service-group-edit-ro.model";
 import {GlobalLookups} from "../../common/global-lookups";
 import {ServiceGroupExtensionWizardDialogComponent} from "../service-group-extension-wizard-dialog/service-group-extension-wizard-dialog.component";
 import {ServiceGroupValidationRo} from "./service-group-validation-edit-ro.model";
-import {DomainRo} from "../../domain/domain-ro.model";
+import {DomainRo} from "../../system-settings/domain/domain-ro.model";
 import {ServiceGroupDomainEditRo} from "../service-group-domain-edit-ro.model";
 import {ConfirmationDialogComponent} from "../../common/dialogs/confirmation-dialog/confirmation-dialog.component";
 import {SecurityService} from "../../security/security.service";
-import {UserRo} from "../../user/user-ro.model";
+import {UserRo} from "../../system-settings/user/user-ro.model";
 import {ServiceGroupValidationErrorCodeModel} from "./service-group-validation-error-code.model";
 
 @Component({

smp-angular/src/app/service-group-edit/service-group-edit-ro.model.ts

 import {ServiceMetadataEditRo} from './service-metadata-edit-ro.model';
 import {SearchTableEntity} from "../common/search-table/search-table-entity.model";
-import {UserRo} from "../user/user-ro.model";
+import {UserRo} from "../system-settings/user/user-ro.model";
 import {ServiceGroupDomainEditRo} from "./service-group-domain-edit-ro.model";
 import {EntityStatus} from "../common/model/entity-status.model";
 

smp-angular/src/app/service-group-edit/service-metadata-wizard-dialog/service-metadata-wizard-dialog.component.ts

@@ -2,8 +2,8 @@ import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms";
 import {HttpClient} from "@angular/common/http";
-import {CertificateService} from "../../user/certificate.service";
-import {CertificateRo} from "../../user/certificate-ro.model";
+import {CertificateService} from "../../system-settings/user/certificate.service";
+import {CertificateRo} from "../../system-settings/user/certificate-ro.model";
 import {AlertMessageService} from "../../common/alert-message/alert-message.service";
 import {ServiceMetadataWizardRo} from "./service-metadata-wizard-edit-ro.model";
 import {GlobalLookups} from "../../common/global-lookups";

smp-angular/src/app/domain/domain-controller.ts → smp-angular/src/app/system-settings/domain/domain-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 {DomainDetailsDialogComponent} from './domain-details-dialog/domain-details-dialog.component';
 import {DomainRo} from './domain-ro.model';
-import {EntityStatus} from '../common/model/entity-status.model';
-import {GlobalLookups} from "../common/global-lookups";
+import {EntityStatus} from '../../common/model/entity-status.model';
+import {GlobalLookups} from "../../common/global-lookups";
 import {of} from "rxjs/internal/observable/of";
-import {SearchTableValidationResult} from "../common/search-table/search-table-validation-result.model";
-import {SearchTableEntity} from "../common/search-table/search-table-entity.model";
-import {SmpConstants} from "../smp.constants";
+import {SearchTableValidationResult} from "../../common/search-table/search-table-validation-result.model";
+import {SearchTableEntity} from "../../common/search-table/search-table-entity.model";
+import {SmpConstants} from "../../smp.constants";
 import {HttpClient} from "@angular/common/http";
 
 export class DomainController implements SearchTableController {

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

@@ -2,9 +2,9 @@ import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {AbstractControl, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms";
 import {DomainRo} from "../domain-ro.model";
-import {AlertMessageService} from "../../common/alert-message/alert-message.service";
-import {EntityStatus} from "../../common/model/entity-status.model";
-import {GlobalLookups} from "../../common/global-lookups";
+import {AlertMessageService} from "../../../common/alert-message/alert-message.service";
+import {EntityStatus} from "../../../common/model/entity-status.model";
+import {GlobalLookups} from "../../../common/global-lookups";
 import {CertificateRo} from "../../user/certificate-ro.model";
 import {BreakpointObserver} from "@angular/cdk/layout";
 

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

-import {SearchTableEntity} from '../common/search-table/search-table-entity.model';
+import {SearchTableEntity} from '../../common/search-table/search-table-entity.model';
 
 export interface DomainRo extends SearchTableEntity {
   domainCode: string;