@inspirer-dev/crm-dashboard 1.0.50 → 1.0.51

package/admin/src/components/StepFlowBuilder/index.tsx

@@ -45,12 +45,17 @@ const StepFlowBuilderInner = forwardRef<HTMLDivElement, StepFlowBuilderProps>(
           const response = await get(url, { params: { populate: 'entrySegment' } });
 
           const data = response?.data as { entrySegment?: { id: number; name: string } } | undefined;
+          console.log('[StepFlowBuilder] Fetch response data:', JSON.stringify(data, null, 2));
+          console.log('[StepFlowBuilder] entrySegment from API:', data?.entrySegment);
           if (data?.entrySegment?.id) {
             const seg = {
               id: data.entrySegment.id,
               name: data.entrySegment.name || `Segment #${data.entrySegment.id}`,
             };
+            console.log('[StepFlowBuilder] Setting initialSegment:', seg);
             setInitialSegment(seg);
+          } else {
+            console.log('[StepFlowBuilder] No entrySegment.id found in API response');
           }
         } catch (err) {
           console.error('[StepFlowBuilder] Fetch error:', err);
@@ -66,35 +71,51 @@ const StepFlowBuilderInner = forwardRef<HTMLDivElement, StepFlowBuilderProps>(
       const values = form?.values as Record<string, unknown> | undefined;
       const entrySegmentValue = values?.entrySegment as ConnectDisconnect | SegmentItem | undefined;
 
+      console.log('[StepFlowBuilder] currentSegment memo - form.values.entrySegment:', entrySegmentValue);
+      console.log('[StepFlowBuilder] currentSegment memo - initialSegment:', initialSegment);
+      console.log('[StepFlowBuilder] currentSegment memo - typeof entrySegmentValue:', typeof entrySegmentValue);
+      if (entrySegmentValue) {
+        console.log('[StepFlowBuilder] currentSegment memo - entrySegmentValue keys:', Object.keys(entrySegmentValue));
+      }
+
       if (!entrySegmentValue) {
+        console.log('[StepFlowBuilder] currentSegment memo - no entrySegmentValue, returning initialSegment');
         return initialSegment;
       }
 
       // Handle connect/disconnect structure (user changed the segment in UI)
       if ('connect' in entrySegmentValue || 'disconnect' in entrySegmentValue) {
+        console.log('[StepFlowBuilder] currentSegment memo - detected connect/disconnect structure');
         const { connect = [], disconnect = [] } = entrySegmentValue as ConnectDisconnect;
 
         if (connect.length > 0) {
           const seg = connect[0];
+          console.log('[StepFlowBuilder] currentSegment memo - returning from connect:', seg);
           return { id: seg.id!, name: seg.name || `Segment #${seg.id}` };
         }
 
         if (disconnect.length > 0 && initialSegment) {
           const disconnectedId = disconnect[0]?.id;
           if (disconnectedId === initialSegment.id) {
+            console.log('[StepFlowBuilder] currentSegment memo - segment disconnected, returning null');
             return null;
           }
         }
 
+        console.log('[StepFlowBuilder] currentSegment memo - connect/disconnect but falling back to initialSegment');
         return initialSegment;
       }
 
       // Handle direct segment object (loaded from server)
       const segmentObj = entrySegmentValue as SegmentItem;
+      console.log('[StepFlowBuilder] currentSegment memo - treating as direct segment object:', segmentObj);
       if (segmentObj.id) {
-        return { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        const result = { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        console.log('[StepFlowBuilder] currentSegment memo - returning direct segment:', result);
+        return result;
       }
 
+      console.log('[StepFlowBuilder] currentSegment memo - no id in segmentObj, returning initialSegment');
       return initialSegment;
     }, [form?.values, initialSegment]);
 
@@ -102,10 +123,12 @@ const StepFlowBuilderInner = forwardRef<HTMLDivElement, StepFlowBuilderProps>(
       const values = form?.values as Record<string, unknown> | undefined;
       if (!values) return {};
 
-      return {
+      const ctx = {
         triggerConfig: values.triggerConfig as CampaignContext['triggerConfig'],
         entrySegment: currentSegment,
       };
+      console.log('[StepFlowBuilder] campaignContext:', ctx);
+      return ctx;
     }, [form?.values, currentSegment]);
 
     useEffect(() => {

package/admin/src/components/StepFlowBuilder/panels/EntryConfig.tsx

@@ -88,6 +88,7 @@ const EntryConfigInner: React.FC<EntryConfigProps & { theme: FlowThemeColors }>
   entrySegment,
   theme,
 }) => {
+  console.log('[EntryConfig] Received entrySegment:', entrySegment);
   const config = parseTriggerConfig(triggerConfig);
 
   const renderTriggerInfo = () => {
@@ -236,6 +237,10 @@ const EntryConfigInner: React.FC<EntryConfigProps & { theme: FlowThemeColors }>
     const hasSegment = entrySegment && (entrySegment.id || entrySegment.name);
     const segmentDisplayName = entrySegment?.name || (entrySegment?.id ? `Segment #${entrySegment.id}` : null);
 
+    console.log('[EntryConfig] renderSegmentInfo - entrySegment:', entrySegment);
+    console.log('[EntryConfig] renderSegmentInfo - hasSegment:', hasSegment);
+    console.log('[EntryConfig] renderSegmentInfo - segmentDisplayName:', segmentDisplayName);
+
     if (!hasSegment || !segmentDisplayName) {
       return (
         <div

package/admin/src/translations/en.json

@@ -119,5 +119,5 @@
   "crm-dashboard.template.title.description": "For email: subject line. For Telegram: optional internal title (not shown to user). For push: notification title.",
 
   "crm-dashboard.template.body.label": "Message Body",
-  "crm-dashboard.template.body.description": "The actual message text. Supports variables like {{user.name}}, {{user.balance}}. For Telegram: supports Markdown formatting."
+  "crm-dashboard.template.body.description": "The message text. Variables: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *bold*, _italic_"
 }

package/admin/src/translations/ru.json

@@ -119,5 +119,5 @@
   "crm-dashboard.template.title.description": "Для email: тема письма. Для Telegram: внутренний заголовок (не виден пользователю). Для push: заголовок уведомления.",
 
   "crm-dashboard.template.body.label": "Текст сообщения",
-  "crm-dashboard.template.body.description": "Текст сообщения. Поддерживает переменные: {{user.name}}, {{user.balance}}. Для Telegram: поддерживает Markdown-форматирование."
+  "crm-dashboard.template.body.description": "Текст сообщения. Переменные: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *жирный*, _курсив_"
 }

package/dist/_chunks/{en-CdGCb6EW.js → en-D2kTkBns.js}

@@ -81,6 +81,6 @@ const en = {
   "crm-dashboard.template.title.label": "Title",
   "crm-dashboard.template.title.description": "For email: subject line. For Telegram: optional internal title (not shown to user). For push: notification title.",
   "crm-dashboard.template.body.label": "Message Body",
-  "crm-dashboard.template.body.description": "The actual message text. Supports variables like {{user.name}}, {{user.balance}}. For Telegram: supports Markdown formatting."
+  "crm-dashboard.template.body.description": "The message text. Variables: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *bold*, _italic_"
 };
 exports.default = en;

package/dist/_chunks/{en-BIgUnT9A.mjs → en-DEUgX5uV.mjs}

@@ -79,7 +79,7 @@ const en = {
   "crm-dashboard.template.title.label": "Title",
   "crm-dashboard.template.title.description": "For email: subject line. For Telegram: optional internal title (not shown to user). For push: notification title.",
   "crm-dashboard.template.body.label": "Message Body",
-  "crm-dashboard.template.body.description": "The actual message text. Supports variables like {{user.name}}, {{user.balance}}. For Telegram: supports Markdown formatting."
+  "crm-dashboard.template.body.description": "The message text. Variables: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *bold*, _italic_"
 };
 export {
   en as default

package/dist/_chunks/{index-D0NPKIXd.mjs → index-B_HwB9Vy.mjs}

@@ -1921,6 +1921,7 @@ const EntryConfigInner = ({
   entrySegment,
   theme
 }) => {
+  console.log("[EntryConfig] Received entrySegment:", entrySegment);
   const config = parseTriggerConfig(triggerConfig);
   const renderTriggerInfo = () => {
     if (!config) {
@@ -2052,6 +2053,9 @@ const EntryConfigInner = ({
   const renderSegmentInfo = () => {
     const hasSegment = entrySegment && (entrySegment.id || entrySegment.name);
     const segmentDisplayName = entrySegment?.name || (entrySegment?.id ? `Segment #${entrySegment.id}` : null);
+    console.log("[EntryConfig] renderSegmentInfo - entrySegment:", entrySegment);
+    console.log("[EntryConfig] renderSegmentInfo - hasSegment:", hasSegment);
+    console.log("[EntryConfig] renderSegmentInfo - segmentDisplayName:", segmentDisplayName);
     if (!hasSegment || !segmentDisplayName) {
       return /* @__PURE__ */ jsx(
         "div",
@@ -3669,12 +3673,17 @@ const StepFlowBuilderInner = forwardRef(
           const url = `/content-manager/collection-types/${model}/${documentId}`;
           const response = await get(url, { params: { populate: "entrySegment" } });
           const data = response?.data;
+          console.log("[StepFlowBuilder] Fetch response data:", JSON.stringify(data, null, 2));
+          console.log("[StepFlowBuilder] entrySegment from API:", data?.entrySegment);
           if (data?.entrySegment?.id) {
             const seg = {
               id: data.entrySegment.id,
               name: data.entrySegment.name || `Segment #${data.entrySegment.id}`
             };
+            console.log("[StepFlowBuilder] Setting initialSegment:", seg);
             setInitialSegment(seg);
+          } else {
+            console.log("[StepFlowBuilder] No entrySegment.id found in API response");
           }
         } catch (err) {
           console.error("[StepFlowBuilder] Fetch error:", err);
@@ -3687,36 +3696,53 @@ const StepFlowBuilderInner = forwardRef(
     const currentSegment = useMemo(() => {
       const values = form?.values;
       const entrySegmentValue = values?.entrySegment;
+      console.log("[StepFlowBuilder] currentSegment memo - form.values.entrySegment:", entrySegmentValue);
+      console.log("[StepFlowBuilder] currentSegment memo - initialSegment:", initialSegment);
+      console.log("[StepFlowBuilder] currentSegment memo - typeof entrySegmentValue:", typeof entrySegmentValue);
+      if (entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - entrySegmentValue keys:", Object.keys(entrySegmentValue));
+      }
       if (!entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - no entrySegmentValue, returning initialSegment");
         return initialSegment;
       }
       if ("connect" in entrySegmentValue || "disconnect" in entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - detected connect/disconnect structure");
         const { connect = [], disconnect = [] } = entrySegmentValue;
         if (connect.length > 0) {
           const seg = connect[0];
+          console.log("[StepFlowBuilder] currentSegment memo - returning from connect:", seg);
           return { id: seg.id, name: seg.name || `Segment #${seg.id}` };
         }
         if (disconnect.length > 0 && initialSegment) {
           const disconnectedId = disconnect[0]?.id;
           if (disconnectedId === initialSegment.id) {
+            console.log("[StepFlowBuilder] currentSegment memo - segment disconnected, returning null");
             return null;
           }
         }
+        console.log("[StepFlowBuilder] currentSegment memo - connect/disconnect but falling back to initialSegment");
         return initialSegment;
       }
       const segmentObj = entrySegmentValue;
+      console.log("[StepFlowBuilder] currentSegment memo - treating as direct segment object:", segmentObj);
       if (segmentObj.id) {
-        return { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        const result = { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        console.log("[StepFlowBuilder] currentSegment memo - returning direct segment:", result);
+        return result;
       }
+      console.log("[StepFlowBuilder] currentSegment memo - no id in segmentObj, returning initialSegment");
       return initialSegment;
     }, [form?.values, initialSegment]);
     const campaignContext = useMemo(() => {
       const values = form?.values;
       if (!values) return {};
-      return {
+      const ctx = {
         triggerConfig: values.triggerConfig,
         entrySegment: currentSegment
       };
+      console.log("[StepFlowBuilder] campaignContext:", ctx);
+      return ctx;
     }, [form?.values, currentSegment]);
     useEffect(() => {
       const parsed = parseValue(value);

package/dist/_chunks/{index-D0bqpjSi.js → index-CwwnTFv3.js}

@@ -1926,6 +1926,7 @@ const EntryConfigInner = ({
   entrySegment,
   theme
 }) => {
+  console.log("[EntryConfig] Received entrySegment:", entrySegment);
   const config = parseTriggerConfig(triggerConfig);
   const renderTriggerInfo = () => {
     if (!config) {
@@ -2057,6 +2058,9 @@ const EntryConfigInner = ({
   const renderSegmentInfo = () => {
     const hasSegment = entrySegment && (entrySegment.id || entrySegment.name);
     const segmentDisplayName = entrySegment?.name || (entrySegment?.id ? `Segment #${entrySegment.id}` : null);
+    console.log("[EntryConfig] renderSegmentInfo - entrySegment:", entrySegment);
+    console.log("[EntryConfig] renderSegmentInfo - hasSegment:", hasSegment);
+    console.log("[EntryConfig] renderSegmentInfo - segmentDisplayName:", segmentDisplayName);
     if (!hasSegment || !segmentDisplayName) {
       return /* @__PURE__ */ jsxRuntime.jsx(
         "div",
@@ -3674,12 +3678,17 @@ const StepFlowBuilderInner = React.forwardRef(
           const url = `/content-manager/collection-types/${model}/${documentId}`;
           const response = await get(url, { params: { populate: "entrySegment" } });
           const data = response?.data;
+          console.log("[StepFlowBuilder] Fetch response data:", JSON.stringify(data, null, 2));
+          console.log("[StepFlowBuilder] entrySegment from API:", data?.entrySegment);
           if (data?.entrySegment?.id) {
             const seg = {
               id: data.entrySegment.id,
               name: data.entrySegment.name || `Segment #${data.entrySegment.id}`
             };
+            console.log("[StepFlowBuilder] Setting initialSegment:", seg);
             setInitialSegment(seg);
+          } else {
+            console.log("[StepFlowBuilder] No entrySegment.id found in API response");
           }
         } catch (err) {
           console.error("[StepFlowBuilder] Fetch error:", err);
@@ -3692,36 +3701,53 @@ const StepFlowBuilderInner = React.forwardRef(
     const currentSegment = React.useMemo(() => {
       const values = form?.values;
       const entrySegmentValue = values?.entrySegment;
+      console.log("[StepFlowBuilder] currentSegment memo - form.values.entrySegment:", entrySegmentValue);
+      console.log("[StepFlowBuilder] currentSegment memo - initialSegment:", initialSegment);
+      console.log("[StepFlowBuilder] currentSegment memo - typeof entrySegmentValue:", typeof entrySegmentValue);
+      if (entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - entrySegmentValue keys:", Object.keys(entrySegmentValue));
+      }
       if (!entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - no entrySegmentValue, returning initialSegment");
         return initialSegment;
       }
       if ("connect" in entrySegmentValue || "disconnect" in entrySegmentValue) {
+        console.log("[StepFlowBuilder] currentSegment memo - detected connect/disconnect structure");
         const { connect = [], disconnect = [] } = entrySegmentValue;
         if (connect.length > 0) {
           const seg = connect[0];
+          console.log("[StepFlowBuilder] currentSegment memo - returning from connect:", seg);
           return { id: seg.id, name: seg.name || `Segment #${seg.id}` };
         }
         if (disconnect.length > 0 && initialSegment) {
           const disconnectedId = disconnect[0]?.id;
           if (disconnectedId === initialSegment.id) {
+            console.log("[StepFlowBuilder] currentSegment memo - segment disconnected, returning null");
             return null;
           }
         }
+        console.log("[StepFlowBuilder] currentSegment memo - connect/disconnect but falling back to initialSegment");
         return initialSegment;
       }
       const segmentObj = entrySegmentValue;
+      console.log("[StepFlowBuilder] currentSegment memo - treating as direct segment object:", segmentObj);
       if (segmentObj.id) {
-        return { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        const result = { id: segmentObj.id, name: segmentObj.name || `Segment #${segmentObj.id}` };
+        console.log("[StepFlowBuilder] currentSegment memo - returning direct segment:", result);
+        return result;
       }
+      console.log("[StepFlowBuilder] currentSegment memo - no id in segmentObj, returning initialSegment");
       return initialSegment;
     }, [form?.values, initialSegment]);
     const campaignContext = React.useMemo(() => {
       const values = form?.values;
       if (!values) return {};
-      return {
+      const ctx = {
         triggerConfig: values.triggerConfig,
         entrySegment: currentSegment
       };
+      console.log("[StepFlowBuilder] campaignContext:", ctx);
+      return ctx;
     }, [form?.values, currentSegment]);
     React.useEffect(() => {
       const parsed = parseValue(value);

package/dist/_chunks/{ru-0SymptLG.js → ru-BKzplvmu.js}

@@ -81,6 +81,6 @@ const ru = {
   "crm-dashboard.template.title.label": "Заголовок",
   "crm-dashboard.template.title.description": "Для email: тема письма. Для Telegram: внутренний заголовок (не виден пользователю). Для push: заголовок уведомления.",
   "crm-dashboard.template.body.label": "Текст сообщения",
-  "crm-dashboard.template.body.description": "Текст сообщения. Поддерживает переменные: {{user.name}}, {{user.balance}}. Для Telegram: поддерживает Markdown-форматирование."
+  "crm-dashboard.template.body.description": "Текст сообщения. Переменные: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *жирный*, _курсив_"
 };
 exports.default = ru;

package/dist/_chunks/{ru-Bs6gLZAD.mjs → ru-DOt1yfNm.mjs}

@@ -79,7 +79,7 @@ const ru = {
   "crm-dashboard.template.title.label": "Заголовок",
   "crm-dashboard.template.title.description": "Для email: тема письма. Для Telegram: внутренний заголовок (не виден пользователю). Для push: заголовок уведомления.",
   "crm-dashboard.template.body.label": "Текст сообщения",
-  "crm-dashboard.template.body.description": "Текст сообщения. Поддерживает переменные: {{user.name}}, {{user.balance}}. Для Telegram: поддерживает Markdown-форматирование."
+  "crm-dashboard.template.body.description": "Текст сообщения. Переменные: {{userName}}, {{balance}}, {{depositCount}}, {{depositTotal}}, {{amount}}. Markdown: *жирный*, _курсив_"
 };
 export {
   ru as default

package/dist/admin/index.js

@@ -131,7 +131,7 @@ const index = {
       components: {
         Input: async () => Promise.resolve().then(() => require(
           /* webpackChunkName: "crm-step-flow-builder" */
-          "../_chunks/index-D0bqpjSi.js"
+          "../_chunks/index-CwwnTFv3.js"
         ))
       },
       options: {
@@ -168,7 +168,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("../_chunks/en-CdGCb6EW.js")), "./translations/ru.json": () => Promise.resolve().then(() => require("../_chunks/ru-0SymptLG.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("../_chunks/en-D2kTkBns.js")), "./translations/ru.json": () => Promise.resolve().then(() => require("../_chunks/ru-BKzplvmu.js")) }), `./translations/${locale}.json`, 3);
           return { data, locale };
         } catch {
           return { data: {}, locale };

package/dist/admin/index.mjs

@@ -130,7 +130,7 @@ const index = {
       components: {
         Input: async () => import(
           /* webpackChunkName: "crm-step-flow-builder" */
-          "../_chunks/index-D0NPKIXd.mjs"
+          "../_chunks/index-B_HwB9Vy.mjs"
         )
       },
       options: {
@@ -167,7 +167,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("../_chunks/en-BIgUnT9A.mjs"), "./translations/ru.json": () => import("../_chunks/ru-Bs6gLZAD.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("../_chunks/en-DEUgX5uV.mjs"), "./translations/ru.json": () => import("../_chunks/ru-DOt1yfNm.mjs") }), `./translations/${locale}.json`, 3);
           return { data, locale };
         } catch {
           return { data: {}, locale };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspirer-dev/crm-dashboard",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "description": "CRM Dashboard and Tools",
   "strapi": {
     "name": "crm-dashboard",