@c8y/ng1-modules 1018.481.0 → 1018.482.30

package/users/userDetailView/userDetailView.html

@@ -1,20 +1,29 @@
 <c8y-breadcrumbs-set>
   <c8y-breadcrumbs-item
+    icon="c8y-accounts"
     path="#users"
     label="{{ 'Users' | translate }}"
-    icon="c8y-accounts"
   ></c8y-breadcrumbs-item>
   <c8y-breadcrumbs-item
-    label="{{ 'Accounts' | translate }}"
     icon="c8y-accounts"
+    label="{{ 'Accounts' | translate }}"
   ></c8y-breadcrumbs-item>
 </c8y-breadcrumbs-set>
 
 <div class="card content-fullpage d-grid grid__col--6-6--md grid__row--auto-min-content">
-  <form name="forms.userForm" class="d-contents" novalidate>
+  <form
+    class="d-contents"
+    name="forms.userForm"
+    novalidate
+  >
     <div class="inner-scroll bg-level-0">
       <div class="card-header large-padding separator sticky-top">
-        <div class="card-title h4" translate>Identification</div>
+        <div
+          class="card-title h4"
+          translate
+        >
+          Identification
+        </div>
       </div>
       <div class="card-block large-padding">
         <c8y-ui-edit-user
@@ -33,13 +42,25 @@
     </div>
   </form>
 
-  <form name="forms.rolesForm" class="d-contents" novalidate>
+  <form
+    class="d-contents"
+    name="forms.rolesForm"
+    novalidate
+  >
     <div class="bg-level-1 inner-scroll">
       <div class="card-header sticky-top separator">
-        <div class="h4 card-title" translate>Global roles</div>
+        <div
+          class="h4 card-title"
+          translate
+        >
+          Global roles
+        </div>
       </div>
       <ul class="c8y-list__group p-l-16 p-r-16 no-border-last">
-        <li class="c8y-list__item bg-inherit" ng-repeat="group in groups | orderBy: 'name'">
+        <li
+          class="c8y-list__item bg-inherit"
+          ng-repeat="group in groups | orderBy: 'name'"
+        >
           <div class="c8y-list__item__block">
             <div class="c8y-list__item__body p-l-0">
               <label
@@ -49,21 +70,24 @@
                 }"
               >
                 <input
-                  type="checkbox"
                   id="{{ 'groupcheckbox' + $index }}"
+                  type="checkbox"
                   ng-model="_groups[group.id]"
                   ng-disabled="vm.shouldDisableGlobalRolesCheckbox(group)"
                 />
                 <span></span>
-                <span title="{{ ::group.name | translate }}" class="text-normal d-flex">
+                <span
+                  class="text-normal d-flex"
+                  title="{{ ::group.name | translate }}"
+                >
                   <div>
                     {{::group.name | translate}}
                     <p class="small text-muted">{{::group.description | translate}}</p>
                   </div>
                   <button
                     class="m-l-auto btn-clean"
-                    type="button"
                     aria-label="{{ 'Global roles' | translate }}"
+                    type="button"
                     uib-popover="{{
                       'Only global roles defined on the owner can be defined on the owned user.'
                         | translate
@@ -74,7 +98,10 @@
                     ng-click="$event.preventDefault()"
                     ng-show="restrictedByOwner(group)"
                   >
-                    <i c8y-icon="exclamation-circle" class="text-warning"></i>
+                    <i
+                      class="text-warning"
+                      c8y-icon="exclamation-circle"
+                    ></i>
                   </button>
                 </span>
               </label>
@@ -83,9 +110,17 @@
         </li>
       </ul>
 
-      <div ng-if="showAcl()" class="bg-inherit card--grid__separator-top--white">
+      <div
+        class="bg-inherit card--grid__separator-top--white"
+        ng-if="showAcl()"
+      >
         <div class="card-header large-padding sticky-top separator">
-          <div class="h4" translate>User permissions</div>
+          <div
+            class="h4"
+            translate
+          >
+            User permissions
+          </div>
         </div>
         <div class="card-block large-padding">
           <c8y-acl-editor acl="user.devicePermissions"></c8y-acl-editor>
@@ -96,21 +131,23 @@
 
   <div class="card-footer large-padding separator grid__col--fullspan">
     <button
