From 4617055c30f72c320c1a0760405673cccae9b152 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:43:53 +0530
Subject: [PATCH 01/88] Update source file en.json

---
 packages/nc-gui/lang/en.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 10b7623e36..338311b1ec 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Details",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From f1a563f9b3eddbc505bbf521749efaa970f6fc74 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:43:56 +0530
Subject: [PATCH 02/88] New translations en.json (Korean)

---
 packages/nc-gui/lang/ko.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 899978ef3b..ed3c41916d 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -1067,6 +1067,7 @@
     "viewHide": "뷰 보임 여부 "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "뷰 할당",
     "webhookDetails": "웹훅 상세",
     "showSaturdaysAndSundays": "토요일 & 일요일 보기",

From edd0a5b0769f0938b93eee9ea976873cc0cf799a Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:43:58 +0530
Subject: [PATCH 03/88] New translations en.json (Swedish)

---
 packages/nc-gui/lang/sv.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index 3ba5bbfb17..9bb7cf128a 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Detaljer",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From ea1cc48ca7b0de667c24e2f14ade28db1315cfa4 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:43:59 +0530
Subject: [PATCH 04/88] New translations en.json (Japanese)

---
 packages/nc-gui/lang/ja.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index d098be334b..46971fcd86 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Details",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 0c042cc9e82fadffae798462190c056b5d67eb49 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:01 +0530
Subject: [PATCH 05/88] New translations en.json (Romanian)

---
 packages/nc-gui/lang/ro.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ro.json b/packages/nc-gui/lang/ro.json
index 429cdc48c3..ab4a271fe8 100644
--- a/packages/nc-gui/lang/ro.json
+++ b/packages/nc-gui/lang/ro.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detalii Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From b8d135493c4eed8a293f9ddab8c02991f19ce16b Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:02 +0530
Subject: [PATCH 06/88] New translations en.json (French)

---
 packages/nc-gui/lang/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 5b3568755a..0f48361180 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -655,7 +655,7 @@
     "snapshotCreationFailed": "La création de l'instantané a échoué",
     "snapshotCreationFailedDescription": "Impossible de créer votre instantané de base. Réessayez plus tard.",
     "snapshotCooldownDescription": "Les instantanés ne peuvent être pris qu'à trois heures d'intervalle.",
-    "snapshotCooldownWarning": "Snapshot cooldown remaining",
+    "snapshotCooldownWarning": "Délai de récupération restant pour l'instantané",
     "snapshotLimitDescription": "Vous ne pouvez gérer que 2 instantanés de base à la fois. Passez à un plan supérieur pour obtenir des instantanés supplémentaires.",
     "snapshotLimitReached": "Limite de nombre d'instantanés atteinte",
     "confirmRestore": "Confirmer la restauration",
@@ -1067,6 +1067,7 @@
     "viewHide": "Afficher la visibilité "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Affecter la vue",
     "webhookDetails": "Détails du Webhook",
     "showSaturdaysAndSundays": "Afficher les samedis et dimanches",

From 2729bfce3ddd1fa15e2146937b7a29ce8235ab10 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:03 +0530
Subject: [PATCH 07/88] New translations en.json (Spanish)

---
 packages/nc-gui/lang/es.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 85c16f002c..12e1a28c5b 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detalles de Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 05e349aa03341eb87c91284ba0a8e68567a97f21 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:05 +0530
Subject: [PATCH 08/88] New translations en.json (Arabic)

---
 packages/nc-gui/lang/ar.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 514421c9c8..e22783534b 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "تفاصيل Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 6600678a1667c72d0e01d5e52b23d016f2f42505 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:06 +0530
Subject: [PATCH 09/88] New translations en.json (Czech)

---
 packages/nc-gui/lang/cs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index aec58bd90c..9c498222a9 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Podrobnosti o webhooku",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 040b5998853d000c7d040f6ac18d32918822d8ed Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:07 +0530
Subject: [PATCH 10/88] New translations en.json (Danish)

---
 packages/nc-gui/lang/da.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index 38995b3b40..6189d4206d 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Detaljer",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 4308a42bba27d381fcb3d5a92adf5205bce52426 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:09 +0530
Subject: [PATCH 11/88] New translations en.json (German)

---
 packages/nc-gui/lang/de.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 53dd5602b1..c967bc84f2 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -1067,6 +1067,7 @@
     "viewHide": "Sichtbarkeit anzeigen"
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Ansicht zuweisen",
     "webhookDetails": "Webhook-Details",
     "showSaturdaysAndSundays": "Samstage und Sonntage anzeigen",

From 03d30e0a4d655228393946cd47f2a85b180dfed8 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:10 +0530
Subject: [PATCH 12/88] New translations en.json (Basque)

---
 packages/nc-gui/lang/eu.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index 4136181bec..71ebb27bc3 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook xehetasunak",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 7f079a1aa98d14c78b3bf67edc831f665a50166e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:12 +0530
Subject: [PATCH 13/88] New translations en.json (Finnish)

---
 packages/nc-gui/lang/fi.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index a2ca9c22db..1f524946f6 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhotokin tiedot",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 5d878fc31a4e5a81073b868da9181b4e20ec1428 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:13 +0530
Subject: [PATCH 14/88] New translations en.json (Hebrew)

---
 packages/nc-gui/lang/he.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index 3f6857f100..330ab5923f 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "הקצאת תצוגה",
     "webhookDetails": "פרטי Webhook",
     "showSaturdaysAndSundays": "הצג שבתות וימי ראשון",

From 7da8e38821ba9ea705c57b13a0428d23963e1a8a Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:14 +0530
Subject: [PATCH 15/88] New translations en.json (Hungarian)

---
 packages/nc-gui/lang/hu.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/hu.json b/packages/nc-gui/lang/hu.json
index a0f3ceceae..ee7379ec44 100644
--- a/packages/nc-gui/lang/hu.json
+++ b/packages/nc-gui/lang/hu.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Részletek",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From e1ad8a426dedbc88ee9a11f9e179fbaa5801ad08 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:16 +0530
Subject: [PATCH 16/88] New translations en.json (Italian)

---
 packages/nc-gui/lang/it.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index b2e33ddbf9..de8a7a436f 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Dettagli webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 18c429b97e7f457bb79d363b410f9d838b70b4a7 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:18 +0530
Subject: [PATCH 17/88] New translations en.json (Dutch)

---
 packages/nc-gui/lang/nl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index c79f471478..1d3c3eda48 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Weergave toewijzen",
     "webhookDetails": "Webhookdetails",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 45410a40d68d9a57bb9f2f358c067f2fc2b79c75 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:19 +0530
Subject: [PATCH 18/88] New translations en.json (Norwegian)

---
 packages/nc-gui/lang/no.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index c4a0321f99..654f0f4b54 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Detaljer",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From d3ca29f1a246b3ad5a9964a7d106b6f0069812c7 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:21 +0530
Subject: [PATCH 19/88] New translations en.json (Polish)

---
 packages/nc-gui/lang/pl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index bc1809c943..9edc37de60 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Szczegóły Webhooka",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From beb3baaf6e2a543814095414583198ac7a668972 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:22 +0530
Subject: [PATCH 20/88] New translations en.json (Portuguese)

---
 packages/nc-gui/lang/pt.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 9fd8605be2..c22072517b 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detalhes do Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 97303781dd603cb04de8b48cb4e9ef8af81706cf Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:23 +0530
Subject: [PATCH 21/88] New translations en.json (Russian)

---
 packages/nc-gui/lang/ru.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index 37aaa5313b..0fd9a87101 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Детали вебхука",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 25bfb0af57b9482537bd2e41a5d0e11dc7d3da34 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:24 +0530
Subject: [PATCH 22/88] New translations en.json (Slovak)

---
 packages/nc-gui/lang/sk.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index fa46be6eeb..64f41a401d 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detaily Webhooku",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 68a50d680ef2cb00630b380310d66f2b653cdda8 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:26 +0530
Subject: [PATCH 23/88] New translations en.json (Slovenian)

---
 packages/nc-gui/lang/sl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index fdb6da0a90..a58111775d 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Podrobnosti Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 8006585ccb18c1cdd8d48556c65a38b9932bd080 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:27 +0530
Subject: [PATCH 24/88] New translations en.json (Turkish)

---
 packages/nc-gui/lang/tr.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index c4225dafba..e10544aa46 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook Detayları",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From db111f471e9c371a5a4392bc6246f510f699d108 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:28 +0530
Subject: [PATCH 25/88] New translations en.json (Ukrainian)

---
 packages/nc-gui/lang/uk.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index 1b62d28cb8..af7890dc2b 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Деталі вебхука",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From e30af4ff7b2ed572f27ee72ce5423a712bebfcdb Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:29 +0530
Subject: [PATCH 26/88] New translations en.json (Chinese Simplified)

---
 packages/nc-gui/lang/zh-Hans.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index 2c410775c9..fe8d23e709 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -1067,6 +1067,7 @@
     "viewHide": "查看可见性 "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "指定视图",
     "webhookDetails": "Webhook 详情",
     "showSaturdaysAndSundays": "显示周六和周日",

From 6193698c5de9a5af7e9a3a2810d4c513a6b40e84 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:31 +0530
Subject: [PATCH 27/88] New translations en.json (Chinese Traditional)

---
 packages/nc-gui/lang/zh-Hant.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index fa698065b8..92c43a83b6 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook詳情",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From be4bd4deb5c5e38581442ec37188bb28499ac7a2 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:32 +0530
Subject: [PATCH 28/88] New translations en.json (English)

---
 packages/nc-gui/lang/en.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 338311b1ec..86900a1cc3 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -661,8 +661,8 @@
     "confirmRestore": "Confirm Restore",
     "visibilityAndDataHandling": "Visibility & Data Handling",
     "visibilityConfigLabel": "Base specific additional configurations to customise data display & default behaviours.",
-    "snapShotSubText": "Snapshots serve as comprehensive backups of your base, capturing its state at the time of creation. Restoring a snapshot creates a new instance of the base in the designated workspace.",
-    "newSnapshot": "New Snapshot",
+    "snapShotSubText": "Snapshots are complete backups of your database at the time of creation. Restoring a snapshot duplicates the data.",
+    "newSnapshot": "New snapshot",
     "searchASnapshot": "Search a snapshot",
     "continue": "Continue",
     "toggleExperimentalFeature": "Enable or disable experimental features with ease, allowing you to explore and evaluate upcoming functionalities.",
@@ -804,7 +804,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id: {id}",
+    "idColon": "Id:",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",
@@ -890,7 +890,7 @@
     "lengthValue": "Length/ value",
     "dbType": "Database Type",
     "servername": "servername / hostAddr",
-    "sqliteFile": "SQLite file path",
+    "sqliteFile": "SQLite File",
     "hostAddress": "Host address",
     "port": "Port number",
     "username": "Username",
@@ -954,7 +954,7 @@
       "joinCommunity": "Join NocoDB Community",
       "joinReddit": "/r/NocoDB",
       "followNocodb": "Follow NocoDB",
-      "communityTranslated": "(Community/AI Translated)"
+      "communityTranslated": "(Community Translated)"
     },
     "twitter": "Twitter",
     "docReference": "Document Reference",
@@ -1037,7 +1037,7 @@
     "appearanceSettings": "Appearance settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on conditions",
+    "showOnConditions": "Show on condtions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
     "limitOptions": "Limit options",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
@@ -1087,7 +1087,7 @@
     "toggleSidebar": "Toggle Sidebar",
     "addEndDate": "Add end date",
     "endDate": "End Date",
-    "withEndDate": "With end date",
+    "withEndDate": "with end date",
     "calendar": "Calendar",
     "viewSettings": "View settings",
     "googleOAuth": "Google OAuth",
@@ -1640,7 +1640,7 @@
       "apiOptions": "Access Base via",
       "submitAnotherForm": "Show 'Submit Another Form' button",
       "showBlankForm": "Show a blank form after 5 seconds",
-      "emailForm": "Email responses to",
+      "emailForm": "E-mail me at",
       "showSysFields": "Show system fields",
       "filterAutoApply": "Auto apply",
       "formDisplayMessage": "Display Message",
@@ -1648,7 +1648,7 @@
       "showAllViews": "Show all shared views of this table",
       "collabView": "Collaborators with edit permissions or higher can change the view configuration.",
       "lockedView": "No one can edit the view configuration until it is unlocked.",
-      "personalView": "Only you can edit the view configuration.",
+      "personalView": "Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.",
       "canEditLockedViewConfiguration": "Unlock this view to edit the view configuration.",
       "cannotEditViewConfiguration": "You connot configure this view",
       "onlyYouCanConfigureThisView": "Only {user} can edit the view configuration.",

From e8bc972e6d5dc88176b76a6842f2cdb6411b33cd Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:33 +0530
Subject: [PATCH 29/88] New translations en.json (Vietnamese)

---
 packages/nc-gui/lang/vi.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index 7668310e5e..b992baac67 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Chi tiết Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From e8a1e31ac6cbbfccc982813b06ec38dd41ab1640 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:35 +0530
Subject: [PATCH 30/88] New translations en.json (Portuguese, Brazilian)

---
 packages/nc-gui/lang/pt_BR.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 9344a03147..64354d8f13 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detalhes do Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 3b6bcb53d2ad5fcf63d1d64f63ba88e2eb5c6755 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:36 +0530
Subject: [PATCH 31/88] New translations en.json (Indonesian)

---
 packages/nc-gui/lang/id.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index 964f3250ed..cf1a50c545 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detail Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 331db9f708b7a8d5b612e32139ede94a6abb2817 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:37 +0530
Subject: [PATCH 32/88] New translations en.json (Persian)

---
 packages/nc-gui/lang/fa.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index b1b4e0f8d5..f133bffe4d 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "جزئیات وب‌هوک",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From ffa212776e9c9a7bb1c266bc9916c665cd324d4c Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:39 +0530
Subject: [PATCH 33/88] New translations en.json (Khmer)

---
 packages/nc-gui/lang/km.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/km.json b/packages/nc-gui/lang/km.json
index 9d5f5c37a9..2ab7536c95 100644
--- a/packages/nc-gui/lang/km.json
+++ b/packages/nc-gui/lang/km.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "ព័ត៌មានលម្អិតរបស់ Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 27fe0356e5887b44ddc4494d678fffa1b72423db Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:40 +0530
Subject: [PATCH 34/88] New translations en.json (Thai)

---
 packages/nc-gui/lang/th.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index 289b6cf411..a7d84b79f7 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "รายละเอียด Webhook",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 1f6cf7ee3668a1486e272eda32ca08b6c3aa6df3 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:41 +0530
Subject: [PATCH 35/88] New translations en.json (Croatian)

---
 packages/nc-gui/lang/hr.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index 8e683b914e..dc456c2095 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Detalji o webhooku",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 5ed7ad24a38e8b82f4115a2b0286feb682590736 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:43 +0530
Subject: [PATCH 36/88] New translations en.json (Latvian)

---
 packages/nc-gui/lang/lv.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index 335de86de2..e0573b80eb 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "Webhook detaļas",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From c3a81cf22e3b00b58326df5bc76ee2b689bbffca Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:44 +0530
Subject: [PATCH 37/88] New translations en.json (Hindi)

---
 packages/nc-gui/lang/hi.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index 879596cbf0..35d50a4a6a 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "वेबहूक विवरण",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 7fffdbb879187af6094d9e455af69f276934d807 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:46 +0530
Subject: [PATCH 38/88] New translations en.json (Malayalam)

---
 packages/nc-gui/lang/ml.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ml.json b/packages/nc-gui/lang/ml.json
index b6a7a26dc0..268f7dabfa 100644
--- a/packages/nc-gui/lang/ml.json
+++ b/packages/nc-gui/lang/ml.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "വെബ്‌ഹുക്ക് വിശദാംശങ്ങൾ",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From c3140bfd579dd55992254bccd630cd5c98472056 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:47 +0530
Subject: [PATCH 39/88] New translations en.json (Kannada)

---
 packages/nc-gui/lang/kn.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/kn.json b/packages/nc-gui/lang/kn.json
index 9d5caa5085..ef5393b36a 100644
--- a/packages/nc-gui/lang/kn.json
+++ b/packages/nc-gui/lang/kn.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "ವೆಬ್‌ಹುಕ್ ವಿವರಣೆಗಳು",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From 0e91a318594850e1d4d5d1ddcd4b942a33cb302f Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:49 +0530
Subject: [PATCH 40/88] New translations en.json (Bengali, India)

---
 packages/nc-gui/lang/bn_IN.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index 5144ab02b4..ba2d708076 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "ওয়েবহুকের বিবরণ",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From f54c76619544b50a52275c8b3881a4b00b1d508e Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 03:44:50 +0530
Subject: [PATCH 41/88] New translations en.json (Nepali)

---
 packages/nc-gui/lang/ne.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nc-gui/lang/ne.json b/packages/nc-gui/lang/ne.json
index a158304ef1..7c9b02e343 100644
--- a/packages/nc-gui/lang/ne.json
+++ b/packages/nc-gui/lang/ne.json
@@ -1067,6 +1067,7 @@
     "viewHide": "View visibility "
   },
   "activity": {
+    "deleteAllRecords": "Delete all records",
     "assignView": "Assign view",
     "webhookDetails": "वेबहुक विवरणहरू",
     "showSaturdaysAndSundays": "Show Saturdays & Sundays",

From d43a380aefb001333149cf7351a9f127b8d5cb30 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:36:59 +0000
Subject: [PATCH 42/88] fix(nocodb): attachment column description update issue
 nocodb/nocodb/issues/9912

---
 packages/nocodb/src/models/Column.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index befddf7971..ceed6fc472 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -1357,9 +1357,13 @@ export default class Column<T = any> implements ColumnType {
       );
     }
 
-    if (oldCol.uidt === UITypes.Attachment && oldCol.uidt !== column.uidt) {
+    if (
+      column.uidt &&
+      oldCol.uidt === UITypes.Attachment &&
+      oldCol.uidt !== column.uidt
+    ) {
       // Set Gallery & Kanban view `fk_cover_image_col_id` value to null
-      await Column.deleteCoverImageColumnId(context, column.id, ncMeta);
+      await Column.deleteCoverImageColumnId(context, colId, ncMeta);
     }
 
     // set meta

From bc61cae291f6524eda6021d8565a2b26cdc923b0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:01 +0000
Subject: [PATCH 43/88] fix(nc-gui): formula formatting is reseting on open
 edit field modal #4123

---
 .../smartsheet/column/FormulaOptions.vue      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index ce0f47bca8..1f5a1dc69d 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -118,6 +118,10 @@ const debouncedValidate = useDebounceFn(async () => {
         dataType: FormulaDataTypes.UNKNOWN,
       }
     }
+  } finally {
+    if (vModel.value?.colOptions?.parsed_tree?.dataType !== parsedTree.value?.dataType) {
+      vModel.value.meta.display_type = null
+    }
   }
 }, 300)
 
@@ -175,15 +179,6 @@ watch(
     immediate: true,
   },
 )
-
-watch(parsedTree, (value, oldValue) => {
-  if (oldValue === undefined && value) {
-    return
-  }
-  if (value?.dataType !== oldValue?.dataType) {
-    vModel.value.meta.display_type = null
-  }
-})
 </script>
 
 <template>
