@c8y/ng1-modules 1021.80.1 → 1022.3.2

package/core/ui/properties/propertySelector.html

@@ -1,35 +1,170 @@
-<div class="form-group m-b-8">
-  <label>{{ 'Properties' | translate }}</label>
-  <div class="d-flex">
-    <div class="m-l-auto m-r-16">
-      <a
-        title="{{ 'Add property' | translate }}"
-        class="btn btn-default btn-xs"
-        data-ng-click="addProperty()"
+<fieldset class="c8y-fieldset">
+  <legend>{{ 'Properties' | translate }}</legend>
+  <table class="table table-vertical-middle table-condensed" style="table-layout: fixed;">
+    <colgroup>
+      <col style="width: 5%" />
+      <col style="width: 7%" />
+      <col style="width: 28%" />
+      <col style="width: 28%" />
+      <col
+        ng-if="showRenderType()"
+        style="width: 28%"
+      />
+      <col style="width: 5%" />
+    </colgroup>
+    <thead>
+      <th></th>
+      <th>
+        <span>{{ 'Show' | translate }}</span>
+      </th>
+      <th>
+        <span>{{ 'Label' | translate }}</span>
+      </th>
+      <th>
+        <span>{{ 'Property' | translate }}</span>
+      </th>
+      <th
+        ng-if="showRenderType()"
       >
-        <i c8y-icon="plus"></i>
-        {{ 'Add property' | translate }}
-      </a>
-    </div>
-    <div class="dropdown" ng-hide="hideActions" uib-dropdown>
+        <span>{{ 'Render type' | translate }}</span>
+      </th>
+      <th></th>
+    </thead>
+
+    <tbody
+      ui-sortable="{handle: '.handle', stop: onPropertiesOrderChanged}"
+      ng-model="properties"
+    >
+      <tr
+        class="property"
+        ng-repeat="property in properties"
+      >
+        <td
+          class="handle"
+        >
+          <i
+            c8y-icon="bars"
+            style="cursor: move"
+          ></i>
+        </td>
+        <td>
+          <label
+            class="c8y-checkbox"
+            title="{{ 'Show' | translate }}"
+          >
+            <input
+              type="checkbox"
+              ng-change="updateOptions()"
+              ng-model="property.__active"
+            />
+            <span></span>
+          </label>
+        </td>
+        <td>
+          <input
+            class="form-control property-label input-sm"
+            data-ng-model="property.label"
+          />
+        </td>
+        <td>
+          <button
+            class="btn btn-xs btn-default"
+            aria-label="{{ 'Configure computed property' | translate }}"
+            uib-tooltip="{{ 'Configure computed property' | translate }}"
+            tooltip-popup-delay="500"
+            tooltip-append-to-body="true"
+            type="button"
+            ng-show="!!property.configSchema"
+            ng-click="configComputeProperty(property)"
+          >
+            <i c8y-icon="bolt"></i>
+            {{ displayKeyPath(property.keyPath) }}
+          </button>
+          <span
+            class="text-truncate"
+            title="{{ displayKeyPath(property.keyPath) }}"
+            ng-hide="!!property.configSchema"
+          >
+            {{ displayKeyPath(property.keyPath) }}
+          </span>
+        </td>
+        <td
+          ng-if="showRenderType()"
+        >
+          <div class="input-group d-flex">
+            <div class="c8y-select-wrapper">
+              <select
+                class="form-control input-sm"
+                name="renderType"
+                ng-disabled="property.isAction"
+                ng-model="property.renderType"
+                ng-options="render.name as render.humanName | translate for render in renderTypes"
+              ></select>
+            </div>
+            <span class="m-l-4">
+              <button
+                class="btn btn-xs pull-right"
+                ng-class="{
+                  'btn-danger': !property.renderConfig,
+                  'btn-default': property.renderConfig
+                }"
+                title="{{ 'Config renderer' | translate }}"
+                type="button"
+                ng-click="configRenderer(property)"
+                ng-show="rendererHasConfig(property.renderType)"
+              >
+                <i c8y-icon="sliders"></i>
+              </button>
+            </span>
+          </div>
+        </td>
+        <td>
+          <button
+            class="btn btn-dot btn-dot--danger showOnHover pull-right"
+            title="{{ 'Delete property' | translate }}"
+            type="button"
+            ng-click="removeProperty(property)"
+          >
+            <i c8y-icon="minus-circle"></i>
+          </button>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <div class="m-t-16 m-b-16 d-flex gap-8 a-i-center">
+    <a
+      class="btn btn-default btn-sm"
+      title="{{ 'Add property' | translate }}"
+      data-ng-click="addProperty()"
+    >
+      <i c8y-icon="plus-circle"></i>
+      {{ 'Add property' | translate }}
+    </a>
+    <div
+      class="dropdown"
+      ng-hide="hideActions"
+      uib-dropdown
+    >
       <button
-        class="btn btn-default btn-xs dropdown-toggle c8y-dropdown"
-        type="button"
+        class="btn btn-default btn-sm dropdown-toggle c8y-dropdown"
         title="{{ 'Add action' | translate }}"
+        aria-haspopup="true"
+        type="button"
         data-cy="property-selector--add-action"
         uib-dropdown-toggle
