community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Megala 2016-10-05 10:10:12 +05:30
commit f9204add08
7 changed files with 791 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
View File

@ -1,81 +1,118 @@
/*
* Copyright (c) 2016, 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.
*
*/
package org.wso2.carbon.device.mgt.jaxrs.service.api; package org.wso2.carbon.device.mgt.jaxrs.service.api;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.wso2.carbon.apimgt.annotations.api.API;
import org.wso2.carbon.apimgt.annotations.api.Permission;
import javax.ws.rs.GET; import javax.ws.rs.*;
import javax.ws.rs.Path; import javax.ws.rs.core.MediaType;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
//@Path("/dashboard") /**
//@Api(value = "Dashboard", description = "Dashboard related operations are described here.") * Device Analytics Dashboard related REST-APIs. This can be used to obtain device related analytics.
*/
@API(name = "Device Analytics Dashboard",
version = "1.0.0", context = "/api/device-mgt/v1.0/dashboard", tags = {"devicemgt_admin"})
@Path("/dashboard")
@Api(value = "Device Analytics Dashboard",
description = "Device Analytics Dashboard related information APIs are described here.")
@Produces(MediaType.APPLICATION_JSON)
@SuppressWarnings("NonJaxWsWebServices") @SuppressWarnings("NonJaxWsWebServices")
public interface Dashboard { public interface Dashboard {
// String CONNECTIVITY_STATUS = "connectivity-status"; String CONNECTIVITY_STATUS = "connectivity-status";
// String POTENTIAL_VULNERABILITY = "potential-vulnerability"; String POTENTIAL_VULNERABILITY = "potential-vulnerability";
// String NON_COMPLIANT_FEATURE_CODE = "non-compliant-feature-code"; String NON_COMPLIANT_FEATURE_CODE = "non-compliant-feature-code";
// String PLATFORM = "platform"; String PLATFORM = "platform";
// String OWNERSHIP = "ownership"; String OWNERSHIP = "ownership";
// // Constants related to pagination // Constants related to pagination
// String PAGINATION_ENABLED = "pagination-enabled"; String PAGINATION_ENABLED = "pagination-enabled";
// String START_INDEX = "start"; String START_INDEX = "start";
// String RESULT_COUNT = "length"; String RESULT_COUNT = "length";
//
// @GET @GET
// @Path("device-count-overview") @Path("device-count-overview")
// Response getOverviewDeviceCounts(); @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// Response getOverviewDeviceCounts();
// @GET
// @Path("device-counts-by-potential-vulnerabilities") @GET
// Response getDeviceCountsByPotentialVulnerabilities(); @Path("device-counts-by-potential-vulnerabilities")
// @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// @GET Response getDeviceCountsByPotentialVulnerabilities();
// @Path("non-compliant-device-counts-by-features")
// Response getNonCompliantDeviceCountsByFeatures(@QueryParam(START_INDEX) int startIndex, @GET
// @QueryParam(RESULT_COUNT) int resultCount); @Path("non-compliant-device-counts-by-features")
// @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// @GET Response getNonCompliantDeviceCountsByFeatures(@QueryParam(START_INDEX) int startIndex,
// @Path("device-counts-by-groups") @QueryParam(RESULT_COUNT) int resultCount);
// Response getDeviceCountsByGroups(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus,
// @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability, @GET
// @QueryParam(PLATFORM) String platform, @Path("device-counts-by-groups")
// @QueryParam(OWNERSHIP) String ownership); @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// Response getDeviceCountsByGroups(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus,
// @GET @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability,
// @Path("feature-non-compliant-device-counts-by-groups") @QueryParam(PLATFORM) String platform,
// Response getFeatureNonCompliantDeviceCountsByGroups(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode, @QueryParam(OWNERSHIP) String ownership);
// @QueryParam(PLATFORM) String platform,
// @QueryParam(OWNERSHIP) String ownership); @GET
// @GET @Path("feature-non-compliant-device-counts-by-groups")
// @Path("filtered-device-count-over-total") @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// Response getFilteredDeviceCountOverTotal(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus, Response getFeatureNonCompliantDeviceCountsByGroups(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode,
// @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability, @QueryParam(PLATFORM) String platform,
// @QueryParam(PLATFORM) String platform, @QueryParam(OWNERSHIP) String ownership);
// @QueryParam(OWNERSHIP) String ownership); @GET
// @Path("filtered-device-count-over-total")
// @GET @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// @Path("feature-non-compliant-device-count-over-total") Response getFilteredDeviceCountOverTotal(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus,
// Response getFeatureNonCompliantDeviceCountOverTotal(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode, @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability,
// @QueryParam(PLATFORM) String platform, @QueryParam(PLATFORM) String platform,
// @QueryParam(OWNERSHIP) String ownership); @QueryParam(OWNERSHIP) String ownership);
//
// @GET @GET
// @Path("devices-with-details") @Path("feature-non-compliant-device-count-over-total")
// Response getDevicesWithDetails(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus, @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability, Response getFeatureNonCompliantDeviceCountOverTotal(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode,
// @QueryParam(PLATFORM) String platform, @QueryParam(PLATFORM) String platform,
// @QueryParam(OWNERSHIP) String ownership, @QueryParam(OWNERSHIP) String ownership);
// @QueryParam(PAGINATION_ENABLED) String paginationEnabled,
// @QueryParam(START_INDEX) int startIndex, @GET
// @QueryParam(RESULT_COUNT) int resultCount); @Path("devices-with-details")
// @Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
// @GET Response getDevicesWithDetails(@QueryParam(CONNECTIVITY_STATUS) String connectivityStatus,
// @Path("feature-non-compliant-devices-with-details") @QueryParam(POTENTIAL_VULNERABILITY) String potentialVulnerability,
// Response getFeatureNonCompliantDevicesWithDetails(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode, @QueryParam(PLATFORM) String platform,
// @QueryParam(PLATFORM) String platform, @QueryParam(OWNERSHIP) String ownership,
// @QueryParam(OWNERSHIP) String ownership, @QueryParam(PAGINATION_ENABLED) String paginationEnabled,
// @QueryParam(PAGINATION_ENABLED) String paginationEnabled, @QueryParam(START_INDEX) int startIndex,
// @QueryParam(START_INDEX) int startIndex, @QueryParam(RESULT_COUNT) int resultCount);
// @QueryParam(RESULT_COUNT) int resultCount);
@GET
@Path("feature-non-compliant-devices-with-details")
@Permission(name = "View Dashboard", permission = "/device-mgt/dashboard/view")
Response getFeatureNonCompliantDevicesWithDetails(@QueryParam(NON_COMPLIANT_FEATURE_CODE) String nonCompliantFeatureCode,
@QueryParam(PLATFORM) String platform,
@QueryParam(OWNERSHIP) String ownership,
@QueryParam(PAGINATION_ENABLED) String paginationEnabled,
@QueryParam(START_INDEX) int startIndex,
@QueryParam(RESULT_COUNT) int resultCount);
} }

