From 869e637b91bb2698d2337ffeccb9487b81e449a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20St=C5=99=C3=ADbn=C3=BD?= <petr@stribny.name>
Date: Fri, 30 Jan 2026 13:15:05 +0100
Subject: [PATCH 1/2] Fix AI field keyboard shortcuts (#4531)

---
 .../bug/fix_aifield_keyboard_shortcuts.json   |  9 +++
 .../views/grid/fields/GridViewFieldAI.vue     | 67 +++++++++++++++----
 web-frontend/modules/core/mixins/dropdown.js  |  6 +-
 .../grid/fields/GridViewFieldSingleSelect.vue |  9 +++
 .../modules/database/mixins/gridField.js      |  4 ++
 .../modules/database/mixins/gridFieldInput.js |  9 ++-
 6 files changed, 85 insertions(+), 19 deletions(-)
 create mode 100644 changelog/entries/unreleased/bug/fix_aifield_keyboard_shortcuts.json

diff --git a/changelog/entries/unreleased/bug/fix_aifield_keyboard_shortcuts.json b/changelog/entries/unreleased/bug/fix_aifield_keyboard_shortcuts.json
new file mode 100644
index 0000000000..ffe818f401
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_aifield_keyboard_shortcuts.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Fix AI field keyboard shortcuts",
+    "issue_origin": "github",
+    "issue_number": 4499,
+    "domain": "database",
+    "bullet_points": [],
+    "created_at": "2026-01-09"
+}
diff --git a/premium/web-frontend/modules/baserow_premium/components/views/grid/fields/GridViewFieldAI.vue b/premium/web-frontend/modules/baserow_premium/components/views/grid/fields/GridViewFieldAI.vue
index ca811d2b24..a68b8866c6 100644
--- a/premium/web-frontend/modules/baserow_premium/components/views/grid/fields/GridViewFieldAI.vue
+++ b/premium/web-frontend/modules/baserow_premium/components/views/grid/fields/GridViewFieldAI.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      v-if="(!value || (!opened && generating)) && !readOnly"
+      v-if="(!value || generating) && !readOnly"
       ref="cell"
       class="grid-view__cell active"
     >
@@ -31,22 +31,26 @@
       :row="row"
       :all-fields-in-table="allFieldsInTable"
       v-bind="$attrs"
+      @editing-changed="(e) => (editing = e)"
+      @update="(...args) => $emit('update', ...args)"
+      @select-below="(...args) => $emit('selectBelow', ...args)"
+      @add-row-after="(...args) => $emit('add-row-after', ...args)"
     >
-      <template v-if="!readOnly && editing" #default="{ editing }">
+      <template v-if="!readOnly && editing" #default>
         <div style="background-color: #fff; padding: 8px">
           <ButtonText
             v-if="!isDeactivated"
             icon="iconoir-magic-wand"
             :disabled="!modelAvailable || generating"
             :loading="generating"
-            @click.prevent.stop="generate()"
+            @mousedown.prevent.stop="generate()"
           >
             {{ $t('gridViewFieldAI.regenerate') }}
           </ButtonText>
           <ButtonText
             v-else
             icon="iconoir-lock"
-            @click.prevent.stop="$refs.clickModal.show()"
+            @mousedown.prevent.stop="$refs.clickModal.show()"
           >
             {{ $t('gridViewFieldAI.regenerate') }}
           </ButtonText>
@@ -67,12 +71,17 @@
 <script>
 import { isElement } from '@baserow/modules/core/utils/dom'
 import gridField from '@baserow/modules/database/mixins/gridField'
