@things-factory/notification 4.2.12 → 4.3.0

package/client/viewparts/notification-badge.js

@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element'
+import { LitElement, html, css } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 import { store } from '@things-factory/shell'
 
@@ -9,7 +9,7 @@ export class NotificationBadge extends connect(store)(LitElement) {
         :host {
           font-size: 2em;
           margin: 0 5px 0 0;
-          --badge-size:14px;
+          --badge-size: 14px;
         }
 
         mwc-icon {
@@ -52,9 +52,7 @@ export class NotificationBadge extends connect(store)(LitElement) {
 
   render() {
     var badge = this.badge || 0
-    return html`
-      <mwc-icon data-badge=${badge} class="badge">notifications_none</mwc-icon>
-    `
+    return html` <mwc-icon data-badge=${badge} class="badge">notifications_none</mwc-icon> `
   }
 
   stateChanged(state) {

package/client/viewparts/notification-item.js

@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element'
+import { LitElement, html, css } from 'lit'
 import '@material/mwc-icon'
 
 function isOriginSameAsLocation(url) {

package/client/viewparts/notification-list.js

@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element'
+import { LitElement, html, css } from 'lit'
 import { connect } from 'pwa-helpers'
 import { store, notificationStore } from '@things-factory/shell'
 import { UPDATE_NOTIFICATION } from '../actions/notification-fcm'

package/client/viewparts/notification-sender.js

@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element'
+import { LitElement, html, css } from 'lit'
 import { auth } from '@things-factory/auth-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { ScrollbarStyles } from '@things-factory/styles'

package/client/viewparts/notification-setting-let.js

@@ -1,4 +1,4 @@
-import { css, html, LitElement } from 'lit-element'
+import { css, html, LitElement } from 'lit'
 import Clipboard from 'clipboard'
 
 import { notify } from '@things-factory/layout-base'

package/dist-server/controllers/fcm.js

@@ -137,11 +137,12 @@ async function notify({ receivers, privileges, tokens, topic, title, body, data,
         debug('send to receivers', receivers);
         for (let receiver of receivers) {
             var notification_key = await getDeviceGroup(receiver);
-            notification_key &&
-                (await messaging.sendToDeviceGroup(notification_key, {
+            if (notification_key) {
+                await messaging.sendToDeviceGroup(notification_key, {
                     notification,
                     data
-                }));
+                });
+            }
         }
     }
 }

package/dist-server/controllers/fcm.js.map

@@ -1 +1 @@
-{"version":3,"file":"fcm.js","sourceRoot":"","sources":["../../server/controllers/fcm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fcm.js","sourceRoot":"","sources":["../../server/controllers/fcm.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/notification",
-  "version": "4.2.12",
+  "version": "4.3.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,14 +27,14 @@
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-formfield": "^0.25.3",
     "@material/mwc-switch": "^0.25.3",
-    "@things-factory/auth-base": "^4.2.12",
-    "@things-factory/i18n-base": "^4.2.12",
-    "@things-factory/layout-base": "^4.2.12",
-    "@things-factory/setting-base": "^4.2.12",
-    "@things-factory/shell": "^4.2.12",
+    "@things-factory/auth-base": "^4.3.0",
+    "@things-factory/i18n-base": "^4.3.0",
+    "@things-factory/layout-base": "^4.3.0",
+    "@things-factory/setting-base": "^4.3.0",
+    "@things-factory/shell": "^4.3.0",
     "clipboard": "^2.0.6",
     "firebase": "^8.0.1",
     "firebase-admin": "^9.4.1"
   },
-  "gitHead": "fea26f2ea238a3a279c7ab6427cd8aedcd68926b"
+  "gitHead": "772c8e6f56a3dda655ad49f7018a49a37e081ee8"
 }

package/server/controllers/fcm.ts

@@ -146,11 +146,12 @@ export async function notify({ receivers, privileges, tokens, topic, title, body
     for (let receiver of receivers) {
       var notification_key = await getDeviceGroup(receiver)
 
-      notification_key &&
-        (await messaging.sendToDeviceGroup(notification_key, {
+      if (notification_key) {
+        await messaging.sendToDeviceGroup(notification_key, {
           notification,
           data
-        }))
+        })
+      }
     }
   }
 }