@inspirer-dev/crm-dashboard 1.0.80 → 1.0.82

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

@@ -80,7 +80,7 @@ interface StrapiTheme {
 }
 
 const useThemeColors = () => {
-  const theme = useTheme() as StrapiTheme;
+  const theme = useTheme() as unknown as StrapiTheme;
   const isDark = theme?.colors?.neutral0 === '#212134';
 
   return useMemo(() => ({
@@ -367,8 +367,8 @@ const ButtonsBuilder = forwardRef<HTMLDivElement, ButtonsBuilderProps>(
             </Box>
           )}
 
-          {error && <Field.Error>{error}</Field.Error>}
-          {hint && <Field.Hint>{hint}</Field.Hint>}
+          {error && <Field.Error />}
+          {hint && <Field.Hint />}
         </Flex>
       </Field.Root>
     );

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

@@ -116,7 +116,8 @@ const ValueInput: React.FC<ValueInputProps> = ({ metric, value, operator, onChan
     return (
       <Flex gap={2} alignItems="center">
         <Switch
-          label=""
+          onLabel=""
+          offLabel=""
           checked={boolVal}
           onChange={() => onChange(!boolVal)}
           disabled={disabled}
@@ -161,7 +162,7 @@ const ValueInput: React.FC<ValueInputProps> = ({ metric, value, operator, onChan
         <Box style={{ width: '120px' }}>
           <SingleSelect
             value={unit}
-            onChange={(newUnit: string) => onChange({ [newUnit]: numValue })}
+            onChange={(newUnit: string | number) => onChange({ [String(newUnit)]: numValue })}
             disabled={disabled}
           >
             {CANCEL_TIME_UNITS.map((u) => (
@@ -215,7 +216,7 @@ const RuleRow: React.FC<RuleRowProps> = ({ rule, onUpdate, onDelete, disabled })
       <Box style={{ flex: '1 1 200px', minWidth: '180px' }}>
         <SingleSelect
           value={rule.field}
-          onChange={(val: string) => handleFieldChange(val)}
+          onChange={(val: string | number) => handleFieldChange(String(val))}
           disabled={disabled}
           size="S"
         >
@@ -230,7 +231,7 @@ const RuleRow: React.FC<RuleRowProps> = ({ rule, onUpdate, onDelete, disabled })
       <Box style={{ width: '80px' }}>
         <SingleSelect
           value={rule.operator}
-          onChange={(val: string) => onUpdate({ ...rule, operator: val as RuleOperator })}
+          onChange={(val: string | number) => onUpdate({ ...rule, operator: String(val) as RuleOperator })}
           disabled={disabled}
           size="S"
         >
@@ -386,8 +387,8 @@ const CancelConditionsField = forwardRef<HTMLDivElement, CancelConditionsFieldPr
             </CardContent>
           </Card>
 
-          {error && <Field.Error>{error}</Field.Error>}
-          {hint && <Field.Hint>{hint}</Field.Hint>}
+          {error && <Field.Error />}
+          {hint && <Field.Hint />}
         </Flex>
       </Field.Root>
     );

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

@@ -58,7 +58,7 @@ interface StrapiTheme {
 }
 
 const useThemeColors = () => {
-  const theme = useTheme() as StrapiTheme;
+  const theme = useTheme() as unknown as StrapiTheme;
   const isDark = theme?.colors?.neutral0 === '#212134';
 
   return useMemo(
@@ -124,8 +124,9 @@ const ValueInput: React.FC<ValueInputProps> = ({
     return (
       <Flex gap={2} alignItems="center">
         <Switch
-          label=""
-          selected={boolVal}
+          onLabel=""
+          offLabel=""
+          checked={boolVal}
           onChange={() => onChange(!boolVal)}
           disabled={disabled}
         />
@@ -141,7 +142,7 @@ const ValueInput: React.FC<ValueInputProps> = ({
     return (
       <SingleSelect
         value={boolVal ? 'true' : 'false'}
-        onChange={(val: string) => onChange(val === 'true')}
+        onChange={(val: string | number) => onChange(val === 'true')}
         disabled={disabled}
         size="S"
       >
@@ -176,7 +177,7 @@ const ValueInput: React.FC<ValueInputProps> = ({
         <Box style={{ width: '120px' }}>
           <SingleSelect
             value={unit}
-            onChange={(val: string) => onChange(createTimeAgoValue(amount, val))}
+            onChange={(val: string | number) => onChange(createTimeAgoValue(amount, String(val)))}
             disabled={disabled}
             size="S"
           >
@@ -195,7 +196,7 @@ const ValueInput: React.FC<ValueInputProps> = ({
     return (
       <SingleSelect
         value={String(value || '')}
-        onChange={(val: string) => onChange(val)}
+        onChange={(val: string | number) => onChange(val)}
         disabled={disabled}
         size="S"
       >
@@ -328,7 +329,7 @@ const RuleRow: React.FC<RuleRowProps> = ({ rule, onUpdate, onDelete, disabled })
       <Box style={{ flex: '1 1 200px', minWidth: '180px' }}>
         <SingleSelect
           value={rule.field}
-          onChange={(val: string) => handleFieldChange(val)}
+          onChange={(val: string | number) => handleFieldChange(String(val))}
           disabled={disabled}
           size="S"
         >
@@ -350,7 +351,7 @@ const RuleRow: React.FC<RuleRowProps> = ({ rule, onUpdate, onDelete, disabled })
       <Box style={{ width: '75px' }}>
         <SingleSelect
           value={rule.operator}
-          onChange={(val: string) => handleOperatorChange(val as RuleOperator)}
+          onChange={(val: string | number) => handleOperatorChange(val as RuleOperator)}
           disabled={disabled}
           size="S"
         >

package/admin/src/components/StepFlowBuilder/constants.ts

@@ -152,6 +152,8 @@ export const DEFAULT_NODE_DATA: Record<StepType, { name: string; config: object
       eventTrigger: {
         events: [],
         logic: 'or',
+        timeout: 0,
+        timeoutUnit: 'minutes' as DurationUnit,
       },
     },
   },

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

@@ -474,7 +474,7 @@ const StepFlowBuilderInner = forwardRef<HTMLDivElement, StepFlowBuilderProps>(
     const stepCount = steps.length;
 
     const validationError = useMemo(() => {
-      if (!validation || validation.isValid) return null;
+      if (!validation || validation.isValid) return undefined;
       const errorCount = validation.errors.length;
       const errorWord = pluralize(errorCount, 'ошибка', 'ошибки', 'ошибок');
       return `Поток содержит ${errorCount} ${errorWord} валидации. Исправьте все ошибки перед публикацией.`;

package/admin/src/components/StepFlowBuilder/nodes/EventTriggerNode.tsx

@@ -11,6 +11,8 @@ const EventTriggerNode: React.FC<NodeProps<FlowNodeData>> = ({ id, data, selecte
   const eventTrigger = data.config.eventTrigger;
   const events = eventTrigger?.events || [];
   const logic = eventTrigger?.logic || 'or';
+  const timeout = eventTrigger?.timeout || 0;
+  const timeoutUnit = eventTrigger?.timeoutUnit || 'minutes';
   const { hasError, hasWarning } = useNodeValidation(id);
 
   const getEventLabel = () => {
@@ -19,6 +21,17 @@ const EventTriggerNode: React.FC<NodeProps<FlowNodeData>> = ({ id, data, selecte
     return `${events.length} events (${logic.toUpperCase()})`;
   };
 
+  const getTimeoutLabel = () => {
+    if (timeout <= 0) return null;
+    const unitShort: Record<string, string> = {
+      seconds: 's',
+      minutes: 'm',
+      hours: 'h',
+      days: 'd',
+    };
+    return `${timeout}${unitShort[timeoutUnit] || timeoutUnit}`;
+  };
+
   return (
     <div
       style={{
@@ -106,7 +119,7 @@ const EventTriggerNode: React.FC<NodeProps<FlowNodeData>> = ({ id, data, selecte
               background: 'rgba(255, 255, 255, 0.9)',
               padding: '2px 10px',
               borderRadius: 4,
-              maxWidth: 160,
+              maxWidth: getTimeoutLabel() ? 120 : 160,
               overflow: 'hidden',
               textOverflow: 'ellipsis',
               whiteSpace: 'nowrap',
@@ -114,6 +127,21 @@ const EventTriggerNode: React.FC<NodeProps<FlowNodeData>> = ({ id, data, selecte
           >
             {getEventLabel()}
           </span>
+          {getTimeoutLabel() && (
+            <span
+              style={{
+                fontSize: 10,
+                fontWeight: 600,
+                color: '#d97706',
+                background: 'rgba(255, 255, 255, 0.9)',
+                padding: '2px 8px',
+                borderRadius: 4,
+                whiteSpace: 'nowrap',
+              }}
+            >
+              ⏱ {getTimeoutLabel()}
+            </span>
+          )}
         </div>
       </div>
       <Handle

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

@@ -7,8 +7,12 @@ import {
   ComboboxOption,
   Badge,
   Checkbox,
+  NumberInput,
+  SingleSelect,
+  SingleSelectOption,
 } from '@strapi/design-system';
-import type { FlowNodeData, EventTriggerLogic } from '../types';
+import type { FlowNodeData, EventTriggerLogic, DurationUnit } from '../types';
+import { DURATION_UNIT_OPTIONS } from '../constants';
 import { useFlowTheme } from '../hooks/useFlowTheme';
 
 const ANALYTICS_EVENTS: Record<string, { value: string; label: string }[]> = {
@@ -81,6 +85,8 @@ const EventTriggerConfig: React.FC<EventTriggerConfigProps> = ({ data, onUpdate,
   const eventTrigger = data.config.eventTrigger || { events: [], logic: 'or' as EventTriggerLogic };
   const events = eventTrigger.events || [];
   const logic = eventTrigger.logic || 'or';
+  const timeout = eventTrigger.timeout || 0;
+  const timeoutUnit = eventTrigger.timeoutUnit || 'minutes';
 
   const [inputText, setInputText] = useState('');
   const justSelectedRef = useRef(false);
@@ -135,6 +141,30 @@ const EventTriggerConfig: React.FC<EventTriggerConfigProps> = ({ data, onUpdate,
     });
   };
 
+  const handleTimeoutChange = (value: number | undefined) => {
+    onUpdate({
+      config: {
+        ...data.config,
+        eventTrigger: {
+          ...eventTrigger,
+          timeout: value || 0,
+        },
+      },
+    });
+  };
+
+  const handleTimeoutUnitChange = (value: string) => {
+    onUpdate({
+      config: {
+        ...data.config,
+        eventTrigger: {
+          ...eventTrigger,
+          timeoutUnit: value as DurationUnit,
+        },
+      },
+    });
+  };
+
   return (
     <Flex direction="column" gap={4}>
       <Box style={{ width: '100%' }}>
@@ -168,7 +198,8 @@ const EventTriggerConfig: React.FC<EventTriggerConfigProps> = ({ data, onUpdate,
           disabled={disabled}
           creatable
           createMessage={(v: string) => `Использовать: "${v}"`}
-          onCreateOption={(v: string) => {
+          onCreateOption={(v?: string) => {
+            if (!v) return;
             handleAddEvent(v);
           }}
         >
@@ -322,6 +353,53 @@ const EventTriggerConfig: React.FC<EventTriggerConfigProps> = ({ data, onUpdate,
         </Box>
       )}
 
+      <Box style={{ width: '100%' }}>
+        <Typography
+          variant="sigma"
+          style={{
+            marginBottom: 10,
+            display: 'block',
+            fontSize: 11,
+            letterSpacing: '0.05em',
+            color: theme.textMuted,
+          }}
+        >
+          ТАЙМАУТ
+        </Typography>
+        <Flex gap={3} alignItems="center">
+          <Box style={{ flex: 1 }}>
+            <NumberInput
+              value={timeout}
+              onValueChange={handleTimeoutChange}
+              disabled={disabled}
+              step={1}
+            />
+          </Box>
+          <Box style={{ width: 140 }}>
+            <SingleSelect
+              value={timeoutUnit}
+              onChange={(val: string | number) => handleTimeoutUnitChange(String(val))}
+              disabled={disabled}
+            >
+              {DURATION_UNIT_OPTIONS.map((opt) => (
+                <SingleSelectOption key={opt.value} value={opt.value}>
+                  {opt.label}
+                </SingleSelectOption>
+              ))}
+            </SingleSelect>
+          </Box>
+        </Flex>
+        <Typography
+          variant="pi"
+          textColor="neutral500"
+          style={{ marginTop: 8, display: 'block' }}
+        >
+          {timeout > 0
+            ? `Если событие не произойдёт за ${timeout} ${timeoutUnit}, кампания продолжится автоматически`
+            : 'Установите 0 для бесконечного ожидания события'}
+        </Typography>
+      </Box>
+
       <div
         style={{
           padding: 14,
@@ -340,15 +418,25 @@ const EventTriggerConfig: React.FC<EventTriggerConfigProps> = ({ data, onUpdate,
         >
           {events.length === 0 ? (
             'Выберите события, которые должен совершить пользователь для продолжения кампании.'
-          ) : logic === 'or' ? (
-            <>
-              Кампания продолжится, когда пользователь выполнит{' '}
-              <strong>любое</strong> из выбранных событий.
-            </>
           ) : (
             <>
-              Кампания продолжится только когда пользователь выполнит{' '}
-              <strong>все {events.length}</strong> выбранных события.
+              {logic === 'or' ? (
+                <>
+                  Кампания продолжится, когда пользователь выполнит{' '}
+                  <strong>любое</strong> из выбранных событий
+                </>
+              ) : (
+                <>
+                  Кампания продолжится только когда пользователь выполнит{' '}
+                  <strong>все {events.length}</strong> выбранных события
+                </>
+              )}
+              {timeout > 0 && (
+                <>
+                  {' '}или через <strong>{timeout} {timeoutUnit}</strong>
+                </>
+              )}
+              .
             </>
           )}
         </Typography>

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

@@ -336,7 +336,7 @@ const NodeEditPanel: React.FC<ExtendedNodeEditPanelProps> = ({
                 <TextInput
                   value={name}
                   onChange={handleNameChange}
-                  disabled={disabled || stepType === 'entry'}
+                  disabled={disabled}
                   placeholder="Enter step name..."
                 />
               </div>

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

@@ -61,7 +61,6 @@ const WaitConfig: React.FC<WaitConfigProps> = ({ data, onUpdate, disabled }) =>
             onValueChange={handleDurationChange}
             disabled={disabled}
             step={1}
-            label=""
           />
         </div>
       </Box>
@@ -81,9 +80,8 @@ const WaitConfig: React.FC<WaitConfigProps> = ({ data, onUpdate, disabled }) =>
         <div style={{ width: '100%' }}>
           <SingleSelect
             value={durationUnit}
-            onChange={handleUnitChange}
+            onChange={(val: string | number) => handleUnitChange(String(val))}
             disabled={disabled}
-            label=""
           >
             {DURATION_UNIT_OPTIONS.map((opt) => (
               <SingleSelectOption key={opt.value} value={opt.value}>

package/admin/src/components/StepFlowBuilder/types.ts

@@ -8,6 +8,8 @@ export type EventTriggerLogic = 'and' | 'or';
 export interface EventTriggerConfig {
   events: string[];
   logic: EventTriggerLogic;
+  timeout?: number;
+  timeoutUnit?: DurationUnit;
 }
 
 export interface BranchSegmentRef {

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

@@ -226,7 +226,7 @@ interface StrapiTheme {
 }
 
 const useThemeColors = () => {
-  const theme = useTheme() as StrapiTheme;
+  const theme = useTheme() as unknown as StrapiTheme;
   const isDark = theme?.colors?.neutral0 === '#212134';
 
   return useMemo(
@@ -524,7 +524,8 @@ const TriggerConfigField = forwardRef<HTMLDivElement, TriggerConfigFieldProps>(
                     disabled={disabled}
                     creatable
                     createMessage={(v: string) => `Use custom event: "${v}"`}
-                    onCreateOption={(v: string) => {
+                    onCreateOption={(v?: string) => {
+                      if (!v) return;
                       const eventValue = extractEventValue(v);
                       handleUpdate({ eventName: eventValue });
                       setInputText(getEventLabel(eventValue));
@@ -617,8 +618,8 @@ const TriggerConfigField = forwardRef<HTMLDivElement, TriggerConfigFieldProps>(
                       <Box style={{ width: 120 }}>
                         <SingleSelect
                           value={config.delayUnit || 'minutes'}
-                          onChange={(val: string) =>
-                            handleUpdate({ delayUnit: val as TriggerConfig['delayUnit'] })
+                          onChange={(val: string | number) =>
+                            handleUpdate({ delayUnit: String(val) as TriggerConfig['delayUnit'] })
                           }
                           disabled={disabled}
                           size="S"
@@ -743,8 +744,8 @@ const TriggerConfigField = forwardRef<HTMLDivElement, TriggerConfigFieldProps>(
                         <Box style={{ width: 160 }}>
                           <SingleSelect
                             value={String(config.scheduleEveryMinutes ?? 5)}
-                            onChange={(val: string) =>
-                              handleUpdate({ scheduleEveryMinutes: parseInt(val, 10) || 5 })
+                            onChange={(val: string | number) =>
+                              handleUpdate({ scheduleEveryMinutes: parseInt(String(val), 10) || 5 })
                             }
                             disabled={disabled}
                             size="S"
@@ -885,8 +886,8 @@ const TriggerConfigField = forwardRef<HTMLDivElement, TriggerConfigFieldProps>(
                       textColor="neutral500"
                       style={{ marginTop: 8, display: 'block' }}
                     >
-                      Формат: минута час день месяц день_недели (напр., "0 12 * * *" = ежедневно в 12:00
-                      UTC)
+                      Формат: минута час день месяц день_недели (напр., "0 12 * * *" = ежедневно в
+                      12:00 UTC)
                     </Typography>
                   )}
                 </Box>
@@ -894,8 +895,8 @@ const TriggerConfigField = forwardRef<HTMLDivElement, TriggerConfigFieldProps>(
             </Box>
           )}
 
-          {error && <Field.Error>{error}</Field.Error>}
-          {hint && <Field.Hint>{hint}</Field.Hint>}
+          {error && <Field.Error />}
+          {hint && <Field.Hint />}
         </Flex>
       </Field.Root>
     );

package/admin/src/components/TriggerParamsField/constants.ts

@@ -0,0 +1,109 @@
+export interface TriggerParamDef {
+  key: string;
+  label: string;
+  description: string;
+  unit: string;
+  min: number;
+  placeholder: string;
+  stageTypes: string[];
+}
+
+export const TRIGGER_PARAMS: TriggerParamDef[] = [
+  {
+    key: 'delaySeconds',
+    label: 'Задержка',
+    description: 'Задержка перед показом после срабатывания триггера',
+    unit: 'сек',
+    min: 0,
+    placeholder: '7',
+    stageTypes: ['side_hint', 'modal', 'retry'],
+  },
+  {
+    key: 'timeOnSiteSeconds',
+    label: 'Время на сайте',
+    description: 'Мин. время на сайте для срабатывания',
+    unit: 'сек',
+    min: 0,
+    placeholder: '120',
+    stageTypes: ['exit_intent', 'side_hint', 'modal'],
+  },
+  {
+    key: 'scrollThresholdPx',
+    label: 'Порог скролла',
+    description: 'Скролл в пикселях для срабатывания',
+    unit: 'px',
+    min: 0,
+    placeholder: '200',
+    stageTypes: ['side_hint'],
+  },
+  {
+    key: 'idleSeconds',
+    label: 'Бездействие',
+    description: 'Время без кликов/скролла',
+    unit: 'сек',
+    min: 0,
+    placeholder: '15',
+    stageTypes: ['side_hint'],
+  },
+  {
+    key: 'caseViewSeconds',
+    label: 'Просмотр кейса',
+    description: 'Время на странице кейса',
+    unit: 'сек',
+    min: 0,
+    placeholder: '12',
+    stageTypes: ['modal', 'side_hint'],
+  },
+  {
+    key: 'activePlayMinutes',
+    label: 'Активная игра',
+    description: 'Время активной игры',
+    unit: 'мин',
+    min: 0,
+    placeholder: '10',
+    stageTypes: ['modal'],
+  },
+  {
+    key: 'actionCountThreshold',
+    label: 'Порог действий',
+    description: 'Кол-во значимых действий + низкий баланс',
+    unit: '',
+    min: 0,
+    placeholder: '2',
+    stageTypes: ['modal'],
+  },
+  {
+    key: 'balanceThresholdMultiplier',
+    label: 'Множитель баланса',
+    description: 'Множитель мин. цены кейса для "низкого баланса"',
+    unit: '×',
+    min: 0,
+    placeholder: '1.5',
+    stageTypes: ['modal', 'side_hint'],
+  },
+  {
+    key: 'abandonedTimeoutMinutes',
+    label: 'Таймаут заброшенного депозита',
+    description: 'Через сколько минут депозит считается заброшенным',
+    unit: 'мин',
+    min: 1,
+    placeholder: '10',
+    stageTypes: ['retry'],
+  },
+  {
+    key: 'minDepositAmount',
+    label: 'Мин. сумма депозита',
+    description: 'Подстановка в {{min_deposit}} в текстах',
+    unit: '₽',
+    min: 0,
+    placeholder: '250',
+    stageTypes: ['modal', 'side_hint', 'retry'],
+  },
+];
+
+export const STAGE_TYPE_LABELS: Record<string, string> = {
+  side_hint: 'Side-hint',
+  modal: 'Modal',
+  exit_intent: 'Exit intent',
+  retry: 'Retry',
+};