-        aria-haspopup="true"
       >
-        <i c8y-icon="plus"></i>
         {{ 'Add action' | translate }}
+        <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu dropdown-menu-right m-t-8" uib-dropdown-menu>
+      <ul
+        class="dropdown-menu dropdown-menu-right m-t-8"
+        uib-dropdown-menu
+      >
         <li ng-repeat="action in actions">
           <button
-            class="btn btn-link"
+            title="{{ action.config.label | translate }}"
             type="button"
             data-cy="property-selector--{{ action.config.label }}"
-            title="{{ action.config.label | translate }}"
             ng-click="addAction(action)"
           >
             {{ action.config.label | translate }}
@@ -38,94 +173,6 @@
       </ul>
     </div>
   </div>
-</div>
+</fieldset>
 
-<table class="table table-vertical-middle form-group">
-  <thead>
-    <th style="width: 5%"></th>
-    <th style="width: 5%">
-      <label>{{ 'Show' | translate }}</label>
-    </th>
-    <th style="width: 28%">
-      <label>{{ 'Label' | translate }}</label>
-    </th>
-    <th style="width: 28%">
-      <label>{{ 'Property' | translate }}</label>
-    </th>
-    <th style="width: 28%" ng-if="showRenderType()">
-      <label>{{ 'Render type' | translate }}</label>
-    </th>
-    <th style="width: 5%"></th>
-  </thead>
-
-  <tbody ui-sortable="{handle: '.handle', stop: onPropertiesOrderChanged}" ng-model="properties">
-    <tr class="property" ng-repeat="property in properties">
-      <td style="width: 5%" class="handle">
-        <i c8y-icon="bars" style="cursor: move"></i>
-      </td>
-      <td style="width: 5%">
-        <input type="checkbox" ng-change="updateOptions()" ng-model="property.__active" />
-      </td>
-      <td style="width: 28%">
-        <input class="form-control property-label" data-ng-model="property.label" />
-      </td>
-      <td style="width: 28%">
-        <button
-          class="btn btn-xs btn-default"
-          type="button"
-          aria-label="{{ 'Configure computed property' | translate }}"
-          uib-tooltip="{{ 'Configure computed property' | translate }}"
-          tooltip-popup-delay="500"
-          tooltip-append-to-body="true"
-          ng-show="!!property.configSchema"
-          ng-click="configComputeProperty(property)"
-        >
-          <i c8y-icon="bolt"></i>
-          {{ displayKeyPath(property.keyPath) }}
-        </button>
-        <span ng-hide="!!property.configSchema">{{ displayKeyPath(property.keyPath) }}</span>
-      </td>
-      <td style="width: 28%" ng-if="showRenderType()">
-        <div class="input-group d-flex">
-          <div class="c8y-select-wrapper">
-            <select
-              class="form-control"
-              name="renderType"
-              ng-disabled="property.isAction"
-              ng-model="property.renderType"
-              ng-options="render.name as render.humanName | translate for render in renderTypes"
-            >
-              <span></span>
-            </select>
-          </div>
-          <span class="m-l-4">
-            <button
-              class="btn btn-xs pull-right"
-              type="button"
-              title="{{ 'Config renderer' | translate }}"
-              ng-click="configRenderer(property)"
-              ng-show="rendererHasConfig(property.renderType)"
-              ng-class="{
-                'btn-danger': !property.renderConfig,
-                'btn-default': property.renderConfig
-              }"
-            >
-              <i c8y-icon="sliders"></i>
-            </button>
-          </span>
-        </div>
-      </td>
-      <td style="width: 5%">
-        <button
-          class="btn btn-dot btn-dot--danger showOnHover pull-right"
-          type="button"
-          title="{{ 'Delete property' | translate }}"
-          ng-click="removeProperty(property)"
-        >
-          <i c8y-icon="times"></i>
-        </button>
-      </td>
-    </tr>
-  </tbody>
-</table>
 <ng-form name="propertiesHiddenForm"></ng-form>

package/core/ui/views/auditList.html

@@ -80,7 +80,7 @@
           </button>
           <i
             class="text-gray-medium-dark"
-            c8y-icon="c8y-events"
+            c8y-icon="online1"
             ng-if="!convertTypeIcon(audit.type)"
           ></i>
         </div>
@@ -160,4 +160,4 @@
     </div>
   </div>
   <c8y-load-more></c8y-load-more>
-</div>
+</div>

package/core/ui/views/eventList.html

@@ -80,7 +80,7 @@
   ng-if="!$parent.child.templateUrl && !hideHeaderActions && ctrl.showOverviewBreadcrumbs"
 >
   <c8y-breadcrumbs-item
-    icon="c8y-events"
+    icon="online1"
     label="{{ 'Events' | translate }}"
   ></c8y-breadcrumbs-item>
   <c8y-breadcrumbs-item
@@ -165,7 +165,7 @@
 
 <!-- empty state -->
 <c8y-ui-empty-state
-  [icon]="'c8y-events'"
+  [icon]="'online1'"
   [title]="'No events to display.' | translate"
   ng-if="events.length == 0"
 >

package/core/ui/views/filePicker.html

