[pull] master from supabase:master

apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewContext.tsx

@@ -5,16 +5,8 @@ import { LOCAL_STORAGE_KEYS } from 'lib/constants'
 import { EMPTY_OBJ } from 'lib/void'
 import { APISidePanelPreview } from './APISidePanelPreview'
 import { CLSPreview } from './CLSPreview'
-import { AssistantV2Preview } from './AssistantV2Preview'
 
 export const FEATURE_PREVIEWS = [
-  {
-    key: LOCAL_STORAGE_KEYS.UI_PREVIEW_ASSISTANT_V2,
-    name: 'Supabase AI Assistant V2',
-    content: <AssistantV2Preview />,
-    discussionsUrl: undefined,
-    isNew: true,
-  },
   {
     key: LOCAL_STORAGE_KEYS.UI_PREVIEW_API_SIDE_PANEL,
     name: 'Project API documentation',
@@ -85,8 +77,3 @@ export const useIsColumnLevelPrivilegesEnabled = () => {
   const { flags } = useFeaturePreviewContext()
   return flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_CLS]
 }
-
-export const useIsAssistantV2Enabled = () => {
-  const { flags } = useFeaturePreviewContext()
-  return flags[LOCAL_STORAGE_KEYS.UI_PREVIEW_ASSISTANT_V2]
-}

apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx

@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react'
 
 import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
 import { useFlag } from 'hooks/ui/useFlag'
-import { LOCAL_STORAGE_KEYS } from 'lib/constants'
 import { TELEMETRY_EVENTS } from 'lib/constants/telemetry'
 import { useAppStateSnapshot } from 'state/app-state'
 import { Badge, Button, Modal, ScrollArea, cn } from 'ui'
@@ -42,13 +41,6 @@ const FeaturePreviewModal = () => {
       label: selectedFeatureKey,
       value: isSelectedFeatureEnabled ? 'disabled' : 'enabled',
     })
