@pushwoosh/smart-components-kit 1.0.45 → 1.0.47

package/ExportCSV/ExportCsvBanner/ExportCsvBanner.d.ts

@@ -14,6 +14,7 @@ type ExportCsvBannerProps = {
     showLastExportLocalStorageKey?: string;
     lastTasksParams?: GetLastTasksRequest;
     isKeepPageOpenWarning?: boolean;
+    onClose?: () => void;
 };
-export declare const ExportCsvBanner: ({ exportTask, updateExportTask, showLastExportLocalStorageKey, lastTasksParams, isKeepPageOpenWarning, }: ExportCsvBannerProps) => React.JSX.Element | null;
+export declare const ExportCsvBanner: ({ exportTask, updateExportTask, showLastExportLocalStorageKey, lastTasksParams, isKeepPageOpenWarning, onClose, }: ExportCsvBannerProps) => React.JSX.Element | null;
 export {};

package/ExportCSV/ExportCsvBanner/ExportCsvBanner.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { ExportResult, ProgressBar, Button } from '@pushwoosh/dumb-components';
 import { Color, ShapeRadius } from '@pushwoosh/kit-constants';
 import { Horizontal } from '@pushwoosh/kit-helpers';
@@ -11,7 +11,8 @@ export const ExportCsvBanner = ({
   updateExportTask,
   showLastExportLocalStorageKey,
   lastTasksParams,
-  isKeepPageOpenWarning
+  isKeepPageOpenWarning,
+  onClose
 }) => {
   const {
     getLastTasks,
@@ -78,6 +79,10 @@ export const ExportCsvBanner = ({
       });
     }
   }, [getLastTasks, isHidden, lastTasksParams, updateExportTask]);
+  const handleClose = useCallback(() => {
+    hide();
+    onClose === null || onClose === void 0 || onClose();
+  }, [hide, onClose]);
   if (!exportTask || isHidden) return null;
   const {
     filename,
@@ -95,7 +100,7 @@ export const ExportCsvBanner = ({
     type: "success",
     title: "Exporting complete",
     subtitle: `${resultSubTitle} ${filename}`,
-    handleClose: hide,
+    handleClose: handleClose,
     rightSlot: React.createElement("a", {
       href: `/api/v2/statistics/exportMessagesStatistics/download/${filename}`,
       download: filename
@@ -126,6 +131,6 @@ export const ExportCsvBanner = ({
       size: "medium",
       view: "filled"
     }),
-    handleClose: hide
+    handleClose: handleClose
   }));
 };

package/OpenActions/components/OpenActionsSummary/OpenActionsSummary.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { useParams, Link as ReactLink } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { Link, Spinner } from '@pushwoosh/dumb-components';
 import { Color, PlatformsIcons, PlatformsLabels, Tag } from '@pushwoosh/kit-constants';
 import { Horizontal, useAsync, Vertical } from '@pushwoosh/kit-helpers';
-import { OpenIcon, PlatformLogoIcon } from '@pushwoosh/kit-icons';
-import { H4, Text } from '@pushwoosh/kit-typography';
+import { PlatformLogoIcon } from '@pushwoosh/kit-icons';
+import { Text } from '@pushwoosh/kit-typography';
 import { LinkRow, ClickActionSection } from './styles';
 import { useSPAContext } from '../../../context';
 import { getSafariUrl } from '../../helpers';
@@ -30,12 +30,12 @@ export const OpenActionsSummary = ({
   }) : Promise.resolve(undefined), [rpcGateway, applicationCode]);
   const hasCustomPlatformsDeeplink = Object.keys(platformsDeeplinkUrls).length > 0;
   const safariUrl = getSafariUrl((applicationData === null || applicationData === void 0 || (_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, {
+  const renderInfoBlock = (device, action, url = null, urlText) => 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",
     target: "_blank",
     href: url
-  }, url)));
+  }, urlText ?? url)));
   const renderPlatformDeepLink = (platformKey, url, label = 'deep link') => {
     const isEnumKey = typeof platformKey === 'number';
     const icon = isEnumKey ? PlatformsIcons[platformKey] : null;
@@ -56,28 +56,19 @@ export const OpenActionsSummary = ({
       "$uppercase": true
     }, labelText, ' ', label)), React.createElement(LinkRow, null, url));
   };