@@ -77,7 +77,7 @@
             <i c8y-icon="ellipsis-h"></i>
           </button>
           <button
-            class="btn btn-dot btn-dot--danger"
+            class="btn-dot btn-dot--danger"
             title="{{ 'Remove' | translate }}"
             aria-label="{{ 'Remove' | translate }}"
             type="button"

package/dataBroker/connectors/connectors.service.js

@@ -1 +1 @@
-(()=>{function e(a,o,r,c,i,u,l){var s=c.url("databroker/connectors"),n=c.contentHeaders("connector",!0),e=c.createEnum([{name:"ALARM",value:"alarm",label:u("Alarms"),icon:"bell"},{name:"EVENT",value:"event",label:u("Events"),icon:"c8y-events"},{name:"MEASUREMENT",value:"measurement",label:u("Measurements"),icon:"line-chart"},{name:"MANAGED_OBJECT",value:"managedObject",label:u("Managed objects"),icon:"cubes"},{name:"OPERATION",value:"operation",label:u("Operations"),icon:"code"},{name:"ALL",value:"*",hidden:!0}]),d=c.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"ACTIVATING",label:u("activating`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),g=c.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),m=c.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"ACTIVATING",label:u("activating`connector`")},{name:"PENDING",label:u("pending`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),p=["name","description","filters"],t=["id","status","destinationStatus","instanceUrl","tenantId","username","password","code","self","suspendReason"];return{getConnectors:function e(){var t={params:c.pageSizeNoTotalFilter()};var n=c.cleanListCallback("connectors",e,t.params);return o.get(s,t).then(n).then(function(e){return _.forEach(e,E),e})},saveConnector:function(e){{var t;t=c.hasId(e)?(t=_.pick(e,p),f(c.getId(e),t)):T(e)}return t},createConnector:T,updateConnector:f,toggleConnectorStatus:function(t){t.status===d.ACTIVE.value?t.status=d.SUSPENDED.value:t.status=d.ACTIVE.value;return _.unset(t,"visibleStatus"),f(t.id,{status:t.status}).then(function(e){t.status=e.status,E(t)})},getConnector:function(e){return o.get(v(e)).then(c.getResData).then(E)},getConnectorStub:function(){return{name:"",instanceUrl:"",description:"",filters:[]}},getConnectorDuplicate:function(e){return o.get(v(e)).then(c.getResData).then(function(e){return e.name=l.getString("Duplicate of {{name}}",e),_.omit(e,t)})},deleteConnector:function(e){return o({method:"DELETE",url:v(e)})},updateConnectorName:function(t,n){var e=a.when();t.id?e=f(t.id,{name:n}).then(function(e){return t.name=n,e}):t.name=n;return e},convertToViewModel:function(e){e=_.cloneDeep(e);return e.filters=_.map(e.filters,function(e){return e.apis=_.transform(e.apis,function(e,t){e[t]=!0},{}),e.fragmentsToFilter=I(e.fragmentsToFilter),e.copyAllFragments=_.isNull(e.fragmentsToCopy)||_.isUndefined(e.fragmentsToCopy),e.fragmentsToCopy=I(e.fragmentsToCopy),e.selectedGroupOrDevice=(e=>{var t,e=e.deviceGroupId||e.sourceId;return t=e?{id:e}:t})(e),e}),e},convertToBackendModel:function(e){e=_.cloneDeep(e);return e.filters=_.map(e.filters,function(e){a=e.apis;var t,n,a=_(a).map(function(e,t){return e?t:void 0}).compact().value(),o=A(e.fragmentsToFilter),r=e.copyAllFragments?null:A(e.fragmentsToCopy),c=e.selectedGroupOrDevice;return c&&c.isDevice&&(t=c.id),c&&!c.isDevice&&(n=c.id),_.assign(e,{isOpen:void 0,apis:a,fragmentsToFilter:o,fragmentsToCopy:r,copyAllFragments:void 0,sourceId:t,deviceGroupId:n,selectedGroupOrDevice:void 0})}),e},getFilterFragmentsSummary:function(e){var t=A(_.get(e,"fragmentsToFilter",[])),n=A(_.get(e,"fragmentsToCopy",[])),e=_.get(e,"copyAllFragments"),a="",o="";a=0<t.length?l.getString("Filter: {{fragments}}",{fragments:t.join(", ")}):l.getString("Filter: none");o=e?l.getString("Copy: all"):0<n.length?l.getString("Copy: {{fragments}}",{fragments:n.join(", ")}):l.getString("Copy: standard only");return[a,o].join("; ")},navigateToList:function(){var e=i.CONNECTOR_BASE_URL;r.path(e)},navigateToNew:function(e){var t="new",n=i.CONNECTOR_BASE_URL,a="";c.hasId(e)&&(t=c.getId(e),a="/duplicate");r.path("".concat(n,"/").concat(t).concat(a))},navigateToDetails:function(e){e=c.getId(e),e="".concat(i.CONNECTOR_BASE_URL,"/").concat(e);r.path(e)},getMappedStatus:S,getStatusTooltip:function(e){var t={},n=d.WAITING.value,a=d.ACTIVE.value,o=d.ACTIVATING.value,r=d.SUSPENDED.value,c=g.ACTIVE.value,i=g.WAITING.value,s=g.SUSPENDED.value,n=(t[n]=u("Connector not bootstrapped yet."),t[a]={},t[a][c]=u("Connector is working."),t[o]={},t[o][c]=u("Inventory structure synchronization in progress."),t[a][s]=u("Subscription in destination tenant disabled."),t[r]={},t[r][i]=u("Connector not bootstrapped but suspended by source tenant."),t[r][c]=u("Connector suspended by source tenant."),t[r][s]=u("Subscription in destination tenant disabled and then connector suspended by source tenant."),t[e.status]);return(e.status===r?l.getString(e.suspendReason):void 0)||_.get(n,e.destinationStatus)||n},APIS:e,STATUS:d,MAPPED_STATUS:m,DESTINATION_STATUS:g};function v(e){return[s,e].join("/")}function T(e){return o({method:"POST",url:s,data:e,headers:n}).then(c.getResData)}function f(e,t){return o({method:"PUT",url:v(e),data:t,headers:n}).then(c.getResData)}function E(e){return e.visibleStatus=S(e),e}function S(e){var t={},n=d.WAITING.value,a=d.ACTIVE.value,o=d.ACTIVATING.value,r=d.SUSPENDED.value,c=g.ACTIVE.value,i=g.SUSPENDED.value,n=(t[n]=m.WAITING,t[a]={},t[a][c]=m.ACTIVE,t[o]={},t[o][c]=m.ACTIVATING,t[a][i]=m.PENDING,t[r]=m.SUSPENDED,t[e.status]);return _.get(n,e.destinationStatus)||n}function I(e){e=e||[];return e.length||e.push(""),_.map(e,C)}function C(e){return{fragment:e}}function A(e){return _(e).map("fragment").compact().value()}}e.$inject=["$q","$http","$location","c8yBase","dataBrokerConstants","gettext","gettextCatalog"],angular.module("c8y.dataBroker").factory("dataBrokerConnectorsSvc",e)})();
+(()=>{function e(a,o,r,i,c,u,l){var s=i.url("databroker/connectors"),n=i.contentHeaders("connector",!0),e=i.createEnum([{name:"ALARM",value:"alarm",label:u("Alarms"),icon:"bell"},{name:"EVENT",value:"event",label:u("Events"),icon:"online1"},{name:"MEASUREMENT",value:"measurement",label:u("Measurements"),icon:"line-chart"},{name:"MANAGED_OBJECT",value:"managedObject",label:u("Managed objects"),icon:"cubes"},{name:"OPERATION",value:"operation",label:u("Operations"),icon:"code"},{name:"ALL",value:"*",hidden:!0}]),d=i.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"ACTIVATING",label:u("activating`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),g=i.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),m=i.createEnum([{name:"ACTIVE",label:u("active`connector`")},{name:"ACTIVATING",label:u("activating`connector`")},{name:"PENDING",label:u("pending`connector`")},{name:"SUSPENDED",label:u("suspended`connector`")},{name:"WAITING",label:u("waiting`connector`")}]),p=["name","description","filters"],t=["id","status","destinationStatus","instanceUrl","tenantId","username","password","code","self","suspendReason"];return{getConnectors:function e(){var t={params:i.pageSizeNoTotalFilter()};var n=i.cleanListCallback("connectors",e,t.params);return o.get(s,t).then(n).then(function(e){return _.forEach(e,E),e})},saveConnector:function(e){{var t;t=i.hasId(e)?(t=_.pick(e,p),f(i.getId(e),t)):T(e)}return t},createConnector:T,updateConnector:f,toggleConnectorStatus:function(t){t.status===d.ACTIVE.value?t.status=d.SUSPENDED.value:t.status=d.ACTIVE.value;return _.unset(t,"visibleStatus"),f(t.id,{status:t.status}).then(function(e){t.status=e.status,E(t)})},getConnector:function(e){return o.get(v(e)).then(i.getResData).then(E)},getConnectorStub:function(){return{name:"",instanceUrl:"",description:"",filters:[]}},getConnectorDuplicate:function(e){return o.get(v(e)).then(i.getResData).then(function(e){return e.name=l.getString("Duplicate of {{name}}",e),_.omit(e,t)})},deleteConnector:function(e){return o({method:"DELETE",url:v(e)})},updateConnectorName:function(t,n){var e=a.when();t.id?e=f(t.id,{name:n}).then(function(e){return t.name=n,e}):t.name=n;return e},convertToViewModel:function(e){e=_.cloneDeep(e);return e.filters=_.map(e.filters,function(e){return e.apis=_.transform(e.apis,function(e,t){e[t]=!0},{}),e.fragmentsToFilter=I(e.fragmentsToFilter),e.copyAllFragments=_.isNull(e.fragmentsToCopy)||_.isUndefined(e.fragmentsToCopy),e.fragmentsToCopy=I(e.fragmentsToCopy),e.selectedGroupOrDevice=(e=>{var t,e=e.deviceGroupId||e.sourceId;return t=e?{id:e}:t})(e),e}),e},convertToBackendModel:function(e){e=_.cloneDeep(e);return e.filters=_.map(e.filters,function(e){a=e.apis;var t,n,a=_(a).map(function(e,t){return e?t:void 0}).compact().value(),o=A(e.fragmentsToFilter),r=e.copyAllFragments?null:A(e.fragmentsToCopy),i=e.selectedGroupOrDevice;return i&&i.isDevice&&(t=i.id),i&&!i.isDevice&&(n=i.id),_.assign(e,{isOpen:void 0,apis:a,fragmentsToFilter:o,fragmentsToCopy:r,copyAllFragments:void 0,sourceId:t,deviceGroupId:n,selectedGroupOrDevice:void 0})}),e},getFilterFragmentsSummary:function(e){var t=A(_.get(e,"fragmentsToFilter",[])),n=A(_.get(e,"fragmentsToCopy",[])),e=_.get(e,"copyAllFragments"),a="",o="";a=0<t.length?l.getString("Filter: {{fragments}}",{fragments:t.join(", ")}):l.getString("Filter: none");o=e?l.getString("Copy: all"):0<n.length?l.getString("Copy: {{fragments}}",{fragments:n.join(", ")}):l.getString("Copy: standard only");return[a,o].join("; ")},navigateToList:function(){var e=c.CONNECTOR_BASE_URL;r.path(e)},navigateToNew:function(e){var t="new",n=c.CONNECTOR_BASE_URL,a="";i.hasId(e)&&(t=i.getId(e),a="/duplicate");r.path("".concat(n,"/").concat(t).concat(a))},navigateToDetails:function(e){e=i.getId(e),e="".concat(c.CONNECTOR_BASE_URL,"/").concat(e);r.path(e)},getMappedStatus:S,getStatusTooltip:function(e){var t={},n=d.WAITING.value,a=d.ACTIVE.value,o=d.ACTIVATING.value,r=d.SUSPENDED.value,i=g.ACTIVE.value,c=g.WAITING.value,s=g.SUSPENDED.value,n=(t[n]=u("Connector not bootstrapped yet."),t[a]={},t[a][i]=u("Connector is working."),t[o]={},t[o][i]=u("Inventory structure synchronization in progress."),t[a][s]=u("Subscription in destination tenant disabled."),t[r]={},t[r][c]=u("Connector not bootstrapped but suspended by source tenant."),t[r][i]=u("Connector suspended by source tenant."),t[r][s]=u("Subscription in destination tenant disabled and then connector suspended by source tenant."),t[e.status]);return(e.status===r?l.getString(e.suspendReason):void 0)||_.get(n,e.destinationStatus)||n},APIS:e,STATUS:d,MAPPED_STATUS:m,DESTINATION_STATUS:g};function v(e){return[s,e].join("/")}function T(e){return o({method:"POST",url:s,data:e,headers:n}).then(i.getResData)}function f(e,t){return o({method:"PUT",url:v(e),data:t,headers:n}).then(i.getResData)}function E(e){return e.visibleStatus=S(e),e}function S(e){var t={},n=d.WAITING.value,a=d.ACTIVE.value,o=d.ACTIVATING.value,r=d.SUSPENDED.value,i=g.ACTIVE.value,c=g.SUSPENDED.value,n=(t[n]=m.WAITING,t[a]={},t[a][i]=m.ACTIVE,t[o]={},t[o][i]=m.ACTIVATING,t[a][c]=m.PENDING,t[r]=m.SUSPENDED,t[e.status]);return _.get(n,e.destinationStatus)||n}function I(e){e=e||[];return e.length||e.push(""),_.map(e,C)}function C(e){return{fragment:e}}function A(e){return _(e).map("fragment").compact().value()}}e.$inject=["$q","$http","$location","c8yBase","dataBrokerConstants","gettext","gettextCatalog"],angular.module("c8y.dataBroker").factory("dataBrokerConnectorsSvc",e)})();

