"
- );
-};
-
-stepForwardFrom["policy-criteria"] = function () {
- $("input[type='radio'].select-users-radio").each(function () {
- if ($(this).is(':radio')) {
- if ($(this).is(":checked")) {
- if ($(this).attr("id") == "users-radio-btn") {
- policy["selectedUsers"] = $("#users-input").val();
- policy["selectedUserRoles"] = null;
- } else if ($(this).attr("id") == "user-roles-radio-btn") {
- policy["selectedUsers"] = null;
- policy["selectedUserRoles"] = $("#user-roles-input").val();
- }
- }
- }
- });
- policy["selectedNonCompliantAction"] = $("#action-input").find(":selected").data("action");
- policy["selectedOwnership"] = $("#ownership-input").val();
- //updating next-page wizard title with selected platform
- $("#policy-naming-page-wizard-title").text("ADD " + policy["platform"] + " POLICY");
-};
-
-/**
- * Checks if provided input is valid against provided length range.
- *
- * @param input Alphanumeric or non-alphanumeric input
- * @param minLength Minimum Required Length
- * @param maxLength Maximum Required Length
- * @returns {boolean} Returns true if input matches the provided minimum length and maximum length
- */
-var inputIsValidAgainstLength = function (input, minLength, maxLength) {
- var length = input.length;
- return (length == minLength || (length > minLength && length < maxLength) || length == maxLength);
-};
-
-validateStep["policy-criteria"] = function () {
- var validationStatus = {};
- var selectedAssignees;
- var selectedField = "Role(s)";
-
- $("input[type='radio'].select-users-radio").each(function () {
- if ($(this).is(":checked")) {
- if ($(this).attr("id") == "users-radio-btn") {
- selectedAssignees = $("#users-input").val();
- selectedField = "User(s)";
- } else if ($(this).attr("id") == "user-roles-radio-btn") {
- selectedAssignees = $("#user-roles-input").val();
- }
- return false;
- }
- });
-
- if (selectedAssignees) {
- validationStatus["error"] = false;
- } else {
- validationStatus["error"] = true;
- validationStatus["mainErrorMsg"] = selectedField + " is a required field. It cannot be empty";
- }
-
- var wizardIsToBeContinued;
- if (validationStatus["error"]) {
- wizardIsToBeContinued = false;
- var mainErrorMsgWrapper = "#policy-criteria-main-error-msg";
- var mainErrorMsg = mainErrorMsgWrapper + " span";
- $(mainErrorMsg).text(validationStatus["mainErrorMsg"]);
- $(mainErrorMsgWrapper).removeClass("hidden");
- } else {
- wizardIsToBeContinued = true;
- }
-
- return wizardIsToBeContinued;
-};
-
-validateStep["policy-naming"] = function () {
- var validationStatus = {};
-
- // taking values of inputs to be validated
- var policyName = $("input#policy-name-input").val();
- // starting validation process and updating validationStatus
- if (!policyName) {
- validationStatus["error"] = true;
- validationStatus["mainErrorMsg"] = "Policy name is empty. You cannot proceed.";
- } else if (!inputIsValidAgainstLength(policyName, 1, 30)) {
- validationStatus["error"] = true;
- validationStatus["mainErrorMsg"] =
- "Policy name exceeds maximum allowed length.";
- } else {
- validationStatus["error"] = false;
- }
- // ending validation process
-
- // start taking specific actions upon validation
- var wizardIsToBeContinued;
- if (validationStatus["error"]) {
- wizardIsToBeContinued = false;
- var mainErrorMsgWrapper = "#policy-naming-main-error-msg";
- var mainErrorMsg = mainErrorMsgWrapper + " span";
- $(mainErrorMsg).text(validationStatus["mainErrorMsg"]);
- $(mainErrorMsgWrapper).removeClass("hidden");
- } else {
- wizardIsToBeContinued = true;
- }
-
- return wizardIsToBeContinued;
-};
-
-validateStep["policy-platform"] = function () {
- return false;
-};
-
-validateStep["policy-naming-publish"] = function () {
- var validationStatus = {};
-
- // taking values of inputs to be validated
- var policyName = $("input#policy-name-input").val();
- // starting validation process and updating validationStatus
- if (!policyName) {
- validationStatus["error"] = true;
- validationStatus["mainErrorMsg"] = "Policy name is empty. You cannot proceed.";
- } else if (!inputIsValidAgainstLength(policyName, 1, 30)) {
- validationStatus["error"] = true;
- validationStatus["mainErrorMsg"] =
- "Policy name exceeds maximum allowed length.";
- } else {
- validationStatus["error"] = false;
- }
- // ending validation process
-
- // start taking specific actions upon validation
- var wizardIsToBeContinued;
- if (validationStatus["error"]) {
- wizardIsToBeContinued = false;
- var mainErrorMsgWrapper = "#policy-naming-main-error-msg";
- var mainErrorMsg = mainErrorMsgWrapper + " span";
- $(mainErrorMsg).text(validationStatus["mainErrorMsg"]);
- $(mainErrorMsgWrapper).removeClass("hidden");
- } else {
- wizardIsToBeContinued = true;
- }
-
- return wizardIsToBeContinued;
-};
-
-stepForwardFrom["policy-naming-publish"] = function () {
- policy["policyName"] = $("#policy-name-input").val();
- policy["description"] = $("#policy-description-input").val();
- //All data is collected. Policy can now be updated.
- savePolicy(policy, true, "/api/device-mgt/v1.0/policies/");
-};
-
-stepForwardFrom["policy-naming"] = function () {
- policy["policyName"] = $("#policy-name-input").val();
- policy["description"] = $("#policy-description-input").val();
- //All data is collected. Policy can now be updated.
- savePolicy(policy, false, "/api/device-mgt/v1.0/policies/");
-};
-
-var savePolicy = function (policy, isActive, serviceURL) {
- var profilePayloads = [];
- // traverses key by key in policy["profile"]
- var key;
- for (key in policy["profile"]) {
- if (policy["profile"].hasOwnProperty(key)) {
- profilePayloads.push({
- "featureCode": key,
- "deviceType": policy["platform"],
- "content": policy["profile"][key]
- });
- }
- }
-
- $.each(profilePayloads, function (i, item) {
- $.each(item.content, function (key, value) {
- //cannot add a true check since it will catch value = false as well
- if (value === null || value === undefined || value === "") {
- item.content[key] = null;
- }
- });
- });
-
- var payload = {
- "policyName": policy["policyName"],
- "description": policy["description"],
- "compliance": policy["selectedNonCompliantAction"],
- "ownershipType": policy["selectedOwnership"],
- "active": isActive,
- "profile": {
- "profileName": policy["policyName"],
- "deviceType": policy["platform"],
- "profileFeaturesList": profilePayloads
- }
- };
-
- if (policy["selectedUsers"]) {
- payload["users"] = policy["selectedUsers"];
- } else if (policy["selectedUserRoles"]) {
- payload["roles"] = policy["selectedUserRoles"];
- } else {
- payload["users"] = [];
- payload["roles"] = [];
- }
-
- invokerUtil.post(
- serviceURL,
- payload,
- function () {
- $(".add-policy").addClass("hidden");
- $(".policy-naming").addClass("hidden");
- $(".policy-message").removeClass("hidden");
- },
- function (data) {
- }
- );
-};
-
-function formatRepo(user) {
- if (user.loading) {
- return user.text;
- }
- if (!user.username) {
- return;
- }
- var markup = '
' +
- '
' +
- '
' +
- '
' + user.username + '
';
- if (user.firstname) {
- markup += '
' + user.firstname + '
';
- }
- if (user.emailAddress) {
- markup += '
' + user.emailAddress + '
';
- }
- markup += '
';
- return markup;
-}
-
-function formatRepoSelection(user) {
- return user.username || user.text;
-}
-
-// End of functions related to grid-input-view
-
-
-$(document).ready(function () {
- $("#users-input").select2({
- multiple: true,
- tags: false,
- ajax: {
- url: context + "/api/invoker/execute/",
- method: "POST",
- dataType: 'json',
- delay: 250,
- id: function (user) {
- return user.username;
- },
- data: function (params) {
- var postData = {};
- postData.requestMethod = "GET";
- postData.requestURL = "/api/device-mgt/v1.0/users/search/usernames?filter=" + params.term;
- postData.requestPayload = null;
- return JSON.stringify(postData);
- },
- processResults: function (data) {
- var newData = [];
- $.each(data, function (index, value) {
- value.id = value.username;
- newData.push(value);
- });
- return {
- results: newData
- };
- },
- cache: true
- },
- escapeMarkup: function (markup) {
- return markup;
- }, // let our custom formatter work
- minimumInputLength: 1,
- templateResult: formatRepo, // omitted for brevity, see the source of this page
- templateSelection: formatRepoSelection // omitted for brevity, see the source of this page
- });
-
- $("#loading-content").remove();
- $(".policy-platform").removeClass("hidden");
- // Adding initial state of wizard-steps.
- $("#policy-platform-wizard-steps").html($(".wr-steps").html());
-
- $("select.select2[multiple=multiple]").select2({
- "tags": false
- });
-
- $("#users-select-field").hide();
- $("#user-roles-select-field").show();
-
- $("input[type='radio'].select-users-radio").change(function () {
- if ($("#users-radio-btn").is(":checked")) {
- $("#user-roles-select-field").hide();
- $("#users-select-field").show();
- }
- if ($("#user-roles-radio-btn").is(":checked")) {
- $("#users-select-field").hide();
- $("#user-roles-select-field").show();
- }
- });
-
- // Support for special input type "ANY" on user(s) & user-role(s) selection
- $("#user-roles-input").select2({
- "tags": false
- }).on("select2:select", function (e) {
- if (e.params.data.id == "ANY") {
- $(this).val("ANY").trigger("change");
- } else {
- $("option[value=ANY]", this).prop("selected", false).parent().trigger("change");
- }
- });
-
- //Policy wizard stepper
- $(".wizard-stepper").click(function () {
- // button clicked here can be either a continue button or a back button.
- var currentStep = $(this).data("current");
- var validationIsRequired = $(this).data("validate");
- var wizardIsToBeContinued;
-
- if (validationIsRequired) {
- wizardIsToBeContinued = validateStep[currentStep]();
- } else {
- wizardIsToBeContinued = true;
- }
-
- if (wizardIsToBeContinued) {
- // When moving back and forth, following code segment will
- // remove if there are any visible error-messages.
- var errorMsgWrappers = ".alert.alert-danger";
- $(errorMsgWrappers).each(
- function () {
- if (!$(this).hasClass("hidden")) {
- $(this).addClass("hidden");
- }
- }
- );
-
- var nextStep = $(this).data("next");
- var isBackBtn = $(this).data("is-back-btn");
-
- // if current button is a continuation...
- if (!isBackBtn) {
- // initiate stepForwardFrom[*] functions to gather form data.
- if (stepForwardFrom[currentStep]) {
- stepForwardFrom[currentStep](this);
- }
- } else {
- // initiate stepBackFrom[*] functions to rollback.
- if (stepBackFrom[currentStep]) {
- stepBackFrom[currentStep]();
- }
- }
-
- // following step occurs only at the last stage of the wizard.
- if (!nextStep) {
- window.location.href = $(this).data("direct");
- }
-
- // updating next wizard step as current.
- $(".itm-wiz").each(function () {
- var step = $(this).data("step");
- if (step == nextStep) {
- $(this).addClass("itm-wiz-current");
- } else {
- $(this).removeClass("itm-wiz-current");
- }
- });
-
- // adding next update of wizard-steps.
- $("#" + nextStep + "-wizard-steps").html($(".wr-steps").html());
-
- // hiding current section of the wizard and showing next section.
- $("." + currentStep).addClass("hidden");
- $("." + nextStep).removeClass("hidden");
- }
- });
-});
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.hbs
deleted file mode 100644
index 02f7bc76cf6..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.hbs
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-
-
-
-
Policy creation is
- successful.
- Please click "Add Another Policy", if you wish to add another policy or
- click
- "View policy list" to complete the process and go back to the policy list.
-
-
-
-
-
-
-
- Add another policy
-
-
-{{#zone "bottomJs"}}
- {{js "js/policy-create.js"}}
-{{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.js
deleted file mode 100644
index c3cb1ea3b84..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-
-function onRequest(context) {
- // var log = new Log("wizard.js");
- var constants = require("/app/modules/constants.js");
- var DTYPE_CONF_DEVICE_TYPE_KEY = "deviceType";
- var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label";
-
- var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
- var utility = require('/app/modules/utility.js').utility;
- var response = userModule.getRoles();
- var wizardPage = {};
- if (response["status"] == "success") {
- wizardPage["roles"] = response["content"];
- }
- var deviceType = context.uriParams.deviceType;
- var typesListResponse = userModule.getPlatforms();
- if (typesListResponse["status"] == "success") {
- wizardPage["type"] = {};
- for (var type in typesListResponse["content"]["deviceTypes"]) {
- if (deviceType == typesListResponse["content"]["deviceTypes"][type]) {
- wizardPage["type"]["name"] = deviceType;
- wizardPage["type"]["label"] = deviceType;
- }
- }
- }
- var user = session.get(constants.USER_SESSION_KEY);
- wizardPage.username = user.username;
- wizardPage.permissions = userModule.getUIPermissions();
- return wizardPage;
-}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.json
deleted file mode 100644
index fd259012978..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "version" : "1.0.0"
-}
\ No newline at end of file
diff --git a/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 b/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
index 211de751132..5ecc4e2118b 100644
--- a/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
+++ b/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
@@ -6526,4 +6526,41 @@ select > option:hover {
}
.table.list-table:not(.grid-view) tbody{
margin: 0px !important;
-}
\ No newline at end of file
+}
+
+#user-grid td i {
+ padding-right: 5px;
+}
+
+
+/**
+ *
+ * Temporary responsive fix for table listing action button width issue
+ * Todo : Move responsive style to theme.less file
+ *
+**/
+@media (max-width: 1199px) and (min-width: 992px){
+ .table .fw-stack{
+ font-size: 12px;
+ }
+}
+
+@media (min-width: 1200px){
+ table tbody tr {
+ width: 18% !important;
+ }
+ .table .fw-stack{
+ font-size: 1.2vw;
+ }
+}
+
+@media (min-width: 1500px){
+ table tbody tr {
+ width: 14% !important;
+ }
+ .table .fw-stack{
+ font-size: 0.8vw;
+ }
+}
+
+/** End **/