@antscorp/antsomi-ui 1.3.5-beta.231 → 1.3.5-beta.233

package/es/components/molecules/TemplateSaveAs/components/ImageSlider/BigImage.js

@@ -2,16 +2,12 @@ import React, { useMemo } from 'react';
 import { Image } from 'antd';
 import { Button } from '@antscorp/antsomi-ui/es/components';
 import Icon from '@antscorp/icons';
-import { checkShowSkeletonBaseUrl } from '@antscorp/antsomi-ui/es/utils';
+import { checkShowSkeletonBaseUrl, getUrlNoCache } from '@antscorp/antsomi-ui/es/utils';
 export const BigImage = React.memo(props => {
     const { url, isDefaultThumbnail, isHideDefaultButton, index, showSkeleton, onClickDefaultButton, } = props;
     const currentTime = useMemo(() => new Date(), []);
     const timeGenerated = Math.floor(currentTime.getTime() / 1000 - (currentTime.getTime() % 3)) * 1000;
-    const urlNoCache = url
-        ? url.includes('nocache') || url.startsWith('data:image')
-            ? url
-            : `${url}?nocache=${timeGenerated}`
-        : undefined;
+    const urlNoCache = getUrlNoCache(url, timeGenerated);
     const showSkeletonMemo = showSkeleton !== undefined ? showSkeleton : checkShowSkeletonBaseUrl(urlNoCache);
     return (React.createElement("div", { className: `image-container--big ${!showSkeletonMemo ? 'hide-skeleton' : ''}` },
         url ? (React.createElement(Image, { preview: false, width: "100%", height: "100%", src: urlNoCache })) : null,

package/es/components/molecules/TemplateSaveAs/components/ImageSlider/SmallImage.js

@@ -1,15 +1,11 @@
 import React, { useMemo } from 'react';
 import { Image } from 'antd';
-import { checkShowSkeletonBaseUrl } from '@antscorp/antsomi-ui/es/utils';
+import { checkShowSkeletonBaseUrl, getUrlNoCache } from '@antscorp/antsomi-ui/es/utils';
 export const SmallImage = React.memo(props => {
     const { url, isSelected, index, onClick, showSkeleton } = props;
     const currentTime = useMemo(() => new Date(), []);
     const timeGenerated = Math.floor(currentTime.getTime() / 1000 - (currentTime.getTime() % 3)) * 1000;
-    const urlNoCache = url
-        ? url.includes('nocache') || url.startsWith('data:image')
-            ? url
-            : `${url}?nocache=${timeGenerated}`
-        : undefined;
+    const urlNoCache = getUrlNoCache(url, timeGenerated);
     const showSkeletonMemo = showSkeleton !== undefined ? showSkeleton : checkShowSkeletonBaseUrl(urlNoCache);
     return (React.createElement("div", { className: `image-container--small ${isSelected ? 'image-container--selected' : ''} ${!showSkeletonMemo ? 'hide-skeleton' : ''}`, onClick: () => onClick && onClick(index) }, url ? (React.createElement(Image, { preview: false, width: "100%", height: "100%", 
         // src={imageUrl}

package/es/components/molecules/ThumbnailCard/ThumbnailCard.js

@@ -32,7 +32,7 @@ import { getUrlNoCache, checkShowSkeletonBaseUrl } from '@antscorp/antsomi-ui/es
 const cacheValue = new Date().getTime();
 export const ThumbnailCard = memo(props => {
     const [modal, contextHolder] = Modal.useModal();
-    const { id, name, width = THUMBNAIL_CARD_DEFAULT_WIDTH, height = THUMBNAIL_CARD_DEFAULT_HEIGHT, thumbnail, removable = true, actionAvailable = true, showSkeleton = true, loading = false, removeModalProps, editBtnProps, previewBtnProps, onClickWrapper } = props, restOfProps = __rest(props, ["id", "name", "width", "height", "thumbnail", "removable", "actionAvailable", "showSkeleton", "loading", "removeModalProps", "editBtnProps", "previewBtnProps", "onClickWrapper"]);
+    const { id, name, width = THUMBNAIL_CARD_DEFAULT_WIDTH, height = THUMBNAIL_CARD_DEFAULT_HEIGHT, thumbnail, removable = true, actionAvailable = true, showSkeleton, loading = false, removeModalProps, editBtnProps, previewBtnProps, onClickWrapper } = props, restOfProps = __rest(props, ["id", "name", "width", "height", "thumbnail", "removable", "actionAvailable", "showSkeleton", "loading", "removeModalProps", "editBtnProps", "previewBtnProps", "onClickWrapper"]);
     const _a = removeModalProps || {}, { onOk } = _a, restOfRemoveTemplateModalProps = __rest(_a, ["onOk"]);
     const _b = editBtnProps || {}, { text: editText = 'Use template', onClick: onClickEdit } = _b, restOfEditBtnProps = __rest(_b, ["text", "onClick"]);
     const _c = previewBtnProps || {}, { text: previewText = 'Preview', onClick: onClickPreview } = _c, restOfPreviewBtnProps = __rest(_c, ["text", "onClick"]);

package/es/utils/common.d.ts

@@ -84,4 +84,4 @@ export declare const simplifyString: (str: string) => string;
  */
 export declare const searchStringQuery: (str: string, queryStr: string) => boolean;
 export declare const isExistedImage: (imageUrl: string) => boolean;
-export declare const getUrlNoCache: (url?: string, cacheValue?: number | string) => string | undefined;
+export declare const getUrlNoCache: (url?: string, cacheValue?: number | string) => string;

package/es/utils/common.js

@@ -476,10 +476,13 @@ export const isExistedImage = (imageUrl) => {
     }
 };
 export const getUrlNoCache = (url = '', cacheValue = 0) => {
-    const urlNoCache = url
-        ? url.includes('nocache') || url.startsWith('data:image')
-            ? url
-            : `${url}?nocache=${cacheValue}`
-        : undefined;
+    let urlNoCache = url;
+    if (urlNoCache.includes('nocache') || url.startsWith('data:image')) {
+        urlNoCache = url;
+    }
+    else {
+        const newUrl = new URL(url);
+        newUrl.searchParams.append('nocache', `${cacheValue}`);
+    }
     return urlNoCache;
 };

package/es/utils/templateListing.js

@@ -10,5 +10,20 @@ export const getCategoriesFromObjectTemplate = (objectTemplate) => {
     });
     return categories;
 };
-export const checkShowSkeletonBaseUrl = (url = '') => `${url || ''}`.includes('base64-img') &&
-    ['jn_thumb_', 'v_thumb_'].every(prefix => !`${url || ''}`.includes(prefix));
+export const checkShowSkeletonBaseUrl = (url = '') => {
+    if (url.includes('type')) {
+        switch (true) {
+            case url.includes('media'):
+                return true;
+            case url.includes('email'): {
+                return false;
+            }
+            default:
+                return false;
+        }
+    }
+    else {
+        return (`${url || ''}`.includes('base64-img') &&
+            ['jn_thumb_', 'v_thumb_'].every(prefix => !`${url || ''}`.includes(prefix)));
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.5-beta.231",
+  "version": "1.3.5-beta.233",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",