Merge pull request #8 from eea/develop

Develop
eea · Sep 4, 2024 · 6a9d759 · 6a9d759
2 parents 1dadf20 + 401c17b
commit 6a9d759
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [0.1.2](https://github.com/eea/volto-chatbot/compare/0.1.1...0.1.2) - 13 August 2024
+### [0.1.3](https://github.com/eea/volto-chatbot/compare/0.1.2...0.1.3) - 4 September 2024
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`fc2b165`](https://github.com/eea/volto-chatbot/commit/fc2b16561c2f633a92ab85b012c7dbe031a5c213)]
+
+#### :hammer_and_wrench: Others
+
+- Remove console log [Tiberiu Ichim - [`a17a8cd`](https://github.com/eea/volto-chatbot/commit/a17a8cdd06da8e2134b81100c166c0d10a8d4f16)]
+- Cleanup [Tiberiu Ichim - [`48987e9`](https://github.com/eea/volto-chatbot/commit/48987e985fb5e50625ba63e41f352f05518a3812)]
+- Improve chatbot [Tiberiu Ichim - [`89d3cee`](https://github.com/eea/volto-chatbot/commit/89d3cee81cc306cf2e3b4d66cbff0a77c9e7ede6)]
+### [0.1.2](https://github.com/eea/volto-chatbot/compare/0.1.1...0.1.2) - 15 August 2024
 
 #### :house: Internal changes
 
@@ -77,4 +88,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- yarn bootstrap [alin - [`064d130`](https://github.com/eea/volto-chatbot/commit/064d130ad938a046a4f8dfaa3e78d2fe426c53aa)]
 - Initial commit [Tiberiu Ichim - [`c9e59d3`](https://github.com/eea/volto-chatbot/commit/c9e59d3d0d91c2a40c5d215aa26d8ed982fd7856)]
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-chatbot",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "@eeacms/volto-chatbot: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/ChatBlock/ChatBlockView.jsx b/src/ChatBlock/ChatBlockView.jsx
@@ -4,14 +4,13 @@ import ChatWindow from './ChatWindow';
 import superagent from 'superagent';
 
 function ChatBlockView(props) {
-  const { assistantData } = props;
+  const { assistantData, data } = props;
 
   return assistantData ? (
-    <div>
-      <div>
-        <ChatWindow persona={assistantData} />
-      </div>
-    </div>
+    <ChatWindow
+      persona={assistantData}
+      placeholderPrompt={data.placeholderPrompt}
+    />
   ) : (
     <div>Chatbot</div>
   );

diff --git a/src/ChatBlock/ChatWindow.jsx b/src/ChatBlock/ChatWindow.jsx
@@ -12,7 +12,12 @@ import SendIcon from './../icons/send.svg';
 
 import './style.less';
 
-function ChatWindow({ persona, rehypePrism, remarkGfm }) {
+function ChatWindow({
+  persona,
+  rehypePrism,
+  remarkGfm,
+  placeholderPrompt = 'Ask a question',
+}) {
   const libs = { rehypePrism, remarkGfm }; // rehypePrism, remarkGfm
   const { onSubmit, messages, isStreaming, clearChat } = useBackendChat({
     persona,
@@ -91,7 +96,7 @@ function ChatWindow({ persona, rehypePrism, remarkGfm }) {
               ref={textareaRef}
               value={input}
               placeholder={
-                messages.length > 0 ? 'Ask follow-up...' : 'Placeholder text'
+                messages.length > 0 ? 'Ask follow-up...' : placeholderPrompt
               }
               onChange={(e) => setInput(e.target.value)}
               onKeyDown={(e) => {

diff --git a/src/ChatBlock/schema.js b/src/ChatBlock/schema.js
@@ -5,14 +5,18 @@ export function ChatBlockSchema({ assistants }) {
       {
         id: 'default',
         title: 'Defalt',
-        fields: ['assistant'],
+        fields: ['assistant', 'placeholderPrompt'],
       },
     ],
     properties: {
       assistant: {
         title: 'Assistant',
         choices: assistants?.map(({ id, name }) => [id.toString(), name]),
       },
+      placeholderPrompt: {
+        default: 'Ask a question',
+        title: 'Prompt',
+      },
     },
     required: [],
   };

diff --git a/src/ChatBlock/withDanswerData.jsx b/src/ChatBlock/withDanswerData.jsx
@@ -1,4 +1,20 @@
 import React from 'react';
+import {
+  PlaceholderParagraph,
+  PlaceholderLine,
+  Placeholder,
+} from 'semantic-ui-react';
+
+const Loader = () => (
+  <Placeholder>
+    <PlaceholderParagraph>
+      <PlaceholderLine />
+      <PlaceholderLine />
+      <PlaceholderLine />
+      <PlaceholderLine />
+    </PlaceholderParagraph>
+  </Placeholder>
+);
 
 export default function withDanswerData(callback) {
   function wrapper(Component) {
@@ -21,7 +37,7 @@ export default function withDanswerData(callback) {
       return state ? (
         <Component {...props} {...state} />
       ) : (
-        <div>Fetching external data...</div>
+        <Loader active={true} />
       );
     }
     return WrappedComponent;