@redneckz/wildless-cms-uni-blocks 0.14.1022 → 0.14.1023

package/lib/ui-kit/UserSurveyDialog/FirstStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"FirstStep.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/FirstStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEtC,MAAM,KAAK,GAAG;IACZ,GAAG,EAAE,uHAAuH;IAC5H,GAAG,EAAE,2DAA2D;CACjE,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAC1B,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACnF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAU,CAAC;IAE3D,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;QAC1C,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,UAAU,EAAE,CAAC;SACd;IACH,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAC,mCAAmC,aAChD,KAAC,OAAO,IAAC,SAAS,EAAC,aAAa,EAAC,WAAW,EAAC,IAAI,EAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,GAAI,EAC9E,cAAK,SAAS,EAAC,qBAAqB,YACjC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAC9B,KAAC,QAAQ,IAEP,KAAK,EAAE,KAAK,GAAG,CAAC,EAChB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAC,sBAAsB,IAN3B,KAAK,CAOV,CACH,CAAC,GACE,EACL,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CACrB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,SAAS,uEAE9C,CAChB,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"FirstStep.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/FirstStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEtC,MAAM,KAAK,GAAG;IACZ,GAAG,EAAE,yHAAyH;IAC9H,GAAG,EAAE,2DAA2D;CACjE,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAC1B,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACnF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAU,CAAC;IAE3D,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;QAC1C,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,UAAU,EAAE,CAAC;SACd;IACH,CAAC,CAAC;IAEF,OAAO,CACL,eAAK,SAAS,EAAC,mCAAmC,aAChD,KAAC,OAAO,IACN,SAAS,EAAC,iCAAiC,EAC3C,WAAW,EAAC,IAAI,EAChB,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,GACxB,EACF,cAAK,SAAS,EAAC,qBAAqB,YACjC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAC9B,KAAC,QAAQ,IAEP,KAAK,EAAE,KAAK,GAAG,CAAC,EAChB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAC,sBAAsB,IAN3B,KAAK,CAOV,CACH,CAAC,GACE,EACL,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CACrB,KAAC,YAAY,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,SAAS,uEAE9C,CAChB,CAAC,CAAC,CAAC,IAAI,IACJ,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js

@@ -11,13 +11,13 @@ import { FirstStep } from './FirstStep.js';
 import { SecondStep } from './SecondStep.js';
 const STEPS = [FirstStep, SecondStep, FinalStep];
 const LAST_STEP_INDEX = 2;
