diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs
index 9025c456..11e7f64b 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/raspberrypi.hbs
@@ -4,5 +4,5 @@
{{/zone}}
{{#zone "body"}}
{{unit "appbar" link="store" title="STORE"}}
- {{unit "devices/raspberrypi"}}
+ {{unit "raspberrypi"}}
{{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs
index 4a4b58c1..a1b5049d 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/sensebot.hbs
@@ -4,5 +4,5 @@
{{/zone}}
{{#zone "body"}}
{{unit "appbar" link="store" title="STORE"}}
- {{unit "devices/sensebot"}}
+ {{unit "sensebot"}}
{{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/windows.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/windows.hbs
index cdfa94ba..8b87456d 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/windows.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/devices/windows.hbs
@@ -4,5 +4,5 @@
{{/zone}}
{{#zone "body"}}
{{unit "appbar" link="store" title="STORE"}}
- {{unit "devices/windows"}}
+ {{unit "windows"}}
{{/zone}}
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag
new file mode 100755
index 00000000..c0097b63
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag
@@ -0,0 +1,12 @@
+<%
+var userModule = require("/modules/user.js").userModule;
+userModule.addPermissions([{key: "device-mgt/", name: "Device Management"}], "");
+userModule.addPermissions([{key: "device-mgt/admin", name: "Device Management Admin"}], "");
+userModule.addPermissions([{key: "device-mgt/user", name: "Device Management User"}], "");
+
+userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/admin");
+userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/user");
+userModule.addPermissions([{key: "devices/list", name: "List all Devices"}], "device-mgt/admin");
+userModule.addPermissions([{key: "devices/list", name: "List own Devices"}], "device-mgt/user");
+new Log().info(userModule.isAuthorized("/permission/device-mgt/admin/devices/list"));
+%>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/test/device-spec.js b/modules/distribution/src/repository/jaggeryapps/iotserver/test/device-spec.js
new file mode 100755
index 00000000..f8ce2f3e
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/test/device-spec.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. 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.
+ */
+
+describe('Device Module', function () {
+ var log = new Log();
+ var mobileDB;
+ var cdmDB;
+ var deviceModule = require("/modules/device.js").deviceModule;
+
+ function tearUp() {
+ mobileDB = new Database("MobileDM_DS");
+ cdmDB = new Database("DM_DS");
+ cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+ "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+ "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+ " 1,'4892813d-0b18-4a02-b7b1-61775257488e', 'admin@wso2.com', '-1234');");
+ cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+ "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+ "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+ " 1,'4892813d-0b18-4a02-b7b1-61775257488F', 'mdm@wso2.com', '-1234');");
+
+ mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+ "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+ "values ('4892813d-0b18-4a02-b7b1-61775257488e', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+ "'Galaxy Tab', 'Samsung', '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+ "'ksdfjlskfjwer', '234234');");
+ mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+ "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+ "values ('4892813d-0b18-4a02-b7b1-61775257488F', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+ "'Galaxy Tab', 'Samsung', '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+ "'ksdfjlskfjwer', '234234');");
+ }
+
+ function tearDown() {
+ deleteData();
+ mobileDB.close();
+ cdmDB.close();
+ }
+
+ function deleteData(){
+ cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488e'");
+ cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488F'");
+ mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488e'");
+ mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488F'");
+ }
+
+ it('List all Devices - Device Module', function () {
+ try {
+ tearUp();
+ var results = deviceModule.listDevices();
+ expect(results.length).not.toBe(0);
+ } catch (e) {
+ log.error(e);
+ throw e;
+ } finally {
+ tearDown();
+ }
+ });
+ it('List Devices for User - Device Module', function () {
+ try {
+ tearUp();
+ var results = deviceModule.listDevicesForUser("mdm@wso2.com");
+ expect(results.length).toBe(1);
+ } catch (e) {
+ log.error(e);
+ throw e;
+ } finally {
+ tearDown();
+ }
+ });
+ it('Perform operation on the device', function(){
+ try {
+ tearUp();
+ var devices = [{"id": "4892813d-0b18-4a02-b7b1-61775257488e", "type": "android"}];
+ var operation = {"featureName": "DEVICE_LOCK", "type": "COMMAND", "properties": {"enabled": true}}
+ var results = deviceModule.performOperation(devices, operation);
+ expect(results.length).toBe(1);
+ } catch (e) {
+ log.error(e);
+ throw e;
+ } finally {
+ tearDown();
+ }
+ });
+});
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/test/testExecutor.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/test/testExecutor.jag
old mode 100644
new mode 100755
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/test/user-spec.js b/modules/distribution/src/repository/jaggeryapps/iotserver/test/user-spec.js
new file mode 100755
index 00000000..5bbf7444
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/test/user-spec.js
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. 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.
+ */
+
+describe('Device Module', function () {
+ var log = new Log();
+ var mobileDB;
+ var cdmDB;
+ var deviceModule = require("/modules/device.js").deviceModule;
+ var userModule = require("/modules/user.js").userModule;
+ var constants = require("/modules/constants.js");
+ function tearUp() {
+ mobileDB = new Database("MobileDM_DS");
+ cdmDB = new Database("DM_DS");
+ cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+ "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+ "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+ " 1,'4892813d-0b18-4a02-b7b1-61775257488e', 'admin@wso2.com', '-1234');");
+ cdmDB.query("insert into dm_device(description, name, date_of_enrollment, date_of_last_update, " +
+ "ownership,status, device_type_id, device_identification, owner, tenant_id ) " +
+ "values ('Galaxy Tab','Admin Samsung', 1425467382, 1425467382, 'BYOD', 'ACTIVE'," +
+ " 1,'4892813d-0b18-4a02-b7b1-61775257488F', 'mdm@wso2.com', '-1234');");
+
+ mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+ "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+ "values ('4892813d-0b18-4a02-b7b1-61775257488e', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+ "'Galaxy Tab', 'Samsung', '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+ "'ksdfjlskfjwer', '234234');");
+ mobileDB.query("insert into mbl_device (mobile_device_id, push_token, imei ,imsi, os_version, " +
+ "device_model , vendor ,latitude ,longitude , challenge ,token, unlock_token ,serial ) " +
+ "values ('4892813d-0b18-4a02-b7b1-61775257488F', 'sdfsdf', 'cxv', 'vbcb', '4.1', " +
+ "'Galaxy Tab', 'Samsung', '234234234', '4345345234234', 'dfjsdlfk', 'wuweir234', " +
+ "'ksdfjlskfjwer', '234234');");
+ session.put(constants.USER_SESSION_KEY, {"username" : "admin", "domain": "carbon.super", "tenantId": "-1234"});
+ }
+
+ function tearDown() {
+ deleteData();
+ mobileDB.close();
+ cdmDB.close();
+ session.put(constants.USER_SESSION_KEY, null);
+ }
+
+ function deleteData(){
+ cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488e'");
+ cdmDB.query("delete from dm_device where device_identification='4892813d-0b18-4a02-b7b1-61775257488F'");
+ mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488e'");
+ mobileDB.query("delete from mbl_device where mobile_device_id='4892813d-0b18-4a02-b7b1-61775257488F'");
+ }
+
+ it('List all users', function () {
+ try {
+ tearUp();
+ var results = userModule.getUsers();
+ expect(results.length).not.toBe(0);
+ } catch (e) {
+ log.error(e);
+ throw e;
+ } finally {
+ tearDown();
+ }
+ });
+ it('Check permission for user', function () {
+ try {
+ tearUp();
+ expect(userModule.isAuthorized("/permission/device-mgt/user/devices/list")).toBe(true);
+ } catch (e) {
+ log.error(e);
+ throw e;
+ } finally {
+ tearDown();
+ }
+ });
+});
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/tmp/.gitignore b/modules/distribution/src/repository/jaggeryapps/iotserver/tmp/.gitignore
new file mode 100755
index 00000000..50e166d6
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/tmp/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything in this directory.
+# they are auto generated, should not be committed.
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag
new file mode 100755
index 00000000..77778307
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag
@@ -0,0 +1,4 @@
+<%
+var apiWrapperUtil = require("/modules/api-wrapper-util.js").apiWrapperUtil;
+apiWrapperUtil.refreshToken();
+%>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/android.hbs
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js
new file mode 100644
index 00000000..dae1a137
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.js
@@ -0,0 +1,4 @@
+function onRequest(context){
+ context.sketchPath = "api/device/sketch/download";
+ return context;
+}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/android.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/android.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/images/android-thumb.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android-thumb.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/images/android-thumb.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android-thumb.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/images/android.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/images/android.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/images/android.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android/public/store.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/android_sense.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/android_sense.hbs
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js
new file mode 100644
index 00000000..dae1a137
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.js
@@ -0,0 +1,4 @@
+function onRequest(context){
+ context.sketchPath = "api/device/sketch/download";
+ return context;
+}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/android_sense.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/android_sense.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/images/android_sense-thumb.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense-thumb.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/images/android_sense-thumb.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense-thumb.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/images/android_sense.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/images/android_sense.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/images/android_sense.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/store.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/android_sense/public/store.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/public/store.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.hbs
index e82f3989..4067deba 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.hbs
@@ -41,7 +41,7 @@
- - Device Management
+ - My Devices
{{#if permissions.ADD_USER}}
- User Management
{{/if}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.js
index 7d0416b2..381b757a 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/appbar/appbar.js
@@ -1,6 +1,6 @@
function onRequest(context) {
var constants = require("/modules/constants.js");
- var user = session.get(constants.USER_SESSION_KEY);
+ var carbonUser = session.get(constants.USER_SESSION_KEY);
var links = {
"users": [],
@@ -18,7 +18,7 @@ function onRequest(context) {
};
var deviceMgtLink = {
- title: "Go back to Device Management",
+ title: "Go back to My Devices",
icon: "fw-left-arrow",
url: "/iotserver/devices"
};
@@ -38,9 +38,12 @@ function onRequest(context) {
links.analytics.push(deviceMgtLink);
links['device-mgt'].push(dashboardLink);
- if (user) {
+ if (!carbonUser) {
+ //user is not logged in
+ }else{
var userModule = require("/modules/user.js").userModule;
var permissions = userModule.getUIPermissions();
+
context.permissions = permissions;
//if (permissions.ADD_USER) {
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/arduino.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/arduino.hbs
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.js
new file mode 100644
index 00000000..dae1a137
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.js
@@ -0,0 +1,4 @@
+function onRequest(context){
+ context.sketchPath = "api/device/sketch/download";
+ return context;
+}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/arduino.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/arduino.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/images/arduino-thumb.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/images/arduino-thumb.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/images/arduino-thumb.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/images/arduino-thumb.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/images/arduino.png b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/images/arduino.png
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/images/arduino.png
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/images/arduino.png
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/store.json
similarity index 100%
rename from modules/distribution/src/repository/jaggeryapps/iotserver/units/devices/arduino/public/store.json
rename to modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/public/store.json
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
index 8dddd607..17444875 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/device-listing.hbs
@@ -93,7 +93,7 @@
Device was successfully updated.
@@ -165,4 +165,4 @@
{{#zone "bottomJs"}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
index 097882cd..b2663ec3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js
@@ -253,24 +253,25 @@ function attachEvents() {
$("a#remove-device-yes-link").click(function () {
invokerUtil.get(
removeDeviceAPI,
- function (data) {
- if (data == 200) {
- $("#" + username).addClass("hide");
+ function (data,txtStatus,jqxhr) {
+ var status = jqxhr.status;
+ if (status == 200) {
$(modalPopupContent).html($('#remove-device-200-content').html());
- $("a#remove-device-200-link").click(function () {
+ $('div[data-deviceid="' + deviceId + '"]').remove();
+ $("a#remove-device-200-link").click(function () {
hidePopup();
});
- } else if (data == 400) {
+ } else if (status == 400) {
$(modalPopupContent).html($('#remove-device-400-content').html());
$("a#remove-device-400-link").click(function () {
hidePopup();
});
- } else if (data == 403) {
+ } else if (status == 403) {
$(modalPopupContent).html($('#remove-device-403-content').html());
$("a#remove-device-403-link").click(function () {
hidePopup();
});
- } else if (data == 409) {
+ } else if (status == 409) {
$(modalPopupContent).html($('#remove-device-409-content').html());
$("a#remove-device-409-link").click(function () {
hidePopup();
@@ -308,28 +309,31 @@ function attachEvents() {
showPopup();
$("a#edit-device-yes-link").click(function () {
- var device={"device":{"name" : $('#edit-device-name').val()}};
+ var newDeviceName = $('#edit-device-name').val();
+ var device={"device":{"name" : newDeviceName}};
invokerUtil.post(
editDeviceAPI,
device,
- function (data) {
- if (data == 200) {
- $("#" + username).addClass("hide");
+ function (data,txtStatus,jqxhr) {
+ var status = jqxhr.status;
+ if (status == 200) {
$(modalPopupContent).html($('#edit-device-200-content').html());
+ console.log("asdsdasda" + newDeviceName);
+ $("div[data-deviceid='"+deviceId+"'] .ast-name").html(newDeviceName);
$("a#edit-device-200-link").click(function () {
hidePopup();
});
- } else if (data == 400) {
+ } else if (status == 400) {
$(modalPopupContent).html($('#edit-device-400-content').html());
$("a#edit-device-400-link").click(function () {
hidePopup();
});
- } else if (data == 403) {
+ } else if (status == 403) {
$(modalPopupContent).html($('#edit-device-403-content').html());
$("a#edit-device-403-link").click(function () {
hidePopup();
});
- } else if (data == 409) {
+ } else if (status == 409) {
$(modalPopupContent).html($('#edit-device-409-content').html());
$("a#edit-device-409-link").click(function () {
hidePopup();
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js.save b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js.save
new file mode 100644
index 00000000..37be0302
--- /dev/null
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/js/device-listing.js.save
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. 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 () {
+ var cache = {};
+ var permissionSet = {};
+ var validateAndReturn = function (value) {
+ return (value == undefined || value == null) ? "Unspecified" : value;
+ };
+ Handlebars.registerHelper("deviceMap", function (device) {
+ device.owner = validateAndReturn(device.owner);
+ device.ownership = validateAndReturn(device.ownership);
+ var arr = device.properties;
+ if (arr) {
+ device.properties = arr.reduce(function (total, current) {
+ total[current.name] = validateAndReturn(current.value);
+ return total;
+ }, {});
+ }
+ });
+
+ //This method is used to setup permission for device listing
+ $.setPermission = function (permission) {
+ permissionSet[permission] = true;
+ };
+
+ $.hasPermission = function (permission) {
+ return permissionSet[permission];
+ };
+})();
+
+/*
+ * Setting-up global variables.
+ */
+var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
+var assetContainer = "#ast-container";
+
+/*
+ * DOM ready functions.
+ */
+$(document).ready(function () {
+ /* Adding selected class for selected devices */
+ $(deviceCheckbox).each(function () {
+ addDeviceSelectedClass(this);
+ });
+
+ var i;
+ var permissionList = $("#permission").data("permission");
+ for (i = 0; i < permissionList.length; i++) {
+ $.setPermission(permissionList[i]);
+ }
+
+ /* for device list sorting drop down */
+ $(".ctrl-filter-type-switcher").popover({
+ html: true,
+ content: function () {
+ return $("#content-filter-types").html();
+ }
+ });
+});
+
+/*
+ * On Select All Device button click function.
+ *
+ * @param button: Select All Device button
+ */
+function selectAllDevices(button) {
+ if (!$(button).data('select')) {
+ $(deviceCheckbox).each(function (index) {
+ $(this).prop('checked', true);
+ addDeviceSelectedClass(this);
+ });
+ $(button).data('select', true);
+ $(button).html('Deselect All Devices');
+ } else {
+ $(deviceCheckbox).each(function (index) {
+ $(this).prop('checked', false);
+ addDeviceSelectedClass(this);
+ });
+ $(button).data('select', false);
+ $(button).html('Select All Devices');
+ }
+}
+
+/*
+ * On listing layout toggle buttons click function.
+ *
+ * @param view: Selected view type
+ * @param selection: Selection button
+ */
+function changeDeviceView(view, selection) {
+ $(".view-toggle").each(function () {
+ $(this).removeClass("selected");
+ });
+ $(selection).addClass("selected");
+ if (view == "list") {
+ $(assetContainer).addClass("list-view");
+ } else {
+ $(assetContainer).removeClass("list-view");
+ }
+}
+
+/*
+ * Add selected style class to the parent element function.
+ *
+ * @param checkbox: Selected checkbox
+ */
+function addDeviceSelectedClass(checkbox) {
+ if ($(checkbox).is(":checked")) {
+ $(checkbox).closest(".ctrl-wr-asset").addClass("selected device-select");
+ } else {
+ $(checkbox).closest(".ctrl-wr-asset").removeClass("selected device-select");
+ }
+}
+function loadDevices(searchType, searchParam) {
+ var deviceListing = $("#device-listing");
+ var deviceListingSrc = deviceListing.attr("src");
+ var imageResource = deviceListing.data("image-resource");
+ $.template("device-listing", deviceListingSrc, function (template) {
+ var serviceURL;
+ if ($.hasPermission("LIST_DEVICES")) {
+ serviceURL = "/iotserver/api/devices/all";
+ } else if ($.hasPermission("LIST_OWN_DEVICES")) {
+ //Get authenticated users devices
+ serviceURL = "/iotserver/api/devices/all";
+ } else {
+ $("#ast-container").html("Permission denied");
+ return;
+ }
+ if (searchParam) {
+ if (searchType == "users") {
+ serviceURL = serviceURL + "?user=" + searchParam;
+ } else if (searchType == "user-roles") {
+ serviceURL = serviceURL + "?role=" + searchParam;
+ } else {
+ serviceURL = serviceURL + "?type=" + searchParam;
+ }
+ }
+ var successCallback = function (data) {
+ data = JSON.parse(data);
+ var viewModel = {};
+ viewModel.devices = data.data;
+ viewModel.imageLocation = imageResource;
+ if(!data.data || data.data.length <= 0){
+ $("#ast-container").html($("#no-devices-div-content").html());
+ } else {
+ var content = template(viewModel);
+ $("#ast-container").html(content);
+ /*
+ * On device checkbox select add parent selected style class
+ */
+ $(deviceCheckbox).click(function () {
+ addDeviceSelectedClass(this);
+ });
+ attachEvents();
+ formatDates();
+ }
+ };
+ invokerUtil.get(serviceURL,
+ successCallback, function (message) {
+ console.log(message);
+ });
+ });
+}
+$(document).ready(function () {
+ loadDevices();
+});
+
+function formatDates(){
+ $(".formatDate").each(function(){
+ var timeStamp = $(this).html();
+ $(this).html(new Date(parseInt(timeStamp)).toUTCString());
+ });
+}
+
+/**
+ * Sorting function of users
+ * listed on User Management page in WSO2 MDM Console.
+ */
+$(function () {
+ var sortableElem = '.wr-sortable';
+ $(sortableElem).sortable({
+ beforeStop: function () {
+ var sortedIDs = $(this).sortable('toArray');
+ console.log(sortedIDs);
+ }
+ });
+ $(sortableElem).disableSelection();
+});
+
+var modalPopup = ".wr-modalpopup";
+var modalPopupContainer = modalPopup + " .modalpopup-container";
+var modalPopupContent = modalPopup + " .modalpopup-content";
+var body = "body";
+
+/*
+ * set popup maximum height function.
+ */
+function setPopupMaxHeight() {
+ $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30)));
+ $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2)));
+}
+
+/*
+ * show popup function.
+ */
+function showPopup() {
+ $(modalPopup).show();
+ setPopupMaxHeight();
+}
+
+/*
+ * hide popup function.
+ */
+function hidePopup() {
+ $(modalPopupContent).html('');
+ $(modalPopup).hide();
+}
+
+
+/**
+ * Following functions should be triggered after AJAX request is made.
+ */
+function attachEvents() {
+ /**
+ * Following click function would execute
+ * when a user clicks on "Remove" link
+ * on Device Management page in WSO2 MDM Console.
+ */
+ $("a.remove-device-link").click(function () {
+ var deviceId = $(this).data("deviceid");
+ var deviceType = $(this).data("devicetype");
+ var removeDeviceAPI = "/iotserver/api/device/" + deviceType + "/" + deviceId + "/remove";
+
+ $(modalPopupContent).html($('#remove-device-modal-content').html());
+ showPopup();
+
+ $("a#remove-device-yes-link").click(function () {
+ invokerUtil.get(
+ removeDeviceAPI,
+ function (data,txtStatus,jqxhr) {
+ var status = jqxhr.status;
+ if (status == 200) {
+ $(modalPopupContent).html($('#remove-device-200-content').html());
+ $("a#remove-device-200-link").click(function () {
+ hidePopup();
+ });
+ $("")
+ } else if (status == 400) {
+ $(modalPopupContent).html($('#remove-device-400-content').html());
+ $("a#remove-device-400-link").click(function () {
+ hidePopup();
+ });
+ } else if (status == 403) {
+ $(modalPopupContent).html($('#remove-device-403-content').html());
+ $("a#remove-device-403-link").click(function () {
+ hidePopup();
+ });
+ } else if (status == 409) {
+ $(modalPopupContent).html($('#remove-device-409-content').html());
+ $("a#remove-device-409-link").click(function () {
+ hidePopup();
+ });
+ }
+ },
+ function () {
+ $(modalPopupContent).html($('#remove-device-unexpected-error-content').html());
+ $("a#remove-device-unexpected-error-link").click(function () {
+ hidePopup();
+ });
+ }
+ );
+ });
+
+ $("a#remove-device-cancel-link").click(function () {
+ hidePopup();
+ });
+
+ });
+
+ /**
+ * Following click function would execute
+ * when a user clicks on "Edit" link
+ * on Device Management page in WSO2 MDM Console.
+ */
+ $("a.edit-device-link").click(function () {
+ var deviceId = $(this).data("deviceid");
+ var deviceType = $(this).data("devicetype");
+ var deviceName = $(this).data("devicename");
+ var editDeviceAPI = "/iotserver/api/device/" + deviceType + "/" + deviceId + "/update";
+
+ $(modalPopupContent).html($('#edit-device-modal-content').html());
+ $('#edit-device-name').val(deviceName);
+ showPopup();
+
+ $("a#edit-device-yes-link").click(function () {
+ var device={"device":{"name" : $('#edit-device-name').val()}};
+ invokerUtil.post(
+ editDeviceAPI,
+ device,
+ function (data,txtStatus,jqxhr) {
+ var status = jqxhr.status;
+ if (status == 200) {
+ $(modalPopupContent).html($('#edit-device-200-content').html());
+ $("a#edit-device-200-link").click(function () {
+ hidePopup();
+ });
+ } else if (status == 400) {
+ $(modalPopupContent).html($('#edit-device-400-content').html());
+ $("a#edit-device-400-link").click(function () {
+ hidePopup();
+ });
+ } else if (status == 403) {
+ $(modalPopupContent).html($('#edit-device-403-content').html());
+ $("a#edit-device-403-link").click(function () {
+ hidePopup();
+ });
+ } else if (status == 409) {
+ $(modalPopupContent).html($('#edit-device-409-content').html());
+ $("a#edit-device-409-link").click(function () {
+ hidePopup();
+ });
+ }
+ },
+ function () {
+ $(modalPopupContent).html($('#edit-device-unexpected-error-content').html());
+ $("a#edit-device-unexpected-error-link").click(function () {
+ hidePopup();
+ });
+ }
+ );
+ });
+
+ $("a#edit-device-cancel-link").click(function () {
+ hidePopup();
+ });
+ });
+}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
index 767aab17..0ffc884e 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/device-listing/public/templates/device-listing.hbs
@@ -1,6 +1,6 @@
{{#each devices}}
{{deviceMap this}}
-
+