Merge pull request #321 from CleverTap/develop

Develop

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+
+### Changes
+
+Describe the key changes in this PR with the Jira Issue reference 
+
+### Changes to Public Facing API if any 
+
+Please list the impact on the public facing API if any
+
+### How Has This Been Tested?
+
+Describe the testing approach and any relevant configurations (e.g., environment, platform)
+
+### Checklist
+
+- [ ] Code compiles without errors
+- [ ] Version Bump added to package.json & CHANGELOG.md
+- [ ] All tests pass
+- [ ] Build process is successful
+- [ ] Documentation has been updated (if needed)

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.11.13] 12th Dec, 2024
+- Fixed web push soft prompt bug
+
 ## [1.11.12] 11th Dec, 2024
 - Initialize Web Inbox on document readyState complete
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clevertap-web-sdk",
-  "version": "1.11.12",
+  "version": "1.11.13",
   "description": "",
   "main": "clevertap.js",
   "scripts": {

src/modules/notification.js

@@ -37,8 +37,8 @@ export default class NotificationHandler extends Array {
   }
 
   enable (options = {}) {
-    const { swPath } = options
-    enablePush(this.#logger, this.#account, this.#request, swPath)
+    const { swPath, skipDialog } = options
+    enablePush(this.#logger, this.#account, this.#request, swPath, skipDialog)
   }
 
   _processOldValues () {

src/modules/webPushPrompt/prompt.js

@@ -24,7 +24,7 @@ export const processWebPushConfig = (webPushConfig, logger, request) => {
   }
 }
 
-export const enablePush = (logger, account, request, customSwPath) => {
+export const enablePush = (logger, account, request, customSwPath, skipDialog) => {
   const _pushConfig = StorageManager.readFromLSorCookie(WEBPUSH_CONFIG) || {}
   $ct.pushConfig = _pushConfig
   if (!$ct.pushConfig) {
@@ -35,6 +35,13 @@ export const enablePush = (logger, account, request, customSwPath) => {
   if (customSwPath) { swPath = customSwPath }
 
   notificationHandler = new NotificationHandler({ logger, session: {}, request, account })
+
+  if (skipDialog) {
+    notificationHandler.setApplicationServerKey(appServerKey)
+    notificationHandler.setUpWebPushNotifications(null, swPath, null, null)
+    return
+  }
+
   const { showBox, boxType, showBellIcon, isPreview } = $ct.pushConfig
 
   if (isPreview) {
@@ -103,13 +110,28 @@ export const createNotificationBox = (configData) => {
 
   setElementPosition(pnCard, style.card.position)
 
+  if (!configData.isPreview) {
+    if ('Notification' in window && Notification !== null) {
+      if (Notification.permission === 'granted') {
+        notificationHandler.setApplicationServerKey(appServerKey)
+        notificationHandler.setUpWebPushNotifications(null, swPath, null, null)
+        return
+      } else if (Notification.permission === 'denied') {
+        return
+      }
+    }
+  }
+
   const now = new Date().getTime() / 1000
   const lastNotifTime = StorageManager.getMetaProp('webpush_last_notif_time')
-  const popupFrequency = content.popupFrequency || 7 * 24 * 60 * 60
+  const popupFrequency = content.popupFrequency || 7 // number of days
 
   if (!lastNotifTime || now - lastNotifTime >= popupFrequency * 24 * 60 * 60) {
     document.body.appendChild(wrapper)
-    if (!configData.isPreview) { addEventListeners(wrapper) }
+    if (!configData.isPreview) {
+      StorageManager.setMetaProp('webpush_last_notif_time', now)
+      addEventListeners(wrapper)
+    }
   }
 }
 
@@ -175,7 +197,6 @@ export const addEventListeners = (wrapper) => {
   })
 
   secondaryButton.addEventListener('click', () => {
-    StorageManager.setMetaProp('webpush_last_notif_time', Date.now() / 1000)
     removeWrapper()
   })
 }