fixes some circular dependencies caught when running 'ng serve'

ngapp/src/app/activities/activities-routing.module.ts

@@ -12,18 +12,15 @@
 
 import { ActivitiesComponent } from "@activities/activities.component";
 import { AddActivityComponent } from "@activities/add-activity/add-activity.component";
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { Routes } from "@angular/router";
 
-export const activitiesRootPath = "/activities";
-export const addActivityPath = activitiesRootPath + "/add-activity";
-export const editActivityPath = activitiesRootPath + "/edit-activity";
-
 const activitiesRoutes: Routes = [
-  { path: activitiesRootPath, component: ActivitiesComponent },
-  { path: addActivityPath, component: AddActivityComponent }
-//  { path: editActivityPath, component: EditActivityComponent }
+  { path: ActivitiesConstants.activitiesRootRoute, component: ActivitiesComponent },
+  { path: ActivitiesConstants.addActivityRoute, component: AddActivityComponent }
+//  { path: ActivitiesConstants.editActivityRoute, component: EditActivityComponent }
 ];
 
 @NgModule({
@@ -34,5 +31,4 @@ const activitiesRoutes: Routes = [
     RouterModule
   ]
 })
-
 export class ActivitiesRoutingModule {}

ngapp/src/app/activities/activities.component.ts

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import { addActivityPath, editActivityPath } from "@activities/activities-routing.module";
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
 import { Activity } from "@activities/shared/activity.model";
 import { ActivityService } from "@activities/shared/activity.service";
 import { NewActivity } from "@activities/shared/new-activity.model";
-import { ViewChild } from "@angular/core";
 import { Component } from "@angular/core";
+import { ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { Router } from "@angular/router";
 import { ArrayUtils } from "@core/utils/array-utils";
@@ -39,7 +39,7 @@ import { SortDirection } from "@shared/sort-direction.enum";
 })
 export class ActivitiesComponent extends AbstractPageComponent {
 
-  public addActivityLink = addActivityPath;
+  public readonly addActivityLink = ActivitiesConstants.addActivityPath;
 
   private allActivities: Activity[] = [];
   private filteredActivities: Activity[] = [];
@@ -102,7 +102,7 @@ export class ActivitiesComponent extends AbstractPageComponent {
   }
 
   public onEdit(activityName: string): void {
-    const link: string[] = [ editActivityPath ];
+    const link: string[] = [ ActivitiesConstants.editActivityPath ];
     this.router.navigate(link);
   }
 

ngapp/src/app/activities/activities.module.ts

@@ -49,5 +49,6 @@ import { SharedModule } from "@shared/shared.module";
   ],
   providers: [
     ActivityService
-  ]})
-export class ActivitiesModule { }
+  ]
+})
+export class ActivitiesModule {}

ngapp/src/app/activities/add-activity/add-activity.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { activitiesRootPath } from "@activities/activities-routing.module";
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
 import { ActivityService } from "@activities/shared/activity.service";
 import { AddActivityFormComponent } from "@activities/shared/add-activity-form/add-activity-form.component";
 import { NewActivity } from "@activities/shared/new-activity.model";