1268
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DashboardImpl.java
View File

File diff suppressed because it is too large Load Diff

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/operation-api.jag
View File

@ -51,7 +51,12 @@ if (uriMatcher.match("/{context}/api/operation/paginate")) {
} else { } else {
response["status"] = restAPIResponse["status"]; response["status"] = restAPIResponse["status"];
if (restAPIResponse["responseText"]) { if (restAPIResponse["responseText"]) {
response["content"] = parse(restAPIResponse["responseText"]); var responseText = "";
try {
response["content"] = parse(restAPIResponse["responseText"]);
} catch (e) {
responseText = restAPIResponse["responseText"];
}
} }
} }
} }

13
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
View File

@ -45,12 +45,13 @@ var invokers = function () {
* If the token pair is not set in the session, this will return null. * If the token pair is not set in the session, this will return null.
*/ */
privateMethods.getAccessToken = function () { privateMethods.getAccessToken = function () {
var tokenPair = session.get(constants["TOKEN_PAIR"]); if (session) {
if (tokenPair) { var tokenPair = session.get(constants["TOKEN_PAIR"]);
return parse(tokenPair)["accessToken"]; if (tokenPair) {
} else { return parse(tokenPair)["accessToken"];
return null; }
} }
return null;
}; };
/** /**
@ -80,7 +81,7 @@ var invokers = function () {
if (devicemgtProps["isOAuthEnabled"]) { if (devicemgtProps["isOAuthEnabled"]) {
var accessToken = privateMethods.getAccessToken(); var accessToken = privateMethods.getAccessToken();
if (!accessToken) { if (accessToken == null) {
userModule.logout(function () { userModule.logout(function () {
response.sendRedirect(devicemgtProps["appContext"] + "login"); response.sendRedirect(devicemgtProps["appContext"] + "login");
}); });

34
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
View File

@ -35,16 +35,26 @@
<div class="row no-gutter"> <div class="row no-gutter">
<div class="wr-hidden-operations-nav col-lg-4"> <div class="wr-hidden-operations-nav col-lg-4">
<a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected"> <a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i> <i class="fw fw-settings fw-stack-2x"></i>
</span> <span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-mobile fw-stack-1x fw-inverse"></i>
</span>
</span>
General Configurations General Configurations
</a> </a>
{{#each deviceTypes}} {{#each deviceTypes}}
<a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)"> <a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i> <i class="fw fw-settings fw-stack-2x"></i>
</span> <span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-{{name}} fw-stack-1x fw-inverse"></i>
</span>
</span>
{{label}} Configurations {{label}} Configurations
</a> </a>
{{/each}} {{/each}}
@ -79,9 +89,7 @@
placeholder="[ Required Field ]"> placeholder="[ Required Field ]">
</div> </div>
<div class="wr-input-control wr-btn-grp"> <div class="wr-input-control wr-btn-grp">
<button id="save-general-btn" class="wr-btn"> <button id="save-general-btn" class="wr-btn">Save</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</button>
</div> </div>
</div> </div>
</div> </div>
@ -107,12 +115,8 @@
<b>"Exit"</b> to complete the process and go back to the dashboard. <b>"Exit"</b> to complete the process and go back to the dashboard.
<hr/> <hr/>
<button class="wr-btn" <button class="wr-btn"
onclick="window.location.href='{{@app.context}}/platform-configuration'">Go onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to configurations</button>
back <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">Exit</button>
to
configurations
</button>
<button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
</div> </div>
</div> </div>
<!-- /content --> <!-- /content -->

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
View File

@ -16,10 +16,6 @@
* under the License. * under the License.
*/ */
.wr-content {
padding-left: 33px;
padding-right: 33px;
}
.wr-input-control .helper { .wr-input-control .helper {
font-weight: 100; font-weight: 100;

22
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
View File

@ -167,7 +167,7 @@ pre {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
body.inverse .fade-edge:after { body.inverse .fade-edge:after {
@ -181,7 +181,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
.visible-block { .visible-block {
@ -4552,6 +4552,15 @@ a.wr-side-panel-toggle-btn.selected {
background: #f4f4f4; background: #f4f4f4;
} }
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i{
color: #526A84;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x{
color: #fff;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x.fw-stroke.fw-inverse{
color: #526A84;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover { .wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover {
color: #ffffff; color: #ffffff;
background: #526A84; background: #526A84;
@ -5515,7 +5524,7 @@ ul.listing li.grouped-input ul.grouped-child-input.disabled {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
body.inverse .fade-edge:after { body.inverse .fade-edge:after {
content: ""; content: "";
@ -5528,7 +5537,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
/* ======================================================================== /* ========================================================================
@ -5752,7 +5761,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
.table.table-selectable > tbody > tr:hover { .table.table-selectable > tbody > tr:hover {
cursor: pointer; cursor: pointer;
@ -6495,3 +6504,6 @@ select > option:hover {
/*background:url('http://cdn-sg1.pgimgs.com/images/pg/close-button.png') no-repeat center center;*/ /*background:url('http://cdn-sg1.pgimgs.com/images/pg/close-button.png') no-repeat center center;*/
} }
.label-bold{
font-weight:400;
}