@@ -209,9 +204,14 @@ watch(parsedTree, (value, oldValue) => {
             <div>{{ $t('labels.formatting') }}</div>
           </div>
         </template>
-        <div class="flex flex-col px-0.5 gap-4">
+        <div class="flex flex-col px-0.5 gap-4 pb-0.5">
           <a-form-item class="mt-4" :label="$t('general.format')">
-            <a-select v-model:value="vModel.meta.display_type" class="w-full" :placeholder="$t('labels.selectAFormatType')">
+            <NcSelect
+              v-model:value="vModel.meta.display_type"
+              class="w-full nc-select-shadow"
+              :placeholder="$t('labels.selectAFormatType')"
+              allow-clear
+            >
               <a-select-option v-for="option in supportedFormulaAlias" :key="option.value" :value="option.value">
                 <div class="flex w-full items-center gap-2 justify-between">
                   <div class="w-full">
@@ -226,7 +226,7 @@ watch(parsedTree, (value, oldValue) => {
                   />
                 </div>
               </a-select-option>
-            </a-select>
+            </NcSelect>
           </a-form-item>
 
           <template

From e47950740f7e7cc2841fbccbb89bc75028d7141d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:03 +0000
Subject: [PATCH 44/88] fix(nc-gui): load aggregation on dependency field value
 change nocodb/nocodb/issues/9897

---
 .../nc-gui/composables/useViewAggregate.ts    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/nc-gui/composables/useViewAggregate.ts b/packages/nc-gui/composables/useViewAggregate.ts
index d8746e4252..b0358f2630 100644
--- a/packages/nc-gui/composables/useViewAggregate.ts
+++ b/packages/nc-gui/composables/useViewAggregate.ts
@@ -2,6 +2,7 @@ import type { Ref } from 'vue'
 import {
   type ColumnType,
   CommonAggregations,
+  type FormulaType,
   type TableType,
   UITypes,
   type ViewType,
@@ -123,6 +124,32 @@ const [useProvideViewAggregate, useViewAggregate] = useInjectionState(
       await updateGridViewColumn(fieldId, { aggregation: agg })
     }
 
+    const aggregateFormulaFields = computed(() => {
+      return fields.value
+        .filter((field) => {
+          if (!field?.id || !field?.title) return false
+
+          if (
+            !isFormula(field) ||
+            !gridViewCols.value[field.id] ||
+            !gridViewCols.value[field.id]?.aggregation ||
+            gridViewCols.value[field.id]?.aggregation === CommonAggregations.None ||
+            !(field.colOptions as FormulaType)?.formula_raw
+          ) {
+            return false
+          }
+
+          return true
+        })
+        .map((field) => {
+          return {
+            id: field.id,
+            aggregation: gridViewCols.value[field.id!]?.aggregation ?? CommonAggregations.None,
+            formula_raw: (field.colOptions as FormulaType)?.formula_raw ?? '',
+          }
+        })
+    })
+
     reloadAggregate?.on(async (_fields) => {
       if (!_fields || !_fields?.fields.length) {
         await loadViewAggregate()
@@ -135,6 +162,12 @@ const [useProvideViewAggregate, useViewAggregate] = useInjectionState(
 
           acc[f.id] = field.aggregation ?? gridViewCols.value[f.id].aggregation ?? CommonAggregations.None
 
+          for (const formulaField of aggregateFormulaFields.value) {
+            if (!acc[formulaField.id!] && formulaField.formula_raw.includes(field.title)) {
+              acc[formulaField.id!] = formulaField.aggregation
+            }
+          }
+
           return acc
         }, {} as Record<string, string>)
 

From 0f49b732e956ba75e69dd81417457a94afe7f3c7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:04 +0000
Subject: [PATCH 45/88] fix(nc-gui): allow user to clear form view field lable
 input and start from begining #4130

---
 .../nc-gui/components/smartsheet/Form.vue     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 36ab5528f9..f667e52911 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -655,10 +655,30 @@ const handleOnUploadImage = (data: AttachmentResType = null) => {
   updateView()
 }
 
+const isFocusedFieldLabel = ref(false)
+
 const onFocusActiveFieldLabel = (e: FocusEvent) => {
+  isFocusedFieldLabel.value = true
+
+  if (activeField.value && !activeField.value.label) {
+    activeField.value.label = activeField.value?.title ?? ''
+  }
+
   ;(e.target as HTMLTextAreaElement).select()
 }
 
+const activeFieldLabel = computed(() => {
+  if (!isFocusedFieldLabel.value && !activeField.value?.label) {
+    return activeField.value?.title
+  }
+
+  return activeField.value?.label ?? ''
+})
+
+onClickOutside(focusLabel, () => {
+  isFocusedFieldLabel.value = false
+})
+
 const updateFieldTitle = (value: string) => {
   if (!activeField.value) return
 
@@ -1459,7 +1479,7 @@ useEventListener(
 
                     <a-textarea
                       ref="focusLabel"
-                      :value="activeField.label || activeField.title"
+                      :value="activeFieldLabel"
                       :rows="1"
                       auto-size
                       hide-details
@@ -1467,6 +1487,7 @@ useEventListener(
                       data-testid="nc-form-input-label"
                       :placeholder="$t('msg.info.formInput')"
                       @focus="onFocusActiveFieldLabel"
+                      @blur="isFocusedFieldLabel = false"
                       @keydown.enter.prevent
                       @input="updateFieldTitle($event.target.value)"
                       @change="updateColMeta(activeField)"

From 3c7e82994a8da51e499e76ddfb2cae1acd88fae6 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:09 +0000
Subject: [PATCH 46/88] fix(nc-gui): use trimStart to prevent user from adding
 blank form field label with spaces only

---
 packages/nc-gui/components/smartsheet/Form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index f667e52911..16d97e2edd 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -685,7 +685,7 @@ const updateFieldTitle = (value: string) => {
   if (activeField.value.title === value) {
     activeField.value.label = null
   } else {
-    activeField.value.label = value
+    activeField.value.label = value.trimStart()
   }
 }
 

From 432af865e0338a1bd2327a5f983452a09018c914 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 47/88] fix(nc-gui): form view field label blank issue if label
 and column title is same

---
 packages/nc-gui/components/smartsheet/Form.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 16d97e2edd..6ec3d2f149 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -682,11 +682,7 @@ onClickOutside(focusLabel, () => {
 const updateFieldTitle = (value: string) => {
   if (!activeField.value) return
 
-  if (activeField.value.title === value) {
-    activeField.value.label = null
-  } else {
-    activeField.value.label = value.trimStart()
-  }
+  activeField.value.label = value.trimStart()
 }
 
 const handleAutoScrollFormField = (title: string, isSidebar: boolean) => {

From c6d99d1f37be6639a1e9967783406177d6170891 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 48/88] fix(nc-gui): text area cell text alignment issue

---
 packages/nc-gui/components/cell/TextArea.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 0214061431..0ffb0d90de 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -664,6 +664,18 @@ textarea:focus {
   @apply !block cursor-pointer;
 }
 
+.nc-grid-cell {
+  &.align-top {
+    .long-text-wrapper {
+      @apply items-start;
+    }
+  }
+
+  &:not(.align-top) {
+    @apply items-center;
+  }
+}
+
 .nc-data-cell {
   &:has(.nc-cell-ai .nc-expanded-form-open) {
     @apply !border-none -mx-1 -my-1;

From 7c66085c5d7b2b9048231dde2738b3eeb9a1e8f4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 49/88] fix(nc-gui): make field modal footer sticky at bottom
 if scroll is enabled

---
 .../smartsheet/column/EditOrAdd.vue           | 122 +++++++++++-------
 .../smartsheet/column/FormulaInputHelper.vue  |   2 +-
 2 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index d6ccb7a014..ad605f39f1 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -238,6 +238,20 @@ const uiTypesOptions = computed<typeof uiTypes>(() => {
   return types
 })
 
+const editOrAddRef = ref<HTMLDivElement>()
+
+const isScrollEnabled = ref(false)
+
+const handleScrollDebounce = useDebounceFn(() => {
+  if (props.fromTableExplorer || !editOrAddRef.value || aiAutoSuggestMode.value) return
+
+  if (editOrAddRef.value.clientHeight < editOrAddRef.value.scrollHeight) {
+    isScrollEnabled.value = true
+  } else {
+    isScrollEnabled.value = false
+  }
+}, 500)
+
 const onSelectType = (uidt: UITypes | typeof AIButton, fromSearchList = false) => {
   let preload
 
@@ -254,6 +268,10 @@ const onSelectType = (uidt: UITypes | typeof AIButton, fromSearchList = false) =
     formState.value.uidt = uidt
   }
   onUidtOrIdTypeChange(preload)
+
+  nextTick(() => {
+    handleScrollDebounce()
+  })
 }
 
 const reloadMetaAndData = async () => {
@@ -393,6 +411,9 @@ onMounted(() => {
   nextTick(() => {
     mounted.value = true
     emit('mounted')
+
+    handleScrollDebounce()
+
     if (!isEdit.value) {
       if (!formState.value?.temp_id) {
         emit('add', formState.value)
@@ -489,6 +510,9 @@ const triggerDescriptionEnable = () => {
       descInputEl.value?.focus()
     }, 100)
   }
+  nextTick(() => {
+    handleScrollDebounce()
+  })
 }
 
 const isFullUpdateAllowed = computed(() => {
@@ -596,6 +620,7 @@ watch(activeAiTab, (newValue) => {
 
 <template>
   <div
+    ref="editOrAddRef"
     v-if="!warningVisible"
     class="overflow-auto nc-scrollbar-md"
     :class="{
@@ -604,13 +629,15 @@ watch(activeAiTab, (newValue) => {
       'min-w-[500px]': formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links,
       '!w-[600px]': formState.uidt === UITypes.LinkToAnotherRecord || formState.uidt === UITypes.Links,
       'min-w-[422px] !w-full': isLinksOrLTAR(formState.uidt),
-      'shadow-lg shadow-gray-300 border-1 border-gray-200 rounded-xl p-5': !embedMode,
+      'shadow-lg shadow-gray-300 border-1 border-gray-200 rounded-2xl p-5': !embedMode,
       'nc-ai-mode': isAiMode,
       'h-full': props.fromTableExplorer,
       '!bg-nc-bg-gray-extralight': aiAutoSuggestMode && formState.uidt && !props.fromTableExplorer,
+      '!pb-0': !embedMode && !aiAutoSuggestMode && formState.uidt,
     }"
     @keydown="handleEscape"
     @click.stop
+    @scroll="handleScrollDebounce"
   >
     <a-form
       v-model="formState"
@@ -1266,53 +1293,58 @@ watch(activeAiTab, (newValue) => {
             </NcButton>
           </a-form-item>
         </template>
-        <template v-else>
-          <div class="flex items-center justify-between gap-2 empty:hidden">
-            <NcButton v-if="!enableDescription" size="small" type="text" @click.stop="triggerDescriptionEnable">
-              <div class="flex !text-gray-700 items-center gap-2">
-                <GeneralIcon icon="plus" class="h-4 w-4" />
 
-                <span class="first-letter:capitalize">
-                  {{ $t('labels.addDescription').toLowerCase() }}
-                </span>
-              </div>
-            </NcButton>
-            <div v-else-if="!aiAutoSuggestMode"></div>
+        <div
+          class="flex items-center justify-between gap-2 empty:hidden"
+          :class="{
+            'sticky bottom-0 z-10 bg-white px-5 pb-5 -mx-5': true,
+            'border-t-1 border-nc-border-gray-medium pt-3': isScrollEnabled,
+          }"
+        >
+          <NcButton v-if="!enableDescription" size="small" type="text" @click.stop="triggerDescriptionEnable">
+            <div class="flex !text-gray-700 items-center gap-2">
+              <GeneralIcon icon="plus" class="h-4 w-4" />
 
-            <a-form-item v-if="!aiAutoSuggestMode">
-              <div
-                class="flex gap-x-2 justify-end"
-                :class="{
-                  'justify-end': !props.embedMode,
-                }"
+              <span class="first-letter:capitalize">
+                {{ $t('labels.addDescription').toLowerCase() }}
+              </span>
+            </div>
+          </NcButton>
+          <div v-else-if="!aiAutoSuggestMode"></div>
+
+          <a-form-item v-if="!aiAutoSuggestMode">
+            <div
+              class="flex gap-x-2 justify-end"
+              :class="{
+                'justify-end': !props.embedMode,
+              }"
+            >
+              <!-- Cancel -->
+              <NcButton size="small" html-type="button" type="secondary" :disabled="saving" @click="emit('cancel')">
+                {{ $t('general.cancel') }}
+              </NcButton>
+
+              <!-- Save -->
+              <NcButton
+                html-type="submit"
+                type="primary"
+                :theme="isAiMode ? 'ai' : 'default'"
+                :loading="saving"
+                :disabled="!formState.uidt || disableSubmitBtn || saving"
+                size="small"
+                :label="submitBtnLabel.label"
+                :loading-label="submitBtnLabel.loadingLabel"
+                data-testid="nc-field-modal-submit-btn"
+                @click.prevent="onSubmit"
               >
-                <!-- Cancel -->
-                <NcButton size="small" html-type="button" type="secondary" :disabled="saving" @click="emit('cancel')">
-                  {{ $t('general.cancel') }}
-                </NcButton>
-
-                <!-- Save -->
-                <NcButton
-                  html-type="submit"
-                  type="primary"
-                  :theme="isAiMode ? 'ai' : 'default'"
-                  :loading="saving"
-                  :disabled="!formState.uidt || disableSubmitBtn || saving"
-                  size="small"
-                  :label="submitBtnLabel.label"
-                  :loading-label="submitBtnLabel.loadingLabel"
-                  data-testid="nc-field-modal-submit-btn"
-                  @click.prevent="onSubmit"
-                >
-                  {{ submitBtnLabel.label }}
-                  <template #loading>
-                    {{ submitBtnLabel.loadingLabel }}
-                  </template>
-                </NcButton>
-              </div>
-            </a-form-item>
-          </div>
-        </template>
+                {{ submitBtnLabel.label }}
+                <template #loading>
+                  {{ submitBtnLabel.loadingLabel }}
+                </template>
+              </NcButton>
+            </div>
+          </a-form-item>
+        </div>
       </template>
     </a-form>
   </div>
diff --git a/packages/nc-gui/components/smartsheet/column/FormulaInputHelper.vue b/packages/nc-gui/components/smartsheet/column/FormulaInputHelper.vue
index 0cb0c4bd19..fb9291c7e5 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaInputHelper.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaInputHelper.vue
@@ -638,7 +638,7 @@ const enableAI = async () => {
 <template>
   <div
     v-if="suggestionPreviewed && !suggestionPreviewed.unsupported && suggestionPreviewed.type === 'function'"
-    class="w-84 fixed bg-white z-10 pl-3 pt-3 border-1 shadow-md rounded-xl"
+    class="w-84 fixed bg-white z-11 pl-3 pt-3 border-1 shadow-md rounded-xl"
     :style="{
       left: suggestionPreviewPostion.left,
       top: suggestionPreviewPostion.top,

From 788df21b24e03cd5485ee9357551efd1641ca74d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 50/88] fix(nc-gui): add missing v-else condition

---
 .../smartsheet/column/EditOrAdd.vue           | 114 ++++++++++--------
 1 file changed, 63 insertions(+), 51 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index ad605f39f1..e190808f51 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -1254,7 +1254,12 @@ watch(activeAiTab, (newValue) => {
           </Transition>
         </template>
 
-        <a-form-item v-if="enableDescription && !aiAutoSuggestMode">
+        <a-form-item
+          v-if="enableDescription && !aiAutoSuggestMode"
+          :class="{
+            '!pb-4': embedMode,
+          }"
+        >
           <div class="flex gap-3 text-gray-800 h-7 mb-1 items-center justify-between">
             <span class="text-[13px]">
               {{ $t('labels.description') }}
@@ -1281,8 +1286,13 @@ watch(activeAiTab, (newValue) => {
         </a-form-item>
 
         <template v-if="props.fromTableExplorer">
-          <a-form-item>
-            <NcButton v-if="!enableDescription" size="small" type="text" @click.stop="triggerDescriptionEnable">
+          <a-form-item
+            v-if="!enableDescription"
+            :class="{
+              '!pb-4': embedMode,
+            }"
+          >
+            <NcButton size="small" type="text" @click.stop="triggerDescriptionEnable">
               <div class="flex !text-gray-700 items-center gap-2">
                 <GeneralIcon icon="plus" class="h-4 w-4" />
 
@@ -1294,57 +1304,59 @@ watch(activeAiTab, (newValue) => {
           </a-form-item>
         </template>
 
-        <div
-          class="flex items-center justify-between gap-2 empty:hidden"
-          :class="{
-            'sticky bottom-0 z-10 bg-white px-5 pb-5 -mx-5': true,
-            'border-t-1 border-nc-border-gray-medium pt-3': isScrollEnabled,
-          }"
-        >
-          <NcButton v-if="!enableDescription" size="small" type="text" @click.stop="triggerDescriptionEnable">
-            <div class="flex !text-gray-700 items-center gap-2">
-              <GeneralIcon icon="plus" class="h-4 w-4" />
-
-              <span class="first-letter:capitalize">
-                {{ $t('labels.addDescription').toLowerCase() }}
-              </span>
-            </div>
-          </NcButton>
-          <div v-else-if="!aiAutoSuggestMode"></div>
+        <template v-else>
+          <div
+            class="flex items-center justify-between gap-2 empty:hidden"
+            :class="{
+              'sticky bottom-0 z-10 bg-white px-5 pb-5 -mx-5': true,
+              'border-t-1 border-nc-border-gray-medium pt-3': isScrollEnabled,
+            }"
+          >
+            <NcButton v-if="!enableDescription" size="small" type="text" @click.stop="triggerDescriptionEnable">
+              <div class="flex !text-gray-700 items-center gap-2">
+                <GeneralIcon icon="plus" class="h-4 w-4" />
 
-          <a-form-item v-if="!aiAutoSuggestMode">
-            <div
-              class="flex gap-x-2 justify-end"
-              :class="{
-                'justify-end': !props.embedMode,
-              }"
-            >
-              <!-- Cancel -->
-              <NcButton size="small" html-type="button" type="secondary" :disabled="saving" @click="emit('cancel')">
-                {{ $t('general.cancel') }}
-              </NcButton>
+                <span class="first-letter:capitalize">
+                  {{ $t('labels.addDescription').toLowerCase() }}
+                </span>
+              </div>
+            </NcButton>
+            <div v-else-if="!aiAutoSuggestMode"></div>
 
-              <!-- Save -->
-              <NcButton
-                html-type="submit"
-                type="primary"
-                :theme="isAiMode ? 'ai' : 'default'"
-                :loading="saving"
-                :disabled="!formState.uidt || disableSubmitBtn || saving"
-                size="small"
-                :label="submitBtnLabel.label"
-                :loading-label="submitBtnLabel.loadingLabel"
-                data-testid="nc-field-modal-submit-btn"
-                @click.prevent="onSubmit"
+            <a-form-item v-if="!aiAutoSuggestMode">
+              <div
+                class="flex gap-x-2 justify-end"
+                :class="{
+                  'justify-end': !props.embedMode,
+                }"
               >
-                {{ submitBtnLabel.label }}
-                <template #loading>
-                  {{ submitBtnLabel.loadingLabel }}
-                </template>
-              </NcButton>
-            </div>
-          </a-form-item>
-        </div>
+                <!-- Cancel -->
+                <NcButton size="small" html-type="button" type="secondary" :disabled="saving" @click="emit('cancel')">
+                  {{ $t('general.cancel') }}
+                </NcButton>
+
+                <!-- Save -->
+                <NcButton
+                  html-type="submit"
+                  type="primary"
+                  :theme="isAiMode ? 'ai' : 'default'"
+                  :loading="saving"
+                  :disabled="!formState.uidt || disableSubmitBtn || saving"
+                  size="small"
+                  :label="submitBtnLabel.label"
+                  :loading-label="submitBtnLabel.loadingLabel"
+                  data-testid="nc-field-modal-submit-btn"
+                  @click.prevent="onSubmit"
+                >
+                  {{ submitBtnLabel.label }}
+                  <template #loading>
+                    {{ submitBtnLabel.loadingLabel }}
+                  </template>
+                </NcButton>
+              </div>
+            </a-form-item>
+          </div>
+        </template>
       </template>
     </a-form>
   </div>

From f3ee08fc3ea44def1bf0bcb3e423aa1dbd2e9830 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 51/88] fix(nc-gui): single select field cell search value
 input el placement issue

---
 packages/nc-gui/components/cell/SingleSelect.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 874bc99e41..4a5eccd79e 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -395,7 +395,7 @@ const onFocus = () => {
         :disabled="readOnly || !editAllowed"
         :show-search="!isMobileMode && isOpen && active"
         :show-arrow="hasEditRoles && !readOnly && active && (vModel === null || vModel === undefined)"
-        :dropdown-class-name="`nc-dropdown-single-select-cell !min-w-156px ${isOpen && active ? 'active' : ''}`"
+        :dropdown-class-name="`nc-dropdown-single-select-cell !min-w-200px ${isOpen && active ? 'active' : ''}`"
         :dropdown-match-select-width="true"
         @select="onSelect"
         @keydown="onKeydown($event)"
@@ -482,8 +482,12 @@ const onFocus = () => {
   text-overflow: clip;
 }
 
-:deep(.ant-select-selection-search-input) {
-  @apply !text-xs;
+:deep(.ant-select-selection-search) {
+  @apply flex items-center;
+
+  .ant-select-selection-search-input {
+    @apply !text-xs;
+  }
 }
 
 :deep(.ant-select-clear > span) {

From 883dfc2783c07e3979b3cd70de08300f2cad6cf0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:12 +0000
Subject: [PATCH 52/88] fix(nc-gui): row invalid yellow box fluctuation issue
 on scroll

---
 .../smartsheet/grid/InfiniteTable.vue         | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index 8ee6663508..8a170dd212 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -2139,19 +2139,16 @@ watch(vSelectedAllRecords, (selectedAll) => {
                   :row="row"
                 >
                   <template #default="{ state }">
-                    <div
+                    <tr
                       v-if="row.rowMeta?.isValidationFailed"
                       :style="{
                         top: `${(index + 1) * rowHeight - 6}px`,
                         zIndex: 100001,
                       }"
-                      class="absolute z-30 left-0"
+                      class="absolute z-30 left-0 w-full flex"
                     >
                       <div
-                        class="flex items-center gap-2 transform bg-yellow-500 px-2 py-1 rounded-br-md font-semibold text-xs text-gray-800"
-                        :style="{
-                          transform: `translateX(${scrollLeft - leftOffset}px)`,
-                        }"
+                        class="sticky left-0 flex items-center gap-2 transform bg-yellow-500 px-2 py-1 rounded-br-md font-semibold text-xs text-gray-800"
                       >
                         Row filtered
 
@@ -2163,20 +2160,17 @@ watch(vSelectedAllRecords, (selectedAll) => {
                           <GeneralIcon icon="info" class="w-4 h-4 text-gray-800" />
                         </NcTooltip>
                       </div>
-                    </div>
-                    <div
+                    </tr>
+                    <tr
                       v-if="row.rowMeta?.isRowOrderUpdated"
                       :style="{
                         top: `${(index + 1) * rowHeight - 6}px`,
                         zIndex: 100000,
                       }"
-                      class="absolute transform z-30 left-0"
+                      class="absolute transform z-30 left-0 w-full flex"
                     >
                       <div
-                        class="flex items-center gap-2 transform bg-yellow-500 px-2 py-1 rounded-br-md font-semibold text-xs text-gray-800"
-                        :style="{
-                          transform: `translateX(${scrollLeft - leftOffset}px)`,
-                        }"
+                        class="sticky left-0 flex items-center gap-2 transform bg-yellow-500 px-2 py-1 rounded-br-md font-semibold text-xs text-gray-800"
                       >
                         Row moved
 
@@ -2186,7 +2180,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
                           <GeneralIcon icon="info" class="w-4 h-4 text-gray-800" />
                         </NcTooltip>
                       </div>
-                    </div>
+                    </tr>
                     <tr
                       class="nc-grid-row transition transition-opacity duration-500 opacity-100 !xs:h-14"
                       :style="{

From da3c4bea196a8055d786484b849c8cc59141a0df Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:13 +0000
Subject: [PATCH 53/88] fix(nc-gui): revert single line text dropdown width
 related changes

---
 packages/nc-gui/components/cell/SingleSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 4a5eccd79e..07b56e4e5d 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -395,7 +395,7 @@ const onFocus = () => {
         :disabled="readOnly || !editAllowed"
         :show-search="!isMobileMode && isOpen && active"
         :show-arrow="hasEditRoles && !readOnly && active && (vModel === null || vModel === undefined)"
-        :dropdown-class-name="`nc-dropdown-single-select-cell !min-w-200px ${isOpen && active ? 'active' : ''}`"
+        :dropdown-class-name="`nc-dropdown-single-select-cell !min-w-156px ${isOpen && active ? 'active' : ''}`"
         :dropdown-match-select-width="true"
         @select="onSelect"
         @keydown="onKeydown($event)"

From de06b3ef2abb255ec7033fc44ec1e5c6def6fbfc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:13 +0000
Subject: [PATCH 54/88] fix(nc-gui): row warning lint issue

---
 .../nc-gui/components/smartsheet/column/EditOrAdd.vue     | 5 ++---
 .../nc-gui/components/smartsheet/grid/InfiniteTable.vue   | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index e190808f51..3f65429185 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -620,8 +620,8 @@ watch(activeAiTab, (newValue) => {
 
 <template>
   <div
-    ref="editOrAddRef"
     v-if="!warningVisible"
+    ref="editOrAddRef"
     class="overflow-auto nc-scrollbar-md"
     :class="{
       'bg-white max-h-[max(80vh,500px)]': !props.fromTableExplorer,
@@ -1306,9 +1306,8 @@ watch(activeAiTab, (newValue) => {
 
         <template v-else>
           <div
-            class="flex items-center justify-between gap-2 empty:hidden"
+            class="flex items-center justify-between gap-2 empty:hidden sticky bottom-0 z-10 bg-white px-5 pb-5 -mx-5"
             :class="{
-              'sticky bottom-0 z-10 bg-white px-5 pb-5 -mx-5': true,
               'border-t-1 border-nc-border-gray-medium pt-3': isScrollEnabled,
             }"
           >
diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index 8a170dd212..303fa91d34 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -2139,7 +2139,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
                   :row="row"
                 >
                   <template #default="{ state }">
-                    <tr
+                    <div
                       v-if="row.rowMeta?.isValidationFailed"
                       :style="{
                         top: `${(index + 1) * rowHeight - 6}px`,
@@ -2160,8 +2160,8 @@ watch(vSelectedAllRecords, (selectedAll) => {
                           <GeneralIcon icon="info" class="w-4 h-4 text-gray-800" />
                         </NcTooltip>
                       </div>
-                    </tr>
-                    <tr
+                    </div>
+                    <div
                       v-if="row.rowMeta?.isRowOrderUpdated"
                       :style="{
                         top: `${(index + 1) * rowHeight - 6}px`,
@@ -2180,7 +2180,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
                           <GeneralIcon icon="info" class="w-4 h-4 text-gray-800" />
                         </NcTooltip>
                       </div>
-                    </tr>
+                    </div>
                     <tr
                       class="nc-grid-row transition transition-opacity duration-500 opacity-100 !xs:h-14"
                       :style="{

From c17939a6341c7a130449f90da23a7f2c3dd15a30 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:37:13 +0000
Subject: [PATCH 55/88] chore(nc-gui): lint

---
 .../smartsheet/grid/InfiniteTable.vue          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index 303fa91d34..2df1f9f187 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -665,15 +665,13 @@ const onActiveCellChanged = () => {
   }
 }
 
+const isOpen = ref(false)
+
 const isDeleteAllModalIsOpen = ref(false)
+
 async function deleteAllRecords() {
   isDeleteAllModalIsOpen.value = true
 
-  function closeDlg() {
-    isOpen.value = false
-    close(200)
-  }
-
   const { close } = useDialog(resolveComponent('DlgRecordDeleteAll'), {
     'modelValue': isDeleteAllModalIsOpen,
     'rows': totalRows.value,
@@ -685,10 +683,14 @@ async function deleteAllRecords() {
     },
   })
 
+  function closeDlg() {
+    isOpen.value = false
+    close(200)
+  }
+
   await until(isDeleteAllModalIsOpen).toBe(false)
 }
 
-const isOpen = ref(false)
 async function expandRows({
   newRows,
   newColumns,
@@ -1878,9 +1880,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
                     data-testid="nc-check-all"
                     class="flex items-center pl-2 pr-1 w-full h-full justify-center"
                   >
-                    <div class="nc-no-label text-gray-500"  :class="{ hidden: vSelectedAllRecords }">
-                      #
-                    </div>
+                    <div class="nc-no-label text-gray-500" :class="{ hidden: vSelectedAllRecords }">#</div>
                     <div
                       :class="{
                         hidden: !vSelectedAllRecords,

From 3c9073967e9e4eaf3d597bb12ea081ec5873edd7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:57 +0000
Subject: [PATCH 56/88] fix(nc-gui): rich text italic render issue #4128

---
 packages/nc-gui/components/cell/RichText.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index a01b7e41d6..d4b59288a2 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -709,6 +709,14 @@ onClickOutside(editorDom, (e) => {
   .mention span {
     display: none;
   }
+
+  em {
+    font-synthesis: initial !important;
+
+    & * {
+      font-synthesis: initial !important;
+    }
+  }
 }
 .nc-form-field-bubble-menu-wrapper {
   @apply absolute -bottom-9 left-1/2 z-50 rounded-lg;

From d56e6aaaade2736b92105c28012e7c2fa92e7fb0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 57/88] fix(nc-gui): rich text cell height issue in grid view
 #3919

---
 packages/nc-gui/components/cell/TextArea.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 0ffb0d90de..b5c69ceb6c 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -342,8 +342,8 @@ watch([isVisible, inputRef], (value) => {
           'nc-readonly-rich-text-sort-height': localRowHeight === 1 && !isExpandedFormOpen && !isForm,
         }"
         :style="{
-          maxHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${21 * rowHeightTruncateLines(localRowHeight)}px`,
-          minHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${21 * rowHeightTruncateLines(localRowHeight)}px`,
+          maxHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${16.6 * rowHeightTruncateLines(localRowHeight)}px`,
+          minHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${16.5 * rowHeightTruncateLines(localRowHeight)}px`,
         }"
         @dblclick="onExpand"
         @keydown.enter="onExpand"

From 0a2ff8bde3d07d5f4e1195be2992d212235e2335 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 58/88] fix(nc-gui): rich text mention issue #4122

---
 packages/nc-gui/components/cell/RichText.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index d4b59288a2..669cfc5aa3 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -11,6 +11,7 @@ import { TaskItem } from '~/helpers/dbTiptapExtensions/task-item'
 import { Link } from '~/helpers/dbTiptapExtensions/links'
 import { Mention } from '~/helpers/tiptapExtensions/mention'
 import suggestion from '~/helpers/tiptapExtensions/mention/suggestion'
+import UserMentionList from '~/helpers/tiptapExtensions/mention/UserMentionList.vue'
 
 const props = withDefaults(
   defineProps<{
@@ -145,7 +146,7 @@ if (appInfo.value.ee) {
           isSameUser: bUser?.id === user.value?.id,
         }),
       )
-      span.setAttribute('class', `${colorStyles} mention font-semibold  m-0.5 rounded-md px-1`)
+      span.setAttribute('class', `${colorStyles} mention font-semibold m-0.5 rounded-md px-1 inline-block`)
       span.textContent = `@${processedContent}`
       return span.outerHTML
     }
@@ -224,7 +225,7 @@ const tiptapExtensions = [
     ? [
         Mention.configure({
           suggestion: {
-            ...suggestion,
+            ...suggestion(UserMentionList),
             items: ({ query }) =>
               baseUsers.value
                 .filter((user) => user.deleted !== true)
@@ -706,8 +707,12 @@ onClickOutside(editorDom, (e) => {
     height: fit-content;
   }
 
-  .mention span {
-    display: none;
+  .mention {
+    @apply inline-block my-2px;
+
+    span {
+      display: none;
+    }
   }
 
   em {

From c482f5c69f290f96e39d6fb5204871619203777d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 59/88] fix(nc-gui): i tag render issue as italic

---
 packages/nc-gui/assets/style.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 335b6199ba..f5b5913d06 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -20,6 +20,14 @@
   font-synthesis: none;
 }
 
+i {
+  font-synthesis: initial !important;
+
+  & * {
+    font-synthesis: initial !important;
+  }
+}
+
 html {
   overflow: hidden;
 }

From 723420c7a3e1041be49b6e44dfe468832eb3f567 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 60/88] fix(nc-gui): Failed to execute 'observe' on
 'ResizeObserver': parameter 1 is not of type 'Element'

---
 packages/nc-gui/components/cell/TextArea.vue | 22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index b5c69ceb6c..d6bb5e643c 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -286,9 +286,13 @@ watch([isVisible, inputRef], (value) => {
   })
 
   if (value) {
-    if (isRichMode.value) {
+    if (isRichMode.value && isVisible.value) {
       setTimeout(() => {
-        observer.observe(document.querySelector('.nc-long-text-expanded-modal .nc-textarea-rich-editor .tiptap') as HTMLElement)
+        const el = document.querySelector('.nc-long-text-expanded-modal .nc-textarea-rich-editor .tiptap') as HTMLElement
+
+        if (!el) return
+
+        observer.observe(el)
 
         updateSize()
       }, 50)
@@ -342,8 +346,16 @@ watch([isVisible, inputRef], (value) => {
           'nc-readonly-rich-text-sort-height': localRowHeight === 1 && !isExpandedFormOpen && !isForm,
         }"
         :style="{
-          maxHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${16.6 * rowHeightTruncateLines(localRowHeight)}px`,
-          minHeight: isForm ? undefined : isExpandedFormOpen ? `${height}px` : `${16.5 * rowHeightTruncateLines(localRowHeight)}px`,
+          maxHeight: isForm
+            ? undefined
+            : isExpandedFormOpen
+            ? `${height}px`
+            : `${16.6 * rowHeightTruncateLines(localRowHeight)}px`,
+          minHeight: isForm
+            ? undefined
+            : isExpandedFormOpen
+            ? `${height}px`
+            : `${16.5 * rowHeightTruncateLines(localRowHeight)}px`,
         }"
         @dblclick="onExpand"
         @keydown.enter="onExpand"
@@ -543,7 +555,7 @@ watch([isVisible, inputRef], (value) => {
               {{ column.title }}
             </span>
           </div>
-          <template v-if="!props.isAi">
+          <template v-if="!props.isAi && !isRichMode">
             <div class="flex-1" />
 
             <NcButton class="mr-2" type="text" size="small" @click="isVisible = false">

From c0eb410f67dd9257e7ef3b7b453d73c656823419 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 61/88] fix(nc-gui): rich text modal close btn visibility issue

---
 packages/nc-gui/components/cell/RichText.vue              | 2 +-
 .../components/cell/RichText/SelectedBubbleMenu.vue       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index 669cfc5aa3..440bfafd9f 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -425,7 +425,7 @@ onClickOutside(editorDom, (e) => {
           'justify-end xs:hidden': !isForm,
         }"
       >
-        <div class="scrollbar-thin scrollbar-thumb-gray-200 hover:scrollbar-thumb-gray-300 scrollbar-track-transparent">
+        <div class="scrollbar-thin scrollbar-thumb-gray-200 hover:scrollbar-thumb-gray-300 scrollbar-track-transparent relative">
           <CellRichTextSelectedBubbleMenu
             v-if="editor"
             :editor="editor"
diff --git a/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue b/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
index 58f30aac6d..02633e36c9 100644
--- a/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
+++ b/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
@@ -427,9 +427,11 @@ const closeTextArea = () => {
       </NcButton>
     </NcTooltip>
 
-    <NcButton v-if="enableCloseButton" class="mr-2" type="text" size="small" @click="closeTextArea">
-      <GeneralIcon icon="close" />
-    </NcButton>
+    <div class="!sticky right-0.5 bg-white">
+      <NcButton v-if="enableCloseButton" type="text" size="small" @click="closeTextArea">
+        <GeneralIcon icon="close" />
+      </NcButton>
+    </div>
   </div>
 </template>
 

From a45c77c2f4321bb030a8fb6f267b9d157a72300d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:58 +0000
Subject: [PATCH 62/88] fix(nc-gui): rich text modal size persist issue

---
 .../cell/RichText/SelectedBubbleMenu.vue      |  2 +-
 packages/nc-gui/components/cell/TextArea.vue  | 50 +++++++++++--------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue b/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
index 02633e36c9..4d24ac49c7 100644
--- a/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
+++ b/packages/nc-gui/components/cell/RichText/SelectedBubbleMenu.vue
@@ -427,7 +427,7 @@ const closeTextArea = () => {
       </NcButton>
     </NcTooltip>
 
-    <div class="!sticky right-0.5 bg-white">
+    <div class="!sticky right-0 pr-0.5 bg-white">
       <NcButton v-if="enableCloseButton" type="text" size="small" @click="closeTextArea">
         <GeneralIcon icon="close" />
       </NcButton>
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index d6bb5e643c..9256520dae 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -272,37 +272,43 @@ const updateSize = () => {
   }
 }
 
-watch([isVisible, inputRef], (value) => {
-  const observer = new ResizeObserver((entries) => {
-    for (const entry of entries) {
-      const { width, height } = entry.contentRect
+watch(
+  [isVisible, inputRef],
+  (value) => {
+    const observer = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        const { width, height } = entry.contentRect
+
+        if (!isVisible.value) {
+          return
+        }
 
-      if (!isVisible.value) {
-        return
+        localStorage.setItem(STORAGE_KEY, JSON.stringify({ width, height }))
       }
+    })
 
-      localStorage.setItem(STORAGE_KEY, JSON.stringify({ width, height }))
-    }
-  })
-
-  if (value) {
-    if (isRichMode.value && isVisible.value) {
-      setTimeout(() => {
-        const el = document.querySelector('.nc-long-text-expanded-modal .nc-textarea-rich-editor .tiptap') as HTMLElement
+    if (value) {
+      if (isRichMode.value && isVisible.value) {
+        setTimeout(() => {
+          const el = document.querySelector('.nc-long-text-expanded-modal .nc-textarea-rich-editor .tiptap') as HTMLElement
 
-        if (!el) return
+          if (!el) return
 
-        observer.observe(el)
+          observer.observe(el)
 
+          updateSize()
+        }, 50)
+      } else {
         updateSize()
-      }, 50)
+      }
     } else {
-      updateSize()
+      observer.disconnect()
     }
-  } else {
-    observer.disconnect()
-  }
-})
+  },
+  {
+    immediate: true,
+  },
+)
 </script>
 
 <template>

From 465c86cf5e793ea56f4ab4fa11b713bda971a90b Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:59 +0000
Subject: [PATCH 63/88] fix(nc-gui): update workspace icon bg color in left
 sidebar

---
 .../components/general/WorkspaceIcon.vue      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/general/WorkspaceIcon.vue b/packages/nc-gui/components/general/WorkspaceIcon.vue
index af7f6f8483..b4ba52c374 100644
--- a/packages/nc-gui/components/general/WorkspaceIcon.vue
+++ b/packages/nc-gui/components/general/WorkspaceIcon.vue
@@ -4,16 +4,22 @@ import 'emoji-mart-vue-fast/css/emoji-mart.css'
 import { Icon } from '@iconify/vue'
 import { WorkspaceIconType, isColorDark, stringToColor } from '#imports'
 
-const props = defineProps<{
-  workspace: WorkspaceType | undefined
-  workspaceIcon?: {
-    icon: string | Record<string, any>
-    iconType: WorkspaceIconType | string
-  }
-  hideLabel?: boolean
-  size?: 'small' | 'medium' | 'large' | 'xlarge'
-  isRounded?: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    workspace: WorkspaceType | undefined
+    workspaceIcon?: {
+      icon: string | Record<string, any>
+      iconType: WorkspaceIconType | string
+    }
+    hideLabel?: boolean
+    size?: 'small' | 'medium' | 'large' | 'xlarge'
+    isRounded?: boolean
+    iconBgColor?: string
+  }>(),
+  {
+    iconBgColor: '#F4F4F5',
+  },
+)
 
 const { workspace } = toRefs(props)
 
@@ -50,10 +56,10 @@ const workspaceColor = computed(() => {
         return ''
       }
       case WorkspaceIconType.EMOJI: {
-        return '#F4F4F5'
+        return props.iconBgColor
       }
       case WorkspaceIconType.ICON: {
-        return '#F4F4F5'
+        return props.iconBgColor
       }
 
       default: {

From 456b3ca224e147c5a376e976ae31ea9131dc9fb7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:59 +0000
Subject: [PATCH 64/88] fix(nc-gui): active table cell blue border overflow
 issue on first row, last row and first col after sticky column

---
 .../smartsheet/grid/InfiniteTable.vue         | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index 2df1f9f187..ff077a8269 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -2870,7 +2870,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
     top: 0;
     left: 0;
     width: 100%;
-    box-shadow: 0 0 0 2px #3366ff !important;
+    box-shadow: 0 0 0 1.5px #3366ff !important;
     border-radius: 2px;
   }
 
@@ -2887,7 +2887,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
 
   // todo: replace with css variable
   td.filling::after {
-    @apply border-1 border-dashed text-primary border-current bg-gray-100 bg-opacity-50;
+    @apply !border-1 border-dashed text-primary border-current bg-gray-100 bg-opacity-50;
   }
 
   //td.active::before {
@@ -2924,6 +2924,35 @@ watch(vSelectedAllRecords, (selectedAll) => {
       background: white;
       @apply border-r-1 border-r-gray-100;
     }
+
+    tbody {
+      tr:not(.nc-grid-add-new-cell):not(.placeholder) td:nth-child(3) {
+        &.active-cell {
+          @apply border-l-[1.5px] !border-l-transparent;
+        }
+        &.filling::after {
+          left: 0px;
+        }
+      }
+
+      tr:not(.nc-grid-add-new-cell):not(.placeholder):nth-child(1) td {
+        &.active-cell {
+          @apply border-t-[1.5px] !border-t-transparent;
+        }
+        &.filling::after {
+          top: 0px;
+        }
+      }
+
+      tr:not(.nc-grid-add-new-cell):not(.placeholder):nth-last-child(2) td {
+        &.active-cell {
+          @apply border-b-[1.5px] !border-b-transparent;
+        }
+        &.filling::after {
+          bottom: 0px;
+        }
+      }
+    }
   }
 
   .nc-grid-skeleton-loader {

From c5d96d7d5d09d74f15152a62a04faee32da4d26c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:39:59 +0000
Subject: [PATCH 65/88] fix(nc-gui): ai review changes

---
 packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index ff077a8269..64b3b6786c 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -2887,7 +2887,7 @@ watch(vSelectedAllRecords, (selectedAll) => {
 
   // todo: replace with css variable
   td.filling::after {
-    @apply !border-1 border-dashed text-primary border-current bg-gray-100 bg-opacity-50;
+    @apply border-1 border-dashed text-primary border-current bg-gray-100 bg-opacity-50;
   }
 
   //td.active::before {

From c7b8f4667937990bd60791e9db13931c4792218c Mon Sep 17 00:00:00 2001
From: Yoones Khoshghadam <yooneskh@gmail.com>
Date: Sat, 7 Dec 2024 09:45:29 +0000
Subject: [PATCH 66/88] fix (nc-gui): use autocomplete attributes on non-ee
 auth components

---
 packages/nc-gui/pages/signin.vue           | 3 +++
 packages/nc-gui/pages/signup/[[token]].vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/nc-gui/pages/signin.vue b/packages/nc-gui/pages/signin.vue
index cdde347c1e..d9d06efb98 100644
--- a/packages/nc-gui/pages/signin.vue
+++ b/packages/nc-gui/pages/signin.vue
@@ -107,6 +107,8 @@ function navigateForgotPassword() {
               <a-form-item :label="$t('labels.email')" name="email" :rules="formRules.email">
                 <a-input
                   v-model:value="form.email"
+                  type="email"
+                  autocomplete="email"
                   data-testid="nc-form-signin__email"
                   size="large"
                   :placeholder="$t('msg.info.signUp.workEmail')"
@@ -117,6 +119,7 @@ function navigateForgotPassword() {
               <a-form-item :label="$t('labels.password')" name="password" :rules="formRules.password">
                 <a-input-password
                   v-model:value="form.password"
+                  autocomplete="current-password"
                   data-testid="nc-form-signin__password"
                   size="large"
                   class="password"
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index 7cd8d313a3..c2f1f2e95d 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -151,6 +151,8 @@ onMounted(async () => {
               <a-form-item :label="$t('labels.email')" name="email" :rules="formRules.email">
                 <a-input
                   v-model:value="form.email"
+                  type="email"
+                  autocomplete="email"
                   size="large"
                   :placeholder="$t('msg.info.signUp.workEmail')"
                   @focus="resetError"
@@ -160,6 +162,7 @@ onMounted(async () => {
               <a-form-item :label="$t('labels.password')" name="password" :rules="formRules.password">
                 <a-input-password
                   v-model:value="form.password"
+                  autocomplete="new-password"
                   size="large"
                   class="password"
                   :placeholder="$t('msg.info.signUp.enterPassword')"

From 3eedbaa924654ec49d72d1895bbacc3849563e5f Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Sat, 7 Dec 2024 15:42:20 +0530
Subject: [PATCH 67/88] Update source file en.json

---
 packages/nc-gui/lang/en.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 86900a1cc3..338311b1ec 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -661,8 +661,8 @@
     "confirmRestore": "Confirm Restore",
     "visibilityAndDataHandling": "Visibility & Data Handling",
     "visibilityConfigLabel": "Base specific additional configurations to customise data display & default behaviours.",
-    "snapShotSubText": "Snapshots are complete backups of your database at the time of creation. Restoring a snapshot duplicates the data.",
-    "newSnapshot": "New snapshot",
+    "snapShotSubText": "Snapshots serve as comprehensive backups of your base, capturing its state at the time of creation. Restoring a snapshot creates a new instance of the base in the designated workspace.",
+    "newSnapshot": "New Snapshot",
     "searchASnapshot": "Search a snapshot",
     "continue": "Continue",
     "toggleExperimentalFeature": "Enable or disable experimental features with ease, allowing you to explore and evaluate upcoming functionalities.",
@@ -804,7 +804,7 @@
     "icon": "Icon",
     "max": "Max",
     "enableRichText": "Enable rich text",
-    "idColon": "Id:",
+    "idColon": "Id: {id}",
     "copiedRecordURL": "Copied Record URL",
     "copyRecordURL": "Copy Record URL",
     "duplicateRecord": "Duplicate record",
@@ -890,7 +890,7 @@
     "lengthValue": "Length/ value",
     "dbType": "Database Type",
     "servername": "servername / hostAddr",
-    "sqliteFile": "SQLite File",
+    "sqliteFile": "SQLite file path",
     "hostAddress": "Host address",
     "port": "Port number",
     "username": "Username",
@@ -954,7 +954,7 @@
       "joinCommunity": "Join NocoDB Community",
       "joinReddit": "/r/NocoDB",
       "followNocodb": "Follow NocoDB",
-      "communityTranslated": "(Community Translated)"
+      "communityTranslated": "(Community/AI Translated)"
     },
     "twitter": "Twitter",
     "docReference": "Document Reference",
@@ -1037,7 +1037,7 @@
     "appearanceSettings": "Appearance settings",
     "backgroundColor": "Background Color",
     "hideNocodbBranding": "Hide NocoDB Branding",
-    "showOnConditions": "Show on condtions",
+    "showOnConditions": "Show on conditions",
     "showFieldOnConditionsMet": "Shows field only when conditions are met",
     "limitOptions": "Limit options",
     "limitOptionsSubtext": "Limit options visible to users by selecting available options",
@@ -1087,7 +1087,7 @@
     "toggleSidebar": "Toggle Sidebar",
     "addEndDate": "Add end date",
     "endDate": "End Date",
-    "withEndDate": "with end date",
+    "withEndDate": "With end date",
     "calendar": "Calendar",
     "viewSettings": "View settings",
     "googleOAuth": "Google OAuth",
@@ -1640,7 +1640,7 @@
       "apiOptions": "Access Base via",
       "submitAnotherForm": "Show 'Submit Another Form' button",
       "showBlankForm": "Show a blank form after 5 seconds",
-      "emailForm": "E-mail me at",
+      "emailForm": "Email responses to",
       "showSysFields": "Show system fields",
       "filterAutoApply": "Auto apply",
       "formDisplayMessage": "Display Message",
@@ -1648,7 +1648,7 @@
       "showAllViews": "Show all shared views of this table",
       "collabView": "Collaborators with edit permissions or higher can change the view configuration.",
       "lockedView": "No one can edit the view configuration until it is unlocked.",
-      "personalView": "Only you can edit the view configuration. Other collaborators’ personal views are hidden by default.",
+      "personalView": "Only you can edit the view configuration.",
       "canEditLockedViewConfiguration": "Unlock this view to edit the view configuration.",
       "cannotEditViewConfiguration": "You connot configure this view",
       "onlyYouCanConfigureThisView": "Only {user} can edit the view configuration.",

From 1686474904a305189a9feee590fa4109bfffd653 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:32:57 +0530
Subject: [PATCH 68/88] chore: hide beta (#9995)

Co-authored-by: mertmit <mertmit99@gmail.com>
---
 .../smartsheet/column/ButtonOptions.vue       |  16 +-
 .../smartsheet/column/EditOrAdd.vue           |  14 +-
 .../smartsheet/column/LongTextOptions.vue     | 238 +++++++++++++++++-
 3 files changed, 255 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
index ba039be412..53d1bd7aae 100644
--- a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
@@ -26,6 +26,8 @@ const { isUIAllowed } = useRoles()
 
 const { getMeta } = useMetas()
 
+const { isFeatureEnabled } = useBetaFeatureToggle()
+
 const vModel = useVModel(props, 'value', emit)
 
 const meta = inject(MetaInj, ref())
@@ -58,11 +60,15 @@ const buttonTypes = [
     label: t('labels.runWebHook'),
     value: ButtonActionsType.Webhook,
   },
-  {
-    label: t('labels.generateFieldDataUsingAi'),
-    value: ButtonActionsType.Ai,
-    tooltip: t('tooltip.generateFieldDataUsingAiButtonOption'),
-  },
+  ...(isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+    ? [
+        {
+          label: t('labels.generateFieldDataUsingAi'),
+          value: ButtonActionsType.Ai,
+          tooltip: t('tooltip.generateFieldDataUsingAiButtonOption'),
+        },
+      ]
+    : []),
 ]
 
 const supportedColumns = computed(
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 3f65429185..28bfe0dd7e 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -183,9 +183,21 @@ const uiFilters = (t: UiTypesType) => {
   const specificDBType = t.name === UITypes.SpecificDBType && isXcdbBase(meta.value?.source_id)
   const showDeprecatedField = !t.deprecated || showDeprecated.value
 
+  const hideAiPromptOnEdit = !((t.name === AIPrompt || t.name === AIButton) && isEdit.value)
+
+  const hideBetaAi = !(t.name === AIPrompt || t.name === AIButton) || isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+
   const isAllowToAddInFormView = isForm.value ? !formViewHiddenColTypes.includes(t.name) : true
 
-  return systemFiledNotEdited && geoDataToggle && !specificDBType && showDeprecatedField && isAllowToAddInFormView
+  return (
+    systemFiledNotEdited &&
+    geoDataToggle &&
+    !specificDBType &&
+    showDeprecatedField &&
+    isAllowToAddInFormView &&
+    hideAiPromptOnEdit &&
+    hideBetaAi
+  )
 }
 
 const extraIcons = ref<Record<string, string>>({})
diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 45c9a829db..f172c87049 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -5,7 +5,81 @@ const props = defineProps<{
   value: any
 }>()
 
-const emit = defineEmits(['update:value'])
+const emit = defineEmits(['update:modelValue', 'navigateToIntegrations'])
+
+const { t } = useI18n()
+
+const meta = inject(MetaInj)!
+
+const workspaceStore = useWorkspace()
+const { activeWorkspaceId } = storeToRefs(workspaceStore)
+
+const availableFields = computed(() => {
+  if (!meta.value?.columns) return []
+  return meta.value.columns.filter((c) => c.title && !c.system && c.uidt !== UITypes.ID)
+})
+
+const vModel = useVModel(props, 'modelValue', emit)
+
+const { isEdit, setAdditionalValidations, column, formattedData, loadData, disableSubmitBtn } = useColumnCreateStoreOrThrow()
+
+const { aiIntegrationAvailable, generateRows } = useNocoAi()
+
+const { isFeatureEnabled } = useBetaFeatureToggle()
+
+const previewRow = ref<Row>({
+  row: {},
+  oldRow: {},
+  rowMeta: { new: true },
+})
+
+const previewFieldTitle = ref(vModel.value.title || 'temp_title')
+
+const generatingPreview = ref(false)
+
+const isAlreadyGenerated = ref(false)
+
+const isPreviewEnabled = computed(() => {
+  const isFieldAddedInPromt = availableFields.value.some((f) => {
+    return vModel.value.prompt_raw?.includes(`{${f.title}}`)
+  })
+
+  return isFieldAddedInPromt
+})
+
+const isEnabledGenerateText = computed({
+  get: () => {
+    return vModel.value.meta?.[LongTextAiMetaProp]
+  },
+  set: (value: boolean) => {
+    vModel.value.meta[LongTextAiMetaProp] = value
+    vModel.value.prompt_raw = ''
+    previewRow.value.row = {}
+    isAlreadyGenerated.value = false
+  },
+})
+
+const loadViewData = async () => {
+  if (!formattedData.value.length) {
+    await loadData(undefined, false)
+  }
+}
+
+const generate = async () => {
+  generatingPreview.value = true
+
+  await loadViewData()
+
+  const pk = formattedData.value.length ? extractPkFromRow(unref(formattedData.value[0].row), meta.value?.columns || []) : ''
+
+  if (!formattedData.value.length || !pk) {
+    message.error('Include at least 1 sample record in table to generate')
+    generatingPreview.value = false
+
+    return
+  }
+
+  previewFieldTitle.value = vModel.value?.title || 'temp_title'
 
 const vModel = useVModel(props, 'value', emit)
 
@@ -26,13 +100,163 @@ watch(richMode, () => {
 <template>
   <div class="flex flex-col gap-2">
     <a-form-item>
-      <div class="flex items-center gap-1">
-        <NcSwitch v-model:checked="richMode">
-          <div class="text-sm text-gray-800 select-none">
-            {{ $t('labels.enableRichText') }}
+      <NcTooltip :disabled="!isEnabledGenerateText">
+        <template #title> Rich text formatting is not supported when generate text using AI is enabled </template>
+        <div class="flex items-center gap-1">
+          <NcSwitch v-model:checked="richMode" :disabled="isEnabledGenerateText">
+            <div class="text-sm text-gray-800 select-none font-semibold">
+              {{ $t('labels.enableRichText') }}
+            </div>
+          </NcSwitch>
+        </div>
+      </NcTooltip>
+    </a-form-item>
+
+    <template v-if="isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)">
+      <div class="relative">
+        <a-form-item class="flex items-center">
+          <NcTooltip :disabled="!richMode" class="flex items-center">
+            <template #title> Generate text using AI is not supported when rich text formatting is enabled </template>
+
+            <NcSwitch
+              v-model:checked="isEnabledGenerateText"
+              :disabled="richMode"
+              class="nc-ai-field-generate-text nc-ai-input"
+              @change="handleDisableSubmitBtn"
+            >
+              <span
+                class="text-sm font-semibold pl-1"
+                :class="{
+                  'text-nc-content-purple-dark': isEnabledGenerateText,
+                  'text-nc-content-gray': !isEnabledGenerateText,
+                }"
+              >
+                Generate text using AI
+              </span>
+            </NcSwitch>
+          </NcTooltip>
+          <NcTooltip class="ml-2 mr-[40px] flex cursor-pointer">
+            <template #title> Use AI to generate content based on record data. </template>
+            <GeneralIcon
+              icon="info"
+              class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5"
+            />
+          </NcTooltip>
+          <div class="flex-1"></div>
+
+          <div class="absolute right-0">
+            <AiSettings
+              v-model:fk-integration-id="vModel.fk_integration_id"
+              v-model:model="vModel.model"
+              v-model:randomness="vModel.randomness"
+              :workspace-id="activeWorkspaceId"
+              :show-tooltip="false"
+              :is-edit-column="isEdit"
+              placement="bottomRight"
+            >
+              <NcButton size="xs" theme="ai" class="!px-1" type="text">
+                <GeneralIcon icon="settings" />
+              </NcButton>
+            </AiSettings>
           </div>
-        </NcSwitch>
+        </a-form-item>
       </div>
-    </a-form-item>
+      <template v-if="!isEdit ? aiIntegrationAvailable && isEnabledGenerateText : isEnabledGenerateText">
+        <a-form-item class="flex">
+          <div class="nc-prompt-input-wrapper bg-nc-bg-gray-light rounded-lg w-full">
+            <AiPromptWithFields
+              v-model="vModel.prompt_raw"
+              :options="availableFields"
+              :read-only="!aiIntegrationAvailable"
+              placeholder="Write custom AI Prompt instruction here"
+              prompt-field-tag-class-name="!text-nc-content-purple-dark font-weight-500"
+              suggestion-icon-class-name="!text-nc-content-purple-medium"
+            />
+            <div class="rounded-b-lg flex items-center gap-1.5 p-1">
+              <GeneralIcon icon="info" class="!text-nc-content-purple-medium w-3.5 h-3.5" />
+              <span class="text-xs text-nc-content-gray-subtle2"
+                >Mention fields using curly braces, e.g. <span class="text-nc-content-purple-dark">{Field name}</span>.</span
+              >
+            </div>
+          </div>
+        </a-form-item>
+        <div v-if="aiIntegrationAvailable && isEnabledGenerateText" class="nc-ai-options-preview overflow-hidden">
+          <div>
+            <div
+              class="flex items-center gap-2 transition-all duration-300"
+              :class="{
+                'pl-3 py-2 pr-2': !isAlreadyGenerated,
+                'pl-3 py-1 pr-1 border-b-1 border-nc-border-gray-medium': isAlreadyGenerated,
+              }"
+            >
+              <div class="flex flex-col flex-1 gap-1">
+                <div class="flex items-center gap-2">
+                  <span class="text-sm font-bold text-nc-content-gray-subtle">Preview</span>
+                  <NcTooltip class="flex cursor-pointer">
+                    <template #title> Preview is generated using the first record in this table</template>
+                    <GeneralIcon
+                      icon="info"
+                      class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5"
+                    />
+                  </NcTooltip>
+                </div>
+                <span v-if="!isAlreadyGenerated" class="text-[11px] leading-[18px] text-nc-content-gray-muted">
+                  Include at least 1 field in prompt.
+                </span>
+              </div>
+
+              <NcTooltip :disabled="isPreviewEnabled">
+                <template #title> Include at least 1 field in prompt to generate </template>
+                <NcButton
+                  class="nc-aioptions-preview-generate-btn"
+                  :class="{
+                    'nc-is-already-generated': isAlreadyGenerated,
+                    'nc-preview-enabled': isPreviewEnabled,
+                  }"
+                  size="xs"
+                  :type="isAlreadyGenerated ? 'text' : 'secondary'"
+                  :theme="isPreviewEnabled ? 'ai' : 'default'"
+                  :disabled="!isPreviewEnabled"
+                  :loading="generatingPreview"
+                  @click.stop="generate"
+                >
+                  <div
+                    :class="{
+                      'nc-animate-dots min-w-[91px] text-left': generatingPreview,
+                      'min-w-[102px]': isAlreadyGenerated && generatingPreview,
+                      'min-w-[80px]': !isAlreadyGenerated && generatingPreview,
+                    }"
+                  >
+                    {{
+                      isAlreadyGenerated
+                        ? generatingPreview
+                          ? 'Re-generating'
+                          : 'Re-generate'
+                        : generatingPreview
+                        ? 'Generating'
+                        : 'Generate preview'
+                    }}
+                  </div>
+                </NcButton>
+              </NcTooltip>
+            </div>
+            <div v-if="previewRow.row?.[previewFieldTitle]?.value">
+              <div class="relative">
+                <LazySmartsheetRow :row="previewRow">
+                  <LazySmartsheetCell
+                    :edit-enabled="true"
+                    :model-value="previewRow.row[previewFieldTitle]"
+                    :column="vModel"
+                    class="!border-none h-auto my-auto pl-1"
+                  />
+                </LazySmartsheetRow>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+    </template>
+
+    <AiIntegrationNotFound v-if="!aiIntegrationAvailable && isEnabledGenerateText" />
   </div>
 </template>

From be06331b32b650f3a88d957e35ead236d8f33f59 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 9 Dec 2024 06:57:33 +0000
Subject: [PATCH 69/88] fix: duplicate model - skip column if missing in source
 table

---
 .../src/modules/jobs/jobs/export-import/import.service.ts   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index 3644306618..326f4b0c79 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -230,7 +230,11 @@ export class ImportService {
               sanitizeColumnName(a.column_name, source.type) ===
                 col.column_name,
           );
-          idMap.set(colRef.id, col.id);
+
+          // if column is not found, it means not present in the import data and should be skipped
+          if (colRef) {
+            idMap.set(colRef.id, col.id);
+          }
 
           // setval for auto increment column in pg
           if (source.type === 'pg') {

From 6a1603243a36125564b58395cd7c74fbeb6de948 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 9 Dec 2024 06:57:33 +0000
Subject: [PATCH 70/88] refactor: hide unavailable integrations

---
 .../integrations/IntegrationsTab.vue          | 107 ++++++++++--------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
index b78cc7e68b..76c6638037 100644
--- a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
+++ b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
+import { IntegrationCategoryType } from 'nocodb-sdk'
 import NcModal from '~/components/nc/Modal.vue'
 /* eslint-disable @typescript-eslint/consistent-type-imports */
-import { IntegrationCategoryType, type IntegrationItemType, SyncDataType } from '#imports'
+import { type IntegrationItemType, SyncDataType } from '#imports'
 
 const props = withDefaults(
   defineProps<{
@@ -18,6 +19,8 @@ const props = withDefaults(
     showFilter: false,
   },
 )
+const easterEggCount = ref(0)
+const easterEggToggle = computed(() => easterEggCount.value > 2)
 
 const { isModal, filterCategory, filterIntegration } = props
 
@@ -144,6 +147,7 @@ const integrationsMapByCategory = computed(() => {
           list: getIntegrationsByCategory(curr.value, searchQuery.value),
           isAvailable: curr.isAvailable,
           teleEventName: curr.teleEventName,
+          value: curr.value,
         }
 
         return acc
@@ -243,7 +247,7 @@ watch(activeViewTab, (value) => {
             <GeneralIcon icon="arrowLeft" />
           </NcButton>
           <GeneralIcon icon="gitCommit" class="flex-none h-5 w-5" />
-          <div class="flex-1 text-base font-weight-700">New Connection</div>
+          <div class="flex-1 text-base font-weight-700" @dblclick="easterEggCount++">New Connection</div>
           <div class="flex items-center gap-3">
             <NcButton size="small" type="text" @click="isAddNewIntegrationModalOpen = false">
               <GeneralIcon icon="close" class="text-gray-600" />
@@ -265,7 +269,7 @@ watch(activeViewTab, (value) => {
               }"
             >
               <div class="flex-1">
-                <div class="text-sm font-normal text-gray-600 mb-2">
+                <div class="text-sm font-normal text-gray-600 mb-2" @dblclick="easterEggCount++">
                   <div>
                     Connect integrations with NocoDB.
                     <a href="https://docs.nocodb.com/category/integrations" target="_blank" rel="noopener noreferrer"
@@ -275,6 +279,7 @@ watch(activeViewTab, (value) => {
                 </div>
                 <div class="flex items-center gap-2 !max-w-[400px]">
                   <a-input
+                    v-if="easterEggToggle"
                     v-model:value="searchQuery"
                     type="text"
                     class="flex-1 nc-input-border-on-value nc-search-integration-input !min-w-[300px] nc-input-sm flex-none"
@@ -285,7 +290,7 @@ watch(activeViewTab, (value) => {
                       <GeneralIcon icon="search" class="mr-2 h-4 w-4 text-gray-500" />
                     </template>
                   </a-input>
-                  <NcDropdown v-if="showFilter" v-model:visible="isOpenFilter">
+                  <NcDropdown v-if="easterEggToggle && showFilter" v-model:visible="isOpenFilter">
                     <NcButton size="small" type="secondary">
                       <div class="flex items-center gap-2">
                         <GeneralIcon icon="filter" />
@@ -328,7 +333,13 @@ watch(activeViewTab, (value) => {
                   </NcDropdown>
                 </div>
               </div>
-              <NcButton type="ghost" size="small" class="!text-primary" @click="requestIntegration.isOpen = true">
+              <NcButton
+                v-if="easterEggToggle"
+                type="ghost"
+                size="small"
+                class="!text-primary"
+                @click="requestIntegration.isOpen = true"
+              >
                 Request Integration
               </NcButton>
             </div>
@@ -352,7 +363,11 @@ watch(activeViewTab, (value) => {
                 }"
               >
                 <template v-for="(category, key) in integrationsMapByCategory">
-                  <div v-if="category.list.length" :key="key" class="integration-type-wrapper">
+                  <div
+                    v-if="(easterEggToggle || category.value === IntegrationCategoryType.DATABASE) && category.list.length"
+                    :key="key"
+                    class="integration-type-wrapper"
+                  >
                     <div class="category-type-title flex gap-2">
                       {{ $t(category.title) }}
                       <NcBadge
@@ -363,46 +378,47 @@ watch(activeViewTab, (value) => {
                       >
                     </div>
                     <div v-if="category.list.length" class="integration-type-list">
-                      <NcTooltip
-                        v-for="integration of category.list"
-                        :key="integration.subType"
-                        :disabled="integration?.isAvailable"
-                        placement="bottom"
-                      >
-                        <template #title>{{ $t('tooltip.comingSoonIntegration') }}</template>
-
-                        <div
-                          :tabindex="0"
-                          class="source-card focus-visible:outline-none outline-none h-full"
-                          :class="{
-                            'is-available': integration?.isAvailable,
-                          }"
-                          @click="handleAddIntegration(key, integration)"
+                      <template v-for="integration of category.list" :key="integration.subType">
+                        <NcTooltip
+                          v-if="easterEggToggle || integration.isAvailable"
+                          :disabled="integration?.isAvailable"
+                          placement="bottom"
                         >
-                          <div class="integration-icon-wrapper">
-                            <component :is="integration.icon" class="integration-icon" :style="integration.iconStyle" />
-                          </div>
-                          <div class="flex-1">
-                            <div class="name">{{ $t(integration.title) }}</div>
-                            <div v-if="integration.subtitle" class="subtitle flex-1">{{ $t(integration.subtitle) }}</div>
-                          </div>
-                          <div v-if="integration?.isAvailable" class="action-btn">+</div>
-                          <div v-else class="">
-                            <NcButton
-                              type="secondary"
-                              size="xs"
-                              class="integration-upvote-btn !rounded-lg !px-1 !py-0"
-                              :class="{
-                                selected: upvotesData.has(integration.subType),
-                              }"
-                            >
-                              <div class="flex items-center gap-2">
-                                <GeneralIcon icon="ncArrowUp" />
-                              </div>
-                            </NcButton>
+                          <template #title>{{ $t('tooltip.comingSoonIntegration') }}</template>
+
+                          <div
+                            :tabindex="0"
+                            class="source-card focus-visible:outline-none outline-none h-full"
+                            :class="{
+                              'is-available': integration?.isAvailable,
+                            }"
+                            @click="handleAddIntegration(key, integration)"
+                          >
+                            <div class="integration-icon-wrapper">
+                              <component :is="integration.icon" class="integration-icon" :style="integration.iconStyle" />
+                            </div>
+                            <div class="flex-1">
+                              <div class="name">{{ $t(integration.title) }}</div>
+                              <div v-if="integration.subtitle" class="subtitle flex-1">{{ $t(integration.subtitle) }}</div>
+                            </div>
+                            <div v-if="integration?.isAvailable" class="action-btn">+</div>
+                            <div v-else class="">
+                              <NcButton
+                                type="secondary"
+                                size="xs"
+                                class="integration-upvote-btn !rounded-lg !px-1 !py-0"
+                                :class="{
+                                  selected: upvotesData.has(integration.subType),
+                                }"
+                              >
+                                <div class="flex items-center gap-2">
+                                  <GeneralIcon icon="ncArrowUp" />
+                                </div>
+                              </NcButton>
+                            </div>
                           </div>
-                        </div>
-                      </NcTooltip>
+                        </NcTooltip>
+                      </template>
                     </div>
                   </div>
                 </template>
@@ -569,8 +585,7 @@ watch(activeViewTab, (value) => {
             @apply text-gray-800;
           }
         }
-
-        &:not(.is-available) {
+        z &:not(.is-available) {
           &:not(:hover) {
             .integration-icon-wrapper {
               // @apply bg-gray-50;

From d3ceb9a5171386109ccc118052378e4c476c820f Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 9 Dec 2024 06:57:33 +0000
Subject: [PATCH 71/88] refactor: use feature flags

---
 .../workspace/integrations/IntegrationsTab.vue         | 10 ++++++----
 packages/nc-gui/composables/useBetaFeatureToggle.ts    |  7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
index 76c6638037..c8bfa8d247 100644
--- a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
+++ b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
@@ -19,8 +19,6 @@ const props = withDefaults(
     showFilter: false,
   },
 )
-const easterEggCount = ref(0)
-const easterEggToggle = computed(() => easterEggCount.value > 2)
 
 const { isModal, filterCategory, filterIntegration } = props
 
@@ -30,6 +28,10 @@ const { t } = useI18n()
 
 const { syncDataUpvotes, updateSyncDataUpvotes } = useGlobal()
 
+const { isFeatureEnabled } = useBetaFeatureToggle()
+
+const easterEggToggle = computed(() => isFeatureEnabled(FEATURE_FLAG.INTEGRATIONS))
+
 const router = useRouter()
 const route = router.currentRoute
 
@@ -247,7 +249,7 @@ watch(activeViewTab, (value) => {
             <GeneralIcon icon="arrowLeft" />
           </NcButton>
           <GeneralIcon icon="gitCommit" class="flex-none h-5 w-5" />
-          <div class="flex-1 text-base font-weight-700" @dblclick="easterEggCount++">New Connection</div>
+          <div class="flex-1 text-base font-weight-700">New Connection</div>
           <div class="flex items-center gap-3">
             <NcButton size="small" type="text" @click="isAddNewIntegrationModalOpen = false">
               <GeneralIcon icon="close" class="text-gray-600" />
@@ -269,7 +271,7 @@ watch(activeViewTab, (value) => {
               }"
             >
               <div class="flex-1">
-                <div class="text-sm font-normal text-gray-600 mb-2" @dblclick="easterEggCount++">
+                <div class="text-sm font-normal text-gray-600 mb-2">
                   <div>
                     Connect integrations with NocoDB.
                     <a href="https://docs.nocodb.com/category/integrations" target="_blank" rel="noopener noreferrer"
diff --git a/packages/nc-gui/composables/useBetaFeatureToggle.ts b/packages/nc-gui/composables/useBetaFeatureToggle.ts
index a8d9955cef..a148adbc22 100644
--- a/packages/nc-gui/composables/useBetaFeatureToggle.ts
+++ b/packages/nc-gui/composables/useBetaFeatureToggle.ts
@@ -15,6 +15,13 @@ const FEATURES = [
     enabled: false,
     isEngineering: true,
   },
+  {
+    id: 'integrations',
+    title: 'Integrations',
+    description: 'Enable dynamic integrations.',
+    enabled: false,
+    isEngineering: true,
+  },
   {
     id: 'geodata_column',
     title: 'Geodata column',

From 52ef43f8e19a88a9858c82748f6555c0e9b8868a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 9 Dec 2024 13:03:08 +0530
Subject: [PATCH 72/88] Update
 packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../components/workspace/integrations/IntegrationsTab.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
index c8bfa8d247..7369c060dc 100644
--- a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
+++ b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
@@ -587,7 +587,7 @@ watch(activeViewTab, (value) => {
             @apply text-gray-800;
           }
         }
-        z &:not(.is-available) {
+        &:not(.is-available) {
           &:not(:hover) {
             .integration-icon-wrapper {
               // @apply bg-gray-50;

From f1fca236f2ca046272374ad7a5e747a6a0844ea6 Mon Sep 17 00:00:00 2001
From: navi <oof1lab@gmail.com>
Date: Mon, 9 Dec 2024 13:39:45 +0530
Subject: [PATCH 73/88] New translations en.json (Dutch)

---
 packages/nc-gui/lang/nl.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index 1d3c3eda48..9c36576a4a 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -297,7 +297,7 @@
     "languages": "Talen",
     "extension": "Extensie",
     "extensions": "Extensies",
-    "enable": "Enable",
+    "enable": "Inschakelen",
     "poweredBy": "Powered by",
     "nocoAI": "Noco AI",
     "you": "You"
@@ -636,20 +636,20 @@
     "noConditionsAdded": "Geen voorwaarden toegevoegd",
     "noAiIntegrationAvailable": "No AI Integrations available.",
     "nocoAiBaseBuilder": "Noco AI Base Builder",
-    "additionalDetails": "Additional Details",
-    "aiIntegrationMissing": "AI Integration missing",
-    "noAiIntegrationsHaveBeenAdded": "No AI Integrations have been added.",
+    "additionalDetails": "Aanvullende details",
+    "aiIntegrationMissing": "AI-integratie ontbreekt",
+    "noAiIntegrationsHaveBeenAdded": "Er zijn geen AI-integraties toegevoegd.",
     "generatingBaseTailoredToYourRequirement": "Generating a Base tailored to your requirement...",
     "hereYourCrmBase": "Here’s your CRM Base",
-    "lockThisView": "Lock this view",
+    "lockThisView": "Vergrendel deze weergave",
     "lockThisViewSubtle": "Locking this view will prevent anyone from changing the view settings until it is unlocked by a collaborator with creator permissions.",
     "unlockViewTitle": "Are you sure you want to unlock this view?",
-    "unlockViewTitleSubtitle": "This view was locked by",
-    "thisViewIsLockType": "This view is {type}",
-    "thisFormIsLocked": "This Form is currently locked",
-    "unlockThisVieToMakeChanges": "Unlock this view to make changes",
+    "unlockViewTitleSubtitle": "Deze weergave is vergrendeld door",
+    "thisViewIsLockType": "Deze weergave is {type}",
+    "thisFormIsLocked": "Dit formulier is momenteel vergrendeld",
+    "unlockThisVieToMakeChanges": "Ontgrendel deze weergave om wijzigingen aan te brengen",
     "yourBaseRole": "Your base role",
-    "lockedByUser": "Locked by {user}"
+    "lockedByUser": "Geblokkeerd door {user}"
   },
   "labels": {
     "snapshotCreationFailed": "Snapshot creation failed",
@@ -1086,7 +1086,7 @@
     "goToToday": "Ga naar Vandaag",
     "toggleSidebar": "Toggle Zijbalk",
     "addEndDate": "Voeg einddatum toe",
-    "endDate": "End Date",
+    "endDate": "Einddatum",
     "withEndDate": "with end date",
     "calendar": "Kalender",
     "viewSettings": "Bekijk instellingen",

From 818d9344e9a934c4d18ba54fae581b378725feb9 Mon Sep 17 00:00:00 2001
From: "Mert E." <mertmit99@gmail.com>
Date: Mon, 9 Dec 2024 11:15:36 +0300
Subject: [PATCH 74/88] chore: preps (#9994)

* chore: preps

Signed-off-by: mertmit <mertmit99@gmail.com>

* test: fix unit

Signed-off-by: mertmit <mertmit99@gmail.com>

---------

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/ai/PromptWithFields.vue |  83 ++++++++--
 packages/nc-gui/components/ai/Settings.vue    |  36 ++++-
 packages/nc-gui/components/cell/AI.vue        |  53 +++++--
 packages/nc-gui/components/cell/TextArea.vue  |  96 ++++++++---
 .../components/cell/attachment/index.vue      |   2 +-
 .../components/general/IntegrationIcon.vue    |   2 +-
 packages/nc-gui/components/general/Loader.vue |   6 +-
 packages/nc-gui/components/nc/Button.vue      |   9 +-
 .../nc-gui/components/nc/List/RecordItem.vue  |   2 +-
 packages/nc-gui/components/nc/Switch.vue      |   4 +-
 .../nc-gui/components/smartsheet/Cell.vue     |  82 +++++++---
 .../nc-gui/components/smartsheet/Gallery.vue  |   2 +-
 .../nc-gui/components/smartsheet/Kanban.vue   |   2 +-
 .../components/smartsheet/PlainCell.vue       |   7 +
 .../smartsheet/column/AiButtonOptions.vue     |  17 +-
 .../smartsheet/column/ButtonOptions.vue       |   4 +-
 .../smartsheet/column/EditOrAdd.vue           |  34 +++-
 .../smartsheet/column/LongTextOptions.vue     | 109 ++++++++++++-
 .../column/UITypesOptionsWithSearch.vue       |   4 +-
 .../components/smartsheet/details/Fields.vue  |   4 +
 .../smartsheet/expanded-form/index.vue        |   4 +
 .../smartsheet/grid/GroupByTable.vue          |   1 +
 .../smartsheet/grid/InfiniteTable.vue         |  16 +-
 .../components/smartsheet/grid/Table.vue      |  16 +-
 .../components/smartsheet/header/Cell.vue     |  11 +-
 .../components/smartsheet/header/CellIcon.ts  |   4 +-
 .../components/smartsheet/header/Menu.vue     |  27 +++-
 .../smartsheet/header/VirtualCell.vue         |   7 +-
 .../smartsheet/toolbar/ViewActionMenu.vue     |   4 +
 .../nc-gui/components/virtual-cell/Button.vue |   2 +-
 .../components/virtual-cell/HasMany.vue       |   4 +-
 .../components/virtual-cell/ManyToMany.vue    |   4 +-
 .../virtual-cell/components/ListItem.vue      |   4 +-
 .../workspace/integrations/ConnectionsTab.vue |   6 -
 .../integrations/IntegrationsTab.vue          |   3 +
 .../integrations/forms/EditOrAddCommon.vue    |   8 +-
 .../integrations/forms/EditOrAddDatabase.vue  |  12 +-
 .../workspace/project/AiCreateProject.vue     |  31 ++--
 .../composables/useColumnCreateStore.ts       |   6 +-
 packages/nc-gui/composables/useData.ts        |   3 +-
 .../nc-gui/composables/useInfiniteData.ts     |   3 +-
 .../composables/useIntegrationsStore.ts       |  63 ++++++--
 .../composables/useMultiSelect/index.ts       |  11 +-
 packages/nc-gui/composables/useNocoAi.ts      |  38 ++---
 .../nc-gui/helpers/parsers/parserHelpers.ts   |  12 +-
 .../tiptapExtensions/mention/FieldList.vue    |  18 ++-
 packages/nc-gui/nuxt.config.ts                |   4 +
 packages/nc-gui/utils/cell.ts                 |   4 +-
 packages/nc-gui/utils/columnUtils.ts          |  58 +++++--
 packages/nc-gui/utils/commonUtils.ts          |  44 +++++
 packages/nocodb-sdk/src/lib/Api.ts            |   3 -
 packages/nocodb-sdk/src/lib/UITypes.ts        |  12 +-
 packages/nocodb-sdk/src/lib/globals.ts        |   2 +
 .../nocodb-sdk/src/lib/helperFunctions.ts     |  16 ++
 packages/nocodb-sdk/src/lib/index.ts          |   1 +
 packages/nocodb/src/db/BaseModelSqlv2.ts      |  88 ++++++++--
 packages/nocodb/src/db/conditionV2.ts         |  19 +++
 .../src/db/formulav2/formulaQueryBuilderv2.ts |  42 +++++
 packages/nocodb/src/db/sortV2.ts              |  29 +++-
 .../meta/migrations/XcMigrationSourcev2.ts    |   4 +
 .../meta/migrations/v2/nc_069_ai_prompt.ts    |  29 ++++
 packages/nocodb/src/models/AIColumn.ts        |  48 ++++++
 packages/nocodb/src/models/Column.ts          | 113 +++++++++++++
 packages/nocodb/src/models/Integration.ts     |  58 +++++++
 packages/nocodb/src/models/LongTextColumn.ts  | 113 +++++++++++++
 packages/nocodb/src/models/index.ts           |   2 +
 .../jobs/export-import/duplicate.processor.ts |   9 +-
 .../jobs/jobs/export-import/export.service.ts |  32 +++-
 .../jobs/jobs/export-import/import.service.ts |  45 +++++-
 .../nocodb/src/services/columns.service.ts    | 106 ++++++++++++-
 packages/nocodb/src/utils/dataConversion.ts   | 150 ++++++++++++++++++
 packages/nocodb/src/utils/globals.ts          |   7 +-
 72 files changed, 1636 insertions(+), 278 deletions(-)
 create mode 100644 packages/nocodb/src/meta/migrations/v2/nc_069_ai_prompt.ts
 create mode 100644 packages/nocodb/src/models/AIColumn.ts
 create mode 100644 packages/nocodb/src/models/LongTextColumn.ts
 create mode 100644 packages/nocodb/src/utils/dataConversion.ts

diff --git a/packages/nc-gui/components/ai/PromptWithFields.vue b/packages/nc-gui/components/ai/PromptWithFields.vue
index 3b56693836..219f6cd597 100644
--- a/packages/nc-gui/components/ai/PromptWithFields.vue
+++ b/packages/nc-gui/components/ai/PromptWithFields.vue
@@ -3,6 +3,7 @@ import Placeholder from '@tiptap/extension-placeholder'
 import StarterKit from '@tiptap/starter-kit'
 import Mention from '@tiptap/extension-mention'
 import { EditorContent, useEditor } from '@tiptap/vue-3'
+import tippy from 'tippy.js'
 import { type ColumnType, UITypes } from 'nocodb-sdk'
 import FieldList from '~/helpers/tiptapExtensions/mention/FieldList'
 import suggestion from '~/helpers/tiptapExtensions/mention/suggestion.ts'
@@ -15,6 +16,7 @@ const props = withDefaults(
     promptFieldTagClassName?: string
     suggestionIconClassName?: string
     placeholder?: string
+    readOnly?: boolean
   }>(),
   {
     options: () => [],
@@ -26,6 +28,7 @@ const props = withDefaults(
      * @example: :placeholder="`Enter prompt here...\n\neg : Categorise this {Notes}`"
      */
     placeholder: 'Write your prompt here...',
+    readOnly: false,
   },
 )
 
@@ -38,7 +41,9 @@ const vModel = computed({
   },
 })
 
-const { autoFocus } = toRefs(props)
+const { autoFocus, readOnly } = toRefs(props)
+
+const debouncedLoadMentionFieldTagTooltip = useDebounceFn(loadMentionFieldTagTooltip, 1000)
 
 const editor = useEditor({
   content: vModel.value,
@@ -55,18 +60,25 @@ const editor = useEditor({
         ...suggestion(FieldList),
         items: ({ query }) => {
           if (query.length === 0) return props.options ?? []
-          return props.options?.filter((o) => o.title?.toLowerCase()?.includes(query.toLowerCase())) ?? []
+          return (
+            props.options?.filter(
+              (o) =>
+                o.title?.toLowerCase()?.includes(query.toLowerCase()) || `${o.title?.toLowerCase()}}` === query.toLowerCase(),
+            ) ?? []
+          )
         },
         char: '{',
         allowSpaces: true,
       },
       renderHTML: ({ node }) => {
+        const matchedOption = props.options?.find((option) => option.title === node.attrs.id)
+        const isAttachment = matchedOption?.uidt === UITypes.Attachment
         return [
           'span',
           {
-            class: `prompt-field-tag ${
-              props.options?.find((option) => option.title === node.attrs.id)?.uidt === UITypes.Attachment ? '!bg-green-200' : ''
-            } ${props.promptFieldTagClassName}`,
+            'class': `prompt-field-tag ${isAttachment ? '!bg-green-200' : ''} ${props.promptFieldTagClassName}`,
+            'style': 'max-width: 100px; white-space: nowrap; overflow: hidden; display: inline-block; text-overflow: ellipsis;', // Enforces truncation
+            'data-tooltip': node.attrs.id, // Tooltip content
           },
           `${node.attrs.id}`,
         ]
@@ -93,8 +105,10 @@ const editor = useEditor({
     text = text.trim()
 
     vModel.value = text
+
+    debouncedLoadMentionFieldTagTooltip()
   },
-  editable: true,
+  editable: !readOnly.value,
   autofocus: autoFocus.value,
   editorProps: { scrollThreshold: 100 },
 })
@@ -141,15 +155,60 @@ onMounted(async () => {
     }, 100)
   }
 })
+
+const tooltipInstances: any[] = []
+
+function loadMentionFieldTagTooltip() {
+  document.querySelectorAll('.nc-ai-prompt-with-fields .prompt-field-tag').forEach((el) => {
+    const tooltip = Object.values(el.attributes).find((attr) => attr.name === 'data-tooltip')
+    if (!tooltip || el.scrollWidth <= el.clientWidth) return
+    // Show tooltip only on truncate
+    const instance = tippy(el, {
+      content: `<div class="tooltip text-xs">${tooltip.value}</div>`,
+      placement: 'top',
+      allowHTML: true,
+      arrow: true,
+      animation: 'fade',
+      duration: 0,
+      maxWidth: '200px',
+    })
+
+    tooltipInstances.push(instance)
+  })
+}
+
+onMounted(() => {
+  debouncedLoadMentionFieldTagTooltip()
+})
+
+onBeforeUnmount(() => {
+  tooltipInstances.forEach((instance) => instance?.destroy())
+  tooltipInstances.length = 0
+})
 </script>
 
 <template>
   <div class="nc-ai-prompt-with-fields w-full">
     <EditorContent ref="editorDom" :editor="editor" @keydown.alt.enter.stop @keydown.shift.enter.stop />
 
-    <NcButton size="xs" type="text" class="nc-prompt-with-field-suggestion-btn !px-1" @click.stop="newFieldSuggestionNode">
+    <NcButton
+      size="xs"
+      type="text"
+      class="nc-prompt-with-field-suggestion-btn !px-1"
+      :disabled="readOnly"
+      @click.stop="newFieldSuggestionNode"
+    >
       <slot name="triggerIcon">
-        <GeneralIcon icon="ncPlusSquareSolid" class="text-nc-content-brand" :class="`${suggestionIconClassName}`" />
+        <GeneralIcon
+          icon="ncPlusSquareSolid"
+          class="text-nc-content-brand"
+          :class="[
+            `${suggestionIconClassName}`,
+            {
+              'opacity-75': readOnly,
+            },
+          ]"
+        />
       </slot>
     </NcButton>
   </div>
@@ -160,11 +219,11 @@ onMounted(async () => {
   @apply relative;
 
   .nc-prompt-with-field-suggestion-btn {
-    @apply absolute top-[1px] right-[1px];
+    @apply absolute top-[2px] right-[1px];
   }
 
   .prompt-field-tag {
-    @apply bg-gray-100 rounded-md px-1;
+    @apply bg-gray-100 rounded-md px-1 align-middle;
   }
 
   .ProseMirror {
@@ -172,6 +231,10 @@ onMounted(async () => {
     resize: vertical;
     min-width: 100%;
     max-height: min(800px, calc(100vh - 200px)) !important;
+
+    & > p {
+      @apply mr-3;
+    }
   }
 
   .ProseMirror-focused {
diff --git a/packages/nc-gui/components/ai/Settings.vue b/packages/nc-gui/components/ai/Settings.vue
index 2b9d66db1c..20b3e650fe 100644
--- a/packages/nc-gui/components/ai/Settings.vue
+++ b/packages/nc-gui/components/ai/Settings.vue
@@ -7,9 +7,11 @@ const props = withDefaults(
     workspaceId: string
     scope?: string
     showTooltip?: boolean
+    isEditColumn?: boolean
   }>(),
   {
     showTooltip: true,
+    isEditColumn: false,
   },
 )
 
@@ -19,6 +21,8 @@ const vFkIntegrationId = useVModel(props, 'fkIntegrationId', emits)
 
 const vModel = useVModel(props, 'model', emits)
 
+const { isEditColumn } = toRefs(props)
+
 // const vRandomness = useVModel(props, 'randomness', emits)
 
 const { $api } = useNuxtApp()
@@ -29,7 +33,7 @@ const lastIntegrationId = ref<string | null>(null)
 
 const isDropdownOpen = ref(false)
 
-const availableModels = ref<string[]>([])
+const availableModels = ref<{ value: string; label: string }[]>([])
 
 const isLoadingAvailableModels = ref<boolean>(false)
 
@@ -50,10 +54,10 @@ const onIntegrationChange = async (newFkINtegrationId?: string) => {
 
   try {
     const response = await $api.integrations.endpoint(newFkINtegrationId, 'availableModels', {})
-    availableModels.value = response as string[]
+    availableModels.value = (response || []) as { value: string; label: string }[]
 
     if (!vModel.value && availableModels.value.length > 0) {
-      vModel.value = availableModels.value[0]
+      vModel.value = availableModels.value[0].value
     }
   } catch (error) {
     console.error(error)
@@ -63,6 +67,10 @@ const onIntegrationChange = async (newFkINtegrationId?: string) => {
 }
 
 onMounted(async () => {
+  if (isEditColumn.value) {
+    return
+  }
+
   if (!vFkIntegrationId.value) {
     if (aiIntegrations.value.length > 0 && aiIntegrations.value[0].id) {
       vFkIntegrationId.value = aiIntegrations.value[0].id
@@ -72,6 +80,10 @@ onMounted(async () => {
     }
   } else {
     lastIntegrationId.value = vFkIntegrationId.value
+
+    if (!vModel.value || !availableModels.value.length) {
+      onIntegrationChange()
+    }
   }
 })
 </script>
@@ -111,6 +123,7 @@ onMounted(async () => {
                 v-model:value="vFkIntegrationId"
                 class="w-full nc-select-shadow nc-ai-input"
                 size="middle"
+                placeholder="- select integration -"
                 @change="onIntegrationChange"
               >
                 <a-select-option v-for="integration in aiIntegrations" :key="integration.id" :value="integration.id">
@@ -150,20 +163,21 @@ onMounted(async () => {
                 v-model:value="vModel"
                 class="w-full nc-select-shadow nc-ai-input"
                 size="middle"
+                placeholder="- select model -"
                 :disabled="!vFkIntegrationId || availableModels.length === 0"
                 :loading="isLoadingAvailableModels"
               >
-                <a-select-option v-for="md in availableModels" :key="md" :value="md">
+                <a-select-option v-for="md in availableModels" :key="md.label" :value="md.value">
                   <div class="w-full flex gap-2 items-center">
                     <NcTooltip class="flex-1 truncate" show-on-truncate-only>
                       <template #title>
-                        {{ md }}
+                        {{ md.label }}
                       </template>
-                      {{ md }}
+                      {{ md.label }}
                     </NcTooltip>
                     <component
                       :is="iconMap.check"
-                      v-if="vModel === md"
+                      v-if="vModel === md.value"
                       id="nc-selected-item-icon"
                       class="text-nc-content-purple-medium w-4 h-4"
                     />
@@ -198,4 +212,10 @@ onMounted(async () => {
   </NcDropdown>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+:deep(.nc-select.ant-select) {
+  .ant-select-selector {
+    @apply !rounded-lg;
+  }
+}
+</style>
diff --git a/packages/nc-gui/components/cell/AI.vue b/packages/nc-gui/components/cell/AI.vue
index aa5ea1e2c6..ff2e8bbfe5 100644
--- a/packages/nc-gui/components/cell/AI.vue
+++ b/packages/nc-gui/components/cell/AI.vue
@@ -13,6 +13,10 @@ const { generateRows, generatingRows, generatingColumnRows, aiIntegrations } = u
 
 const { row } = useSmartsheetRowStoreOrThrow()
 
+const { isUIAllowed } = useRoles()
+
+const isPublic = inject(IsPublicInj, ref(false))
+
 const meta = inject(MetaInj, ref())
 
 const column = inject(ColumnInj) as Ref<
@@ -40,9 +44,7 @@ const isAiEdited = ref(false)
 const isFieldAiIntegrationAvailable = computed(() => {
   const fkIntegrationId = column.value?.colOptions?.fk_integration_id
 
-  if (!fkIntegrationId) return false
-
-  return ncIsArrayIncludes(aiIntegrations.value, fkIntegrationId, 'id')
+  return !!fkIntegrationId
 })
 
 const pk = computed(() => {
@@ -58,7 +60,7 @@ const generate = async () => {
     ncIsString(column.value.colOptions?.output_column_ids) && column.value.colOptions.output_column_ids.split(',').length > 1
       ? column.value.colOptions.output_column_ids.split(',')
       : []
-  const outputColumns = outputColumnIds.map((id) => meta.value?.columnsById[id])
+  const outputColumns = outputColumnIds.map((id) => meta.value?.columnsById?.[id]).filter(Boolean)
 
   generatingRows.value.push(pk.value)
   generatingColumnRows.value.push(column.value.id)
@@ -76,11 +78,18 @@ const generate = async () => {
       }
     } else {
       const obj: AIRecordType = resRow[column.value.title!]
+
       if (obj && typeof obj === 'object') {
         vModel.value = obj
         setTimeout(() => {
           isAiEdited.value = false
         }, 100)
+      } else {
+        vModel.value = {
+          ...(ncIsObject(vModel.value) ? vModel.value : {}),
+          isStale: false,
+          value: resRow[column.value.title!],
+        }
       }
     }
   }
@@ -99,10 +108,16 @@ const isLoading = computed(() => {
 })
 
 const handleSave = () => {
+  vModel.value = { ...vModel.value }
+
   emits('save')
 }
 
 const debouncedSave = useDebounceFn(handleSave, 1000)
+
+const isDisabledAiButton = computed(() => {
+  return !isFieldAiIntegrationAvailable.value || isLoading.value || isPublic.value || !isUIAllowed('dataEdit')
+})
 </script>
 
 <template>
@@ -113,20 +128,15 @@ const debouncedSave = useDebounceFn(handleSave, 1000)
       'justify-center': isGrid && !isExpandedForm,
     }"
   >
-    <NcTooltip :disabled="isFieldAiIntegrationAvailable" class="flex">
+    <NcTooltip :disabled="isFieldAiIntegrationAvailable || isPublic || isUIAllowed('dataEdit')" class="flex">
       <template #title>
         {{ aiIntegrations.length ? $t('tooltip.aiIntegrationReConfigure') : $t('tooltip.aiIntegrationAddAndReConfigure') }}
       </template>
-      <button
-        class="nc-cell-ai-button nc-cell-button h-7"
-        size="small"
-        :disabled="!isFieldAiIntegrationAvailable || isLoading"
-        @click.stop="generate"
-      >
+      <button class="nc-cell-ai-button nc-cell-button h-6" size="small" :disabled="isDisabledAiButton" @click.stop="generate">
         <div class="flex items-center gap-1">
-          <GeneralLoader v-if="isLoading" size="regular" class="!text-nc-content-purple-dark" />
-          <GeneralIcon v-else icon="ncAutoAwesome" class="text-nc-content-purple-dark h-4 w-4" />
-          <span class="text-sm font-semibold">Generate</span>
+          <GeneralLoader v-if="isLoading" size="regular" />
+          <GeneralIcon v-else icon="ncAutoAwesome" class="h-4 w-4" />
+          <span class="text-small leading-[18px] truncate font-medium">Generate</span>
         </div>
       </button>
     </NcTooltip>
@@ -147,10 +157,19 @@ const debouncedSave = useDebounceFn(handleSave, 1000)
 
 <style scoped lang="scss">
 .nc-cell-button {
-  @apply rounded-lg px-2 flex items-center gap-2 transition-all justify-center border-1 border-nc-border-gray-medium;
+  @apply rounded-md px-2 flex items-center gap-2 transition-all justify-center bg-purple-100 hover:bg-purple-200 text-gray-700;
 
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.06), 0px 5px 3px -2px rgba(0, 0, 0, 0.02);
 
+  .nc-loader {
+    @apply !text-purple-600;
+  }
+
+  &:focus-within {
+    @apply outline-none ring-0;
+    box-shadow: 0px 0px 0px 2px #fff, 0px 0px 0px 4px #3069fe;
+  }
+
   &[disabled] {
     @apply !bg-gray-100 opacity-50;
   }
@@ -162,6 +181,10 @@ const debouncedSave = useDebounceFn(handleSave, 1000)
   &:has(.nc-cell-ai-button) {
     @apply !border-none;
     box-shadow: none !important;
+
+    &:focus-within:not(.nc-readonly-div-data-cell):not(.nc-system-field) {
+      box-shadow: none !important;
+    }
   }
 }
 </style>
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 9256520dae..c51602a5c5 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -14,6 +14,8 @@ const props = defineProps<{
 
 const emits = defineEmits(['update:modelValue', 'update:isAiEdited', 'generate', 'close'])
 
+const meta = inject(MetaInj, ref())
+
 const column = inject(ColumnInj)
 
 const editEnabled = inject(EditModeInj, ref(false))
@@ -34,7 +36,9 @@ const readOnly = inject(ReadonlyInj, ref(false))
 
 const { showNull, user } = useGlobal()
 
-const { aiLoading, aiIntegrations } = useNocoAi()
+const { currentRow } = useSmartsheetRowStoreOrThrow()
+
+const { aiLoading, aiIntegrations, generatingRows, generatingColumnRows } = useNocoAi()
 
 const baseStore = useBase()
 
@@ -93,6 +97,19 @@ const aiWarningRef = ref<HTMLDivElement>()
 
 const { height: aiWarningRefHeight } = useElementSize(aiWarningRef)
 
+const rowId = computed(() => {
+  return extractPkFromRow(currentRow.value?.row, meta.value!.columns!)
+})
+
+const isAiGenerating = computed(() => {
+  return !!(
+    rowId.value &&
+    column?.value.id &&
+    generatingRows.value.includes(rowId.value) &&
+    generatingColumnRows.value.includes(column.value.id)
+  )
+})
+
 watch(isVisible, () => {
   if (isVisible.value) {
     setTimeout(() => {
@@ -406,8 +423,8 @@ watch(
           @selectstart.capture.stop
           @mousedown.stop
         />
-        <div v-if="!readOnly" class="-mt-1">
-          <div v-if="props.isAi && props.aiMeta?.isStale" ref="aiWarningRef">
+        <div v-if="!readOnly && props.isAi && isExpandedFormOpen" class="-mt-1">
+          <div v-if="props.aiMeta?.isStale" ref="aiWarningRef">
             <div class="flex items-start p-3 bg-nc-bg-purple-light gap-4">
               <GeneralIcon icon="alertTriangleSolid" class="text-nc-content-purple-medium h-4 w-4 flex-none" />
               <div class="flex flex-col">
@@ -419,8 +436,8 @@ watch(
             </div>
           </div>
 
-          <div v-if="props.isAi && !isEditColumn" class="flex items-center gap-2 px-3 py-0.5 !text-small leading-[18px]">
-            <span class="text-nc-content-purple-dark truncate">Generated by AI</span>
+          <div v-if="!isEditColumn" class="flex items-center gap-2 px-3 py-0.5 !text-small leading-[18px]">
+            <span class="text-nc-content-purple-light truncate">Generated by AI</span>
             <NcTooltip v-if="isAiEdited" class="text-nc-content-green-dark flex-1 truncate" show-on-truncate-only>
               <template #title> Edited by you </template>
               Edited by you
@@ -458,12 +475,13 @@ watch(
                 theme="ai"
                 size="xs"
                 :disabled="!isFieldAiIntegrationAvailable"
-                :loading="aiLoading"
+                :loading="isAiGenerating"
                 @click.stop="generate"
               >
                 <template #icon>
-                  <GeneralIcon icon="ncAutoAwesome" />
+                  <GeneralIcon icon="ncAutoAwesome" class="h-4 w-4" />
                 </template>
+                <template #loading> Re-generating... </template>
                 Re-generate
               </NcButton>
             </NcTooltip>
@@ -488,10 +506,8 @@ watch(
 
       <span v-else>{{ vModel }}</span>
 
-      <NcTooltip
-        v-if="!isVisible && !isForm"
-        placement="bottom"
-        class="nc-action-icon !absolute !hidden nc-text-area-expand-btn group-hover:block z-3"
+      <div
+        class="!absolute !hidden nc-text-area-expand-btn group-hover:block z-3 flex items-center gap-1"
         :class="{
           'right-1': isForm,
           'right-0': !isForm,
@@ -504,17 +520,45 @@ watch(
             : undefined
         "
       >
-        <template #title>{{ $t('title.expand') }}</template>
-        <NcButton
-          type="secondary"
-          size="xsmall"
-          data-testid="attachment-cell-file-picker-button"
-          class="!p-0 !w-5 !h-5 !min-w-[fit-content]"
-          @click.stop="onExpand"
+        <NcTooltip
+          v-if="!isVisible && !isForm && !readOnly && props.isAi && !isExpandedFormOpen && !isEditColumn"
+          placement="bottom"
+          class="nc-action-icon"
         >
-          <component :is="iconMap.expand" class="transform group-hover:(!text-grey-800) text-gray-700 text-xs" />
-        </NcButton>
-      </NcTooltip>
+          <template #title>
+            {{ isAiGenerating ? 'Re-generating...' : 'Re-generate' }}
+          </template>
+          <NcButton
+            type="secondary"
+            size="xsmall"
+            class="!p-0 !w-5 !h-5 !min-w-[fit-content]"
+            :disabled="isAiGenerating"
+            loader-size="small"
+            icon-only
+            @click.stop="generate"
+          >
+            <template #icon>
+              <GeneralIcon
+                icon="refresh"
+                class="transform group-hover:(!text-grey-800) text-gray-700 w-3 h-3"
+                :class="{ 'animate-infinite animate-spin': isAiGenerating }"
+              />
+            </template>
+          </NcButton>
+        </NcTooltip>
+        <NcTooltip v-if="!isVisible && !isForm" placement="bottom" class="nc-action-icon">
+          <template #title>{{ $t('title.expand') }}</template>
+          <NcButton
+            type="secondary"
+            size="xsmall"
+            data-testid="attachment-cell-file-picker-button"
+            class="!p-0 !w-5 !h-5 !min-w-[fit-content]"
+            @click.stop="onExpand"
+          >
+            <component :is="iconMap.maximize" class="transform group-hover:(!text-grey-800) text-gray-700 w-3 h-3" />
+          </NcButton>
+        </NcTooltip>
+      </div>
     </div>
     <a-modal
       v-if="isVisible"
@@ -600,15 +644,15 @@ watch(
                   @click.stop="generate"
                 >
                   <div class="flex items-center gap-2">
-                    <GeneralIcon icon="refresh" :class="{ 'animate-infinite animate-spin': aiLoading }" />
-                    <span class="text-sm font-bold">Re-generate</span>
+                    <GeneralIcon icon="refresh" :class="{ 'animate-infinite animate-spin': isAiGenerating }" />
+                    <span class="text-sm font-bold"> {{ isAiGenerating ? 'Re-generating...' : 'Re-generate' }} </span>
                   </div>
                 </NcButton>
               </NcTooltip>
             </div>
           </template>
         </div>
-        <div v-if="props.isAi && props.aiMeta?.isStale && !readOnly" ref="aiWarningRef">
+        <div v-if="props.isAi && props.aiMeta?.isStale && !readOnly" ref="aiWarningRef" class="border-b-1 border-gray-100">
           <div class="flex items-center p-4 bg-nc-bg-purple-light gap-4">
             <GeneralIcon icon="alertTriangleSolid" class="text-nc-content-purple-medium h-6 w-6 flex-none" />
             <div class="flex flex-col">
@@ -679,7 +723,7 @@ textarea:focus {
 <style lang="scss">
 .cell:hover .nc-text-area-expand-btn,
 .long-text-wrapper:hover .nc-text-area-expand-btn {
-  @apply !block cursor-pointer;
+  @apply !flex cursor-pointer;
 }
 
 .nc-grid-cell {
@@ -695,7 +739,7 @@ textarea:focus {
 }
 
 .nc-data-cell {
-  &:has(.nc-cell-ai .nc-expanded-form-open) {
+  &:has(.nc-cell-longtext-ai .nc-expanded-form-open) {
     @apply !border-none -mx-1 -my-1;
     box-shadow: none !important;
 
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 4bb3ba6df2..033b50d8fc 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -424,7 +424,7 @@ defineExpose({
         >
           <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
-          <component :is="iconMap.expand" v-else class="transform group-hover:(!text-grey-800) text-gray-700 text-xs" />
+          <component :is="iconMap.maximize" v-else class="transform group-hover:(!text-grey-800) text-gray-700 w-3 h-3" />
         </NcButton>
       </NcTooltip>
 
diff --git a/packages/nc-gui/components/general/IntegrationIcon.vue b/packages/nc-gui/components/general/IntegrationIcon.vue
index 356bd06e65..645533b22a 100644
--- a/packages/nc-gui/components/general/IntegrationIcon.vue
+++ b/packages/nc-gui/components/general/IntegrationIcon.vue
@@ -2,7 +2,7 @@
 const props = withDefaults(
   defineProps<{
     type: string
-    size: 'sx' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'
+    size?: 'sx' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'
   }>(),
   {
     size: 'sm',
diff --git a/packages/nc-gui/components/general/Loader.vue b/packages/nc-gui/components/general/Loader.vue
index 8949b01f77..515471c0c6 100644
--- a/packages/nc-gui/components/general/Loader.vue
+++ b/packages/nc-gui/components/general/Loader.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup>
 import { LoadingOutlined } from '@ant-design/icons-vue'
 
-const props = defineProps<{
+export interface GeneralLoaderProps {
   size?: 'small' | 'medium' | 'large' | 'xlarge' | 'regular' | number
   loaderClass?: string
-}>()
+}
+
+const props = defineProps<GeneralLoaderProps>()
 
 function getFontSize() {
   const { size = 'medium' } = props
diff --git a/packages/nc-gui/components/nc/Button.vue b/packages/nc-gui/components/nc/Button.vue
index 5336c436df..61edf4934a 100644
--- a/packages/nc-gui/components/nc/Button.vue
+++ b/packages/nc-gui/components/nc/Button.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { ButtonType } from 'ant-design-vue/lib/button'
 import { useSlots } from 'vue'
+import type { GeneralLoaderProps } from '../general/Loader.vue'
 
 /**
  * @description
@@ -19,6 +20,7 @@ interface Props {
   showAsDisabled?: boolean
   type?: ButtonType | 'danger' | 'secondary' | undefined
   size?: NcButtonSize
+  loaderSize?: GeneralLoaderProps['size']
   centered?: boolean
   fullWidth?: boolean
   iconOnly?: boolean
@@ -32,6 +34,7 @@ const props = withDefaults(defineProps<Props>(), {
   disabled: false,
   showAsDisabled: false,
   size: 'medium',
+  loaderSize: 'medium',
   type: 'primary',
   fullWidth: false,
   centered: true,
@@ -47,7 +50,7 @@ const slots = useSlots()
 
 const NcButton = ref<HTMLElement | null>(null)
 
-const { size, type, theme, bordered } = toRefs(props)
+const { size, loaderSize, type, theme, bordered } = toRefs(props)
 
 const loading = useVModel(props, 'loading', emits)
 
@@ -112,7 +115,7 @@ useEventListener(NcButton, 'mousedown', () => {
     >
       <template v-if="iconPosition === 'left'">
         <slot v-if="loading" name="loadingIcon">
-          <GeneralLoader class="flex !bg-inherit !text-inherit" size="medium" />
+          <GeneralLoader class="flex !bg-inherit !text-inherit" :size="loaderSize" />
         </slot>
 
         <slot v-else name="icon" />
@@ -131,7 +134,7 @@ useEventListener(NcButton, 'mousedown', () => {
       </div>
       <template v-if="iconPosition === 'right'">
         <slot v-if="loading" name="loadingIcon">
-          <GeneralLoader v-if="loading" class="flex !bg-inherit !text-inherit" size="medium" />
+          <GeneralLoader class="flex !bg-inherit !text-inherit" :size="loaderSize" />
         </slot>
 
         <slot v-else name="icon" />
diff --git a/packages/nc-gui/components/nc/List/RecordItem.vue b/packages/nc-gui/components/nc/List/RecordItem.vue
index 13039f65c9..a1a82c1bdc 100644
--- a/packages/nc-gui/components/nc/List/RecordItem.vue
+++ b/packages/nc-gui/components/nc/List/RecordItem.vue
@@ -142,7 +142,7 @@ const columnsToRender = computed(() => {
 
           <div v-if="columnsToRender.length > 0" class="flex ml-[-0.25rem] sm:flex-row xs:(flex-col mt-2) gap-4 min-h-5">
             <div v-for="column in columnsToRender" :key="column.id" class="sm:(w-1/3 max-w-1/3 overflow-hidden)">
-              <div v-if="!isRowEmpty({ row }, column)" class="flex flex-col gap-[-1]">
+              <div v-if="!isRowEmpty(currentRow, column)" class="flex flex-col gap-[-1]">
                 <NcTooltip class="z-10 flex" placement="bottomLeft" :arrow-point-at-center="false">
                   <template #title>
                     <LazySmartsheetHeaderVirtualCell
diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 7a99da82dc..1380d99964 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -42,7 +42,7 @@ const onChange = (e: boolean, updateValue = false) => {
     :class="[
       contentWrapperClass,
       {
-        'cursor-not-allowed': disabled,
+        'cursor-not-allowed opacity-60': disabled,
         'cursor-pointer': !disabled,
       },
     ]"
@@ -69,7 +69,7 @@ const onChange = (e: boolean, updateValue = false) => {
     :class="[
       contentWrapperClass,
       {
-        'cursor-not-allowed': disabled,
+        'cursor-not-allowed opacity-60': disabled,
         'cursor-pointer': !disabled,
       },
     ]"
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index d18dc6942b..e1add8bfa1 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -146,6 +146,34 @@ const showCurrentDateOption = computed(() => {
 const currentDate = () => {
   vModel.value = sqlUi.value?.getCurrentDateDefault?.(column.value)
 }
+
+const cellType = computed(() => {
+  if (isAI(column.value)) return 'ai'
+  if (isTextArea(column.value)) return 'textarea'
+  if (isGeoData(column.value)) return 'geoData'
+  if (isBoolean(column.value, abstractType.value)) return 'checkbox'
+  if (isAttachment(column.value)) return 'attachment'
+  if (isSingleSelect(column.value)) return 'singleSelect'
+  if (isMultiSelect(column.value)) return 'multiSelect'
+  if (isDate(column.value, abstractType.value)) return 'datePicker'
+  if (isYear(column.value, abstractType.value)) return 'yearPicker'
+  if (isDateTime(column.value, abstractType.value)) return 'dateTimePicker'
+  if (isTime(column.value, abstractType.value)) return 'timePicker'
+  if (isRating(column.value)) return 'rating'
+  if (isDuration(column.value)) return 'duration'
+  if (isEmail(column.value)) return 'email'
+  if (isURL(column.value)) return 'url'
+  if (isPhoneNumber(column.value)) return 'phoneNumber'
+  if (isPercent(column.value)) return 'percent'
+  if (isCurrency(column.value)) return 'currency'
+  if (isUser(column.value)) return 'user'
+  if (isDecimal(column.value)) return 'decimal'
+  if (isFloat(column.value, abstractType.value)) return 'float'
+  if (isString(column.value, abstractType.value)) return 'text'
+  if (isInt(column.value, abstractType.value)) return 'integer'
+  if (isJSON(column.value)) return 'json'
+  return 'text'
+})
 </script>
 
 <template>
@@ -165,6 +193,7 @@ const currentDate = () => {
         'h-10': !isEditColumnMenu && isForm && !isAttachment(column) && !isTextArea(column) && !isJSON(column) && !props.virtual,
         'nc-grid-numeric-cell-left': (isForm && isNumericField && isExpandedFormOpen) || isEditColumnMenu,
         '!min-h-30': isTextArea(column) && (isForm || isSurveyForm),
+        'nc-cell-longtext-ai': cellType === 'ai',
       },
     ]"
     class="nc-cell w-full h-full relative"
@@ -180,53 +209,58 @@ const currentDate = () => {
           {{ $t('general.generating') }}
         </NcTooltip>
       </div>
-      <LazyCellTextArea v-else-if="isTextArea(column)" v-model="vModel" :virtual="props.virtual" />
-      <LazyCellGeoData v-else-if="isGeoData(column)" v-model="vModel" />
-      <LazyCellCheckbox v-else-if="isBoolean(column, abstractType)" v-model="vModel" />
-      <LazyCellAttachment v-else-if="isAttachment(column)" ref="attachmentCell" v-model="vModel" :row-index="props.rowIndex" />
+      <LazyCellAI v-else-if="cellType === 'ai'" v-model="vModel" @save="emit('save')" />
+      <LazyCellTextArea v-else-if="cellType === 'textarea'" v-model="vModel" :virtual="props.virtual" />
+      <LazyCellGeoData v-else-if="cellType === 'geoData'" v-model="vModel" />
+      <LazyCellCheckbox v-else-if="cellType === 'checkbox'" v-model="vModel" />
+      <LazyCellAttachment
+        v-else-if="cellType === 'attachment'"
+        ref="attachmentCell"
+        v-model="vModel"
+        :row-index="props.rowIndex"
+      />
       <LazyCellSingleSelect
-        v-else-if="isSingleSelect(column)"
+        v-else-if="cellType === 'singleSelect'"
         v-model="vModel"
         :disable-option-creation="!!isEditColumnMenu"
         :row-index="props.rowIndex"
       />
       <LazyCellMultiSelect
-        v-else-if="isMultiSelect(column)"
+        v-else-if="cellType === 'multiSelect'"
         v-model="vModel"
         :disable-option-creation="!!isEditColumnMenu"
         :row-index="props.rowIndex"
       />
       <LazyCellDatePicker
-        v-else-if="isDate(column, abstractType)"
+        v-else-if="cellType === 'datePicker'"
         v-model="vModel"
         :is-pk="isPrimaryKey(column)"
         :show-current-date-option="showCurrentDateOption"
         @current-date="currentDate"
       />
-      <LazyCellYearPicker v-else-if="isYear(column, abstractType)" v-model="vModel" :is-pk="isPrimaryKey(column)" />
+      <LazyCellYearPicker v-else-if="cellType === 'yearPicker'" v-model="vModel" :is-pk="isPrimaryKey(column)" />
       <LazyCellDateTimePicker
-        v-else-if="isDateTime(column, abstractType)"
+        v-else-if="cellType === 'dateTimePicker'"
         v-model="vModel"
         :is-pk="isPrimaryKey(column)"
         :is-updated-from-copy-n-paste="currentRow.rowMeta.isUpdatedFromCopyNPaste"
         :show-current-date-option="showCurrentDateOption"
         @current-date="currentDate"
       />
-      <LazyCellTimePicker v-else-if="isTime(column, abstractType)" v-model="vModel" :is-pk="isPrimaryKey(column)" />
-      <LazyCellRating v-else-if="isRating(column)" v-model="vModel" />
-      <LazyCellDuration v-else-if="isDuration(column)" v-model="vModel" />
-      <LazyCellEmail v-else-if="isEmail(column)" v-model="vModel" />
-      <LazyCellUrl v-else-if="isURL(column)" v-model="vModel" />
-      <LazyCellPhoneNumber v-else-if="isPhoneNumber(column)" v-model="vModel" />
-      <LazyCellPercent v-else-if="isPercent(column)" v-model="vModel" />
-      <LazyCellCurrency v-else-if="isCurrency(column)" v-model="vModel" @save="emit('save')" />
-      <LazyCellUser v-else-if="isUser(column)" v-model="vModel" :row-index="props.rowIndex" />
-      <LazyCellAI v-else-if="isAI(column)" v-model="vModel" @save="emit('save')" />
-      <LazyCellDecimal v-else-if="isDecimal(column)" v-model="vModel" />
-      <LazyCellFloat v-else-if="isFloat(column, abstractType)" v-model="vModel" />
-      <LazyCellText v-else-if="isString(column, abstractType)" v-model="vModel" />
-      <LazyCellInteger v-else-if="isInt(column, abstractType)" v-model="vModel" />
-      <LazyCellJson v-else-if="isJSON(column)" v-model="vModel" />
+      <LazyCellTimePicker v-else-if="cellType === 'timePicker'" v-model="vModel" :is-pk="isPrimaryKey(column)" />
+      <LazyCellRating v-else-if="cellType === 'rating'" v-model="vModel" />
+      <LazyCellDuration v-else-if="cellType === 'duration'" v-model="vModel" />
+      <LazyCellEmail v-else-if="cellType === 'email'" v-model="vModel" />
+      <LazyCellUrl v-else-if="cellType === 'url'" v-model="vModel" />
+      <LazyCellPhoneNumber v-else-if="cellType === 'phoneNumber'" v-model="vModel" />
+      <LazyCellPercent v-else-if="cellType === 'percent'" v-model="vModel" />
+      <LazyCellCurrency v-else-if="cellType === 'currency'" v-model="vModel" @save="emit('save')" />
+      <LazyCellUser v-else-if="cellType === 'user'" v-model="vModel" :row-index="props.rowIndex" />
+      <LazyCellDecimal v-else-if="cellType === 'decimal'" v-model="vModel" />
+      <LazyCellFloat v-else-if="cellType === 'float'" v-model="vModel" />
+      <LazyCellText v-else-if="cellType === 'text'" v-model="vModel" />
+      <LazyCellInteger v-else-if="cellType === 'integer'" v-model="vModel" />
+      <LazyCellJson v-else-if="cellType === 'json'" v-model="vModel" />
       <LazyCellText v-else v-model="vModel" />
       <div
         v-if="
diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index 450c66a442..f97499a6c1 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -373,7 +373,7 @@ reloadViewDataHook?.on(async () => {
         <NcMenu @click="contextMenu = false">
           <NcMenuItem v-if="contextMenuTarget" @click="expandForm(contextMenuTarget.row)">
             <div v-e="['a:row:expand-record']" class="flex items-center gap-2">
-              <component :is="iconMap.expand" class="flex" />
+              <component :is="iconMap.maximize" class="flex" />
               {{ $t('activity.expandRecord') }}
             </div>
           </NcMenuItem>
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue
index ba345d861b..9112ca30ca 100644
--- a/packages/nc-gui/components/smartsheet/Kanban.vue
+++ b/packages/nc-gui/components/smartsheet/Kanban.vue
@@ -1143,7 +1143,7 @@ const handleSubmitRenameOrNewStack = async (loadMeta: boolean, stack?: any, stac
           <NcMenu @click="contextMenu = false">
             <NcMenuItem v-if="contextMenuTarget" @click="expandForm(contextMenuTarget)">
               <div v-e="['a:kanban:expand-record']" class="flex items-center gap-2 nc-kanban-context-menu-item">
-                <component :is="iconMap.expand" class="flex" />
+                <component :is="iconMap.maximize" class="flex" />
                 <!-- Expand Record -->
                 {{ $t('activity.expandRecord') }}
               </div>
diff --git a/packages/nc-gui/components/smartsheet/PlainCell.vue b/packages/nc-gui/components/smartsheet/PlainCell.vue
index 7d7c70b808..ac8a86001d 100644
--- a/packages/nc-gui/components/smartsheet/PlainCell.vue
+++ b/packages/nc-gui/components/smartsheet/PlainCell.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 import {
+  type AIRecordType,
   type BoolType,
   type ButtonType,
   type ColumnType,
   type LookupType,
   type RollupType,
   dateFormats,
+  isAIPromptCol,
   isCreatedOrLastModifiedByCol,
   isCreatedOrLastModifiedTimeCol,
   timeFormats,
@@ -202,6 +204,11 @@ const getTextAreaValue = (modelValue: string | null, col: ColumnType) => {
   if (isRichMode) {
     return modelValue?.replace(/[*_~\[\]]|<\/?[^>]+(>|$)/g, '') || ''
   }
+
+  if (isAIPromptCol(col)) {
+    return (modelValue as AIRecordType)?.value || ''
+  }
+
   return modelValue || ''
 }
 
diff --git a/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
index 3596f971d7..54c8b1e3ab 100644
--- a/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
@@ -366,6 +366,7 @@ onBeforeUnmount(() => {
                       v-model:randomness="vModel.randomness"
                       :workspace-id="activeWorkspaceId"
                       :show-tooltip="false"
+                      :is-edit-column="isEdit"
                       placement="bottomRight"
                     >
                       <NcButton size="xs" theme="ai" class="!px-1" type="text">
@@ -467,7 +468,11 @@ onBeforeUnmount(() => {
                       <a-tag v-if="outputColumnIds.includes(op.id)" :key="op.id" class="nc-ai-button-output-field">
                         <div class="flex flex-row items-center gap-1 py-[2px] text-sm">
                           <component :is="cellIcon(op)" class="!mx-0 !mr-1 opacity-80" />
-                          <span>{{ op.title }}</span>
+                          <NcTooltip show-on-truncate-only class="truncate max-w-[150px]">
+                            <template #title>{{ op.title }}</template>
+                            {{ op.title }}
+                          </NcTooltip>
+
                           <div class="flex items-center p-0.5 mt-0.5">
                             <GeneralIcon
                               icon="close"
@@ -679,8 +684,8 @@ onBeforeUnmount(() => {
                 <div
                   class="flex justify-center nc-ai-button-test-generate-wrapper"
                   :class="{
-                    'text-nc-border-gray-dark': !(selectedRecordPk && outputColumnIds.length && vModel.formula_raw),
-                    'text-nc-content-purple-dark': !!(selectedRecordPk && outputColumnIds.length && vModel.formula_raw),
+                    'text-nc-border-gray-dark': !(selectedRecordPk && outputColumnIds.length && inputColumns.length),
+                    'text-nc-content-purple-dark': !!(selectedRecordPk && outputColumnIds.length && inputColumns.length),
                   }"
                 >
                   <div class="h-2.5 w-2.5 flex-none absolute -top-[30px] border-1 border-current rounded-full bg-current"></div>
@@ -690,7 +695,7 @@ onBeforeUnmount(() => {
                         <div>Preview checklist</div>
                         <div class="flex gap-2">
                           <div
-                            class="h-4 w-4 mt-0.5 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
+                            class="h-4 w-4 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
                             :class="
                               inputColumns.length
                                 ? 'bg-nc-bg-green-dark text-nc-content-green-dark'
@@ -703,7 +708,7 @@ onBeforeUnmount(() => {
                         </div>
                         <div class="flex gap-2">
                           <div
-                            class="h-4 w-4 mt-0.5 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
+                            class="h-4 w-4 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
                             :class="
                               outputColumnIds.length
                                 ? 'bg-nc-bg-green-dark text-nc-content-green-dark'
@@ -716,7 +721,7 @@ onBeforeUnmount(() => {
                         </div>
                         <div class="flex gap-2">
                           <div
-                            class="h-4 w-4 mt-0.5 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
+                            class="h-4 w-4 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
                             :class="
                               selectedRecordPk
                                 ? 'bg-nc-bg-green-dark text-nc-content-green-dark'
diff --git a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
index 53d1bd7aae..25ab0a209b 100644
--- a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
@@ -177,7 +177,7 @@ const validators = {
     },
   ],
 
-  ...((isEdit.value ? vModel.value.colOptions : vModel.value.type) === ButtonActionsType.Ai
+  ...((isEdit.value ? vModel.value.colOptions?.type : vModel.value.type) === ButtonActionsType.Ai
     ? {
         output_column_ids: [
           {
@@ -215,7 +215,7 @@ if (isEdit.value) {
   vModel.value.type = vModel.value?.type || buttonTypes[0].value
 
   if (vModel.value.type === ButtonActionsType.Ai) {
-    vModel.value.theme = 'text'
+    vModel.value.theme = 'light'
     vModel.value.label = 'Generate data'
     vModel.value.color = 'purple'
     vModel.value.icon = 'ncAutoAwesome'
diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index 28bfe0dd7e..e1316e8c3f 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { type ColumnReqType, type ColumnType } from 'nocodb-sdk'
+import { type ColumnReqType, type ColumnType, isAIPromptCol } from 'nocodb-sdk'
 import {
   ButtonActionsType,
   UITypes,
@@ -264,7 +264,7 @@ const handleScrollDebounce = useDebounceFn(() => {
   }
 }, 500)
 
-const onSelectType = (uidt: UITypes | typeof AIButton, fromSearchList = false) => {
+const onSelectType = (uidt: UITypes | typeof AIButton | typeof AIPrompt, fromSearchList = false) => {
   let preload
 
   if (fromSearchList && !isEdit.value && aiAutoSuggestMode.value) {
@@ -276,9 +276,17 @@ const onSelectType = (uidt: UITypes | typeof AIButton, fromSearchList = false) =
     preload = {
       type: ButtonActionsType.Ai,
     }
+  } else if (uidt === AIPrompt) {
+    formState.value.uidt = UITypes.LongText
+    preload = {
+      meta: {
+        [LongTextAiMetaProp]: true,
+      },
+    }
   } else {
     formState.value.uidt = uidt
   }
+
   onUidtOrIdTypeChange(preload)
 
   nextTick(() => {
@@ -618,6 +626,10 @@ const isAiButtonSelectOption = (uidt: string) => {
   return uidt === UITypes.Button && formState.value.uidt === UITypes.Button && formState.value.type === ButtonActionsType.Ai
 }
 
+const isAiPromptSelectOption = (uidt: string) => {
+  return uidt === UITypes.LongText && isAIPromptCol(formState.value)
+}
+
 const aiPromptInputRef = ref<HTMLElement>()
 
 watch(activeAiTab, (newValue) => {
@@ -966,7 +978,7 @@ watch(activeAiTab, (newValue) => {
                 type="primary"
                 theme="ai"
                 :loading="saving"
-                :disabled="disableSubmitBtn || !activeTabSelectedFields.length || saving"
+                :disabled="disableSubmitBtn || saving"
                 size="small"
                 :label="submitBtnLabel.label"
                 :loading-label="submitBtnLabel.loadingLabel"
@@ -1080,14 +1092,20 @@ watch(activeAiTab, (newValue) => {
                 v-bind="validateInfos.uidt"
                 :class="{
                   'ant-select-item-option-active-selected': showHoverEffectOnSelectedType && formState.uidt === opt.name,
-                  '!text-nc-content-purple-dark': [AIButton].includes(opt.name),
+                  '!text-nc-content-purple-dark': [AIPrompt, AIButton].includes(opt.name),
                 }"
                 @mouseover="handleResetHoverEffect"
               >
                 <div class="w-full flex gap-2 items-center justify-between" :data-testid="opt.name" :data-title="formState?.type">
                   <div class="flex-1 flex gap-2 items-center max-w-[calc(100%_-_24px)]">
                     <component
-                      :is="isAiButtonSelectOption(opt.name) && !isColumnTypeOpen ? iconMap.cellAiButton : opt.icon"
+                      :is="
+                        isAiButtonSelectOption(opt.name) && !isColumnTypeOpen
+                          ? iconMap.cellAiButton
+                          : isAiPromptSelectOption(opt.name) && !isColumnTypeOpen
+                          ? iconMap.cellAi
+                          : opt.icon
+                      "
                       class="nc-field-type-icon w-4 h-4"
                       :class="isMetaReadOnly && !readonlyMetaAllowedTypes.includes(opt.name) ? 'text-gray-300' : 'text-gray-700'"
                     />
@@ -1148,7 +1166,11 @@ watch(activeAiTab, (newValue) => {
         <SmartsheetColumnQrCodeOptions v-if="formState.uidt === UITypes.QrCode" v-model="formState" />
         <SmartsheetColumnBarcodeOptions v-if="formState.uidt === UITypes.Barcode" v-model="formState" />
         <SmartsheetColumnCurrencyOptions v-if="formState.uidt === UITypes.Currency" v-model:value="formState" />
-        <SmartsheetColumnLongTextOptions v-if="formState.uidt === UITypes.LongText" v-model:value="formState" />
+        <SmartsheetColumnLongTextOptions
+          v-if="formState.uidt === UITypes.LongText"
+          v-model="formState"
+          @navigate-to-integrations="handleNavigateToIntegrations"
+        />
         <SmartsheetColumnDurationOptions v-if="formState.uidt === UITypes.Duration" v-model:value="formState" />
         <SmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" v-model:value="formState" />
         <SmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" v-model:value="formState" />
diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index f172c87049..68502d38f8 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -1,8 +1,8 @@
-<!-- File not in use for now -->
-
 <script setup lang="ts">
+import { UITypes } from 'nocodb-sdk'
+
 const props = defineProps<{
-  value: any
+  modelValue: any
 }>()
 
 const emit = defineEmits(['update:modelValue', 'navigateToIntegrations'])
@@ -81,7 +81,40 @@ const generate = async () => {
 
   previewFieldTitle.value = vModel.value?.title || 'temp_title'
 
-const vModel = useVModel(props, 'value', emit)
+  const res = await generateRows(
+    meta.value.id!,
+    {
+      title: previewFieldTitle.value,
+      prompt_raw: vModel.value.prompt_raw,
+      fk_integration_id: vModel.value.fk_integration_id,
+      uidt: UITypes.LongText,
+    },
+    [pk],
+  )
+
+  if (res?.length && res[0]?.[previewFieldTitle.value]) {
+    previewRow.value.row = {
+      ...res[0],
+      [previewFieldTitle.value]: {
+        value: res[0]?.[previewFieldTitle.value],
+      },
+    }
+    isAlreadyGenerated.value = true
+  }
+
+  generatingPreview.value = false
+}
+
+onMounted(() => {
+  // set default value
+  vModel.value.prompt_raw = (column?.value?.colOptions as Record<string, any>)?.prompt_raw || ''
+})
+
+if (isEdit.value) {
+  vModel.value.fk_integration_id = vModel.value?.colOptions?.fk_integration_id
+}
+
+provide(EditColumnInj, ref(true))
 
 const richMode = computed({
   get: () => !!vModel.value.meta?.richMode,
@@ -92,13 +125,51 @@ const richMode = computed({
   },
 })
 
+const handleDisableSubmitBtn = () => {
+  if (!isEnabledGenerateText.value) {
+    if (disableSubmitBtn.value) {
+      disableSubmitBtn.value = false
+    }
+
+    return
+  }
+
+  if (isPreviewEnabled.value) {
+    disableSubmitBtn.value = false
+  } else {
+    disableSubmitBtn.value = true
+  }
+}
+
 watch(richMode, () => {
   vModel.value.cdf = null
 })
+
+watch(isPreviewEnabled, handleDisableSubmitBtn, {
+  immediate: true,
+})
+
+watch(
+  isEnabledGenerateText,
+  (newValue) => {
+    if (newValue) {
+      setAdditionalValidations({
+        fk_integration_id: [{ required: true, message: t('title.aiIntegrationMissing') }],
+      })
+    } else {
+      setAdditionalValidations({
+        fk_integration_id: [{ required: false }],
+      })
+    }
+  },
+  {
+    immediate: true,
+  },
+)
 </script>
 
 <template>
-  <div class="flex flex-col gap-2">
+  <div class="flex flex-col gap-4">
     <a-form-item>
       <NcTooltip :disabled="!isEnabledGenerateText">
         <template #title> Rich text formatting is not supported when generate text using AI is enabled </template>
@@ -260,3 +331,31 @@ watch(richMode, () => {
     <AiIntegrationNotFound v-if="!aiIntegrationAvailable && isEnabledGenerateText" />
   </div>
 </template>
+
+<style lang="scss" scoped>
+:deep(.ant-form-item-control-input-content) {
+  @apply flex items-center;
+}
+
+.nc-prompt-input-wrapper {
+  @apply border-1 border-nc-border-gray-medium;
+  box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
+}
+
+.nc-ai-options-preview {
+  @apply rounded-lg border-1 border-nc-border-gray-medium;
+  box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
+
+  :deep(.nc-text-area-expand-btn) {
+    @apply right-1;
+  }
+}
+
+.nc-aioptions-preview-generate-btn {
+  &:not(.nc-is-already-generated) {
+    &.nc-preview-enabled {
+      @apply !border-transparent;
+    }
+  }
+}
+</style>
diff --git a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
index 9c8adf6993..cc2dc7d4e0 100644
--- a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
+++ b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
@@ -20,7 +20,7 @@ const filteredOptions = computed(
   () =>
     options.value?.filter(
       (c) =>
-        !(c.name === 'AIButton' && !isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)) &&
+        !((c.name === 'AIButton' || c.name === 'AIPrompt') && !isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)) &&
         (c.name.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
           (UITypesName[c.name] && UITypesName[c.name].toLowerCase().includes(searchQuery.value.toLowerCase()))),
     ) ?? [],
@@ -126,7 +126,7 @@ watch(
               'hover:bg-gray-100 cursor-pointer': !isDisabledUIType(option.name),
               'bg-gray-100 nc-column-list-option-active': activeFieldIndex === index && !isDisabledUIType(option.name),
               '!text-gray-400 cursor-not-allowed': isDisabledUIType(option.name),
-              '!text-nc-content-purple-dark': option.name === 'AIButton',
+              '!text-nc-content-purple-dark': option.name === 'AIButton' || option.name === 'AIPrompt',
             },
           ]"
           :data-testid="option.name"
diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index 9dbd53d930..f6dafbe49c 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -1037,6 +1037,10 @@ const onClickCopyFieldUrl = async (field: ColumnType) => {
   await copy(field.id!)
 
   isFieldIdCopied.value = true
+
+  await ncDelay(5000)
+
+  isFieldIdCopied.value = false
 }
 
 const keys = useMagicKeys()
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index dec44ec27c..f92d9fb778 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -327,6 +327,10 @@ const copyRecordUrl = async () => {
   )
 
   isRecordLinkCopied.value = true
+
+  await ncDelay(5000)
+
+  isRecordLinkCopied.value = false
 }
 
 const saveChanges = async () => {
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
index a8cd49ace6..a593c281c2 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
@@ -276,6 +276,7 @@ async function deleteSelectedRowsWrapper() {
 </script>
 
 <template>
+  <!-- eslint-disable vue/no-restricted-v-bind -->
   <Table
     v-if="vGroup.rows"
     v-model:selected-all-records="selectedAllRecords"
diff --git a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
index 64b3b6786c..5a128763fd 100644
--- a/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import {
-  ButtonActionsType,
   type ButtonType,
   type ColumnReqType,
   type ColumnType,
@@ -8,6 +7,7 @@ import {
   UITypes,
   type ViewType,
   ViewTypes,
+  isAIPromptCol,
   isCreatedOrLastModifiedByCol,
   isCreatedOrLastModifiedTimeCol,
   isLinksOrLTAR,
@@ -1024,8 +1024,8 @@ const isSelectedOnlyAI = computed(() => {
   if (selectedRange.start.col === selectedRange.end.col) {
     const field = fields.value[selectedRange.start.col]
     return {
-      enabled: field.uidt === UITypes.Button && (field?.colOptions as ButtonType)?.type === ButtonActionsType.Ai,
-      disabled: !ncIsArrayIncludes(aiIntegrations.value, (field?.colOptions as ButtonType)?.fk_integration_id, 'id'),
+      enabled: isAIPromptCol(field) || isAiButton(field),
+      disabled: !(field?.colOptions as ButtonType)?.fk_integration_id,
     }
   }
 
@@ -1048,9 +1048,7 @@ const generateAIBulk = async () => {
 
   let outputColumnIds = [field.id]
 
-  const isAiButton = field.uidt === UITypes.Button && (field?.colOptions as ButtonType)?.type === ButtonActionsType.Ai
-
-  if (isAiButton) {
+  if (isAiButton(field)) {
     outputColumnIds =
       ncIsString(field.colOptions?.output_column_ids) && field.colOptions.output_column_ids.split(',').length > 0
         ? field.colOptions.output_column_ids.split(',')
@@ -2248,13 +2246,13 @@ watch(vSelectedAllRecords, (selectedAll) => {
                             </span>
                             <div
                               v-else-if="!row.rowMeta?.saving && !row.rowMeta?.isLoading"
-                              class="cursor-pointer flex items-center border-1 border-gray-100 active:ring rounded p-1 hover:(bg-gray-50)"
+                              class="cursor-pointer flex items-center border-1 border-gray-100 active:ring rounded-md p-1 hover:(bg-white border-nc-border-gray-medium)"
                             >
                               <component
-                                :is="iconMap.expand"
+                                :is="iconMap.maximize"
                                 v-if="expandForm"
                                 v-e="['c:row-expand:open']"
-                                class="select-none transform hover:(text-black scale-120) nc-row-expand"
+                                class="select-none transform nc-row-expand opacity-90 w-4 h-4"
                                 @click="expandAndLooseFocus(row, state)"
                               />
                             </div>
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index fb8b1cb447..bda48a7293 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -3,9 +3,9 @@ import axios from 'axios'
 import { nextTick } from '@vue/runtime-core'
 import type { ButtonType, ColumnReqType, ColumnType, PaginatedType, TableType, ViewType } from 'nocodb-sdk'
 import {
-  ButtonActionsType,
   UITypes,
   ViewTypes,
+  isAIPromptCol,
   isCreatedOrLastModifiedByCol,
   isCreatedOrLastModifiedTimeCol,
   isLinksOrLTAR,
@@ -852,8 +852,8 @@ const isSelectedOnlyAI = computed(() => {
   if (selectedRange.start.col === selectedRange.end.col) {
     const field = fields.value[selectedRange.start.col]
     return {
-      enabled: field.uidt === UITypes.Button && (field?.colOptions as ButtonType)?.type === ButtonActionsType.Ai,
-      disabled: !ncIsArrayIncludes(aiIntegrations.value, (field?.colOptions as ButtonType)?.fk_integration_id, 'id'),
+      enabled: isAIPromptCol(field) || isAiButton(field),
+      disabled: !(field?.colOptions as ButtonType)?.fk_integration_id,
     }
   }
 
@@ -876,9 +876,7 @@ const generateAIBulk = async () => {
 
   let outputColumnIds = [field.id]
 
-  const isAiButton = field.uidt === UITypes.Button && (field?.colOptions as ButtonType)?.type === ButtonActionsType.Ai
-
-  if (isAiButton) {
+  if (isAiButton(field)) {
     outputColumnIds =
       ncIsString(field.colOptions?.output_column_ids) && field.colOptions.output_column_ids.split(',').length > 0
         ? field.colOptions.output_column_ids.split(',')
@@ -2139,13 +2137,13 @@ onKeyStroke('ArrowDown', onDown)
                             </span>
                             <div
                               v-else-if="!row.rowMeta.saving"
-                              class="cursor-pointer flex items-center border-1 border-gray-100 active:ring rounded p-1 hover:(bg-gray-50)"
+                              class="cursor-pointer flex items-center border-1 border-gray-100 active:ring rounded-md p-1 hover:(bg-white border-nc-border-gray-medium)"
                             >
                               <component
-                                :is="iconMap.expand"
+                                :is="iconMap.maximize"
                                 v-if="expandForm"
                                 v-e="['c:row-expand:open']"
-                                class="select-none transform hover:(text-black scale-120) nc-row-expand"
+                                class="select-none nc-row-expand opacity-90 w-4 h-4"
                                 @click="expandAndLooseFocus(row, state)"
                               />
                             </div>
diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index cf07c2f92e..d32cd46342 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -43,9 +43,16 @@ const editColumnDropdown = ref(false)
 const columnOrder = ref<Pick<ColumnReqType, 'column_order'> | null>(null)
 
 const columnTypeName = computed(() => {
-  if (column.value.uidt === UITypes.LongText && parseProp(column?.value?.meta)?.richMode) {
-    return UITypesName.RichText
+  if (column.value.uidt === UITypes.LongText) {
+    if (parseProp(column.value?.meta)?.richMode) {
+      return UITypesName.RichText
+    }
+
+    if (parseProp(column.value?.meta)?.[LongTextAiMetaProp]) {
+      return UITypesName.AIPrompt
+    }
   }
+
   return column.value.uidt ? UITypesName[column.value.uidt] : ''
 })
 
diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
index 0923872ecd..2ce6e8ac5a 100644
--- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts
+++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts
@@ -20,6 +20,8 @@ const renderIcon = (column: ColumnType, abstractType: any) => {
     return iconMap.cellSingleSelect
   } else if (isBoolean(column, abstractType)) {
     return iconMap.cellCheckbox
+  } else if (isAI(column)) {
+    return iconMap.cellAi
   } else if (isTextArea(column)) {
     return iconMap.cellLongText
   } else if (isEmail(column)) {
@@ -51,8 +53,6 @@ const renderIcon = (column: ColumnType, abstractType: any) => {
       return iconMap.cellUser
     }
     return iconMap.cellUser
-  } else if (isAI(column)) {
-    return iconMap.cellAi
   } else if (isInt(column, abstractType) || isFloat(column, abstractType)) {
     return iconMap.cellNumber
   } else if (isString(column, abstractType)) {
diff --git a/packages/nc-gui/components/smartsheet/header/Menu.vue b/packages/nc-gui/components/smartsheet/header/Menu.vue
index 7da72bdf27..7643370472 100644
--- a/packages/nc-gui/components/smartsheet/header/Menu.vue
+++ b/packages/nc-gui/components/smartsheet/header/Menu.vue
@@ -45,8 +45,21 @@ const { fieldsToGroupBy, groupByLimit } = useViewGroupByOrThrow(view)
 
 const { isUIAllowed, isMetaReadOnly, isDataReadOnly } = useRoles()
 
+const { aiIntegrations } = useNocoAi()
+
 const isLoading = ref<'' | 'hideOrShow' | 'setDisplay'>('')
 
+const columnInvalid = computed<{ isInvalid: boolean; tooltip: string }>(() => {
+  if (!column?.value) {
+    return {
+      isInvalid: false,
+      tooltip: '',
+    }
+  }
+
+  return isColumnInvalid(column.value, aiIntegrations.value, isPublic.value || !isUIAllowed('dataEdit'))
+})
+
 const setAsDisplayValue = async () => {
   isLoading.value = 'setDisplay'
   try {
@@ -415,6 +428,10 @@ const onClickCopyFieldUrl = async (field: ColumnType) => {
   await copy(field.id!)
 
   isFieldIdCopied.value = true
+
+  await ncDelay(5000)
+
+  isFieldIdCopied.value = false
 }
 
 const onDeleteColumn = () => {
@@ -431,7 +448,7 @@ const onDeleteColumn = () => {
     overlay-class-name="nc-dropdown-column-operations !border-1 rounded-lg !shadow-xl "
     @click.stop="openDropdown"
   >
-    <div class="flex gap-0.5 items-center" @dblclick.stop>
+    <div class="flex gap-1 items-center" @dblclick.stop>
       <div v-if="isExpandedForm" class="h-[1px]">&nbsp;</div>
       <NcTooltip v-if="column?.description?.length && !isExpandedForm" class="flex">
         <template #title>
@@ -441,14 +458,10 @@ const onDeleteColumn = () => {
       </NcTooltip>
 
       <NcTooltip class="flex items-center">
-        <GeneralIcon
-          v-if="isColumnInvalid(column) && !isExpandedForm"
-          class="text-orange-500 w-3.5 h-3.5 ml-2"
-          icon="alertTriangle"
-        />
+        <GeneralIcon v-if="columnInvalid.isInvalid && !isExpandedForm" class="text-red-300 w-3.5 h-3.5" icon="alertTriangle" />
 
         <template #title>
-          {{ $t('msg.invalidColumnConfiguration') }}
+          {{ $t(columnInvalid.tooltip) }}
         </template>
       </NcTooltip>
       <GeneralIcon
diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
index 5881ee9081..7dca782e58 100644
--- a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
+++ b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue
@@ -126,13 +126,14 @@ const showTooltipAlways = computed(() => {
 const columnOrder = ref<Pick<ColumnReqType, 'column_order'> | null>(null)
 
 const columnTypeName = computed(() => {
-  if (column.value.uidt === UITypes.LongText && parseProp(column?.value?.meta)?.richMode) {
-    return UITypesName.RichText
-  }
   if (column.value.uidt === UITypes.LinkToAnotherRecord && column.value.colOptions?.type === RelationTypes.ONE_TO_ONE) {
     return UITypesName[UITypes.Links]
   }
 
+  if (isAiButton(column.value)) {
+    return UITypesName.AIButton
+  }
+
   return column.value.uidt ? UITypesName[column.value.uidt] : ''
 })
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index f11c91ab0f..02da9d086d 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -152,6 +152,10 @@ const { copy } = useCopy()
 const onViewIdCopy = async () => {
   await copy(view.value!.id!)
   isViewIdCopied.value = true
+
+  await ncDelay(5000)
+
+  isViewIdCopied.value = false
 }
 
 const onDelete = async () => {
diff --git a/packages/nc-gui/components/virtual-cell/Button.vue b/packages/nc-gui/components/virtual-cell/Button.vue
index d0fe37c7fa..72fe63ee28 100644
--- a/packages/nc-gui/components/virtual-cell/Button.vue
+++ b/packages/nc-gui/components/virtual-cell/Button.vue
@@ -210,7 +210,7 @@ const componentProps = computed(() => {
 
 <style scoped lang="scss">
 .nc-cell-button {
-  @apply rounded-lg px-2 flex items-center gap-2 transition-all justify-center;
+  @apply rounded-md px-2 flex items-center gap-2 transition-all justify-center;
   &:not([class*='text']) {
     box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.06), 0px 5px 3px -2px rgba(0, 0, 0, 0.02);
   }
diff --git a/packages/nc-gui/components/virtual-cell/HasMany.vue b/packages/nc-gui/components/virtual-cell/HasMany.vue
index c7b525d9cc..3fe458d958 100644
--- a/packages/nc-gui/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui/components/virtual-cell/HasMany.vue
@@ -146,8 +146,8 @@ watch(
 
       <div v-if="!isUnderLookup && !isSystemColumn(column)" class="flex justify-end gap-1 min-h-4 items-center">
         <GeneralIcon
-          icon="expand"
-          class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
+          icon="maximize"
+          class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand h-3 w-3"
           @click.stop="openChildList"
         />
 
diff --git a/packages/nc-gui/components/virtual-cell/ManyToMany.vue b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
index a25fdf9b86..e403653e15 100644
--- a/packages/nc-gui/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui/components/virtual-cell/ManyToMany.vue
@@ -145,8 +145,8 @@ watch(
 
       <div v-if="!isUnderLookup || isForm" class="flex justify-end gap-1 min-h-4 items-center">
         <GeneralIcon
-          icon="expand"
-          class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
+          icon="maximize"
+          class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand h-3 w-3"
           @click.stop="openChildList"
         />
 
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index 311192a3c6..d18e1fbf32 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -1,8 +1,6 @@
 <script lang="ts" setup>
 import { UITypes, isVirtualCol, parseStringDateTime } from 'nocodb-sdk'
 
-import MaximizeIcon from '~icons/nc-icons/maximize'
-
 const props = withDefaults(
   defineProps<{
     row: any
@@ -161,7 +159,7 @@ const displayValue = computed(() => {
               class="z-10 flex items-center justify-center nc-expand-item !group-hover:visible !invisible !h-7 !w-7 transition-all !hover:children:(w-4.5 h-4.5)"
               @click.stop="$emit('expand', row)"
             >
-              <MaximizeIcon class="flex-none w-4 h-4 scale-125" />
+              <GeneralIcon icon="maximize" class="flex-none w-4 h-4 scale-125" />
             </button>
           </NcTooltip>
         </div>
diff --git a/packages/nc-gui/components/workspace/integrations/ConnectionsTab.vue b/packages/nc-gui/components/workspace/integrations/ConnectionsTab.vue
index c5ea772a2e..7d00c1a1fd 100644
--- a/packages/nc-gui/components/workspace/integrations/ConnectionsTab.vue
+++ b/packages/nc-gui/components/workspace/integrations/ConnectionsTab.vue
@@ -20,8 +20,6 @@ const {
   setDefaultIntegration,
 } = useIntegrationStore()
 
-const { loadAiIntegrations } = useNocoAi()
-
 const { $api, $e } = useNuxtApp()
 
 const { allCollaborators } = storeToRefs(useWorkspace())
@@ -164,10 +162,6 @@ const onDeleteConfirm = async () => {
         sources: [...base.sources.filter((s) => s.id !== source.id)],
       })
     }
-
-    if (toBeDeletedIntegration.value?.type && toBeDeletedIntegration.value.type === IntegrationCategoryType.AI) {
-      loadAiIntegrations()
-    }
   }
 }
 
diff --git a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
index 7369c060dc..086e2f847b 100644
--- a/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
+++ b/packages/nc-gui/components/workspace/integrations/IntegrationsTab.vue
@@ -44,6 +44,7 @@ const {
   integrationsRefreshKey,
   integrationsCategoryFilter,
   activeViewTab,
+  loadDynamicIntegrations,
 } = useIntegrationStore()
 
 const focusTextArea: VNodeRef = (el) => el && el?.focus?.()
@@ -218,6 +219,8 @@ const toggleShowOrHideAllCategory = () => {
 }
 
 onMounted(() => {
+  loadDynamicIntegrations()
+
   if (!integrationsCategoryFilter.value.length) {
     integrationsCategoryFilter.value = integrationCategoriesRef.value.map((c) => c.value)
   }
diff --git a/packages/nc-gui/components/workspace/integrations/forms/EditOrAddCommon.vue b/packages/nc-gui/components/workspace/integrations/forms/EditOrAddCommon.vue
index 6c1526b33f..e4e2367e42 100644
--- a/packages/nc-gui/components/workspace/integrations/forms/EditOrAddCommon.vue
+++ b/packages/nc-gui/components/workspace/integrations/forms/EditOrAddCommon.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { IntegrationCategoryType, type SyncDataType } from '#imports'
+import type { IntegrationCategoryType, SyncDataType } from '#imports'
 import { clientTypes as _clientTypes } from '#imports'
 
 const props = defineProps<{
@@ -22,8 +22,6 @@ const {
   updateIntegration,
 } = useIntegrationStore()
 
-const { loadAiIntegrations } = useNocoAi()
-
 const isEditMode = computed(() => pageMode.value === IntegrationsPageMode.EDIT)
 
 const initState = ref({
@@ -43,10 +41,6 @@ const { form, formState, isLoading, initialState, submit } = useProvideFormBuild
     try {
       if (pageMode.value === IntegrationsPageMode.ADD) {
         await saveIntegration(formState.value)
-
-        if (props.integrationType === IntegrationCategoryType.AI) {
-          loadAiIntegrations()
-        }
       } else {
         await updateIntegration({
           id: activeIntegration.value?.id,
diff --git a/packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue b/packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue
index 942b2d0807..7a779415fb 100644
--- a/packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue
+++ b/packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue
@@ -658,12 +658,12 @@ watch(
                   >
                     <NcButton
                       type="text"
-                      size="xsmall"
-                      class="nc-extdb-btn-import-url !rounded-md !h-6 !px-2 flex-none"
+                      size="small"
+                      class="nc-extdb-btn-import-url !rounded-md !px-2 flex-none -my-1.5"
                       @click.stop="importURLDlg = true"
                     >
                       <div class="flex items-center gap-2">
-                        <GeneralIcon icon="magic" class="flex-none text-yellow-500" />
+                        <GeneralIcon icon="ncLink" class="flex-none" />
                         {{ $t('activity.useConnectionUrl') }}
                       </div>
                     </NcButton>
@@ -672,7 +672,13 @@ watch(
                         <div class="text-sm text-gray-700">
                           Auto populate connection configuration using database connection URL
                         </div>
+
                         <a-textarea
+                          :ref="
+                            (el) => {
+                              el?.$el?.focus()
+                            }
+                          "
                           v-model:value="importURL"
                           class="!rounded-lg !min-h-[120px] !max-h-[250px] nc-scrollbar-thin"
                         ></a-textarea>
diff --git a/packages/nc-gui/components/workspace/project/AiCreateProject.vue b/packages/nc-gui/components/workspace/project/AiCreateProject.vue
index a6f9443db3..41f0945f14 100644
--- a/packages/nc-gui/components/workspace/project/AiCreateProject.vue
+++ b/packages/nc-gui/components/workspace/project/AiCreateProject.vue
@@ -28,6 +28,8 @@ const { workspaceId, baseType } = toRefs(props)
 
 const { navigateToProject } = useGlobal()
 
+const { $e } = useNuxtApp()
+
 const { clone } = useUndoRedo()
 
 const { aiIntegrationAvailable, aiError, aiLoading, createSchema, predictSchema } = useNocoAi()
@@ -145,6 +147,21 @@ const onPredictSchema = async () => {
   let currentMessageIndex = 0
   let currentCharIndex = 0
 
+  let prompt = `${aiFormState.value.prompt}`
+
+  // Append optional information if provided
+  if (aiFormState.value.organization?.trim()) {
+    prompt += ` | Organization: ${aiFormState.value.organization}`
+  }
+  if (aiFormState.value.industry?.trim()) {
+    prompt += ` | Industry: ${aiFormState.value.industry}`
+  }
+  if (aiFormState.value.audience?.trim()) {
+    prompt += ` | Audience: ${aiFormState.value.audience}`
+  }
+
+  $e('a:base:ai:generate', prompt)
+
   try {
     const displayCharByChar = () => {
       const currentMessage = loadingMessages[currentMessageIndex]
@@ -169,19 +186,6 @@ const onPredictSchema = async () => {
     // Set interval to display characters one by one
     timerId = setInterval(displayCharByChar, 40) // Adjust the speed as needed (100ms)
 
-    let prompt = `${aiFormState.value.prompt}`
-
-    // Append optional information if provided
-    if (aiFormState.value.organization?.trim()) {
-      prompt += ` | Organization: ${aiFormState.value.organization}`
-    }
-    if (aiFormState.value.industry?.trim()) {
-      prompt += ` | Industry: ${aiFormState.value.industry}`
-    }
-    if (aiFormState.value.audience?.trim()) {
-      prompt += ` | Audience: ${aiFormState.value.audience}`
-    }
-
     const res = await predictSchema(prompt)
 
     if (!res?.tables) {
@@ -465,7 +469,6 @@ onMounted(() => {
           </div>
           <div v-if="aiIntegrationAvailable" class="flex items-center gap-3">
             <NcButton
-              v-e="['a:base:ai:generate']"
               size="small"
               :type="aiStep !== AI_STEP.MODIFY || isOldPromptChanged ? 'primary' : 'secondary'"
               theme="ai"
diff --git a/packages/nc-gui/composables/useColumnCreateStore.ts b/packages/nc-gui/composables/useColumnCreateStore.ts
index 945fe139c2..694438f135 100644
--- a/packages/nc-gui/composables/useColumnCreateStore.ts
+++ b/packages/nc-gui/composables/useColumnCreateStore.ts
@@ -1,6 +1,6 @@
 import rfdc from 'rfdc'
 import type { ColumnReqType, ColumnType, TableType } from 'nocodb-sdk'
-import { ButtonActionsType, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
+import { ButtonActionsType, UITypes, isAIPromptCol, isLinksOrLTAR } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import type { RuleObject } from 'ant-design-vue/es/form'
 import { generateUniqueColumnName } from '~/helpers/parsers/parserHelpers'
@@ -110,6 +110,10 @@ const [useProvideColumnCreateStore, useColumnCreateStore] = createInjectionState
         return true
       }
 
+      if (isAIPromptCol(formState.value)) {
+        return true
+      }
+
       return false
     })
 
diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index 595099e069..832319b093 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -1,5 +1,5 @@
 import type { ColumnType, LinkToAnotherRecordType, PaginatedType, RelationTypes, TableType, ViewType } from 'nocodb-sdk'
-import { UITypes, isCreatedOrLastModifiedByCol, isCreatedOrLastModifiedTimeCol } from 'nocodb-sdk'
+import { UITypes, isAIPromptCol, isCreatedOrLastModifiedByCol, isCreatedOrLastModifiedTimeCol } from 'nocodb-sdk'
 import type { ComputedRef, Ref } from 'vue'
 import type { CellRange } from '#imports'
 
@@ -286,6 +286,7 @@ export function useData(args: {
                 col.uidt === UITypes.Lookup ||
                 col.uidt === UITypes.Button ||
                 col.uidt === UITypes.Attachment ||
+                isAIPromptCol(col) ||
                 col.au ||
                 (isValidValue(col?.cdf) && / on update /i.test(col.cdf)))
             )
diff --git a/packages/nc-gui/composables/useInfiniteData.ts b/packages/nc-gui/composables/useInfiniteData.ts
index 367c81d17c..17a94033c6 100644
--- a/packages/nc-gui/composables/useInfiniteData.ts
+++ b/packages/nc-gui/composables/useInfiniteData.ts
@@ -1,5 +1,5 @@
 import type { ComputedRef, Ref } from 'vue'
-import { UITypes, extractFilterFromXwhere } from 'nocodb-sdk'
+import { UITypes, extractFilterFromXwhere, isAIPromptCol } from 'nocodb-sdk'
 import type { Api, ColumnType, LinkToAnotherRecordType, PaginatedType, RelationTypes, TableType, ViewType } from 'nocodb-sdk'
 import type { Row } from '../lib/types'
 import { validateRowFilters } from '../utils/dataUtils'
@@ -916,6 +916,7 @@ export function useInfiniteData(args: {
           col.title &&
           col.title in updatedRowData &&
           (columnsToUpdate.has(col.uidt as UITypes) ||
+            isAIPromptCol(col) ||
             col.au ||
             (isValidValue(col?.cdf) && / on update /i.test(col.cdf as string)))
         ) {
diff --git a/packages/nc-gui/composables/useIntegrationsStore.ts b/packages/nc-gui/composables/useIntegrationsStore.ts
index 62a1d59492..bbd743181f 100644
--- a/packages/nc-gui/composables/useIntegrationsStore.ts
+++ b/packages/nc-gui/composables/useIntegrationsStore.ts
@@ -90,6 +90,8 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
 
   const { t } = useI18n()
 
+  const { aiIntegrations } = useNocoAi()
+
   const isFromIntegrationPage = ref(false)
 
   const integrationsRefreshKey = ref(0)
@@ -186,12 +188,17 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
   const deleteIntegration = async (integration: IntegrationType, force = false) => {
     if (!integration?.id) return
 
+    $e('a:integration:delete')
+
     try {
       await api.integration.delete(integration.id, {
         query: force ? { force: 'true' } : {},
       })
 
-      $e('a:integration:delete')
+      if (integration.type === IntegrationsType.Ai) {
+        aiIntegrations.value = aiIntegrations.value.filter((i) => i.id !== integration.id)
+      }
+
       await loadIntegrations()
 
       // await message.success(`Connection ${integration.title} deleted successfully`)
@@ -214,10 +221,21 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
   const updateIntegration = async (integration: IntegrationType) => {
     if (!integration.id) return
 
+    $e('a:integration:update')
+
     try {
       await api.integration.update(integration.id, integration)
 
-      $e('a:integration:update')
+      if (integration.type === IntegrationsType.Ai) {
+        aiIntegrations.value = aiIntegrations.value.map((i) => {
+          if (i.id === integration.id) {
+            i.title = integration.title
+          }
+
+          return i
+        })
+      }
+
       await loadIntegrations()
 
       pageMode.value = null
@@ -232,10 +250,23 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
   const setDefaultIntegration = async (integration: IntegrationType) => {
     if (!integration.id) return
 
+    $e('a:integration:set-default')
+
     try {
       await api.integration.setDefault(integration.id)
 
-      $e('a:integration:set-default')
+      if (integration.type === IntegrationsType.Ai) {
+        aiIntegrations.value = aiIntegrations.value.map((i) => {
+          if (i.id === integration.id) {
+            i.is_default = true
+          } else {
+            i.is_default = false
+          }
+
+          return i
+        })
+      }
+
       await loadIntegrations()
 
       pageMode.value = null
@@ -253,18 +284,29 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
     loadDatasourceInfo = false,
     baseId: string | undefined = undefined,
   ) => {
+    if (mode === 'create') {
+      $e('a:integration:create')
+    } else {
+      $e('a:integration:duplicate')
+    }
+
     try {
       const response = await api.integration.create(integration)
-      if (mode === 'create') {
-        $e('a:integration:create')
-      } else {
-        $e('a:integration:duplicate')
-      }
 
       if (response && response?.id) {
         if (!loadDatasourceInfo) {
           integrations.value.push(response)
         }
+
+        if (response.type === IntegrationsType.Ai) {
+          aiIntegrations.value.push({
+            id: response.id,
+            title: response.title,
+            is_default: response.is_default,
+            type: response.type,
+            sub_type: response.sub_type,
+          })
+        }
       }
 
       await loadIntegrations(loadDatasourceInfo, baseId)
@@ -402,7 +444,7 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
     return list
   }
 
-  onMounted(async () => {
+  const loadDynamicIntegrations = async () => {
     if (integrationsInitialized.value) return
 
     integrationsInitialized.value = true
@@ -451,7 +493,7 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
 
       integrationsRefreshKey.value++
     }
-  })
+  }
 
   const integrationsIconMap = computed(() => {
     // eslint-disable-next-line no-unused-expressions
@@ -496,6 +538,7 @@ const [useProvideIntegrationViewStore, _useIntegrationStore] = useInjectionState
     setDefaultIntegration,
     integrationsIconMap,
     listIntegrationByType,
+    loadDynamicIntegrations,
   }
 }, 'integrations-store')
 
diff --git a/packages/nc-gui/composables/useMultiSelect/index.ts b/packages/nc-gui/composables/useMultiSelect/index.ts
index 0911f367d0..09c3863950 100644
--- a/packages/nc-gui/composables/useMultiSelect/index.ts
+++ b/packages/nc-gui/composables/useMultiSelect/index.ts
@@ -3,6 +3,7 @@ import { computed } from 'vue'
 import dayjs from 'dayjs'
 import type { MaybeRef } from '@vueuse/core'
 import type {
+  AIRecordType,
   AttachmentType,
   ColumnType,
   LinkToAnotherRecordType,
@@ -288,7 +289,15 @@ export function useMultiSelect(
     }
 
     if (columnObj.uidt === UITypes.LongText) {
-      textToCopy = `"${textToCopy.replace(/"/g, '\\"')}"`
+      if (parseProp(columnObj.meta)?.[LongTextAiMetaProp] === true) {
+        const aiCell: AIRecordType = (columnObj.title && rowObj.row[columnObj.title]) || null
+
+        if (aiCell) {
+          textToCopy = aiCell.value
+        }
+      } else {
+        textToCopy = `"${textToCopy.replace(/"/g, '\\"')}"`
+      }
     }
 
     return textToCopy
diff --git a/packages/nc-gui/composables/useNocoAi.ts b/packages/nc-gui/composables/useNocoAi.ts
index 7e36307c75..cf6b79ee03 100644
--- a/packages/nc-gui/composables/useNocoAi.ts
+++ b/packages/nc-gui/composables/useNocoAi.ts
@@ -1,4 +1,4 @@
-import { type IntegrationType, IntegrationsType, type SerializedAiViewType, type TableType } from 'nocodb-sdk'
+import type { IntegrationType, SerializedAiViewType, TableType } from 'nocodb-sdk'
 
 const aiIntegrationNotFound = 'AI integration not found'
 
@@ -13,15 +13,19 @@ export const useNocoAi = createSharedComposable(() => {
 
   const { activeProjectId } = storeToRefs(basesStore)
 
-  const aiIntegrationAvailable = ref(true)
-
   const aiLoading = ref(false)
 
   const aiError = ref<string>('')
 
-  const aiIntegrations = ref<IntegrationType[]>([])
+  const aiIntegrations = ref<Partial<IntegrationType>[]>([])
+
+  const aiIntegrationAvailable = computed(() => !!aiIntegrations.value.length)
+
+  const isAiIntegrationAvailableInList = (integrationId?: string) => {
+    if (!aiIntegrationAvailable.value) return false
 
-  const { listIntegrationByType } = useProvideIntegrationViewStore()
+    return ncIsArrayIncludes(aiIntegrations.value, integrationId, 'id')
+  }
 
   const callAiUtilsApi = async (operation: string, input: any, customBaseId?: string, skipMsgToast = false) => {
     try {
@@ -338,30 +342,9 @@ export const useNocoAi = createSharedComposable(() => {
     }
   }
 
-  const loadAiIntegrations = async () => {
-    aiIntegrations.value = (await listIntegrationByType(IntegrationsType.Ai)) || []
-
-    if (aiIntegrations.value.length) {
-      aiIntegrationAvailable.value = true
-    } else {
-      aiIntegrationAvailable.value = false
-    }
-  }
-
-  const { signedIn } = useGlobal()
-
-  watch(
-    signedIn,
-    (val) => {
-      if (val) {
-        loadAiIntegrations()
-      }
-    },
-    { immediate: true },
-  )
-
   return {
     aiIntegrationAvailable,
+    isAiIntegrationAvailableInList,
     aiLoading,
     aiError,
     predictFieldType,
@@ -381,6 +364,5 @@ export const useNocoAi = createSharedComposable(() => {
     repairFormula,
     predictViews,
     aiIntegrations,
-    loadAiIntegrations,
   }
 })
diff --git a/packages/nc-gui/helpers/parsers/parserHelpers.ts b/packages/nc-gui/helpers/parsers/parserHelpers.ts
index 2b3ddc1aa4..8366ed02ad 100644
--- a/packages/nc-gui/helpers/parsers/parserHelpers.ts
+++ b/packages/nc-gui/helpers/parsers/parserHelpers.ts
@@ -1,4 +1,4 @@
-import { ButtonActionsType, type ColumnType, FieldNameFromUITypes, UITypes } from 'nocodb-sdk'
+import { ButtonActionsType, type ColumnType, FieldNameFromUITypes, UITypes, UITypesName } from 'nocodb-sdk'
 import isURL from 'validator/lib/isURL'
 import { pluralize } from 'inflection'
 
@@ -478,8 +478,16 @@ export const generateUniqueColumnName = ({
 
     case UITypes.Button: {
       if (formState?.type === ButtonActionsType.Ai) {
-        defaultColumnName = `AI ${defaultColumnName}`
+        defaultColumnName = UITypesName.AIButton
       }
+      break
+    }
+
+    case UITypes.LongText: {
+      if (formState?.meta?.[LongTextAiMetaProp] === true) {
+        defaultColumnName = UITypesName.AIPrompt
+      }
+      break
     }
   }
 
diff --git a/packages/nc-gui/helpers/tiptapExtensions/mention/FieldList.vue b/packages/nc-gui/helpers/tiptapExtensions/mention/FieldList.vue
index 3461e06fcc..860b712aad 100644
--- a/packages/nc-gui/helpers/tiptapExtensions/mention/FieldList.vue
+++ b/packages/nc-gui/helpers/tiptapExtensions/mention/FieldList.vue
@@ -56,6 +56,12 @@ export default {
         return true
       }
 
+      if (event.key === '}') {
+        setTimeout(() => {
+          this.selectItem(this.selectedIndex)
+        }, 250)
+      }
+
       return false
     },
 
@@ -80,6 +86,7 @@ export default {
 
     selectItem(index, _e) {
       const item = this.items[index]
+
       if (item) {
         this.command({
           id: item.title,
@@ -92,7 +99,7 @@ export default {
 
 <template>
   <div
-    class="w-64 bg-white scroll-smooth nc-mention-list nc-scrollbar-md border-1 border-gray-200 rounded-lg max-h-64 !py-2 shadow-lg"
+    class="w-64 bg-white scroll-smooth nc-mention-list nc-scrollbar-thin border-1 border-gray-200 rounded-lg max-h-64 !py-2 px-2 shadow-lg"
     @mousedown.stop
   >
     <template v-if="items.length">
@@ -100,11 +107,16 @@ export default {
         v-for="(item, index) in items"
         :key="index"
         :class="{ 'is-selected': index === selectedIndex }"
-        class="py-2 flex hover:bg-gray-100 transition-all cursor-pointer items-center gap-2 text-gray-800 pl-4"
+        class="py-2 flex hover:bg-gray-100 rounded-md transition-all cursor-pointer items-center gap-2 text-gray-800 pl-4"
         @click="selectItem(index, $event)"
       >
         <component :is="getUIDTIcon(item.uidt)" v-if="item?.uidt" class="flex-none w-3.5 h-3.5" />
-        {{ item?.title || '' }}
+        <NcTooltip class="truncate" show-on-truncate-only :tooltip-style="{ zIndex: '10000' }">
+          <template #title>
+            {{ item?.title || '' }}
+          </template>
+          {{ item?.title || '' }}
+        </NcTooltip>
       </div>
     </template>
     <div v-else class="px-4">No field available</div>
diff --git a/packages/nc-gui/nuxt.config.ts b/packages/nc-gui/nuxt.config.ts
index a1b06ed408..a9ea4ee43d 100644
--- a/packages/nc-gui/nuxt.config.ts
+++ b/packages/nc-gui/nuxt.config.ts
@@ -226,6 +226,8 @@ export default defineNuxtConfig({
         '@vuelidate/core',
         '@vuelidate/validators',
         'company-email-validator',
+        'crossoriginworker',
+        'dayjs/plugin/utc',
         'd3-scale',
         'dagre',
         'deep-object-diff',
@@ -237,6 +239,7 @@ export default defineNuxtConfig({
         'marked',
         'mime-lite',
         'monaco-editor',
+        'monaco-editor/esm/vs/basic-languages/javascript/javascript',
         'papaparse',
         'prosemirror-state',
         'rehype-sanitize',
@@ -252,6 +255,7 @@ export default defineNuxtConfig({
         'validator/es/lib/isEmail',
         'validator/lib/isMobilePhone',
         'vue-advanced-cropper',
+        'vue-barcode-reader',
         'xlsx',
         'youtube-vue3',
         'vuedraggable',
diff --git a/packages/nc-gui/utils/cell.ts b/packages/nc-gui/utils/cell.ts
index 4c27a3a653..77ce48afe4 100644
--- a/packages/nc-gui/utils/cell.ts
+++ b/packages/nc-gui/utils/cell.ts
@@ -40,7 +40,9 @@ export const isUser = (column: ColumnType) => column.uidt === UITypes.User
 export const isButton = (column: ColumnType) => column.uidt === UITypes.Button
 export const isAiButton = (column: ColumnType) =>
   column.uidt === UITypes.Button && (column?.colOptions as any)?.type === ButtonActionsType.Ai
-export const isAI = (_column: ColumnType) => false
+export const isAI = (column: ColumnType) =>
+  column.uidt === UITypes.LongText && parseProp(column?.meta)?.[LongTextAiMetaProp] === true
+
 export const isAutoSaved = (column: ColumnType) =>
   [
     UITypes.SingleLineText,
diff --git a/packages/nc-gui/utils/columnUtils.ts b/packages/nc-gui/utils/columnUtils.ts
index cbd57334fc..9fab22e405 100644
--- a/packages/nc-gui/utils/columnUtils.ts
+++ b/packages/nc-gui/utils/columnUtils.ts
@@ -1,6 +1,6 @@
 import type { FunctionalComponent, SVGAttributes } from 'vue'
-import type { ButtonType, ColumnType, FormulaType, LinkToAnotherRecordType } from 'nocodb-sdk'
-import { ButtonActionsType, RelationTypes, UITypes } from 'nocodb-sdk'
+import type { ButtonType, ColumnType, FormulaType, IntegrationType, LinkToAnotherRecordType } from 'nocodb-sdk'
+import { ButtonActionsType, RelationTypes, UITypes, LongTextAiMetaProp as _LongTextAiMetaProp } from 'nocodb-sdk'
 
 export interface UiTypesType {
   name: UITypes | string
@@ -12,6 +12,10 @@ export interface UiTypesType {
 
 export const AIButton = 'AIButton'
 
+export const AIPrompt = 'AIPrompt'
+
+export const LongTextAiMetaProp = _LongTextAiMetaProp
+
 const uiTypes: UiTypesType[] = [
   {
     name: AIButton,
@@ -20,6 +24,12 @@ const uiTypes: UiTypesType[] = [
     isNew: 1,
     deprecated: 0,
   },
+  {
+    name: AIPrompt,
+    icon: iconMap.cellAi,
+    isNew: 1,
+    deprecated: 0,
+  },
   {
     name: UITypes.Links,
     icon: iconMap.cellLinks,
@@ -256,23 +266,53 @@ const isColumnSupportsGroupBySettings = (colOrUidt: ColumnType) => {
   return [UITypes.SingleSelect, UITypes.User, UITypes.CreatedBy, UITypes.Checkbox, UITypes.Rating].includes(uidt)
 }
 
-const isColumnInvalid = (col: ColumnType) => {
+const isColumnInvalid = (
+  col: ColumnType,
+  aiIntegrations: Partial<IntegrationType>[] = [],
+  isReadOnly: boolean = false,
+): { isInvalid: boolean; tooltip: string } => {
+  const result = {
+    isInvalid: false,
+    tooltip: 'msg.invalidColumnConfiguration',
+  }
+
   switch (col.uidt) {
     case UITypes.Formula:
-      return !!(col.colOptions as FormulaType).error
+      result.isInvalid = !!(col.colOptions as FormulaType).error
+      break
     case UITypes.Button: {
       const colOptions = col.colOptions as ButtonType
       if (colOptions.type === ButtonActionsType.Webhook) {
-        return !colOptions.fk_webhook_id
+        result.isInvalid = !colOptions.fk_webhook_id
       } else if (colOptions.type === ButtonActionsType.Url) {
-        return !!colOptions.error
+        result.isInvalid = !!colOptions.error
+      } else if (colOptions.type === ButtonActionsType.Ai) {
+        result.isInvalid =
+          !colOptions.fk_integration_id ||
+          (isReadOnly
+            ? false
+            : !!colOptions.fk_integration_id && !ncIsArrayIncludes(aiIntegrations, colOptions.fk_integration_id, 'id'))
+        result.tooltip = 'title.aiIntegrationMissing'
       }
+      break
     }
-  }
+    case UITypes.LongText: {
+      if (parseProp(col.meta)[LongTextAiMetaProp]) {
+        const colOptions = col.colOptions as ButtonType
+
+        result.isInvalid =
+          !colOptions.fk_integration_id ||
+          (isReadOnly
+            ? false
+            : !!colOptions.fk_integration_id && !ncIsArrayIncludes(aiIntegrations, colOptions.fk_integration_id, 'id'))
 
-  if (col.uidt === UITypes.Formula) {
-    return !!(col.colOptions as FormulaType).error
+        result.tooltip = 'title.aiIntegrationMissing'
+      }
+      break
+    }
   }
+
+  return result
 }
 
 // cater existing v1 cases
diff --git a/packages/nc-gui/utils/commonUtils.ts b/packages/nc-gui/utils/commonUtils.ts
index 9db2e51068..cc04552efe 100644
--- a/packages/nc-gui/utils/commonUtils.ts
+++ b/packages/nc-gui/utils/commonUtils.ts
@@ -71,3 +71,47 @@ export const ncArrayFrom = <T>(
 export const isUnicodeEmoji = (emoji: string) => {
   return !!emoji?.match(/(\p{Emoji}|\p{Extended_Pictographic})/gu)
 }
+
+/**
+ * Performs a case-insensitive search to check if the `query` exists within the `source`.
+ *
+ * - If `source` is an array, the function checks if any element (converted to a string) contains the `query`.
+ * - If `source` is a string or number, it checks if the `query` exists within `source` (case-insensitively).
+ * - If `source` or `query` is `undefined`, they are treated as empty strings.
+ *
+ * @param source - The value to search within. Can be a string, number, or an array of strings/numbers.
+ * @param query - The value to search for. Treated as an empty string if `undefined`.
+ * @returns `true` if the `query` is found within the `source` (case-insensitively), otherwise `false`.
+ *
+ * @example
+ * ```typescript
+ * // Single string or number search
+ * searchCompare("Hello World", "world"); // true
+ * searchCompare("OpenAI ChatGPT", "gpt"); // true
+ * searchCompare("TypeScript", "JavaScript"); // false
+ *
+ * // Array search
+ * searchCompare(["apple", "banana", "cherry"], "Banana"); // true
+ * searchCompare([123, 456, 789], "456"); // true
+ * searchCompare([null, undefined, "test"], "TEST"); // true
+ *
+ * // Handling undefined
+ * searchCompare(undefined, "test"); // false
+ * searchCompare("test", undefined); // true
+ * ```
+ */
+export const searchCompare = (source?: string | number | (string | number | undefined)[], query?: string): boolean => {
+  if (ncIsArray(source)) {
+    return source.some((item) => {
+      return (item || '')
+        .toString()
+        .toLowerCase()
+        .includes((query || '').toLowerCase())
+    })
+  }
+
+  return (source || '')
+    .toString()
+    .toLowerCase()
+    .includes((query || '').toLowerCase())
+}
diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts
index aeeebea37d..cc889c2767 100644
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@@ -8741,7 +8741,6 @@ export class Api<
       orgs: string,
       baseName: string,
       tableName: string,
-      data: object,
       query?: {
         where?: string;
         viewId?: string;
@@ -8758,8 +8757,6 @@ export class Api<
         path: `/api/v1/db/data/bulk/${orgs}/${baseName}/${tableName}/all`,
         method: 'DELETE',
         query: query,
-        body: data,
-        type: ContentType.Json,
         format: 'json',
         ...params,
       }),
diff --git a/packages/nocodb-sdk/src/lib/UITypes.ts b/packages/nocodb-sdk/src/lib/UITypes.ts
index 17475dc490..813d9687f4 100644
--- a/packages/nocodb-sdk/src/lib/UITypes.ts
+++ b/packages/nocodb-sdk/src/lib/UITypes.ts
@@ -1,6 +1,7 @@
 import { ColumnReqType, ColumnType, TableType } from './Api';
 import { FormulaDataTypes } from './formulaHelpers';
-import { RelationTypes } from '~/lib/globals';
+import { LongTextAiMetaProp, RelationTypes } from '~/lib/globals';
+import { parseHelper } from './helperFunctions';
 
 enum UITypes {
   ID = 'ID',
@@ -90,6 +91,7 @@ export const UITypesName = {
   [UITypes.CreatedBy]: 'Created by',
   [UITypes.LastModifiedBy]: 'Last modified by',
   AIButton: 'AI Button',
+  AIPrompt: 'AI Prompt',
 };
 
 export const FieldNameFromUITypes: Record<UITypes, string> = {
@@ -186,6 +188,14 @@ export function isVirtualCol(
   ].includes(<UITypes>(typeof col === 'object' ? col?.uidt : col));
 }
 
+export function isAIPromptCol(
+  col:
+    | ColumnReqType
+    | ColumnType
+) {
+  return col.uidt === UITypes.LongText && parseHelper((col as any)?.meta)?.[LongTextAiMetaProp];
+}
+
 export function isCreatedOrLastModifiedTimeCol(
   col:
     | UITypes
diff --git a/packages/nocodb-sdk/src/lib/globals.ts b/packages/nocodb-sdk/src/lib/globals.ts
index b4ee7ae8f7..152df75fe0 100644
--- a/packages/nocodb-sdk/src/lib/globals.ts
+++ b/packages/nocodb-sdk/src/lib/globals.ts
@@ -229,6 +229,8 @@ export enum NcErrorType {
   INVALID_ATTACHMENT_UPLOAD_SCOPE = 'INVALID_ATTACHMENT_UPLOAD_SCOPE',
 }
 
+export const LongTextAiMetaProp = 'ai';
+
 type Roles = OrgUserRoles | ProjectRoles | WorkspaceUserRoles;
 
 type RolesObj = Partial<Record<Roles, boolean>>;
diff --git a/packages/nocodb-sdk/src/lib/helperFunctions.ts b/packages/nocodb-sdk/src/lib/helperFunctions.ts
index 5b5e5b4ad2..cb70719c21 100644
--- a/packages/nocodb-sdk/src/lib/helperFunctions.ts
+++ b/packages/nocodb-sdk/src/lib/helperFunctions.ts
@@ -226,4 +226,20 @@ export const getTestDatabaseName = (db: {
 
 export const integrationCategoryNeedDefault = (category: IntegrationsType) => {
   return [IntegrationsType.Ai].includes(category);
+};
+
+export function parseHelper(v: any): any {
+  try {
+    return typeof v === 'string' ? JSON.parse(v) : v;
+  } catch {
+    return v;
+  }
+}
+
+export function stringifyHelper(v: any): string {
+  try {
+    return JSON.stringify(v);
+  } catch {
+    return v;
+  }
 }
diff --git a/packages/nocodb-sdk/src/lib/index.ts b/packages/nocodb-sdk/src/lib/index.ts
index eafac88f43..9f66861cd7 100644
--- a/packages/nocodb-sdk/src/lib/index.ts
+++ b/packages/nocodb-sdk/src/lib/index.ts
@@ -12,6 +12,7 @@ export {
   UITypesName,
   FieldNameFromUITypes,
   numericUITypes,
+  isAIPromptCol,
   isNumericCol,
   isVirtualCol,
   isLinksOrLTAR,
diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index d207f1e7bb..426603791a 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -10,11 +10,13 @@ import {
   AuditOperationTypes,
   ButtonActionsType,
   extractFilterFromXwhere,
+  isAIPromptCol,
   isCreatedOrLastModifiedByCol,
   isCreatedOrLastModifiedTimeCol,
   isLinksOrLTAR,
   isSystemColumn,
   isVirtualCol,
+  LongTextAiMetaProp,
   RelationTypes,
   UITypes,
 } from 'nocodb-sdk';
@@ -5716,7 +5718,10 @@ class BaseModelSqlv2 {
         await this.model.getColumns(this.context);
 
         await Promise.all(
-          insertDatas.map((d) => this.prepareNocoData(d, true, cookie)),
+          insertDatas.map(
+            async (d) =>
+              await this.prepareNocoData(d, true, cookie, null, { raw }),
+          ),
         );
       }
 
@@ -5935,7 +5940,7 @@ class BaseModelSqlv2 {
             }
           }
         } else {
-          await this.prepareNocoData(d, false, cookie);
+          await this.prepareNocoData(d, false, cookie, null, { raw });
 
           const wherePk = await this._wherePk(pkValues, true);
 
@@ -8628,23 +8633,25 @@ class BaseModelSqlv2 {
     jsonColumns: Record<string, any>[],
     d: Record<string, any>,
   ) {
-    try {
-      if (d) {
-        for (const col of jsonColumns) {
-          if (d[col.id] && typeof d[col.id] === 'string') {
+    if (d) {
+      for (const col of jsonColumns) {
+        if (d[col.id] && typeof d[col.id] === 'string') {
+          try {
             d[col.id] = JSON.parse(d[col.id]);
-          }
+          } catch {}
+        }
 
-          if (d[col.id]?.length) {
-            for (let i = 0; i < d[col.id].length; i++) {
-              if (typeof d[col.id][i] === 'string') {
+        if (d[col.id]?.length) {
+          for (let i = 0; i < d[col.id].length; i++) {
+            if (typeof d[col.id][i] === 'string') {
+              try {
                 d[col.id][i] = JSON.parse(d[col.id][i]);
-              }
+              } catch {}
             }
           }
         }
       }
-    } catch {}
+    }
     return d;
   }
 
@@ -8671,13 +8678,16 @@ class BaseModelSqlv2 {
 
       for (const col of columns) {
         if (col.uidt === UITypes.Lookup) {
+          const lookupNestedCol = await this.getNestedColumn(col);
+
           if (
-            JSON_COLUMN_TYPES.includes((await this.getNestedColumn(col))?.uidt)
+            JSON_COLUMN_TYPES.includes(lookupNestedCol.uidt) ||
+            isAIPromptCol(lookupNestedCol)
           ) {
             jsonCols.push(col);
           }
         } else {
-          if (JSON_COLUMN_TYPES.includes(col.uidt)) {
+          if (JSON_COLUMN_TYPES.includes(col.uidt) || isAIPromptCol(col)) {
             jsonCols.push(col);
           }
         }
@@ -9766,7 +9776,8 @@ class BaseModelSqlv2 {
     cookie?: { user?: any; system?: boolean },
     // oldData uses title as key where as data uses column_name as key
     oldData?,
-  ) {
+    extra?: { raw?: boolean },
+  ): Promise<void> {
     for (const column of this.model.columns) {
       if (
         ![
@@ -9777,7 +9788,10 @@ class BaseModelSqlv2 {
           UITypes.LastModifiedTime,
           UITypes.CreatedBy,
           UITypes.LastModifiedBy,
-        ].includes(column.uidt)
+          UITypes.LongText,
+        ].includes(column.uidt) ||
+        (column.uidt === UITypes.LongText &&
+          column.meta?.[LongTextAiMetaProp] !== true)
       )
         continue;
 
@@ -10046,6 +10060,48 @@ class BaseModelSqlv2 {
         ) {
           data[column.column_name] = JSON.stringify(data[column.column_name]);
         }
+      } else if (isAIPromptCol(column) && !extra?.raw) {
+        if (data[column.column_name]) {
+          let value = data[column.column_name];
+
+          if (typeof value === 'object') {
+            value = value.value;
+          }
+
+          const obj: {
+            value?: string;
+            lastModifiedBy?: string;
+            lastModifiedTime?: string;
+            isStale?: string;
+          } = {};
+
+          if (cookie?.system === true) {
+            Object.assign(obj, {
+              value,
+              lastModifiedBy: null,
+              lastModifiedTime: null,
+              isStale: false,
+            });
+          } else {
+            const oldObj = oldData?.[column.title];
+            const isStale = oldObj ? oldObj.isStale : false;
+
+            const isModified = oldObj?.value !== value;
+
+            Object.assign(obj, {
+              value,
+              lastModifiedBy: isModified
+                ? cookie?.user?.id
+                : oldObj?.lastModifiedBy,
+              lastModifiedTime: isModified
+                ? this.now()
+                : oldObj?.lastModifiedTime,
+              isStale: isModified ? false : isStale,
+            });
+          }
+
+          data[column.column_name] = JSON.stringify(obj);
+        }
       }
     }
   }
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 7c8c0b9beb..1f8739d2c9 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -1,6 +1,7 @@
 import {
   FormulaDataTypes,
   getEquivalentUIType,
+  isAIPromptCol,
   isDateMonthFormat,
   isNumericCol,
   RelationTypes,
@@ -592,6 +593,24 @@ const parseConditionV2 = async (
             ? 'YYYY-MM-DD HH:mm:ss'
             : 'YYYY-MM-DD HH:mm:ssZ';
 
+        if (isAIPromptCol(column)) {
+          if (knex.clientType() === 'pg') {
+            field = knex.raw(`TRIM('"' FROM (??::jsonb->>'value'))`, [
+              column.column_name,
+            ]);
+          } else if (knex.clientType().startsWith('mysql')) {
+            field = knex.raw(`JSON_UNQUOTE(JSON_EXTRACT(??, '$.value'))`, [
+              column.column_name,
+            ]);
+          } else if (knex.clientType() === 'sqlite3') {
+            field = knex.raw(`json_extract(??, '$.value')`, [
+              column.column_name,
+            ]);
+          } else if (knex.clientType() === 'mssql') {
+            field = knex.raw(`JSON_VALUE(??, '$.value')`, [column.column_name]);
+          }
+        }
+
         if (
           (column.uidt === UITypes.Formula &&
             getEquivalentUIType({ formulaColumn: column }) ==
diff --git a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
index 35a8f3a2f1..408dc089ee 100644
--- a/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
+++ b/packages/nocodb/src/db/formulav2/formulaQueryBuilderv2.ts
@@ -2,6 +2,7 @@ import jsep from 'jsep';
 import {
   FormulaDataTypes,
   jsepCurlyHook,
+  LongTextAiMetaProp,
   RelationTypes,
   UITypes,
   validateDateWithUnknownFormat,
@@ -828,6 +829,47 @@ async function _formulaQueryBuilder(params: {
           };
         }
         break;
+      case UITypes.LongText: {
+        if (col.meta?.[LongTextAiMetaProp] === true) {
+          if (knex.clientType() === 'pg') {
+            aliasToColumn[col.id] = async (): Promise<any> => {
+              return {
+                builder: knex.raw(`TRIM('"' FROM (??::jsonb->>'value'))`, [
+                  col.column_name,
+                ]),
+              };
+            };
+          } else if (knex.clientType().startsWith('mysql')) {
+            aliasToColumn[col.id] = async (): Promise<any> => {
+              return {
+                builder: knex.raw(`JSON_UNQUOTE(JSON_EXTRACT(??, '$.value'))`, [
+                  col.column_name,
+                ]),
+              };
+            };
+          } else if (knex.clientType() === 'sqlite3') {
+            aliasToColumn[col.id] = async (): Promise<any> => {
+              return {
+                builder: knex.raw(`json_extract(??, '$.value')`, [
+                  col.column_name,
+                ]),
+              };
+            };
+          } else if (knex.clientType() === 'mssql') {
+            aliasToColumn[col.id] = async (): Promise<any> => {
+              return {
+                builder: knex.raw(`JSON_VALUE(??, '$.value')`, [
+                  col.column_name,
+                ]),
+              };
+            };
+          }
+        } else {
+          aliasToColumn[col.id] = () =>
+            Promise.resolve({ builder: col.column_name });
+        }
+        break;
+      }
       default:
         aliasToColumn[col.id] = () =>
           Promise.resolve({ builder: col.column_name });
diff --git a/packages/nocodb/src/db/sortV2.ts b/packages/nocodb/src/db/sortV2.ts
index c19d1b9cb9..1bb276f4c7 100644
--- a/packages/nocodb/src/db/sortV2.ts
+++ b/packages/nocodb/src/db/sortV2.ts
@@ -1,4 +1,4 @@
-import { UITypes } from 'nocodb-sdk';
+import { isAIPromptCol, UITypes } from 'nocodb-sdk';
 import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
 import type { Knex } from 'knex';
 import type { ButtonColumn, FormulaColumn, RollupColumn } from '~/models';
@@ -199,6 +199,33 @@ export default async function sortV2(
 
         break;
       }
+      case UITypes.LongText: {
+        if (isAIPromptCol(column)) {
+          let col;
+          if (knex.clientType() === 'pg') {
+            col = knex.raw(`TRIM('"' FROM (??::jsonb->>'value'))`, [
+              column.column_name,
+            ]);
+          } else if (knex.clientType().startsWith('mysql')) {
+            col = knex.raw(`JSON_UNQUOTE(JSON_EXTRACT(??, '$.value'))`, [
+              column.column_name,
+            ]);
+          } else if (knex.clientType() === 'sqlite3') {
+            col = knex.raw(`json_extract(??, '$.value')`, [column.column_name]);
+          } else if (knex.clientType() === 'mssql') {
+            col = knex.raw(`JSON_VALUE(??, '$.value')`, [column.column_name]);
+          }
+
+          qb.orderBy(col, sort.direction || 'asc', nulls);
+        } else {
+          qb.orderBy(
+            sanitize(column.column_name),
+            sort.direction || 'asc',
+            nulls,
+          );
+        }
+        break;
+      }
       default:
         qb.orderBy(
           sanitize(column.column_name),
diff --git a/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts b/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
index 15e2908e10..11f55098e6 100644
--- a/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
+++ b/packages/nocodb/src/meta/migrations/XcMigrationSourcev2.ts
@@ -55,6 +55,7 @@ import * as nc_065_encrypt_flag from '~/meta/migrations/v2/nc_065_encrypt_flag';
 import * as nc_066_ai_button from '~/meta/migrations/v2/nc_066_ai_button';
 import * as nc_067_personal_view from '~/meta/migrations/v2/nc_067_personal_view';
 import * as nc_068_user_delete from '~/meta/migrations/v2/nc_068_user_delete';
+import * as nc_069_ai_prompt from '~/meta/migrations/v2/nc_069_ai_prompt';
 
 // Create a custom migration source class
 export default class XcMigrationSourcev2 {
@@ -121,6 +122,7 @@ export default class XcMigrationSourcev2 {
       'nc_066_ai_button',
       'nc_067_personal_view',
       'nc_068_user_delete',
+      'nc_069_ai_prompt',
     ]);
   }
 
@@ -244,6 +246,8 @@ export default class XcMigrationSourcev2 {
         return nc_067_personal_view;
       case 'nc_068_user_delete':
         return nc_068_user_delete;
+      case 'nc_069_ai_prompt':
+        return nc_069_ai_prompt;
     }
   }
 }
diff --git a/packages/nocodb/src/meta/migrations/v2/nc_069_ai_prompt.ts b/packages/nocodb/src/meta/migrations/v2/nc_069_ai_prompt.ts
new file mode 100644
index 0000000000..afbe464624
--- /dev/null
+++ b/packages/nocodb/src/meta/migrations/v2/nc_069_ai_prompt.ts
@@ -0,0 +1,29 @@
+import type { Knex } from 'knex';
+import { MetaTable } from '~/utils/globals';
+
+const up = async (knex: Knex) => {
+  await knex.schema.createTable(MetaTable.COL_LONG_TEXT, (table) => {
+    table.string('id', 20).primary();
+    table.string('fk_workspace_id', 20);
+    table.string('base_id', 20);
+    table.string('fk_model_id', 20);
+    table.string('fk_column_id', 20);
+
+    table.string('fk_integration_id', 20);
+    table.string('model', 255);
+
+    table.text('prompt');
+    table.text('prompt_raw');
+    table.text('error');
+
+    table.timestamps(true, true);
+
+    table.index('fk_column_id');
+  });
+};
+
+const down = async (knex: Knex) => {
+  await knex.schema.dropTable(MetaTable.COL_LONG_TEXT);
+};
+
+export { up, down };
diff --git a/packages/nocodb/src/models/AIColumn.ts b/packages/nocodb/src/models/AIColumn.ts
new file mode 100644
index 0000000000..ee9087ed26
--- /dev/null
+++ b/packages/nocodb/src/models/AIColumn.ts
@@ -0,0 +1,48 @@
+import type { NcContext } from '~/interface/config';
+import Noco from '~/Noco';
+import LongTextColumn from '~/models/LongTextColumn';
+
+export default class AIColumn extends LongTextColumn {
+  id: string;
+
+  fk_integration_id: string;
+  model: string;
+  prompt: string;
+  prompt_raw: string;
+  error?: string;
+
+  public static castType(data: AIColumn): AIColumn {
+    return data && new AIColumn(data);
+  }
+
+  public static async insert(
+    context: NcContext,
+    aiColumn: Partial<AIColumn> & {
+      fk_model_id: string;
+      fk_column_id: string;
+    },
+    ncMeta = Noco.ncMeta,
+  ) {
+    return this._insert(
+      context,
+      aiColumn,
+      ['fk_integration_id', 'model', 'prompt', 'prompt_raw', 'error'],
+      ncMeta,
+    );
+  }
+
+  public static async update(
+    context: NcContext,
+    columnId: string,
+    aiColumn: Partial<AIColumn>,
+    ncMeta = Noco.ncMeta,
+  ) {
+    return this._update(
+      context,
+      columnId,
+      aiColumn,
+      ['fk_integration_id', 'model', 'prompt', 'prompt_raw', 'error'],
+      ncMeta,
+    );
+  }
+}
diff --git a/packages/nocodb/src/models/Column.ts b/packages/nocodb/src/models/Column.ts
index ceed6fc472..71a8e52993 100644
--- a/packages/nocodb/src/models/Column.ts
+++ b/packages/nocodb/src/models/Column.ts
@@ -1,6 +1,8 @@
 import {
   AllowedColumnTypesForQrAndBarcodes,
+  isAIPromptCol,
   isLinksOrLTAR,
+  LongTextAiMetaProp,
   UITypes,
 } from 'nocodb-sdk';
 import { Logger } from '@nestjs/common';
@@ -17,6 +19,7 @@ import Sort from '~/models/Sort';
 import Filter from '~/models/Filter';
 import QrCodeColumn from '~/models/QrCodeColumn';
 import BarcodeColumn from '~/models/BarcodeColumn';
+import AIColumn from '~/models/AIColumn';
 import {
   ButtonColumn,
   FileReference,
@@ -446,6 +449,24 @@ export default class Column<T = any> implements ColumnType {
         }
         break;
       }
+      case UITypes.LongText: {
+        if (column.meta?.[LongTextAiMetaProp] === true) {
+          await AIColumn.insert(
+            context,
+            {
+              fk_model_id: column.fk_model_id,
+              fk_column_id: colId,
+              fk_integration_id: column.fk_integration_id,
+              model: column.model,
+              prompt: column.prompt,
+              prompt_raw: column.prompt_raw,
+              error: column.error,
+            },
+            ncMeta,
+          );
+        }
+        break;
+      }
 
       /*  default:
         {
@@ -549,6 +570,11 @@ export default class Column<T = any> implements ColumnType {
       case UITypes.Barcode:
         res = await BarcodeColumn.read(context, this.id, ncMeta);
         break;
+      case UITypes.LongText:
+        if (this.meta?.[LongTextAiMetaProp] === true) {
+          res = await AIColumn.read(context, this.id, ncMeta);
+        }
+        break;
       // default:
       //   res = await DbColumn.read(this.id);
       //   break;
@@ -857,6 +883,48 @@ export default class Column<T = any> implements ColumnType {
       }
     }
 
+    {
+      const cachedList = await NocoCache.getList(CacheScope.COLUMN, [
+        col.fk_model_id,
+      ]);
+      let { list: aiColumns } = cachedList;
+      const { isNoneList } = cachedList;
+      if (!isNoneList && !aiColumns.length) {
+        aiColumns = await ncMeta.metaList2(
+          context.workspace_id,
+          context.base_id,
+          MetaTable.COLUMNS,
+          {
+            condition: {
+              fk_model_id: col.fk_model_id,
+              uidt: UITypes.LongText,
+            },
+          },
+        );
+      }
+
+      parseMetaProp(col);
+
+      aiColumns = aiColumns.filter((c) => isAIPromptCol(c));
+
+      for (const aiCol of aiColumns) {
+        const ai = await new Column(aiCol).getColOptions<AIColumn>(
+          context,
+          ncMeta,
+        );
+
+        if (!ai) continue;
+
+        /*
+          if prompt includes deleted column id {column_id}, add error and update
+        */
+        if (ai.prompt && ai.prompt.match(/{column_id}/)) {
+          ai.error = `Field '${col.title}' not found`;
+          await AIColumn.update(context, aiCol.id, ai, ncMeta);
+        }
+      }
+    }
+
     {
       const cachedList = await NocoCache.getList(CacheScope.COLUMN, [
         col.fk_model_id,
@@ -1030,6 +1098,12 @@ export default class Column<T = any> implements ColumnType {
         colOptionTableName = MetaTable.COL_BARCODE;
         cacheScopeName = CacheScope.COL_BARCODE;
         break;
+      case UITypes.LongText:
+        if (col.meta?.[LongTextAiMetaProp] === true) {
+          colOptionTableName = MetaTable.COL_LONG_TEXT;
+          cacheScopeName = CacheScope.COL_LONG_TEXT;
+        }
+        break;
     }
 
     if (colOptionTableName && cacheScopeName) {
@@ -1276,6 +1350,23 @@ export default class Column<T = any> implements ColumnType {
           );
           break;
         }
+
+        case UITypes.LongText: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_LONG_TEXT,
+            {
+              fk_column_id: colId,
+            },
+          );
+
+          await NocoCache.deepDel(
+            `${CacheScope.COL_LONG_TEXT}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
       }
     }
     const updateObj = extractProps(column, [
@@ -1867,6 +1958,20 @@ export default class Column<T = any> implements ColumnType {
           }
           break;
         }
+        case UITypes.LongText: {
+          if (column.meta?.[LongTextAiMetaProp] === true) {
+            insertArr.push({
+              fk_model_id: column.fk_model_id,
+              fk_column_id: column.id,
+              fk_integration_id: column.fk_integration_id,
+              model: column.model,
+              prompt: column.prompt,
+              prompt_raw: column.prompt_raw,
+              error: column.error,
+            });
+          }
+          break;
+        }
       }
     }
 
@@ -1933,6 +2038,14 @@ export default class Column<T = any> implements ColumnType {
             insertGroups.get(group),
           );
           break;
+        case UITypes.LongText:
+          await ncMeta.bulkMetaInsert(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_LONG_TEXT,
+            insertGroups.get(group),
+          );
+          break;
       }
     }
   }
diff --git a/packages/nocodb/src/models/Integration.ts b/packages/nocodb/src/models/Integration.ts
index 20bd62c090..816d791382 100644
--- a/packages/nocodb/src/models/Integration.ts
+++ b/packages/nocodb/src/models/Integration.ts
@@ -451,6 +451,10 @@ export default class Integration implements IntegrationType {
       data: this,
     });
 
+    if (!Array.isArray(config?.models)) {
+      config.models = [];
+    }
+
     return config;
   }
 
@@ -467,6 +471,33 @@ export default class Integration implements IntegrationType {
       );
     }
 
+    // unbind all buttons and long texts associated with this integration
+    await ncMeta.metaUpdate(
+      this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
+      RootScopes.WORKSPACE,
+      MetaTable.COL_BUTTON,
+      {
+        fk_integration_id: null,
+        model: null,
+      },
+      {
+        fk_integration_id: this.id,
+      },
+    );
+
+    await ncMeta.metaUpdate(
+      this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
+      RootScopes.WORKSPACE,
+      MetaTable.COL_LONG_TEXT,
+      {
+        fk_integration_id: null,
+        model: null,
+      },
+      {
+        fk_integration_id: this.id,
+      },
+    );
+
     return await ncMeta.metaDelete(
       this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
       RootScopes.WORKSPACE,
@@ -488,6 +519,33 @@ export default class Integration implements IntegrationType {
       );
     }
 
+    // unbind all buttons and long texts associated with this integration
+    await ncMeta.metaUpdate(
+      this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
+      RootScopes.WORKSPACE,
+      MetaTable.COL_BUTTON,
+      {
+        fk_integration_id: null,
+        model: null,
+      },
+      {
+        fk_integration_id: this.id,
+      },
+    );
+
+    await ncMeta.metaUpdate(
+      this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
+      RootScopes.WORKSPACE,
+      MetaTable.COL_LONG_TEXT,
+      {
+        fk_integration_id: null,
+        model: null,
+      },
+      {
+        fk_integration_id: this.id,
+      },
+    );
+
     await ncMeta.metaUpdate(
       this.fk_workspace_id ? this.fk_workspace_id : RootScopes.WORKSPACE,
       RootScopes.WORKSPACE,
diff --git a/packages/nocodb/src/models/LongTextColumn.ts b/packages/nocodb/src/models/LongTextColumn.ts
new file mode 100644
index 0000000000..b1f5cb4063
--- /dev/null
+++ b/packages/nocodb/src/models/LongTextColumn.ts
@@ -0,0 +1,113 @@
+import type { NcContext } from '~/interface/config';
+import Noco from '~/Noco';
+import NocoCache from '~/cache/NocoCache';
+import { extractProps } from '~/helpers/extractProps';
+import { CacheGetType, CacheScope, MetaTable } from '~/utils/globals';
+import { Column } from '~/models/index';
+import { NcError } from '~/helpers/catchError';
+
+export default abstract class LongTextColumn {
+  id: string;
+
+  fk_workspace_id?: string;
+  base_id: string;
+  fk_model_id: string;
+  fk_column_id: string;
+
+  constructor(data: Partial<LongTextColumn>) {
+    Object.assign(this, data);
+  }
+
+  public static castType(data: LongTextColumn): LongTextColumn {
+    return data;
+  }
+
+  protected static async _insert(
+    context: NcContext,
+    longTextColumn: Partial<LongTextColumn> & {
+      fk_model_id: string;
+      fk_column_id: string;
+    },
+    props: string[],
+    ncMeta = Noco.ncMeta,
+  ) {
+    const insertObj = extractProps(longTextColumn, [
+      'fk_workspace_id',
+      'base_id',
+      'fk_model_id',
+      'fk_column_id',
+      ...(props || []),
+    ]);
+
+    const column = await Column.get(
+      context,
+      {
+        colId: insertObj.fk_column_id,
+      },
+      ncMeta,
+    );
+
+    if (!column) {
+      NcError.fieldNotFound(insertObj.fk_column_id);
+    }
+
+    await ncMeta.metaInsert2(
+      context.workspace_id,
+      context.base_id,
+      MetaTable.COL_LONG_TEXT,
+      insertObj,
+    );
+
+    return this.read(context, longTextColumn.fk_column_id, ncMeta);
+  }
+
+  public static async read(
+    context: NcContext,
+    columnId: string,
+    ncMeta = Noco.ncMeta,
+  ) {
+    let column =
+      columnId &&
+      (await NocoCache.get(
+        `${CacheScope.COL_LONG_TEXT}:${columnId}`,
+        CacheGetType.TYPE_OBJECT,
+      ));
+    if (!column) {
+      column = await ncMeta.metaGet2(
+        context.workspace_id,
+        context.base_id,
+        MetaTable.COL_LONG_TEXT,
+        { fk_column_id: columnId },
+      );
+      await NocoCache.set(`${CacheScope.COL_LONG_TEXT}:${columnId}`, column);
+    }
+
+    return column ? this.castType(column) : null;
+  }
+
+  protected static async _update(
+    context: NcContext,
+    columnId: string,
+    longTextColumn: Partial<LongTextColumn>,
+    props: string[],
+    ncMeta = Noco.ncMeta,
+  ) {
+    const updateObj = extractProps(longTextColumn, [...(props || [])]);
+
+    // set meta
+    await ncMeta.metaUpdate(
+      context.workspace_id,
+      context.base_id,
+      MetaTable.COL_LONG_TEXT,
+      updateObj,
+      {
+        fk_column_id: columnId,
+      },
+    );
+
+    await NocoCache.update(
+      `${CacheScope.COL_LONG_TEXT}:${columnId}`,
+      updateObj,
+    );
+  }
+}
diff --git a/packages/nocodb/src/models/index.ts b/packages/nocodb/src/models/index.ts
index ed05733c38..0a6648e405 100644
--- a/packages/nocodb/src/models/index.ts
+++ b/packages/nocodb/src/models/index.ts
@@ -48,3 +48,5 @@ export { default as Integration } from './Integration';
 export { default as IntegrationStore } from './IntegrationStore';
 export { default as FileReference } from './FileReference';
 export { default as ButtonColumn } from './ButtonColumn';
+export { default as LongTextColumn } from './LongTextColumn';
+export { default as AIColumn } from './AIColumn';
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
index 8a5bfd4b52..95c459ae33 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/duplicate.processor.ts
@@ -1,7 +1,12 @@
 import { Readable } from 'stream';
 import papaparse from 'papaparse';
 import debug from 'debug';
-import { isLinksOrLTAR, isVirtualCol, RelationTypes } from 'nocodb-sdk';
+import {
+  isAIPromptCol,
+  isLinksOrLTAR,
+  isVirtualCol,
+  RelationTypes,
+} from 'nocodb-sdk';
 import { Injectable } from '@nestjs/common';
 import type { Job } from 'bull';
 import type { NcContext, NcRequest } from '~/interface/config';
@@ -435,7 +440,7 @@ export class DuplicateProcessor {
     });
 
     // update cdf
-    if (!isVirtualCol(destColumn)) {
+    if (!isVirtualCol(destColumn) && !isAIPromptCol(destColumn)) {
       await this.columnsService.columnUpdate(context, {
         columnId: findWithIdentifier(idMap, sourceColumn.id),
         column: {
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 79d7d36ced..47b279b49f 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -1,5 +1,11 @@
 import { Readable } from 'stream';
-import { isLinksOrLTAR, RelationTypes, UITypes, ViewTypes } from 'nocodb-sdk';
+import {
+  isLinksOrLTAR,
+  LongTextAiMetaProp,
+  RelationTypes,
+  UITypes,
+  ViewTypes,
+} from 'nocodb-sdk';
 import { unparse } from 'papaparse';
 import debug from 'debug';
 import { Injectable } from '@nestjs/common';
@@ -137,8 +143,21 @@ export class ExportService {
               case 'fk_rollup_column_id':
               case 'fk_qr_value_column_id':
               case 'fk_barcode_value_column_id':
+              case 'fk_model_id':
                 column.colOptions[k] = idMap.get(v as string);
                 break;
+              // Preserve the values on export
+              // We will keep these only within same workspace as integration is only available within same workspace
+              case 'fk_workspace_id':
+              case 'fk_integrations_id':
+              case 'model':
+                column.colOptions[k] = v;
+                break;
+              case 'output_column_ids':
+                column.colOptions[k] = ((v as string)?.split(',') || [])
+                  .map((id) => idMap.get(id))
+                  .join(',');
+                break;
               case 'fk_target_view_id':
                 if (v) {
                   const view = await View.get(context, v as string);
@@ -158,6 +177,8 @@ export class ExportService {
                 }
                 break;
               case 'formula':
+                if (column.uidt === UITypes.Button) break;
+
                 // rewrite formula_raw with aliases
                 column.colOptions['formula_raw'] = column.colOptions[
                   k
@@ -604,6 +625,15 @@ export class ExportService {
                   row[colId] = v;
                 }
                 break;
+              case UITypes.LongText:
+                if (col.meta?.[LongTextAiMetaProp] && v) {
+                  try {
+                    row[colId] = JSON.stringify(v);
+                  } catch (e) {
+                    row[colId] = v;
+                  }
+                }
+                break;
               case UITypes.User:
               case UITypes.CreatedBy:
               case UITypes.LastModifiedBy:
diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
index 326f4b0c79..1c231b62b8 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
@@ -1,4 +1,5 @@
 import {
+  isAIPromptCol,
   isLinksOrLTAR,
   isVirtualCol,
   RelationTypes,
@@ -178,6 +179,7 @@ export class ImportService {
         (a) =>
           !isVirtualCol(a) &&
           a.uidt !== UITypes.ForeignKey &&
+          !isAIPromptCol(a) &&
           (param.importColumnIds
             ? param.importColumnIds.includes(getEntityIdentifier(a.id))
             : true),
@@ -1112,7 +1114,8 @@ export class ImportService {
               a.uidt === UITypes.LastModifiedTime ||
               a.uidt === UITypes.CreatedBy ||
               a.uidt === UITypes.LastModifiedBy ||
-              a.uidt === UITypes.Barcode) &&
+              a.uidt === UITypes.Barcode ||
+              isAIPromptCol(a)) &&
             (param.importColumnIds
               ? param.importColumnIds.includes(getEntityIdentifier(a.id))
               : true),
@@ -1242,6 +1245,12 @@ export class ImportService {
           }
         }
       } else if (col.uidt === UITypes.Button) {
+        if (base.fk_workspace_id !== colOptions.fk_workspace_id) {
+          colOptions.fk_workspace_id = null;
+          colOptions.fk_integration_id = null;
+          colOptions.model = null;
+        }
+
         const freshModelData = await this.columnsService.columnAdd(context, {
           tableId: getIdOrExternalId(getParentIdentifier(col.id)),
           column: withoutId({
@@ -1254,6 +1263,40 @@ export class ImportService {
               icon: colOptions?.icon,
               type: colOptions?.type,
               fk_webhook_id: getIdOrExternalId(colOptions?.fk_webhook_id),
+              output_column_ids: (
+                colOptions?.output_column_ids?.split(',') || []
+              )
+                .map((a) => getIdOrExternalId(a))
+                .join(','),
+              fk_integration_id: colOptions?.fk_integration_id,
+              model: colOptions?.model,
+            },
+          }) as any,
+          req: param.req,
+          user: param.user,
+        });
+
+        for (const nColumn of freshModelData.columns) {
+          if (nColumn.title === col.title) {
+            idMap.set(col.id, nColumn.id);
+            break;
+          }
+        }
+      } else if (isAIPromptCol(col)) {
+        if (base.fk_workspace_id !== colOptions.fk_workspace_id) {
+          colOptions.fk_workspace_id = null;
+          colOptions.fk_integration_id = null;
+          colOptions.model = null;
+        }
+
+        const freshModelData = await this.columnsService.columnAdd(context, {
+          tableId: getIdOrExternalId(getParentIdentifier(col.id)),
+          column: withoutId({
+            ...flatCol,
+            ...{
+              fk_integration_id: colOptions.fk_integration_id,
+              model: colOptions.model,
+              prompt_raw: colOptions.prompt_raw,
             },
           }) as any,
           req: param.req,
diff --git a/packages/nocodb/src/services/columns.service.ts b/packages/nocodb/src/services/columns.service.ts
index 90a58a1bcb..609b880cd2 100644
--- a/packages/nocodb/src/services/columns.service.ts
+++ b/packages/nocodb/src/services/columns.service.ts
@@ -3,10 +3,12 @@ import {
   AppEvents,
   ButtonActionsType,
   FormulaDataTypes,
+  isAIPromptCol,
   isCreatedOrLastModifiedByCol,
   isCreatedOrLastModifiedTimeCol,
   isLinksOrLTAR,
   isVirtualCol,
+  LongTextAiMetaProp,
   partialUpdateAllowedTypes,
   readonlyMetaAllowedTypes,
   RelationTypes,
@@ -66,6 +68,10 @@ import Noco from '~/Noco';
 import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';
 import { MetaTable } from '~/utils/globals';
 import { MetaService } from '~/meta/meta.service';
+import {
+  convertAIRecordTypeToValue,
+  convertValueToAIRecordType,
+} from '~/utils/dataConversion';
 
 // todo: move
 export enum Altered {
@@ -551,10 +557,6 @@ export class ColumnsService {
               NcError.badRequest('Webhook not found');
             }
           } else if (colBody.type === ButtonActionsType.Ai) {
-            if (!colBody.fk_integration_id) {
-              NcError.badRequest('AI Integration not found');
-            }
-
             /*
               Substitute column alias with id in prompt
             */
@@ -1573,6 +1575,75 @@ export class ColumnsService {
         );
       }
 
+      if (
+        isAIPromptCol(column) &&
+        (colBody.uidt !== UITypes.LongText ||
+          (colBody.uidt === UITypes.LongText &&
+            colBody.meta?.[LongTextAiMetaProp] !== true))
+      ) {
+        const baseModel = await reuseOrSave('baseModel', reuse, async () =>
+          Model.getBaseModelSQL(context, {
+            id: table.id,
+            dbDriver: await reuseOrSave('dbDriver', reuse, async () =>
+              NcConnectionMgrv2.get(source),
+            ),
+          }),
+        );
+
+        await convertAIRecordTypeToValue({
+          source,
+          table,
+          column,
+          baseModel,
+          sqlClient,
+        });
+      } else if (isAIPromptCol(colBody)) {
+        let prompt = '';
+
+        /*
+          Substitute column alias with id in prompt
+        */
+        if (colBody.prompt_raw) {
+          await table.getColumns(context);
+
+          prompt = colBody.prompt_raw.replace(/{(.*?)}/g, (match, p1) => {
+            const column = table.columns.find((c) => c.title === p1);
+
+            if (!column) {
+              NcError.badRequest(`Field '${p1}' not found`);
+            }
+
+            return `{${column.id}}`;
+          });
+        }
+
+        colBody.prompt = prompt;
+
+        // If column wasn't AI before, convert the data to AIRecordType format
+        if (
+          column.uidt !== UITypes.LongText ||
+          column.meta?.[LongTextAiMetaProp] !== true
+        ) {
+          const baseModel = await reuseOrSave('baseModel', reuse, async () =>
+            Model.getBaseModelSQL(context, {
+              id: table.id,
+              dbDriver: await reuseOrSave('dbDriver', reuse, async () =>
+                NcConnectionMgrv2.get(source),
+              ),
+            }),
+          );
+
+          await convertValueToAIRecordType({
+            source,
+            table,
+            column,
+            baseModel,
+            sqlClient,
+            user: param.user,
+          });
+        }
+      }
+
       colBody = await getColumnPropsFromUIDT(colBody, source);
 
       await this.updateMetaAndDatabase(context, {
@@ -1914,10 +1985,6 @@ export class ColumnsService {
             colBody.fk_webhook_id = null;
           }
         } else if (colBody.type === ButtonActionsType.Ai) {
-          if (!colBody.fk_integration_id) {
-            NcError.badRequest('AI Integration not found');
-          }
-
           /*
             Substitute column alias with id in prompt
           */
@@ -2212,6 +2279,29 @@ export class ColumnsService {
             }
           }
 
+          if (isAIPromptCol(colBody)) {
+            let prompt = '';
+
+            /*
+              Substitute column alias with id in prompt
+            */
+            if (colBody.prompt_raw) {
+              await table.getColumns(context);
+
+              prompt = colBody.prompt_raw.replace(/{(.*?)}/g, (match, p1) => {
+                const column = table.columns.find((c) => c.title === p1);
+
+                if (!column) {
+                  NcError.badRequest(`Field '${p1}' not found`);
+                }
+
+                return `{${column.id}}`;
+              });
+            }
+
+            colBody.prompt = prompt;
+          }
+
           const tableUpdateBody = {
             ...table,
             tn: table.table_name,
diff --git a/packages/nocodb/src/utils/dataConversion.ts b/packages/nocodb/src/utils/dataConversion.ts
new file mode 100644
index 0000000000..e3245513f5
--- /dev/null
+++ b/packages/nocodb/src/utils/dataConversion.ts
@@ -0,0 +1,150 @@
+import type { AIRecordType } from 'nocodb-sdk';
+import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
+import type KnexClient from '~/db/sql-client/lib/KnexClient';
+import type { Column, Model, Source, User } from '~/models';
+
+export const convertAIRecordTypeToValue = async (args: {
+  source: Source;
+  table: Model;
+  column: Column;
+  baseModel: BaseModelSqlv2;
+  sqlClient: KnexClient;
+}) => {
+  const { source, table, column, baseModel, sqlClient } = args;
+
+  if (source.type === 'pg') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = TRIM('"' FROM (??::jsonb->>'value'))
+        WHERE ?? ~ '^\\s*\\{.*\\}\\s*$' AND jsonb_typeof(??::jsonb) = 'object' AND (??::jsonb->'value') IS NOT NULL;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'mysql' || source.type === 'mysql2') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = JSON_UNQUOTE(JSON_EXTRACT(??, '$.value'))
+        WHERE JSON_VALID(??) AND JSON_TYPE(??) = 'OBJECT' AND JSON_EXTRACT(??, '$.value') IS NOT NULL;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'sqlite3') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = json_extract(??, '$.value')
+        WHERE json_valid(??) AND json_extract(??, '$.value') IS NOT NULL;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'mssql') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = JSON_VALUE(??, '$.value')
+        WHERE ISJSON(??) = 1 AND JSON_VALUE(??, '$.value') IS NOT NULL;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        column.column_name,
+        column.column_name,
+      ],
+    );
+  }
+};
+
+export const convertValueToAIRecordType = async (args: {
+  source: Source;
+  table: Model;
+  column: Column;
+  baseModel: BaseModelSqlv2;
+  sqlClient: KnexClient;
+  user: User;
+}) => {
+  const { source, table, column, baseModel, sqlClient, user } = args;
+
+  const commonRecord: Omit<AIRecordType, 'value'> = {
+    lastModifiedBy: user.id,
+    lastModifiedTime: baseModel.now(),
+    isStale: true,
+  };
+
+  // update every record with json which holds old value in value prop & commonRecord props in lastModifiedBy, lastModifiedTime, isStale
+  if (source.type === 'pg') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = jsonb_build_object('value', ??, 'lastModifiedBy', ?::text, 'lastModifiedTime', ?::text, 'isStale', ?::boolean)
+        WHERE ?? is not null;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        commonRecord.lastModifiedBy.toString(),
+        commonRecord.lastModifiedTime.toString(),
+        commonRecord.isStale,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'mysql' || source.type === 'mysql2') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = JSON_OBJECT('value', ??, 'lastModifiedBy', ?, 'lastModifiedTime', ?, 'isStale', ?)
+        WHERE ?? is not null;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        commonRecord.lastModifiedBy.toString(),
+        commonRecord.lastModifiedTime.toString(),
+        commonRecord.isStale,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'sqlite3') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = json_object('value', ??, 'lastModifiedBy', ?, 'lastModifiedTime', ?, 'isStale', ?)
+        WHERE ?? is not null;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        commonRecord.lastModifiedBy.toString(),
+        commonRecord.lastModifiedTime.toString(),
+        commonRecord.isStale,
+        column.column_name,
+      ],
+    );
+  } else if (source.type === 'mssql') {
+    await sqlClient.raw(
+      `UPDATE ??
+        SET ?? = JSON_QUERY('{"value":' + ?? + ',"lastModifiedBy":' + ? + ',"lastModifiedTime":' + ? + ',"isStale":' + ? + '}')
+        WHERE ?? is not null;`,
+      [
+        baseModel.getTnPath(table.table_name),
+        column.column_name,
+        column.column_name,
+        commonRecord.lastModifiedBy.toString(),
+        commonRecord.lastModifiedTime.toString(),
+        commonRecord.isStale,
+        column.column_name,
+      ],
+    );
+  }
+};
diff --git a/packages/nocodb/src/utils/globals.ts b/packages/nocodb/src/utils/globals.ts
index 289913590e..cc1dcb0053 100644
--- a/packages/nocodb/src/utils/globals.ts
+++ b/packages/nocodb/src/utils/globals.ts
@@ -12,7 +12,7 @@ export enum MetaTable {
   COL_FORMULA = 'nc_col_formula_v2',
   COL_QRCODE = 'nc_col_qrcode_v2',
   COL_BARCODE = 'nc_col_barcode_v2',
-  COL_AI = 'nc_col_ai_v2',
+  COL_LONG_TEXT = 'nc_col_long_text_v2',
   FILTER_EXP = 'nc_filter_exp_v2',
   // HOOK_FILTER_EXP = 'nc_hook_filter_exp_v2',
   SORT = 'nc_sort_v2',
@@ -145,7 +145,7 @@ export enum CacheScope {
   COL_FORMULA = 'colFormula',
   COL_QRCODE = 'colQRCode',
   COL_BARCODE = 'colBarcode',
-  COL_AI = 'colAi',
+  COL_LONG_TEXT = 'colLongText',
   FILTER_EXP = 'filterExp',
   SORT = 'sort',
   SHARED_VIEW = 'sharedView',
@@ -241,6 +241,9 @@ export const RootScopeTables = {
   [RootScopes.BASE]: [MetaTable.PROJECT],
   // It's a special case and Workspace is equivalent to org in oss
   [RootScopes.WORKSPACE]: [
+    // COL_BUTTON & COL_LONG_TEXT have integration references which we need to clean
+    MetaTable.COL_BUTTON,
+    MetaTable.COL_LONG_TEXT,
     MetaTable.INTEGRATIONS,
     MetaTable.INTEGRATIONS_STORE,
   ],

From 6f6e54b1b5bf8ec6198ab022ca90d9368ada0a94 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:41 +0000
Subject: [PATCH 75/88] fix(nc-gui): prompt ester egg pending issues

---
 .../dashboard/TreeView/CreateViewBtn.vue      |   3 +-
 .../smartsheet/column/LongTextOptions.vue     | 136 +++++++++---------
 .../smartsheet/topbar/ViewListDropdown.vue    |  22 ++-
 3 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
index bb031307d3..b415c40bb9 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
@@ -16,7 +16,6 @@ const { refreshCommandPalette } = useCommandPalette()
 const viewsStore = useViewsStore()
 const { loadViews, navigateToView } = viewsStore
 
-const { aiIntegrationAvailable } = useNocoAi()
 const { isFeatureEnabled } = useBetaFeatureToggle()
 
 const table = inject(SidebarTableInj)!
@@ -197,7 +196,7 @@ async function onOpenModal({
             <GeneralIcon v-else class="plus" icon="plus" />
           </div>
         </NcMenuItem>
-        <template v-if="aiIntegrationAvailable && isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)">
+        <template v-if="isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)">
           <NcDivider />
           <NcMenuItem data-testid="sidebar-view-create-ai" @click="onOpenModal({ type: 'AI' })">
             <div class="item">
diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 68502d38f8..60a8ebe8a7 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { UITypes } from 'nocodb-sdk'
+import { isAIPromptCol, UITypes } from 'nocodb-sdk'
 
 const props = defineProps<{
   modelValue: any
@@ -105,6 +105,15 @@ const generate = async () => {
   generatingPreview.value = false
 }
 
+const isPromptEnabled = computed(() => {
+  console.log('isAiPrompt', isAIPromptCol(column.value))
+  if (isEdit.value) {
+    return isAIPromptCol(column.value)
+  }
+
+  return isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+})
+
 onMounted(() => {
   // set default value
   vModel.value.prompt_raw = (column?.value?.colOptions as Record<string, any>)?.prompt_raw || ''
@@ -183,11 +192,10 @@ watch(
       </NcTooltip>
     </a-form-item>
 
-    <template v-if="isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)">
-      <div class="relative">
-        <a-form-item class="flex items-center">
-          <NcTooltip :disabled="!richMode" class="flex items-center">
-            <template #title> Generate text using AI is not supported when rich text formatting is enabled </template>
+    <div v-if="isPromptEnabled" class="relative">
+      <a-form-item class="flex items-center">
+        <NcTooltip :disabled="!richMode" class="flex items-center">
+          <template #title> Generate text using AI is not supported when rich text formatting is enabled </template>
 
             <NcSwitch
               v-model:checked="isEnabledGenerateText"
@@ -215,66 +223,66 @@ watch(
           </NcTooltip>
           <div class="flex-1"></div>
 
-          <div class="absolute right-0">
-            <AiSettings
-              v-model:fk-integration-id="vModel.fk_integration_id"
-              v-model:model="vModel.model"
-              v-model:randomness="vModel.randomness"
-              :workspace-id="activeWorkspaceId"
-              :show-tooltip="false"
-              :is-edit-column="isEdit"
-              placement="bottomRight"
+        <div class="absolute right-0">
+          <AiSettings
+            v-model:fk-integration-id="vModel.fk_integration_id"
+            v-model:model="vModel.model"
+            v-model:randomness="vModel.randomness"
+            :workspace-id="activeWorkspaceId"
+            :show-tooltip="false"
+            :is-edit-column="isEdit"
+            placement="bottomRight"
+          >
+            <NcButton size="xs" theme="ai" class="!px-1" type="text">
+              <GeneralIcon icon="settings" />
+            </NcButton>
+          </AiSettings>
+        </div>
+      </a-form-item>
+    </div>
+    <template v-if="isPromptEnabled && (!isEdit ? aiIntegrationAvailable && isEnabledGenerateText : isEnabledGenerateText)">
+      <a-form-item class="flex">
+        <div class="nc-prompt-input-wrapper bg-nc-bg-gray-light rounded-lg w-full">
+          <AiPromptWithFields
+            v-model="vModel.prompt_raw"
+            :options="availableFields"
+            :read-only="!aiIntegrationAvailable"
+            placeholder="Write custom AI Prompt instruction here"
+            prompt-field-tag-class-name="!text-nc-content-purple-dark font-weight-500"
+            suggestion-icon-class-name="!text-nc-content-purple-medium"
+          />
+          <div class="rounded-b-lg flex items-center gap-1.5 p-1">
+            <GeneralIcon icon="info" class="!text-nc-content-purple-medium w-3.5 h-3.5" />
+            <span class="text-xs text-nc-content-gray-subtle2"
+              >Mention fields using curly braces, e.g. <span class="text-nc-content-purple-dark">{Field name}</span>.</span
             >
-              <NcButton size="xs" theme="ai" class="!px-1" type="text">
-                <GeneralIcon icon="settings" />
-              </NcButton>
-            </AiSettings>
-          </div>
-        </a-form-item>
-      </div>
-      <template v-if="!isEdit ? aiIntegrationAvailable && isEnabledGenerateText : isEnabledGenerateText">
-        <a-form-item class="flex">
-          <div class="nc-prompt-input-wrapper bg-nc-bg-gray-light rounded-lg w-full">
-            <AiPromptWithFields
-              v-model="vModel.prompt_raw"
-              :options="availableFields"
-              :read-only="!aiIntegrationAvailable"
-              placeholder="Write custom AI Prompt instruction here"
-              prompt-field-tag-class-name="!text-nc-content-purple-dark font-weight-500"
-              suggestion-icon-class-name="!text-nc-content-purple-medium"
-            />
-            <div class="rounded-b-lg flex items-center gap-1.5 p-1">
-              <GeneralIcon icon="info" class="!text-nc-content-purple-medium w-3.5 h-3.5" />
-              <span class="text-xs text-nc-content-gray-subtle2"
-                >Mention fields using curly braces, e.g. <span class="text-nc-content-purple-dark">{Field name}</span>.</span
-              >
-            </div>
           </div>
-        </a-form-item>
-        <div v-if="aiIntegrationAvailable && isEnabledGenerateText" class="nc-ai-options-preview overflow-hidden">
-          <div>
-            <div
-              class="flex items-center gap-2 transition-all duration-300"
-              :class="{
-                'pl-3 py-2 pr-2': !isAlreadyGenerated,
-                'pl-3 py-1 pr-1 border-b-1 border-nc-border-gray-medium': isAlreadyGenerated,
-              }"
-            >
-              <div class="flex flex-col flex-1 gap-1">
-                <div class="flex items-center gap-2">
-                  <span class="text-sm font-bold text-nc-content-gray-subtle">Preview</span>
-                  <NcTooltip class="flex cursor-pointer">
-                    <template #title> Preview is generated using the first record in this table</template>
-                    <GeneralIcon
-                      icon="info"
-                      class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5"
-                    />
-                  </NcTooltip>
-                </div>
-                <span v-if="!isAlreadyGenerated" class="text-[11px] leading-[18px] text-nc-content-gray-muted">
-                  Include at least 1 field in prompt.
-                </span>
+        </div>
+      </a-form-item>
+      <div v-if="aiIntegrationAvailable && isEnabledGenerateText" class="nc-ai-options-preview overflow-hidden">
+        <div>
+          <div
+            class="flex items-center gap-2 transition-all duration-300"
+            :class="{
+              'pl-3 py-2 pr-2': !isAlreadyGenerated,
+              'pl-3 py-1 pr-1 border-b-1 border-nc-border-gray-medium': isAlreadyGenerated,
+            }"
+          >
+            <div class="flex flex-col flex-1 gap-1">
+              <div class="flex items-center gap-2">
+                <span class="text-sm font-bold text-nc-content-gray-subtle">Preview</span>
+                <NcTooltip class="flex cursor-pointer">
+                  <template #title> Preview is generated using the first record in this table</template>
+                  <GeneralIcon
+                    icon="info"
+                    class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5"
+                  />
+                </NcTooltip>
               </div>
+              <span v-if="!isAlreadyGenerated" class="text-[11px] leading-[18px] text-nc-content-gray-muted">
+                Include at least 1 field in prompt.
+              </span>
+            </div>
 
               <NcTooltip :disabled="isPreviewEnabled">
                 <template #title> Include at least 1 field in prompt to generate </template>
@@ -328,7 +336,7 @@ watch(
       </template>
     </template>
 
-    <AiIntegrationNotFound v-if="!aiIntegrationAvailable && isEnabledGenerateText" />
+    <AiIntegrationNotFound v-if="!aiIntegrationAvailable && isEnabledGenerateText && isPromptEnabled" />
   </div>
 </template>
 
diff --git a/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue b/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
index bbff1e7506..c44a7f8287 100644
--- a/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
+++ b/packages/nc-gui/components/smartsheet/topbar/ViewListDropdown.vue
@@ -21,7 +21,7 @@ const { loadViews, navigateToView } = viewsStore
 
 const { refreshCommandPalette } = useCommandPalette()
 
-const { aiIntegrationAvailable } = useNocoAi()
+const { isFeatureEnabled } = useBetaFeatureToggle()
 
 const isOpen = ref<boolean>(false)
 
@@ -254,17 +254,15 @@ async function onOpenModal({
                   </div>
                 </a-menu-item>
 
-                <NcDivider />
-                <a-menu-item
-                  v-if="aiIntegrationAvailable"
-                  data-testid="sidebar-view-create-ai"
-                  @click="onOpenModal({ type: 'AI' })"
-                >
-                  <div class="nc-viewlist-submenu-popup-item">
-                    <GeneralIcon icon="ncAutoAwesome" class="!w-4 !h-4 text-nc-fill-purple-dark" />
-                    <div>{{ $t('labels.aiSuggested') }}</div>
-                  </div>
-                </a-menu-item>
+                <template v-if="isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)">
+                  <NcDivider />
+                  <a-menu-item data-testid="sidebar-view-create-ai" @click="onOpenModal({ type: 'AI' })">
+                    <div class="nc-viewlist-submenu-popup-item">
+                      <GeneralIcon icon="ncAutoAwesome" class="!w-4 !h-4 text-nc-fill-purple-dark" />
+                      <div>{{ $t('labels.aiSuggested') }}</div>
+                    </div>
+                  </a-menu-item>
+                </template>
               </a-sub-menu>
             </a-menu>
           </div>

From 32c4b8e5fec2951dcbcabceb1b5f6685beaad3c4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:41 +0000
Subject: [PATCH 76/88] fix(nc-gui): remove console

---
 packages/nc-gui/components/smartsheet/column/LongTextOptions.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 60a8ebe8a7..95fad7dda8 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -106,7 +106,6 @@ const generate = async () => {
 }
 
 const isPromptEnabled = computed(() => {
-  console.log('isAiPrompt', isAIPromptCol(column.value))
   if (isEdit.value) {
     return isAIPromptCol(column.value)
   }

From 4c0f06e12d40b3b657145cbe39be5837b9d97c24 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 77/88] fix(nc-gui): ai button related changes

---
 .../smartsheet/column/AiButtonOptions.vue     | 22 +++++++++++++++----
 .../smartsheet/column/ButtonOptions.vue       | 18 +++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
index 54c8b1e3ab..3ff71f7a2a 100644
--- a/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/AiButtonOptions.vue
@@ -32,10 +32,13 @@ const {
   formattedData,
   disableSubmitBtn,
   tableExplorerColumns,
+  fromTableExplorer,
 } = useColumnCreateStoreOrThrow()
 
 const { aiIntegrationAvailable, aiLoading, aiError, generateRows } = useNocoAi()
 
+const { isFeatureEnabled } = useBetaFeatureToggle()
+
 const isOpenConfigModal = ref<boolean>(false)
 
 const isOpenSelectOutputFieldDropdown = ref<boolean>(false)
@@ -243,6 +246,14 @@ watch(isOpenSelectRecordDropdown, (newValue) => {
   }
 })
 
+const isAiButtonEnabled = computed(() => {
+  if (isEdit.value) {
+    return true
+  }
+
+  return isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+})
+
 const previewPanelDom = ref<HTMLElement>()
 
 const isPreviewPanelOnScrollTop = ref(false)
@@ -294,7 +305,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <div class="relative flex flex-col gap-4">
+  <div v-if="isAiButtonEnabled" class="relative flex flex-col gap-4">
     <AiIntegrationNotFound v-if="!aiIntegrationAvailable" />
     <template v-else-if="!!aiError"> </template>
     <template v-else>
@@ -332,6 +343,7 @@ onBeforeUnmount(() => {
           </NcButton>
 
           <NcButton
+            v-if="!fromTableExplorer"
             size="small"
             type="primary"
             :disabled="disableSubmitBtn || saving"
@@ -604,7 +616,7 @@ onBeforeUnmount(() => {
                                     show-search-always
                                     search-input-placeholder="Search records"
                                     :item-height="60"
-                                    class="!w-auto min-w-[500px] max-w-[576px]"
+                                    class="!w-auto min-w-[550px] max-w-[550px]"
                                     container-class-name="!px-0 !pb-0"
                                     item-class-name="!rounded-none !p-0 !bg-none !hover:bg-none"
                                     @update:value="handleResetOutput"
@@ -691,8 +703,9 @@ onBeforeUnmount(() => {
                   <div class="h-2.5 w-2.5 flex-none absolute -top-[30px] border-1 border-current rounded-full bg-current"></div>
                   <NcTooltip :disabled="!!(selectedRecordPk && outputColumnIds.length && inputColumns.length)">
                     <template #title>
-                      <div class="flex flex-col gap-2">
-                        <div>Preview checklist</div>
+                      <div class="flex flex-col gap-2 py-1 px-0.5">
+                        <div class="text-[10px] leading-[14px] text-gray-300 uppercase mb-1">Preview checklist</div>
+
                         <div class="flex gap-2">
                           <div
                             class="h-4 w-4 rounded-full grid place-items-center children:(h-3.5 w-3.5 flex-none)"
@@ -859,6 +872,7 @@ onBeforeUnmount(() => {
       </div>
     </NcModal>
   </div>
+  <div v-else></div>
 </template>
 
 <style lang="scss">
diff --git a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
index 25ab0a209b..921c7a51d8 100644
--- a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
@@ -35,6 +35,8 @@ const meta = inject(MetaInj, ref())
 const { isEdit, setAdditionalValidations, validateInfos, sqlUi, column, isWebhookCreateModalOpen, isAiMode } =
   useColumnCreateStoreOrThrow()
 
+const { isFeatureEnabled } = useBetaFeatureToggle()
+
 const uiTypesNotSupportedInFormulas = [UITypes.QrCode, UITypes.Barcode, UITypes.Button]
 
 const webhooksStore = useWebhooksStore()
@@ -51,7 +53,15 @@ const manualHooks = computed(() => {
   return hooks.value.filter((hook) => hook.event === 'manual' && hook.active)
 })
 
-const buttonTypes = [
+const isAiButtonEnabled = computed(() => {
+  if (isEdit.value) {
+    return true
+  }
+
+  return isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+})
+
+const buttonTypes = computed(() => [
   {
     label: t('labels.openUrl'),
     value: ButtonActionsType.Url,
@@ -60,7 +70,7 @@ const buttonTypes = [
     label: t('labels.runWebHook'),
     value: ButtonActionsType.Webhook,
   },
-  ...(isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
+  ...(isAiButtonEnabled.value
     ? [
         {
           label: t('labels.generateFieldDataUsingAi'),
@@ -69,7 +79,7 @@ const buttonTypes = [
         },
       ]
     : []),
-]
+])
 
 const supportedColumns = computed(
   () =>
@@ -212,7 +222,7 @@ if (isEdit.value) {
     vModel.value.fk_integration_id = colOptions?.fk_integration_id
   }
 } else {
-  vModel.value.type = vModel.value?.type || buttonTypes[0].value
+  vModel.value.type = vModel.value?.type || buttonTypes.value[0]?.value
 
   if (vModel.value.type === ButtonActionsType.Ai) {
     vModel.value.theme = 'light'

From b750ce0112a657af36de84301cbc0f3299c573e3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 78/88] fix(nc-gui): select integration related changes

---
 packages/nc-gui/components/ai/Settings.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/ai/Settings.vue b/packages/nc-gui/components/ai/Settings.vue
index 20b3e650fe..a1c25b380c 100644
--- a/packages/nc-gui/components/ai/Settings.vue
+++ b/packages/nc-gui/components/ai/Settings.vue
@@ -67,18 +67,14 @@ const onIntegrationChange = async (newFkINtegrationId?: string) => {
 }
 
 onMounted(async () => {
-  if (isEditColumn.value) {
-    return
-  }
-
-  if (!vFkIntegrationId.value) {
+  if (!vFkIntegrationId.value && !isEditColumn.value) {
     if (aiIntegrations.value.length > 0 && aiIntegrations.value[0].id) {
       vFkIntegrationId.value = aiIntegrations.value[0].id
       nextTick(() => {
         onIntegrationChange()
       })
     }
-  } else {
+  } else if (vFkIntegrationId.value) {
     lastIntegrationId.value = vFkIntegrationId.value
 
     if (!vModel.value || !availableModels.value.length) {

From 4be28bbb0326b692ea21abcf4892007b351e695c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 79/88] fix(nc-gui): field modal new field issue

---
 packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index e1316e8c3f..d939bf09d5 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -183,10 +183,9 @@ const uiFilters = (t: UiTypesType) => {
   const specificDBType = t.name === UITypes.SpecificDBType && isXcdbBase(meta.value?.source_id)
   const showDeprecatedField = !t.deprecated || showDeprecated.value
 
-  const hideAiPromptOnEdit = !((t.name === AIPrompt || t.name === AIButton) && isEdit.value)
-
-  const hideBetaAi = !(t.name === AIPrompt || t.name === AIButton) || isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
-
+  const hideAiPromptOnEdit = [AIPrompt, AIButton].includes(t.name)
+    ? isFeatureEnabled(FEATURE_FLAG.AI_FEATURES) && !isEdit.value
+    : true
   const isAllowToAddInFormView = isForm.value ? !formViewHiddenColTypes.includes(t.name) : true
 
   return (

From f2e7e8b4607f97f2bddefd3ecd93cfb9bd78536d Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 80/88] fix(nc-gui): update field search logic

---
 .../smartsheet/column/UITypesOptionsWithSearch.vue        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
index cc2dc7d4e0..99a63bd714 100644
--- a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
+++ b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
@@ -17,13 +17,7 @@ const { isMetaReadOnly } = useRoles()
 const { isFeatureEnabled } = useBetaFeatureToggle()
 
 const filteredOptions = computed(
-  () =>
-    options.value?.filter(
-      (c) =>
-        !((c.name === 'AIButton' || c.name === 'AIPrompt') && !isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)) &&
-        (c.name.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
-          (UITypesName[c.name] && UITypesName[c.name].toLowerCase().includes(searchQuery.value.toLowerCase()))),
-    ) ?? [],
+  () => options.value?.filter((c) => searchCompare([c.name, UITypesName[c.name]], searchQuery.value)) ?? [],
 )
 
 const inputRef = ref()

From 93c24eb9192c14ea3dca909b6d4c9b9e20d45ff8 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 81/88] fix(nc-gui): rename variable name

---
 .../components/smartsheet/column/EditOrAdd.vue     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index d939bf09d5..491f329690 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -183,20 +183,10 @@ const uiFilters = (t: UiTypesType) => {
   const specificDBType = t.name === UITypes.SpecificDBType && isXcdbBase(meta.value?.source_id)
   const showDeprecatedField = !t.deprecated || showDeprecated.value
 
-  const hideAiPromptOnEdit = [AIPrompt, AIButton].includes(t.name)
-    ? isFeatureEnabled(FEATURE_FLAG.AI_FEATURES) && !isEdit.value
-    : true
+  const showAiFields = [AIPrompt, AIButton].includes(t.name) ? isFeatureEnabled(FEATURE_FLAG.AI_FEATURES) && !isEdit.value : true
   const isAllowToAddInFormView = isForm.value ? !formViewHiddenColTypes.includes(t.name) : true
 
-  return (
-    systemFiledNotEdited &&
-    geoDataToggle &&
-    !specificDBType &&
-    showDeprecatedField &&
-    isAllowToAddInFormView &&
-    hideAiPromptOnEdit &&
-    hideBetaAi
-  )
+  return systemFiledNotEdited && geoDataToggle && !specificDBType && showDeprecatedField && isAllowToAddInFormView && showAiFields
 }
 
 const extraIcons = ref<Record<string, string>>({})

From e0dea1646028240bcb134bb6dedabb6544fd5192 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 82/88] fix(nc-gui): ai button related changes

---
 .../components/smartsheet/details/Fields.vue  | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index f6dafbe49c..503f9ebf9c 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -417,6 +417,7 @@ const onFieldUpdate = (state: TableExplorerColumn, skipLinkChecks = false) => {
   const diffs = Object.fromEntries(
     Object.entries(pdiffs).filter(([_, value]) => value !== undefined),
   ) as Partial<TableExplorerColumn>
+
   if (
     Object.keys(diffs).length === 0 ||
     // skip custom prop since it's only used for custom LTAR links
@@ -642,9 +643,29 @@ const isColumnValid = (column: TableExplorerColumn) => {
     }
   }
 
-  if (column.uidt === UITypes.Button && isNew) {
-    if (column.type === ButtonActionsType.Url && !column.formula_raw) return false
-    if (column.type === ButtonActionsType.Webhook && !column.fk_webhook_id) return false
+  if (column.uidt === UITypes.Button) {
+    if (isNew) {
+      if (column.type === ButtonActionsType.Url && !column.formula_raw) return false
+      if (column.type === ButtonActionsType.Webhook && !column.fk_webhook_id) return false
+    }
+
+    if (column.type === ButtonActionsType.Ai) {
+      if (isNew) {
+        return !(
+          !column.fk_integration_id ||
+          !column.formula_raw?.trim() ||
+          !column.cdfoutput_column_ids?.length ||
+          !column.output_column_ids?.split(',')?.length
+        )
+      } else {
+        !(
+          !column.colOptions?.fk_integration_id ||
+          !column.colOptions?.formula_raw?.trim() ||
+          !column.colOptions?.output_column_ids?.length ||
+          !column.colOptions?.output_column_ids?.split(',')?.length
+        )
+      }
+    }
   }
 
   return true
@@ -711,6 +732,8 @@ function updateDefaultColumnValues(column: TableExplorerColumn) {
         column.label = column.label || 'Generate data'
         column.color = column.color || 'purple'
         column.icon = column.icon || 'ncAutoAwesome'
+        column.output_column_ids = colOptions?.output_column_ids
+        column.fk_integration_id = colOptions?.fk_integration_id
       } else {
         column.theme = column.theme || 'solid'
         column.label = column.label || 'Button'

From 0c508a83549d337a5f2a99bb28475eb84ca38748 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 83/88] fix(nc-gui): some ai button related issue

---
 .../smartsheet/column/ButtonOptions.vue       | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
index 921c7a51d8..d2f6ed168a 100644
--- a/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/ButtonOptions.vue
@@ -35,8 +35,6 @@ const meta = inject(MetaInj, ref())
 const { isEdit, setAdditionalValidations, validateInfos, sqlUi, column, isWebhookCreateModalOpen, isAiMode } =
   useColumnCreateStoreOrThrow()
 
-const { isFeatureEnabled } = useBetaFeatureToggle()
-
 const uiTypesNotSupportedInFormulas = [UITypes.QrCode, UITypes.Barcode, UITypes.Button]
 
 const webhooksStore = useWebhooksStore()
@@ -99,7 +97,7 @@ const supportedColumns = computed(
 const validators = {
   formula_raw: [
     {
-      required: vModel.value.type === ButtonActionsType.Url,
+      required: [ButtonActionsType.Url, ButtonActionsType.Ai].includes(vModel.value.type),
       validator: (_: any, formula: any) => {
         return (async () => {
           if (vModel.value.type === ButtonActionsType.Url) {
@@ -120,6 +118,8 @@ const validators = {
 
               throw new Error(e.message)
             }
+          } else if (vModel.value.type === ButtonActionsType.Ai) {
+            if (!formula?.trim()) throw new Error('Prompt required for AI Button')
           }
         })()
       },
@@ -186,24 +186,30 @@ const validators = {
       },
     },
   ],
-
-  ...((isEdit.value ? vModel.value.colOptions?.type : vModel.value.type) === ButtonActionsType.Ai
-    ? {
-        output_column_ids: [
-          {
-            required: true,
-            message: 'At least one output field is required for AI Button',
-          },
-        ],
-        formula_raw: [
-          {
-            required: true,
-            message: 'Prompt required for AI Button',
-          },
-        ],
-        fk_integration_id: [{ required: true, message: t('general.required') }],
-      }
-    : {}),
+  output_column_ids: [
+    {
+      validator: (_: any, value: any) => {
+        return new Promise<void>((resolve, reject) => {
+          if (vModel.value.type === ButtonActionsType.Ai && !value) {
+            reject(new Error('At least one output field is required for AI Button'))
+          }
+          resolve()
+        })
+      },
+    },
+  ],
+  fk_integration_id: [
+    {
+      validator: (_: any, value: any) => {
+        return new Promise<void>((resolve, reject) => {
+          if (vModel.value.type === ButtonActionsType.Ai && !value) {
+            reject(new Error(t('title.aiIntegrationMissing')))
+          }
+          resolve()
+        })
+      },
+    },
+  ],
 }
 
 if (isEdit.value) {
@@ -360,13 +366,6 @@ const selectIcon = (icon: string) => {
 }
 
 const handleUpdateActionType = (type: ButtonActionsType) => {
-  // We are using `formula_raw` in both type url & ai, so it's imp to reset it
-  if (type !== ButtonActionsType.Ai) {
-    setAdditionalValidations({
-      formula_raw: validators.formula_raw,
-    })
-  }
-
   vModel.value.formula_raw = ''
 }
 

From 66259d3fd404d79c1e4c00ced3221f57b17dd2cf Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:25:42 +0000
Subject: [PATCH 84/88] fix(nc-gui): some MFE related issues

---
 .../smartsheet/column/LongTextOptions.vue     | 171 +++++++++---------
 .../components/smartsheet/details/Fields.vue  |  39 ++--
 2 files changed, 106 insertions(+), 104 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 95fad7dda8..08db2880e8 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -107,7 +107,7 @@ const generate = async () => {
 
 const isPromptEnabled = computed(() => {
   if (isEdit.value) {
-    return isAIPromptCol(column.value)
+    return isAIPromptCol(column.value) || isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
   }
 
   return isFeatureEnabled(FEATURE_FLAG.AI_FEATURES)
@@ -118,10 +118,29 @@ onMounted(() => {
   vModel.value.prompt_raw = (column?.value?.colOptions as Record<string, any>)?.prompt_raw || ''
 })
 
+const validators = {
+  fk_integration_id: [
+    {
+      validator: (_: any, value: any) => {
+        return new Promise<void>((resolve, reject) => {
+          if (isEnabledGenerateText.value && !value) {
+            reject(new Error(t('title.aiIntegrationMissing')))
+          }
+          resolve()
+        })
+      },
+    },
+  ],
+}
+
 if (isEdit.value) {
   vModel.value.fk_integration_id = vModel.value?.colOptions?.fk_integration_id
 }
 
+setAdditionalValidations({
+  ...validators,
+})
+
 provide(EditColumnInj, ref(true))
 
 const richMode = computed({
@@ -156,24 +175,6 @@ watch(richMode, () => {
 watch(isPreviewEnabled, handleDisableSubmitBtn, {
   immediate: true,
 })
-
-watch(
-  isEnabledGenerateText,
-  (newValue) => {
-    if (newValue) {
-      setAdditionalValidations({
-        fk_integration_id: [{ required: true, message: t('title.aiIntegrationMissing') }],
-      })
-    } else {
-      setAdditionalValidations({
-        fk_integration_id: [{ required: false }],
-      })
-    }
-  },
-  {
-    immediate: true,
-  },
-)
 </script>
 
 <template>
@@ -196,31 +197,28 @@ watch(
         <NcTooltip :disabled="!richMode" class="flex items-center">
           <template #title> Generate text using AI is not supported when rich text formatting is enabled </template>
 
-            <NcSwitch
-              v-model:checked="isEnabledGenerateText"
-              :disabled="richMode"
-              class="nc-ai-field-generate-text nc-ai-input"
-              @change="handleDisableSubmitBtn"
+          <NcSwitch
+            v-model:checked="isEnabledGenerateText"
+            :disabled="richMode"
+            class="nc-ai-field-generate-text nc-ai-input"
+            @change="handleDisableSubmitBtn"
+          >
+            <span
+              class="text-sm font-semibold pl-1"
+              :class="{
+                'text-nc-content-purple-dark': isEnabledGenerateText,
+                'text-nc-content-gray': !isEnabledGenerateText,
+              }"
             >
-              <span
-                class="text-sm font-semibold pl-1"
-                :class="{
-                  'text-nc-content-purple-dark': isEnabledGenerateText,
-                  'text-nc-content-gray': !isEnabledGenerateText,
-                }"
-              >
-                Generate text using AI
-              </span>
-            </NcSwitch>
-          </NcTooltip>
-          <NcTooltip class="ml-2 mr-[40px] flex cursor-pointer">
-            <template #title> Use AI to generate content based on record data. </template>
-            <GeneralIcon
-              icon="info"
-              class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5"
-            />
-          </NcTooltip>
-          <div class="flex-1"></div>
+              Generate text using AI
+            </span>
+          </NcSwitch>
+        </NcTooltip>
+        <NcTooltip class="ml-2 mr-[40px] flex cursor-pointer">
+          <template #title> Use AI to generate content based on record data. </template>
+          <GeneralIcon icon="info" class="text-nc-content-gray-muted hover:text-nc-content-gray-subtle opacity-70 w-3.5 h-3.5" />
+        </NcTooltip>
+        <div class="flex-1"></div>
 
         <div class="absolute right-0">
           <AiSettings
@@ -283,56 +281,55 @@ watch(
               </span>
             </div>
 
-              <NcTooltip :disabled="isPreviewEnabled">
-                <template #title> Include at least 1 field in prompt to generate </template>
-                <NcButton
-                  class="nc-aioptions-preview-generate-btn"
+            <NcTooltip :disabled="isPreviewEnabled">
+              <template #title> Include at least 1 field in prompt to generate </template>
+              <NcButton
+                class="nc-aioptions-preview-generate-btn"
+                :class="{
+                  'nc-is-already-generated': isAlreadyGenerated,
+                  'nc-preview-enabled': isPreviewEnabled,
+                }"
+                size="xs"
+                :type="isAlreadyGenerated ? 'text' : 'secondary'"
+                :theme="isPreviewEnabled ? 'ai' : 'default'"
+                :disabled="!isPreviewEnabled"
+                :loading="generatingPreview"
+                @click.stop="generate"
+              >
+                <div
                   :class="{
-                    'nc-is-already-generated': isAlreadyGenerated,
-                    'nc-preview-enabled': isPreviewEnabled,
+                    'nc-animate-dots min-w-[91px] text-left': generatingPreview,
+                    'min-w-[102px]': isAlreadyGenerated && generatingPreview,
+                    'min-w-[80px]': !isAlreadyGenerated && generatingPreview,
                   }"
-                  size="xs"
-                  :type="isAlreadyGenerated ? 'text' : 'secondary'"
-                  :theme="isPreviewEnabled ? 'ai' : 'default'"
-                  :disabled="!isPreviewEnabled"
-                  :loading="generatingPreview"
-                  @click.stop="generate"
                 >
-                  <div
-                    :class="{
-                      'nc-animate-dots min-w-[91px] text-left': generatingPreview,
-                      'min-w-[102px]': isAlreadyGenerated && generatingPreview,
-                      'min-w-[80px]': !isAlreadyGenerated && generatingPreview,
-                    }"
-                  >
-                    {{
-                      isAlreadyGenerated
-                        ? generatingPreview
-                          ? 'Re-generating'
-                          : 'Re-generate'
-                        : generatingPreview
-                        ? 'Generating'
-                        : 'Generate preview'
-                    }}
-                  </div>
-                </NcButton>
-              </NcTooltip>
-            </div>
-            <div v-if="previewRow.row?.[previewFieldTitle]?.value">
-              <div class="relative">
-                <LazySmartsheetRow :row="previewRow">
-                  <LazySmartsheetCell
-                    :edit-enabled="true"
-                    :model-value="previewRow.row[previewFieldTitle]"
-                    :column="vModel"
-                    class="!border-none h-auto my-auto pl-1"
-                  />
-                </LazySmartsheetRow>
-              </div>
+                  {{
+                    isAlreadyGenerated
+                      ? generatingPreview
+                        ? 'Re-generating'
+                        : 'Re-generate'
+                      : generatingPreview
+                      ? 'Generating'
+                      : 'Generate preview'
+                  }}
+                </div>
+              </NcButton>
+            </NcTooltip>
+          </div>
+          <div v-if="previewRow.row?.[previewFieldTitle]?.value">
+            <div class="relative">
+              <LazySmartsheetRow :row="previewRow">
+                <LazySmartsheetCell
+                  :edit-enabled="true"
+                  :model-value="previewRow.row[previewFieldTitle]"
+                  :column="vModel"
+                  class="!border-none h-auto my-auto pl-1"
+                />
+              </LazySmartsheetRow>
             </div>
           </div>
         </div>
-      </template>
+      </div>
     </template>
 
     <AiIntegrationNotFound v-if="!aiIntegrationAvailable && isEnabledGenerateText && isPromptEnabled" />
diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index 503f9ebf9c..6b41cd413b 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -4,6 +4,7 @@ import { message } from 'ant-design-vue'
 import {
   ButtonActionsType,
   UITypes,
+  isAIPromptCol,
   isLinksOrLTAR,
   isSystemColumn,
   isVirtualCol,
@@ -650,21 +651,12 @@ const isColumnValid = (column: TableExplorerColumn) => {
     }
 
     if (column.type === ButtonActionsType.Ai) {
-      if (isNew) {
-        return !(
-          !column.fk_integration_id ||
-          !column.formula_raw?.trim() ||
-          !column.cdfoutput_column_ids?.length ||
-          !column.output_column_ids?.split(',')?.length
-        )
-      } else {
-        !(
-          !column.colOptions?.fk_integration_id ||
-          !column.colOptions?.formula_raw?.trim() ||
-          !column.colOptions?.output_column_ids?.length ||
-          !column.colOptions?.output_column_ids?.split(',')?.length
-        )
-      }
+      return !(
+        !column.fk_integration_id ||
+        !column.formula_raw?.trim() ||
+        !column.output_column_ids?.length ||
+        !column.output_column_ids?.split(',')?.length
+      )
     }
   }
 
@@ -724,6 +716,11 @@ function updateDefaultColumnValues(column: TableExplorerColumn) {
       column.fk_webhook_id = colOptions?.fk_webhook_id
       column.icon = colOptions?.icon
       column.formula_raw = column.colOptions?.formula_raw
+
+      if (column.type === ButtonActionsType.Ai) {
+        column.output_column_ids = colOptions?.output_column_ids
+        column.fk_integration_id = colOptions?.fk_integration_id
+      }
     } else {
       column.type = column?.type || ButtonActionsType.Url
 
@@ -732,8 +729,6 @@ function updateDefaultColumnValues(column: TableExplorerColumn) {
         column.label = column.label || 'Generate data'
         column.color = column.color || 'purple'
         column.icon = column.icon || 'ncAutoAwesome'
-        column.output_column_ids = colOptions?.output_column_ids
-        column.fk_integration_id = colOptions?.fk_integration_id
       } else {
         column.theme = column.theme || 'solid'
         column.label = column.label || 'Button'
@@ -745,6 +740,16 @@ function updateDefaultColumnValues(column: TableExplorerColumn) {
     }
   }
 
+  if (column.uidt === UITypes.LongText && isAIPromptCol(column)) {
+    if (column?.id) {
+      const colOptions = column.colOptions as Record<string, any>
+
+      column.prompt_raw = colOptions?.prompt_raw
+    } else {
+      column.prompt_raw = column.prompt_raw || ''
+    }
+  }
+
   return column
 }
 

From 6f4d753299acb74784825e16bfb8e66f1c1abdf1 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 9 Dec 2024 15:28:11 +0530
Subject: [PATCH 85/88] fix: shared url and dashboard url corrections (#9999)

---
 .../dlg/share-and-collaborate/ShareBase.vue        | 14 ++------------
 .../dlg/share-and-collaborate/SharePage.vue        | 12 ++----------
 packages/nocodb/src/run/cloud.ts                   | 10 ++++++++++
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/ShareBase.vue b/packages/nc-gui/components/dlg/share-and-collaborate/ShareBase.vue
index d171ce9a11..c8690be865 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/ShareBase.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/ShareBase.vue
@@ -18,22 +18,12 @@ const sharedBase = ref<null | ShareBase>(null)
 
 const { base } = storeToRefs(useBase())
 
-const { getBaseUrl, appInfo } = useGlobal()
-
-const workspaceStore = useWorkspace()
+const { appInfo } = useGlobal()
 
 const url = computed(() => {
   if (!sharedBase.value || !sharedBase.value.uuid) return ''
 
-  // get base url for workspace
-  const baseUrl = getBaseUrl(workspaceStore.activeWorkspaceId)
-
-  let dashboardUrl1 = dashboardUrl.value
-
-  if (baseUrl) {
-    dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
-  }
-  return encodeURI(`${dashboardUrl1}#/base/${sharedBase.value.uuid}`)
+  return encodeURI(`${dashboardUrl.value}#/base/${sharedBase.value.uuid}`)
 })
 
 const loadBase = async () => {
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index f644852665..8fac6d85dd 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -4,7 +4,7 @@ import { ViewTypes } from 'nocodb-sdk'
 
 const { view: _view, $api } = useSmartsheetStoreOrThrow()
 const { $e } = useNuxtApp()
-const { getBaseUrl, appInfo } = useGlobal()
+const { appInfo } = useGlobal()
 
 const { dashboardUrl } = useDashboard()
 
@@ -203,15 +203,7 @@ function sharedViewUrl() {
       viewType = 'view'
   }
 
-  // get base url for workspace
-  const baseUrl = getBaseUrl(workspaceStore.activeWorkspaceId)
-
-  let dashboardUrl1 = dashboardUrl.value
-  if (baseUrl) {
-    dashboardUrl1 = `${baseUrl}${appInfo.value?.dashboardPath}`
-  }
-
-  return `${encodeURI(`${dashboardUrl1}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}`)}${
+  return `${encodeURI(`${dashboardUrl.value}#/nc/${viewType}/${activeView.value.uuid}${surveyMode.value ? '/survey' : ''}`)}${
     viewStore.preFillFormSearchParams && formPreFill.value.preFillEnabled ? `?${viewStore.preFillFormSearchParams}` : ''
   }`
 }
diff --git a/packages/nocodb/src/run/cloud.ts b/packages/nocodb/src/run/cloud.ts
index bfcc4174a4..14518b23a8 100644
--- a/packages/nocodb/src/run/cloud.ts
+++ b/packages/nocodb/src/run/cloud.ts
@@ -15,6 +15,16 @@ server.use(
   process.env.NC_DASHBOARD_URL ?? '/dashboard',
   express.static(path.join(__dirname, 'nc-gui')),
 );
+
+// if NC_DASHBOARD_URL is not set to /dashboard, then redirect '/dashboard'
+// to the path set in NC_DASHBOARD_URL
+if (!/^\/?dashboard\/?$/.test(process.env.NC_DASHBOARD_URL)) {
+  server.use('/dashboard', (_, res) => {
+    // redirect to NC_DASHBOARD_URL path
+    res.redirect(process.env.NC_DASHBOARD_URL);
+  });
+}
+
 server.set('view engine', 'ejs');
 
 (async () => {

From 8159fa5420c07ac51a24b13029b53bf86e7f5d32 Mon Sep 17 00:00:00 2001
From: Eli Sheinfeld <lma05485@gmail.com>
Date: Mon, 9 Dec 2024 13:27:54 +0200
Subject: [PATCH 86/88] fix rspack running in build-local-docker-image.sh
 (#10000)

---
 build-local-docker-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-local-docker-image.sh b/build-local-docker-image.sh
index c6fd2878b8..72d598fd64 100755
--- a/build-local-docker-image.sh
+++ b/build-local-docker-image.sh
@@ -45,7 +45,7 @@ function copy_gui_artifacts() {
 function package_nocodb() {
     # build nocodb ( pack nocodb-sdk and nc-gui )
     cd ${SCRIPT_DIR}/packages/nocodb
-    EE=true ${SCRIPT_DIR}/node_modules/@rspack/cli/bin --config ${SCRIPT_DIR}/packages/nocodb/rspack.config.js || ERROR="package_nocodb failed"
+    EE=true ${SCRIPT_DIR}/node_modules/@rspack/cli/bin/rspack.js --config ${SCRIPT_DIR}/packages/nocodb/rspack.config.js || ERROR="package_nocodb failed"
 }
 
 function build_image() {

From 2684cedddf92a08bbff1c81a2aff97c9fac01661 Mon Sep 17 00:00:00 2001
From: Eng Zer Jun <engzerjun@gmail.com>
Date: Mon, 9 Dec 2024 19:29:25 +0800
Subject: [PATCH 87/88] chore(release-pr): update `upload-artifact` action to
 v4 (#9859)

* chore(release-pr): update `upload-artifact` and `download-artifact` actions to v4

v3 of `actions/upload-artifact` and `actions/download-artifact` will be
fully deprecated by 5 December 2024. Jobs that are scheduled to run
during the brownout periods will also fail. See [1][2].

[1]: https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/
[2]: https://github.blog/changelog/2024-11-05-notice-of-breaking-changes-for-github-actions/

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

* Unique artifact name

Reference: https://github.com/nocodb/nocodb/pull/9859#pullrequestreview-2488379782
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

---------

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
---
 .github/workflows/release-pr.yml      | 13 ++++++------
 .github/workflows/uffizzi-preview.yml | 29 ++++++---------------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 973574ce5d..59702bc50d 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -107,9 +107,9 @@ jobs:
           envsubst < .github/uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
           cat docker-compose.rendered.yml
       - name: Upload Rendered Compose File as Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: preview-spec
+          name: preview-spec-docker-compose
           path: docker-compose.rendered.yml
           retention-days: 2
       - name: Serialize PR Event to File
@@ -118,9 +118,9 @@ jobs:
           ${{ toJSON(github.event) }}
           EOF
       - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: preview-spec
+          name: preview-spec-event
           path: event.json
           retention-days: 2
 
@@ -174,8 +174,9 @@ jobs:
 
           EOF
       - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: preview-spec
+          name: preview-spec-event
           path: event.json
           retention-days: 2
+          overwrite: true
diff --git a/.github/workflows/uffizzi-preview.yml b/.github/workflows/uffizzi-preview.yml
index 437d42cc73..ce5c73a4e1 100644
--- a/.github/workflows/uffizzi-preview.yml
+++ b/.github/workflows/uffizzi-preview.yml
@@ -20,31 +20,14 @@ jobs:
     steps:
       - name: 'Download artifacts'
         # Fetch output (zip archive) from the workflow run that triggered this workflow.
-        uses: actions/github-script@v6
+        uses: actions/download-artifact@v4
         with:
-          script: |
-            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "preview-spec"
-            })[0];
-            if (matchArtifact === undefined) {
-              throw TypeError('Build Artifact not found!');
-            }
-            let download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            let fs = require('fs');
-            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
+          path: preview-spec
+          pattern: preview-spec-*
+          merge-multiple: true
 
       - name: 'Accept event from first stage'
-        run: unzip preview-spec.zip event.json
+        run: cp preview-spec/event.json .
 
       - name: Read Event into ENV
         id: event
@@ -58,7 +41,7 @@ jobs:
         # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
         if: ${{ steps.event.outputs.ACTION != 'closed' }}
         run: |
-          unzip preview-spec.zip docker-compose.rendered.yml
+          cp preview-spec/docker-compose.rendered.yml .
           echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_OUTPUT
 
       - name: Cache Rendered Compose File

From b34ab4f96cd4f41875d00a3acae524c33d458503 Mon Sep 17 00:00:00 2001
From: "Mert E." <mertmit99@gmail.com>
Date: Mon, 9 Dec 2024 16:49:28 +0300
Subject: [PATCH 88/88] fix: rich text and normal long text column not working
 (#10002)

Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com>
---
 .../src/modules/jobs/jobs/export-import/export.service.ts       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
index 47b279b49f..74498c9278 100644
--- a/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/export-import/export.service.ts
@@ -632,6 +632,8 @@ export class ExportService {
                   } catch (e) {
                     row[colId] = v;
                   }
+                } else {
+                  row[colId] = v;
                 }
                 break;
               case UITypes.User: