@droppii-org/chat-sdk 0.1.83 → 0.1.84

package/dist/hooks/conversation/useBotFlow.d.ts

@@ -14,7 +14,7 @@ export declare const useBotFlow: ({ conversationId, isBotThread, }: UseBotFlowPa
     currentButtonsBlock: BotInputButtonsBlock | null;
     menuItems: import("../../types/conversation").BotButtonOption[];
     isInCsSession: boolean;
-    pendingMenuOption: import("../../types/conversation").BotButtonOption | null;
+    isCsConfirmOpen: boolean;
     start: () => Promise<void>;
     selectButton: (actionId: string) => Promise<void>;
     restart: () => Promise<void>;

package/dist/hooks/conversation/useBotFlow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useBotFlow.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useBotFlow.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAgB9B,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,CAAC;AAEtD,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACtB;AAsBD,eAAO,MAAM,UAAU,GAAI,kCAGxB,gBAAgB;;;;;;;;;;;;6BAmIqB,MAAM;;6BAkDN,eAAe;;;CA+CtD,CAAC"}
+{"version":3,"file":"useBotFlow.d.ts","sourceRoot":"","sources":["../../../src/hooks/conversation/useBotFlow.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAgB9B,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,aAAa,CAAC;AAMtD,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACtB;AAsBD,eAAO,MAAM,UAAU,GAAI,kCAGxB,gBAAgB;;;;;;;;;;;;6BAkIqB,MAAM;;6BA0DN,eAAe;;;CAmDtD,CAAC"}

package/dist/hooks/conversation/useBotFlow.js

@@ -54,7 +54,7 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
     const { sendMergeMessage } = useSendMessage({
         scrollEvent: "CONVERSATION_CHAT_SCROLL_TO_BOTTOM_IF_AT_BOTTOM",
     });
-    const [pendingMenuOption, setPendingMenuOption] = useState(null);
+    const [pendingCsAction, setPendingCsAction] = useState(null);
     const menuQuery = useBotMainMenu(conversationId, isBotThread && botType === BOT_TYPE.FLOW);
     const menuItems = filterVisibleBotButtons((_c = menuQuery.data) !== null && _c !== void 0 ? _c : []);
     useEffect(() => {
@@ -89,7 +89,7 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
             emitter.off("PUSH_NEW_MSG", handleNewMessage);
         };
     }, [authUserID]);
-    const activeStep = storedConversationId === conversationId ? flowCurrentStep : null;
+    const activeStep = isActiveConversation ? flowCurrentStep : null;
     const currentButtonsBlock = (_d = activeStep === null || activeStep === void 0 ? void 0 : activeStep.data.children.find((child) => child.type === BotBlockType.InputButtons)) !== null && _d !== void 0 ? _d : null;
     const isInActiveCsSession = isInCsSession({ flowCurrentStep: activeStep });
     const isProcessing = runMutation.isPending ||
@@ -142,7 +142,7 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
         }
         await runStep(activeStep, actionId);
     };