+      class="btn btn-default"
       title="{{ 'Cancel' | translate }}"
       type="button"
-      class="btn btn-default"
       ng-click="vm.cancel()"
+      c8y-key-shortcut="Escape"
     >
       {{ 'Cancel' | translate }}
     </button>
     <button
       class="btn btn-primary"
-      type="button"
-      title="{{ 'Save' | translate }}"
       ng-class="{ 'btn-save': showPassword }"
+      title="{{ 'Save' | translate }}"
+      type="button"
       ng-if="canEditUser(currentUser, user)"
-      ng-disabled="saving || vm.isUserAndRolesFormPristine() || vm.isUserFormInvalid() || vm.isRolesFormInvalid()"
+      ng-disabled="!vm.canSave()"
       ng-click="checkPassword(user)"
+      c8y-key-shortcut="Enter"
     >
       {{ 'Save' | translate }}
     </button>

package/users/userListView/userListView.html

@@ -47,6 +47,7 @@
         type="button"
         class="btn btn-default"
         ng-click="vm.applyFilters()"
+        c8y-key-shortcut="Enter"
       >
         <i c8y-icon="filter"></i>
         <span class="hidden-sm" translate>Apply`filters`</span>
@@ -57,6 +58,7 @@
         class="m-l-0 btn btn-default"
         ng-click="vm.clearFilters()"
         ng-show="vm.isAnyFilterSelected()"
+        c8y-key-shortcut="Escape"
       >
         <i c8y-icon="times"></i>
         <span class="hidden-sm" translate>Clear`filters`</span>

package/devicemanagement-location/controllers/location.js

@@ -1 +0,0 @@
-"use strict";!function(){function e(t,n,e,a,i,o,l,c,d){var r,s,u="c8y_Position",g="com_nsn_startups_vendme_fragments_GPSCoordinates",f={},m={icon:{type:"div",className:"normal-marker-icon",iconSize:[25,41],iconAnchor:[12.5,41]},focus:!0,draggable:!0};function v(e){d.getMap("locationId").then(function(e){setTimeout(function(){e.invalidateSize(!0)},500)}),r=e,t.location=A(e)||{};var n,e=t.location;b(t.location),s=_.clone(e),(n=e).lat&&n.lng&&$(e)}function b(e){var n=_.get(e,"lat"),t=_.get(e,"lng"),a=_.get(e,"alt");_.set(e,"lat",_.toNumber(n)),_.set(e,"lng",_.toNumber(t)),_.isUndefined(a)||_.set(e,"alt",_.toNumber(a))}function h(e){var e=e&&e.latLng;e&&($(e={lat:Number(e.lat),lng:Number(e.lng),zoom:17}),C(e),D(e))}function p(){var e;i.detailCached(((e=_.get(t,"child.config.device"))&&(m.draggable=!1),_.get(e,"id",n.deviceId))).then(function(e){return _.cloneDeep(e.data)}).then(v)}function $(e){_.assign(m,{lat:parseFloat(e.lat),lng:parseFloat(e.lng)}),D(f.main=m)}function C(e){_.assign(t.location,{lat:parseFloat(e.lat),lng:(e=parseFloat(e.lng),(e%=360)<-180?360+e:180<e?e-360:e)})}function y(e){return i.isVendme(e)?g:u}function A(e){return e[y(e)]}function D(e){e=e||m;_.assign(t.center,e)}_.assign(t,{settings:{},markers:f,mapDefaults:{scrollWheelZoom:!1},centerMap:D,center:{lat:0,lng:0,zoom:11},pattern:{latitude:/^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?)$/,longitude:/^[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$/,altitude:/^[-+]?(0|([1-9]\d*))(\.\d+)?$/},events:{markers:{enable:["dragend"]}},gotoAddress:function(e){a.geoCode(e).then(function(e){e=_.get(e,"data.results[0].locations[0]");return e||l.warning(c("Address could not be found.")),e||null}).then(h)},cancel:function(){t.noeditable=!t.noeditable,_.isEqual(t.location,s)||(t.location=_.clone(s))},save:function(){t.noeditable=!t.noeditable;var e={id:r.id},n=_.clone(A(r));delete n.address,e[y(r)]=n,b(e[y(r)]),i.save(e).then(function(){l.success(c("Location saved."))}).then(p)},realtimeChannel:"/managedobjects/".concat(void 0!==n.deviceId?n.deviceId:"*"),invalid:angular.bind(e,e.invalid,t),id:t.$id}),t.$on("leafletDirectiveMarker.locationId.dragend",function(e,n){C(n.model)}),t.$watch("child.config.device",p),o.addListener(t.$id,t.realtimeChannel,"".concat(t.$id,"-subscribed"),function(){p()}),o.addListener(t.$id,t.realtimeChannel,"CREATE",function(e,n){v(n)}),o.addListener(t.$id,t.realtimeChannel,"UPDATE",function(e,n){v(n)}),p()}e.$inject=["$scope","$routeParams","c8yBase","c8yGeo","c8yDevices","c8yRealtime","c8yAlert","gettext","leafletData"],angular.module("c8y.parts.location").controller("locationCtrl",e)}();

