@things-factory/notification 6.2.86 → 7.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/notification",
-  "version": "6.2.86",
+  "version": "7.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,17 +30,17 @@
     "@material/mwc-button": "^0.27.0",
     "@material/mwc-formfield": "^0.27.0",
     "@material/mwc-switch": "^0.27.0",
-    "@operato/layout": "^1.0.1",
-    "@things-factory/auth-base": "^6.2.84",
-    "@things-factory/codelingua": "^6.2.86",
-    "@things-factory/i18n-base": "^6.2.84",
-    "@things-factory/organization": "^6.2.84",
-    "@things-factory/setting-base": "^6.2.84",
-    "@things-factory/shell": "^6.2.84",
+    "@operato/layout": "^2.0.0-alpha.0",
+    "@things-factory/auth-base": "^7.0.0-alpha.1",
+    "@things-factory/codelingua": "^7.0.0-alpha.1",
+    "@things-factory/i18n-base": "^7.0.0-alpha.1",
+    "@things-factory/organization": "^7.0.0-alpha.1",
+    "@things-factory/setting-base": "^7.0.0-alpha.1",
+    "@things-factory/shell": "^7.0.0-alpha.1",
     "clipboard": "^2.0.6",
     "firebase": "^9.14.0",
     "firebase-admin": "^11.3.0",
     "google": "^2.1.0"
   },
-  "gitHead": "f90a5c1ff2a93331bb6e375944972dc68dde8a1f"
+  "gitHead": "778315d165d7f15e147583a45d5079c3d7cbce38"
 }

package/server/service/notification/notification-subscription.ts

@@ -1,4 +1,4 @@
-import { withFilter } from 'graphql-subscriptions'
+import { filter, pipe } from 'graphql-yoga'
 import { Arg, Resolver, FieldResolver, Root, Subscription } from 'type-graphql'
 
 import { pubsub, ScalarDate } from '@things-factory/shell'
@@ -8,37 +8,37 @@ import { Notification } from './notification'
 @Resolver(Notification)
 export class NotificationSubscription {
   @Subscription({
-    subscribe: withFilter(
-      () => pubsub.asyncIterator('notification'),
-      (payload, variables, context, info) => {
-        /* normally, subscription context doesn't have domain */
-        const { domain, user } = context.state
-
-        const { subjects = [] } = variables
-        const {
-          notification: { subject, domain: pdomain }
-        } = payload
-
-        const subdomain = pdomain?.subdomain
-
-        if (subdomain) {
-          if (domain?.subdomain) {
-            if (subdomain !== domain.subdomain) {
+    subscribe: ({ args, context, info }) => {
+      const { subjects = [] } = args
+
+      return pipe(
+        pubsub.subscribe('notification'),
+        filter(async (payload: { notification: Notification }) => {
+          /* normally, subscription context doesn't have domain */
+          const { domain, user } = context.state
+
+          const {
+            notification: { subject, domain: pdomain }
+          } = payload
+
+          const subdomain = pdomain?.subdomain
+
+          if (subdomain) {
+            if (domain?.subdomain) {
+              if (subdomain !== domain.subdomain) {
+                return false
+              }
+            } else if (!user.domains.find(d => d.subdomain === subdomain)) {
               return false
             }
-          } else if (!user.domains.find(d => d.subdomain === subdomain)) {
-            return false
           }
-        }
 
-        return !subject || subjects.indexOf(subject) !== -1
-      }
-    )
+          return !subject || subjects.indexOf(subject) !== -1
+        })
+      )
+    }
   })
-  notification(
-    @Root() payload: { notification: Notification },
-    @Arg('subjects', type => [String], { nullable: true }) subjects: string[]
-  ): Notification {
+  notification(@Root() payload: { notification: Notification }, @Arg('subjects', type => [String], { nullable: true }) subjects: string[]): Notification {
     return payload.notification
   }
 }