From 21ffcd826903367606fe51f486fe6781c4551b78 Mon Sep 17 00:00:00 2001
From: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>
Date: Thu, 1 Aug 2024 13:13:59 +0530
Subject: [PATCH] fix: Configuration tab "Reset configuration to Defaults"
 confuses the user whether it is button or dropdown. (#1196)

---
 code/backend/pages/04_Configuration.py | 18 +++++++++++++++---
 code/backend/pages/common.css          | 19 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/code/backend/pages/04_Configuration.py b/code/backend/pages/04_Configuration.py
index 75a817559..74af882c9 100644
--- a/code/backend/pages/04_Configuration.py
+++ b/code/backend/pages/04_Configuration.py
@@ -8,6 +8,7 @@
 from batch.utilities.helpers.config.config_helper import ConfigHelper
 from azure.core.exceptions import ResourceNotFoundError
 from batch.utilities.helpers.config.assistant_strategy import AssistantStrategy
+
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 env_helper: EnvHelper = EnvHelper()
 
@@ -95,10 +96,14 @@ def validate_answering_user_prompt():
 def config_legal_assistant_prompt():
     if st.session_state["ai_assistant_type"] == AssistantStrategy.LEGAL_ASSISTANT.value:
         st.success("Legal Assistant Prompt")
-        st.session_state["answering_user_prompt"] = ConfigHelper.get_default_legal_assistant()
+        st.session_state["answering_user_prompt"] = (
+            ConfigHelper.get_default_legal_assistant()
+        )
     else:
         st.success("Default Assistant Prompt")
-        st.session_state["answering_user_prompt"] = ConfigHelper.get_default_assistant_prompt()
+        st.session_state["answering_user_prompt"] = (
+            ConfigHelper.get_default_assistant_prompt()
+        )
 
 
 def validate_post_answering_prompt():
@@ -374,7 +379,7 @@ def validate_documents():
                     "enable_post_answering_prompt"
                 ],
                 "enable_content_safety": st.session_state["enable_content_safety"],
-                "ai_assistant_type": st.session_state["ai_assistant_type"]
+                "ai_assistant_type": st.session_state["ai_assistant_type"],
             },
             "messages": {
                 "post_answering_filter": st.session_state[
@@ -404,9 +409,16 @@ def validate_documents():
         )
 
     with st.popover(":red[Reset configuration to defaults]"):
+
+        # Close button with a custom class
+        if st.button("X", key="close_popup", help="Close popup"):
+            st.session_state["popup_open"] = False
+            st.rerun()
+
         st.write(
             "**Resetting the configuration cannot be reversed, proceed with caution!**"
         )
+
         st.text_input('Enter "reset" to proceed', key="reset_configuration")
         if st.button(
             ":red[Reset]", disabled=st.session_state["reset_configuration"] != "reset"
diff --git a/code/backend/pages/common.css b/code/backend/pages/common.css
index 790e6055d..0f5d6bece 100644
--- a/code/backend/pages/common.css
+++ b/code/backend/pages/common.css
@@ -1,7 +1,24 @@
 #MainMenu {visibility: hidden;}
 footer {visibility: hidden;}
 header {visibility: hidden;}
-.st-emotion-cache-1kyxreq{width:100%}
+[data-testid="baseButton-secondary"] svg{display: none;}
+[data-testid="stPopoverBody"] button{float: right;}
+[data-testid="stSidebar"] {z-index: 999;}
+[data-testid="stPopoverBody"] .stTooltipIcon [data-testid="baseButton-secondary"] p{
+    font-weight: bold;
+}
+[data-testid="stPopoverBody"] .stTooltipIcon {
+    position: absolute;
+    right: 0;
+    margin-top: 0.3rem;
+}
+[data-testid="stPopoverBody"] [data-testid="stVerticalBlock"]{
+    width: 520px;
+}
+[data-testid="stPopoverBody"] .stTooltipIcon [data-testid="baseButton-secondary"]{
+    border: none;
+    z-index: 1;
+}
 
 .stTextArea{width: 100% !important;}
 @media screen and (-ms-high-contrast: active), (forced-colors: active) {