@pushwoosh/smart-components-kit 1.0.38 → 1.0.40

package/OpenActions/components/OpenActionsSummary/OpenActionsSummary.js

@@ -29,7 +29,7 @@ export const OpenActionsSummary = ({
     code: applicationCode
   }), [applicationCode]);
   const hasCustomPlatformsDeeplink = Object.keys(platformsDeeplinkUrls).length > 0;
-  const safariUrl = !hasCustomPlatformsDeeplink && getSafariUrl(((_applicationData$valu = applicationData.value) === null || _applicationData$valu === void 0 ? void 0 : _applicationData$valu.application) || null, safariUrlArgs ?? '');
+  const safariUrl = getSafariUrl(((_applicationData$valu = applicationData.value) === null || _applicationData$valu === void 0 ? void 0 : _applicationData$valu.application) || null, safariUrlArgs ?? '');
   const renderInfoBlock = (device, action, url = null) => React.createElement(Vertical, null, React.createElement("span", null, "For", ' ', React.createElement("strong", null, device), ' ', "subscribers:", ' ', React.createElement("strong", null, action)), url && React.createElement(LinkRow, null, React.createElement(Link, {
     as: Tag.A,
     rel: "noopener noreferrer",

package/OpenActions/usePresetOpenActions.js

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useToast } from '@pushwoosh/dumb-components';
 import { useSPAContext } from '../context';
-import { formatDeeplink } from './helpers';
+import { formatDeeplink, isWebLink } from './helpers';
 const WEB_PLATFORM_KEY = 0;
 export const usePresetOpenActions = pushPreset => {
   const [openActions, setOpenActions] = useState(undefined);
@@ -25,13 +25,10 @@ export const usePresetOpenActions = pushPreset => {
       return '';
     }
   }, [openToast, rpcGateway]);
-  const getOpenActionsByPreset = useCallback(async () => {
+  const getOpenActionsFromV2Preset = useCallback(async pushPreset => {
     var _pushPreset$localized, _pushPreset$openActio, _pushPreset$openActio2;
-    if (!pushPreset) {
-      return;
-    }
     const safariUrlArgs = ((_pushPreset$localized = pushPreset.localizedProperties.default) === null || _pushPreset$localized === void 0 || (_pushPreset$localized = _pushPreset$localized.safari) === null || _pushPreset$localized === void 0 || (_pushPreset$localized = _pushPreset$localized.urlArguments) === null || _pushPreset$localized === void 0 ? void 0 : _pushPreset$localized[0]) ?? null;
-    const webPageUrl = pushPreset.url;
+    const webPageUrl = isWebLink(pushPreset.url) ? pushPreset.url : null;
     const {
       platformsDeeplinkUrls,
       showRichmedia
@@ -46,18 +43,25 @@ export const usePresetOpenActions = pushPreset => {
       const deeplinkManual = pushPreset.openAction.kind.data;
       defaultDeeplinkUrl = deeplinkManual.url;
     }
+    return {
+      webPageUrl,
+      defaultDeeplinkUrl,
+      platformsDeeplinkUrls,
+      safariUrlArgs,
+      showRichmedia
+    };
+  }, [getDeeplinkUrl]);
+  const getOpenActionsByPreset = useCallback(async () => {
+    if (!pushPreset) {
+      return;
+    }
+    const openActions = pushPreset.isV2 ? await getOpenActionsFromV2Preset(pushPreset) : await getOpenActionsFromV1Preset(pushPreset);
     // setTimeout нужен, чтобы не получать ошибку 'ResizeObserver loop completed with undelivered notifications.'
     // Она возникает, когда этот хук вызывается ВНУТРИ Modal и с пересчетом её размера. Подробности в тикете FRONT-750
     setTimeout(() => {
-      setOpenActions({
-        webPageUrl,
-        defaultDeeplinkUrl,
-        platformsDeeplinkUrls,
-        safariUrlArgs,
-        showRichmedia
-      });
+      setOpenActions(openActions);
     }, 0);
-  }, [getDeeplinkUrl, pushPreset]);
+  }, [getOpenActionsFromV2Preset, pushPreset]);
   useEffect(() => {
     getOpenActionsByPreset();
   }, [getOpenActionsByPreset]);
@@ -93,4 +97,20 @@ const getPlatformDeeplinksByOpenActions = async (pushPreset, getDeeplinkUrl) =>
     platformsDeeplinkUrls,
     showRichmedia
   };
+};
+const getOpenActionsFromV1Preset = async pushPreset => {
+  var _pushPreset$localized2, _pushPreset$localized3;
+  const webPageUrl = !pushPreset.deeplink && isWebLink(pushPreset.url) ? pushPreset.url : null;
+  const defaultDeeplinkUrl = pushPreset.deeplink && pushPreset.url ? pushPreset.url : null;
+  const showRichmedia = pushPreset.richmedia ? {
+    code: pushPreset.richmedia
+  } : null;
+  const safariUrlArgs = ((_pushPreset$localized2 = pushPreset.localizedProperties.default) === null || _pushPreset$localized2 === void 0 || (_pushPreset$localized2 = _pushPreset$localized2.safari) === null || _pushPreset$localized2 === void 0 || (_pushPreset$localized2 = _pushPreset$localized2.urlArguments) === null || _pushPreset$localized2 === void 0 ? void 0 : _pushPreset$localized2[0]) ?? ((_pushPreset$localized3 = pushPreset.localizedProperties.en) === null || _pushPreset$localized3 === void 0 || (_pushPreset$localized3 = _pushPreset$localized3.safari) === null || _pushPreset$localized3 === void 0 || (_pushPreset$localized3 = _pushPreset$localized3.urlArguments) === null || _pushPreset$localized3 === void 0 ? void 0 : _pushPreset$localized3[0]) ?? null;
+  return {
+    webPageUrl,
+    defaultDeeplinkUrl,
+    platformsDeeplinkUrls: {},
+    safariUrlArgs,
+    showRichmedia
+  };
 };

package/package.json

@@ -51,5 +51,5 @@
   "engines": {
     "node": ">= 18"
   },
-  "version": "1.0.38"
+  "version": "1.0.40"
 }