@capillarytech/creatives-library 8.0.316-alpha.1 → 8.0.316-alpha.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.316-alpha.1",
+  "version": "8.0.316-alpha.3",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Components/FormBuilder/index.js

@@ -52,7 +52,7 @@ import './_formBuilder.scss';
 import {updateCharCount, checkUnicode} from "../../utils/smsCharCountV2";
 import { preprocessHtml, validateTagsCore, hasUnsubscribeTag } from '../../utils/tagValidations';
 import { containsBase64Images } from '../../utils/content';
-import { SMS, MOBILE_PUSH, LINE, ENABLE_AI_SUGGESTIONS,AI_CONTENT_BOT_DISABLED, EMAIL, LIQUID_SUPPORTED_CHANNELS, INAPP } from '../../v2Containers/CreativesContainer/constants';
+import { SMS, MOBILE_PUSH, LINE, ENABLE_AI_SUGGESTIONS, EMAIL, LIQUID_SUPPORTED_CHANNELS, INAPP } from '../../v2Containers/CreativesContainer/constants';
 import globalMessages from '../../v2Containers/Cap/messages';
 import { convert } from 'html-to-text';
 import { OUTBOUND, ADD_LANGUAGE, UPLOAD, USE_EDITOR, COPY_PRIMARY_LANGUAGE, GLOBAL_CONVERT_OPTIONS } from './constants';
@@ -60,7 +60,7 @@ import { GET_TRANSLATION_MAPPED } from '../../constants/unified';
 import moment from 'moment';
 import { CUSTOMER_BARCODE_TAG , COPY_OF, ENTRY_TRIGGER_TAG_REGEX, SKIP_TAGS_REGEX_GROUPS} from '../../constants/unified';
 import { REQUEST } from '../../v2Containers/Cap/constants'
-import { isEmailUnsubscribeTagOptional } from '../../utils/common';
+import { isEmailUnsubscribeTagOptional, isAiContentBotDisabled } from '../../utils/common';
 import { isUrl } from '../../v2Containers/Line/Container/Wrapper/utils';
 import { bindActionCreators } from 'redux';
 import { getChannelData, hasPersonalizationTags, validateLiquidTemplateContent, validateMobilePushContent } from '../../utils/commonUtils';
@@ -2790,10 +2790,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     const { MISSING_TAG_ERROR, TAG_BRACKET_COUNT_MISMATCH_ERROR } = errorMessageForTags;
     const { formatMessage } = this.props.intl;
     