-import gridFieldInput from '@baserow/modules/database/mixins/gridFieldInput'
 import gridFieldAI from '@baserow_premium/mixins/gridFieldAI'
 
 export default {
   name: 'GridViewFieldAI',
-  mixins: [gridField, gridFieldInput, gridFieldAI],
+  mixins: [gridField, gridFieldAI],
+  data() {
+    return {
+      editing: false,
+      keydownEventListener: null,
+    }
+  },
   computed: {
     fieldName() {
       return this.$registry.get('field', this.field.type).getName()
@@ -98,13 +107,38 @@ export default {
     },
   },
   methods: {
-    save() {
-      this.opened = false
-      this.editing = false
-      this.afterSave()
+    select() {
+      this.keydownEventListener = (event) => {
+        if (event.key === 'Enter') {
+          // When the field is selected but doesn't have any generated value yet,
+          // we want to trigger AI generation
+          if (!this.value && !this.readOnly) {
+            this.generate()
+          }
+        }
+      }
+      document.body.addEventListener('keydown', this.keydownEventListener)
+    },
+    beforeUnSelect() {
+      document.body.removeEventListener('keydown', this.keydownEventListener)
+    },
+    canKeyDown() {
+      if (this.$refs.cell && typeof this.$refs.cell.canKeyDown === 'function') {
+        return this.$refs.cell.canKeyDown()
+      }
+      return true
     },
-    canSaveByPressingEnter(event) {
-      return this.$refs.cell.canSaveByPressingEnter(event)
+    canKeyboardShortcut() {
+      // Since this component is based on gridField mixin
+      // we need to make sure that keyboard shortcuts are
+      // restricted only to non-editing mode
+      if (
+        this.$refs.cell &&
+        typeof this.$refs.cell.canKeyboardShortcut === 'function'
+      ) {
+        return this.$refs.cell.canKeyboardShortcut()
+      }
+      return true
     },
     canUnselectByClickingOutside(event) {
       if (this.isDeactivated && this.workspace) {
@@ -112,6 +146,15 @@ export default {
       }
       return true
     },
+    canSelectNext(event) {
+      if (
+        this.$refs.cell &&
+        typeof this.$refs.cell.canSelectNext === 'function'
+      ) {
+        return this.$refs.cell.canSelectNext(event)
+      }
+      return true
+    },
   },
 }
 </script>
diff --git a/web-frontend/modules/core/mixins/dropdown.js b/web-frontend/modules/core/mixins/dropdown.js
index ffb70a3c3e..ca7955ddb3 100644
--- a/web-frontend/modules/core/mixins/dropdown.js
+++ b/web-frontend/modules/core/mixins/dropdown.js
@@ -396,11 +396,7 @@ export default {
           this.handleUpAndDownArrowPress(event)
         }
         // Allow the Enter key to select the value that is currently being focused
-        if (
-          this.open &&
-          event.key === 'Enter' &&
-          this.focusedDropdownItem !== null
-        ) {
+        if (this.open && event.key === 'Enter') {
           // Prevent submitting the whole form when pressing the enter key while the
           // dropdown is open.
           event.preventDefault()
diff --git a/web-frontend/modules/database/components/view/grid/fields/GridViewFieldSingleSelect.vue b/web-frontend/modules/database/components/view/grid/fields/GridViewFieldSingleSelect.vue
index cffc744cd5..9f52db39cc 100644
--- a/web-frontend/modules/database/components/view/grid/fields/GridViewFieldSingleSelect.vue
+++ b/web-frontend/modules/database/components/view/grid/fields/GridViewFieldSingleSelect.vue
@@ -43,10 +43,19 @@ import FieldSelectOptionsDropdown from '@baserow/modules/database/components/fie
 export default {
   components: { FieldSelectOptionsDropdown },
   mixins: [gridField, singleSelectField],
+  emits: ['editing-changed'],
   data() {
     return {
       editing: false,
     }
   },
+  watch: {
+    editing: {
+      handler(newValue) {
+        this.$emit('editing-changed', newValue)
+      },
+      immediate: true,
+    },
+  },
 }
 </script>
diff --git a/web-frontend/modules/database/mixins/gridField.js b/web-frontend/modules/database/mixins/gridField.js
index 9edc461bc7..38062150ae 100644
--- a/web-frontend/modules/database/mixins/gridField.js
+++ b/web-frontend/modules/database/mixins/gridField.js
@@ -21,6 +21,10 @@ export default {
     'unselect',
     'unselected',
     'update',
+    'selectPrevious',
+    'selectAbove',
+    'selectNext',
+    'selectBelow',
   ],
   props: {
     /**
diff --git a/web-frontend/modules/database/mixins/gridFieldInput.js b/web-frontend/modules/database/mixins/gridFieldInput.js
index 3c94b5d4e1..6f83e5f675 100644
--- a/web-frontend/modules/database/mixins/gridFieldInput.js
+++ b/web-frontend/modules/database/mixins/gridFieldInput.js
@@ -5,8 +5,7 @@ import { isPrintableUnicodeCharacterKeyPress } from '@baserow/modules/core/utils
  * example for the text and number fields. It depends on the gridField mixin.
  */
 export default {
-  emits: ['edit', 'selectBelow', 'update'],
-
+  emits: ['edit', 'selectBelow', 'update', 'editing-changed'],
   data() {
     return {
       /**
@@ -31,6 +30,12 @@ export default {
         this.$emit('edit', this.prepareValue(newCopy), this.value)
       }
     },
+    editing: {
+      handler(newValue) {
+        this.$emit('editing-changed', newValue)
+      },
+      immediate: true,
+    },
   },
   mounted() {
     this.leftMouseDownListener = (event) => {

From 4194f1e254b1c0b40de900971d5994fbaa22d28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20St=C5=99=C3=ADbn=C3=BD?= <petr@stribny.name>
Date: Fri, 30 Jan 2026 13:16:02 +0100
Subject: [PATCH 2/2] Close connection in postgres_ready() (#4605)

---
 backend/docker/docker-entrypoint.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/docker/docker-entrypoint.sh b/backend/docker/docker-entrypoint.sh
index 1760e2f84c..e100349963 100755
--- a/backend/docker/docker-entrypoint.sh
+++ b/backend/docker/docker-entrypoint.sh
@@ -69,7 +69,7 @@ DATABASE_PASSWORD=os.getenv('DATABASE_PASSWORD')
 DATABASE_OPTIONS=os.getenv('DATABASE_OPTIONS')
 try:
     options = json.loads(DATABASE_OPTIONS or "{}")
-    psycopg.connect(
+    conn = psycopg.connect(
         dbname=DATABASE_NAME,
         user=DATABASE_USER,
         password=DATABASE_PASSWORD,
@@ -77,19 +77,21 @@ try:
         port=DATABASE_PORT,
         **options
     )
+    conn.close()
 except Exception as e:
     print(f"Error: Failed to connect to the postgresql database at {DATABASE_HOST}")
     print("Please see the error below for more details:")
     print(e)
     print("Trying again without any DATABASE_OPTIONS:")
     try:
-      psycopg.connect(
+      conn = psycopg.connect(
           dbname=DATABASE_NAME,
           user=DATABASE_USER,
           password=DATABASE_PASSWORD,
           host=DATABASE_HOST,
           port=DATABASE_PORT,
       )
+      conn.close()
     except Exception as e:
       print(f"Error: Failed to connect to the postgresql database at {DATABASE_HOST} without the {DATABASE_OPTIONS}")
       print("Please see the error below for more details:")
@@ -109,9 +111,10 @@ except ImportError:
 import os
 DATABASE_URL=os.getenv('DATABASE_URL')
 try:
-    psycopg.connect(
+    conn = psycopg.connect(
         DATABASE_URL
     )
+    conn.close()
 except psycopg.OperationalError as e:
     print(f"Error: Failed to connect to the postgresql database at {DATABASE_URL}")
     print("Please see the error below for more details:")