From 2722ec1413d7de25d3fa948876000ae843e0ab76 Mon Sep 17 00:00:00 2001
From: TINCU Sebastian-Ion <Sebastian-Ion.TINCU@ext.ec.europa.eu>
Date: Thu, 27 Sep 2018 11:27:30 +0200
Subject: [PATCH] EDELIVERY-3762 Clean the smp-angular project from domibus
object
Rename folders.
Replace occurrences of Domibus with SMP (SVG logo included).
---
.../src/app/app-info/smp-info.model.ts | 3 ++
.../smp-info.service.ts} | 14 ++++----
smp-angular/src/app/app.component.html | 2 +-
smp-angular/src/app/app.module.ts | 32 +++++++++----------
smp-angular/src/app/app.routes.ts | 4 +--
.../src/app/appinfo/domibus-info.model.ts | 3 --
.../search-table-controller.ts | 0
.../search-table-result.model.ts | 0
.../search-table.component.css | 0
.../search-table.component.html | 0
.../search-table.component.ts | 0
.../clear-invalid.directive.ts | 0
.../date-format.service.ts | 0
.../{customDate => custom-date}/date.pipe.ts | 0
.../src/app/domain/domain-controller.ts | 2 +-
.../src/app/footer/footer.component.css | 2 +-
.../src/app/footer/footer.component.html | 2 +-
.../src/app/footer/footer.component.ts | 12 +++----
smp-angular/src/app/login/login.component.ts | 2 +-
.../service-group-controller.ts | 10 +++---
...ervice-group-details-dialog.component.html | 0
...ice-group-details-dialog.component.spec.ts | 0
.../service-group-details-dialog.component.ts | 0
...vice-group-extension-dialog.component.html | 0
...e-group-extension-dialog.component.spec.ts | 0
...ervice-group-extension-dialog.component.ts | 0
...ervice-group-metadata-dialog.component.css | 0
...rvice-group-metadata-dialog.component.html | 0
...ce-group-metadata-dialog.component.spec.ts | 2 +-
...service-group-metadata-dialog.component.ts | 0
...-group-metadata-list-dialog.component.css} | 0
...group-metadata-list-dialog.component.html} | 0
...oup-metadata-list-dialog.component.spec.ts | 25 +++++++++++++++
...e-group-metadata-list-dialog.component.ts} | 12 +++----
.../service-group-ro-id.model.ts | 0
.../service-group-ro.model.ts | 0
.../service-group.component.css | 0
.../service-group.component.html | 0
.../service-group.component.ts | 2 +-
...roup-metadatalist-dialog.component.spec.ts | 25 ---------------
.../trust-store-dialog.component.html | 0
.../trust-store-dialog.component.spec.ts | 0
.../trust-store-dialog.component.ts | 0
.../trust-store-entry.model.ts | 0
.../trust-store-upload.component.html | 0
.../trust-store-upload.component.spec.ts | 0
.../trust-store-upload.component.ts | 0
.../trust-store.component.css | 0
.../trust-store.component.html | 0
.../trust-store.component.spec.ts | 0
.../trust-store.component.ts | 4 +--
.../trust-store.service.ts | 0
smp-angular/src/app/user/user-controller.ts | 2 +-
.../src/assets/images/smp_logo_icon.svg | 6 ++--
54 files changed, 83 insertions(+), 83 deletions(-)
create mode 100644 smp-angular/src/app/app-info/smp-info.model.ts
rename smp-angular/src/app/{appinfo/domibus-info.service.ts => app-info/smp-info.service.ts} (66%)
delete mode 100644 smp-angular/src/app/appinfo/domibus-info.model.ts
rename smp-angular/src/app/common/{searchtable => search-table}/search-table-controller.ts (100%)
rename smp-angular/src/app/common/{searchtable => search-table}/search-table-result.model.ts (100%)
rename smp-angular/src/app/common/{searchtable => search-table}/search-table.component.css (100%)
rename smp-angular/src/app/common/{searchtable => search-table}/search-table.component.html (100%)
rename smp-angular/src/app/common/{searchtable => search-table}/search-table.component.ts (100%)
rename smp-angular/src/app/{customDate => custom-date}/clear-invalid.directive.ts (100%)
rename smp-angular/src/app/{customDate => custom-date}/date-format.service.ts (100%)
rename smp-angular/src/app/{customDate => custom-date}/date.pipe.ts (100%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group-controller.ts (64%)
rename smp-angular/src/app/{servicegroup/servicegroup-details-dialog => service-group/service-group-details-dialog}/service-group-details-dialog.component.html (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-details-dialog => service-group/service-group-details-dialog}/service-group-details-dialog.component.spec.ts (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-details-dialog => service-group/service-group-details-dialog}/service-group-details-dialog.component.ts (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-extension-dialog => service-group/service-group-extension-dialog}/service-group-extension-dialog.component.html (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-extension-dialog => service-group/service-group-extension-dialog}/service-group-extension-dialog.component.spec.ts (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-extension-dialog => service-group/service-group-extension-dialog}/service-group-extension-dialog.component.ts (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadata-dialog => service-group/service-group-metadata-dialog}/service-group-metadata-dialog.component.css (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadata-dialog => service-group/service-group-metadata-dialog}/service-group-metadata-dialog.component.html (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadata-dialog => service-group/service-group-metadata-dialog}/service-group-metadata-dialog.component.spec.ts (92%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadata-dialog => service-group/service-group-metadata-dialog}/service-group-metadata-dialog.component.ts (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.css => service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.css} (100%)
rename smp-angular/src/app/{servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.html => service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.html} (100%)
create mode 100644 smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts
rename smp-angular/src/app/{servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts => service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts} (82%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group-ro-id.model.ts (100%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group-ro.model.ts (100%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group.component.css (100%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group.component.html (100%)
rename smp-angular/src/app/{servicegroup => service-group}/service-group.component.ts (94%)
delete mode 100644 smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts
rename smp-angular/src/app/{truststore/truststore-dialog => trust-store/trust-store-dialog}/trust-store-dialog.component.html (100%)
rename smp-angular/src/app/{truststore/truststore-dialog => trust-store/trust-store-dialog}/trust-store-dialog.component.spec.ts (100%)
rename smp-angular/src/app/{truststore/truststore-dialog => trust-store/trust-store-dialog}/trust-store-dialog.component.ts (100%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store-entry.model.ts (100%)
rename smp-angular/src/app/{truststore/truststore-upload => trust-store/trust-store-upload}/trust-store-upload.component.html (100%)
rename smp-angular/src/app/{truststore/truststore-upload => trust-store/trust-store-upload}/trust-store-upload.component.spec.ts (100%)
rename smp-angular/src/app/{truststore/truststore-upload => trust-store/trust-store-upload}/trust-store-upload.component.ts (100%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store.component.css (100%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store.component.html (100%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store.component.spec.ts (100%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store.component.ts (95%)
rename smp-angular/src/app/{truststore => trust-store}/trust-store.service.ts (100%)
diff --git a/smp-angular/src/app/app-info/smp-info.model.ts b/smp-angular/src/app/app-info/smp-info.model.ts
new file mode 100644
index 000000000..e9c3f36e5
--- /dev/null
+++ b/smp-angular/src/app/app-info/smp-info.model.ts
@@ -0,0 +1,3 @@
+export interface SmpInfo {
+ version: string;
+}
diff --git a/smp-angular/src/app/appinfo/domibus-info.service.ts b/smp-angular/src/app/app-info/smp-info.service.ts
similarity index 66%
rename from smp-angular/src/app/appinfo/domibus-info.service.ts
rename to smp-angular/src/app/app-info/smp-info.service.ts
index cd955d694..9f509c471 100644
--- a/smp-angular/src/app/appinfo/domibus-info.service.ts
+++ b/smp-angular/src/app/app-info/smp-info.service.ts
@@ -5,24 +5,24 @@ import "rxjs/add/operator/map";
import {Router} from "@angular/router";
import {HttpEventService} from "../http/http-event.service";
import {ReplaySubject} from "rxjs";
-import {DomibusInfo} from "./domibus-info.model";
+import {SmpInfo} from "./smp-info.model";
@Injectable()
-export class DomibusInfoService {
+export class SmpInfoService {
constructor(private http: Http, private router: Router) {
}
- getDomibusInfo(): Observable<DomibusInfo> {
+ getSmpInfo(): Observable<SmpInfo> {
let subject = new ReplaySubject();
this.http.get('rest/application/info')
.map((response: Response) => {
- const domibusInfo:DomibusInfo = { version: response.json().version };
- return domibusInfo;
+ const smpInfo: SmpInfo = { version: response.json().version };
+ return smpInfo;
})
- .subscribe((res: DomibusInfo) => {
+ .subscribe((res: SmpInfo) => {
subject.next(res);
}, (error: any) => {
- console.log("getDomibusInfo:" + error);
+ console.log("getSmpInfo:" + error);
// subject.next(null);
});
return subject.asObservable();
diff --git a/smp-angular/src/app/app.component.html b/smp-angular/src/app/app.component.html
index 83c3585fe..1aa6e50de 100644
--- a/smp-angular/src/app/app.component.html
+++ b/smp-angular/src/app/app.component.html
@@ -41,7 +41,7 @@
<div>
<img src="assets/images/EC+Logo2.png"/>
</div>
- <div class="domibusTextSmall"
+ <div class="smpTextSmall"
style="display: flex;flex-direction: column-reverse;text-align: left;color:#004494;padding-left: 5px;">
<div>
Connecting Europe
diff --git a/smp-angular/src/app/app.module.ts b/smp-angular/src/app/app.module.ts
index 36386ad02..c020feac1 100644
--- a/smp-angular/src/app/app.module.ts
+++ b/smp-angular/src/app/app.module.ts
@@ -36,39 +36,39 @@ import {AlertComponent} from "./alert/alert.component";
import {AlertService} from "./alert/alert.service";
import {FooterComponent} from "./footer/footer.component";
-import {DomibusInfoService} from "./appinfo/domibus-info.service";
+import {SmpInfoService} from "./app-info/smp-info.service";
import {AuthorizedAdminGuard} from "./guards/authorized-admin.guard";
-import {ServiceGroupComponent} from "./servicegroup/service-group.component";
+import {ServiceGroupComponent} from "./service-group/service-group.component";
import {DomainComponent} from "./domain/domain.component";
import {UserComponent} from "./user/user.component";
-import {TrustStoreComponent} from "./truststore/trust-store.component";
+import {TrustStoreComponent} from "./trust-store/trust-store.component";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
-import {ServiceGroupMetadatalistDialogComponent} from "./servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component";
+import {ServiceGroupMetadataListDialogComponent} from "./service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component";
import {RowLimiterComponent} from "./common/row-limiter/row-limiter.component";
-import {DatePipe} from "./customDate/date.pipe";
+import {DatePipe} from "./custom-date/date.pipe";
import {CapitalizeFirstPipe} from "./common/capitalize-first.pipe";
import {DefaultPasswordDialogComponent} from "./security/default-password-dialog/default-password-dialog.component";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup/servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group/service-group-details-dialog/service-group-details-dialog.component";
import {CancelDialogComponent} from "./common/cancel-dialog/cancel-dialog.component";
import {DirtyGuard} from "./common/dirty.guard";
import {SaveDialogComponent} from "./common/save-dialog/save-dialog.component";
-import {TrustStoreDialogComponent} from "./truststore/truststore-dialog/trust-store-dialog.component";
-import {TrustStoreUploadComponent} from "./truststore/truststore-upload/trust-store-upload.component";
+import {TrustStoreDialogComponent} from "./trust-store/trust-store-dialog/trust-store-dialog.component";
+import {TrustStoreUploadComponent} from "./trust-store/trust-store-upload/trust-store-upload.component";
import {ColumnPickerComponent} from "./common/column-picker/column-picker.component";
import {PageHelperComponent} from "./common/page-helper/page-helper.component";
import {SharedModule} from "./common/module/shared.module";
-import {ClearInvalidDirective} from "./customDate/clear-invalid.directive";
+import {ClearInvalidDirective} from "./custom-date/clear-invalid.directive";
import {PageHeaderComponent} from "./common/page-header/page-header.component";
import {DomainSelectorComponent} from "./common/domain-selector/domain-selector.component";
import {AlertsComponent} from "./alerts/alerts.component";
-import {SearchTableComponent} from "./common/searchtable/search-table.component";
-import {ServiceGroupExtensionDialogComponent} from "./servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadataDialogComponent} from "./servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component";
+import {SearchTableComponent} from "./common/search-table/search-table.component";
+import {ServiceGroupExtensionDialogComponent} from "./service-group/service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataDialogComponent} from "./service-group/service-group-metadata-dialog/service-group-metadata-dialog.component";
import {DomainDetailsDialogComponent} from "./domain/domain-details-dialog/domain-details-dialog.component";
import {UserDetailsDialogComponent} from "./user/user-details-dialog/user-details-dialog.component";
import {DownloadService} from "./download/download.service";
-import {TrustStoreService} from "./truststore/trust-store.service";
+import {TrustStoreService} from "./trust-store/trust-store.service";
export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions: RequestOptions, httpEventService: HttpEventService) {
return new ExtendedHttpClient(xhrBackend, requestOptions, httpEventService);
@@ -88,7 +88,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
IsAuthorized,
TrustStoreComponent,
SaveDialogComponent,
- ServiceGroupMetadatalistDialogComponent,
+ ServiceGroupMetadataListDialogComponent,
ServiceGroupMetadataDialogComponent,
ServiceGroupExtensionDialogComponent,
CancelDialogComponent,
@@ -111,7 +111,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
],
entryComponents: [
AppComponent,
- ServiceGroupMetadatalistDialogComponent,
+ ServiceGroupMetadataListDialogComponent,
ServiceGroupMetadataDialogComponent,
ServiceGroupDetailsDialogComponent,
ServiceGroupExtensionDialogComponent,
@@ -154,7 +154,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions
SecurityService,
SecurityEventService,
DomainService,
- DomibusInfoService,
+ SmpInfoService,
AlertService,
DownloadService,
TrustStoreService,
diff --git a/smp-angular/src/app/app.routes.ts b/smp-angular/src/app/app.routes.ts
index c1a87bf32..1fd5f20f5 100644
--- a/smp-angular/src/app/app.routes.ts
+++ b/smp-angular/src/app/app.routes.ts
@@ -1,11 +1,11 @@
import {RouterModule, Routes} from '@angular/router';
import {LoginComponent} from './login/login.component';
-import {ServiceGroupComponent} from './servicegroup/service-group.component';
+import {ServiceGroupComponent} from './service-group/service-group.component';
import {DomainComponent} from './domain/domain.component';
import {AuthenticatedGuard} from './guards/authenticated.guard';
import {AuthorizedAdminGuard} from './guards/authorized-admin.guard';
import {UserComponent} from './user/user.component';
-import {TrustStoreComponent} from 'app/truststore/trust-store.component';
+import {TrustStoreComponent} from 'app/trust-store/trust-store.component';
const appRoutes: Routes = [
diff --git a/smp-angular/src/app/appinfo/domibus-info.model.ts b/smp-angular/src/app/appinfo/domibus-info.model.ts
deleted file mode 100644
index a871d1ac6..000000000
--- a/smp-angular/src/app/appinfo/domibus-info.model.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface DomibusInfo {
- version: string;
-}
diff --git a/smp-angular/src/app/common/searchtable/search-table-controller.ts b/smp-angular/src/app/common/search-table/search-table-controller.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table-controller.ts
rename to smp-angular/src/app/common/search-table/search-table-controller.ts
diff --git a/smp-angular/src/app/common/searchtable/search-table-result.model.ts b/smp-angular/src/app/common/search-table/search-table-result.model.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table-result.model.ts
rename to smp-angular/src/app/common/search-table/search-table-result.model.ts
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.css b/smp-angular/src/app/common/search-table/search-table.component.css
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.css
rename to smp-angular/src/app/common/search-table/search-table.component.css
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.html b/smp-angular/src/app/common/search-table/search-table.component.html
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.html
rename to smp-angular/src/app/common/search-table/search-table.component.html
diff --git a/smp-angular/src/app/common/searchtable/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
similarity index 100%
rename from smp-angular/src/app/common/searchtable/search-table.component.ts
rename to smp-angular/src/app/common/search-table/search-table.component.ts
diff --git a/smp-angular/src/app/customDate/clear-invalid.directive.ts b/smp-angular/src/app/custom-date/clear-invalid.directive.ts
similarity index 100%
rename from smp-angular/src/app/customDate/clear-invalid.directive.ts
rename to smp-angular/src/app/custom-date/clear-invalid.directive.ts
diff --git a/smp-angular/src/app/customDate/date-format.service.ts b/smp-angular/src/app/custom-date/date-format.service.ts
similarity index 100%
rename from smp-angular/src/app/customDate/date-format.service.ts
rename to smp-angular/src/app/custom-date/date-format.service.ts
diff --git a/smp-angular/src/app/customDate/date.pipe.ts b/smp-angular/src/app/custom-date/date.pipe.ts
similarity index 100%
rename from smp-angular/src/app/customDate/date.pipe.ts
rename to smp-angular/src/app/custom-date/date.pipe.ts
diff --git a/smp-angular/src/app/domain/domain-controller.ts b/smp-angular/src/app/domain/domain-controller.ts
index 75659116b..b5b62d4a9 100644
--- a/smp-angular/src/app/domain/domain-controller.ts
+++ b/smp-angular/src/app/domain/domain-controller.ts
@@ -1,4 +1,4 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
import {MdDialog, MdDialogRef} from "@angular/material";
import {DomainDetailsDialogComponent} from "./domain-details-dialog/domain-details-dialog.component";
diff --git a/smp-angular/src/app/footer/footer.component.css b/smp-angular/src/app/footer/footer.component.css
index d06fb69f2..c7440cb2a 100644
--- a/smp-angular/src/app/footer/footer.component.css
+++ b/smp-angular/src/app/footer/footer.component.css
@@ -7,7 +7,7 @@
text-align: center;
}
-#footer .domibusVersion {
+#footer .smpVersion {
display: inline-block;
font-size: 15px;
}
diff --git a/smp-angular/src/app/footer/footer.component.html b/smp-angular/src/app/footer/footer.component.html
index 816b3d598..d12698f7b 100644
--- a/smp-angular/src/app/footer/footer.component.html
+++ b/smp-angular/src/app/footer/footer.component.html
@@ -1,3 +1,3 @@
<div id="footer">
- <span class="domibusVersion">{{domibusVersion}}</span>
+ <span class="smpVersion">{{smpVersion}}</span>
</div>
diff --git a/smp-angular/src/app/footer/footer.component.ts b/smp-angular/src/app/footer/footer.component.ts
index c4a38a733..044b7ce38 100644
--- a/smp-angular/src/app/footer/footer.component.ts
+++ b/smp-angular/src/app/footer/footer.component.ts
@@ -1,6 +1,6 @@
import {Component, OnInit} from "@angular/core";
-import {DomibusInfoService} from "../appinfo/domibus-info.service";
-import {DomibusInfo} from "../appinfo/domibus-info.model";
+import {SmpInfoService} from "../app-info/smp-info.service";
+import {SmpInfo} from "../app-info/smp-info.model";
@Component({
moduleId: module.id,
@@ -10,15 +10,15 @@ import {DomibusInfo} from "../appinfo/domibus-info.model";
})
export class FooterComponent implements OnInit {
- domibusVersion: string;
+ smpVersion: string;
- constructor(private domibusInfoService: DomibusInfoService) {
+ constructor(private smpInfoService: SmpInfoService) {
}
ngOnInit(): void {
console.log("FooterComponent onInit");
- this.domibusInfoService.getDomibusInfo().subscribe((domibusInfo: DomibusInfo) => {
- this.domibusVersion = domibusInfo.version;
+ this.smpInfoService.getSmpInfo().subscribe((smpInfo: SmpInfo) => {
+ this.smpVersion = smpInfo.version;
}
);
}
diff --git a/smp-angular/src/app/login/login.component.ts b/smp-angular/src/app/login/login.component.ts
index ed184568a..3bf655d89 100644
--- a/smp-angular/src/app/login/login.component.ts
+++ b/smp-angular/src/app/login/login.component.ts
@@ -73,7 +73,7 @@ export class LoginComponent implements OnInit, OnDestroy {
break;
case HTTP_GATEWAY_TIMEOUT:
case HTTP_NOTFOUND:
- message = "Unable to login. Domibus is not running.";
+ message = "Unable to login. SMP is not running.";
break;
default:
message = "Default error (" + error.status + ") occurred during login.";
diff --git a/smp-angular/src/app/servicegroup/service-group-controller.ts b/smp-angular/src/app/service-group/service-group-controller.ts
similarity index 64%
rename from smp-angular/src/app/servicegroup/service-group-controller.ts
rename to smp-angular/src/app/service-group/service-group-controller.ts
index aa970c27b..8dc516710 100644
--- a/smp-angular/src/app/servicegroup/service-group-controller.ts
+++ b/smp-angular/src/app/service-group/service-group-controller.ts
@@ -1,10 +1,10 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
import {MdDialog, MdDialogRef} from "@angular/material";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group-details-dialog/service-group-details-dialog.component";
import {Http} from "@angular/http";
import {AlertService} from "../alert/alert.service";
-import {ServiceGroupExtensionDialogComponent} from "./servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadatalistDialogComponent} from "./servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component";
+import {ServiceGroupExtensionDialogComponent} from "./service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataListDialogComponent} from "./service-group-metadata-list-dialog/service-group-metadata-list-dialog.component";
export class ServiceGroupController implements SearchTableController {
@@ -27,7 +27,7 @@ export class ServiceGroupController implements SearchTableController {
}
public showMetadataList(row: any) {
- let dialogRef: MdDialogRef<ServiceGroupMetadatalistDialogComponent> = this.dialog.open(ServiceGroupMetadatalistDialogComponent);
+ let dialogRef: MdDialogRef<ServiceGroupMetadataListDialogComponent> = this.dialog.open(ServiceGroupMetadataListDialogComponent);
// dialogRef.componentInstance.servicegroup = row;
dialogRef.afterClosed().subscribe(result => {
//Todo:
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.html b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.spec.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.ts b/smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-details-dialog/service-group-details-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-details-dialog/service-group-details-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.html b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.spec.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.ts b/smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-extension-dialog/service-group-extension-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-extension-dialog/service-group-extension-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.css b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.css
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.css
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.html b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.html
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
similarity index 92%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
index 76277ee70..86acc1f19 100644
--- a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.spec.ts
+++ b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ServiceGroupMetadataDialogComponent } from './service-group-metadata-dialog.component';
-describe('ServicegroupExtensionDialogComponent', () => {
+describe('ServiceGroupMetadataDialogComponent', () => {
let component: ServiceGroupMetadataDialogComponent;
let fixture: ComponentFixture<ServiceGroupMetadataDialogComponent>;
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.ts b/smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadata-dialog/service-group-metadata-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-metadata-dialog/service-group-metadata-dialog.component.ts
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.css b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.css
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.css
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.html b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.html
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.html
diff --git a/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts
new file mode 100644
index 000000000..d01831eaf
--- /dev/null
+++ b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ServiceGroupMetadataListDialogComponent } from './service-group-metadata-list-dialog.component';
+
+describe('ServiceGroupMetadataListDialogComponent', () => {
+ let component: ServiceGroupMetadataListDialogComponent;
+ let fixture: ComponentFixture<ServiceGroupMetadataListDialogComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ServiceGroupMetadataListDialogComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ServiceGroupMetadataListDialogComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
similarity index 82%
rename from smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts
rename to smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
index 68ce5d48f..617ca79f9 100644
--- a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.ts
+++ b/smp-angular/src/app/service-group/service-group-metadata-list-dialog/service-group-metadata-list-dialog.component.ts
@@ -3,15 +3,15 @@ import {MdDialog, MdDialogRef} from "@angular/material";
import {ColumnPicker} from "../../common/column-picker/column-picker.model";
import {ServiceGroupController} from "../service-group-controller";
import {RowLimiter} from "../../common/row-limiter/row-limiter.model";
-import {ServiceGroupExtensionDialogComponent} from "../servicegroup-extension-dialog/service-group-extension-dialog.component";
-import {ServiceGroupMetadataDialogComponent} from "../servicegroup-metadata-dialog/service-group-metadata-dialog.component";
+import {ServiceGroupExtensionDialogComponent} from "../service-group-extension-dialog/service-group-extension-dialog.component";
+import {ServiceGroupMetadataDialogComponent} from "../service-group-metadata-dialog/service-group-metadata-dialog.component";
@Component({
selector: 'app-messagelog-dialog',
- templateUrl: './service-group-metadatalist-dialog.component.html',
- styleUrls: ['./service-group-metadatalist-dialog.component.css']
+ templateUrl: './service-group-metadata-list-dialog.component.html',
+ styleUrls: ['./service-group-metadata-list-dialog.component.css']
})
-export class ServiceGroupMetadatalistDialogComponent implements OnInit {
+export class ServiceGroupMetadataListDialogComponent implements OnInit {
@ViewChild('rowActions') rowActions: TemplateRef<any>;
@@ -32,7 +32,7 @@ export class ServiceGroupMetadatalistDialogComponent implements OnInit {
messageResent = new EventEmitter(false);
- constructor(public dialogRef: MdDialogRef<ServiceGroupMetadatalistDialogComponent>, public dialog: MdDialog) {
+ constructor(public dialogRef: MdDialogRef<ServiceGroupMetadataListDialogComponent>, public dialog: MdDialog) {
}
ngOnInit() {
diff --git a/smp-angular/src/app/servicegroup/service-group-ro-id.model.ts b/smp-angular/src/app/service-group/service-group-ro-id.model.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group-ro-id.model.ts
rename to smp-angular/src/app/service-group/service-group-ro-id.model.ts
diff --git a/smp-angular/src/app/servicegroup/service-group-ro.model.ts b/smp-angular/src/app/service-group/service-group-ro.model.ts
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group-ro.model.ts
rename to smp-angular/src/app/service-group/service-group-ro.model.ts
diff --git a/smp-angular/src/app/servicegroup/service-group.component.css b/smp-angular/src/app/service-group/service-group.component.css
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group.component.css
rename to smp-angular/src/app/service-group/service-group.component.css
diff --git a/smp-angular/src/app/servicegroup/service-group.component.html b/smp-angular/src/app/service-group/service-group.component.html
similarity index 100%
rename from smp-angular/src/app/servicegroup/service-group.component.html
rename to smp-angular/src/app/service-group/service-group.component.html
diff --git a/smp-angular/src/app/servicegroup/service-group.component.ts b/smp-angular/src/app/service-group/service-group.component.ts
similarity index 94%
rename from smp-angular/src/app/servicegroup/service-group.component.ts
rename to smp-angular/src/app/service-group/service-group.component.ts
index 08ffa3f3a..6e13170d3 100644
--- a/smp-angular/src/app/servicegroup/service-group.component.ts
+++ b/smp-angular/src/app/service-group/service-group.component.ts
@@ -1,7 +1,7 @@
import {Component, TemplateRef, ViewChild} from "@angular/core";
import {ColumnPicker} from "../common/column-picker/column-picker.model";
import {MdDialog, MdDialogRef} from "@angular/material";
-import {ServiceGroupDetailsDialogComponent} from "./servicegroup-details-dialog/service-group-details-dialog.component";
+import {ServiceGroupDetailsDialogComponent} from "./service-group-details-dialog/service-group-details-dialog.component";
import {Http} from "@angular/http";
import {AlertService} from "../alert/alert.service";
import {ServiceGroupController} from "./service-group-controller";
diff --git a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts b/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts
deleted file mode 100644
index 65e130db7..000000000
--- a/smp-angular/src/app/servicegroup/servicegroup-metadatalist-dialog/service-group-metadatalist-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ServiceGroupMetadatalistDialogComponent } from './service-group-metadatalist-dialog.component';
-
-describe('ServicegroupExtensionDialogComponent', () => {
- let component: ServiceGroupMetadatalistDialogComponent;
- let fixture: ComponentFixture<ServiceGroupMetadatalistDialogComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ ServiceGroupMetadatalistDialogComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(ServiceGroupMetadatalistDialogComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.html b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.html
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.html
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.spec.ts b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.spec.ts
diff --git a/smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.ts b/smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-dialog/trust-store-dialog.component.ts
rename to smp-angular/src/app/trust-store/trust-store-dialog/trust-store-dialog.component.ts
diff --git a/smp-angular/src/app/truststore/trust-store-entry.model.ts b/smp-angular/src/app/trust-store/trust-store-entry.model.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store-entry.model.ts
rename to smp-angular/src/app/trust-store/trust-store-entry.model.ts
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.html b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.html
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.html
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.spec.ts b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.spec.ts
diff --git a/smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.ts b/smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.ts
similarity index 100%
rename from smp-angular/src/app/truststore/truststore-upload/trust-store-upload.component.ts
rename to smp-angular/src/app/trust-store/trust-store-upload/trust-store-upload.component.ts
diff --git a/smp-angular/src/app/truststore/trust-store.component.css b/smp-angular/src/app/trust-store/trust-store.component.css
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.css
rename to smp-angular/src/app/trust-store/trust-store.component.css
diff --git a/smp-angular/src/app/truststore/trust-store.component.html b/smp-angular/src/app/trust-store/trust-store.component.html
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.html
rename to smp-angular/src/app/trust-store/trust-store.component.html
diff --git a/smp-angular/src/app/truststore/trust-store.component.spec.ts b/smp-angular/src/app/trust-store/trust-store.component.spec.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.component.spec.ts
rename to smp-angular/src/app/trust-store/trust-store.component.spec.ts
diff --git a/smp-angular/src/app/truststore/trust-store.component.ts b/smp-angular/src/app/trust-store/trust-store.component.ts
similarity index 95%
rename from smp-angular/src/app/truststore/trust-store.component.ts
rename to smp-angular/src/app/trust-store/trust-store.component.ts
index d02abc60f..553a16c99 100644
--- a/smp-angular/src/app/truststore/trust-store.component.ts
+++ b/smp-angular/src/app/trust-store/trust-store.component.ts
@@ -3,9 +3,9 @@ import "rxjs/add/operator/map";
import "rxjs/add/operator/catch";
import {TrustStoreService} from "./trust-store.service";
import {TrustStoreEntry} from "./trust-store-entry.model";
-import {TrustStoreDialogComponent} from "./truststore-dialog/trust-store-dialog.component";
+import {TrustStoreDialogComponent} from "./trust-store-dialog/trust-store-dialog.component";
import {MdDialog, MdDialogRef} from "@angular/material";
-import {TrustStoreUploadComponent} from "./truststore-upload/trust-store-upload.component";
+import {TrustStoreUploadComponent} from "./trust-store-upload/trust-store-upload.component";
import {ColumnPicker} from "../common/column-picker/column-picker.model";
import {RowLimiter} from "../common/row-limiter/row-limiter.model";
import {DownloadService} from "../download/download.service";
diff --git a/smp-angular/src/app/truststore/trust-store.service.ts b/smp-angular/src/app/trust-store/trust-store.service.ts
similarity index 100%
rename from smp-angular/src/app/truststore/trust-store.service.ts
rename to smp-angular/src/app/trust-store/trust-store.service.ts
diff --git a/smp-angular/src/app/user/user-controller.ts b/smp-angular/src/app/user/user-controller.ts
index e7af9ab3d..9ada4224b 100644
--- a/smp-angular/src/app/user/user-controller.ts
+++ b/smp-angular/src/app/user/user-controller.ts
@@ -1,4 +1,4 @@
-import {SearchTableController} from "../common/searchtable/search-table-controller";
+import {SearchTableController} from "../common/search-table/search-table-controller";
import {MdDialog, MdDialogRef} from "@angular/material";
import {UserDetailsDialogComponent} from "./user-details-dialog/user-details-dialog.component";
diff --git a/smp-angular/src/assets/images/smp_logo_icon.svg b/smp-angular/src/assets/images/smp_logo_icon.svg
index f2005c7c2..0d6eff915 100755
--- a/smp-angular/src/assets/images/smp_logo_icon.svg
+++ b/smp-angular/src/assets/images/smp_logo_icon.svg
@@ -24,7 +24,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Domibus_logo_icon_2</dc:title>
+ <dc:title>SMP_logo_icon_2</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -51,7 +51,7 @@
inkscape:current-layer="g3392" />
<!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title
- id="title4">Domibus_logo_icon_2</title>
+ id="title4">SMP_logo_icon_2</title>
<desc
id="desc6">Created with Sketch.</desc>
<defs
@@ -247,7 +247,7 @@
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
transform="translate(0,-528)">
<g
- id="Domibus_logo_icon_2">
+ id="SMP_logo_icon_2">
<g
id="Group-2"
transform="translate(94,111)">
--
GitLab