-    const { accessibleFeatures = [] } = this.props.currentOrgDetails || {};
-    const isAiContentBotDisabled = accessibleFeatures?.includes(
-      AI_CONTENT_BOT_DISABLED
-    );
+    const aiContentBotDisabled = isAiContentBotDisabled();
 
     let errorMessageText = false;
     switch (errorType) {
@@ -2861,7 +2858,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             cols={cols}
           />
           {[SMS, MOBILE_PUSH].includes(this.props.schema?.channel)
-            && !isAiContentBotDisabled
+            && !aiContentBotDisabled
             && (
               <CapAskAira.ContentGenerationBot
                 text={messageContent || ""}
@@ -3397,10 +3394,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         switch (type) {
           case "input":
             const errorType = isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id];
-            const { accessibleFeatures = [] } = this.props.currentOrgDetails || {};
-            const isAiContentBotDisabled = accessibleFeatures?.includes(
-              AI_CONTENT_BOT_DISABLED
-            );
+            const aiContentBotDisabled = isAiContentBotDisabled();
             ifError = this.state.checkValidation && (isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id]);
             const { TAG_BRACKET_COUNT_MISMATCH_ERROR } = errorMessageForTags;
             const { formatMessage } = this.props.intl;
@@ -3433,7 +3427,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     size={val.size || "default"}
                   />
                   {this.props.schema?.channel === EMAIL &&
-                    !isAiContentBotDisabled && (
+                    !aiContentBotDisabled && (
                       <CapAskAira.ContentGenerationBot
                         text={value || ""}
                         setText={this.handleSetText.bind(this, val)}

package/v2Containers/InApp/index.js

@@ -53,7 +53,6 @@ import {
   IOS_CAPITAL,
 } from "./constants";
 import { GENERIC, INAPP, SMS } from "../CreativesContainer/constants";
-import { AI_CONTENT_BOT_DISABLED } from "../../constants/unified";
 import {
   ALL, TAG, EMBEDDED, DEFAULT, FULL, LIBRARY,
 } from "../Whatsapp/constants";
@@ -61,7 +60,7 @@ import { getCdnUrl } from "../../utils/cdnTransformation";
 import { getCtaObject, hasAnyErrors, getSingleTab } from "./utils";
 import { validateInAppContent } from "../../utils/commonUtils";
 import { validateTags } from "../../utils/tagValidations";
-import { hasNewEditorFlowInAppEnabled } from "../../utils/common";
+import { hasNewEditorFlowInAppEnabled, isAiContentBotDisabled } from "../../utils/common";
 import formBuilderMessages from "../../v2Components/FormBuilder/messages";
 import HTMLEditor from "../../v2Components/HtmlEditor";
 import { HTML_EDITOR_VARIANTS } from "../../v2Components/HtmlEditor/constants";
@@ -1217,7 +1216,7 @@ export const InApp = (props) => {
   }
 
   // ── Old-flow helpers (used by CapDeviceContent when flag is disabled) ──────
-  const isAiContentBotDisabled = currentOrgDetails?.accessibleFeatures?.includes(AI_CONTENT_BOT_DISABLED);
+  const aiContentBotDisabled = isAiContentBotDisabled();
 
   /**
    * Clears stored API/liquid errors for a specific device (and GENERIC) so
@@ -1367,7 +1366,7 @@ export const InApp = (props) => {
           templateDescErrorHandler={templateDescErrorHandler}
           templateTitleError={templateTitleErrorAndroid}
           setTemplateTitleError={setTemplateTitleErrorAndroid}
-          isAiContentBotDisabled={isAiContentBotDisabled}
+          isAiContentBotDisabled={aiContentBotDisabled}
           injectedTags={injectedTags}
           selectedOfferDetails={selectedOfferDetails}
           location={location}
@@ -1412,7 +1411,7 @@ export const InApp = (props) => {
           templateDescErrorHandler={templateDescErrorHandler}
           templateTitleError={templateTitleErrorIos}
           setTemplateTitleError={setTemplateTitleErrorIos}
-          isAiContentBotDisabled={isAiContentBotDisabled}
+          isAiContentBotDisabled={aiContentBotDisabled}
           injectedTags={injectedTags}
           selectedOfferDetails={selectedOfferDetails}
           location={location}

package/v2Containers/Rcs/index.js

@@ -55,9 +55,9 @@ import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
   setInjectedTags,
-  selectCurrentOrgDetails,
 } from '../Cap/selectors';
 import * as RcsActions from './actions';
+import { isAiContentBotDisabled } from '../../utils/common';
 import * as TemplatesActions from '../Templates/actions';
 import './index.scss';
 import {
@@ -76,7 +76,6 @@ import {
   RCS_IMG_SIZE,
   RCS_DLT_MODE,
   CTA,
-  AI_CONTENT_BOT_DISABLED,
   RCS_STATUSES,
   TITLE_TEXT,
   MESSAGE_TEXT,
@@ -148,7 +147,6 @@ export const Rcs = (props) => {
     isDltEnabled,
     smsRegister,
     selectedOfferDetails,
-    currentOrgDetails,
     eventContextTags,
     accountData = {},
     // TestAndPreviewSlidebox props
@@ -331,10 +329,7 @@ export const Rcs = (props) => {
       label: formatMessage(messages.mediaVideo),
     },
   ];
-  const { accessibleFeatures = [] } = currentOrgDetails || {};
-  const isAiContentBotDisabled = accessibleFeatures?.includes(
-    AI_CONTENT_BOT_DISABLED
-  );
+  const aiContentBotDisabled = isAiContentBotDisabled();
 
   const updateButtonChange = (data, index) => {
     if (data && data.text) {
@@ -1240,7 +1235,7 @@ const splitTemplateVarString = (str) => {
                     data-testid="rcs_text_area"
                     disabled={(isEditFlow || !isFullMode)}
                   />
-                  {!isAiContentBotDisabled && !isEditFlow && (
+                  {!aiContentBotDisabled && !isEditFlow && (
                     <CapAskAira.ContentGenerationBot
                       text={templateDesc || ""}
                       setText={(text) => onTemplateDescChange({ target: { value: text } })}
@@ -1627,7 +1622,7 @@ const splitTemplateVarString = (str) => {
     //           errorMessage={fallbackMessageError}
     //           value={fallbackMessage || ""}
     //         />
-    //         {!isAiContentBotDisabled && (
+    //         {!aiContentBotDisabled && (
     //           <CapAskAira.ContentGenerationBot
     //             text={fallbackMessage || ""}
     //             setText={(text) => {
@@ -2466,7 +2461,6 @@ const mapStateToProps = createStructuredSelector({
   metaEntities: makeSelectMetaEntities(),
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),
-  currentOrgDetails: selectCurrentOrgDetails(),
 });
 
 const mapDispatchToProps = (dispatch) => ({

package/v2Containers/Viber/index.js

@@ -30,7 +30,7 @@ import messages from './messages';
 import creativesMessages from '../CreativesContainer/messages';
 import TagList from '../TagList';
 import CapTagListWithInput from '../../v2Components/CapTagListWithInput';
-import { makeSelectMetaEntities, setInjectedTags, selectCurrentOrgDetails } from '../Cap/selectors';
+import { makeSelectMetaEntities, setInjectedTags } from '../Cap/selectors';
 import {
   ALLOWED_IMAGE_EXTENSIONS_REGEX_VIBER,
   ALLOWED_EXTENSIONS_VIDEO_REGEX_VIBER,
@@ -44,7 +44,6 @@ import {
   NONE,
   mediaRadioOptions,
   buttonRadioOptions,
-  AI_CONTENT_BOT_DISABLED,
 } from './constants';
 import withCreatives from '../../hoc/withCreatives';
 import {
@@ -53,6 +52,7 @@ import {
 import { gtmPush } from '../../utils/gtmTrackers';
 import { VIBER } from '../CreativesContainer/constants';
 import { getCdnUrl } from '../../utils/cdnTransformation';
+import { isAiContentBotDisabled } from '../../utils/common';
 import globalMessages from '../Cap/messages';
 import CapImageUpload from '../../v2Components/CapImageUpload';
 import CapVideoUpload from '../../v2Components/CapVideoUpload';
@@ -81,7 +81,6 @@ export const Viber = (props) => {
     getFormSubscriptionData,
     viberData = {},
     selectedOfferDetails = [],
-    currentOrgDetails,
     eventContextTags,
     // TestAndPreviewSlidebox props
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
@@ -115,10 +114,7 @@ export const Viber = (props) => {
   const [buttonType, setButtonType] = useState(NONE);
   const [ctaData, setCtadata] = useState({});
   const [isCtaSaved, setIsCtaSaved] = useState(false);
-  const { accessibleFeatures = [] } = currentOrgDetails || {};
-  const isAiContentBotDisabled = accessibleFeatures?.includes(
-    AI_CONTENT_BOT_DISABLED
-  );
+  const aiContentBotDisabled = isAiContentBotDisabled();
 
   const updateImageSrc = React.useCallback((url) => {
     const newUrl = getCdnUrl({url, channelName: 'VIBER'});
@@ -306,7 +302,7 @@ export const Viber = (props) => {
           cols={2}
           placeholder={formatMessage(messages.enterMessage)}
         />
-        {!isAiContentBotDisabled && (
+        {!aiContentBotDisabled && (
           <CapAskAira.ContentGenerationBot
             text={messageContent || ""}
             setText={(text) => {
@@ -887,7 +883,6 @@ const mapStateToProps = createStructuredSelector({
   injectedTags: setInjectedTags(),
   viberData: makeSelectViber(),
   viber: makeSelectCreateViber(),
-  currentOrgDetails: selectCurrentOrgDetails(),
 });
 
 const mapDispatchToProps = (dispatch) => ({

package/v2Containers/WebPush/Create/hooks/useAiraTriggerPosition.js

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useLayoutEffect, useMemo, useState } from 'react';
 
 const DEFAULT_BOTTOM = '0.83rem';
 
@@ -27,7 +27,7 @@ export const useAiraTriggerPosition = ({
 }) => {
   const [bottomOffset, setBottomOffset] = useState(DEFAULT_BOTTOM);
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const wrapperElement = wrapperRef?.current;
     if (!wrapperElement) {
       setBottomOffset(DEFAULT_BOTTOM);
@@ -47,7 +47,8 @@ export const useAiraTriggerPosition = ({
       ));
     };
 
-    const rafId = requestAnimationFrame(updatePosition);
+    updatePosition();
+
     let resizeObserver = null;
 
     if (window.ResizeObserver) {
@@ -61,7 +62,6 @@ export const useAiraTriggerPosition = ({
     }
 
     return () => {
-      cancelAnimationFrame(rafId);
       if (resizeObserver) {
         resizeObserver.disconnect();
       }

package/v2Containers/WebPush/Create/hooks/useAiraTriggerPosition.test.js

@@ -11,12 +11,6 @@ describe('useAiraTriggerPosition', () => {
     disconnectMock = jest.fn();
     resizeObserverCallback = null;
 
-    global.requestAnimationFrame = jest.fn((cb) => {
-      cb();
-      return 1;
-    });
-    global.cancelAnimationFrame = jest.fn();
-
     global.ResizeObserver = jest.fn((cb) => {
       resizeObserverCallback = cb;
       return {

package/v2Containers/Whatsapp/index.js

@@ -43,12 +43,12 @@ import { makeSelectTemplates } from '../Templates/selectors';
 import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
-  selectCurrentOrgDetails,
   setInjectedTags,
   selectMetaDataStatus,
 } from "../Cap/selectors";
 import * as WhatsappActions from './actions';
 import TestAndPreviewSlidebox from '../../v2Components/TestAndPreviewSlidebox';
+import { isAiContentBotDisabled } from '../../utils/common';
 import './index.scss';
 import {
   UNSUBSCRIBE_TEXT_LENGTH,
@@ -88,7 +88,6 @@ import {
   BUTTON_TEXT,
   OTP_CONFIG_URI,
   WHATSAPP_CATEGORIES,
-  AI_CONTENT_BOT_DISABLED,
   mediaTypeOptions,
   carouselMediaOptions,
   CAROUSEL_INITIAL_DATA,
@@ -180,7 +179,6 @@ export const Whatsapp = (props) => {
     loadingTags,
     getFormData,
     selectedOfferDetails,
-    currentOrgDetails,
     eventContextTags,
     metaDataStatus = "",
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
@@ -268,10 +266,7 @@ export const Whatsapp = (props) => {
   const carouselBodyVarRegex = /{{[1-5]}}/g;
   const previewUrlMatchingRegex = /(http|ftp|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])/g;
 
-  const { accessibleFeatures = [] } = currentOrgDetails || {};
-  const isAiContentBotDisabled = accessibleFeatures?.includes(
-    AI_CONTENT_BOT_DISABLED
-  );
+  const aiContentBotDisabled = isAiContentBotDisabled();
   const isBtnTypeCta = buttonType === WHATSAPP_BUTTON_TYPES.CTA;
   const isBtnTypeQuickReply = buttonType === WHATSAPP_BUTTON_TYPES.QUICK_REPLY;
   const isMediaTypeText = templateMediaType === WHATSAPP_MEDIA_TYPES.TEXT;
@@ -2257,7 +2252,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
           value={templateMessage || ""}
           disabled={isAuthenticationTemplate}
         />
-        {!isAiContentBotDisabled && (
+        {!aiContentBotDisabled && (
           <CapAskAira.ContentGenerationBot
             text={templateMessage || ""}
             setText={(text) => onTemplateValueChange({ target: { value: text } }, MESSAGE_TEXT)}
@@ -3219,7 +3214,6 @@ const mapStateToProps = createStructuredSelector({
   metaEntities: makeSelectMetaEntities(),
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),
-  currentOrgDetails: selectCurrentOrgDetails(),
   metaDataStatus: selectMetaDataStatus(),
 });