From 3521b9004ffac0e10b484391053bd9cb3419400a Mon Sep 17 00:00:00 2001
From: Jordi Enric <37541088+jordienr@users.noreply.github.com>
Date: Fri, 14 Feb 2025 12:11:05 +0100
Subject: [PATCH] clean up old logs feature flags (#33487)
* clean up loki ff
* rm loki ff
* rm logsDetailV2 ff
* rm cloneToNewProject ff
---
.../Database/Backups/DatabaseBackupsNav.tsx | 4 +--
.../LogDrainDestinationSheetForm.tsx | 27 +++++++---------
.../interfaces/LogDrains/LogDrains.tsx | 26 +++++++--------
.../interfaces/Settings/Logs/LogSelection.tsx | 32 +------------------
4 files changed, 25 insertions(+), 64 deletions(-)
diff --git a/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx b/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
index 90deb1ac302..f13ffca7e40 100644
--- a/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
@@ -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: (
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
index eb49a069446..20af799952f 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx
@@ -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
) => 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}
- {LOG_DRAIN_TYPES.map((type) =>
- type.value === 'loki' && !lokiLogDrainsEnabled ? null : (
-
- {type.name}
-
- )
- )}
+ {LOG_DRAIN_TYPES.map((type) => (
+
+ {type.name}
+
+ ))}
diff --git a/apps/studio/components/interfaces/LogDrains/LogDrains.tsx b/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
index acd9d90ec13..f7009bbeaee 100644
--- a/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
+++ b/apps/studio/components/interfaces/LogDrains/LogDrains.tsx
@@ -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(null)
@@ -93,19 +91,17 @@ export function LogDrains({
if (!isLoading && logDrains?.length === 0) {
return (
- {LOG_DRAIN_TYPES.map((src) =>
- src.value === 'loki' && !lokiLogDrainsEnabled ? null : (
- {
- onNewDrainClick(src.value)
- }}
- />
- )
- )}
+ {LOG_DRAIN_TYPES.map((src) => (
+ {
+ onNewDrainClick(src.value)
+ }}
+ />
+ ))}
)
}
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
index 473123465e8..f6e1cb542ff 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
@@ -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
if (!log) return
- if (useNewLogDetail || IS_PLATFORM === false)
- return
-
- switch (queryType) {
- case 'warehouse':
- return
- case 'api':
- return
- case 'database':
- return
- case 'pg_cron':
- return
- case 'fn_edge':
- return
- case 'functions':
- return
- case 'auth':
- return
- default:
- return
- }
+ return
}
return (