mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
clean up old logs feature flags (#33487)
* clean up loki ff * rm loki ff * rm logsDetailV2 ff * rm cloneToNewProject ff
This commit is contained in:
1 parent
fc1b439665
commit
3521b9004f
4 files changed
+25
-64
No files matched your search
@@ -1,5 +1,4 @@
|
||||
import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
|
||||
import { useFlag } from 'hooks/ui/useFlag'
|
||||
import Link from 'next/link'
|
||||
import React from 'react'
|
||||
|
||||
@@ -10,7 +9,6 @@ type Props = {
|
||||
}
|
||||
|
||||
function DatabaseBackupsNav({ active }: Props) {
|
||||
const isCloneToNewProjectEnabled = useFlag('clonetonewproject')
|
||||
const { ref, cloud_provider } = useProjectContext()?.project || {}
|
||||
|
||||
const navMenuItems = [
|
||||
@@ -27,7 +25,7 @@ function DatabaseBackupsNav({ active }: Props) {
|
||||
href: `/project/${ref}/database/backups/pitr`,
|
||||
},
|
||||
{
|
||||
enabled: isCloneToNewProjectEnabled && cloud_provider !== 'FLY',
|
||||
enabled: cloud_provider !== 'FLY',
|
||||
id: 'rtnp',
|
||||
label: (
|
||||
<div className="flex items-center gap-1">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { zodResolver } from '@hookform/resolvers/zod'
|
||||
import { ExternalLink, TrashIcon } from 'lucide-react'
|
||||
import { TrashIcon } from 'lucide-react'
|
||||
import { ReactNode, useEffect, useState } from 'react'
|
||||
import { useForm } from 'react-hook-form'
|
||||
import { toast } from 'sonner'
|
||||
@@ -7,7 +7,7 @@ import { z } from 'zod'
|
||||
|
||||
import { useParams } from 'common'
|
||||
import { LogDrainData, useLogDrainsQuery } from 'data/log-drains/log-drains-query'
|
||||
import { useFlag } from 'hooks/ui/useFlag'
|
||||
|
||||
import {
|
||||
Button,
|
||||
Form_Shadcn_,
|
||||
@@ -136,7 +136,6 @@ export function LogDrainDestinationSheetForm({
|
||||
onSubmit: (values: z.infer<typeof formSchema>) => void
|
||||
mode: 'create' | 'update'
|
||||
}) {
|
||||
const lokiLogDrainsEnabled = useFlag('lokilogdrains')
|
||||
const CREATE_DEFAULT_HEADERS = {
|
||||
'Content-Type': 'application/json',
|
||||
}
|
||||
@@ -281,18 +280,16 @@ export function LogDrainDestinationSheetForm({
|
||||
{LOG_DRAIN_TYPES.find((t) => t.value === type)?.name}
|
||||
</SelectTrigger_Shadcn_>
|
||||
<SelectContent_Shadcn_>
|
||||
{LOG_DRAIN_TYPES.map((type) =>
|
||||
type.value === 'loki' && !lokiLogDrainsEnabled ? null : (
|
||||
<SelectItem_Shadcn_
|
||||
value={type.value}
|
||||
key={type.value}
|
||||
id={type.value}
|
||||
className="text-left"
|
||||
>
|
||||
{type.name}
|
||||
</SelectItem_Shadcn_>
|
||||
)
|
||||
)}
|
||||
{LOG_DRAIN_TYPES.map((type) => (
|
||||
<SelectItem_Shadcn_
|
||||
value={type.value}
|
||||
key={type.value}
|
||||
id={type.value}
|
||||
className="text-left"
|
||||
>
|
||||
{type.name}
|
||||
</SelectItem_Shadcn_>
|
||||
))}
|
||||
</SelectContent_Shadcn_>
|
||||
</Select_Shadcn_>
|
||||
</FormItemLayout>
|
||||
|
||||
@@ -27,7 +27,6 @@ import {
|
||||
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
|
||||
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
|
||||
import { LOG_DRAIN_TYPES, LogDrainType } from './LogDrains.constants'
|
||||
import { useFlag } from 'hooks/ui/useFlag'
|
||||
|
||||
export function LogDrains({
|
||||
onNewDrainClick,
|
||||
@@ -40,7 +39,6 @@ export function LogDrains({
|
||||
|
||||
const { isLoading: orgPlanLoading, plan } = useCurrentOrgPlan()
|
||||
const logDrainsEnabled = !orgPlanLoading && (plan?.id === 'team' || plan?.id === 'enterprise')
|
||||
const lokiLogDrainsEnabled = useFlag('lokilogdrains')
|
||||
|
||||
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
|
||||
const [selectedLogDrain, setSelectedLogDrain] = useState<LogDrainData | null>(null)
|
||||
@@ -93,19 +91,17 @@ export function LogDrains({
|
||||
if (!isLoading && logDrains?.length === 0) {
|
||||
return (
|
||||
<div className="grid lg:grid-cols-2 gap-3">
|
||||
{LOG_DRAIN_TYPES.map((src) =>
|
||||
src.value === 'loki' && !lokiLogDrainsEnabled ? null : (
|
||||
<CardButton
|
||||
key={src.value}
|
||||
title={src.name}
|
||||
description={src.description}
|
||||
icon={src.icon}
|
||||
onClick={() => {
|
||||
onNewDrainClick(src.value)
|
||||
}}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
{LOG_DRAIN_TYPES.map((src) => (
|
||||
<CardButton
|
||||
key={src.value}
|
||||
title={src.name}
|
||||
description={src.description}
|
||||
icon={src.icon}
|
||||
onClick={() => {
|
||||
onNewDrainClick(src.value)
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -8,17 +8,9 @@ import {
|
||||
Tabs_Shadcn_,
|
||||
cn,
|
||||
} from 'ui'
|
||||
import AuthSelectionRenderer from './LogSelectionRenderers/AuthSelectionRenderer'
|
||||
import DatabaseApiSelectionRender from './LogSelectionRenderers/DatabaseApiSelectionRender'
|
||||
import DatabasePostgresSelectionRender from './LogSelectionRenderers/DatabasePostgresSelectionRender'
|
||||
import DefaultPreviewSelectionRenderer from './LogSelectionRenderers/DefaultPreviewSelectionRenderer'
|
||||
import FunctionInvocationSelectionRender from './LogSelectionRenderers/FunctionInvocationSelectionRender'
|
||||
import FunctionLogsSelectionRender from './LogSelectionRenderers/FunctionLogsSelectionRender'
|
||||
import type { LogData, QueryType } from './Logs.types'
|
||||
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
|
||||
import { WarehouseSelectionRenderer } from './LogSelectionRenderers/WarehouseSelectionRenderer'
|
||||
import { useFlag } from 'hooks/ui/useFlag'
|
||||
import { IS_PLATFORM } from 'lib/constants'
|
||||
|
||||
export interface LogSelectionProps {
|
||||
log?: LogData
|
||||
@@ -31,32 +23,10 @@ export interface LogSelectionProps {
|
||||
}
|
||||
|
||||
const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectionProps) => {
|
||||
const useNewLogDetail = useFlag('logsDetailV2')
|
||||
|
||||
const LogDetails = () => {
|
||||
if (error) return <LogErrorState error={error} />
|
||||
if (!log) return <LogDetailEmptyState />
|
||||
if (useNewLogDetail || IS_PLATFORM === false)
|
||||
return <DefaultPreviewSelectionRenderer log={log} />
|
||||
|
||||
switch (queryType) {
|
||||
case 'warehouse':
|
||||
return <WarehouseSelectionRenderer log={log} />
|
||||
case 'api':
|
||||
return <DatabaseApiSelectionRender log={log} />
|
||||
case 'database':
|
||||
return <DatabasePostgresSelectionRender log={log} />
|
||||
case 'pg_cron':
|
||||
return <DatabasePostgresSelectionRender log={log} />
|
||||
case 'fn_edge':
|
||||
return <FunctionInvocationSelectionRender log={log} />
|
||||
case 'functions':
|
||||
return <FunctionLogsSelectionRender log={log} />
|
||||
case 'auth':
|
||||
return <AuthSelectionRenderer log={log} />
|
||||
default:
|
||||
return <DefaultPreviewSelectionRenderer log={log} />
|
||||
}
|
||||
return <DefaultPreviewSelectionRenderer log={log} />
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
Reference in new issue
Block a user