From d74aadae20be4218e530de398781a7d127675465 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 21 Sep 2017 14:42:00 +0530 Subject: [PATCH] Tidying up the topic browser view --- .../public/js/topic-listing.js | 51 +--- .../app/pages/cdmf.page.topic/topic.hbs | 245 ++++-------------- 2 files changed, 61 insertions(+), 235 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/public/js/topic-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/public/js/topic-listing.js index 2c9291e694..973d91b20a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/public/js/topic-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/public/js/topic-listing.js @@ -28,14 +28,6 @@ function InitiateViewOption(url) { } } -/* - * Setting-up global variables. - */ -var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']"; -var assetContainer = "#ast-container"; - -var deviceListing, currentUser,name; - /* * DOM ready functions. */ @@ -52,12 +44,6 @@ $(document).ready(function () { name = getParameterByName("name"); - - /* Adding selected class for selected topics */ - $(deviceCheckbox).each(function () { - addDeviceSelectedClass(this); - }); - /* for device list sorting drop down */ $(".ctrl-filter-type-switcher").popover({ html: true, @@ -67,30 +53,16 @@ $(document).ready(function () { }); }); -/* - * 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 loadTopics(searchType, searchParam) { var serviceURL; if ($.hasPermission("VIEW_TOPICS")) { serviceURL = "/api/mqtt-topics/v1.0/admin/topics"; - console.log("serviceURL------"+serviceURL); } else { $("#loading-content").remove(); - $('#device-table').addClass('hidden'); - $('#device-listing-status-msg').text('Permission denied.'); - $("#device-listing-status").removeClass(' hidden'); + $('#topics-table').addClass('hidden'); + $('#topics-listing-status-msg').text('Permission denied.'); + $("#topics-listing-status").removeClass(' hidden'); return; } @@ -205,22 +177,15 @@ function loadTopics(searchType, searchParam) { }); var json = { - "recordsTotal": Object.keys(data).length, - "recordsFiltered": Object.keys(data).length, + "recordsTotal": data.count, + "recordsFiltered": data.count, "data": objects }; - var table = $('#device-grid1').DataTable(); - - - - setInterval( function () { - table.ajax.reload(); - }, 300000 ); return JSON.stringify(json); }; - $('#device-grid1').datatables_extended_serverside_paging( + $('#topics-grid').datatables_extended_serverside_paging( null, serviceURL, dataFilter, @@ -228,10 +193,8 @@ function loadTopics(searchType, searchParam) { fnCreatedRow, function () { $(".icon .text").res_text(0.2); - $('#device-grid1').removeClass('hidden'); + $('#topics-grid').removeClass('hidden'); $("#loading-content").remove(); - - }, { "placeholder": "Search By Topic Name", "searchKey": "name" diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/topic.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/topic.hbs index ea85b67cb3..e34956912d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/topic.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.topic/topic.hbs @@ -46,198 +46,61 @@
- {{unit "cdmf.unit.device.operation-mod"}} - {{#if deviceCount}} -
- - Loading subscriptions . . . -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
- - {{else}} -
- -
- {{/if}} - -
-
-

- Please enter new name for the device? -

- -
-
- -
-
-
- - Rename - - - - Cancel - -
-
+
+ + Loading subscriptions . . . +
- -
-
-

- Device was successfully updated. -

- -
-
- -
-
-
- -
-
-
-
-

Device was successfully updated.

-
-
-
-
- -
-
-
-
-

Exception at backend. Try Later.

-
-
- - Ok - -
-
-
-
-
- -
-
-
-
-

Operation not permitted.

-
-
- - Ok - -
-
-
-
-
- -
-
-
-
-

Device does not exist.

-
-
- - Ok - -
-
-
-
-
- -
-
-
-
-

Please select one ore more devices in order to perform this - operation.

-
-
- - Ok - -
-
-
-
-
- -
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+