diff --git a/ngapp/src/app/activities/activities-routing.module.ts b/ngapp/src/app/activities/activities-routing.module.ts
index d91f9a7b..79528fdc 100644
--- a/ngapp/src/app/activities/activities-routing.module.ts
+++ b/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 {}
diff --git a/ngapp/src/app/activities/activities.component.ts b/ngapp/src/app/activities/activities.component.ts
index 3d0e316c..c51ea1a9 100644
--- a/ngapp/src/app/activities/activities.component.ts
+++ b/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);
}
diff --git a/ngapp/src/app/activities/activities.module.ts b/ngapp/src/app/activities/activities.module.ts
index 392fddb4..599796fa 100644
--- a/ngapp/src/app/activities/activities.module.ts
+++ b/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 {}
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 eb38ea96..4849d017 100644
--- a/ngapp/src/app/activities/add-activity/add-activity.component.ts
+++ b/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);
}
diff --git a/ngapp/src/app/activities/shared/activities-constants.ts b/ngapp/src/app/activities/shared/activities-constants.ts
new file mode 100644
index 00000000..66fea42c
--- /dev/null
+++ b/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";
+
+}
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 a32a1777..3cc72898 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
@@ -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);
}
diff --git a/ngapp/src/app/app-routing.module.ts b/ngapp/src/app/app-routing.module.ts
index 64b486da..40fae7ab 100644
--- a/ngapp/src/app/app-routing.module.ts
+++ b/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 {}
diff --git a/ngapp/src/app/app.component.ts b/ngapp/src/app/app.component.ts
index 3cdf875a..91a24300 100644
--- a/ngapp/src/app/app.component.ts
+++ b/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"]
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 2fbbf50e..f797c14b 100644
--- a/ngapp/src/app/connections/add-connection/add-connection.component.ts
+++ b/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);
}
diff --git a/ngapp/src/app/connections/connections-routing.module.ts b/ngapp/src/app/connections/connections-routing.module.ts
index 643674f0..49089690 100644
--- a/ngapp/src/app/connections/connections-routing.module.ts
+++ b/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 {}
diff --git a/ngapp/src/app/connections/connections.component.ts b/ngapp/src/app/connections/connections.component.ts
index c10b07eb..7738fe66 100644
--- a/ngapp/src/app/connections/connections.component.ts
+++ b/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,6 +29,7 @@ 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"],
@@ -36,7 +37,7 @@ import { SortDirection } from "@shared/sort-direction.enum";
})
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);
}
diff --git a/ngapp/src/app/connections/edit-connection/edit-connection.component.ts b/ngapp/src/app/connections/edit-connection/edit-connection.component.ts
index 807a6c74..202a9429 100644
--- a/ngapp/src/app/connections/edit-connection/edit-connection.component.ts
+++ b/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;
diff --git a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.html b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.html
index 05e92068..5ec6aa63 100644
--- a/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.html
+++ b/ngapp/src/app/connections/shared/add-connection-form/add-connection-form.component.html
@@ -5,25 +5,25 @@ Connection Properties
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 126a0da2..e1a92aab 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
@@ -17,10 +17,11 @@
import { Component, EventEmitter, Output } from "@angular/core";
import { Router } from "@angular/router";
-import { connectionsRootPath } from "@connections/connections-routing.module";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
import { NewConnection } from "@connections/shared/new-connection.model";
@Component({
+ moduleId: module.id,
selector: "app-add-connection-form",
templateUrl: "./add-connection-form.component.html",
styleUrls: ["./add-connection-form.component.css"]
@@ -37,6 +38,34 @@ export class AddConnectionFormComponent {
this.router = router;
}
+ /**
+ * @returns {string} the name of the connection
+ */
+ public get connectionName(): string {
+ return this.model.getName();
+ }
+
+ /**
+ * @returns {string} the driver name of the connection
+ */
+ public get connectionDriverName(): string {
+ return this.model.getDriverName();
+ }
+
+ /**
+ * @returns {boolean} true if a JDBC connection
+ */
+ public get connectionIsJdbc(): boolean {
+ return this.model.isJdbc();
+ }
+
+ /**
+ * @returns {string} the JNDI name of the connection
+ */
+ public get connectionJndiName(): string {
+ return this.model.getJndiName();
+ }
+
public currentConnection(): string {
return JSON.stringify(this.model);
}
@@ -58,7 +87,7 @@ export class AddConnectionFormComponent {
}
public cancelAdd(): void {
- const link: string[] = [ connectionsRootPath ];
+ const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
this.router.navigate(link);
}
diff --git a/ngapp/src/app/connections/shared/connection.service.ts b/ngapp/src/app/connections/shared/connection.service.ts
index d0b23b1f..495dd9d0 100644
--- a/ngapp/src/app/connections/shared/connection.service.ts
+++ b/ngapp/src/app/connections/shared/connection.service.ts
@@ -20,8 +20,9 @@ import { Http } from "@angular/http";
import { Connection } from "@connections/shared/connection.model";
import { NewConnection } from "@connections/shared/new-connection.model";
import { ApiService } from "@core/api.service";
-import { komodoWorkspaceUrl } from "@core/api.service";
+import { environment } from "@environments/environment";
import { Observable } from "rxjs/Observable";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
@Injectable()
export class ConnectionService extends ApiService {
@@ -39,7 +40,7 @@ export class ConnectionService extends ApiService {
*/
public getAllConnections(): Observable {
return this.http
- .get(komodoWorkspaceUrl + "/connections", this.getAuthRequestOptions())
+ .get(environment.komodoWorkspaceUrl + ConnectionsConstants.connectionsRootPath, this.getAuthRequestOptions())
.map((response) => {
const connections = response.json();
return connections.map((connection) => Connection.create( connection ));
@@ -54,7 +55,8 @@ export class ConnectionService extends ApiService {
*/
public createConnection(connection: NewConnection): Observable {
return this.http
- .post(komodoWorkspaceUrl + "/connections/" + connection.getName(), connection, this.getAuthRequestOptions())
+ .post(environment.komodoWorkspaceUrl + ConnectionsConstants.connectionsRootPath + "/" + connection.getName(),
+ connection, this.getAuthRequestOptions())
.map((response) => {
return new Connection();
})
@@ -68,7 +70,8 @@ export class ConnectionService extends ApiService {
*/
public deleteConnection(connection: NewConnection): Observable {
return this.http
- .delete(komodoWorkspaceUrl + "/connections/" + connection.getName(), this.getAuthRequestOptions())
+ .delete(environment.komodoWorkspaceUrl + ConnectionsConstants.connectionsRootPath + "/" + connection.getName(),
+ this.getAuthRequestOptions())
.map((response) => null)
.catch(this.handleError);
}
diff --git a/ngapp/src/app/connections/shared/connections-constants.ts b/ngapp/src/app/connections/shared/connections-constants.ts
new file mode 100644
index 00000000..17d5f152
--- /dev/null
+++ b/ngapp/src/app/connections/shared/connections-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 ConnectionsConstants {
+
+ public static readonly connectionsRootRoute = "connections";
+ public static readonly connectionsRootPath = "/" + ConnectionsConstants.connectionsRootRoute;
+
+ public static readonly addConnectionRoute = ConnectionsConstants.connectionsRootRoute + "/add-connection";
+ public static readonly addConnectionPath = ConnectionsConstants.connectionsRootPath + "/add-connection";
+
+ public static readonly editConnectionRoute = ConnectionsConstants.connectionsRootRoute + "/edit-connection";
+ public static readonly editConnectionPath = ConnectionsConstants.connectionsRootPath + "/edit-connection";
+
+}
diff --git a/ngapp/src/app/core/api.service.ts b/ngapp/src/app/core/api.service.ts
index 96ef2e3c..cdc4b8a4 100644
--- a/ngapp/src/app/core/api.service.ts
+++ b/ngapp/src/app/core/api.service.ts
@@ -17,15 +17,12 @@
import { Injectable } from "@angular/core";
import {Headers, RequestOptions} from "@angular/http";
-import { environment } from "@environments/environment";
import "rxjs/add/observable/throw";
import "rxjs/add/operator/catch";
import "rxjs/add/operator/map";
import { Observable } from "rxjs/Observable";
import { ErrorObservable } from "rxjs/observable/ErrorObservable";
-export const komodoWorkspaceUrl = environment.komodoWorkspaceUrl;
-
@Injectable()
export class ApiService {
diff --git a/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.ts b/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.ts
index d9a049fc..f08508d3 100644
--- a/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.ts
+++ b/ngapp/src/app/core/breadcrumbs/breadcrumbs.component.ts
@@ -23,6 +23,4 @@ import {Component} from "@angular/core";
templateUrl: "breadcrumbs.component.html",
styleUrls: ["breadcrumbs.component.css"]
})
-export class BreadcrumbsComponent {
-
-}
+export class BreadcrumbsComponent {}
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 8dd65775..234e8504 100644
--- a/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts
+++ b/ngapp/src/app/core/vertical-nav/vertical-nav.component.ts
@@ -15,8 +15,10 @@
* limitations under the License.
*/
+import { ActivitiesConstants } from "@activities/shared/activities-constants";
import { Component, OnInit } from "@angular/core";
import { NavigationEnd, Router } from "@angular/router";
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
/**
* Models the menus off the main left-hand vertical nav.
@@ -33,6 +35,7 @@ enum VerticalNavType {
})
export class VerticalNavComponent implements OnInit {
+
public menuTypes: any = VerticalNavType;
public currentMenu: VerticalNavType = VerticalNavType.Home;
private router: Router;
@@ -84,7 +87,7 @@ export class VerticalNavComponent implements OnInit {
*/
private onActivitiesClick(): void {
this.currentMenu = VerticalNavType.Activities;
- const link: string[] = [ "/activities" ];
+ const link: string[] = [ ActivitiesConstants.activitiesRootPath ];
this.router.navigate(link);
}
@@ -93,7 +96,7 @@ export class VerticalNavComponent implements OnInit {
*/
private onConnectionsClick(): void {
this.currentMenu = VerticalNavType.Connections;
- const link: string[] = [ "/connections" ];
+ const link: string[] = [ ConnectionsConstants.connectionsRootPath ];
this.router.navigate(link);
}
diff --git a/ngapp/src/environments/environment.ts b/ngapp/src/environments/environment.ts
index 1c44c54e..0aa072e5 100644
--- a/ngapp/src/environments/environment.ts
+++ b/ngapp/src/environments/environment.ts
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import { ConnectionsConstants } from "@connections/shared/connections-constants";
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
@@ -24,7 +25,7 @@ export const environment = {
production: false,
// the home page path
- homePagePath: "/connections",
+ homePagePath: ConnectionsConstants.connectionsRootPath,
// REST URL - Komodo workspace
komodoWorkspaceUrl: "https://localhost:8443/vdb-builder/v1/workspace",