-
Source:
-
{{ activity.getSourceConnection() }}
+
+ Source: {{ activity.getSourceConnection() }}
-
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 6d996ee2..1395eb59 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
@@ -1,12 +1,9 @@
import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { FormsModule } from "@angular/forms";
-import { HttpModule } from "@angular/http";
+
import { RouterTestingModule } from "@angular/router/testing";
-import { AddConnectionComponent } from "@connections/add-connection/add-connection.component";
-import { AddConnectionFormComponent } from "@connections/shared/add-connection-form/add-connection-form.component";
-import { ConnectionService } from "@connections/shared/connection.service";
-import { MockConnectionService } from "@connections/shared/mock-connection.service";
+import { AddConnectionWizardComponent } from "@connections/add-connection-wizard/add-connection-wizard.component";
import { CoreModule } from "@core/core.module";
+import { AddConnectionComponent } from "./add-connection.component";
describe("AddConnectionComponent", () => {
let component: AddConnectionComponent;
@@ -14,11 +11,8 @@ describe("AddConnectionComponent", () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- imports: [ CoreModule, FormsModule, HttpModule, RouterTestingModule ],
- declarations: [ AddConnectionComponent, AddConnectionFormComponent ],
- providers: [
- { provide: ConnectionService, useClass: MockConnectionService },
- ]
+ imports: [ CoreModule, RouterTestingModule ],
+ declarations: [ AddConnectionComponent, AddConnectionWizardComponent ]
})
.compileComponents().then(() => {
// nothing to do
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 309d10d0..738e69da 100644
--- a/ngapp/src/app/connections/add-connection/add-connection.component.ts
+++ b/ngapp/src/app/connections/add-connection/add-connection.component.ts
@@ -1,72 +1,21 @@
-/**
- * @license
- * Copyright 2017 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Component } from "@angular/core";
-import { ViewChild } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { Router } from "@angular/router";
-import { AddConnectionFormComponent } from "@connections/shared/add-connection-form/add-connection-form.component";
-import { ConnectionService } from "@connections/shared/connection.service";
-import { ConnectionsConstants } from "@connections/shared/connections-constants";
-import { NewConnection } from "@connections/shared/new-connection.model";
-import { LoggerService } from "@core/logger.service";
-import { AbstractPageComponent } from "@shared/abstract-page.component";
+import { Component, OnInit } from "@angular/core";
+import {ConnectionsConstants} from "@connections/shared/connections-constants";
@Component({
- moduleId: module.id,
- selector: "app-add-connection",
+ selector: "app-add-connection-page",
templateUrl: "./add-connection.component.html",
styleUrls: ["./add-connection.component.css"]
})
-export class AddConnectionComponent extends AbstractPageComponent {
+export class AddConnectionComponent implements OnInit {
public readonly connectionsLink = ConnectionsConstants.connectionsRootPath;
- private router: Router;
- private connectionService: ConnectionService;
-
- @ViewChild(AddConnectionFormComponent) private form: AddConnectionFormComponent;
-
- constructor(router: Router, route: ActivatedRoute, connectionService: ConnectionService, logger: LoggerService ) {
- super(route, logger);
- this.router = router;
- this.connectionService = connectionService;
+ constructor() {
+ // Nothing
}
- /**
- * Called when the Add Connection form (component) emits a "add-connection" event. This is bound to
- * from the add-connection.page.html template.
- * @param {NewConnection} connection
- */
- public onCreateConnection(connection: NewConnection): void {
- this.logger.log("[AddConnectionComponent] onCreateConnection(): " + JSON.stringify(connection));
- this.connectionService
- .createConnection(connection)
- .subscribe(
- () => {
- this.form.connectionCreated();
- const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
- this.logger.log("[AddConnectionComponent] Navigating to: %o", link);
- this.router.navigate(link).then(() => {
- // nothing to do
- });
- }
- );
-
+ public ngOnInit(): void {
+ // Nothing
}
}
diff --git a/ngapp/src/app/connections/connections-cards/connections-cards.component.html b/ngapp/src/app/connections/connections-cards/connections-cards.component.html
index 184bc372..6a1ac4e1 100644
--- a/ngapp/src/app/connections/connections-cards/connections-cards.component.html
+++ b/ngapp/src/app/connections/connections-cards/connections-cards.component.html
@@ -9,16 +9,13 @@
-