package/dataPointExplorer/views/widgetConfig.html

@@ -1,18 +1,17 @@
 <div
+  class="row no-card-context"
   ng-controller="DataPointWidgetConfigCtrl"
   ng-init="disableLocalStorage = true"
-  class="row no-card-context d-flex"
-  style="height: calc(100vh - 422px);"
 >
-  <div class="col-md-5 bg-level-1 a-s-stretch inner-scroll">
-    <div class="p-l-24 bg-inherit p-t-8">
+  <div class="col-md-12 a-s-stretch">
+    <div class="bg-inherit p-t-8">
       <div class="form-group m-b-0 p-b-16 separator-bottom">
         <label for="dateSelection">
           {{ 'Date selection' | translate }}
           <button
-            type="button"
             class="btn-help btn-help--sm"
             aria-label="{{ 'Help' | translate }}"
+            type="button"
             uib-popover-html="dateSelectionHelpPopoverText | translate"
             popover-placement="right"
             popover-trigger="'focus'"
@@ -21,10 +20,10 @@
         </label>
         <div class="c8y-select-wrapper">
           <select
-            id="dateSelection"
             class="form-control"
             title="{{ 'Date selection' | translate }}"
             aria-label="{{ 'Date selection' | translate }}"
+            id="dateSelection"
             ng-model="dateSelection"
           >
             <option
