diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
index de3c30a739..c94c1ff97a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
@@ -76,6 +76,27 @@ var userModule = function () {
}
};
+ /**
+ * Build default user claims.
+ *
+ * @param firstname First name of the user
+ * @param lastname Last name of the user
+ * @param emailAddress Email address of the user
+ *
+ * @returns {Object} Default user claims to be provided
+ */
+ privateMethods.buildDefaultUserClaims = function (firstname, lastname, emailAddress) {
+ var defaultUserClaims = {
+ "http://wso2.org/claims/givenname": firstname,
+ "http://wso2.org/claims/lastname": lastname,
+ "http://wso2.org/claims/emailaddress": emailAddress
+ };
+ if (log.isDebugEnabled()) {
+ log.debug("ClaimMap created for new user : " + stringify(defaultUserClaims));
+ }
+ return defaultUserClaims;
+ };
+
/**
* Register user to dc-user-store.
*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
index 7961b2b65b..105c65ac6d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
@@ -49,10 +49,12 @@
- {{defineZone "signInForm-below" scope="protected"}}
+
";
+ // append newly created .cloned div element to panel-body
+ $(this).parent().parent().append(cloned);
+ // enable remove action of newly cloned div element
+ $(".cloned", $(this).parent().parent()).each(
+ function () {
+ if ($(".multi-view.remove", this).hasClass("disabled")) {
+ $(".multi-view.remove", this).removeClass("disabled");
+ }
+ if (!$(".multi-view.remove", this).hasClass("enabled")) {
+ $(".multi-view.remove", this).addClass("enabled");
+ }
+ }
+ );
+ });
+
+ $(advanceOperations).on("click", ".multi-view.remove.enabled", function () {
+ $(this).parent().remove();
+ });
+
+ // enabling or disabling grouped-input based on the status of a parent check-box
+ $(advanceOperations).on("click", ".grouped-input", function () {
+ updateGroupedInputVisibility(this);
+ });
+
+ // add form entry click function for grid inputs
+ $(advanceOperations).on("click", "[data-click-event=add-form]", function () {
+ var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+ var clonedForm = $("[data-add-form=" + $(this).attr("href") + "]").clone().
+ find("[data-add-form-element=clone]").attr("data-add-form-clone", $(this).attr("href"));
+
+ // adding class .child-input to capture text-input-array-values
+ $("input, select", clonedForm).addClass("child-input");
+
+ $(addFormContainer).append(clonedForm);
+ setId(addFormContainer);
+ showHideHelpText(addFormContainer);
+ });
+
+ // remove form entry click function for grid inputs
+ $(advanceOperations).on("click", "[data-click-event=remove-form]", function () {
+ var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+
+ $(this).closest("[data-add-form-element=clone]").remove();
+ setId(addFormContainer);
+ showHideHelpText(addFormContainer);
+ });
+
+ $(".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");
+ if (nextStep !== "policy-message") {
+ $("." + nextStep).removeClass("hidden");
+ }
+ }
+ });
+});
+
+function getParameterByName(name) {
+ name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+ var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+ results = regex.exec(location.search);
+ return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}
\ 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/public/js/sql.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/public/js/sql.js
new file mode 100644
index 0000000000..9f92fbc938
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/public/js/sql.js
@@ -0,0 +1,310 @@
+/*
+ * 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.
+ */
+
+/*Annotations, Annotation Names and relevant tokens*/
+var ANNOTATION_IMPORT = "Import";
+var ANNOTATION_EXPORT = "Export";
+
+var ANNOTATION_TOKEN_AT = "@";
+var ANNOTATION_TOKEN_OPENING_BRACKET = "(";
+var ANNOTATION_TOKEN_CLOSING_BRACKET = ")";
+
+var REGEX_LINE_STARTING_WITH_PLAN = /^@Plan.*/g;
+var REGEX_LINE_STARTING_WITH_SINGLE_LINE_COMMENT = /^--.*/g;
+var REGEX_LINE_STARTING_WITH_MULTI_LINE_COMMENT = /^\/\*.*\*\//g;
+var REGEX_LINE_STARTING_WITH_IMPORT_STATEMENT = /^@Import.*/g;
+
+var SIDDHI_STATEMENT_DELIMETER = ";";
+var SIDDHI_LINE_BREAK = "\n";
+var SIDDHI_LINE_BREAK_CHARACTER = '\n';
+var SIDDHI_SINGLE_QUOTE = "'";
+var SIDDHI_SPACE_LITERAL = " ";
+
+var SIDDHI_LITERAL_DEFINE_STREAM = "define stream";
+
+var MIME_TYPE_SIDDHI_QL = "text/siddhi-ql";
+
+
+CodeMirror.defineMode("sql", function (config, parserConfig) {
+ "use strict";
+
+ var client = parserConfig.client || {},
+ atoms = parserConfig.atoms || {"false":true, "true":true, "null":true},
+ builtin = parserConfig.builtin || {},
+ keywords = parserConfig.keywords || {},
+ operatorChars = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
+ support = parserConfig.support || {},
+ hooks = parserConfig.hooks || {},
+ dateSQL = parserConfig.dateSQL || {"date":true, "time":true, "timestamp":true};
+
+ function tokenBase(stream, state) {
+ var ch = stream.next();
+
+ // call hooks from the mime type
+ if (hooks[ch]) {
+ var result = hooks[ch](stream, state);
+ if (result !== false) return result;
+ }
+
+ if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
+ // numbers
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
+ stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
+ support.decimallessFloat == true && stream.eat('.');
+ return "number";
+ } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
+ // strings
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
+ state.tokenize = tokenLiteral(ch);
+ return state.tokenize(stream, state);
+ } else if (/^[\(\),\;\[\]]/.test(ch)) {
+ // no highlightning
+ return null;
+ } else if ((ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
+ // 1-line comments
+ // ref: https://kb.askmonty.org/en/comment-syntax/
+ stream.skipToEnd();
+ return "comment";
+ } else if (ch == "/" && stream.eat("*")) {
+ // multi-line comments
+ // ref: https://kb.askmonty.org/en/comment-syntax/
+ state.tokenize = tokenComment;
+ return state.tokenize(stream, state);
+ } else if (ch == ".") {
+ // .1 for 0.1
+ if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
+ return "number";
+ }
+ } else {
+ stream.eatWhile(/^[_\-\w\d]/); /* Character '-' will also be eaten, to prevent the highlight happening in keywords being embedded in non-keyword strings. For example, 'all' in 'all-nonkeyword' */
+ var word = stream.current().toLowerCase(); // Added toLowerCase() to highlight keywords in a case insensitive manner.
+ // dates (standard SQL syntax)
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
+ if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
+ return "number";
+ if (atoms.hasOwnProperty(word)) return "atom";
+ if (builtin.hasOwnProperty(word)) return "builtin";
+ if (keywords.hasOwnProperty(word)) return "keyword";
+ if (client.hasOwnProperty(word)) return "string-2";
+ return null;
+ }
+ }
+
+ // 'string', with char specified in quote escaped by '\'
+ function tokenLiteral(quote) {
+ return function (stream, state) {
+ var escaped = false, ch;
+ while ((ch = stream.next()) != null) {
+ if (ch == quote && !escaped) {
+ state.tokenize = tokenBase;
+ break;
+ }
+ escaped = !escaped && ch == "\\";
+ }
+ return "string";
+ };
+ }
+
+ function tokenComment(stream, state) {
+ while (true) {
+ if (stream.skipTo("*")) {
+ stream.next();
+ if (stream.eat("/")) {
+ state.tokenize = tokenBase;
+ break;
+ }
+ } else {
+ stream.skipToEnd();
+ break;
+ }
+ }
+ return "comment";
+ }
+
+ function pushContext(stream, state, type) {
+ state.context = {
+ prev:state.context,
+ indent:stream.indentation(),
+ col:stream.column(),
+ type:type
+ };
+ }
+
+ function popContext(state) {
+ state.indent = state.context.indent;
+ state.context = state.context.prev;
+ }
+
+ return {
+ startState:function () {
+ return {tokenize:tokenBase, context:null};
+ },
+
+ token:function (stream, state) {
+ if (stream.sol()) {
+ if (state.context && state.context.align == null)
+ state.context.align = false;
+ }
+ if (stream.eatSpace()) return null;
+
+ var style = state.tokenize(stream, state);
+ if (style == "comment") return style;
+
+ if (state.context && state.context.align == null)
+ state.context.align = true;
+
+ var tok = stream.current();
+ if (tok == "(")
+ pushContext(stream, state, ")");
+ else if (tok == "[")
+ pushContext(stream, state, "]");
+ else if (state.context && state.context.type == tok)
+ popContext(state);
+ return style;
+ },
+
+ indent:function (state, textAfter) {
+ var cx = state.context;
+ if (!cx) return CodeMirror.Pass;
+ var closing = textAfter.charAt(0) == cx.type;
+ if (cx.align) return cx.col + (closing ? 0 : 1);
+ else return cx.indent + (closing ? 0 : config.indentUnit);
+ },
+
+ blockCommentStart: "/*",
+ blockCommentEnd: "*/",
+ lineComment: "--"
+ };
+});
+
+(function () {
+ "use strict";
+
+ // `identifier`
+ function hookIdentifier(stream) {
+ // MySQL/MariaDB identifiers
+ // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
+ var ch;
+ while ((ch = stream.next()) != null) {
+ if (ch == "`" && !stream.eat("`")) return "variable-2";
+ }
+ stream.backUp(stream.current().length - 1);
+ return stream.eatWhile(/\w/) ? "variable-2" : null;
+ }
+
+ // variable token
+ function hookVar(stream) {
+ // variables
+ // @@prefix.varName @varName
+ // varName can be quoted with ` or ' or "
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
+ if (stream.eat("@")) {
+ stream.match(/^session\./);
+ stream.match(/^local\./);
+ stream.match(/^global\./);
+ }
+
+ if (stream.eat("'")) {
+ stream.match(/^.*'/);
+ return "variable-2";
+ } else if (stream.eat('"')) {
+ stream.match(/^.*"/);
+ return "variable-2";
+ } else if (stream.eat("`")) {
+ stream.match(/^.*`/);
+ return "variable-2";
+ } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) {
+ return "variable-2";
+ }
+ return null;
+ }
+
+ ;
+
+ // short client keyword token
+ function hookClient(stream) {
+ // \N means NULL
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
+ if (stream.eat("N")) {
+ return "atom";
+ }
+ // \g, etc
+ // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
+ return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
+ }
+
+ // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
+ var sqlKeywordsWithoutSymbols = "all and as begin by contains define delete end events " +
+ "every first for from full group having inner insert into join last " +
+ "left not of on or outer output partition raw return right select snapshot stream table ";
+ var sqlKeywords = ", : ? # ( ) " + sqlKeywordsWithoutSymbols;
+ var builtIn = "bool double float int long object string ";
+ var atoms = "false true null ";
+ var dateSQL = "days hours milliseconds minutes months seconds ";
+ var allSqlSuggestions = sqlKeywordsWithoutSymbols + builtIn + atoms + dateSQL;
+
+ // turn a space-separated list into an array
+ function set(str) {
+ var obj = {}, words = str.split(" ");
+ for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+ return obj;
+ }
+
+ // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
+ CodeMirror.defineMIME(MIME_TYPE_SIDDHI_QL, {
+ name:"sql",
+ keywords:set(sqlKeywords),
+ builtin:set(builtIn),
+ atoms:set(atoms),
+ operatorChars:/^[*+%<>!=/]/,
+ dateSQL:set(dateSQL),
+ support:set("doubleQuote "),
+ allSqlSuggestions:set(allSqlSuggestions)
+ });
+}());
+
+/*
+ How Properties of Mime Types are used by SQL Mode
+ =================================================
+
+ keywords:
+ A list of keywords you want to be highlighted.
+ functions:
+ A list of function names you want to be highlighted.
+ builtin:
+ A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
+ operatorChars:
+ All characters that must be handled as operators.
+ client:
+ Commands parsed and executed by the client (not the server).
+ support:
+ A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
+ * ODBCdotTable: .tableName
+ * zerolessFloat: .1
+ * doubleQuote
+ * nCharCast: N'string'
+ * charsetCast: _utf8'string'
+ * commentHash: use # char for comments
+ * commentSlashSlash: use // for comments
+ * commentSpaceRequired: require a space after -- for comments
+ atoms:
+ Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
+ UNKNOWN, INFINITY, UNDERFLOW, NaN...
+ dateSQL:
+ Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
+ */
\ 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
new file mode 100644
index 0000000000..1c661f0002
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.hbs
@@ -0,0 +1,287 @@
+{{#zone "topCss"}}
+ {{css "css/codemirror.css"}}
+{{/zone}}
+
+
+
+
+
+
+
1
+
Select a platform
+
+
+
+
+
+
2
+
Configure profile
+
+
+
+
+
+
3
+
Assign
+
+
+
+
+
+
4
+
Publish to devices
+
+
+
+
+
+
+
+
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/codemirror.js"}}
+ {{js "js/sql.js"}}
+ {{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
new file mode 100644
index 0000000000..49c02f84a8
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.js
@@ -0,0 +1,51 @@
+/*
+ * 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/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") {
+ for (var type in typesListResponse["content"]) {
+ if (deviceType == typesListResponse["content"][type]["name"]) {
+ wizardPage["type"] = typesListResponse["content"][type];
+ var deviceTypeLabel = deviceType;
+ var configs = utility.getDeviceTypeConfig(deviceType);
+ if (configs && configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) {
+ deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
+ }
+ wizardPage["type"]["label"] = deviceTypeLabel;
+ }
+ }
+ }
+ 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
new file mode 100644
index 0000000000..fd25901297
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.wizard/wizard.json
@@ -0,0 +1,3 @@
+{
+ "version" : "1.0.0"
+}
\ No newline at end of file