Changing policy compliance view

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js

@@ -49,6 +49,7 @@
 
     function loadOperationsLog(update) {
         var operationsLogTable = "#operations-log-table";
+
         if (update) {
             operationTable = $(operationsLogTable).DataTable();
             $("#operations-spinner").removeClass("hidden");
@@ -135,9 +136,13 @@
     function loadPolicyCompliance() {
         var policyCompliance = $("#policy-view");
         var policyComplianceTemplate = policyCompliance.attr("src");
+        console.log("deviceId:"+deviceId);
+        console.log("deviceType:"+deviceType);
         var deviceId = policyCompliance.data("device-id");
         var deviceType = policyCompliance.data("device-type");
         var activePolicy = null;
+        console.log("deviceId:"+deviceId);
+        console.log("deviceType:"+deviceType);
 
         $.template(
             "policy-view",
@@ -163,6 +168,8 @@
                                                 var viewModel = {};
                                                 viewModel["policy"] = activePolicy;
                                                 viewModel["deviceType"] = deviceType;
+                                                viewModel["deviceId"] = deviceId;
+                                                viewModel["appContext"] = context;
                                                 data = JSON.parse(data);
                                                 var content;
                                                 if (data["complianceData"]) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs

@@ -37,7 +37,7 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/policy/view?id={{policy.id}}"
+                <a href="{{appContext}}/policy/effective-policy?type={{deviceType}}&id={{deviceId}}"
                    class="cu-btn-inner policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/templates/hidden-operations-windows.hbs

@@ -1,566 +0,0 @@
-<div class="row no-gutter">
-<div class="wr-hidden-operations-nav col-lg-4">
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('passcode-policy', this)" class="selected">
-                <span class="wr-hidden-operations-icon fw-stack">
-                    <i class="fw fw-key fw-stack-2x"></i>
-                </span>
-        Passcode Policy
-        <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
-                <span class="wr-hidden-operations-icon fw-stack">
-                    <i class="fw fw-block fw-stack-2x"></i>
-                </span>
-        Restrictions on Camera
-        <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
-                <span class="wr-hidden-operations-icon fw-stack">
-                    <i class="fw fw-security fw-stack-2x"></i>
-                </span>
-        Encryption Settings
-        <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
-                <span class="fw-stack fw-lg">
-                    <i class="fw fw-application fw-stack-1x"></i>
-                    <i class="fw fw-block fw-stack-2x"></i>
-                </span>
-        Applications Restrictions
-        <span id="app-restriction-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
-        <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
-    </a>
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-wifi fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--Wi-Fi Settings-->
-    <!--<span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>-->
-    <!--<span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>-->
-    <!--<span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>-->
-    <!--</a>-->
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('install-apps', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-application fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--App Installations-->
-    <!--</a>-->
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('blacklist-apps', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-block fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--App Blacklisting-->
-    <!--</a>-->
-    <!--<a href="javascript:void(0)" onclick="showAdvanceOperation('web-clips', this)">-->
-    <!--<span class="wr-hidden-operations-icon fw-stack">-->
-    <!--<i class="fw fw-website fw-stack-2x"></i>-->
-    <!--</span>-->
-    <!--Web clips-->
-    <!--</a>-->
-</div>
-
-<div class="wr-hidden-operations-content col-lg-8">
-<!-- passcode-policy -->
-<div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
-    <div class="panel panel-default operation-data" data-operation="passcode-policy" data-operation-code="PASSCODE_POLICY">
-        <div id="passcode-policy-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Passcode Policy
-                <label id="passcode-policy-lbl" class="wr-input-control switch hidden" data-toggle="collapse" data-target="#passcode-policy-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to set a passcode policy to an Windows Device.
-                Once this configuration profile is installed on a device, corresponding users will not be able
-                to modify these settings on their devices.
-            </div>
-        </div>
-        <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
-            <hr/>
-            <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-allow-simple" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple" checked="checked" disabled/>
-                            <span class="helper" title="Permit the use of repeating, ascending and descending character sequences">
-                                &nbsp;&nbsp;&nbsp;Allow simple value
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="passcode-policy-require-alphanumeric" type="checkbox" class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric" checked="checked" disabled/>
-                            <span class="helper" title="Require passcode to contain both letters and numbers">
-                                &nbsp;&nbsp;&nbsp;Require alphanumeric value
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-length">
-                    Minimum passcode length
-                            <span class="helper" title="Minimum number of characters allowed in a passcode">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-                <select id="passcode-policy-min-length" class="form-control operationDataKeys" data-key="passcodePolicyMinLength" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="1">01</option>
-                    <option value="2">02</option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                    <option value="6">06</option>
-                    <option value="7">07</option>
-                    <option value="8">08</option>
-                    <option value="9">09</option>
-                    <option value="10">10</option>
-                    <option value="11">11</option>
-                    <option value="12">12</option>
-                    <option value="13">13</option>
-                    <option value="14">14</option>
-                    <option value="15">15</option>
-                </select>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-min-complex-chars">
-                    Minimum number of complex characters
-                            <span class="helper" title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-                <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys" data-key="passcodePolicyMinComplexChars" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="1">01</option>
-                    <option value="2">02</option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                </select>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
-                    Maximum passcode age in days
-                            <span class="helper" title="Number of days after which a passcode must be changed">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                    <br>
-                    ( Should be in between 1-to-730 days or none )
-                </label>
-                <input id="passcode-policy-max-passcode-age-in-days" type="text" class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays" maxlength="3" placeholder="[ Requires Number Input ]" disabled>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcode-policy-passcode-history">
-                    Passcode history
-                            <span class="helper" title="Number of consequent unique passcodes to be used before reuse">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                    <br>
-                    ( Should be in between 1-to-50 passcodes or none )
-                </label>
-                <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys" data-key="passcodePolicyPasscodeHistory" maxlength="2" placeholder="[ Requires Number Input ]" disabled>
-            </div>
-
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
-                    Maximum number of failed attempts
-                            <span class="helper" title="Maximum number of passcode entry attempts allowed before all data on a device will be erased">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-                <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys" data-key="passcodePolicyMaxFailedAttempts" data-default="0" disabled>
-                    <option value="" selected="selected">
-                        None
-                    </option>
-                    <option value="3">03</option>
-                    <option value="4">04</option>
-                    <option value="5">05</option>
-                    <option value="6">06</option>
-                    <option value="7">07</option>
-                    <option value="8">08</option>
-                    <option value="9">09</option>
-                    <option value="10">10</option>
-                </select>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- /passcode-policy -->
-
-<!-- camera -->
-<div class="wr-hidden-operation" data-operation="camera">
-    <div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
-        <div id="camera-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Restrictions on Camera
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#camera-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera.
-                Once this configuration profile is installed on a device, corresponding users will not be able
-                to modify these settings on their devices.
-            </div>
-        </div>
-        <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
-            <hr/>
-            <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </div>
-            Un-check following checkbox in case you need to disable camera.
-            <br>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="camera-enabled" type="checkbox" class="operationDataKeys" data-key="cameraEnabled" checked="checked" disabled/>
-                            <span class="helper" title="Having this checked would enable Usage of phone camera in the device.">
-                                &nbsp;&nbsp;&nbsp;Allow use of camera
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-            </div>
-            <br>
-        </div>
-    </div>
-</div>
-<!-- /camera -->
-
-<!-- encrypt-storage -->
-<div class="wr-hidden-operation" data-operation="encrypt-storage">
-    <div class="panel panel-default operation-data" data-operation="encrypt-storage" data-operation-code="ENCRYPT_STORAGE">
-        <div id="encrypt-storage-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Encryption Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#encrypt-storage-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to encrypt data on an Windows device, when the device is locked and
-                make it readable when the passcode is entered. Once this configuration profile is installed on a device,
-                corresponding users will not be able to modify these settings on their devices.
-            </div>
-        </div>
-        <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
-            <hr/>
-            <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </div>
-            Un-check following checkbox in case you need to disable storage-encryption.
-            <br>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-control checkbox">
-                    <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys" data-key="encryptStorageEnabled" checked="checked" disabled/>
-                            <span class="helper" title="Having this checked would enable Storage-encryption in the device">
-                                &nbsp;&nbsp;&nbsp;Enable storage-encryption
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                </label>
-            </div>
-            <br>
-        </div>
-    </div>
-</div>
-<!-- /encrypt-storage -->
-
-<!--app-restriction-->
-<div class="wr-hidden-operation" data-operation="app-restriction">
-    <div class="panel panel-default operation-data" data-operation="app-restriction" data-operation-code="APP-RESTRICTION">
-        <div id="app-restriction-heading" class="panel-heading" role="tab">
-            <h2 class="sub-title panel-title">
-                Application Restriction Settings
-                <label class="wr-input-control switch hidden" data-toggle="collapse" data-target="#app-restriction-body">
-                    <input type="checkbox" />
-                    <span class="helper"></span>
-                    <span class="text"></span>
-                </label>
-            </h2>
-            <div class="panel-title-description">
-                This configuration can be used to create a black list or white list of applications.
-            </div>
-        </div>
-        <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
-            <hr/>
-            <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                <i class="icon fw fw-error"></i><span></span>
-            </div>
-
-            <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType" disabled>
-                <option value="" selected="selected">
-                    None
-                </option>
-                <option value="black-list">Black List</option>
-                <option value="white-list">White List</option>
-            </select>
-            <br>
-            <div class="wr-input-control">
-                <label class="wr-input-label" for="restricted-applications">
-                    Restricted Application List
-                            <span class="helper" title="Add an application to restrict.">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                    <br>
-                    <br>
-                    <a href="#restricted-applications-grid" class="grid-input-add hidden" data-click-event="add-form">
-                                <span class="icon fw-stack">
-                                    <i class="fw fw-add fw-stack-1x"></i>
-                                    <i class="fw fw-ring fw-stack-2x"></i>
-                                </span>
-                        &nbsp;
-                        Add Application
-                    </a>
-                </label>
-                <div id="restricted-applications" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" data-key="restrictedApplications" data-column-count="2">
-                    <table class="table table-responsive table-striped">
-                        <thead>
-                        <tr>
-                            <th>No:</th>
-                            <th>Application Name/Description</th>
-                            <th>Package Name</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody data-add-form-container="#restricted-applications-grid">
-                        <tr data-help-text="add-form">
-                            <td colspan="4">
-                                No entries added yet .
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <table class="template hidden">
-                        <tbody data-add-form="#restricted-applications-grid">
-                        <tr data-add-form-element="clone">
-                            <td data-title="No:">
-                                <span class="index"></span>
-                            </td>
-                            <td data-title="App Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="appName" maxlength="100" data-default="" placeholder="[ Application Name or Description ]" disabled/>
-                            </td>
-                            <td data-title="Package Name">
-                                <input type="text" class="form-control grid-input-text" data-child-key="packageName" maxlength="100" data-default="" placeholder="[ Package Name of Application ]" disabled/>
-                            </td>
-                            <td>
-                                            <span class="list-group-item-actions hidden">
-                                                <a href="#restricted-applications-grid" class="grid-input-remove" data-click-event="remove-form">
-                                                    <span class="fw-stack helper" title="Remove Entry">
-                                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                                        <i class="fw fw-delete fw-stack-1x"></i>
-                                                    </span>
-                                                </a>
-                                            </span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!--/app-restriction-->
-
-<!-- wi-fi -->
-<!--<div class="wr-hidden-operation" data-operation="wifi">-->
-<!--<div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">-->
-<!--<div id="wifi-heading" class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--Wi-Fi Settings-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#wifi-body">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<hr>-->
-<!--<div class="panel-title-description">-->
-<!--This configurations can be used to configure Wi-Fi access on an Android device.-->
-<!--Once this configuration profile is installed on a device, corresponding users will not be able-->
-<!--to modify these settings on their devices.-->
-<!--</div>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="wifi-body">-->
-<!--&lt;!&ndash;<div class="cloneable">&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view add enabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-add fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;<a href="#" class="multi-view remove disabled">&ndash;&gt;-->
-<!--&lt;!&ndash;<span class="icon fw-stack">&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-minus fw-stack-1x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;<i class="fw fw-ring fw-stack-2x"></i>&ndash;&gt;-->
-<!--&lt;!&ndash;</span>&ndash;&gt;-->
-<!--&lt;!&ndash;</a>&ndash;&gt;-->
-<!--&lt;!&ndash;Wi-Fi Setting :&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--&lt;!&ndash;<br>&ndash;&gt;-->
-<!--Please note that * sign represents required fields of data.-->
-<!--<br>-->
-<!--<br>-->
-<!--<div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<div class="wr-input-control">-->
-<!--<label class="wr-input-label" for="wifi-ssid">-->
-<!--Service Set Identifier (SSID) *-->
-<!--<span class="helper" title="Identification of the wireless network to be configured.">-->
-<!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-<!--</span>-->
-<!--<br>-->
-<!--( should be 1-to-30 characters long )-->
-<!--</label>-->
-<!--<input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID" maxlength="100" placeholder="[ Required field ]"/>-->
-<!--</div>-->
-<!--<div class="wr-input-control">-->
-<!--<label class="wr-input-label" for="wifi-password">-->
-<!--Password-->
-<!--<span class="helper" title="Password for the wireless network.">-->
-<!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
-<!--</span>-->
-<!--</label>-->
-<!--<input id="wifi-password" type="text" class="form-control operationDataKeys" data-key="wifiPassword" maxlength="100" placeholder="[ Optional field ]"/>-->
-<!--</div>-->
-<!--&lt;!&ndash;</div>&ndash;&gt;-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /wi-fi -->
-
-<!-- install-applications -->
-<!--<div class="wr-hidden-operation" data-operation="install-apps">-->
-<!--<div class="panel panel-default operation-data" data-operation="INSTALL_APPLICATION">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;App Installations-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installApp">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="installApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installApp">-->
-<!--<div id="install-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
-<!--</div>-->
-<!--<div class="wr-input-control">-->
-<!--<label class="wr-input-control dropdown">-->
-<!--<span class="helper" title="App Type">App Type<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>-->
-<!--<select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type" data-key="type">-->
-<!--<option>Public</option>-->
-<!--<option>Enterprise</option>-->
-<!--</select>-->
-<!--</label>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /install-applications -->
-
-<!-- /uninstall-applications -->
-<!--<div class="wr-hidden-operation" data-operation="uninstall-apps">-->
-<!--<div class="panel panel-default operation-data" data-operation="UNINSTALL_APPLICATION">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;App Uninstallations-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#uninstallApp">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="uninstallApp">-->
-<!--<div id="uninstall-app-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Application Identifier">App Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<!--span>Identification of the wireless network to connect to</span-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="package-name" data-key="packageName" placeholder="Enter App Identifier"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /uninstall-applications -->
-
-<!-- /web-clips -->
-<!--<div class="wr-hidden-operation" data-operation="web-clips">-->
-<!--<div class="panel panel-default operation-data" data-operation="WEBCLIP">-->
-<!--<div class="panel-heading" role="tab">-->
-<!--<h2 class="sub-title panel-title">-->
-<!--<br>-->
-<!--&nbsp;&nbsp;&nbsp;Web clips-->
-<!--<label class="wr-input-control switch" data-toggle="collapse" data-target="#installWebClip">-->
-<!--<input type="checkbox" />-->
-<!--<span class="helper"></span>-->
-<!--<span class="text"></span>-->
-<!--</label>-->
-<!--<br>-->
-<!--<br>-->
-<!--</h2>-->
-<!--</div>-->
-<!--<div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="installWebClip">-->
-<!--<div id="install-webclip-feature-error-msg" class="alert alert-danger hidden" role="alert">-->
-<!--<i class="icon fw fw-error"></i><span></span>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="Title of the web clip">Title<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="title" data-key="title" placeholder="Enter Title"/>-->
-<!--</div>-->
-<!--<label class="wr-input-label" title="URL">URL<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>-->
-<!--<div class="wr-input-control">-->
-<!--<input type="text" class="form-control operationDataKeys" id="url" data-key="url" placeholder="Enter URL"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!-- /web-clips -->
-</div>
-</div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.hbs

@@ -1,4 +1,5 @@
 {{#zone "content"}}
+{{!--#if isAuthorized--}}
     {{#defineZone "policy-profile-top"}}
         <div class="row wr-device-board">
             <div class="col-lg-12 wr-secondary-bar">
@@ -12,60 +13,64 @@
     <div class="page-content-wrapper">
         <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
             <div class="media">
-                <div class="media-body asset-desc add-padding-left-5x">
+                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                    Policy Overview
-                        Policy Overview
+                </div>
-                    </div>
+                {{#defineZone "policy-detail-properties"}}
-                    {{#defineZone "policy-detail-properties"}}
+                    <table class="table table-responsive table-striped" id="members">
-                        <table class="table table-responsive table-striped" id="members">
+                        <tbody>
-                            <tbody>
+                        <tr role="row" class="even">
-                            <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
-                                <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
+                            <td id="policy-platform" style="padding:10px 15px;"></td>
-                                <td id="policy-platform" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        <tr role="row" class="odd">
-                            <tr role="row" class="odd">
+                            <td class="sorting_1" style="padding:10px 15px;">Groups</td>
-                                <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
+                            <td id="policy-groups" style="padding:10px 15px;"></td>
-                                <td id="policy-assignment" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        <tr role="row" class="even">
-                            <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
-                                <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
+                            <td id="policy-action" style="padding:10px 15px;"></td>
-                                <td id="policy-action" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        <tr role="row" class="even">
-                            <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px;">Status</td>
-                                <td class="sorting_1" style="padding:10px 15px;">Status</td>
+                            <td id="policy-status" style="padding:10px 15px;"></td>
-                                <td id="policy-status" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        <tr role="row" id="users-row" class="even">
-                            <tr role="row" id="users-row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
-                                <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
+                            <td id="policy-users" style="padding:10px 15px;"></td>
-                                <td id="policy-users" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        <tr role="row" id="roles-row" class="even">
-                            <tr role="row" id="roles-row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
-                                <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
+                            <td id="policy-roles" style="padding:10px 15px;"></td>
-                                <td id="policy-roles" style="padding:10px 15px;"></td>
+                        </tr>
-                            </tr>
+                        </tbody>
-                            </tbody>
+                    </table>
-                        </table>
+                {{/defineZone}}
-                    {{/defineZone}}
+                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description</div>
+                </div>
-                    <div class="add-margin-top-4x">
+                <div class="add-margin-top-4x">
-                        <div id="policy-description" class="panel-title-description"></div>
+                    <div id="policy-description" class="panel-title-description"></div>
-                    </div>
+                </div>
-                    <br>
+                <br>
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                        Profile Information
+                    Profile Information
+                </div>
+                <div class="add-margin-top-4x">
+                    <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
                     </div>
-                    <div class="add-margin-top-4x">
+                    <div class="wr-advance-operations">
-                        <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
+                        <div class='wr-advance-operations-init'>
-                            <i class="icon fw fw-error"></i><span></span>
+                            <br/>
+                            <i class='fw fw-settings fw-spin fw-2x'></i>
+                            Loading Platform Features . . .
+                            <br/>
+                            <br/>
+                        </div>
+                        <div id="device-type-policy-operations" class="hidden">
                         </div>
-                        <div class="wr-advance-operations">
+                        <div id="generic-policy-operations" class="hidden">
-                            <div class="wr-advance-operations-init">
+                            {{unit "cdmf.unit.device.type.generic.policy-wizard"}}
-                                <br>
-                                <i class="fw fw-settings fw-spin fw-2x"></i>
-                                Loading platform features . . .
-                                <br>
-                                <br>
-                            </div>
                         </div>
                     </div>
                 </div>
@@ -74,15 +79,5 @@
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
-    <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-ios" src="{{@unit.publicUri}}/templates/hidden-operations-ios.hbs"
-            type="text/x-handlebars-template"></script>
-    <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-android" src="{{@unit.publicUri}}/templates/hidden-operations-android.hbs"
-            type="text/x-handlebars-template"></script>
-    <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-windows" src="{{@unit.publicUri}}/templates/hidden-operations-windows.hbs"
-            type="text/x-handlebars-template"></script>
     {{js "js/view.js"}}
-{{/zone}}
+{{/zone}}
-

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.js

@@ -17,9 +17,11 @@
  */
 
 function onRequest(context) {
-//    var log = new Log("policy-view-edit-unit backend js");
 
-//    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+    var utility = require("/app/modules/utility.js")["utility"];
-//    context.roles = userModule.getRoles();
+    var deviceType = context.uriParams.deviceType;
-    return context;
+    var deviceId = context.uriParams.deviceId;
-}
+
+    return {"deviceTypePolicyView": utility.getTenantedDeviceUnitName(deviceType, deviceId,"policy-view")};
+
+}

e, commit your changes or stash them before you can merge.

@@ -1,15 +0,0 @@
-diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
-index addf38e..4e2ad6b 100644
---- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
-+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
-@@ -43,8 +43,8 @@
-         <MaxRetries>5</MaxRetries>
-         <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
-         <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
--        <!--<PolicyEvaluationPointName>SimplePolicyEvaluationServiceComponent</PolicyEvaluationPointName>-->
--        <PolicyEvaluationPointName>MergedPolicyEvaluationServiceComponent</PolicyEvaluationPointName>
-+        <!--<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>-->
-+        <PolicyEvaluationPoint>Merged</PolicyEvaluationPoint>
-         <Platforms>
-             <Platform>android</Platform>
-             <Platform>ios</Platform>