-export const UserSurveyDialog = UniBlock(({ onClose = noop, reasonsSource = {} }) => {
+export const UserSurveyDialog = UniBlock(({ onClose = noop, isAfterTargetAction = false, reasonsSource = {} }) => {
     const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
     const [currentRating, setCurrentRating] = useState(0);
     const [currentReason, setCurrentReason] = useState();
     const [step, setStep] = useState(0);
     const userSurveyStore = useLocalStore();
-    const surveyType = userSurveyStore.userSurvey?.lastShownType ?? 'NPS';
+    const surveyType = getUserSurveyType(userSurveyStore.userSurvey?.lastShownType);
     const { reasons } = reasonsSource;
     const ActiveStep = STEPS[step];
     const handleNextStep = useCallback(() => {
@@ -31,8 +31,13 @@ export const UserSurveyDialog = UniBlock(({ onClose = noop, reasonsSource = {} }
             message: getMessage(currentReason, message),
             url: globalThis.location.href,
             type: surveyType,
+            ip: isAfterTargetAction ? 'after_target_action' : 'time_on_site',
         });
         endSending();
+        userSurveyStore.userSurvey = {
+            lastShownType: surveyType,
+            nextDueAt: getTimeAfter30days(),
+        };
         setStep(LAST_STEP_INDEX);
     }, [currentRating, currentReason]);
     return (_jsx(Dialog, { maxWidth: "xl", onClose: onClose, children: _jsx(ActiveStep, { currentRating: currentRating, currentReason: currentReason, reasons: reasons, surveyType: surveyType, isSending: isSending, setCurrentReason: setCurrentReason, setCurrentRating: setCurrentRating, onSubmit: handleSubmit, onNextStep: handleNextStep }) }));
@@ -43,4 +48,14 @@ const getMessage = (currentReason, message) => {
     }
     return message?.length ? message : 'Другое. Клиент не оставил комментариев';
 };
+// Отсчитываем месяц с текущей даты
+const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
+// Если пользователь проходил опрос то показываем другой, иначе показываем случайный тип опроса
+const getUserSurveyType = (lastShownType) => {
+    console.log('Расчитал');
+    if (lastShownType) {
+        return lastShownType === 'NPS' ? 'CSI' : 'NPS';
+    }
+    return ['NPS', 'CSI'][Date.now() % 2];
+};
 //# sourceMappingURL=UserSurveyDialog.js.map

package/lib/ui-kit/UserSurveyDialog/UserSurveyDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/UserSurveyDialog.tsx"],"names":[],"mappings":"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"}

package/lib/ui-kit/UserSurveyDialog/UserSurveyDialogContent.d.ts

@@ -1,9 +1,10 @@
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type OnCloseProps } from '../../model/OnCloseProps';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
+export declare type UserSurveyType = 'NPS' | 'CSI';
 export declare type UserSurveyStoreSlice = {
     userSurvey: {
-        lastShownType: 'NPS' | 'CSI';
+        lastShownType: UserSurveyType;
         nextDueAt: number;
     };
 };
@@ -15,7 +16,7 @@ export declare type StepProps = {
     currentRating?: number;
     currentReason?: Reason;
     reasons?: Reason[];
-    surveyType: 'NPS' | 'CSI';
+    surveyType: UserSurveyType;
     isSending: boolean;
     setCurrentReason: (value: Reason) => void;
     setCurrentRating: (value: number) => void;
@@ -26,4 +27,5 @@ export interface UserSurveyDialogContent extends OnCloseProps, UniBlockContent {
     reasonsSource?: {
         reasons: Reason[];
     } | JSONRefObject;
+    isAfterTargetAction?: boolean;
 }

package/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.d.ts

@@ -1 +1 @@
-export declare const useUserSurveyDialog: () => void;
+export declare const useUserSurveyDialog: (withoutTimer?: boolean) => () => void;

package/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js

@@ -1,4 +1,4 @@
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { noop } from '../../utils/noop.js';
@@ -6,40 +6,52 @@ import { useDialog } from '../DialogManager/useDialog.js';
 import { UserSurveyDialog } from './UserSurveyDialog.js';
 const DELAY = 5 * 60 * 1000;
 // Хук отвечает за показ пользователю опроса
-export const useUserSurveyDialog = () => {
+export const useUserSurveyDialog = (withoutTimer) => {
     const userSurveyDialog = useDialog(UserSurveyDialog);
     const userSurveyStore = useLocalStore();
     const sessionStore = useSessionStore();
+    const surveyTimer = sessionStore.surveyTimerId;
+    const isSurveySkipped = sessionStore.isSurveySkipped;
     const elapsedTime = sessionStore.surveyTimerStart
         ? Date.now() - Number.parseInt(sessionStore.surveyTimerStart)
         : 0;
-    const openUserSurveyDialog = () => {
-        userSurveyStore.userSurvey = {
-            lastShownType: userSurveyStore.userSurvey?.lastShownType === 'NPS' ? 'CSI' : 'NPS',
-            nextDueAt: getTimeAfter30days(),
-        };
+    const isShowSurvey = !isSurveySkipped &&
+        (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now());
+    const handleCloseSurvey = useCallback(() => {
+        sessionStore.isSurveySkipped = true;
+    }, []);
+    const openUserSurveyDialog = useCallback((isAfterTargetAction) => {
         userSurveyDialog.open({
             reasonsSource: {
                 $ref: '/wcms-resources/user-survey-reasons.json',
             },
+            isAfterTargetAction,
+            onClose: handleCloseSurvey,
         });
-    };
+    }, []);
+    const handleOpenSurveyAction = useCallback(() => {
+        if (isShowSurvey) {
+            surveyTimer && clearTimeout(surveyTimer);
+            openUserSurveyDialog(true);
+        }
+    }, [surveyTimer, isShowSurvey]);
     useEffect(() => {
         // Опрос показывается только если ранее пользоваютелю не показывался опрос или с того момента прошел месяц
-        if (!userSurveyStore.userSurvey || userSurveyStore.userSurvey?.nextDueAt <= Date.now()) {
+        if (!withoutTimer && isShowSurvey) {
             // начинаем отсчитывать время от первого захода на сайт
             if (!sessionStore.surveyTimerStart) {
                 sessionStore.surveyTimerStart = Date.now().toString();
             }
             // Опрос показывается спустя 5 минут нахождения на сайте
             const timeout = setTimeout(openUserSurveyDialog, DELAY - elapsedTime);
+            sessionStore.surveyTimerId = timeout;
             return () => {
                 clearTimeout(timeout);
+                sessionStore.surveyTimerId = null;
             };
         }
         return noop;
-    }, []);
+    }, [isShowSurvey]);
+    return handleOpenSurveyAction;
 };
-// Отсчитываем месяц с текущей даты
-const getTimeAfter30days = () => Date.now() + 30 * 24 * 60 * 60 * 1000;
 //# sourceMappingURL=useUserSurveyDialog.js.map

package/lib/ui-kit/UserSurveyDialog/useUserSurveyDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAM5B,4CAA4C;AAC5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,EAAwB,CAAC;IAC9D,MAAM,YAAY,GAAG,eAAe,EAAoB,CAAC;IACzD,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB;QAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;IAEN,MAAM,oBAAoB,GAAG,GAAG,EAAE;QAChC,eAAe,CAAC,UAAU,GAAG;YAC3B,aAAa,EAAE,eAAe,CAAC,UAAU,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YAClF,SAAS,EAAE,kBAAkB,EAAE;SAChC,CAAC;QACF,gBAAgB,CAAC,IAAI,CAAC;YACpB,aAAa,EAAE;gBACb,IAAI,EAAE,0CAA0C;aACjD;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,0GAA0G;QAC1G,IAAI,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE;YACtF,uDAAuD;YACvD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;gBAClC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;aACvD;YACD,wDAAwD;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;YAEtE,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAEF,mCAAmC;AACnC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC"}
+{"version":3,"file":"useUserSurveyDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/UserSurveyDialog/useUserSurveyDialog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAQ5B,4CAA4C;AAC5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,YAAsB,EAAE,EAAE;IAC5D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,aAAa,EAAwB,CAAC;IAC9D,MAAM,YAAY,GAAG,eAAe,EAAoB,CAAC;IACzD,MAAM,WAAW,GAAG,YAAY,CAAC,aAAa,CAAC;IAC/C,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACrD,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB;QAC/C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,YAAY,GAChB,CAAC,eAAe;QAChB,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,YAAY,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,oBAAoB,GAAG,WAAW,CAAC,CAAC,mBAA6B,EAAE,EAAE;QACzE,gBAAgB,CAAC,IAAI,CAAC;YACpB,aAAa,EAAE;gBACb,IAAI,EAAE,0CAA0C;aACjD;YACD,mBAAmB;YACnB,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9C,IAAI,YAAY,EAAE;YAChB,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;YACzC,oBAAoB,CAAC,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEhC,SAAS,CAAC,GAAG,EAAE;QACb,0GAA0G;QAC1G,IAAI,CAAC,YAAY,IAAI,YAAY,EAAE;YACjC,uDAAuD;YACvD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;gBAClC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;aACvD;YACD,wDAAwD;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;YACtE,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC;YAErC,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO,sBAAsB,CAAC;AAChC,CAAC,CAAC"}

package/mobile/bundle/api/sendUserSurvey.d.ts

@@ -4,5 +4,6 @@ export declare type UserSurveyRequest = {
     message?: string;
     url: string;
     type: string;
+    ip: string;
 };
 export declare const sendUserSurvey: (body: UserSurveyRequest) => Promise<Response | null>;