@@ -49,96 +48,95 @@
         </div>
       </div>
 
-      <c8y-data-point-list
-        datapoints="data.datapoints"
-        allow-adding-data-points-from-context-mo-only="dashboard.deviceType && dashboard.deviceTypeValue"
-        dont-save="true"
-        no-target
-        no-yellow-range
-        no-red-range
-        class="bg-inherit separator-bottom"
-      ></c8y-data-point-list>
-      <c8y-alarms-events-timelines-config
-        configs="data.alarmsEventsConfigs"
-        allow-alarms-events-from-context-mo-only="dashboard.deviceType && dashboard.deviceTypeValue"
-        class="d-block bg-inherit separator-top"
-        style="padding-top: 1px;"
-      ></c8y-alarms-events-timelines-config>
-    </div>
-  </div>
-
-  <div class="col-md-7 sticky-top">
-    <div class="p-r-24 p-t-8">
-      <div
-        class="data-point-explorer d-flex d-col"
-        ng-controller="c8yDataPointExplorerCtrl"
-      >
-        <div class="m-b-4 m-t-4 d-flex j-c-end gap-8">
-          <c8y-realtime-button
-            ng-show="!data.widgetInstanceGlobalTimeContext"
-            class="top-right-control"
-            channel="{{ channel }}"
-            state="data.realtime"
-            on-data="onData($data)"
-          ></c8y-realtime-button>
-          <c8y-realtime-button
-            ng-show="false"
-            channel="{{ alarmsChannel }}"
-            state="data.realtime"
-            on-data="onAlarm($data)"
-            on-data-update="onAlarm($data)"
-          ></c8y-realtime-button>
-          <c8y-realtime-button
-            ng-show="false"
-            channel="{{ eventsChannel }}"
-            state="data.realtime"
-            on-data="onEvent($data)"
-          ></c8y-realtime-button>
-          <c8y-aggregation
-            ng-show="!data.widgetInstanceGlobalTimeContext"
-            class="top-right-control"
-            date-from="data.dateFrom"
-            date-to="data.dateTo"
-            aggregation="data.aggregation"
-            realtime="data.realtime"
-            auto="true"
-          ></c8y-aggregation>
-          <c8y-interval
-            ng-show="!data.widgetInstanceGlobalTimeContext"
-            class="top-right-control"
-            date-from="data.dateFrom"
-            date-to="data.dateTo"
-            interval="data.interval"
-          ></c8y-interval>
-        </div>
-        <div
-          class="c8yGraphFill"
-          style="height: calc(100vh - 520px);"
-        >
-          <c8y-chart
-            datapoints="data.graphDataPoints"
-            date-from="data.dateFrom"
-            date-to="data.dateTo"
-            realtime="data.realtime"
-            aggregation="data.aggregation"
-            show-time="!data.widgetInstanceGlobalTimeContext"
-            on-data="(onData)"
-            on-update-dates="onUpdateDates($dateFrom, $dateTo)"
-            on-update-displayed-dates="onUpdateDisplayedDates($dateFrom, $dateTo)"
-            on-box-changed="onBoxChanged(box)"
-          ></c8y-chart>
+      <div class="p-b-8 separator-bottom">
+        <div class="p-r-24 p-t-8">
+          <div
+            class="data-point-explorer d-flex d-col"
+            ng-controller="c8yDataPointExplorerCtrl"
+          >
+            <div class="m-b-4 m-t-4 d-flex j-c-start gap-8">
+              <c8y-realtime-button
+                class="top-right-control"
+                ng-show="!data.widgetInstanceGlobalTimeContext"
+                channel="{{ channel }}"
+                state="data.realtime"
+                on-data="onData($data)"
+              ></c8y-realtime-button>
+              <c8y-realtime-button
+                ng-show="false"
+                channel="{{ alarmsChannel }}"
+                state="data.realtime"
+                on-data="onAlarm($data)"
+                on-data-update="onAlarm($data)"
+              ></c8y-realtime-button>
+              <c8y-realtime-button
+                ng-show="false"
+                channel="{{ eventsChannel }}"
+                state="data.realtime"
+                on-data="onEvent($data)"
+              ></c8y-realtime-button>
+              <c8y-aggregation
+                class="top-right-control"
+                ng-show="!data.widgetInstanceGlobalTimeContext"
+                date-from="data.dateFrom"
+                date-to="data.dateTo"
+                aggregation="data.aggregation"
+                realtime="data.realtime"
+                auto="true"
+              ></c8y-aggregation>
+              <c8y-interval
+                class="top-right-control"
+                ng-show="!data.widgetInstanceGlobalTimeContext"
+                date-from="data.dateFrom"
+                date-to="data.dateTo"
+                interval="data.interval"
+              ></c8y-interval>
+            </div>
+            <c8y-widget-preview-wrapper>
+              <div class="c8yGraphFill">
+                <c8y-chart
+                  datapoints="data.graphDataPoints"
+                  date-from="data.dateFrom"
+                  date-to="data.dateTo"
+                  realtime="data.realtime"
+                  aggregation="data.aggregation"
+                  show-time="!data.widgetInstanceGlobalTimeContext"
+                  on-data="(onData)"
+                  on-update-dates="onUpdateDates($dateFrom, $dateTo)"
+                  on-update-displayed-dates="onUpdateDisplayedDates($dateFrom, $dateTo)"
+                  on-box-changed="onBoxChanged(box)"
+                ></c8y-chart>
+              </div>
+              <c8y-alarms-events-timelines-chart
+                alarms-events-configs="data.graphAlarmsEventsConfigs"
+                date-from="data.displayedDateFrom"
+                date-to="data.displayedDateTo"
+                on-update-dates="onUpdateDates($dateFrom, $dateTo)"
+                realtime="data.realtime"
+                on-realtime-alarm-fn="onRealtimeAlarmFn(onRealtimeAlarm)"
+                on-realtime-event-fn="onRealtimeEventFn(onRealtimeEvent)"
+                chart-box="chartBox"
+              ></c8y-alarms-events-timelines-chart>
+            </c8y-widget-preview-wrapper>
+          </div>
         </div>