@@ -26,13 +26,14 @@ import { Router } from "@angular/router";
 import { AbstractPageComponent } from "@shared/abstract-page.component";
 
 @Component({
+  moduleId: module.id,
   selector: "app-add-activity",
   templateUrl: "./add-activity.component.html",
   styleUrls: ["./add-activity.component.css"]
 })
 export class AddActivityComponent extends AbstractPageComponent {
 
-  public activitiesLink = activitiesRootPath;
+  public readonly activitiesLink = ActivitiesConstants.activitiesRootPath;
 
   private router: Router;
   private activityService: ActivityService;
@@ -53,7 +54,7 @@ export class AddActivityComponent extends AbstractPageComponent {
   public onCreateActivity(activity: NewActivity): void {
     console.log("[AddActivityComponent] onCreateActivity(): " + JSON.stringify(activity));
     this.activityService.createActivity(activity);
-    const link: string[] = [ activitiesRootPath ];
+    const link: string[] = [ ActivitiesConstants.activitiesRootPath ];
     console.log("[AddActivityComponent] Navigating to: %o", link);
     this.router.navigate(link);
   }

ngapp/src/app/activities/shared/activities-constants.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2017 JBoss Inc
+ *
+ * Licensed under the Apache License, /
+ * 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.
+ */
+
+export class ActivitiesConstants {
+
+  public static readonly activitiesRootRoute = "activities";
+  public static readonly activitiesRootPath = "/" + ActivitiesConstants.activitiesRootRoute;
+
+  public static readonly addActivityRoute = ActivitiesConstants.activitiesRootRoute + "/add-activity";
+  public static readonly addActivityPath = ActivitiesConstants.activitiesRootPath + "/add-activity";
+
+  public static readonly editActivityroute = ActivitiesConstants.activitiesRootRoute + "/edit-activity";
+  public static readonly editActivityPath = ActivitiesConstants.activitiesRootPath + "/edit-activity";
+
+}

ngapp/src/app/activities/shared/add-activity-form/add-activity-form.component.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { activitiesRootPath } from "@activities/activities-routing.module";
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
 import { NewActivity } from "@activities/shared/new-activity.model";
 import { Component } from "@angular/core";
 import { EventEmitter } from "@angular/core";
@@ -24,6 +24,7 @@ import { Router } from "@angular/router";
 import { NewConnection } from "@connections/shared/new-connection.model";
 
 @Component({
+  moduleId: module.id,
   selector: "app-add-activity-form",
   templateUrl: "./add-activity-form.component.html",
   styleUrls: ["./add-activity-form.component.css"]
@@ -89,7 +90,7 @@ export class AddActivityFormComponent {
   }
 
   public cancelAdd(): void {
-    const link: string[] = [ activitiesRootPath ];
+    const link: string[] = [ ActivitiesConstants.activitiesRootPath ];
     this.router.navigate(link);
   }
 

ngapp/src/app/app-routing.module.ts

@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-import { activitiesRootPath } from "@activities/activities-routing.module";
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
 import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { Routes } from "@angular/router";
-import { connectionsRootPath } from "@connections/connections-routing.module";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
 import { environment } from "@environments/environment";
 import { PageNotFoundComponent } from "@shared/page-not-found/page-not-found.component";
 
 const appRoutes: Routes = [
   { path: "", redirectTo: environment.homePagePath, pathMatch: "full" },
-  { path: connectionsRootPath, loadChildren: "@connections/connections.module#ConnectionsModule" },
-  { path: activitiesRootPath, loadChildren: "@activities/activities.module#ActivitiesModule" },
+  { path: ConnectionsConstants.connectionsRootRoute, loadChildren: "@connections/connections.module#ConnectionsModule" },
+  { path: ActivitiesConstants.activitiesRootRoute, loadChildren: "@activities/activities.module#ActivitiesModule" },
   { path: "**", component: PageNotFoundComponent }, // always last
 ];
 
@@ -38,5 +38,4 @@ const appRoutes: Routes = [
     RouterModule
   ]
 })
-
 export class AppRoutingModule {}

ngapp/src/app/app.component.ts

@@ -18,6 +18,7 @@
 import { Component } from "@angular/core";
 
 @Component({
+  moduleId: module.id,
   selector: "app-root",
   templateUrl: "./app.component.html",
   styleUrls: ["./app.component.css"]

ngapp/src/app/connections/add-connection/add-connection.component.ts

@@ -19,20 +19,21 @@ import { Component } from "@angular/core";
 import { ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { Router } from "@angular/router";
-import { addConnectionPath, connectionsRootPath } from "@connections/connections-routing.module";
 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 { AbstractPageComponent } from "@shared/abstract-page.component";
 
 @Component({
+  moduleId: module.id,
   selector: "app-add-connection",
   templateUrl: "./add-connection.component.html",
   styleUrls: ["./add-connection.component.css"]
 })
 export class AddConnectionComponent extends AbstractPageComponent {
 
-  public addConnectionLink = addConnectionPath;
+  public readonly addConnectionLink = ConnectionsConstants.addConnectionPath;
 
   private router: Router;
   private connectionService: ConnectionService;
@@ -57,7 +58,7 @@ export class AddConnectionComponent extends AbstractPageComponent {
       .subscribe(
       () => {
         this.form.connectionCreated();
-        const link: string[] = [ connectionsRootPath ];
+        const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
         console.log("[AddConnectionComponent] Navigating to: %o", link);
         this.router.navigate(link);
       }

ngapp/src/app/connections/connections-routing.module.ts

@@ -21,15 +21,12 @@ import { Routes } from "@angular/router";
 import { AddConnectionComponent } from "@connections/add-connection/add-connection.component";
 import { ConnectionsComponent } from "@connections/connections.component";
 import { EditConnectionComponent } from "@connections/edit-connection/edit-connection.component";
-
-export const connectionsRootPath = "/connections";
-export const addConnectionPath = connectionsRootPath + "/add-connection";
-export const editConnectionPath = connectionsRootPath + "/edit-connection";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
 
 const connectionsRoutes: Routes = [
-  { path: connectionsRootPath, component: ConnectionsComponent },
-  { path: addConnectionPath, component: AddConnectionComponent },
-  { path: editConnectionPath, component: EditConnectionComponent }
+  { path: ConnectionsConstants.connectionsRootRoute, component: ConnectionsComponent },
+  { path: ConnectionsConstants.addConnectionRoute, component: AddConnectionComponent },
+  { path: ConnectionsConstants.editConnectionRoute, component: EditConnectionComponent }
 ];
 
 @NgModule({
@@ -40,5 +37,4 @@ const connectionsRoutes: Routes = [
     RouterModule
   ]
 })
-
 export class ConnectionsRoutingModule {}

ngapp/src/app/connections/connections.component.ts

@@ -17,9 +17,9 @@
 
 import { Component, ViewChild } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-import { addConnectionPath, connectionsRootPath, editConnectionPath } from "@connections/connections-routing.module";
 import { Connection } from "@connections/shared/connection.model";
 import { ConnectionService } from "@connections/shared/connection.service";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
 import { NewConnection } from "@connections/shared/new-connection.model";
 import { ArrayUtils } from "@core/utils/array-utils";
 import { AbstractPageComponent } from "@shared/abstract-page.component";
@@ -29,14 +29,15 @@ import { LayoutType } from "@shared/layout-type.enum";
 import { SortDirection } from "@shared/sort-direction.enum";
 
 @Component({
+  moduleId: module.id,
   selector: "app-connections",
   templateUrl: "./connections.component.html",
   styleUrls: ["./connections.component.css"],
   providers: [ConnectionService]
 })
 export class ConnectionsComponent extends AbstractPageComponent {
 
-  public addConnectionLink: string = addConnectionPath;
+  public readonly addConnectionLink: string = ConnectionsConstants.addConnectionPath;
 
   private allConnections: Connection[] = [];
   private filteredConnections: Connection[] = [];
@@ -155,7 +156,7 @@ export class ConnectionsComponent extends AbstractPageComponent {
   }
 
   public onEdit(connName: string): void {
-    const link: string[] = [ editConnectionPath ];
+    const link: string[] = [ ConnectionsConstants.editConnectionPath ];
     this.router.navigate(link);
   }
 
@@ -209,7 +210,7 @@ export class ConnectionsComponent extends AbstractPageComponent {
       .subscribe(
         () => {
           this.removeConnectionFromList(selectedConn);
-          const link: string[] = [ connectionsRootPath ];
+          const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
           console.log("[CreateApiPageComponent] Navigating to: %o", link);
           this.router.navigate(link);
         }

ngapp/src/app/connections/edit-connection/edit-connection.component.ts

@@ -18,19 +18,20 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { Router } from "@angular/router";
-import { connectionsRootPath } from "@connections/connections-routing.module";
 import { ConnectionService } from "@connections/shared/connection.service";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
 import { NewConnection } from "@connections/shared/new-connection.model";
 import { AbstractPageComponent } from "@shared/abstract-page.component";
 
 @Component({
+  moduleId: module.id,
   selector: "app-edit-connection",
   templateUrl: "./edit-connection.component.html",
   styleUrls: ["./edit-connection.component.css"]
 })
 export class EditConnectionComponent extends AbstractPageComponent {
 
-  public connectionsLink = connectionsRootPath;
+  public readonly connectionsLink = ConnectionsConstants.connectionsRootPath;
 
   private router: Router;
   private connectionService: ConnectionService;

ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.html

@@ -5,25 +5,25 @@ <h1>Connection Properties</h1>
       <div class="form-group">
         <label class="col-sm-1 control-label" for="name">Name</label>
         <div class="col-sm-10">
-          <input type="text" class="form-control" id="name" required [(ngModel)]="model.getName()" name="name">
+          <input type="text" class="form-control" id="name" required [(ngModel)]="connectionName" name="name">
         </div>
       </div>
       <div class="form-group">
         <label class="col-sm-1 control-label" for="dv__jndiName">JNDI Name</label>
         <div class="col-sm-10">
-          <input type="text" class="form-control" id="dv__jndiName" required [(ngModel)]="model.getJndiName()" name="jndiName">
+          <input type="text" class="form-control" id="dv__jndiName" required [(ngModel)]="connectionJndiName" name="jndiName">
         </div>
       </div>
       <div class="form-group">
         <label class="col-sm-1 control-label" for="dv__driverName">Driver</label>
         <div class="col-sm-10">
-          <input type="text" class="form-control" id="dv__driverName" [(ngModel)]="model.getDriverName()" name="driverName">
+          <input type="text" class="form-control" id="dv__driverName" [(ngModel)]="connectionDriverName" name="driverName">
         </div>
       </div>
       <div class="form-group">
         <label class="col-sm-1 control-label" for="jdbc">JDBC</label>
         <div class="col-sm-10">
-          <input type="checkbox" class="form-control" id="jdbc" [(ngModel)]="model.isJdbc()" name="jdbc">
+          <input type="checkbox" class="form-control" id="jdbc" [(ngModel)]="connectionIsJdbc" name="jdbc">
         </div>
       </div>
       <hr/>