Add instance details
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@963391 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/webconsole-plugin/src/main/resources/res/ui/factory.js b/ipojo/webconsole-plugin/src/main/resources/res/ui/factory.js
index 8fc76cf..81fc782 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/ui/factory.js
+++ b/ipojo/webconsole-plugin/src/main/resources/res/ui/factory.js
@@ -52,7 +52,6 @@
}
function loadInstancesData() {
- console.log("Go to instances");
window.location = instances_url;
}
diff --git a/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
new file mode 100644
index 0000000..dc58708
--- /dev/null
+++ b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
@@ -0,0 +1,172 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+function renderInstanceDetails(data) {
+ $(".statline").html(getInstancesStatLine(data));
+ createDetail( data.data );
+}
+
+function getInstancesStatLine(instances) {
+ return instances.count + " instances in total, "
+ + instances.valid_count + " valid instances, "
+ + instances.invalid_count + " invalid instances.";
+}
+
+function createDetail(instance) {
+ console.log("Create details");
+ var service = "No provided services"
+
+ var _ = tableBody;
+
+ // Set the name
+ _.find('td.Vname').html(instance.name);
+
+ // Set the state
+ _.find('td.Vstate').text(instance.state);
+
+ // Set the factory
+ _.find('td.Vfactory').html(instance.factory); //TODO Link
+
+ if (instance.services) {
+ $(tableServiceBody).empty();
+ for (var s in instance.services) {
+ var service = instance.services[s];
+ // For each service clone the template
+ var entry = serviceEntryTemplate.clone().appendTo(tableServiceBody).attr('id', 'service-' + service.specification);
+ entry.find('td.name').text(service.specification);
+ entry.find('td.state').text(service.state);
+
+ if (service.id) {
+ entry.find('td.id').text(service.id);
+ } else {
+ entry.find('td.id').html('<i>not registered</i>');
+ }
+
+ if (service.properties) {
+ var list = $('<ul>');
+ for (var x in service.properties) {
+ list.append($('<li>').append(service.properties[x].name + ' = ' + service.properties[x].value));
+ }
+ entry.find('td.properties').html(list);
+ } else {
+ entry.find('td.properties').html('<i>not properties</i>');
+ }
+ }
+ } else {
+ // Hide the table
+ $('services').hide();
+ _.find('td.Vservices').html("No provided services");
+ }
+
+ if (instance.req) {
+ $(tableReqBody).empty();
+ for (var s in instance.req) {
+ var service = instance.req[s];
+ console.dir(service);
+ // For each service clone the template
+ var entry = reqEntryTemplate.clone().appendTo(tableReqBody).attr('id', 'req-' + service.id);
+ entry.find('td.name').text(service.specification);
+ entry.find('td.id').text(service.id);
+ entry.find('td.state').text(service.state);
+
+ entry.find('td.policy').text(service.policy);
+ entry.find('td.optional').text(service.optional);
+ entry.find('td.aggregate').text(service.aggregate);
+
+
+ if (service.matching) {
+ var list = $('<ul>');
+ for (var x in service.matching) {
+ list.append($('<li>').append(service.matching[x].id)); // TODO Link
+ }
+ entry.find('td.matching').html(list);
+ } else {
+ entry.find('td.matching').html('<i>no matching services</i>');
+ }
+
+ if (service.used) {
+ var list = $('<ul>');
+ for (var x in service.used) {
+ list.append($('<li>').append(service.used[x].id)); // TODO Link
+ }
+ entry.find('td.used').html(list);
+ } else {
+ entry.find('td.used').html('<i>no used services</i>');
+ }
+
+ }
+ } else {
+ // Hide the table
+ $('reqServices').hide();
+ _.find('td.VreqServices').html("No required services");
+ }
+
+
+ _.find('pre.architecture_content').text(instance.architecture);
+}
+
+function retrieveDetails() {
+ $.get(pluginRoot + '/instances/' + instance_name + '.json', null, function(data) {
+ renderInstanceDetails(data);
+ }, "json");
+}
+
+function loadFactoriesData() {
+ window.location = factories_url;
+}
+
+function loadInstancesData() {
+ window.location = instances_url;
+}
+
+function loadHandlersData() {
+ window.location = handlers_url;
+}
+
+var tableBody = false;
+var tableServiceBody = false;
+var serviceEntryTemplate = false;
+
+var tableReqBody = false;
+var reqEntryTemplate = false;
+
+
+$(document).ready(function(){
+ tableBody = $('#plugin_table tbody');
+
+ tableServiceBody = $('.services tbody');
+ serviceEntryTemplate = tableServiceBody.find('tr').clone();
+
+ tableReqBody = $('.reqServices tbody');
+ reqEntryTemplate = tableReqBody.find('tr').clone();
+
+
+ retrieveDetails();
+
+ $(".instancesButton").click(loadInstancesData);
+ $(".factoriesButton").click(loadFactoriesData);
+ $(".handlersButton").click(loadHandlersData);
+
+ var extractMethod = function(node) {
+ var link = node.getElementsByTagName("a");
+ if ( link && link.length == 1 ) {
+ return link[0].innerHTML;
+ }
+ return node.innerHTML;
+ };
+
+});
+
diff --git a/ipojo/webconsole-plugin/src/main/resources/res/ui/ipojo.js b/ipojo/webconsole-plugin/src/main/resources/res/ui/ipojo.js
index f59f15f..30cc9e0 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/ui/ipojo.js
+++ b/ipojo/webconsole-plugin/src/main/resources/res/ui/ipojo.js
@@ -36,8 +36,8 @@
var _ = tableEntryTemplate.clone().appendTo(tableBody).attr('id', 'instance-' + instance.name);
- _.find('td.name').html('<a href="' + window.location.pathname + '/instance/' + name + '">' + name + '</a>');
- _.find('td.factory').html('<a href="' + window.location.pathname + '/factory/' + factory + '">' + factory + '</a>');;
+ _.find('td.name').html('<a href="' + instances_url + '/' + name + '">' + name + '</a>');
+ _.find('td.factory').html('<a href="' + factories_url + '/' + factory + '">' + factory + '</a>');;
_.find('td.state').text(state);
}