package/devicemanagement-location/cumulocity.json

@@ -1,24 +0,0 @@
-{
-  "name": "Asset location",
-  "ngModules": [
-    "c8y.parts.location"
-  ],
-  "category": "Device",
-  "icon": "home",
-  "color": "#F03F0F",
-  "description": "Define the location of an asset using a map and map-matching. This plugin contributes a new view.",
-  "css": [
-    "style.css"
-  ],
-  "js": [
-    "index.js",
-    "controllers/location.js"
-  ],
-  "folderName": "location",
-  "appsInclude": [
-    "devicemanagement"
-  ],
-  "copy": [
-    "img/*"
-  ]
-}

package/devicemanagement-location/index.js

@@ -1 +0,0 @@
-"use strict";!function(){function e(e,i,t,n){var o={lat:51.2433101,lng:6.7303924};function c(e){e=e.data;return _.has(e,"c8y_Position")||_.has(e,"com_nsn_startups_vendme_fragments_GPSCoordinates")}e.when("/device/:deviceId",{name:n("Location"),templateUrl:":::PLUGIN_PATH:::/views/index.html",icon:"location-arrow",showIf:["$routeParams","c8yDevices",function(e,i){e=e.deviceId;return i.detailCached(e).then(c)}]}),i.addUrlAction({path:"/device/:deviceId/*",text:n("Add location"),icon:"location-arrow",actionBar:!0,priority:1e3,showIf:["$routeParams","c8yDevices",function(e,i){e=e.deviceId;return i.detailCached(e).then(function(e){return!c(e)})}],showIfPermissions:{adminMOs:[":deviceId"]},action:["$routeParams","$location","c8yDevices",function(e,i,t){var e=e.deviceId,n="/device/".concat(e,"/location");t.save({id:e,c8y_Position:_.cloneDeep(o)}).then(function(){i.path(n)})}]}),t.add({name:n("Location"),description:n("Displays a map with device position marker"),templateUrl:":::PLUGIN_PATH:::/views/component.html",previewImage:":::PLUGIN_PATH:::/img/location-widget-pr.png",options:{noNewWidgets:!0}})}e.$inject=["c8yViewsProvider","c8yActionsProvider","c8yComponentsProvider","gettext"],angular.module("c8y.parts.location",[]).config(e)}();

package/devicemanagement-location/style.css

@@ -1,8 +0,0 @@
-.grid-stack-item-content .leaflet-container {
-  /*position:absolute;
-  top: 40px;
-  right:0;
-  bottom:0;
-  left:0;
-  height: auto !important;*/
-}

package/devicemanagement-location/views/component.html

@@ -1,11 +0,0 @@
-<div data-ng-controller="locationCtrl">
-  <leaflet
-    width="100%"
-    height="250px"
-    markers="markers"
-    center="center"
-    defaults="mapDefaults"
-    event-broadcast="events"
-    id="locationId"
-  ></leaflet>
-</div>

package/devicemanagement-location/views/index.html

