GUI -- Added category to the UiView abstraction.
Change-Id: I55fff4d242e8d6b8d8ce3d25e8f9355dc0ef976a
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
index be229d3..853dd94 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
@@ -44,7 +44,6 @@
private static final String INJECT_VIEW_ITEMS_START = "<!-- {INJECTED-VIEW-NAV-START} -->";
private static final String INJECT_VIEW_ITEMS_END = "<!-- {INJECTED-VIEW-NAV-END} -->";
-
private static final String NAV_FORMAT =
"<a ng-click=\"navCtrl.hideNav()\" href=\"#/%s\">%s</a>\n";
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index 2f1a2e2..a924dba 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -38,6 +38,8 @@
import static com.google.common.collect.ImmutableList.of;
import static java.util.stream.Collectors.toSet;
+import static org.onosproject.ui.UiView.Category.NETWORK;
+import static org.onosproject.ui.UiView.Category.PLATFORM;
/**
* Manages the user interface extensions.
@@ -60,14 +62,14 @@
// Creates core UI extension
private static UiExtension createCoreExtension() {
- List<UiView> coreViews = of(new UiView("topo", "Topology"),
- new UiView("device", "Devices"),
+ List<UiView> coreViews = of(new UiView(PLATFORM, "app", "Applications"),
+ new UiView(PLATFORM, "cluster", "Cluster Nodes"),
+ new UiView(NETWORK, "topo", "Topology"),
+ new UiView(NETWORK, "device", "Devices"),
new UiViewHidden("flow"),
- new UiView("link", "Links"),
- new UiView("host", "Hosts"),
- new UiView("intent", "Intents"),
- new UiView("app", "Applications"),
- new UiView("cluster", "Cluster Nodes"));
+ new UiView(NETWORK, "link", "Links"),
+ new UiView(NETWORK, "host", "Hosts"),
+ new UiView(NETWORK, "intent", "Intents"));
UiMessageHandlerFactory messageHandlerFactory =
() -> ImmutableList.of(
diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index d478a2a..5d534e3 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -106,7 +106,7 @@
// If view ID not provided, route to the first view in the list.
$routeProvider
.otherwise({
- redirectTo: '/' + viewIds[0]
+ redirectTo: '/topo'
});
function viewCtrlName(vid) {