-        <c8y-alarms-events-timelines-chart
-          alarms-events-configs="data.graphAlarmsEventsConfigs"
-          date-from="data.displayedDateFrom"
-          date-to="data.displayedDateTo"
-          on-update-dates="onUpdateDates($dateFrom, $dateTo)"
-          realtime="data.realtime"
-          on-realtime-alarm-fn="onRealtimeAlarmFn(onRealtimeAlarm)"
-          on-realtime-event-fn="onRealtimeEventFn(onRealtimeEvent)"
-          chart-box="chartBox"
-        ></c8y-alarms-events-timelines-chart>
       </div>
     </div>
+
+    <c8y-data-point-list
+      class="bg-inherit separator-bottom"
+      datapoints="data.datapoints"
+      allow-adding-data-points-from-context-mo-only="dashboard.deviceType && dashboard.deviceTypeValue"
+      dont-save="true"
+      no-target
+      no-yellow-range
+      no-red-range
+    ></c8y-data-point-list>
+    <c8y-alarms-events-timelines-config
+      class="d-block bg-inherit separator-top"
+      style="padding-top: 1px"
+      configs="data.alarmsEventsConfigs"
+      allow-alarms-events-from-context-mo-only="dashboard.deviceType && dashboard.deviceTypeValue"
+    ></c8y-alarms-events-timelines-config>
   </div>
 </div>

