rm chatbot feature flag

Author: michaeljguarino

assets/src/components/commandpalette/commands.ts

@@ -1,6 +1,5 @@
 import {
   AiSparkleOutlineIcon,
-  BotIcon,
   CatalogIcon,
   ChatOutlineIcon,
   ClusterIcon,
@@ -190,28 +189,6 @@ export function useCommands({
                   deps: [setFeatureFlag],
                 },
               ]),
-          ...(!featureFlags.WorkbenchChatbots
-            ? [
-                {
-                  id: 'enable-workbench-chatbots',
-                  label: 'Enable Workbench Chatbots',
-                  icon: BotIcon,
-                  callback: () => setFeatureFlag('WorkbenchChatbots', true),
-                  deps: [setFeatureFlag],
-                },
-              ]
-            : []),
-          ...(featureFlags.WorkbenchChatbots
-            ? [
-                {
-                  id: 'disable-workbench-chatbots',
-                  label: 'Disable Workbench Chatbots',
-                  icon: BotIcon,
-                  callback: () => setFeatureFlag('WorkbenchChatbots', false),
-                  deps: [setFeatureFlag],
-                },
-              ]
-            : []),
           ...(openServiceAccountImpersonation
             ? [
                 {
@@ -226,7 +203,7 @@ export function useCommands({
         ],
       },
     ],
-    [featureFlags, openServiceAccountImpersonation, setFeatureFlag]
+    [featureFlags.Edge, openServiceAccountImpersonation, setFeatureFlag]
   )
 
   const commands = useMemo(

assets/src/components/flows/FeatureFlagContext.tsx

@@ -20,17 +20,14 @@ const defaultDocsUrl = 'https://docs.plural.sh/'
 
 export type FeatureFlags = {
   Edge: boolean
-  WorkbenchChatbots: boolean
 }
 
 const DEFAULT_FEATURE_FLAGS: FeatureFlags = {
   Edge: false,
-  WorkbenchChatbots: false,
 }
 
 const FEATURE_FLAG_LABELS: Record<keyof FeatureFlags, string> = {
   Edge: 'Edge',
-  WorkbenchChatbots: 'Workbench Chatbots',
 }
 
 export const FeatureFlagContext = createContext<{
@@ -79,7 +76,6 @@ export const FeatureFlagProvider = ({ children }: { children: ReactNode }) => {
         }}
       >
         {curType === 'Edge' && <EdgeBodyContent />}
-        {curType === 'WorkbenchChatbots' && <WorkbenchChatbotsBodyContent />}
       </FeatureFlagConfirmationModal>
       <Toast
         show={showToast}
@@ -175,12 +171,3 @@ function EdgeBodyContent() {
 function featureFlagLabel(type: keyof FeatureFlags | null) {
   return type ? FEATURE_FLAG_LABELS[type] : ''
 }
-
-function WorkbenchChatbotsBodyContent() {
-  return (
-    <span>
-      <strong>Workbench Chatbots</strong> is an experimental feature that lets
-      chat platforms trigger workbench runs.
-    </span>
-  )
-}

assets/src/components/workbenches/workbench/Workbench.tsx

@@ -23,7 +23,6 @@ import {
   WorkbenchTinyFragment,
 } from 'generated/graphql'
 import { GqlError } from 'components/utils/Alert'
-import { FeatureFlagContext } from 'components/flows/FeatureFlagContext'
 import { Confirm } from 'components/utils/Confirm'
 import { MoreMenu } from 'components/utils/MoreMenu'
 import { useSimpleToast } from 'components/utils/SimpleToastContext'
@@ -32,7 +31,7 @@ import { StretchedFlex } from 'components/utils/StretchedFlex'
 import { SubTabs } from 'components/utils/SubTabs'
 import { TRUNCATE } from 'components/utils/truncate'
 import { Subtitle2H1 } from 'components/utils/typography/Text'
-import { Key, ReactNode, use, useCallback, useMemo, useState } from 'react'
+import { Key, ReactNode, useCallback, useMemo, useState } from 'react'
 import { mapExistingNodes } from 'utils/graphql'
 import {
   Link,
@@ -111,7 +110,6 @@ export function WorkbenchPageLayout({
 }: WorkbenchPageLayoutProps) {
   const theme = useTheme()
   const navigate = useNavigate()
-  const { featureFlags } = use(FeatureFlagContext)
   const { workbenchId, isLoading, workbench, openToolsEdit, openDelete } =
     useOutletContext<WorkbenchOutletContext>()
 
@@ -175,7 +173,6 @@ export function WorkbenchPageLayout({
           navigate(getWorkbenchWebhookTriggersAbsPath(workbenchId))
           return
         case WorkbenchMoreMenuKey.Chatbots:
-          if (!featureFlags.WorkbenchChatbots) return
           navigate(getWorkbenchChatbotsAbsPath(workbenchId))
           return
         case WorkbenchMoreMenuKey.Tools:
@@ -194,14 +191,7 @@ export function WorkbenchPageLayout({
           return
       }
     },
-    [
-      navigate,
-      workbenchBasePath,
-      workbenchId,
-      openToolsEdit,
-      openDelete,
-      featureFlags.WorkbenchChatbots,
-    ]
+    [navigate, workbenchBasePath, workbenchId, openToolsEdit, openDelete]
   )
 
   return (
@@ -278,13 +268,11 @@ export function WorkbenchPageLayout({
                 leftContent={<WebhooksIcon />}
                 label="Webhook triggers"
               />
-              {featureFlags.WorkbenchChatbots && (
-                <ListBoxItem
-                  key={WorkbenchMoreMenuKey.Chatbots}
-                  leftContent={<BotIcon />}
-                  label="Chatbots"
-                />
-              )}
+              <ListBoxItem
+                key={WorkbenchMoreMenuKey.Chatbots}
+                leftContent={<BotIcon />}
+                label="Chatbots"
+              />
               <ListBoxItem
                 key={WorkbenchMoreMenuKey.SavedPrompts}
                 leftContent={<BookmarkIcon />}

assets/src/components/workbenches/workbench/WorkbenchSidePanel.tsx

@@ -6,9 +6,8 @@ import {
   PencilIcon,
 } from '@pluralsh/design-system'
 import { useWorkbenchTriggersSummaryQuery } from 'generated/graphql'
-import { FeatureFlagContext } from 'components/flows/FeatureFlagContext'
 import { isEmpty } from 'lodash'
-import { PropsWithChildren, use, useMemo } from 'react'
+import { PropsWithChildren, useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 import { mapExistingNodes } from 'utils/graphql'
@@ -36,7 +35,6 @@ export function WorkbenchSidePanel({
   onOpenToolsEdit: () => void
 }) {
   const navigate = useNavigate()
-  const { featureFlags } = use(FeatureFlagContext)
 
   const { data } = useWorkbenchTriggersSummaryQuery({
     variables: { id: workbenchId },
@@ -171,70 +169,68 @@ export function WorkbenchSidePanel({
             </ButtonSC>
           )}
         </SectionSC>
-        {featureFlags.WorkbenchChatbots && (
-          <SectionSC>
-            <HeaderSC>
-              <span>Chatbots</span>
-              {hasChatbots && (
-                <IconFrame
-                  clickable
-                  size="small"
-                  icon={<AddIcon size={12} />}
-                  tooltip="Add chatbot"
-                  onClick={() =>
-                    navigate(getWorkbenchChatbotCreateAbsPath(workbenchId))
-                  }
-                />
-              )}
-            </HeaderSC>
-            {hasChatbots ? (
-              <Flex
-                gap="xxsmall"
-                direction="column"
-              >
-                {chatbots.map((chatbot) => (
-                  <WorkbenchSidePanelEditRow
-                    key={chatbot.id}
-                    onClick={() =>
-                      navigate(
-                        getWorkbenchChatbotEditAbsPath({
-                          workbenchId,
-                          chatbotId: chatbot.id,
-                        })
-                      )
-                    }
-                  >
-                    <ItemIconContainerSC>
-                      <IconFrame
-                        icon={chatProviderConnectionIcon(
-                          chatbot.chatConnection?.type
-                        )}
-                        size="xsmall"
-                      />
-                    </ItemIconContainerSC>
-                    <ItemNameSC>
-                      {formatChatbotChannelLabel({
-                        type: chatbot.chatConnection?.type,
-                        channel: chatbot.channel,
-                      })}
-                    </ItemNameSC>
-                  </WorkbenchSidePanelEditRow>
-                ))}
-              </Flex>
-            ) : (
-              <ButtonSC
-                small
-                startIcon={<AddIcon size={12} />}
-                tertiary
+        <SectionSC>
+          <HeaderSC>
+            <span>Chatbots</span>
+            {hasChatbots && (
+              <IconFrame
+                clickable
+                size="small"
+                icon={<AddIcon size={12} />}
+                tooltip="Add chatbot"
                 onClick={() =>
                   navigate(getWorkbenchChatbotCreateAbsPath(workbenchId))
                 }
-              >
-                Add chatbot
-              </ButtonSC>
+              />
             )}
-          </SectionSC>
-        )}
+          </HeaderSC>
+          {hasChatbots ? (
+            <Flex
+              gap="xxsmall"
+              direction="column"
+            >
+              {chatbots.map((chatbot) => (
+                <WorkbenchSidePanelEditRow
+                  key={chatbot.id}
+                  onClick={() =>
+                    navigate(
+                      getWorkbenchChatbotEditAbsPath({
+                        workbenchId,
+                        chatbotId: chatbot.id,
+                      })
+                    )
+                  }
+                >
+                  <ItemIconContainerSC>
+                    <IconFrame
+                      icon={chatProviderConnectionIcon(
+                        chatbot.chatConnection?.type
+                      )}
+                      size="xsmall"
+                    />
+                  </ItemIconContainerSC>
+                  <ItemNameSC>
+                    {formatChatbotChannelLabel({
+                      type: chatbot.chatConnection?.type,
+                      channel: chatbot.channel,
+                    })}
+                  </ItemNameSC>
+                </WorkbenchSidePanelEditRow>
+              ))}
+            </Flex>
+          ) : (
+            <ButtonSC
+              small
+              startIcon={<AddIcon size={12} />}
+              tertiary
+              onClick={() =>
+                navigate(getWorkbenchChatbotCreateAbsPath(workbenchId))
+              }
+            >
+              Add chatbot
+            </ButtonSC>
+          )}
+        </SectionSC>
         <SectionSC>
           <HeaderSC>
             <span>Cron schedules</span>

lib/console/chat/impl/slack.ex

@@ -10,10 +10,14 @@ defmodule Console.Chat.Impl.Slack do
 
   @limit 1000
 
-  def handle_event(event, %{"ts" => ts, "text" => text, "channel" => channel}, %Slack.Bot{user_id: id} = bot) do
+  def handle_event(
+    event,
+    %{"ts" => ts, "text" => text, "channel" => channel} = message,
+    %Slack.Bot{user_id: id} = bot
+  ) do
     Logger.info("incoming slack #{event}: #{text}")
     case String.contains?(text, "<@#{id}>") do
-      true -> spawn_job(ts, text, channel, bot)
+      true -> spawn_job(message, ts, text, channel, bot)
       false -> :ok
     end
   end
@@ -53,16 +57,20 @@ defmodule Console.Chat.Impl.Slack do
     ]
   end
 
-  defp spawn_job(ts, text, channel, %Slack.Bot{assigns: %{conn: %ChatConnection{} = conn}, token: token}) do
+  defp spawn_job(message, ts, text, channel, %Slack.Bot{assigns: %{conn: %ChatConnection{} = conn}, token: token}) do
     with {:ok, name} <- fetch_channel(channel, token),
-         {:ok, _} <- Utils.handle_mention(%Reference{id: ts, text: text}, %Reference{id: channel, text: name}, conn) do
+         {:ok, _} <- Utils.handle_mention(
+                      %Reference{id: ts, text: text, parent_id: parent_id(message)},
+                      %Reference{id: channel, text: name},
+                      conn
+                    ) do
       :ok
     else
       :ok -> :ok
       err -> Logger.error("failed to spawn job: #{inspect(err)}")
     end
   end
-  defp spawn_job(_, _, _, _), do: :ok
+  defp spawn_job(_, _, _, _, _), do: :ok
 
   @decorate cacheable(cache: @cache_adapter, key: {:slack_channel, id}, opts: [ttl: @ttl])
   defp fetch_channel(id, token) do
@@ -83,4 +91,8 @@ defmodule Console.Chat.Impl.Slack do
     end
   end
   defp filter(channels, _), do: channels
+
+  defp parent_id(%{"thread_ts" => thread_ts, "ts" => ts})
+    when is_binary(thread_ts) and thread_ts != ts, do: thread_ts
+  defp parent_id(_), do: nil
 end

lib/console/chat/types.ex

@@ -1,5 +1,5 @@
 defmodule Console.Chat.Reference do
-  defstruct [:id, :text]
+  defstruct [:id, :text, :parent_id]
 end
 
 defmodule Console.Chat.Channel do