[pull] master from supabase:master

apps/studio/components/grid/components/grid/RowRenderer.tsx

@@ -2,8 +2,8 @@ import type { Key } from 'react'
 import { TriggerEvent, useContextMenu } from 'react-contexify'
 import { RenderRowProps, Row } from 'react-data-grid'
 
+import { ROW_CONTEXT_MENU_ID } from 'components/grid/constants'
 import { SupaRow } from 'components/grid/types'
-import { ROW_CONTEXT_MENU_ID } from '../menu'
 
 export default function RowRenderer(key: Key, props: RenderRowProps<SupaRow>) {
   const { show: showContextMenu } = useContextMenu()

apps/studio/components/grid/components/menu/RowContextMenu.tsx

@@ -3,11 +3,11 @@ import { useCallback } from 'react'
 import { Item, ItemParams, Menu } from 'react-contexify'
 import { toast } from 'sonner'
 
+import { ROW_CONTEXT_MENU_ID } from 'components/grid/constants'
 import type { SupaRow } from 'components/grid/types'
 import { useTableEditorStateSnapshot } from 'state/table-editor'
 import { useTableEditorTableStateSnapshot } from 'state/table-editor-table'
 import { copyToClipboard, DialogSectionSeparator } from 'ui'
-import { ROW_CONTEXT_MENU_ID } from '.'
 import { formatClipboardValue } from '../../utils/common'
 
 export type RowContextMenuProps = {

apps/studio/components/grid/components/menu/index.ts

@@ -1,4 +1,2 @@
 export { default as ColumnMenu } from './ColumnMenu'
 export { default as RowContextMenu } from './RowContextMenu'
-
-export const ROW_CONTEXT_MENU_ID = 'row-context-menu-id'

apps/studio/components/grid/constants.ts

@@ -12,3 +12,5 @@ const RLS_ACKNOWLEDGED_KEY = 'supabase-acknowledge-rls-warning'
 
 export const rlsAcknowledgedKey = (tableID?: string | number) =>
   `${RLS_ACKNOWLEDGED_KEY}-${String(tableID)}`
+
+export const ROW_CONTEXT_MENU_ID = 'row-context-menu-id'

apps/studio/components/interfaces/Database/Replication/DestinationRow.tsx

@@ -22,8 +22,8 @@ import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 import { DeleteDestination } from './DeleteDestination'
 import { DestinationPanel } from './DestinationPanel'
 import { getStatusName, PIPELINE_ERROR_MESSAGES } from './Pipeline.utils'
-import { PipelineStatus, PipelineStatusName } from './PipelineStatus'
-import { STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
+import { PipelineStatus } from './PipelineStatus'
+import { PipelineStatusName, STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
 import { RowMenu } from './RowMenu'
 import { UpdateVersionModal } from './UpdateVersionModal'
 

apps/studio/components/interfaces/Database/Replication/Pipeline.utils.ts

@@ -1,6 +1,6 @@
 import { ReplicationPipelineStatusData } from 'data/replication/pipeline-status-query'
 import { PipelineStatusRequestStatus } from 'state/replication-pipeline-request-status'
-import { PipelineStatusName } from './PipelineStatus'
+import { PipelineStatusName } from './Replication.constants'
 
 export const PIPELINE_ERROR_MESSAGES = {
   RETRIEVE_PIPELINE: 'Failed to retrieve pipeline information',

apps/studio/components/interfaces/Database/Replication/PipelineStatus.tsx

@@ -8,14 +8,7 @@ import { ResponseError } from 'types'
 import { cn, Tooltip, TooltipContent, TooltipTrigger, WarningIcon } from 'ui'
 import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'
 import { getPipelineStateMessages } from './Pipeline.utils'
-
-export enum PipelineStatusName {
-  FAILED = 'failed',
-  STARTING = 'starting',
-  STARTED = 'started',
-  STOPPED = 'stopped',
-  UNKNOWN = 'unknown',
-}
+import { PipelineStatusName } from './Replication.constants'
 
 interface PipelineStatusProps {
   pipelineStatus: ReplicationPipelineStatusData['status'] | undefined

apps/studio/components/interfaces/Database/Replication/Replication.constants.ts

@@ -1 +1,9 @@
 export const STATUS_REFRESH_FREQUENCY_MS: number = 5000
+
+export enum PipelineStatusName {
+  FAILED = 'failed',
+  STARTING = 'starting',
+  STARTED = 'started',
+  STOPPED = 'stopped',
+  UNKNOWN = 'unknown',
+}

apps/studio/components/interfaces/Database/Replication/ReplicationPipelineStatus/ReplicationPipelineStatus.tsx

@@ -39,8 +39,8 @@ import {
   PIPELINE_ERROR_MESSAGES,
   getStatusName,
 } from '../Pipeline.utils'
-import { PipelineStatus, PipelineStatusName } from '../PipelineStatus'
-import { STATUS_REFRESH_FREQUENCY_MS } from '../Replication.constants'
+import { PipelineStatus } from '../PipelineStatus'
+import { PipelineStatusName, STATUS_REFRESH_FREQUENCY_MS } from '../Replication.constants'
 import { UpdateVersionModal } from '../UpdateVersionModal'
 import { SlotLagMetrics, TableState } from './ReplicationPipelineStatus.types'
 import { getDisabledStateConfig, getStatusConfig } from './ReplicationPipelineStatus.utils'

apps/studio/components/interfaces/Database/Replication/RowMenu.tsx

@@ -1,4 +1,4 @@
-import { Edit, MoreVertical, Pause, Play, RotateCcw, Trash, ArrowUpCircle } from 'lucide-react'
+import { ArrowUpCircle, Edit, MoreVertical, Pause, Play, RotateCcw, Trash } from 'lucide-react'
 import { toast } from 'sonner'
 
 import { useParams } from 'common'
@@ -28,7 +28,7 @@ import {
   PIPELINE_ERROR_MESSAGES,
   getStatusName,
 } from './Pipeline.utils'
-import { PipelineStatusName } from './PipelineStatus'
+import { PipelineStatusName } from './Replication.constants'
 
 interface RowMenuProps {
   pipeline: Pipeline | undefined

apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx

@@ -12,8 +12,7 @@ import {
 } from 'state/replication-pipeline-request-status'
 import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
 import { getStatusName } from './Pipeline.utils'
-import { PipelineStatusName } from './PipelineStatus'
-import { STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
+import { PipelineStatusName, STATUS_REFRESH_FREQUENCY_MS } from './Replication.constants'
 
 interface UpdateVersionModalProps {
   visible: boolean
@@ -26,8 +25,6 @@ interface UpdateVersionModalProps {
 export const UpdateVersionModal = ({
   visible,
   pipeline,
-  // currentVersionName,
-  // newVersionName,
   confirmLabel = 'Update and restart',
   confirmLabelLoading = 'Updating',
   onClose,