@streamlayer/feature-gamification 1.4.2 → 1.5.1

package/lib/advertisement/index.d.ts

@@ -1,11 +1,15 @@
 import { createMapStore, StreamLayerContext } from '@streamlayer/sdk-web-interfaces';
 import { PromotionOptions } from '@streamlayer/sdk-web-types';
+import { QuestionNotification } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 import { type GamificationBackground } from '../background';
 import { getPromotionDetail } from '../queries';
 type AdvertisementData = {
     loading?: boolean;
     error?: unknown;
-    data?: PromotionOptions;
+    data?: {
+        promotions: PromotionOptions;
+        notification?: QuestionNotification;
+    };
 };
 export type Advertisement = {
     autoHideDuration: number;

package/lib/advertisement/index.js

@@ -2,6 +2,7 @@ import { ApiStore, createMapStore, eventBus } from '@streamlayer/sdk-web-interfa
 import { QuestionStatus } from '@streamlayer/sdk-web-types';
 import { createLogger } from '@streamlayer/sdk-web-logger';
 import { onMount } from 'nanostores';
+import { NotificationEnabled } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 import { $promotionList, getPromotionDetail } from '../queries';
 import { AdvertisementStorage } from './storage';
 import { AdvertisementsQueue } from './queue';
@@ -31,7 +32,7 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
             action: 'received',
             payload: {
                 advertisementId,
-                advertisementType: data?.type,
+                advertisementType: data?.promotions.type,
             },
         });
         queue.addToQueue({
@@ -43,6 +44,12 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
                 this.data.setKey('loading', true);
                 try {
                     const response = data || (await getPromotionDetail(advertisementId, transport));
+                    instance.sdk.onAdvertisementActivate({
+                        stage: 'activate',
+                        id: advertisementId,
+                        hasNotification: response?.notification?.enabled === NotificationEnabled.NOTIFICATION_ENABLED,
+                        isShowed: !!storage.isShowed(advertisementId),
+                    });
                     if (!response) {
                         this.data.setKey('error', new Error('No promotion found'));
                     }
@@ -89,7 +96,7 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
             action: 'opened',
             payload: {
                 advertisementId: advertisement.id,
-                advertisementType: advertisementData.data?.type,
+                advertisementType: advertisementData.data?.promotions.type,
             },
         });
         return advertisement;
@@ -98,11 +105,7 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
         if (list.data) {
             const last = list.data[list.data.length - 1];
             if (last) {
-                instance.sdk.onAdvertisementActivate({
-                    stage: 'activate',
-                    id: last.id,
-                    isShowed: !!storage.isShowed(last.id),
-                });
+                show(last.id);
             }
         }
     });
@@ -118,20 +121,13 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
             return;
         }
         if (feedItem.status === QuestionStatus.RESOLVED) {
-            instance.sdk.onAdvertisementActivate({
-                stage: 'deactivate',
-                id: feedItem.id,
-            });
+            hide(feedItem.id);
             logger.debug({ feedItem }, 'resolved: %o');
             return;
         }
         if (feedItem.status === QuestionStatus.ACTIVE) {
             logger.debug({ feedItem }, 'active: %o');
-            instance.sdk.onAdvertisementActivate({
-                stage: 'activate',
-                id: feedItem.id,
-                isShowed: !!storage.isShowed(feedItem.id),
-            });
+            show(feedItem.id);
             return;
         }
         logger.debug({ feedItem }, 'skip: %o');
@@ -164,7 +160,10 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
             }
             if (feedItem.status === QuestionStatus.ACTIVE) {
                 logger.debug({ feedItem }, 'active: %o');
-                show(feedItem.id, promotionItem);
+                show(feedItem.id, {
+                    promotions: promotionItem,
+                    notification: response.data?.attributes?.question?.notification,
+                });
                 return;
             }
             logger.debug({ feedItem }, 'skip: %o');

package/lib/queries/index.d.ts

@@ -350,7 +350,10 @@ export declare const questionSubscription: (questionId: string, transport: Trans
 export declare const getQuestionByUser: (questionId: string, transport: Transport) => Promise<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").ExtendedQuestion | undefined>;
 export declare const getQuestionDetail: (questionId: string, transport: Transport) => Promise<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").Question | undefined>;
 export declare const $questionByUser: ($questionId: ReadableAtom<string | undefined> | string, transport: Transport) => import("@nanostores/query").FetcherStore<import("@bufbuild/protobuf").PlainMessage<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").ExtendedQuestion>, any>;
-export declare const getPromotionDetail: (promoId: string, transport: Transport) => Promise<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionOptions_PromotionOptions | undefined>;
+export declare const getPromotionDetail: (promoId: string, transport: Transport) => Promise<{
+    promotions: import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionOptions_PromotionOptions;
+    notification: import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionNotification | undefined;
+} | undefined>;
 export declare const $pickHistory: (slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<(import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").PickHistory | undefined)[], any>;
 export declare const $feedList: ($slStreamId: ReadableAtom<string | undefined>, $interactiveAllowed: ReadableAtom<InteractiveAllowed>, transport: Transport) => import("@nanostores/query").FetcherStore<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem[], any>;
 export declare const $promotionList: ($slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<({

package/lib/queries/index.js

@@ -83,7 +83,7 @@ export const getPromotionDetail = async (promoId, transport) => {
     const promotions = res.data?.attributes?.options?.options.case === 'promotion'
         ? res.data?.attributes?.options?.options.value
         : undefined;
-    return promotions;
+    return promotions ? { promotions, notification: res.data?.attributes?.notification } : undefined;
 };
 export const $pickHistory = (slStreamId, transport) => {
     const { client, queryKey } = transport.createPromiseClient(Feed, { method: 'pickHistory', params: [slStreamId] });

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.10.0",
     "@fastify/deepmerge": "^2.0.0",
     "@streamlayer/sl-eslib": "^5.122.0",
     "nanostores": "^0.10.3",
-    "@streamlayer/sdk-web-api": "^1.3.2",
-    "@streamlayer/sdk-web-core": "^1.2.2",
-    "@streamlayer/sdk-web-interfaces": "^1.1.6",
-    "@streamlayer/sdk-web-logger": "^1.0.11",
-    "@streamlayer/sdk-web-notifications": "^1.1.6",
-    "@streamlayer/sdk-web-types": "^1.3.2",
-    "@streamlayer/sdk-web-storage": "^1.0.11"
+    "@streamlayer/sdk-web-core": "^1.2.4",
+    "@streamlayer/sdk-web-api": "^1.3.4",
+    "@streamlayer/sdk-web-interfaces": "^1.1.8",
+    "@streamlayer/sdk-web-logger": "^1.0.13",
+    "@streamlayer/sdk-web-notifications": "^1.1.8",
+    "@streamlayer/sdk-web-storage": "^1.0.13",
+    "@streamlayer/sdk-web-types": "^1.4.1"
   },
   "devDependencies": {
     "tslib": "^2.7.0"