Merge pull request #33 from ModusCreateOrg/ADE-30-bedrock

[ADE-30] - Implement Amazon Bedrock Integration

Author: jkestering-modus

docs/assets/images/Upload_error size.png

@@ -10,6 +10,7 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
+    implementation project(':capacitor-filesystem')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-status-bar')

frontend/android/app/capacitor.build.gradle

@@ -5,6 +5,9 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 
+include ':capacitor-filesystem'
+project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
 

frontend/android/capacitor.settings.gradle

@@ -38,6 +38,7 @@
     "@aws-amplify/auth": "^6.0.15",
     "@aws-amplify/core": "^6.0.15",
     "@aws-amplify/ui-react": "^6.1.1",
+    "@aws-sdk/client-bedrock-runtime": "^3.775.0",
     "@capacitor/android": "6.2.0",
     "@capacitor/app": "6.0.2",
     "@capacitor/assets": "3.0.5",

frontend/package-lock.json

@@ -17,6 +17,7 @@ import { chatService } from '../../services/ChatService';
 import { ChatMessageData } from '../Chat/ChatMessage';
 import './AIAssistantModal.scss';
 import aiIcon from '../../../assets/img/ai-icon.svg';
+
 interface AIAssistantModalProps {
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
@@ -39,14 +40,24 @@ const AIAssistantModal: React.FC<AIAssistantModalProps> = ({
     }
   }, [isOpen]);
 
-  const handleClose = () => {
+  const handleClose = async () => {
     setIsOpen(false);
+    
+    // Reset the chat session and clear messages when modal is closed
+    await chatService.resetSession();
+    setMessages([]);
   };
 
   const handleExpand = () => {
     setIsExpanded(!isExpanded);
   };
 
+  // Also handle reset when modal is dismissed directly
+  const handleDismiss = async () => {
+    await chatService.resetSession();
+    setMessages([]);
+  };
+
   const handleSendMessage = async (text: string) => {
     // Always expand the modal on any message
     if (!isExpanded) {
@@ -70,7 +81,10 @@ const AIAssistantModal: React.FC<AIAssistantModalProps> = ({
   return (
     <IonModal 
       isOpen={isOpen}
-      onDidDismiss={() => setIsOpen(false)}
+      onDidDismiss={() => {
+        setIsOpen(false);
+        handleDismiss();
+      }}
       ref={modalRef}
       className={`ai-assistant-modal ${isExpanded ? 'expanded' : ''}`}
       data-testid={testid}

frontend/package.json

@@ -28,7 +28,8 @@ vi.mock('../../../services/ChatService', () => {
         sender: 'assistant',
         timestamp: new Date()
       })),
-      sendMessage: vi.fn(async () => 'Mock response')
+      sendMessage: vi.fn(async () => 'Mock response'),
+      resetSession: vi.fn(async () => Promise.resolve())
     }
   };
 });

frontend/src/common/components/AIAssistant/AIAssistantModal.tsx

@@ -5,6 +5,10 @@
   padding: 1rem;
   height: 100%;
   overflow-y: auto;
+  scroll-behavior: smooth;
+  
+  /* Use relative units for padding and adjust bottom padding */
+  padding-bottom: 1.5rem;
 
   .chat-empty-state {
     display: flex;

frontend/src/common/components/AIAssistant/__tests__/AIAssistantModal.test.tsx

@@ -43,7 +43,7 @@ const ChatContainer: React.FC<ChatContainerProps> = ({
     >
       {messages.length === 0 ? (
         <div className="chat-empty-state" data-testid={`${testid}-empty`}>
-          <p>{t('common.aiAssistant.emptyState', 'How can I help you today?')}</p>
+          <p>{t('aiAssistant.emptyState', 'How can I help you today?')}</p>
         </div>
       ) : (
         messages.map((message) => (

frontend/src/common/components/Chat/ChatContainer.scss

@@ -25,7 +25,7 @@ const ChatInput: React.FC<ChatInputProps> = ({
   const [inputValue, setInputValue] = useState<string>('');
   const inputRef = useRef<HTMLIonInputElement>(null);
 
-  const defaultPlaceholder = t('common.aiAssistant.inputPlaceholder', 'Type your question...');
+  const defaultPlaceholder = t('aiAssistant.inputPlaceholder', 'Type your question...');
   const inputPlaceholder = placeholder || defaultPlaceholder;
 
   const handleSendMessage = () => {