From c6dadb24dc791d1de549382587729705f8b60841 Mon Sep 17 00:00:00 2001
From: hagen-danswer <hagen@danswer.ai>
Date: Fri, 22 Nov 2024 11:53:51 -0800
Subject: [PATCH] cleaned up new slack bot creation

---
 .../6d562f86c78b_remove_default_bot.py        | 41 +++++++++++++++++++
 web/src/app/admin/bots/SlackBotUpdateForm.tsx |  7 ++--
 web/src/app/admin/bots/SlackTokensForm.tsx    |  7 +++-
 .../SlackChannelConfigCreationForm.tsx        |  2 +-
 web/src/app/admin/bots/[bot-id]/page.tsx      |  2 +-
 web/src/app/admin/settings/SettingsForm.tsx   |  4 +-
 .../components/EditableStringFieldDisplay.tsx |  8 +++-
 7 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 backend/alembic/versions/6d562f86c78b_remove_default_bot.py

diff --git a/backend/alembic/versions/6d562f86c78b_remove_default_bot.py b/backend/alembic/versions/6d562f86c78b_remove_default_bot.py
new file mode 100644
index 000000000..5f7b643de
--- /dev/null
+++ b/backend/alembic/versions/6d562f86c78b_remove_default_bot.py
@@ -0,0 +1,41 @@
+"""remove default bot
+
+Revision ID: 6d562f86c78b
+Revises: 177de57c21c9
+Create Date: 2024-11-22 11:51:29.331336
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "6d562f86c78b"
+down_revision = "177de57c21c9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.execute(
+        sa.text(
+            """
+            DELETE FROM slack_bot
+            WHERE name = 'Default Bot'
+            AND bot_token = ''
+            AND app_token = ''
+            """
+        )
+    )
+
+
+def downgrade() -> None:
+    op.execute(
+        sa.text(
+            """
+            INSERT INTO slack_bot (name, enabled, bot_token, app_token)
+            SELECT 'Default Bot', true, '', ''
+            WHERE NOT EXISTS (SELECT 1 FROM slack_bot)
+            RETURNING id;
+            """
+        )
+    )
diff --git a/web/src/app/admin/bots/SlackBotUpdateForm.tsx b/web/src/app/admin/bots/SlackBotUpdateForm.tsx
index 35d6cbcd0..3f4384281 100644
--- a/web/src/app/admin/bots/SlackBotUpdateForm.tsx
+++ b/web/src/app/admin/bots/SlackBotUpdateForm.tsx
@@ -75,7 +75,7 @@ export const ExistingSlackBotForm = ({
   return (
     <div>
       {popup}
-      <div className="flex items-center justify-between">
+      <div className="flex items-center justify-between h-14">
         <div className="flex items-center gap-2">
           <div className="my-auto">
             <SourceIcon iconSize={36} sourceType={"slack"} />
@@ -108,6 +108,7 @@ export const ExistingSlackBotForm = ({
               onClick={() => setShowDeleteModal(true)}
               icon={FiTrash}
               tooltip="Click to delete"
+              className="border h-[42px]"
             >
               Delete
             </Button>
@@ -129,8 +130,8 @@ export const ExistingSlackBotForm = ({
           )}
         </div>
       </div>
-      <div className="mt-4">
-        <div className="inline-block border rounded-lg border-gray-200 px-2 py-2">
+      <div className="mt-2">
+        <div className="inline-block border rounded-lg border-gray-200 p-2">
           <Checkbox
             label="Enabled"
             checked={formValues.enabled}
diff --git a/web/src/app/admin/bots/SlackTokensForm.tsx b/web/src/app/admin/bots/SlackTokensForm.tsx
index 8008a06fe..e0685dee9 100644
--- a/web/src/app/admin/bots/SlackTokensForm.tsx
+++ b/web/src/app/admin/bots/SlackTokensForm.tsx
@@ -95,7 +95,12 @@ export const SlackTokensForm = ({
         <div className="flex justify-end w-full mt-4">
           <Button
             type="submit"
-            disabled={isSubmitting}
+            disabled={
+              isSubmitting ||
+              !values.bot_token ||
+              !values.app_token ||
+              !values.name
+            }
             variant="submit"
             size="default"
           >
diff --git a/web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigCreationForm.tsx b/web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigCreationForm.tsx
index 811bad408..ce54b2dd8 100644
--- a/web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigCreationForm.tsx
+++ b/web/src/app/admin/bots/[bot-id]/channels/SlackChannelConfigCreationForm.tsx
@@ -369,7 +369,7 @@ export const SlackChannelConfigCreationForm = ({
                   <Button
                     type="submit"
                     variant="submit"
-                    disabled={isSubmitting}
+                    disabled={isSubmitting || !values.channel_name}
                     className="mx-auto w-64"
                   >
                     {isUpdate ? "Update!" : "Create!"}
diff --git a/web/src/app/admin/bots/[bot-id]/page.tsx b/web/src/app/admin/bots/[bot-id]/page.tsx
index 05fe15390..414e90f29 100644
--- a/web/src/app/admin/bots/[bot-id]/page.tsx
+++ b/web/src/app/admin/bots/[bot-id]/page.tsx
@@ -95,7 +95,7 @@ function SlackBotEditPage({
           text-sm
           w-80
         "
-        href={`/admin/bots/new?slack_bot_id=${unwrappedParams["bot-id"]}`}
+        href={`/admin/bots/${unwrappedParams["bot-id"]}/channels/new`}
       >
         <div className="mx-auto flex">
           <FiPlusSquare className="my-auto mr-2" />
diff --git a/web/src/app/admin/settings/SettingsForm.tsx b/web/src/app/admin/settings/SettingsForm.tsx
index 3afbb347a..f00e4d978 100644
--- a/web/src/app/admin/settings/SettingsForm.tsx
+++ b/web/src/app/admin/settings/SettingsForm.tsx
@@ -23,12 +23,12 @@ export function Checkbox({
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }) {
   return (
-    <label className="flex text-sm">
+    <label className="flex text-sm cursor-pointer">
       <input
         checked={checked}
         onChange={onChange}
         type="checkbox"
-        className="mx-3 px-5 w-3.5 h-3.5 my-auto"
+        className="mr-2 w-3.5 h-3.5 my-auto"
       />
       <div>
         <Label>{label}</Label>
diff --git a/web/src/components/EditableStringFieldDisplay.tsx b/web/src/components/EditableStringFieldDisplay.tsx
index 462e87190..d9a42f5cd 100644
--- a/web/src/components/EditableStringFieldDisplay.tsx
+++ b/web/src/components/EditableStringFieldDisplay.tsx
@@ -81,13 +81,17 @@ export function EditableStringFieldDisplay({
         value={editableValue}
         onChange={handleValueChange}
         onKeyDown={handleKeyDown}
-        className={cn(textClassName, isEditing ? "block" : "hidden")}
+        className={cn(
+          textClassName,
+          "user-text",
+          isEditing ? "block" : "hidden"
+        )}
         style={{ fontSize: `${scale}rem` }}
       />
       {!isEditing && (
         <span
           onClick={() => isEditable && setIsEditing(true)}
-          className={cn(textClassName, "cursor-pointer")}
+          className={cn(textClassName, "cursor-pointer user-text")}
           style={{ fontSize: `${scale}rem` }}
         >
           {value}