Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Chore/minor logs explorer nudges (#47391)

Joshen Lime938016141a3
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.SavedQueriesItem.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.SavedQueriesItem.tsx
index 1429d103166..ac160baa964 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.SavedQueriesItem.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.SavedQueriesItem.tsx
@@ -2,10 +2,11 @@ import { useParams } from 'common'
import { SqlEditor } from 'icons'
import { Edit, Trash } from 'lucide-react'
import { useRouter } from 'next/router'
+import { parseAsString, useQueryStates } from 'nuqs'
import { useState } from 'react'
import { toast } from 'sonner'
import { DropdownMenuItem, DropdownMenuSeparator } from 'ui'
-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
import { UpdateSavedQueryModal } from './Logs.UpdateSavedQueryModal'
import { LogsSidebarItem } from './SidebarV2/SidebarItem'
@@ -24,15 +25,26 @@ interface SavedQueriesItemProps {
}
}
-const SavedQueriesItem = ({ item }: SavedQueriesItemProps) => {
+export const SavedQueriesItem = ({ item }: SavedQueriesItemProps) => {
const router = useRouter()
- const { ref } = useParams()
+ const { ref, queryId } = useParams()
const [showConfirmModal, setShowConfirmModal] = useState<boolean>(false)
const [showUpdateModal, setShowUpdateModal] = useState<boolean>(false)
+ const [_, setParams] = useQueryStates({
+ queryId: parseAsString.withDefault(''),
+ q: parseAsString.withDefault(''),
+ s: parseAsString.withDefault(''),
+ its: parseAsString.withDefault(''),
+ ite: parseAsString.withDefault(''),
+ })
+
const { mutate: deleteContent } = useContentDeleteMutation({
- onSuccess: () => {
+ onSuccess: (_, vars) => {
setShowConfirmModal(false)
+ if (queryId && vars.ids.includes(queryId)) {
+ setParams({ queryId: '', q: '', s: '', its: '', ite: '' })
+ }
toast.success('Successfully deleted query')
},
onError: (error) => {
@@ -94,15 +106,13 @@ const SavedQueriesItem = ({ item }: SavedQueriesItemProps) => {
</DropdownMenuItem>
</>
}
- ></LogsSidebarItem>
+ />
<ConfirmationModal
variant="destructive"
visible={showConfirmModal}
confirmLabel="Delete query"
title="Confirm to delete saved query"
- onCancel={() => {
- setShowConfirmModal(false)
- }}
+ onCancel={() => setShowConfirmModal(false)}
onConfirm={onConfirmDelete}
>
<p className="text-sm text-foreground-light">
@@ -121,5 +131,3 @@ const SavedQueriesItem = ({ item }: SavedQueriesItemProps) => {
</>
)
}
-
-export default SavedQueriesItem
diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
index 09ea7768a83..bb2596db57f 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
@@ -15,9 +15,10 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
import { FeaturePreviewSidebarPanel } from '../../ui/FeaturePreviewSidebarPanel'
import { useIsETLPrivateAlpha } from '@/components/interfaces/Database/Replication/useIsETLPrivateAlpha'
import { LOG_DRAIN_TYPES } from '@/components/interfaces/LogDrains/LogDrains.constants'
-import SavedQueriesItem from '@/components/interfaces/Settings/Logs/Logs.SavedQueriesItem'
+import { SavedQueriesItem } from '@/components/interfaces/Settings/Logs/Logs.SavedQueriesItem'
import { LogsSidebarItem } from '@/components/interfaces/Settings/Logs/SidebarV2/SidebarItem'
import { UnifiedLogsBanner } from '@/components/interfaces/UnifiedLogs/UnifiedLogsBanner'
+import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { useContentQuery } from '@/data/content/content-query'
import { useReplicationSourcesQuery } from '@/data/replication/sources-query'
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
@@ -227,12 +228,15 @@ export function LogsSidebarMenuV2() {
/>
</InnerSideBarFilters>
- <Button
+ <ButtonTooltip
+ asChild
variant="default"
icon={<Plus className="text-foreground" />}
className="w-[26px]"
- onClick={() => router.push(`/project/${ref}/logs/explorer`)}
- />
+ tooltip={{ content: { text: 'New query', side: 'bottom' } }}
+ >
+ <Link href={`/project/${ref}/logs/explorer`} />
+ </ButtonTooltip>
</div>
{templatesEnabled && (
<div className="px-2">
diff --git a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
index 3675f041fe9..ddaca7aa3ae 100644
--- a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
+++ b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
@@ -283,13 +283,15 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
async function handleOnSave() {
if (!projectRef) return console.error('Project ref is required')
+ const currentSql = editorRef.current?.getValue() ?? editorValue
+
// if we have a queryId, we are editing a saved query
if (queryId && query) {
await upsertContent({
projectRef: projectRef!,
payload: {
...query,
- content: { ...(query.content as LogSqlSnippets.Content), sql: editorValue },
+ content: { ...(query.content as LogSqlSnippets.Content), sql: currentSql },
},
})
diff --git a/apps/studio/pages/project/[ref]/logs/explorer/saved.tsx b/apps/studio/pages/project/[ref]/logs/explorer/saved.tsx
index fc48a8a2eb2..976ce2c93f1 100644
--- a/apps/studio/pages/project/[ref]/logs/explorer/saved.tsx
+++ b/apps/studio/pages/project/[ref]/logs/explorer/saved.tsx
@@ -3,8 +3,8 @@ import { Save } from 'lucide-react'
import Link from 'next/link'
import { Loading } from 'ui'
-import LogsSavedQueriesItem from '@/components/interfaces/Settings/Logs/Logs.SavedQueriesItem'
-import DefaultLayout from '@/components/layouts/DefaultLayout'
+import { SavedQueriesItem } from '@/components/interfaces/Settings/Logs/Logs.SavedQueriesItem'
+import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import LogsLayout from '@/components/layouts/LogsLayout/LogsLayout'
import Table from '@/components/to-be-cleaned/Table'
import LogsExplorerHeader from '@/components/ui/Logs/LogsExplorerHeader'
@@ -44,7 +44,7 @@ export const LogsSavedPage: NextPageWithLayout = () => {
</>
}
body={saved.map((item) => (
- <LogsSavedQueriesItem key={item.id} item={item} />
+ <SavedQueriesItem key={item.id} item={item} />
))}
/>
</div>