Merge branch 'develop' into feature/SA-178-product-selection

# Conflicts:
#	lib/main.dart

lib/main.dart

@@ -18,7 +18,7 @@ class MyApp extends StatefulWidget {
 
   static List<Widget> _widgetOptions = <Widget>[
     WishlistsScreen(),
-    ChatScreen(wishlistId: '', wishlistName: 'New Chat',),
+    ChatScreen(wishlistId: '', wishlistName: 'New Chat', openedFromBottomBar: true),
     Text(''),
   ];
 
@@ -106,4 +106,37 @@ class _MyAppState extends State<MyApp> {
       ),
     );
   }
-}
+}
+
+
+
+
+
+// Use to seed wishlists for new user
+// final ApiClient client = ApiClient();
+//
+// const String startPersonalWishlistMutations = r'''
+//   mutation startPersonalWishlist($dto: WishlistCreateDtoInput!) {
+//   startPersonalWishlist(dto: $dto) {
+//     createdById, id, name, type
+//   }
+// }
+// ''';
+//
+// MutationOptions mutationOptions = MutationOptions(
+//     document: gql(startPersonalWishlistMutations),
+//     variables: const <String, dynamic>{
+//       'dto': {
+//         'firstMessageText': 'Gaming mechanical keyboard',
+//         'type': 'Product'
+//       },
+//     });
+//
+// var client = ApiClient();
+// // for (var i = 0; i < 5; i++) {
+// //   client
+// //       .mutate(mutationOptions)
+// //       .then((result) => print(jsonEncode(result)));
+// //   sleep(Duration(milliseconds: 100));
+// // }
+//

lib/network/search_service.dart

@@ -33,7 +33,7 @@ class SearchService {
   }
 
   bool checkerForSuggestion() {
-    return type == SearchEventType.product;
+    return type == SearchEventType.suggestion;
   }
 
   String? wishlistId;
@@ -149,4 +149,4 @@ class SearchService {
     }
     return [];
   }
-}
+}

lib/screens/chat.dart