@@ -1,163 +0,0 @@
-<div data-ng-controller="locationCtrl">
-  <c8y-ui-action-bar-set>
-    <c8y-realtime-btn class="btn btn-link" subscriber-id="id"></c8y-realtime-btn>
-
-    <button
-      class="btn btn-link"
-      type="button"
-      title="{{ 'Center map' | translate }}"
-      ng-click="centerMap()"
-    >
-      <i c8y-icon="dot-circle-o"></i>
-      {{ 'Center map' | translate }}
-    </button>
-  </c8y-ui-action-bar-set>
-
-  <div class="card content-fullpage card--grid grid__col--8-4--md">
-    <leaflet
-      width="100%"
-      height="100%"
-      markers="markers"
-      center="center"
-      defaults="mapDefaults"
-      id="locationId"
-      event-broadcast="events"
-      style="min-height: 30vh"
-    ></leaflet>
-
-    <div class="d-flex d-col bg-inherit content-fullpage">
-      <div class="card-header separator">
-        <span class="card-title" translate>Device location</span>
-        <button
-          class="btn-help"
-          type="button"
-          aria-label="{{ 'Help' | translate }}"
-          uib-popover-html="'Device location may be set by the device itself, or manually in the platform' | translate"
-          popover-placement="left"
-          popover-trigger="'focus'"
-          popover-append-to-body="true"
-        ></button>
-      </div>
-      <div class="inner-scroll">
-        <form
-          class="card-block"
-          ng-class="{ 'form-read-only': !noeditable }"
-          name="locationForm"
-          novalidate
-        >
-          <div
-            class="form-group m-b-24"
-            ng-class="{ 'has-error': invalid('locationForm', 'latitude') }"
-          >
-            <label for="latitude">
-              <span translate>Latitude</span>
-              (°)
-            </label>
-            <input
-              type="number"
-              name="latitude"
-              id="latitude"
-              class="form-control"
-              ng-disabled="!noeditable"
-              ng-model="location.lat"
-              ng-pattern="pattern.latitude"
-            />
-          </div>
-
-          <div
-            class="form-group m-b-24"
-            ng-class="{ 'has-error': invalid('locationForm', 'longitude') }"
-          >
-            <label for="longitude">
-              <span translate>Longitude</span>
-              (°)
-            </label>
-            <input
-              type="number"
-              name="longitude"
-              id="longitude"
-              class="form-control"
-              ng-disabled="!noeditable"
-              ng-model="location.lng"
-              ng-pattern="pattern.longitude"
-            />
-          </div>
-
-          <div
-            class="form-group m-b-24"
-            ng-class="{ 'has-error': invalid('locationForm', 'altitude') }"
-          >
-            <label for="altitude">
-              <span translate>Altitude</span>
-              (m)
-            </label>
-            <input
-              type="number"
-              name="altitude"
-              id="altitude"
-              class="form-control"
-              ng-disabled="!noeditable"
-              ng-model="location.alt"
-              ng-pattern="pattern.altitude"
-            />
-          </div>
-        </form>
-        <form
-          class="card-block bg-level-1"
-          name="addressForm"
-          ng-show="noeditable"
-          novalidate
-          ng-submit="gotoAddress(location.address)"
-        >
-          <div class="form-group">
-            <label for="latlong">{{ 'Find lat/long by address' | translate }}</label>
-            <div class="input-group input-group-search">
-              <input
-                type="text"
-                id="latlong"
-                ng-model="location.address"
-                placeholder="{{ 'e.g.' | translate }} Speditionstraße 13, Düsseldorf"
-                class="form-control"
-              />
-              <span class="input-group-btn">
-                <button class="btn btn-dot" type="submit" title="{{ 'Search' | translate }}">
-                  <i c8y-icon="search"></i>
-                </button>
-              </span>
-            </div>
-          </div>
-        </form>
-      </div>
-      <div class="card-footer separator">
-        <button
-          class="btn btn-default"
-          type="button"
-          title="{{ 'Edit location' | translate }}"
-          ng-click="noeditable = !noeditable"
-          ng-show="!noeditable"
-        >
-          {{ 'Edit location' | translate }}
-        </button>
-        <button
-          class="btn btn-default"
-          type="button"
-          title="{{ 'Cancel' | translate }}"
-          ng-click="cancel()"
-          ng-show="noeditable"
-        >
-          {{ 'Cancel' | translate }}
-        </button>
-        <button
-          class="btn btn-primary"
-          type="button"
-          title="{{ 'Save' | translate }}"
-          ng-disabled="locationForm.$invalid"
-          ng-click="save()"
-          ng-show="noeditable"
-        >
-          {{ 'Save' | translate }}
-        </button>
-      </div>
-    </div>
-  </div>
-</div>