@capillarytech/creatives-library 8.0.330 → 8.0.331-alpha.0

package/v2Containers/TagList/index.js

@@ -22,7 +22,7 @@ import messages, { scope } from './messages';
 // import styled from styled-components;
 import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';
-import { selectCurrentOrgDetails, makeSelectFetchingSchemaError } from '../Cap/selectors';
+import { selectCurrentOrgDetails, makeSelectFetchingSchemaError, makeSelectFetchingSchema } from '../Cap/selectors';
 import {
   handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature, transformBadgeTags,
 } from '../../utils/common';
@@ -35,12 +35,14 @@ const {TreeNode} = Tree;
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
+    const { tags, injectedTags } = props;
+    const hasInitialData = (tags && tags.length > 0) || !_.isEmpty(injectedTags);
     this.state = {
       loading: false,
       tags: [],
       tagsError: false,
       currentContext: null, // Track current context to detect changes
-      hasTriggeredInitialApiCall: false, // Track if we've triggered API call when popover opens
+      hasTriggeredInitialApiCall: hasInitialData, // Seed from initial props to avoid duplicate fetch on popover open
     };
     this.renderTags = this.renderTags.bind(this);
     this.populateTags = this.populateTags.bind(this);
@@ -52,14 +54,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
 
   componentDidMount() {
     this.generateTags(this.props);
-    // Trigger initial API call if tags are empty (similar to Email/SMS behavior)
-    const { tags, injectedTags, onContextChange } = this.props;
-    const hasNoTags = (!tags || tags.length === 0) && _.isEmpty(injectedTags);
-    if (hasNoTags && onContextChange) {
-      // Trigger API call with default 'Outbound' context to match CapTagList default
-      // This ensures tags are loaded when component mounts
-      this.getTagsforContext('Outbound');
-    }
+    // Initial schema fetch is the parent's responsibility (useTagManagement hook handles it)
+    // This avoids duplicate requests when both parent and child try to fetch on mount
   }
 
   componentWillReceiveProps(nextProps) {
@@ -85,9 +81,10 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     if (!_.isEqual(nextTags, currentTags)) {
       this.setState({loading: false});
       this.clearLoadingTimeout();
-      // Reset the flag when tags are received, so we can trigger API call again if needed
+      // Tags received (from prefetch or button-click API call) — mark as triggered
+      // so handlePopoverVisibilityChange won't fire a duplicate call on popover open
       if (nextTags && nextTags.length > 0) {
-        this.setState({ hasTriggeredInitialApiCall: false });
+        this.setState({ hasTriggeredInitialApiCall: true });
       }
     }
     if (fetchingSchemaError) {
@@ -155,9 +152,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       if ((hasNoTags || hasNoStateTags || hasNotTriggeredApiCall)) {
         // Mark that we've triggered the API call
         this.setState({ hasTriggeredInitialApiCall: true });
-        // Trigger API call with default 'Outbound' context to match CapTagList default
-        // This will call onContextChange which triggers handleOnTagsContextChange in InApp
-        this.getTagsforContext('Outbound');
+        this.getTagsforContext('Outbound'); // Default to Outbound context
       }
     }
   };
@@ -471,6 +466,7 @@ const mapStateToProps = createStructuredSelector({
   TagList: makeSelectTagList(),
   currentOrgDetails: selectCurrentOrgDetails(),
   fetchingSchemaError: makeSelectFetchingSchemaError(),
+  fetchingSchema: makeSelectFetchingSchema(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/WebPush/Create/index.js

@@ -1149,7 +1149,7 @@ const withWebPushSaga = injectSaga({
 });
 
 const withTemplateSaga = injectSaga({
-  key: 'webPushTemplates',
+  key: 'templates',
   saga: v2TemplateSaga,
   mode: DAEMON,
 });