-  const renderRichmedia = richmedia => {
-    if (richmedia.url) {
-      return React.createElement(Vertical, null, React.createElement(H4, null, "Show in-app banner"), React.createElement(ClickActionSection, null, React.createElement(LinkRow, null, richmedia.url)));
-    } else if (richmedia.code) {
-      return React.createElement(Horizontal, {
-        "$gap": 4,
-        "$justifyContent": "start",
-        "$alignItems": "center"
-      }, React.createElement(H4, null, "Show in-app banner:"), React.createElement(Text, null, richmedia.code), React.createElement(ReactLink, {
-        to: `/applications/${applicationCode}/rich-media/${richmedia.code}/edit`,
-        target: "_blank"
-      }, React.createElement(OpenIcon, {
-        color: Color.SOFT,
-        size: "small",
-        view: "lined"
-      })));
+  const getRichmediaLink = ({
+    url,
+    code,
+    createdType = 'BUILDER'
+  }) => {
+    if (code) {
+      return createdType === 'BUILDER' ? `/applications/${applicationCode}/rich-media/${code}/edit` : `/applications/${applicationCode}/richMedia/edit/${Date.now()}/${code}`;
     }
-    return null;
+    return url;
   };
   return React.createElement(Vertical, {
     "$gap": 8
-  }, openActions ? React.createElement(React.Fragment, null, hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'follow the Deep link'), Object.entries(platformsDeeplinkUrls).map(([platformKey, url]) => renderPlatformDeepLink(+platformKey, url)), allPlatformsDeeplinkUrl && hasCustomPlatformsDeeplink && renderPlatformDeepLink('Other platforms', allPlatformsDeeplinkUrl), allPlatformsDeeplinkUrl && !hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'follow the Deep link', allPlatformsDeeplinkUrl), !allPlatformsDeeplinkUrl && !hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'open home page in application'), webPageUrl && renderInfoBlock('web', 'open URL in browser', webPageUrl), webPageUrl && safariUrl && renderInfoBlock('Safari', 'open URL in Safari browser', safariUrl), !webPageUrl && renderInfoBlock('web', 'open home page in browser'), showRichmedia && renderRichmedia(showRichmedia)) : React.createElement(Spinner, {
+  }, openActions ? React.createElement(React.Fragment, null, showRichmedia && renderInfoBlock('mobile', 'open in-app banner', getRichmediaLink(showRichmedia), showRichmedia.name || showRichmedia.code), !showRichmedia && hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'follow the Deep link'), !showRichmedia && Object.entries(platformsDeeplinkUrls).map(([platformKey, url]) => renderPlatformDeepLink(+platformKey, url)), !showRichmedia && allPlatformsDeeplinkUrl && hasCustomPlatformsDeeplink && renderPlatformDeepLink('Other platforms', allPlatformsDeeplinkUrl), !showRichmedia && allPlatformsDeeplinkUrl && !hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'follow the Deep link', allPlatformsDeeplinkUrl), !showRichmedia && !allPlatformsDeeplinkUrl && !hasCustomPlatformsDeeplink && renderInfoBlock('mobile', 'open home page in application'), webPageUrl && renderInfoBlock('web', 'open URL in browser', webPageUrl), webPageUrl && safariUrl && renderInfoBlock('Safari', 'open URL in Safari browser', safariUrl), !webPageUrl && renderInfoBlock('web', 'open home page in browser')) : React.createElement(Spinner, {
     color: Color.MAIN,
     size: "medium"
   }));

package/OpenActions/types.d.ts

@@ -1,12 +1,16 @@
 import { type AllPlatforms } from '@pushwoosh/kit-constants';
+import { type RichMedia_CreatedType } from '@pushwoosh/rpc-v2-http-api-data/rich_medias';
+export type RichmediaOpenAction = {
+    url?: string;
+    code?: string;
+    name?: string;
+    createdType?: RichMedia_CreatedType;
+};
 export type ParsedOpenActions = {
     platformsDeeplinkUrls: Partial<Record<AllPlatforms, string>>;
     defaultDeeplinkUrl: string | null;
     webPageUrl: string | null;
-    showRichmedia: {
-        url?: string;
-        code?: string;
-    } | null;
+    showRichmedia: RichmediaOpenAction | null;
     safariUrlArgs: string | null;
 };
 export type OpenActionsSummaryProps = {

package/package.json

@@ -49,5 +49,5 @@
   "engines": {
     "node": ">= 18"
   },
-  "version": "1.0.45"
+  "version": "1.0.47"
 }