The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix: expanded editor shortcut (#47374)
Vaibhav27ca9ee64dc5
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsxindex ee0d2de2c19..23b4f9280ca 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx@@ -1,3 +1,4 @@+import type { OnMount } from '@monaco-editor/react'import { MAX_CHARACTERS } from '@supabase/pg-meta/src/query/table-row-query'import { useParams } from 'common'import { AlignLeft } from 'lucide-react'@@ -60,16 +61,33 @@ export const JsonEditor = ({const { mutate: getCellValue, isPending, isSuccess, reset } = useGetCellValueMutation()- const validateJSON = async (resolve: () => void) => {- try {- const newJsonStr = removeJSONTrailingComma(jsonStr)- const minifiedJSON = minifyJSON(newJsonStr)- if (onSaveJSON) onSaveJSON(minifiedJSON, resolve)- } catch (error: any) {- resolve()- toast.error('JSON seems to have an invalid structure.')- }- }+ const validateJSON = useCallback(+ async (nextValue: string, resolve: () => void) => {+ try {+ const newJsonStr = removeJSONTrailingComma(nextValue)+ const minifiedJSON = minifyJSON(newJsonStr)+ if (onSaveJSON) onSaveJSON(minifiedJSON, resolve)+ } catch (error: any) {+ resolve()+ toast.error('JSON seems to have an invalid structure.')+ }+ },+ [onSaveJSON]+ )++ const handleEditorMount: OnMount = useCallback(+ (editor, monaco) => {+ if (readOnly) return++ editor.addAction({+ id: 'save-value',+ label: 'Save value',+ keybindings: [monaco.KeyMod.CtrlCmd + monaco.KeyCode.Enter],+ run: () => validateJSON(editor.getValue(), () => undefined),+ })+ },+ [readOnly, validateJSON]+ )const prettify = () => {const res = prettifyJSON(jsonStr)@@ -166,7 +184,7 @@ export const JsonEditor = ({closePanel={onClose}backButtonLabel={backButtonLabel}applyButtonLabel={applyButtonLabel}- applyFunction={readOnly ? undefined : validateJSON}+ applyFunction={readOnly ? undefined : (resolve) => validateJSON(jsonStr, resolve)}/>}>@@ -179,6 +197,7 @@ export const JsonEditor = ({language="json"value={(jsonStr ?? '').toString()}onInputChange={(val) => setJsonStr(val ?? '')}+ onMount={handleEditorMount}/></div>) : (diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsxindex 4d6492fb9c4..8a03bca1b88 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx@@ -1,3 +1,4 @@+import type { OnMount } from '@monaco-editor/react'import { MAX_CHARACTERS } from '@supabase/pg-meta/src/query/table-row-query'import { useParams } from 'common'import { useCallback, useEffect, useState } from 'react'@@ -77,9 +78,26 @@ export const TextEditor = ({)}- const saveValue = (resolve: () => void) => {- if (onSaveField) onSaveField(strValue, resolve)- }+ const saveValue = useCallback(+ (nextValue: string, resolve: () => void) => {+ if (onSaveField) onSaveField(nextValue, resolve)+ },+ [onSaveField]+ )++ const handleEditorMount: OnMount = useCallback(+ (editor, monaco) => {+ if (readOnly) return++ editor.addAction({+ id: 'save-value',+ label: 'Save value',+ keybindings: [monaco.KeyMod.CtrlCmd + monaco.KeyCode.Enter],+ run: () => saveValue(editor.getValue(), () => undefined),+ })+ },+ [readOnly, saveValue]+ )useEffect(() => {if (visible) {@@ -121,7 +139,7 @@ export const TextEditor = ({closePanel={onClose}backButtonLabel="Cancel"applyButtonLabel="Save value"- applyFunction={readOnly ? undefined : saveValue}+ applyFunction={readOnly ? undefined : (resolve) => saveValue(strValue, resolve)}/>}>@@ -134,6 +152,7 @@ export const TextEditor = ({language="markdown"value={strValue ?? ''}onInputChange={(val) => setStrValue(val ?? '')}+ onMount={handleEditorMount}/></div>) : (