-    const restart = async () => {
+    const performRestart = async () => {
         var _a;
         const flow = {
             groupId: (_a = activeStep === null || activeStep === void 0 ? void 0 : activeStep.id) !== null && _a !== void 0 ? _a : "",
@@ -158,6 +158,13 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
         const resetDetail = await resetMutation.mutateAsync(conversationId);
         await runStep(resetDetail.flowCurrentStep);
     };
+    const restart = async () => {
+        if (isInActiveCsSession) {
+            setPendingCsAction({ type: "restart" });
+            return;
+        }
+        await performRestart();
+    };
     const runMenuOption = async (item) => {
         if (!activeStep)
             return;
@@ -175,27 +182,32 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
             return;
         }
         if (isInActiveCsSession) {
-            setPendingMenuOption(item);
+            setPendingCsAction({ type: "menu", item });
             return;
         }
         await runMenuOption(item);
     };
     const confirmEndCsSession = async () => {
-        if (!pendingMenuOption)
+        if (!pendingCsAction)
             return;
-        const option = pendingMenuOption;
+        const action = pendingCsAction;
         try {
             await closeSessionMutation.mutateAsync(conversationId);
-            setPendingMenuOption(null);
-            await runMenuOption(option);
+            setPendingCsAction(null);
+            if (action.type === "restart") {
+                await performRestart();
+            }
+            else {
+                await runMenuOption(action.item);
+            }
         }
         catch (_a) {
             toastMessage.error(t("thread_detail.bot.cs_confirm.close_failed"));
-            setPendingMenuOption(null);
+            setPendingCsAction(null);
         }
     };
     const cancelMenuOption = () => {
-        setPendingMenuOption(null);
+        setPendingCsAction(null);
     };
     return {
         status,
@@ -207,7 +219,7 @@ export const useBotFlow = ({ conversationId, isBotThread, }) => {
         currentButtonsBlock,
         menuItems,
         isInCsSession: isInActiveCsSession,
-        pendingMenuOption,
+        isCsConfirmOpen: !!pendingCsAction,
         start,
         selectButton,
         restart,

package/dist/screens/conversation-detail/index.js

@@ -77,6 +77,6 @@ const DChatConversationDetail = (_a) => {
         !botFlow.flowIsEnd &&
         botFlow.shouldShowButtons &&
         botFlow.currentButtonsBlock ? (_jsx(BotButtonMessage, { buttons: botFlow.currentButtonsBlock.data.buttons, disabled: botFlow.isProcessing, onSelect: botFlow.selectButton, onRestart: botFlow.restart })) : null;
-    return (_jsxs("div", { "data-testid": "conversation-detail-root", className: clsx("relative flex h-full w-full flex-col overflow-hidden bg-white", className), children: [_jsx(ConversationDetailHeader, { conversation: conversation, onBack: handleBack, onProfileClick: openProfile }), _jsx(PinnedMessageBar, {}), _jsx("div", { className: "flex min-h-0 flex-1 flex-col", children: children !== null && children !== void 0 ? children : _jsx(ConversationMessageList, { bottomSlot: botButtonsSlot }) }), footer, isBotThread && (_jsxs(_Fragment, { children: [_jsx(BotMenuSheet, { open: isMenuOpen, items: botFlow.menuItems, disabled: botFlow.isProcessing, onClose: closeMenu, onSelect: botFlow.selectMenuOption }), _jsx(CsSessionConfirmModal, { open: !!botFlow.pendingMenuOption, loading: botFlow.isProcessing, onCancel: botFlow.cancelMenuOption, onConfirm: botFlow.confirmEndCsSession })] })), _jsx(ThreadProfilePanel, { open: isProfileOpen, conversation: conversation, onClose: closeProfile, onSelectResource: setResourceTab }), _jsx(MediaResourcePanel, { open: resourceTab !== null, initialTab: resourceTab !== null && resourceTab !== void 0 ? resourceTab : MediaResourceTabKey.Image, onClose: () => setResourceTab(null) })] }));
+    return (_jsxs("div", { "data-testid": "conversation-detail-root", className: clsx("relative flex h-full w-full flex-col overflow-hidden bg-white", className), children: [_jsx(ConversationDetailHeader, { conversation: conversation, onBack: handleBack, onProfileClick: openProfile }), _jsx(PinnedMessageBar, {}), _jsx("div", { className: "flex min-h-0 flex-1 flex-col", children: children !== null && children !== void 0 ? children : _jsx(ConversationMessageList, { bottomSlot: botButtonsSlot }) }), footer, isBotThread && (_jsxs(_Fragment, { children: [_jsx(BotMenuSheet, { open: isMenuOpen, items: botFlow.menuItems, disabled: botFlow.isProcessing, onClose: closeMenu, onSelect: botFlow.selectMenuOption }), _jsx(CsSessionConfirmModal, { open: botFlow.isCsConfirmOpen, loading: botFlow.isProcessing, onCancel: botFlow.cancelMenuOption, onConfirm: botFlow.confirmEndCsSession })] })), _jsx(ThreadProfilePanel, { open: isProfileOpen, conversation: conversation, onClose: closeProfile, onSelectResource: setResourceTab }), _jsx(MediaResourcePanel, { open: resourceTab !== null, initialTab: resourceTab !== null && resourceTab !== void 0 ? resourceTab : MediaResourceTabKey.Image, onClose: () => setResourceTab(null) })] }));
 };
 export default DChatConversationDetail;