package/device-protocols/object-mapping.component.js

@@ -1 +1 @@
-(()=>{s.$inject=["c8yAlarms"],a.$inject=["c8yObjectMappings"];var e={templateUrl:":::PLUGIN_PATH:::/object-mapping.html",controllerAs:"vm",controller:s,bindings:{autoObserveParams:"<",hideAutoObserve:"@",hideAlarmStatus:"<",mapping:"<",customActions:"<"}},t={template:'\n      <span ng-show="!vm.hasMeasurement && !vm.hasAlarm && !vm.hasEvent" class="text-muted">--</span>\n      <i c8y-icon="line-chart" uib-tooltip="{{\'Measurements\' | translate}}" ng-show="vm.hasMeasurement"></i>\n      <i c8y-icon="bell" uib-tooltip="{{\'Alarms\' | translate}}" ng-show="vm.hasAlarm"></i>\n      <i c8y-icon="c8y-events" uib-tooltip="{{\'Events\' | translate}}" ng-show="vm.hasEvent"></i>\n      <i c8y-icon="eye" uib-tooltip="{{\'Auto observe\' | translate}}" ng-show="vm.mapping.observeParameters.autoObserve"></i>\n      <i c8y-icon="wrench" uib-tooltip="{{\'Custom action\' | translate}}" ng-show="vm.hasCustomAction"></i>\n    ',controllerAs:"vm",controller:s,bindings:{mapping:"<"}},n={bindings:{data:"<"},template:'\n      <span class="text-label-small visible-xs-inline m-r-4">{{\'Resources\' | translate}}</span>\n      <div class="c8y-icon-badge" title="{{::vm.count(vm.data)}} {{\'Resources\' | translate}}">\n        <i c8y-icon="tasks"></i>\n      <span class="badge badge-info">{{::vm.count(vm.data)}}</span></div>',controller:a,controllerAs:"vm"};function a(e){this.count=e.countResources}function s(e){var t="measurementCreation",n="alarmCreation",a="eventCreation",s="customAction",o="observeParameters.autoObserve",i=!0,c=this;function r(){c.autoObserveLocked=!1,!i||c.hasMeasurement||c.hasEvent||c.hasAlarm||c.hasCustomAction||(c.autoObserveLocked=!0,_.unset(c.mapping,o))}_.assign(c,{alarmSeverities:e.severityList,alarmStatus:e.statusList,$onInit:function(){_.isUndefined(c.hideAutoObserve)&&(c.hideAutoObserve=!1);_.isUndefined(c.hideAlarmStatus)&&(c.hideAlarmStatus=!1)},$onChanges:function(e){e.mapping&&(()=>{var e=c.mapping;c.hasMeasurement=!!_.get(e,t),c.hasEvent=!!_.get(e,a),c.hasAlarm=!!_.get(e,n),c.hasCustomAction=!!_.get(e,s),r()})()},updateMeasurementKey:function(e){e||_.unset(c.mapping,t);r()},updateAlarmKey:function(e){e||_.unset(c.mapping,n);r()},updateEventKey:function(e){e||_.unset(c.mapping,a);r()},updateCustomActionKey:function(e){e?_.set(c.mapping,"".concat(s,".type"),null):_.unset(c.mapping,s);r()},formName:"mappingForm"})}angular.module("c8y.deviceProtocols").component("c8yObjectMapping",e).component("c8yObjectMappingStatusIcons",t).component("c8yDeviceProtocolRowCountResources",n)})();
+(()=>{s.$inject=["c8yAlarms"],a.$inject=["c8yObjectMappings"];var e={templateUrl:":::PLUGIN_PATH:::/object-mapping.html",controllerAs:"vm",controller:s,bindings:{autoObserveParams:"<",hideAutoObserve:"@",hideAlarmStatus:"<",mapping:"<",customActions:"<"}},t={template:'\n      <span ng-show="!vm.hasMeasurement && !vm.hasAlarm && !vm.hasEvent" class="text-muted">--</span>\n      <i c8y-icon="line-chart" uib-tooltip="{{\'Measurements\' | translate}}" ng-show="vm.hasMeasurement"></i>\n      <i c8y-icon="bell" uib-tooltip="{{\'Alarms\' | translate}}" ng-show="vm.hasAlarm"></i>\n      <i c8y-icon="online1" uib-tooltip="{{\'Events\' | translate}}" ng-show="vm.hasEvent"></i>\n      <i c8y-icon="eye" uib-tooltip="{{\'Auto observe\' | translate}}" ng-show="vm.mapping.observeParameters.autoObserve"></i>\n      <i c8y-icon="wrench" uib-tooltip="{{\'Custom action\' | translate}}" ng-show="vm.hasCustomAction"></i>\n    ',controllerAs:"vm",controller:s,bindings:{mapping:"<"}},n={bindings:{data:"<"},template:'\n      <span class="text-label-small visible-xs-inline m-r-4">{{\'Resources\' | translate}}</span>\n      <div class="c8y-icon-badge" title="{{::vm.count(vm.data)}} {{\'Resources\' | translate}}">\n        <i c8y-icon="tasks"></i>\n      <span class="badge badge-info">{{::vm.count(vm.data)}}</span></div>',controller:a,controllerAs:"vm"};function a(e){this.count=e.countResources}function s(e){var t="measurementCreation",n="alarmCreation",a="eventCreation",s="customAction",o="observeParameters.autoObserve",i=!0,c=this;function r(){c.autoObserveLocked=!1,!i||c.hasMeasurement||c.hasEvent||c.hasAlarm||c.hasCustomAction||(c.autoObserveLocked=!0,_.unset(c.mapping,o))}_.assign(c,{alarmSeverities:e.severityList,alarmStatus:e.statusList,$onInit:function(){_.isUndefined(c.hideAutoObserve)&&(c.hideAutoObserve=!1);_.isUndefined(c.hideAlarmStatus)&&(c.hideAlarmStatus=!1)},$onChanges:function(e){e.mapping&&(()=>{var e=c.mapping;c.hasMeasurement=!!_.get(e,t),c.hasEvent=!!_.get(e,a),c.hasAlarm=!!_.get(e,n),c.hasCustomAction=!!_.get(e,s),r()})()},updateMeasurementKey:function(e){e||_.unset(c.mapping,t);r()},updateAlarmKey:function(e){e||_.unset(c.mapping,n);r()},updateEventKey:function(e){e||_.unset(c.mapping,a);r()},updateCustomActionKey:function(e){e?_.set(c.mapping,"".concat(s,".type"),null):_.unset(c.mapping,s);r()},formName:"mappingForm"})}angular.module("c8y.deviceProtocols").component("c8yObjectMapping",e).component("c8yObjectMappingStatusIcons",t).component("c8yDeviceProtocolRowCountResources",n)})();

