merge dev

uktrade · Feb 28, 2025 · 6546347 · 6546347
2 parents c7d6d98 + 5b79a0d
commit 6546347
Show file tree

Hide file tree

Showing 12 changed files with 634 additions and 52 deletions.
diff --git a/.env.example b/.env.example
@@ -102,4 +102,5 @@ REDBOX_API_KEY = myapi
 # AUTHBROKER_CLIENT_SECRET=REPLACE_WITH_GITLAB_SECRET
 # AUTHBROKER_URL=https://sso.trade.gov.uk
 
-ENABLE_METADATA_EXTRACTION = True
+ENABLE_METADATA_EXTRACTION = True
+SELF_ROUTE_ENABLED = False
diff --git a/django_app/frontend/src/chat-styles.scss b/django_app/frontend/src/chat-styles.scss
@@ -591,6 +591,14 @@ main:has(.iai-chat-bubble) .chat-options {
   }
 }
 
+.iai-chat-input__input {
+  background-color: white;
+  border: #767676 1px solid;
+  min-height: 1.5em;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
 .exit-feedback {
   background-color: #f3edc9;
   display: none;

diff --git a/django_app/frontend/src/js/web-components/chats/message-input.js b/django_app/frontend/src/js/web-components/chats/message-input.js
@@ -3,7 +3,7 @@
 export class MessageInput extends HTMLElement {
   constructor() {
     super();
-    this.textarea = this.querySelector("textarea");
+    this.textarea = this.querySelector(".iai-chat-input__input");
   }
 
   connectedCallback() {
@@ -15,7 +15,7 @@ export class MessageInput extends HTMLElement {
     this.textarea.addEventListener("keypress", (evt) => {
       if (evt.key === "Enter" && !evt.shiftKey && this.textarea) {
         evt.preventDefault();
-        if (this.textarea.value.trim()) {
+        if (this.textarea?.textContent?.trim()) {
           this.closest("form")?.requestSubmit();
         }
       }
@@ -32,15 +32,15 @@ export class MessageInput extends HTMLElement {
       return;
     }
     this.textarea.style.height = "auto";
-    this.textarea.style.height = `${this.textarea.scrollHeight}px`;
+    this.textarea.style.height = `${this.textarea.scrollHeight || this.textarea.offsetHeight}px`;
   };
 
   /**
    * Returns the current message
    * @returns string
    */
   getValue = () => {
-    return this.querySelector("textarea")?.value.trim() || "";
+    return this.textarea?.textContent?.trim() || "";
   };
 
   /**
@@ -50,7 +50,7 @@ export class MessageInput extends HTMLElement {
     if (!this.textarea) {
       return;
     }
-    this.textarea.value = "";
+    this.textarea.textContent = "";
     this.#adjustHeight();
   };
 }

diff --git a/django_app/redbox_app/templates/chats.html b/django_app/redbox_app/templates/chats.html
@@ -154,7 +154,7 @@ <h2 class="chat-title__heading govuk-visually-hidden" hidden>Current chat</h2>
               Message Redbox
             </label>
             <message-input>
-              <textarea class="iai-chat-input__input js-user-text" id="message" name="message" rows="1" required autofocus></textarea>
+              <div class="iai-chat-input__input js-user-text" id="message" name="message" contenteditable="true" role="textbox" aria-multiline="true"></div>
             </message-input>
           </div>
           <send-message>