@@ -55,8 +55,9 @@ class MessageBubble extends StatelessWidget {
 class ChatScreen extends StatefulWidget {
   String wishlistId;
   String wishlistName;
+  bool openedFromBottomBar; 
 
-  ChatScreen({Key? key, required this.wishlistId, required this.wishlistName}) : super(key: key);
+  ChatScreen({Key? key, required this.wishlistId, required this.wishlistName, required this.openedFromBottomBar}) : super(key: key);
 
   @override
   State createState() => ChatScreenState();
@@ -64,18 +65,23 @@ class ChatScreen extends StatefulWidget {
 
 class ChatScreenState extends State<ChatScreen> {
   var logger = Logger();
-  final SearchService _searchService = SearchService();
+  SearchService _searchService = SearchService();
   List<Message> messages = [];
-  final TextEditingController _messageController = TextEditingController();
+  TextEditingController _messageController = TextEditingController();
+  List<String> suggestions = [];
+  bool showBackButton = false;
   bool buttonsVisible = true;
   bool isSendButtonEnabled = false;
   bool showButtonsContainer = true;
   bool isWaitingForResponse = false;
-  final ScrollController _scrollController = ScrollController();
+  ScrollController _scrollController = ScrollController();
   late Widget appBarTitle;
 
   void initState() {
     super.initState();
+    if (widget.openedFromBottomBar) {
+      _resetState();
+    }
     appBarTitle = Text('New Chat', style: TextStyle(fontSize: 18.0));
     _searchService.sseStream.listen((event) {
       _handleSSEMessage(Message(text: '${event.data}'));
@@ -84,11 +90,27 @@ class ChatScreenState extends State<ChatScreen> {
     if(!widget.wishlistId.isEmpty)
     {
       _loadPreviousMessages();
+      showBackButton = true;
       showButtonsContainer = false;
       buttonsVisible = false;
     }
   }
 
+  void _resetState() {
+    widget.wishlistId = '';
+    widget.wishlistName = '';
+    _searchService = SearchService();
+    messages = [];
+    _messageController = TextEditingController();
+    showBackButton = false;
+    buttonsVisible = true;
+    isSendButtonEnabled = false;
+    showButtonsContainer = true;
+    isWaitingForResponse = false;
+    _scrollController = ScrollController();
+    appBarTitle = const Text('New Chat', style: TextStyle(fontSize: 18.0));
+  }
+
   Future<void> _loadPreviousMessages() async {
     final pageNumber = 1;
     final pageSize = 200;
@@ -117,19 +139,30 @@ class ChatScreenState extends State<ChatScreen> {
       final lastMessage = messages.isNotEmpty ? messages.last : null;
       message.isProduct = _searchService.checkerForProduct();
       message.isSuggestion = _searchService.checkerForSuggestion();
-      bool checker = false;
+      if(message.isSuggestion){
+        suggestions.add(message.text);
+      }
       logger.d("Product status: ${message.isProduct}");
-      if (lastMessage != null && lastMessage.role != "User" && message.role != "User") {
+      logger.d("Suggestion status: ${message.isSuggestion}");
+      logger.d("Message text: ${message.text}");
+      if (lastMessage != null && lastMessage.role != "User" && message.role != "User" && !message.isSuggestion) {
+        String fullMessageText = lastMessage.text + message.text;
+        fullMessageText = fullMessageText.replaceAll("\\n", "");
+        logger.d("fullMessageText: $fullMessageText");
         final updatedMessage = Message(
-            text: "${lastMessage.text}${message.text}",
+            text: fullMessageText,
             role: "Application",
             isProduct: message.isProduct);
         messages.removeLast();
         messages.add(updatedMessage);
       } else {
-        messages.add(message);
+        String messageText = message.text.replaceAll("\\n", "");
+        if (!message.isSuggestion) {
+          messages.add(Message(text: messageText, role: message.role, isProduct: message.isProduct, isSuggestion: message.isSuggestion));
+        }
       }
     });
+
     setState(() {
       isWaitingForResponse = false;
     });
@@ -201,9 +234,17 @@ class ChatScreenState extends State<ChatScreen> {
     }
 
     _messageController.clear();
+    suggestions.clear();
     _scrollToBottom();
   }
 
+  void _handleSuggestion(String suggestion) {
+    _messageController.text = suggestion;
+    _sendMessage();
+    suggestions.clear();
+  }
+
+
   void _scrollToBottom() {
     _scrollController.animateTo(
       _scrollController.position.maxScrollExtent,
@@ -232,18 +273,60 @@ class ChatScreenState extends State<ChatScreen> {
     );
   }
 
+  Widget _generateSuggestionButtons() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+          child: Text(
+            'Several possible options',
+            style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.grey),
+          ),
+        ),
+        SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Row(
+            children: suggestions.map((suggestion) {
+              return Padding(
+                padding: EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+                child: ElevatedButton(
+                  onPressed: () {
+                    _handleSuggestion(suggestion);
+                  },
+                  style: ElevatedButton.styleFrom(
+                    padding: EdgeInsets.symmetric(horizontal: 30, vertical: 16),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    primary: Colors.white,
+                    onPrimary: Colors.blue,
+                    side: BorderSide(color: Colors.blue, width: 2.0),
+                  ),
+                  child: Text(suggestion, style: TextStyle(color: Colors.black)),
+                ),
+              );
+            }).toList(),
+          ),
+        ),
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: appBarTitle,
         centerTitle: true,
-        leading: IconButton(
-          icon: Icon(Icons.arrow_back),
-          onPressed: () {
-            print('Back button pressed');
-          },
-        ),
+        leading: showBackButton
+            ? IconButton(
+                icon: Icon(Icons.arrow_back),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              )
+            : null,
       ),
       body: Column(
         children: <Widget>[
@@ -365,24 +448,8 @@ class ChatScreenState extends State<ChatScreen> {
               color: Colors.blue,
               size: 25.0,
             ),
-          if (messages.any((message) => message.isSuggestion))
-            Container(
-              padding: EdgeInsets.all(8.0),
-              color: Colors.grey[300],
-              child: Row(
-                children: [
-                  Icon(Icons.lightbulb),
-                  SizedBox(width: 8.0),
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: messages
-                        .where((message) => message.isSuggestion)
-                        .map((message) => Text(message.text))
-                        .toList(),
-                  ),
-                ],
-              ),
-            ),
+          if (suggestions.isNotEmpty)
+            _generateSuggestionButtons(),
           Container(
             margin: const EdgeInsets.all(8.0),
             child: Row(
@@ -402,6 +469,7 @@ class ChatScreenState extends State<ChatScreen> {
                         contentPadding: EdgeInsets.symmetric(vertical: 20.0),
                       ),
                     ),
+
                   ),
                 ),
                 IconButton(
@@ -415,4 +483,4 @@ class ChatScreenState extends State<ChatScreen> {
       ),
     );
   }
-}
+}

lib/screens/wishlists.dart

@@ -218,7 +218,7 @@ class _WishlistItemState extends State<WishlistItem> {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                    builder: (context) => ChatScreen(wishlistId: widget._wishlist.id, wishlistName: widget._wishlist.name),
+                    builder: (context) => ChatScreen(wishlistId: widget._wishlist.id, wishlistName: widget._wishlist.name, openedFromBottomBar: false),
                   ),
                 );
               },