@messenger-box/tailwind-ui-inbox 10.0.3-alpha.108 → 10.0.3-alpha.110

package/src/compute.ts

@@ -63,27 +63,37 @@ export const messengerPageStore: IRouteModule[] | { [key: string]: any } = [
         name: 'AiMessenger',
         path: '/ai-messenger',
     },
-
     {
         exact: false,
         icon: 'AiOutlineInbox',
-        key: 'ai-messenger-with-message-app',
+        key: 'ai-messenger-with-org-name',
+        component: () => import('./container/InboxWithAiLoader'),
+        tab: 'Ai Messenger',
+        position: IMenuPosition.Middle,
+        name: 'AiMessengerWithOrgName',
+        path: '//o/:orgName/ai-messenger',
+    },
+    {
+        exact: false,
+        icon: 'AiOutlineInbox',
+        key: 'ai-messenger-app-with-channel-id',
         component: () => import('./container/InboxAiMessagesLoader'),
         tab: 'Ai Messenger',
         position: IMenuPosition.Middle,
-        name: 'AiMessengerWithMessageApp',
-        path: '/ai-messenger/app',
+        name: 'AiMessengerAppWithChannelId',
+        path: '/ai-messenger/app/:id',
     },
     {
         exact: false,
         icon: 'AiOutlineInbox',
-        key: 'ai-messenger-with-org-name',
-        component: () => import('./container/InboxWithAiLoader'),
+        key: 'ai-messenger-app-with-org-and-channel-id',
+        component: () => import('./container/InboxAiMessagesLoader'),
         tab: 'Ai Messenger',
         position: IMenuPosition.Middle,
-        name: 'AiMessengerWithOrgName',
-        path: '//o/:orgName/ai-messenger',
+        name: 'AiMessengerAppWithOrgAndChannelId',
+        path: '//o/:orgName/ai-messenger/app/:id',
     },
+
     // {
     //     exact: false,
     //     icon: 'AiOutlineInbox',
@@ -124,8 +134,8 @@ const selectedRoutes = [
     'direct-message',
     'ai-messenger',
     'ai-messenger-with-org-name',
-    'ai-messenger-with-channel-id',
-    'ai-messenger-with-message-app',
+    'ai-messenger-app-with-channel-id',
+    'ai-messenger-app-with-org-and-channel-id',
     'ai-messenger-with-preview',
 ];
 

package/src/container/AiLandingInput.tsx

@@ -74,7 +74,7 @@ const AiLandingInput: React.FC = () => {
                             console.log('Message sent without channel:', message, files);
                             setIsCreatingChannel(true);
                             const id = objectId();
-                            const postId = objectId();
+                            // const postId = objectId();
                             const channelId = objectId();
                             // Do not include extensionId inside modelConfig when sending additionalProperties
                             const { extensionId: _omitExtensionId, ...modelConfigWithoutExtensionId } =
@@ -90,16 +90,16 @@ const AiLandingInput: React.FC = () => {
                                         projectId: id,
                                         type: RoomType.Aiassistant,
                                         postData: {
-                                            postId: postId,
+                                            // postId: postId,
                                             type: PostTypeEnum.Aiassistant,
                                             content: message,
                                             props: {
-                                                generateAiCode: true,
+                                                //  generateAiCode: true,
                                                 template: modelConfig?.template || 'vite-react',
                                                 projectId: id,
                                                 role: AiAgentMessageRole.User,
                                                 fragment: {},
-                                                sendNotificationWithProjectId: true,
+                                                // sendNotificationWithProjectId: true,
                                             },
                                         },
                                         additionalProperties: {
@@ -121,12 +121,16 @@ const AiLandingInput: React.FC = () => {
                                         setIsCreatingChannel(false);
                                         return;
                                     }
-                                    console.log('orgName', orgName);
-                                    const aiMessengerPath = orgName
+
+                                    const basePath = orgName
                                         ? config.AI_MESSENGER_PATH.replace(':orgName', orgName)
                                         : config.AI_MESSENGER_PATH;
-                                    console.log('aiMessengerPath', aiMessengerPath);
-                                    navigate(`${aiMessengerPath}?id=${id}`, { replace: true });
+
+                                    const targetPath = basePath.includes(':id')
+                                        ? basePath.replace(':id', channelId)
+                                        : `${basePath.replace(/\/+$/, '')}/${channelId}`;
+
+                                    navigate(targetPath, { replace: true });
                                     setIsCreatingChannel(false);
                                 },
                                 onError: (error: any) => {

package/src/container/InboxAiMessagesLoader.tsx

@@ -18,7 +18,8 @@ const InboxWithAiLoaderOutlet = (props: InboxWithAiLoaderOutletProps) => {
     const location = useLocation();
     const { messages, setMessages, selectedPost, setSelectedPost, setIsLoading, isLoading } = useOutletContext() as any;
     const urlParams = location?.search ? new URLSearchParams(location.search) : null;
-    const channelId = urlParams?.get('id');
+    const { id: pathChannelId } = useParams();
+    const channelId = urlParams?.get('id') || pathChannelId;
     const user: any = useSelector<Store.Auth, IUserState>(userSelector, shallowEqual);
 
     return (

package/src/templates/InboxWithAi.tsx

@@ -127,7 +127,6 @@ const InboxWithAiInternal = (props: InboxProps) => {
 
                 const response = await recreateSandbox({
                     variables: {
-                        projectId: channelId,
                         messageId,
                     },
                 });