-
-    if (
-      selectedFeatureKey === LOCAL_STORAGE_KEYS.UI_PREVIEW_ASSISTANT_V2 &&
-      isSelectedFeatureEnabled
-    ) {
-      snap.setAiAssistantPanel({ open: false })
-    }
   }
 
   function handleCloseFeaturePreviewModal() {

apps/studio/components/interfaces/Auth/Policies/AIPolicyEditorPanel/QueryError.tsx

@@ -72,7 +72,8 @@ const QueryError = ({
                   {open ? 'Hide error details' : 'Show error details'}
                 </Button>
               </CollapsibleTrigger_Shadcn_>
-              {!hasHipaaAddon && (
+              {/* [Joshen] Temp hidden as new assistant doesnt support this. Current assistant's UX is not great too tbh so okay to hide this */}
+              {/* {!hasHipaaAddon && (
                 <Button
                   size="tiny"
                   type="default"
@@ -91,7 +92,7 @@ const QueryError = ({
                 >
                   Fix with Assistant
                 </Button>
-              )}
+              )} */}
             </div>
             <CollapsibleContent_Shadcn_ className="overflow-auto">
               {formattedError.length > 0 ? (

apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx

@@ -1,13 +1,14 @@
 import type { PostgresPolicy } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { noop } from 'lodash'
+import { Edit, MoreVertical, Trash } from 'lucide-react'
 
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import { DropdownMenuItemTooltip } from 'components/ui/DropdownMenuItemTooltip'
 import Panel from 'components/ui/Panel'
 import { useAuthConfigQuery } from 'data/auth/auth-config-query'
 import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
-import { Edit, MoreVertical, Trash } from 'lucide-react'
+import { useAppStateSnapshot } from 'state/app-state'
 import {
   Badge,
   Button,
@@ -21,8 +22,6 @@ import {
   TooltipContent_Shadcn_,
   TooltipTrigger_Shadcn_,
 } from 'ui'
-import { useIsAssistantV2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import { useAppStateSnapshot } from 'state/app-state'
 import { generatePolicyCreateSQL } from './PolicyTableRow.utils'
 
 interface PolicyRowProps {
@@ -39,7 +38,6 @@ const PolicyRow = ({
   onSelectDeletePolicy = noop,
 }: PolicyRowProps) => {
   const { setAiAssistantPanel } = useAppStateSnapshot()
-  const isAssistantV2Enabled = useIsAssistantV2Enabled()
   const canUpdatePolicies = useCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'policies')
 
   const { project } = useProjectContext()
@@ -106,39 +104,33 @@ const PolicyRow = ({
             <DropdownMenuTrigger asChild>
               <Button type="default" className="px-1.5" icon={<MoreVertical />} />
             </DropdownMenuTrigger>
-            <DropdownMenuContent
-              side="bottom"
-              align="end"
-              className={cn(isAssistantV2Enabled ? 'w-52' : 'w-40')}
-            >
+            <DropdownMenuContent side="bottom" align="end" className="w-52">
               <DropdownMenuItem className="gap-x-2" onClick={() => onSelectEditPolicy(policy)}>
                 <Edit size={14} />
                 <p>Edit policy</p>
               </DropdownMenuItem>
-              {isAssistantV2Enabled && (
-                <DropdownMenuItem
-                  className="space-x-2"
-                  onClick={() => {
-                    const sql = generatePolicyCreateSQL(policy)
-                    setAiAssistantPanel({
-                      open: true,
-                      sqlSnippets: [sql],
-                      initialInput: `Update the policy with name "${policy.name}" in the ${policy.schema} schema on the ${policy.table} table. It should...`,
-                      suggestions: {
-                        title: `I can help you make a change to the policy "${policy.name}" in the ${policy.schema} schema on the ${policy.table} table, here are a few example prompts to get you started:`,
-                        prompts: [
-                          'Tell me how I can improve this policy...',
-                          'Duplicate this policy for another table...',
-                          'Add extra conditions to this policy...',
-                        ],
-                      },
-                    })
-                  }}
-                >
-                  <Edit size={14} />
-                  <p>Edit policy with Assistant</p>
-                </DropdownMenuItem>
-              )}
+              <DropdownMenuItem
+                className="space-x-2"
+                onClick={() => {
+                  const sql = generatePolicyCreateSQL(policy)
+                  setAiAssistantPanel({
+                    open: true,
+                    sqlSnippets: [sql],
+                    initialInput: `Update the policy with name "${policy.name}" in the ${policy.schema} schema on the ${policy.table} table. It should...`,
+                    suggestions: {
+                      title: `I can help you make a change to the policy "${policy.name}" in the ${policy.schema} schema on the ${policy.table} table, here are a few example prompts to get you started:`,
+                      prompts: [
+                        'Tell me how I can improve this policy...',
+                        'Duplicate this policy for another table...',
+                        'Add extra conditions to this policy...',
+                      ],
+                    },
+                  })
+                }}
+              >
+                <Edit size={14} />
+                <p>Edit policy with Assistant</p>
+              </DropdownMenuItem>
               <DropdownMenuSeparator />
               <DropdownMenuItemTooltip
                 className="gap-x-2"

apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx

@@ -4,7 +4,6 @@ import { Lock, Unlock } from 'lucide-react'
 import { useQueryState } from 'nuqs'
 
 import { useParams } from 'common'
-import { useIsAssistantV2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
 import { ButtonTooltip } from 'components/ui/ButtonTooltip'
 import { EditorTablePageLink } from 'data/prefetchers/project.$ref.editor.$id'
 import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
@@ -37,7 +36,6 @@ const PolicyTableRowHeader = ({
   const { ref } = useParams()
   const { setAiAssistantPanel } = useAppStateSnapshot()
 
-  const enableAssistantV2 = useIsAssistantV2Enabled()
   const canCreatePolicies = useCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'policies')
   const canToggleRLS = useCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'tables')
 
@@ -117,15 +115,10 @@ const PolicyTableRowHeader = ({
               type="default"
               className="px-1"
               onClick={() => {
-                if (enableAssistantV2) {
-                  setAiAssistantPanel({
-                    open: true,
-                    initialInput: `Create a new policy for the ${table.schema} schema on the ${table.name} table that ...`,
-                  })
-                } else {
-                  onSelectCreatePolicy()
-                  setEditView('conversation')
-                }
+                setAiAssistantPanel({
+                  open: true,
+                  initialInput: `Create a new policy for the ${table.schema} schema on the ${table.name} table that ...`,
+                })
               }}
               tooltip={{
                 content: {

apps/studio/components/interfaces/Database/Functions/FunctionsList/FunctionList.tsx

@@ -11,14 +11,12 @@ import { useCheckPermissions } from 'hooks/misc/useCheckPermissions'
 import { useAppStateSnapshot } from 'state/app-state'
 import {
   Button,
-  cn,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from 'ui'
-import { useIsAssistantV2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
 
 interface FunctionListProps {
   schema: string
@@ -38,7 +36,6 @@ const FunctionList = ({
   const router = useRouter()
   const { project: selectedProject } = useProjectContext()
   const { setAiAssistantPanel } = useAppStateSnapshot()
-  const isAssistantV2Enabled = useIsAssistantV2Enabled()
 
   const { data: functions } = useDatabaseFunctionsQuery({
     projectRef: selectedProject?.ref,
@@ -111,10 +108,7 @@ const FunctionList = ({
                       <DropdownMenuTrigger asChild>
                         <Button type="default" className="px-1" icon={<MoreVertical />} />
                       </DropdownMenuTrigger>
-                      <DropdownMenuContent
-                        side="left"
-                        className={cn(isAssistantV2Enabled ? 'w-52' : 'w-40')}
-                      >
+                      <DropdownMenuContent side="left" className="w-52">
                         {isApiDocumentAvailable && (
                           <DropdownMenuItem
                             className="space-x-2"
@@ -128,30 +122,28 @@ const FunctionList = ({
                           <Edit2 size={14} />
                           <p>Edit function</p>
                         </DropdownMenuItem>
-                        {isAssistantV2Enabled && (
-                          <DropdownMenuItem
-                            className="space-x-2"
-                            onClick={() => {
-                              setAiAssistantPanel({
-                                open: true,
-                                initialInput: 'Update this function to do...',
-                                suggestions: {
-                                  title:
-                                    'I can help you make a change to this function, here are a few example prompts to get you started:',
-                                  prompts: [
-                                    'Rename this function to ...',
-                                    'Modify this function so that it ...',
-                                    'Add a trigger for this function that calls it when ...',
-                                  ],
-                                },
-                                sqlSnippets: [x.complete_statement],
-                              })
-                            }}
-                          >
-                            <Edit size={14} />
-                            <p>Edit function with Assistant</p>
-                          </DropdownMenuItem>
-                        )}
+                        <DropdownMenuItem
+                          className="space-x-2"
+                          onClick={() => {
+                            setAiAssistantPanel({
+                              open: true,
+                              initialInput: 'Update this function to do...',
+                              suggestions: {
+                                title:
+                                  'I can help you make a change to this function, here are a few example prompts to get you started:',
+                                prompts: [
+                                  'Rename this function to ...',
+                                  'Modify this function so that it ...',
+                                  'Add a trigger for this function that calls it when ...',
+                                ],
+                              },
+                              sqlSnippets: [x.complete_statement],
+                            })
+                          }}
+                        >
+                          <Edit size={14} />
+                          <p>Edit function with Assistant</p>
+                        </DropdownMenuItem>
                         <DropdownMenuSeparator />
                         <DropdownMenuItem className="space-x-2" onClick={() => deleteFunction(x)}>
                           <Trash size={14} className="text-destructive" />