package/device-protocols/object-mapping.html

@@ -169,7 +169,7 @@
           </label>
         </div>
         <div class="list-item-icon">
-          <i c8y-icon="c8y-events"></i>
+          <i c8y-icon="online1"></i>
         </div>
         <div class="list-item-title" translate>Send event</div>
       </div>

package/deviceDatabase4/modals/configure-discrete-io.html

@@ -257,7 +257,7 @@
                 </label>
               </div>
               <div class="list-item-icon">
-                <i c8y-icon="c8y-events"></i>
+                <i c8y-icon="online1"></i>
               </div>
               <div class="list-item-title">
                 <span>{{ 'Send event' | translate }}</span>

package/deviceDatabase4/modals/configure-register.html

@@ -1225,7 +1225,7 @@
                 </label>
               </div>
               <div class="list-item-icon">
-                <i c8y-icon="c8y-events"></i>
+                <i c8y-icon="online1"></i>
               </div>
               <div class="list-item-title">
                 <span translate>Send event</span>

package/deviceDetail/cumulocity.json

@@ -8,8 +8,7 @@
     "core/assetPropertyWidget",
     "core/deviceGroupAssignment",
     "core/deviceStatusWidget",
-    "core/alarmsEventsExplorer",
-    "core/asset-notes"
+    "core/alarmsEventsExplorer"
   ],
   "js": ["index.js"]
 }