diff --git a/ngapp/e2e/app.e2e-spec.ts b/ngapp/e2e/app.e2e-spec.ts index 7b5d260f..00a295e2 100644 --- a/ngapp/e2e/app.e2e-spec.ts +++ b/ngapp/e2e/app.e2e-spec.ts @@ -9,6 +9,8 @@ describe("beetle-studio App", () => { it("should display welcome message", () => { page.navigateTo(); - expect(page.getParagraphText()).toEqual("Welcome to app!"); + expect(page.getParagraphText()).toEqual("Welcome to app!").then(() => { + // nothing to do + }); }); }); diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.css b/ngapp/src/app/activities/activities-cards/activities-cards.component.css index f6b28f60..cd893700 100644 --- a/ngapp/src/app/activities/activities-cards/activities-cards.component.css +++ b/ngapp/src/app/activities/activities-cards/activities-cards.component.css @@ -28,7 +28,7 @@ .activity-card { -webkit-transition: background-color 300ms; -moz-transition: background-color 300ms; - -ms-transition: background-color 300ms; + //-ms-transition: background-color 300ms; -o-transition: background-color 300ms; transition: background-color 300ms; height: 220px; @@ -41,10 +41,12 @@ background-color: rgb(221, 234, 255); } +/* .activity-description { font-size: 13px; overflow-y: auto; } +*/ .activity-card .activity-tags { margin-bottom: 8px; @@ -53,7 +55,7 @@ font-weight: bold; margin-right: 5px; } -.activity-card .activity-tags .activity-tag { +.activity-card .activity-tags /*.activity-tag*/ { margin-right: 5px; border: 1px solid #ccc; -webkit-border-radius: 2px; @@ -61,7 +63,7 @@ border-radius: 2px; padding: 2px 4px; } -.activity-card .activity-tags .activity-tag:hover { +.activity-card .activity-tags /*.activity-tag:hover*/ { cursor: pointer; background-color: #0088ce; border-color: #00659c; diff --git a/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts b/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts index ac58cb3e..c7c73eb4 100644 --- a/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts +++ b/ngapp/src/app/activities/activities-cards/activities-cards.component.spec.ts @@ -11,7 +11,9 @@ describe("ActivitiesCardsComponent", () => { imports: [RouterModule], declarations: [ ActivitiesCardsComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.css b/ngapp/src/app/activities/activities-list/activities-list.component.css index 2ea63ec6..d3d18292 100644 --- a/ngapp/src/app/activities/activities-list/activities-list.component.css +++ b/ngapp/src/app/activities/activities-list/activities-list.component.css @@ -2,7 +2,7 @@ .list-group-item { -webkit-transition: background-color 300ms; -moz-transition: background-color 300ms; - -ms-transition: background-color 300ms; + //-ms-transition: background-color 300ms; -o-transition: background-color 300ms; transition: background-color 300ms; } @@ -20,7 +20,7 @@ font-weight: bold; margin-right: 5px; } -.list-group-item .activity-tags .activity-tag { +.list-group-item .activity-tags /*.activity-tag*/ { margin-right: 5px; border: 1px solid #ccc; -webkit-border-radius: 2px; @@ -28,7 +28,7 @@ border-radius: 2px; padding: 2px 4px; } -.list-group-item .activity-tags .activity-tag:hover { +.list-group-item .activity-tags /*.activity-tag:hover*/ { cursor: pointer; background-color: #0088ce; border-color: #00659c; diff --git a/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts b/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts index 6cf27629..325c1f04 100644 --- a/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts +++ b/ngapp/src/app/activities/activities-list/activities-list.component.spec.ts @@ -11,7 +11,9 @@ describe("ActivitiesListComponent", () => { imports: [ RouterModule ], declarations: [ ActivitiesListComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/activities/activities.component.html b/ngapp/src/app/activities/activities.component.html index b2451ec6..cfd4e1ce 100644 --- a/ngapp/src/app/activities/activities.component.html +++ b/ngapp/src/app/activities/activities.component.html @@ -90,11 +90,11 @@

+ (editActivity)="onEdit($event)" (startActivity)="onStart($event)" (deleteActivity)="onDelete($event)" + (activitySelected)="onSelected($event)" (activityDeselected)="onDeselected($event)"> + (editActivity)="onEdit($event)" (startActivity)="onStart($event)" (deleteActivity)="onDelete($event)" + (activitySelected)="onSelected($event)" (activityDeselected)="onDeselected($event)">
@@ -102,6 +102,6 @@

- +

Do you really want to delete the selected Activity?

diff --git a/ngapp/src/app/activities/activities.component.spec.ts b/ngapp/src/app/activities/activities.component.spec.ts index 2eb9437c..2e559287 100644 --- a/ngapp/src/app/activities/activities.component.spec.ts +++ b/ngapp/src/app/activities/activities.component.spec.ts @@ -18,7 +18,9 @@ describe("ActivitiesComponent", () => { imports: [ CoreModule, FormsModule, HttpModule, ModalModule.forRoot(), RouterTestingModule, SharedModule ], declarations: [ ActivitiesComponent, ActivitiesListComponent, ActivitiesCardsComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/activities/activities.component.ts b/ngapp/src/app/activities/activities.component.ts index 6352d7e9..d66859b6 100644 --- a/ngapp/src/app/activities/activities.component.ts +++ b/ngapp/src/app/activities/activities.component.ts @@ -81,7 +81,9 @@ export class ActivitiesComponent extends AbstractPageComponent { public onEdit(activityName: string): void { const link: string[] = [ ActivitiesConstants.editActivityPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } public onDelete(activityName: string): void { @@ -157,7 +159,7 @@ export class ActivitiesComponent extends AbstractPageComponent { /** * Called to doDelete all selected APIs. */ - public deleteActivity(): void { + public onDeleteActivity(): void { const selectedActivity = this.filterActivities().find((x) => x.getId() === this.activityNameForDelete); const activityToDelete: NewActivity = new NewActivity(); diff --git a/ngapp/src/app/activities/activities.module.ts b/ngapp/src/app/activities/activities.module.ts index abc3400d..599796fa 100644 --- a/ngapp/src/app/activities/activities.module.ts +++ b/ngapp/src/app/activities/activities.module.ts @@ -27,6 +27,7 @@ import { NgModule } from "@angular/core"; import { FormsModule } from "@angular/forms"; import { RouterModule } from "@angular/router"; import { ConnectionsModule } from "@connections/connections.module"; +import { CoreModule } from "@core/core.module"; import { SharedModule } from "@shared/shared.module"; @NgModule({ @@ -34,6 +35,7 @@ import { SharedModule } from "@shared/shared.module"; ActivitiesRoutingModule, CommonModule, ConnectionsModule, + CoreModule, SharedModule, RouterModule, FormsModule diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.css b/ngapp/src/app/activities/add-activity/add-activity.component.css index 4508ce85..fb12bd19 100644 --- a/ngapp/src/app/activities/add-activity/add-activity.component.css +++ b/ngapp/src/app/activities/add-activity/add-activity.component.css @@ -2,7 +2,7 @@ padding: 15px } -.add-activity-form .form-instructions { +.add-activity-form /*.form-instructions*/ { font-size: 15px; padding-top: 10px } diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.html b/ngapp/src/app/activities/add-activity/add-activity.component.html index 87ded917..89deb300 100644 --- a/ngapp/src/app/activities/add-activity/add-activity.component.html +++ b/ngapp/src/app/activities/add-activity/add-activity.component.html @@ -10,7 +10,7 @@

Add Activity

- +
diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts b/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts index 6f83ea28..048727b2 100644 --- a/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts +++ b/ngapp/src/app/activities/add-activity/add-activity.component.spec.ts @@ -20,7 +20,9 @@ describe("AddActivityComponent", () => { { provide: ActivityService, useClass: MockActivityService }, ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/activities/add-activity/add-activity.component.ts b/ngapp/src/app/activities/add-activity/add-activity.component.ts index c247d99f..ac48be27 100644 --- a/ngapp/src/app/activities/add-activity/add-activity.component.ts +++ b/ngapp/src/app/activities/add-activity/add-activity.component.ts @@ -57,7 +57,9 @@ export class AddActivityComponent extends AbstractPageComponent { this.activityService.createActivity(activity); const link: string[] = [ ActivitiesConstants.activitiesRootPath ]; this.logger.log("[AddActivityComponent] Navigating to: %o", link); - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } } diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css index ccc697d4..9061d0cf 100644 --- a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css +++ b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.css @@ -2,29 +2,36 @@ select { width: auto; } +/* .create-activity-form-panel.dragging { border: 1px dashed #39a5dc; background-color: #eef; } +*/ .create-activity-form-panel { padding-top: 25px; } +/* span.disabled { color: #999; } +*/ .dropdown ul { max-height: 250px; overflow: auto; } +/* div.spinner { display: inline-block; margin-right: 5px; } +*/ +/* .platform-toggle { display: inline-block; text-align: center; @@ -48,13 +55,18 @@ div.spinner { opacity: 0.6; cursor: not-allowed; } +*/ .platform-toggle span.fa { font-size: 32px; } +/* .platform-toggle span.lbl { font-size: 14px; } +*/ +/* .account-link-warning { margin-top: 10px; } +*/ diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts index b97472f0..76123eaa 100644 --- a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts +++ b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.spec.ts @@ -13,7 +13,9 @@ describe("AddActivityFormComponent", () => { imports: [ CoreModule, FormsModule, RouterTestingModule ], declarations: [ AddActivityFormComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts index 28cb994a..e8b39ba4 100644 --- a/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts +++ b/ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts @@ -122,7 +122,9 @@ export class AddActivityFormComponent { public cancelAdd(): void { const link: string[] = [ ActivitiesConstants.activitiesRootPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } } diff --git a/ngapp/src/app/app.component.spec.ts b/ngapp/src/app/app.component.spec.ts index 184f0bbf..0cc4a0d9 100644 --- a/ngapp/src/app/app.component.spec.ts +++ b/ngapp/src/app/app.component.spec.ts @@ -10,7 +10,9 @@ describe("AppComponent", () => { declarations: [ AppComponent ], - }).compileComponents(); + }).compileComponents().then(() => { + // nothing to do + }); })); it("should create the app", async(() => { diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.css b/ngapp/src/app/connections/add-connection/add-connection.component.css index 77de754d..a9b865e5 100644 --- a/ngapp/src/app/connections/add-connection/add-connection.component.css +++ b/ngapp/src/app/connections/add-connection/add-connection.component.css @@ -2,7 +2,7 @@ padding: 15px } -.add-connection-form .form-instructions { +.add-connection-form /*.form-instructions*/ { font-size: 15px; padding-top: 10px } diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.html b/ngapp/src/app/connections/add-connection/add-connection.component.html index c3b22e22..7576883d 100644 --- a/ngapp/src/app/connections/add-connection/add-connection.component.html +++ b/ngapp/src/app/connections/add-connection/add-connection.component.html @@ -10,7 +10,7 @@

Add Connection

- +
diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts b/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts index ad0ca88c..04a3b256 100644 --- a/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts +++ b/ngapp/src/app/connections/add-connection/add-connection.component.spec.ts @@ -20,7 +20,9 @@ describe("AddConnectionComponent", () => { { provide: ConnectionService, useClass: MockConnectionService }, ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/add-connection/add-connection.component.ts b/ngapp/src/app/connections/add-connection/add-connection.component.ts index cb821e14..309d10d0 100644 --- a/ngapp/src/app/connections/add-connection/add-connection.component.ts +++ b/ngapp/src/app/connections/add-connection/add-connection.component.ts @@ -61,7 +61,9 @@ export class AddConnectionComponent extends AbstractPageComponent { this.form.connectionCreated(); const link: string[] = [ ConnectionsConstants.connectionsRootPath ]; this.logger.log("[AddConnectionComponent] Navigating to: %o", link); - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } ); diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.css b/ngapp/src/app/connections/connections-cards/connections-cards.component.css index 8956339e..61b8ac9e 100644 --- a/ngapp/src/app/connections/connections-cards/connections-cards.component.css +++ b/ngapp/src/app/connections/connections-cards/connections-cards.component.css @@ -27,7 +27,7 @@ .connection-card { -webkit-transition: background-color 300ms; -moz-transition: background-color 300ms; - -ms-transition: background-color 300ms; + //-ms-transition: background-color 300ms; -o-transition: background-color 300ms; transition: background-color 300ms; height: 220px; @@ -40,10 +40,12 @@ background-color: rgb(221, 234, 255); } +/* .connection-description { font-size: 13px; overflow-y: auto; } +*/ .connection-card .connection-tags { margin-bottom: 8px; @@ -52,7 +54,7 @@ font-weight: bold; margin-right: 5px; } -.connection-card .connection-tags .connection-tag { +.connection-card .connection-tags /*.connection-tag*/ { margin-right: 5px; border: 1px solid #ccc; -webkit-border-radius: 2px; @@ -60,7 +62,7 @@ border-radius: 2px; padding: 2px 4px; } -.connection-card .connection-tags .connection-tag:hover { +.connection-card .connection-tags /*.connection-tag:hover*/ { cursor: pointer; background-color: #0088ce; border-color: #00659c; diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts b/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts index 555d014f..6d60bc2c 100644 --- a/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts +++ b/ngapp/src/app/connections/connections-cards/connections-cards.component.spec.ts @@ -11,7 +11,9 @@ describe("ConnectionsCardsComponent", () => { imports: [ RouterTestingModule ], declarations: [ ConnectionsCardsComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/connections-list/connections-list.component.css b/ngapp/src/app/connections/connections-list/connections-list.component.css index 14cedd29..45813472 100644 --- a/ngapp/src/app/connections/connections-list/connections-list.component.css +++ b/ngapp/src/app/connections/connections-list/connections-list.component.css @@ -2,7 +2,7 @@ .list-group-item { -webkit-transition: background-color 300ms; -moz-transition: background-color 300ms; - -ms-transition: background-color 300ms; + //-ms-transition: background-color 300ms; -o-transition: background-color 300ms; transition: background-color 300ms; } @@ -20,7 +20,7 @@ font-weight: bold; margin-right: 5px; } -.list-group-item .connection-tags .connection-tag { +.list-group-item .connection-tags /*.connection-tag*/ { margin-right: 5px; border: 1px solid #ccc; -webkit-border-radius: 2px; @@ -28,7 +28,7 @@ border-radius: 2px; padding: 2px 4px; } -.list-group-item .connection-tags .connection-tag:hover { +.list-group-item .connection-tags /*.connection-tag:hover*/ { cursor: pointer; background-color: #0088ce; border-color: #00659c; diff --git a/ngapp/src/app/connections/connections-list/connections-list.component.spec.ts b/ngapp/src/app/connections/connections-list/connections-list.component.spec.ts index 60c27bf5..b0bad59a 100644 --- a/ngapp/src/app/connections/connections-list/connections-list.component.spec.ts +++ b/ngapp/src/app/connections/connections-list/connections-list.component.spec.ts @@ -11,7 +11,9 @@ describe("ConnectionsListComponent", () => { imports: [ RouterTestingModule ], declarations: [ ConnectionsListComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/connections.component.html b/ngapp/src/app/connections/connections.component.html index 9e48cabb..96b2b28e 100644 --- a/ngapp/src/app/connections/connections.component.html +++ b/ngapp/src/app/connections/connections.component.html @@ -90,11 +90,11 @@

+ (editConnection)="onEdit($event)" (pingConnection)="onPing($event)" (deleteConnection)="onDelete($event)" + (connectionSelected)="onSelected($event)" (connectionDeselected)="onDeselected($event)"> + (editConnection)="onEdit($event)" (pingConnection)="onPing($event)" (deleteConnection)="onDelete($event)" + (connectionSelected)="onSelected($event)" (connectionDeselected)="onDeselected($event)">
@@ -102,6 +102,6 @@

- +

Do you really want to delete the selected Connection?

diff --git a/ngapp/src/app/connections/connections.component.spec.ts b/ngapp/src/app/connections/connections.component.spec.ts index c7c8aca4..658cf807 100644 --- a/ngapp/src/app/connections/connections.component.spec.ts +++ b/ngapp/src/app/connections/connections.component.spec.ts @@ -18,7 +18,9 @@ describe("ConnectionsComponent", () => { imports: [ CoreModule, FormsModule, HttpModule, ModalModule.forRoot(), RouterTestingModule, SharedModule ], declarations: [ ConnectionsComponent, ConnectionsListComponent, ConnectionsCardsComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/connections.component.ts b/ngapp/src/app/connections/connections.component.ts index f6b82743..1d75907c 100644 --- a/ngapp/src/app/connections/connections.component.ts +++ b/ngapp/src/app/connections/connections.component.ts @@ -134,7 +134,9 @@ export class ConnectionsComponent extends AbstractPageComponent { public onEdit(connName: string): void { const link: string[] = [ ConnectionsConstants.editConnectionPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } public onDelete(connName: string): void { @@ -171,7 +173,7 @@ export class ConnectionsComponent extends AbstractPageComponent { /** * Called to doDelete all selected APIs. */ - public deleteConnection(): void { + public onDeleteConnection(): void { const selectedConn = this.filterConnections().find((x) => x.getId() === this.connectionNameForDelete); // const itemsToDelete: Connection[] = ArrayUtils.intersect(this.selectedConnections, this.filteredConnections); @@ -189,7 +191,9 @@ export class ConnectionsComponent extends AbstractPageComponent { this.removeConnectionFromList(selectedConn); const link: string[] = [ ConnectionsConstants.connectionsRootPath ]; this.logger.log("[CreateApiPageComponent] Navigating to: %o", link); - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } ); } diff --git a/ngapp/src/app/connections/connections.module.ts b/ngapp/src/app/connections/connections.module.ts index 523541e4..56921641 100644 --- a/ngapp/src/app/connections/connections.module.ts +++ b/ngapp/src/app/connections/connections.module.ts @@ -27,12 +27,14 @@ import { ConnectionsComponent } from "@connections/connections.component"; import { EditConnectionComponent } from "@connections/edit-connection/edit-connection.component"; import { AddConnectionFormComponent } from "@connections/shared/add-connection-form/add-connection-form.component"; import { ConnectionService } from "@connections/shared/connection.service"; +import { CoreModule } from "@core/core.module"; import { SharedModule } from "@shared/shared.module"; @NgModule({ imports: [ ConnectionsRoutingModule, CommonModule, + CoreModule, SharedModule, FormsModule, RouterModule diff --git a/ngapp/src/app/connections/edit-connection/edit-connection.component.css b/ngapp/src/app/connections/edit-connection/edit-connection.component.css index 73a87d5c..1561fd4c 100644 --- a/ngapp/src/app/connections/edit-connection/edit-connection.component.css +++ b/ngapp/src/app/connections/edit-connection/edit-connection.component.css @@ -2,7 +2,7 @@ padding: 15px } -.edit-connection-form .form-instructions { +.edit-connection-form /*.form-instructions*/ { font-size: 15px; padding-top: 10px } diff --git a/ngapp/src/app/connections/edit-connection/edit-connection.component.spec.ts b/ngapp/src/app/connections/edit-connection/edit-connection.component.spec.ts index 431cff4d..749a83fb 100644 --- a/ngapp/src/app/connections/edit-connection/edit-connection.component.spec.ts +++ b/ngapp/src/app/connections/edit-connection/edit-connection.component.spec.ts @@ -21,7 +21,9 @@ describe("EditConnectionComponent", () => { { provide: ConnectionService, useClass: MockConnectionService }, ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.css b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.css index 491084a8..c6783af4 100644 --- a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.css +++ b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.css @@ -2,29 +2,36 @@ select { width: auto; } +/* .create-connection-form-panel.dragging { border: 1px dashed #39a5dc; background-color: #eef; } +*/ .create-connection-form-panel { padding-top: 25px; } +/* span.disabled { color: #999; } +*/ .dropdown ul { max-height: 250px; overflow: auto; } +/* div.spinner { display: inline-block; margin-right: 5px; } +*/ +/* .platform-toggle { display: inline-block; text-align: center; @@ -58,3 +65,4 @@ div.spinner { .account-link-warning { margin-top: 10px; } +*/ diff --git a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.spec.ts b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.spec.ts index 2f52da6d..66affc9a 100644 --- a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.spec.ts +++ b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.spec.ts @@ -12,7 +12,9 @@ describe("AddConnectionFormComponent", () => { imports: [ FormsModule, RouterTestingModule ], declarations: [ AddConnectionFormComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.ts b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.ts index 54a5a12a..a4e037d0 100644 --- a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.ts +++ b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.ts @@ -29,7 +29,7 @@ import { LoggerService } from "@core/logger.service"; }) export class AddConnectionFormComponent { - private creatingConnection = false; + private creating = false; private logger: LoggerService; private model = new NewConnection(); private router: Router; @@ -113,19 +113,28 @@ export class AddConnectionFormComponent { this.logger.log("[AddConnectionFormComponent] Firing create-connection event: %o", connection); - this.creatingConnection = true; + this.creating = true; this.createConnection.emit(connection); } public cancelAdd(): void { const link: string[] = [ ConnectionsConstants.connectionsRootPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); + } + + /** + * @returns {boolean} 'true' if the connection is being created + */ + public get creatingConnection(): boolean { + return this.creating; } /** * Called when the connection has been created. */ public connectionCreated(): void { - this.creatingConnection = false; + this.creating = false; } } diff --git a/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.css b/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.css index f0673af3..5f1b677d 100644 --- a/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.css +++ b/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.css @@ -1,3 +1,5 @@ +/* .studio-breadcrumb { color: inherit; } +*/ diff --git a/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.spec.ts b/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.spec.ts index ac1e2d9b..3c490b83 100644 --- a/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.spec.ts +++ b/ngapp/src/app/core/breadcrumbs/breadcrumb/breadcrumb.component.spec.ts @@ -11,7 +11,9 @@ describe("BreadcrumbComponent", () => { imports: [ RouterTestingModule ], declarations: [ BreadcrumbComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.spec.ts b/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.spec.ts index aea8e021..2cea6f65 100644 --- a/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.spec.ts +++ b/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.spec.ts @@ -9,7 +9,9 @@ describe("BreadcrumbsComponent", () => { TestBed.configureTestingModule({ declarations: [ BreadcrumbsComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/core/core.module.ts b/ngapp/src/app/core/core.module.ts index fae5ef5d..3f77f98a 100644 --- a/ngapp/src/app/core/core.module.ts +++ b/ngapp/src/app/core/core.module.ts @@ -16,9 +16,10 @@ */ import { CommonModule } from "@angular/common"; -import { NgModule} from "@angular/core"; +import { NgModule, Optional, SkipSelf } from "@angular/core"; import {HttpModule} from "@angular/http"; import {RouterModule} from "@angular/router"; +import { ApiService } from "@core/api.service"; import { BreadcrumbComponent } from "@core/breadcrumbs/breadcrumb/breadcrumb.component"; import { BreadcrumbsComponent } from "@core/breadcrumbs/breadcrumbs.component"; import { LoggerService } from "@core/logger.service"; @@ -44,7 +45,16 @@ import { VerticalNavComponent } from "@core/vertical-nav/vertical-nav.component" VerticalNavComponent ], providers: [ + ApiService, LoggerService ] }) -export class CoreModule { } +export class CoreModule { + + constructor( @Optional() @SkipSelf() parentModule: CoreModule ) { + if ( parentModule ) { + throw new Error( "CoreModule is already loaded and should only be mported by the AppModule." ); + } + } + +} diff --git a/ngapp/src/app/core/nav-header/nav-header.component.spec.ts b/ngapp/src/app/core/nav-header/nav-header.component.spec.ts index 454cc499..743e2c8e 100644 --- a/ngapp/src/app/core/nav-header/nav-header.component.spec.ts +++ b/ngapp/src/app/core/nav-header/nav-header.component.spec.ts @@ -9,7 +9,9 @@ describe("NavHeaderComponent", () => { TestBed.configureTestingModule({ declarations: [ NavHeaderComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/core/vertical-nav/vertical-nav.component.less b/ngapp/src/app/core/vertical-nav/vertical-nav.component.less index dd4b3984..a79e36a9 100644 --- a/ngapp/src/app/core/vertical-nav/vertical-nav.component.less +++ b/ngapp/src/app/core/vertical-nav/vertical-nav.component.less @@ -53,7 +53,7 @@ padding: 15px; -webkit-transition: left 200ms; -moz-transition: left 200ms; - -ms-transition: left 200ms; + //-ms-transition: left 200ms; -o-transition: left 200ms; transition: left 200ms; } diff --git a/ngapp/src/app/core/vertical-nav/vertical-nav.component.spec.ts b/ngapp/src/app/core/vertical-nav/vertical-nav.component.spec.ts index 2e155a86..f312cbf7 100644 --- a/ngapp/src/app/core/vertical-nav/vertical-nav.component.spec.ts +++ b/ngapp/src/app/core/vertical-nav/vertical-nav.component.spec.ts @@ -11,7 +11,9 @@ describe("VerticalNavComponent", () => { imports: [RouterTestingModule], declarations: [ VerticalNavComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts b/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts index cec7bbbc..f0404faa 100644 --- a/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts +++ b/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts @@ -91,7 +91,9 @@ export class VerticalNavComponent implements OnInit { private onActivitiesClick(): void { this.currentMenu = VerticalNavType.Activities; const link: string[] = [ ActivitiesConstants.activitiesRootPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } /** @@ -100,7 +102,9 @@ export class VerticalNavComponent implements OnInit { private onConnectionsClick(): void { this.currentMenu = VerticalNavType.Connections; const link: string[] = [ ConnectionsConstants.connectionsRootPath ]; - this.router.navigate(link); + this.router.navigate(link).then(() => { + // nothing to do + }); } /** diff --git a/ngapp/src/app/shared/confirm-delete/confirm-delete.component.spec.ts b/ngapp/src/app/shared/confirm-delete/confirm-delete.component.spec.ts index fecdd15c..932c770b 100644 --- a/ngapp/src/app/shared/confirm-delete/confirm-delete.component.spec.ts +++ b/ngapp/src/app/shared/confirm-delete/confirm-delete.component.spec.ts @@ -11,7 +11,9 @@ describe("ConfirmDeleteComponent", () => { imports: [ModalModule.forRoot()], declarations: [ ConfirmDeleteComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/shared/identifiable.ts b/ngapp/src/app/shared/identifiable.ts index c81fbf5f..66e7223a 100644 --- a/ngapp/src/app/shared/identifiable.ts +++ b/ngapp/src/app/shared/identifiable.ts @@ -22,6 +22,7 @@ export interface Identifiable< T > { /** * @returns {T} the object identifier (can be null) + * @template T the identifier type */ getId(): T; diff --git a/ngapp/src/app/shared/page-error/page-error.component.spec.ts b/ngapp/src/app/shared/page-error/page-error.component.spec.ts index 94b65b0e..f237e4c7 100644 --- a/ngapp/src/app/shared/page-error/page-error.component.spec.ts +++ b/ngapp/src/app/shared/page-error/page-error.component.spec.ts @@ -11,7 +11,9 @@ describe("PageErrorComponent", () => { imports: [ HttpModule ], declarations: [ PageErrorComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/shared/page-not-found/page-not-found.component.spec.ts b/ngapp/src/app/shared/page-not-found/page-not-found.component.spec.ts index ca583db0..078092d5 100644 --- a/ngapp/src/app/shared/page-not-found/page-not-found.component.spec.ts +++ b/ngapp/src/app/shared/page-not-found/page-not-found.component.spec.ts @@ -9,7 +9,9 @@ describe("PageNotFoundComponent", () => { TestBed.configureTestingModule({ declarations: [ PageNotFoundComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/shared/property-form/property-definition.model.ts b/ngapp/src/app/shared/property-form/property-definition.model.ts index 9550b942..8c194be2 100644 --- a/ngapp/src/app/shared/property-form/property-definition.model.ts +++ b/ngapp/src/app/shared/property-form/property-definition.model.ts @@ -46,6 +46,7 @@ export class PropertyDefinition { /** * @returns {T} the property value (can be null) + * @template T the type of the value */ public getValue(): T { return this.value; @@ -152,6 +153,7 @@ export class PropertyDefinition { /** * @param {T} value the property value + * @template T the type of the value */ public setValue( value?: T ): void { this.value = value ? value : null; diff --git a/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.html b/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.html index 70ad85fa..07ef24ac 100644 --- a/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.html +++ b/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.html @@ -4,12 +4,13 @@
+ [id]="property.getId()" type="text" title="A text value"> + [id]="property.getId()" type="checkbox" title="A boolean value"> - diff --git a/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts b/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts index 35acec5e..175fd33a 100644 --- a/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts +++ b/ngapp/src/app/shared/property-form/property-form-property/property-form-property.component.spec.ts @@ -12,7 +12,9 @@ describe("PropertyFormPropertyComponent", () => { imports: [ ReactiveFormsModule ], declarations: [ PropertyFormPropertyComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/app/shared/property-form/property-form.component.spec.ts b/ngapp/src/app/shared/property-form/property-form.component.spec.ts index da56634d..06b2710c 100644 --- a/ngapp/src/app/shared/property-form/property-form.component.spec.ts +++ b/ngapp/src/app/shared/property-form/property-form.component.spec.ts @@ -13,7 +13,9 @@ describe("PropertyFormComponent", () => { imports: [ FormsModule ], declarations: [ PropertyFormComponent, PropertyFormPropertyComponent ] }) - .compileComponents(); + .compileComponents().then(() => { + // nothing to do + }); })); beforeEach(() => { diff --git a/ngapp/src/typings.d.ts b/ngapp/src/typings.d.ts index ef5c7bd6..e20662ca 100644 --- a/ngapp/src/typings.d.ts +++ b/ngapp/src/typings.d.ts @@ -1,4 +1,5 @@ /* SystemJS module definition */ +// noinspection ES6ConvertVarToLetConst declare var module: NodeModule; interface NodeModule { id: string;