Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 2722ec14 authored by Sebastian-Ion TINCU's avatar Sebastian-Ion TINCU
Browse files

EDELIVERY-3762 Clean the smp-angular project from domibus object

Rename folders.
Replace occurrences of Domibus with SMP (SVG logo included).
parent b20d2a0d
No related branches found
No related tags found
No related merge requests found
Showing
with 44 additions and 41 deletions
export interface DomibusInfo {
export interface SmpInfo {
version: string;
}
......@@ -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();
......
......@@ -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
......
......@@ -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,
......
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 = [
......
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";
......
......@@ -7,7 +7,7 @@
text-align: center;
}
#footer .domibusVersion {
#footer .smpVersion {
display: inline-block;
font-size: 15px;
}
<div id="footer">
<span class="domibusVersion">{{domibusVersion}}</span>
<span class="smpVersion">{{smpVersion}}</span>
</div>
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;
}
);
}
......
......@@ -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.";
......
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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment