Skip to content

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

feat: custom report snippets from inline sql editor (#43090)

Jordi Enric9486e6e1a4e8
diff --git a/apps/studio/components/interfaces/Reports/MetricOptions.tsx b/apps/studio/components/interfaces/Reports/MetricOptions.tsx
index 8ebe236af42..ffd5bd42433 100644
--- a/apps/studio/components/interfaces/Reports/MetricOptions.tsx
+++ b/apps/studio/components/interfaces/Reports/MetricOptions.tsx
@@ -1,17 +1,18 @@
import { useDebounce } from '@uidotdev/usehooks'
-import { Home } from 'lucide-react'
-import { useState } from 'react'
-
import { useParams } from 'common'
+import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { useContentQuery } from 'data/content/content-query'
import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { Metric, METRIC_CATEGORIES, METRICS } from 'lib/constants/metrics'
+import { Home, Plus } from 'lucide-react'
+import { useState } from 'react'
+import { editorPanelState } from 'state/editor-panel-state'
+import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
import type { Dashboards } from 'types'
import {
Command_Shadcn_,
- CommandEmpty_Shadcn_,
CommandGroup_Shadcn_,
CommandInput_Shadcn_,
CommandItem_Shadcn_,
@@ -24,6 +25,7 @@ import {
SQL_ICON,
} from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
+
import { DEPRECATED_REPORTS } from './Reports.constants'
interface MetricOptionsProps {
@@ -40,6 +42,7 @@ interface MetricOptionsProps {
export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsProps) => {
const { ref: projectRef } = useParams()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
+ const { openSidebar } = useSidebarManagerSnapshot()
const [search, setSearch] = useState('')
const { projectAuthAll: authEnabled, projectStorageAll: storageEnabled } = useIsFeatureEnabled([
@@ -56,7 +59,11 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsPro
const { mutate: sendEvent } = useSendEventMutation()
const debouncedSearch = useDebounce(search, 300)
- const { data, isPending: isLoading } = useContentQuery({
+ const {
+ data,
+ isPending: isLoading,
+ refetch,
+ } = useContentQuery({
projectRef,
type: 'sql',
name: debouncedSearch.length === 0 ? undefined : debouncedSearch,
@@ -96,7 +103,11 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsPro
</DropdownMenuSub>
)
})}
- <DropdownMenuSub>
+ <DropdownMenuSub
+ onOpenChange={(open) => {
+ if (open) refetch()
+ }}
+ >
<DropdownMenuSubTrigger className="space-x-2">
<SQL_ICON
size={14}
@@ -120,9 +131,11 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsPro
<ShimmeringLoader />
<ShimmeringLoader className="w-3/4" />
</div>
- ) : (
- <CommandEmpty_Shadcn_>No snippets found</CommandEmpty_Shadcn_>
- )}
+ ) : !snippets?.length ? (
+ <p className="text-xs text-center text-foreground-lighter py-3">
+ No snippets found
+ </p>
+ ) : null}
<CommandGroup_Shadcn_>
{snippets?.map((snippet) => (
<CommandItem_Shadcn_
@@ -154,6 +167,23 @@ export const MetricOptions = ({ config, handleChartSelection }: MetricOptionsPro
))}
</CommandGroup_Shadcn_>
</CommandList_Shadcn_>
+
+ <div className="h-px bg-border-overlay -mx-1" />
+
+ <CommandGroup_Shadcn_>
+ <CommandItem_Shadcn_
+ className="cursor-pointer w-full"
+ onSelect={() => {
+ editorPanelState.openAsNew()
+ openSidebar(SIDEBAR_KEYS.EDITOR_PANEL)
+ }}
+ >
+ <div className="w-full flex items-center gap-2">
+ <Plus size={14} strokeWidth={1.5} />
+ <p>Create snippet</p>
+ </div>
+ </CommandItem_Shadcn_>
+ </CommandGroup_Shadcn_>
</Command_Shadcn_>
</DropdownMenuSubContent>
</DropdownMenuPortal>
diff --git a/apps/studio/components/interfaces/Reports/Reports.tsx b/apps/studio/components/interfaces/Reports/Reports.tsx
index 5a7afb238e9..ca74c461aef 100644
--- a/apps/studio/components/interfaces/Reports/Reports.tsx
+++ b/apps/studio/components/interfaces/Reports/Reports.tsx
@@ -1,12 +1,5 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useQueryClient } from '@tanstack/react-query'
-import dayjs from 'dayjs'
-import { groupBy, isEqual, isNull } from 'lodash'
-import { ArrowRight, Plus, RefreshCw, Save } from 'lucide-react'
-import { useRouter } from 'next/router'
-import { DragEvent, useEffect, useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { DatabaseSelector } from 'components/ui/DatabaseSelector'
@@ -21,6 +14,7 @@ import {
useContentUpsertMutation,
} from 'data/content/content-upsert-mutation'
import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
+import dayjs from 'dayjs'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
@@ -28,10 +22,16 @@ import { BASE_PATH } from 'lib/constants'
import { Metric, TIME_PERIODS_REPORTS } from 'lib/constants/metrics'
import { uuidv4 } from 'lib/helpers'
import { useProfile } from 'lib/profile'
+import { groupBy, isEqual, isNull } from 'lodash'
+import { Plus, RefreshCw, Save } from 'lucide-react'
+import { useRouter } from 'next/router'
+import { DragEvent, useEffect, useState } from 'react'
+import { toast } from 'sonner'
import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'
import type { Dashboards } from 'types'
import { Button, cn, DropdownMenu, DropdownMenuContent, DropdownMenuTrigger, LogoLoader } from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
+
import { createSqlSnippetSkeletonV2 } from '../SQLEditor/SQLEditor.utils'
import { ChartConfig } from '../SQLEditor/UtilityPanel/ChartConfig'
import { GridResize } from './GridResize'
@@ -450,20 +450,6 @@ const Reports = () => {
</div>
}
/>
-
- {startDate && endDate && (
- <div className="hidden items-center space-x-1 lg:flex ">
- <span className="text-sm text-foreground-light">
- {dayjs(startDate).format('MMM D, YYYY')}
- </span>
- <span className="text-foreground-lighter">
- <ArrowRight size={12} />
- </span>
- <span className="text-sm text-foreground-light">
- {dayjs(endDate).format('MMM D, YYYY')}
- </span>
- </div>
- )}
</div>
</div>