n8n-editor-ui 1.110.1 → 1.112.0

package/dist/assets/{DataStoreDetailsView-BZ7cLl6L.js → DataStoreDetailsView-DZK3pYSP.js}

@@ -1,8 +1,8 @@
-import { d as defineComponent, aG as useTemplateRef, b as useRouter, a as useToast, r as ref, x as computed, c as useI18n, a7 as watch, h as createElementBlock, g as openBlock, n as normalizeClass, i as createVNode, j as createBaseVNode, w as withCtx, t as toDisplayString, aH as InlineRename, l as unref, e as createBlock, f as createCommentVNode, gk as PROJECT_DATA_STORES, Y as nextTick, _ as _export_sfc, ef as mergeModels, c1 as toRefs, eg as useModel, o as onMounted, ez as getCurrentInstance, gI as markRaw, c7 as onUnmounted, gJ as mergeDefaults, eW as toRaw, gK as render, c0 as isRef, gL as isReactive, fW as isProxy, b2 as withDirectives, N as N8nIcon, b3 as vShow, aM as N8nActionDropdown, P as useDebounce, y as N8nPopoverReka, e5 as N8nInputLabel, cZ as N8nInput, b8 as withKeys, gM as MAX_COLUMN_NAME_LENGTH, p as N8nText, k as createTextVNode, a9 as Tooltip, e8 as N8nSelect, F as Fragment, A as renderList, e9 as _sfc_main$9, q as N8nButton, aa as _sfc_main$a, gN as COLUMN_NAME_REGEX, bd as DateTime, a8 as resolveComponent, ap as normalizeStyle, ca as useClipboard, bq as onClickOutside, gO as DATA_STORE_HEADER_HEIGHT, gP as DATA_STORE_ROW_HEIGHT, gQ as ADD_ROW_ROW_ID, gR as DEFAULT_ID_COLUMN_NAME, am as useMessage, an as MODAL_CONFIRM, gS as NULL_VALUE, gT as EMPTY_VALUE, eS as orderBy, gU as DATA_STORE_ID_COLUMN_WIDTH, ax as useDocumentTitle, gV as MIN_LOADING_TIME, dK as N8nLoading, dJ as _sfc_main$b, gW as DATA_STORE_VIEW } from "./index--OJ5nhDf.js";
-import { u as useDataStoreStore, r as reorderItem } from "./dataStore.store-HuymAG46.js";
-import { B as Breadcrumbs, _ as __unplugin_components_0 } from "./ProjectBreadcrumb-BxMwihEP.js";
-import { _ as _sfc_main$8 } from "./DataStoreActions.vue_vue_type_script_setup_true_lang-Dug6Q9SH.js";
-import { S as SelectedItemsInfo } from "./SelectedItemsInfo-64VntNmH.js";
+import { fK as useDataStoreStore, b as useRouter, a as useToast, ah as InlineRename, fq as PROJECT_DATA_STORES, eb as telemetry, _ as _export_sfc, fO as render, fP as ResponseError, N as N8nIcon, az as vShow, am as N8nActionDropdown, fQ as LOOSE_DATE_REGEX, r as useDebounce, h as N8nPopoverReka, di as N8nInputLabel, cj as N8nInput, aE as withKeys, fR as MAX_COLUMN_NAME_LENGTH, d as N8nText, H as Tooltip, dl as N8nSelect, dm as _sfc_main$9, e as N8nButton, I as _sfc_main$a, fS as COLUMN_NAME_REGEX, fT as ADD_ROW_ROW_ID, fU as NULL_VALUE, fV as EMPTY_VALUE, aJ as DateTime, fW as NUMBER_WITH_SPACES_REGEX, fX as NUMBER_THOUSAND_SEPARATOR, fY as NUMBER_DECIMAL_SEPARATOR, bv as useClipboard, aW as onClickOutside, fZ as DEFAULT_ID_COLUMN_NAME, f_ as reorderItem, f$ as DEFAULT_COLUMN_WIDTH, e1 as orderBy, g0 as DATA_STORE_ID_COLUMN_WIDTH, Z as useMessage, $ as MODAL_CONFIRM, Y as useTelemetry, g1 as DATA_STORE_HEADER_HEIGHT, g2 as DATA_STORE_ROW_HEIGHT, a8 as useDocumentTitle, g3 as MIN_LOADING_TIME, cZ as N8nLoading, cY as _sfc_main$b, g4 as DATA_STORE_VIEW } from "./index-BJG79OsS.js";
+import { o as defineComponent, bB as useTemplateRef, b8 as ref, a9 as computed, bT as useI18n, w as watch, ac as createElementBlock, b1 as openBlock, aQ as normalizeClass, k as createVNode, ad as createBaseVNode, bI as withCtx, bo as toDisplayString, u as unref, aa as createBlock, ab as createCommentVNode, n as nextTick, aO as mergeModels, bs as toRefs, by as useModel, r as onMounted, g as getCurrentInstance, aM as markRaw, s as onUnmounted, aN as mergeDefaults, Q as toRaw, aI as isRef, aG as isReactive, aF as isProxy, bK as withDirectives, bc as resolveComponent, aS as normalizeStyle, ah as createTextVNode, F as Fragment, ba as renderList } from "./index-4g2Akj0I.js";
+import { B as Breadcrumbs, _ as __unplugin_components_0 } from "./ProjectBreadcrumb-9uWmVmc7.js";
+import { _ as _sfc_main$8 } from "./DataStoreActions.vue_vue_type_script_setup_true_lang-qftEof1u.js";
+import { S as SelectedItemsInfo } from "./SelectedItemsInfo-DzoCyQOW.js";
 const BREADCRUMBS_SEPARATOR = "/";
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "DataStoreBreadcrumbs",
@@ -60,6 +60,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           throw new Error(i18n.baseText("generic.unknownError"));
         }
         editableName.value = name;
+        telemetry.track("User renamed data table", {
+          data_table_id: props.dataStore.id,
+          data_table_project_id: props.dataStore.projectId
+        });
       } catch (error) {
         editableName.value = props.dataStore.name;
         toast.showError(error, i18n.baseText("dataStore.rename.error"));
@@ -126,12 +130,12 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const separator = "_separator_12h50_132";
+const separator = "_separator_1n6ua_133";
 const style0$2 = {
-  "data-store-breadcrumbs": "_data-store-breadcrumbs_12h50_123",
-  "data-store-actions": "_data-store-actions_12h50_128",
+  "data-store-breadcrumbs": "_data-store-breadcrumbs_1n6ua_123",
+  "data-store-actions": "_data-store-actions_1n6ua_128",
   separator,
-  "breadcrumb-current": "_breadcrumb-current_12h50_138"
+  "breadcrumb-current": "_breadcrumb-current_1n6ua_139"
 };
 const cssModules$2 = {
   "$style": style0$2
@@ -3322,6 +3326,38 @@ function _applyColumnState(beans, params, source) {
   colAnimation?.finish();
   return unmatchedCount === 0;
 }
+function _resetColumnState(beans, source) {
+  const { colModel, autoColSvc, selectionColSvc, eventSvc, gos } = beans;
+  const primaryCols = colModel.getColDefCols();
+  if (!primaryCols?.length) {
+    return;
+  }
+  const primaryColumnTree = colModel.getColDefColTree();
+  const primaryColumns = _getColumnsFromTree(primaryColumnTree);
+  const columnStates = [];
+  let letRowGroupIndex = 1e3;
+  let letPivotIndex = 1e3;
+  const addColState = (col) => {
+    const stateItem = getColumnStateFromColDef(col);
+    if (_missing(stateItem.rowGroupIndex) && stateItem.rowGroup) {
+      stateItem.rowGroupIndex = letRowGroupIndex++;
+    }
+    if (_missing(stateItem.pivotIndex) && stateItem.pivot) {
+      stateItem.pivotIndex = letPivotIndex++;
+    }
+    columnStates.push(stateItem);
+  };
+  autoColSvc?.getColumns()?.forEach(addColState);
+  selectionColSvc?.getColumns()?.forEach(addColState);
+  primaryColumns?.forEach(addColState);
+  _applyColumnState(beans, { state: columnStates }, source);
+  const autoCols = autoColSvc?.getColumns() ?? [];
+  const selectionCols = selectionColSvc?.getColumns() ?? [];
+  const orderedCols = [...selectionCols, ...autoCols, ...primaryCols];
+  const orderedColState = orderedCols.map((col) => ({ colId: col.colId }));
+  _applyColumnState(beans, { state: orderedColState, applyOrder: true }, source);
+  eventSvc.dispatchEvent(_addGridCommonParams(gos, { type: "columnsReset", source }));
+}
 function _compareColumnStatesAndDispatchEvents(beans, source) {
   const { rowGroupColsSvc, pivotColsSvc, valueColsSvc, colModel, sortSvc, eventSvc } = beans;
   const startState = {
@@ -22054,6 +22090,176 @@ var SkeletonCellRendererModule = {
     agSkeletonCellRenderer: SkeletonCellRenderer
   }
 };
+function getColumnDef(beans, key) {
+  const column = beans.colModel.getColDefCol(key);
+  if (column) {
+    return column.getColDef();
+  }
+  return null;
+}
+function getColumnDefs(beans) {
+  return beans.colModel.getColumnDefs();
+}
+function getDisplayNameForColumn(beans, column, location) {
+  return beans.colNames.getDisplayNameForColumn(column, location) || "";
+}
+function getColumn(beans, key) {
+  return beans.colModel.getColDefCol(key);
+}
+function getColumns(beans) {
+  return beans.colModel.getColDefCols();
+}
+function applyColumnState(beans, params) {
+  return _applyColumnState(beans, params, "api");
+}
+function getColumnState(beans) {
+  return _getColumnState(beans);
+}
+function resetColumnState(beans) {
+  _resetColumnState(beans, "api");
+}
+function isPinning(beans) {
+  return beans.visibleCols.isPinningLeft() || beans.visibleCols.isPinningRight();
+}
+function isPinningLeft(beans) {
+  return beans.visibleCols.isPinningLeft();
+}
+function isPinningRight(beans) {
+  return beans.visibleCols.isPinningRight();
+}
+function getDisplayedColAfter(beans, col) {
+  return beans.visibleCols.getColAfter(col);
+}
+function getDisplayedColBefore(beans, col) {
+  return beans.visibleCols.getColBefore(col);
+}
+function setColumnsVisible(beans, keys, visible) {
+  beans.colModel.setColsVisible(keys, visible, "api");
+}
+function setColumnsPinned(beans, keys, pinned) {
+  beans.pinnedCols?.setColsPinned(keys, pinned, "api");
+}
+function getAllGridColumns(beans) {
+  return beans.colModel.getCols();
+}
+function getDisplayedLeftColumns(beans) {
+  return beans.visibleCols.leftCols;
+}
+function getDisplayedCenterColumns(beans) {
+  return beans.visibleCols.centerCols;
+}
+function getDisplayedRightColumns(beans) {
+  return beans.visibleCols.rightCols;
+}
+function getAllDisplayedColumns(beans) {
+  return beans.visibleCols.allCols;
+}
+function getAllDisplayedVirtualColumns(beans) {
+  return beans.colViewport.getViewportColumns();
+}
+function _deepCloneDefinition(object, keysToSkip) {
+  if (!object) {
+    return;
+  }
+  const obj = object;
+  const res = {};
+  Object.keys(obj).forEach((key) => {
+    if (keysToSkip && keysToSkip.indexOf(key) >= 0 || SKIP_JS_BUILTINS.has(key)) {
+      return;
+    }
+    const value = obj[key];
+    const sourceIsSimpleObject = typeof value === "object" && value !== null && value.constructor === Object;
+    if (sourceIsSimpleObject) {
+      res[key] = _deepCloneDefinition(value);
+    } else {
+      res[key] = value;
+    }
+  });
+  return res;
+}
+var ColumnDefFactory = class extends BeanStub {
+  constructor() {
+    super(...arguments);
+    this.beanName = "colDefFactory";
+  }
+  wireBeans(beans) {
+    this.rowGroupColsSvc = beans.rowGroupColsSvc;
+    this.pivotColsSvc = beans.pivotColsSvc;
+  }
+  getColumnDefs(colDefColsList, showingPivotResult, lastOrder, colsList) {
+    const cols = colDefColsList.slice();
+    if (showingPivotResult) {
+      cols.sort((a, b) => lastOrder.indexOf(a) - lastOrder.indexOf(b));
+    } else if (lastOrder) {
+      cols.sort((a, b) => colsList.indexOf(a) - colsList.indexOf(b));
+    }
+    const rowGroupColumns = this.rowGroupColsSvc?.columns;
+    const pivotColumns = this.pivotColsSvc?.columns;
+    return this.buildColumnDefs(cols, rowGroupColumns, pivotColumns);
+  }
+  buildColumnDefs(cols, rowGroupColumns = [], pivotColumns = []) {
+    const res = [];
+    const colGroupDefs = {};
+    cols.forEach((col) => {
+      const colDef = this.createDefFromColumn(col, rowGroupColumns, pivotColumns);
+      let addToResult = true;
+      let childDef = colDef;
+      let pointer = col.getOriginalParent();
+      let lastPointer = null;
+      while (pointer) {
+        let parentDef = null;
+        if (pointer.isPadding()) {
+          pointer = pointer.getOriginalParent();
+          continue;
+        }
+        const existingParentDef = colGroupDefs[pointer.getGroupId()];
+        if (existingParentDef) {
+          existingParentDef.children.push(childDef);
+          addToResult = false;
+          break;
+        }
+        parentDef = this.createDefFromGroup(pointer);
+        if (parentDef) {
+          parentDef.children = [childDef];
+          colGroupDefs[parentDef.groupId] = parentDef;
+          childDef = parentDef;
+          pointer = pointer.getOriginalParent();
+        }
+        if (pointer != null && lastPointer === pointer) {
+          addToResult = false;
+          break;
+        }
+        lastPointer = pointer;
+      }
+      if (addToResult) {
+        res.push(childDef);
+      }
+    });
+    return res;
+  }
+  createDefFromGroup(group) {
+    const defCloned = _deepCloneDefinition(group.getColGroupDef(), ["children"]);
+    if (defCloned) {
+      defCloned.groupId = group.getGroupId();
+    }
+    return defCloned;
+  }
+  createDefFromColumn(col, rowGroupColumns, pivotColumns) {
+    const colDefCloned = _deepCloneDefinition(col.getColDef());
+    colDefCloned.colId = col.getColId();
+    colDefCloned.width = col.getActualWidth();
+    colDefCloned.rowGroup = col.isRowGroupActive();
+    colDefCloned.rowGroupIndex = col.isRowGroupActive() ? rowGroupColumns.indexOf(col) : null;
+    colDefCloned.pivot = col.isPivotActive();
+    colDefCloned.pivotIndex = col.isPivotActive() ? pivotColumns.indexOf(col) : null;
+    colDefCloned.aggFunc = col.isValueActive() ? col.getAggFunc() : null;
+    colDefCloned.hide = col.isVisible() ? void 0 : true;
+    colDefCloned.pinned = col.isPinned() ? col.getPinned() : null;
+    colDefCloned.sort = col.getSort() ? col.getSort() : null;
+    colDefCloned.sortIndex = col.getSortIndex() != null ? col.getSortIndex() : null;
+    return colDefCloned;
+  }
+};
 var ColumnFlexService = class extends BeanStub {
   constructor() {
     super(...arguments);
@@ -22828,6 +23034,34 @@ var ColumnFlexModule = {
   version: VERSION,
   beans: [ColumnFlexService]
 };
+var ColumnApiModule = {
+  moduleName: "ColumnApi",
+  version: VERSION,
+  beans: [ColumnDefFactory],
+  apiFunctions: {
+    getColumnDef,
+    getDisplayNameForColumn,
+    getColumn,
+    getColumns,
+    applyColumnState,
+    getColumnState,
+    resetColumnState,
+    isPinning,
+    isPinningLeft,
+    isPinningRight,
+    getDisplayedColAfter,
+    getDisplayedColBefore,
+    setColumnsVisible,
+    setColumnsPinned,
+    getAllGridColumns,
+    getDisplayedLeftColumns,
+    getDisplayedCenterColumns,
+    getDisplayedRightColumns,
+    getAllDisplayedColumns,
+    getAllDisplayedVirtualColumns,
+    getColumnDefs
+  }
+};
 function _camelCaseToHumanText(camelCase) {
   if (!camelCase || camelCase == null) {
     return null;
@@ -41189,11 +41423,55 @@ const n8nTheme = themeQuartz.withPart(iconSetAlpine).withParams({
   checkboxUncheckedBackgroundColor: "var(--color-background-light-base)",
   checkboxCheckedBackgroundColor: "var(--color-primary)"
 });
+const useDataStorePagination = (options = {}) => {
+  const currentPage = ref(options.initialPage ?? 1);
+  const pageSize = ref(options.initialPageSize ?? 20);
+  const totalItems = ref(0);
+  const pageSizeOptions = options.pageSizeOptions ?? [10, 20, 50];
+  const setTotalItems = (count) => {
+    totalItems.value = count;
+  };
+  const setCurrentPage = async (page) => {
+    currentPage.value = page;
+    if (options.onChange) await options.onChange(currentPage.value, pageSize.value);
+  };
+  const setPageSize = async (size) => {
+    pageSize.value = size;
+    currentPage.value = 1;
+    if (options.onChange) await options.onChange(currentPage.value, pageSize.value);
+  };
+  const ensureItemOnPage = async (itemIndex) => {
+    const itemPage = Math.max(1, Math.ceil(itemIndex / pageSize.value));
+    if (currentPage.value !== itemPage) {
+      currentPage.value = itemPage;
+      if (options.onChange) await options.onChange(currentPage.value, pageSize.value);
+    }
+  };
+  return {
+    currentPage,
+    pageSize,
+    pageSizeOptions,
+    totalItems,
+    setTotalItems,
+    setCurrentPage,
+    setPageSize,
+    ensureItemOnPage
+  };
+};
+const DATA_STORE_COLUMN_TYPES = ["string", "number", "boolean", "date"];
+const AG_GRID_CELL_TYPES = [
+  "text",
+  "number",
+  "boolean",
+  "date",
+  "dateString",
+  "object"
+];
 const isDataStoreValue = (value) => {
   return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value instanceof Date;
 };
 const isAGGridCellType = (value) => {
-  return typeof value === "string" && ["text", "number", "boolean", "date", "dateString", "object"].includes(value);
+  return typeof value === "string" && AG_GRID_CELL_TYPES.includes(value);
 };
 const COLUMN_TYPE_ICONS = {
   string: "type",
@@ -41203,6 +41481,7 @@ const COLUMN_TYPE_ICONS = {
 };
 const useDataStoreTypes = () => {
   const getIconForType = (type) => COLUMN_TYPE_ICONS[type];
+  const i18n = useI18n();
   const mapToAGCellType = (colType) => {
     if (colType === "string") {
       return "text";
@@ -41232,14 +41511,35 @@ const useDataStoreTypes = () => {
         return null;
     }
   };
+  const getAddColumnError = (error) => {
+    const DEFAULT_HTTP_STATUS = 500;
+    const DEFAULT_MESSAGE = i18n.baseText("generic.unknownError");
+    if (error instanceof ResponseError) {
+      return {
+        httpStatus: error.httpStatusCode ?? 500,
+        message: error.message
+      };
+    }
+    if (error instanceof Error) {
+      return {
+        httpStatus: DEFAULT_HTTP_STATUS,
+        message: error.message
+      };
+    }
+    return {
+      httpStatus: DEFAULT_HTTP_STATUS,
+      message: DEFAULT_MESSAGE
+    };
+  };
   return {
     getIconForType,
     mapToAGCellType,
     mapToDataStoreColumnType,
-    getDefaultValueForType
+    getDefaultValueForType,
+    getAddColumnError
   };
 };
-const _hoisted_1$4 = { class: "data-store-column-header-icon-wrapper" };
+const _hoisted_1$3 = { class: "data-store-column-header-icon-wrapper" };
 const _hoisted_2$2 = {
   class: "ag-header-cell-text",
   "data-test-id": "data-store-column-header-text"
@@ -41326,7 +41626,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         onMouseleave: onMouseLeave,
         onClick: onHeaderClick
       }, [
-        createBaseVNode("div", _hoisted_1$4, [
+        createBaseVNode("div", _hoisted_1$3, [
           typeIcon.value ? (openBlock(), createBlock(_component_N8nIcon, {
             key: 0,
             icon: typeIcon.value
@@ -41360,15 +41660,143 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$3 = { class: "add-column-header-component-wrapper" };
-const _hoisted_2$1 = { class: "add-ds-column-header-popover-content" };
+const parseLooseDateInput = (text) => {
+  const trimmed = text.trim();
+  const m = LOOSE_DATE_REGEX.exec(trimmed);
+  if (!m) return null;
+  const y = Number(m[1]);
+  const mo = Number(m[2]);
+  const d = Number(m[3]);
+  const hh = m[4] !== void 0 ? Number(m[4]) : 0;
+  const mm = m[5] !== void 0 ? Number(m[5]) : 0;
+  const ss = m[6] !== void 0 ? Number(m[6]) : 0;
+  const dt = new Date(y, mo - 1, d, hh, mm, ss, 0);
+  if (dt.getFullYear() !== y || dt.getMonth() !== mo - 1 || dt.getDate() !== d || dt.getHours() !== hh || dt.getMinutes() !== mm || dt.getSeconds() !== ss) {
+    return null;
+  }
+  return dt;
+};
+const areValuesEqual = (oldValue, newValue, type) => {
+  if (type && type === "date") {
+    if (oldValue instanceof Date && newValue instanceof Date) {
+      return oldValue.getTime() === newValue.getTime();
+    }
+  }
+  return oldValue === newValue;
+};
+const _sfc_main$5 = /* @__PURE__ */ defineComponent({
+  __name: "ElDatePickerCellEditor",
+  props: {
+    params: {}
+  },
+  setup(__props, { expose: __expose }) {
+    const props = __props;
+    const pickerRef = useTemplateRef("pickerRef");
+    const wrapperRef = useTemplateRef("wrapperRef");
+    const dateValue = ref(null);
+    const initialValue = ref(null);
+    const inputWidth = ref(props.params.column.getActualWidth() - 4);
+    function commitIfParsedFromInput(target) {
+      const input = target instanceof HTMLInputElement ? target : null;
+      const value = input?.value ?? "";
+      const parsed = parseLooseDateInput(value);
+      if (parsed) {
+        dateValue.value = parsed;
+        props.params.stopEditing();
+        return true;
+      }
+      return false;
+    }
+    function onKeydown(e) {
+      if (e.key === "Escape") {
+        e.stopPropagation();
+        dateValue.value = initialValue.value;
+        props.params.stopEditing();
+        return;
+      }
+      if (e.key === "Enter") {
+        const committed = commitIfParsedFromInput(e.target);
+        if (committed) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+      }
+    }
+    function getInnerInput() {
+      return wrapperRef.value?.querySelector("input") ?? null;
+    }
+    function onChange() {
+      props.params.stopEditing();
+    }
+    function onClear() {
+      dateValue.value = null;
+      props.params.stopEditing();
+    }
+    onMounted(async () => {
+      const initial = props.params.value;
+      if (initial === null || initial === void 0) {
+        dateValue.value = null;
+      } else if (initial instanceof Date) {
+        dateValue.value = initial;
+      }
+      initialValue.value = dateValue.value;
+      await nextTick();
+      try {
+        pickerRef.value?.focus?.();
+      } catch {
+      }
+    });
+    __expose({
+      getValue: () => {
+        const input = getInnerInput();
+        const typed = input?.value ?? "";
+        const parsed = parseLooseDateInput(typed);
+        if (parsed) return parsed;
+        return dateValue.value;
+      },
+      isPopup: () => true
+    });
+    return (_ctx, _cache) => {
+      const _component_el_date_picker = resolveComponent("el-date-picker");
+      return openBlock(), createElementBlock("div", {
+        ref_key: "wrapperRef",
+        ref: wrapperRef,
+        class: "datastore-datepicker-wrapper"
+      }, [
+        createVNode(_component_el_date_picker, {
+          id: "datastore-datepicker",
+          ref_key: "pickerRef",
+          ref: pickerRef,
+          modelValue: dateValue.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dateValue.value = $event),
+          type: "datetime",
+          style: normalizeStyle({ width: `${inputWidth.value}px` }),
+          clearable: true,
+          editable: true,
+          teleported: false,
+          "popper-class": "ag-custom-component-popup datastore-datepicker-popper",
+          placeholder: "YYYY-MM-DD (HH:mm:ss)",
+          size: "small",
+          onChange,
+          onClear,
+          onKeydown
+        }, null, 8, ["modelValue", "style"])
+      ], 512);
+    };
+  }
+});
+const _hoisted_1$2 = { class: "add-column-header-component-wrapper" };
+const _hoisted_2$1 = {
+  class: "add-ds-column-header-popover-content",
+  "data-test-id": "add-column-popover-content"
+};
 const _hoisted_3 = { class: "popover-body" };
 const _hoisted_4 = {
   key: 0,
   class: "error-message"
 };
 const _hoisted_5 = { class: "add-column-option-content" };
-const _sfc_main$5 = /* @__PURE__ */ defineComponent({
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "AddColumnButton",
   props: {
     params: {},
@@ -41383,21 +41811,39 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const nameInputRef = ref(null);
     const columnName = ref("");
     const columnType = ref("string");
-    const columnTypes = ["string", "number", "boolean", "date"];
+    const columnTypes = [...DATA_STORE_COLUMN_TYPES];
     const error = ref(null);
     const popoverOpen = ref(false);
     const isSelectOpen = ref(false);
     const popoverId = computed(() => props.popoverId ?? "add-column-popover");
+    const columnTypeOptions = computed(() => {
+      return columnTypes.map((type) => ({
+        label: type === "date" ? "datetime" : type,
+        value: type
+      }));
+    });
     const onAddButtonClicked = async () => {
       validateName();
       if (!columnName.value || !columnType.value || error.value) {
         return;
       }
-      const success = await props.params.onAddColumn({
+      const response = await props.params.onAddColumn({
         name: columnName.value,
         type: columnType.value
       });
-      if (!success) {
+      if (!response.success) {
+        let errorMessage = i18n.baseText("dataStore.addColumn.error");
+        let errorDescription = response.errorMessage;
+        if (response.httpStatus === 409) {
+          errorMessage = i18n.baseText("dataStore.addColumn.alreadyExistsError", {
+            interpolate: { name: columnName.value }
+          });
+          errorDescription = i18n.baseText("dataStore.addColumn.alreadyExistsDescription");
+        }
+        error.value = {
+          message: errorMessage,
+          description: errorDescription
+        };
         return;
       }
       columnName.value = "";
@@ -41420,7 +41866,10 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         error.value = null;
       }
       if (columnName.value && !COLUMN_NAME_REGEX.test(columnName.value)) {
-        error.value = i18n.baseText("dataStore.addColumn.invalidName.error");
+        error.value = {
+          message: i18n.baseText("dataStore.addColumn.invalidName.error"),
+          description: i18n.baseText("dataStore.addColumn.invalidName.description")
+        };
       }
     };
     const onInput = debounce(validateName, { debounceTime: 100 });
@@ -41441,7 +41890,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         content: unref(i18n).baseText("dataStore.addColumn.label")
       }, {
         default: withCtx(() => [
-          createBaseVNode("div", _hoisted_1$3, [
+          createBaseVNode("div", _hoisted_1$2, [
             createVNode(_component_N8nPopoverReka, {
               id: popoverId.value,
               open: popoverOpen.value,
@@ -41487,18 +41936,21 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                           onInput: unref(onInput)
                         }, null, 8, ["modelValue", "placeholder", "maxlength", "onInput"]),
                         error.value ? (openBlock(), createElementBlock("div", _hoisted_4, [
-                          createVNode(_component_n8n_text, {
+                          error.value.message ? (openBlock(), createBlock(_component_n8n_text, {
+                            key: 0,
                             size: "small",
                             color: "danger",
                             tag: "span"
                           }, {
                             default: withCtx(() => [
-                              createTextVNode(toDisplayString(error.value), 1)
+                              createTextVNode(toDisplayString(error.value.message), 1)
                             ]),
                             _: 1
-                          }),
+                          })) : createCommentVNode("", true),
                           createVNode(Tooltip, {
-                            content: unref(i18n).baseText("dataStore.addColumn.invalidName.description")
+                            content: error.value.description,
+                            placement: "top",
+                            disabled: !error.value.description
                           }, {
                             default: withCtx(() => [
                               createVNode(_component_N8nIcon, {
@@ -41510,7 +41962,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                               })
                             ]),
                             _: 1
-                          }, 8, ["content"])
+                          }, 8, ["content", "disabled"])
                         ])) : createCommentVNode("", true)
                       ]),
                       _: 1
@@ -41528,27 +41980,28 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                           onVisibleChange: _cache[2] || (_cache[2] = ($event) => isSelectOpen.value = $event)
                         }, {
                           default: withCtx(() => [
-                            (openBlock(), createElementBlock(Fragment, null, renderList(columnTypes, (type) => {
-                              return createVNode(_component_N8nOption, {
-                                key: type,
-                                value: type
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(columnTypeOptions.value, (option) => {
+                              return openBlock(), createBlock(_component_N8nOption, {
+                                key: option.value,
+                                label: option.label,
+                                value: option.value
                               }, {
                                 default: withCtx(() => [
                                   createBaseVNode("div", _hoisted_5, [
                                     createVNode(_component_N8nIcon, {
-                                      icon: unref(getIconForType)(type)
+                                      icon: unref(getIconForType)(option.value)
                                     }, null, 8, ["icon"]),
                                     createVNode(_component_N8nText, null, {
                                       default: withCtx(() => [
-                                        createTextVNode(toDisplayString(type), 1)
+                                        createTextVNode(toDisplayString(option.label), 1)
                                       ]),
                                       _: 2
                                     }, 1024)
                                   ])
                                 ]),
                                 _: 2
-                              }, 1032, ["value"]);
-                            }), 64))
+                              }, 1032, ["label", "value"]);
+                            }), 128))
                           ]),
                           _: 1
                         }, 8, ["modelValue", "append-to"])
@@ -41580,7 +42033,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _sfc_main$4 = /* @__PURE__ */ defineComponent({
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "AddRowButton",
   props: {
     params: {}
@@ -41605,8 +42058,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$2 = { class: "n8n-empty-value" };
-const _sfc_main$3 = /* @__PURE__ */ defineComponent({
+const _hoisted_1$1 = { class: "n8n-empty-value" };
+const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "NullEmptyCellRenderer",
   props: {
     params: {}
@@ -41614,84 +42067,690 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("span", _hoisted_1$2, toDisplayString(props.params.value), 1);
+      return openBlock(), createElementBlock("span", _hoisted_1$1, toDisplayString(props.params.value), 1);
     };
   }
 });
-const _hoisted_1$1 = { class: "datastore-datepicker-wrapper" };
-const _sfc_main$2 = /* @__PURE__ */ defineComponent({
-  __name: "ElDatePickerCellEditor",
-  props: {
-    params: {}
-  },
-  setup(__props, { expose: __expose }) {
-    const props = __props;
-    const pickerRef = ref(null);
-    const dateValue = ref(null);
-    const initialValue = ref(null);
-    const inputWidth = ref(props.params.column.getActualWidth() - 4);
-    onMounted(async () => {
-      const initial = props.params.value;
-      if (initial === null || initial === void 0) {
-        dateValue.value = null;
-      } else if (initial instanceof Date) {
-        const dt = DateTime.fromJSDate(initial);
-        dateValue.value = dt.minus({ minutes: dt.offset }).toJSDate();
-      }
-      initialValue.value = dateValue.value;
-      await nextTick();
-      try {
-        pickerRef.value?.focus?.();
-      } catch {
-      }
+const getCellClass = (params) => {
+  if (params.data?.id === ADD_ROW_ROW_ID) {
+    return "add-row-cell";
+  }
+  if (params.column.getUserProvidedColDef()?.cellDataType === "boolean") {
+    return "boolean-cell";
+  }
+  return "";
+};
+const createValueGetter = (col) => (params) => {
+  if (params.data?.[col.name] === null || params.data?.[col.name] === void 0) {
+    return null;
+  }
+  if (col.type === "date") {
+    const value = params.data?.[col.name];
+    if (typeof value === "string") {
+      return new Date(value);
+    }
+  }
+  return params.data?.[col.name];
+};
+const createCellRendererSelector = (col) => (params) => {
+  if (params.data?.id === ADD_ROW_ROW_ID || col.id === "add-column") {
+    return {};
+  }
+  let rowValue = params.data?.[col.name];
+  if (rowValue === void 0) {
+    rowValue = null;
+  }
+  if (rowValue === null) {
+    return { component: _sfc_main$2, params: { value: NULL_VALUE } };
+  }
+  if (rowValue === "") {
+    return { component: _sfc_main$2, params: { value: EMPTY_VALUE } };
+  }
+  return void 0;
+};
+const createStringValueSetter = (col, isTextEditorOpen) => (params) => {
+  let originalValue = params.data[col.name];
+  if (originalValue === void 0) {
+    originalValue = null;
+  }
+  let newValue = params.newValue;
+  if (!isDataStoreValue(newValue)) {
+    return false;
+  }
+  if (originalValue === null && newValue === "") {
+    return false;
+  }
+  if (isTextEditorOpen.value && newValue === null) {
+    newValue = "";
+  }
+  params.data[col.name] = newValue;
+  return true;
+};
+const stringCellEditorParams = (params) => ({
+  value: params.value ?? "",
+  maxLength: 999999999
+});
+const dateValueFormatter = (params) => {
+  const value = params.value;
+  if (value === null || value === void 0) return "";
+  return DateTime.fromJSDate(value).toISO() ?? "";
+};
+const numberWithSpaces = (num) => {
+  const parts = num.toString().split(".");
+  parts[0] = parts[0].replace(NUMBER_WITH_SPACES_REGEX, NUMBER_THOUSAND_SEPARATOR);
+  return parts.join(NUMBER_DECIMAL_SEPARATOR);
+};
+const numberValueFormatter = (params) => {
+  const value = params.value;
+  if (value === null || value === void 0) return "";
+  return numberWithSpaces(value);
+};
+const useDataStoreGridBase = ({
+  gridContainerRef,
+  onDeleteColumn,
+  onAddRowClick,
+  onAddColumn
+}) => {
+  const gridApi = ref(null);
+  const colDefs = ref([]);
+  const isTextEditorOpen = ref(false);
+  const { mapToAGCellType } = useDataStoreTypes();
+  const { copy: copyToClipboard } = useClipboard({ onPaste: onClipboardPaste });
+  const currentSortBy = ref(DEFAULT_ID_COLUMN_NAME);
+  const currentSortOrder = ref("asc");
+  const lastFocusedCell = ref(null);
+  const initializedGridApi = computed(() => {
+    if (!gridApi.value) {
+      throw new Error("Grid API is not initialized");
+    }
+    return gridApi.value;
+  });
+  const onGridReady = (params) => {
+    gridApi.value = params.api;
+    if (gridContainerRef.value) {
+      params.api.setGridOption("popupParent", gridContainerRef.value);
+    }
+  };
+  const setGridData = ({
+    colDefs: colDefs2,
+    rowData
+  }) => {
+    if (colDefs2) {
+      initializedGridApi.value.setGridOption("columnDefs", colDefs2);
+    }
+    if (rowData) {
+      initializedGridApi.value.setGridOption("rowData", rowData);
+    }
+    initializedGridApi.value.setGridOption("pinnedBottomRowData", [{ id: ADD_ROW_ROW_ID }]);
+  };
+  const focusFirstEditableCell = (rowId) => {
+    const rowNode = initializedGridApi.value.getRowNode(String(rowId));
+    if (rowNode?.rowIndex === null) return;
+    const rowIndex = rowNode.rowIndex;
+    const displayed = initializedGridApi.value.getAllDisplayedColumns();
+    const firstEditable = displayed.find((col) => {
+      const def = col.getColDef();
+      if (!def) return false;
+      if (def.colId === DEFAULT_ID_COLUMN_NAME) return false;
+      return !!def.editable;
+    });
+    if (!firstEditable) return;
+    const columnId = firstEditable.getColId();
+    requestAnimationFrame(() => {
+      initializedGridApi.value.ensureIndexVisible(rowIndex);
+      requestAnimationFrame(() => {
+        initializedGridApi.value.setFocusedCell(rowIndex, columnId);
+        initializedGridApi.value.startEditingCell({
+          rowIndex,
+          colKey: columnId
+        });
+      });
     });
-    function onChange() {
-      props.params.stopEditing();
+  };
+  const createColumnDef = (col, extraProps = {}) => {
+    const columnDef = {
+      colId: col.id,
+      field: col.name,
+      headerName: col.name,
+      sortable: true,
+      editable: (params) => params.data?.id !== ADD_ROW_ROW_ID,
+      resizable: true,
+      lockPinned: true,
+      headerComponent: _sfc_main$6,
+      headerComponentParams: { onDelete: onDeleteColumn, allowMenuActions: true },
+      cellEditorPopup: false,
+      cellDataType: mapToAGCellType(col.type),
+      cellClass: getCellClass,
+      valueGetter: createValueGetter(col),
+      cellRendererSelector: createCellRendererSelector(col),
+      width: DEFAULT_COLUMN_WIDTH
+    };
+    if (col.type === "string") {
+      columnDef.cellEditor = "agLargeTextCellEditor";
+      columnDef.cellEditorPopup = true;
+      columnDef.cellEditorPopupPosition = "over";
+      columnDef.cellEditorParams = stringCellEditorParams;
+      columnDef.valueSetter = createStringValueSetter(col, isTextEditorOpen);
+    } else if (col.type === "date") {
+      columnDef.cellEditorSelector = () => ({
+        component: _sfc_main$5
+      });
+      columnDef.valueFormatter = dateValueFormatter;
+      columnDef.cellEditorPopup = true;
+    } else if (col.type === "number") {
+      columnDef.valueFormatter = numberValueFormatter;
     }
-    function onClear() {
-      dateValue.value = null;
-      props.params.stopEditing();
+    return {
+      ...columnDef,
+      ...extraProps
+    };
+  };
+  const onCellEditingStarted = (params) => {
+    if (params.column.getColDef().cellDataType === "text") {
+      isTextEditorOpen.value = true;
+    } else {
+      isTextEditorOpen.value = false;
     }
-    function onKeydown(e) {
-      if (e.key === "Escape") {
-        e.stopPropagation();
-        dateValue.value = initialValue.value;
-        props.params.stopEditing();
-      } else if (e.key === "Enter") {
-        e.stopPropagation();
-        props.params.stopEditing();
-      }
+  };
+  const onCellEditingStopped = (params) => {
+    if (params.column.getColDef().cellDataType === "text") {
+      isTextEditorOpen.value = false;
     }
-    __expose({
-      getValue: () => {
-        if (dateValue.value === null) return null;
-        const dt = DateTime.fromJSDate(dateValue.value);
-        return dt.plus({ minutes: dt.offset }).toJSDate();
+  };
+  const getColumnDefinitions = (dataStoreColumns) => {
+    const systemDateColumnOptions = {
+      editable: false,
+      suppressMovable: true,
+      lockPinned: true,
+      lockPosition: "right",
+      headerComponentParams: {
+        allowMenuActions: false
       },
-      isPopup: () => true
-    });
-    return (_ctx, _cache) => {
-      const _component_el_date_picker = resolveComponent("el-date-picker");
-      return openBlock(), createElementBlock("div", _hoisted_1$1, [
-        createVNode(_component_el_date_picker, {
-          ref_key: "pickerRef",
-          ref: pickerRef,
-          modelValue: dateValue.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dateValue.value = $event),
-          type: "datetime",
-          style: normalizeStyle({ width: `${inputWidth.value}px` }),
-          clearable: true,
+      cellClass: (params) => params.data?.id === ADD_ROW_ROW_ID ? "add-row-cell" : "system-cell",
+      headerClass: "system-column",
+      width: DEFAULT_COLUMN_WIDTH
+    };
+    return [
+      // Always add the ID column, it's not returned by the back-end but all data stores have it
+      // We use it as a placeholder for new datastores
+      createColumnDef(
+        {
+          id: DEFAULT_ID_COLUMN_NAME,
+          name: DEFAULT_ID_COLUMN_NAME,
+          type: "string"
+        },
+        {
           editable: false,
-          teleported: false,
-          placeholder: "",
-          onChange,
-          onClear,
-          onKeydown
-        }, null, 8, ["modelValue", "style"])
-      ]);
+          sortable: true,
+          suppressMovable: true,
+          headerComponent: null,
+          lockPosition: true,
+          minWidth: DATA_STORE_ID_COLUMN_WIDTH,
+          maxWidth: DATA_STORE_ID_COLUMN_WIDTH,
+          resizable: false,
+          headerClass: "system-column",
+          cellClass: (params) => params.data?.id === ADD_ROW_ROW_ID ? "add-row-cell" : "id-column",
+          cellRendererSelector: (params) => {
+            if (params.value === ADD_ROW_ROW_ID) {
+              return {
+                component: _sfc_main$3,
+                params: { onClick: onAddRowClick }
+              };
+            }
+            return void 0;
+          }
+        }
+      ),
+      // Append other columns
+      ...orderBy(dataStoreColumns, "index").map((col) => createColumnDef(col)),
+      createColumnDef(
+        {
+          index: dataStoreColumns.length + 1,
+          id: "createdAt",
+          name: "createdAt",
+          type: "date"
+        },
+        systemDateColumnOptions
+      ),
+      createColumnDef(
+        {
+          index: dataStoreColumns.length + 2,
+          id: "updatedAt",
+          name: "updatedAt",
+          type: "date"
+        },
+        systemDateColumnOptions
+      ),
+      createColumnDef(
+        {
+          index: dataStoreColumns.length + 3,
+          id: "add-column",
+          name: "Add Column",
+          type: "string"
+        },
+        {
+          editable: false,
+          suppressMovable: true,
+          lockPinned: true,
+          lockPosition: "right",
+          resizable: false,
+          flex: 1,
+          headerComponent: _sfc_main$4,
+          headerComponentParams: { onAddColumn }
+        }
+      )
+    ];
+  };
+  const loadColumns = (dataStoreColumns) => {
+    colDefs.value = getColumnDefinitions(dataStoreColumns);
+    setGridData({ colDefs: colDefs.value });
+  };
+  const deleteColumn = (columnId) => {
+    colDefs.value = colDefs.value.filter((col) => col.colId !== columnId);
+    setGridData({ colDefs: colDefs.value });
+  };
+  const insertColumnAtIndex = (column, index) => {
+    colDefs.value.splice(index, 0, column);
+    setGridData({ colDefs: colDefs.value });
+  };
+  const addColumn = (column) => {
+    colDefs.value = [
+      ...colDefs.value.slice(0, -1),
+      createColumnDef(column),
+      ...colDefs.value.slice(-1)
+    ];
+    setGridData({ colDefs: colDefs.value });
+  };
+  const moveColumn = (oldIndex, newIndex) => {
+    const fromIndex = oldIndex - 1;
+    const columnToBeMoved = colDefs.value[fromIndex];
+    if (!columnToBeMoved) {
+      return;
+    }
+    const middleWithIndex = colDefs.value.slice(1, -1).map((col, index) => ({ ...col, index }));
+    const reorderedMiddle = reorderItem(middleWithIndex, fromIndex, newIndex).sort((a, b) => a.index - b.index).map(({ index, ...col }) => col);
+    colDefs.value = [colDefs.value[0], ...reorderedMiddle, colDefs.value[colDefs.value.length - 1]];
+  };
+  const handleCopyFocusedCell = async (params) => {
+    const focused = params.api.getFocusedCell();
+    if (!focused) {
+      return;
+    }
+    const row = params.api.getDisplayedRowAtIndex(focused.rowIndex);
+    const colDef = focused.column.getColDef();
+    if (row?.data && colDef.field) {
+      const rawValue = row.data[colDef.field];
+      const text = rawValue === null || rawValue === void 0 ? "" : String(rawValue);
+      await copyToClipboard(text);
+    }
+  };
+  function onClipboardPaste(data) {
+    const focusedCell = initializedGridApi.value.getFocusedCell();
+    const isEditing2 = initializedGridApi.value.getEditingCells().length > 0;
+    if (!focusedCell || isEditing2) return;
+    const row = initializedGridApi.value.getDisplayedRowAtIndex(focusedCell.rowIndex);
+    if (!row) return;
+    const colDef = focusedCell.column.getColDef();
+    if (colDef.cellDataType === "text") {
+      row.setDataValue(focusedCell.column.getColId(), data);
+    } else if (colDef.cellDataType === "number") {
+      if (!Number.isNaN(Number(data))) {
+        row.setDataValue(focusedCell.column.getColId(), Number(data));
+      }
+    } else if (colDef.cellDataType === "date") {
+      if (!Number.isNaN(Date.parse(data))) {
+        row.setDataValue(focusedCell.column.getColId(), new Date(data));
+      }
+    } else if (colDef.cellDataType === "boolean") {
+      if (data === "true") {
+        row.setDataValue(focusedCell.column.getColId(), true);
+      } else if (data === "false") {
+        row.setDataValue(focusedCell.column.getColId(), false);
+      }
+    }
+  }
+  const onCellClicked = (params) => {
+    const clickedCellColumn = params.column.getColId();
+    const clickedCellRow = params.rowIndex;
+    if (clickedCellRow === null || params.api.isEditing({ rowIndex: clickedCellRow, column: params.column, rowPinned: null }))
+      return;
+    const wasAlreadyFocused = lastFocusedCell.value && lastFocusedCell.value.rowIndex === clickedCellRow && lastFocusedCell.value.colId === clickedCellColumn;
+    if (wasAlreadyFocused && params.column.getColDef()?.editable) {
+      params.api.startEditingCell({
+        rowIndex: clickedCellRow,
+        colKey: clickedCellColumn
+      });
+    }
+    lastFocusedCell.value = {
+      rowIndex: clickedCellRow,
+      colId: clickedCellColumn
     };
+  };
+  const resetLastFocusedCell = () => {
+    lastFocusedCell.value = null;
+  };
+  const onSortChanged2 = async (event) => {
+    const sortedColumn = event.columns?.filter((col) => col.getSort() !== null).pop() ?? null;
+    if (sortedColumn) {
+      const colId = sortedColumn.getColId();
+      const columnDef = colDefs.value.find((col) => col.colId === colId);
+      currentSortBy.value = columnDef?.field || colId;
+      currentSortOrder.value = sortedColumn.getSort() ?? "asc";
+    } else {
+      currentSortBy.value = DEFAULT_ID_COLUMN_NAME;
+      currentSortOrder.value = "asc";
+    }
+  };
+  onClickOutside(gridContainerRef, () => {
+    resetLastFocusedCell();
+    initializedGridApi.value.clearFocusedCell();
+  });
+  return {
+    onGridReady,
+    setGridData,
+    focusFirstEditableCell,
+    onCellEditingStarted,
+    onCellEditingStopped,
+    createColumnDef,
+    loadColumns,
+    colDefs,
+    deleteColumn,
+    insertColumnAtIndex,
+    addColumn,
+    moveColumn,
+    gridApi: initializedGridApi,
+    handleCopyFocusedCell,
+    onCellClicked,
+    resetLastFocusedCell,
+    currentSortBy,
+    currentSortOrder,
+    onSortChanged: onSortChanged2
+  };
+};
+const useDataStoreSelection = ({
+  gridApi
+}) => {
+  const selectedRowIds = ref(/* @__PURE__ */ new Set());
+  const selectedCount = computed(() => selectedRowIds.value.size);
+  const rowSelection = {
+    mode: "multiRow",
+    enableClickSelection: false,
+    checkboxes: (params) => params.data?.id !== ADD_ROW_ROW_ID,
+    isRowSelectable: (params) => params.data?.id !== ADD_ROW_ROW_ID
+  };
+  const onSelectionChanged = () => {
+    const selectedNodes = gridApi.value.getSelectedNodes();
+    const newSelectedIds = /* @__PURE__ */ new Set();
+    selectedNodes.forEach((node) => {
+      if (typeof node.data?.id === "number") {
+        newSelectedIds.add(node.data.id);
+      }
+    });
+    selectedRowIds.value = newSelectedIds;
+  };
+  const handleClearSelection = () => {
+    selectedRowIds.value = /* @__PURE__ */ new Set();
+    gridApi.value.deselectAll();
+  };
+  return {
+    selectedRowIds,
+    selectedCount,
+    rowSelection,
+    onSelectionChanged,
+    handleClearSelection
+  };
+};
+const useDataStoreOperations = ({
+  colDefs,
+  rowData,
+  deleteGridColumn,
+  addGridColumn,
+  setGridData,
+  insertGridColumnAtIndex,
+  moveGridColumn,
+  dataStoreId,
+  projectId,
+  gridApi,
+  totalItems,
+  setTotalItems,
+  ensureItemOnPage,
+  focusFirstEditableCell,
+  toggleSave,
+  currentPage,
+  pageSize,
+  currentSortBy,
+  currentSortOrder,
+  handleClearSelection,
+  selectedRowIds,
+  handleCopyFocusedCell
+}) => {
+  const i18n = useI18n();
+  const toast = useToast();
+  const message = useMessage();
+  const dataStoreStore = useDataStoreStore();
+  const contentLoading = ref(false);
+  const telemetry2 = useTelemetry();
+  const dataStoreTypes = useDataStoreTypes();
+  async function onDeleteColumn(columnId) {
+    const columnToDelete = colDefs.value.find((col) => col.colId === columnId);
+    if (!columnToDelete) return;
+    const promptResponse = await message.confirm(
+      i18n.baseText("dataStore.deleteColumn.confirm.message", {
+        interpolate: { name: columnToDelete.headerName ?? "" }
+      }),
+      i18n.baseText("dataStore.deleteColumn.confirm.title"),
+      {
+        confirmButtonText: i18n.baseText("generic.delete"),
+        cancelButtonText: i18n.baseText("generic.cancel")
+      }
+    );
+    if (promptResponse !== MODAL_CONFIRM) {
+      return;
+    }
+    const columnToDeleteIndex = colDefs.value.findIndex((col) => col.colId === columnId);
+    deleteGridColumn(columnId);
+    const rowDataOldValue = [...rowData.value];
+    rowData.value = rowData.value.map((row) => {
+      const { [columnToDelete.field]: _, ...rest } = row;
+      return rest;
+    });
+    setGridData({ rowData: rowData.value });
+    try {
+      await dataStoreStore.deleteDataStoreColumn(dataStoreId, projectId, columnId);
+      telemetry2.track("User deleted data table column", {
+        column_id: columnId,
+        column_type: columnToDelete.cellDataType,
+        data_table_id: dataStoreId
+      });
+    } catch (error) {
+      toast.showError(error, i18n.baseText("dataStore.deleteColumn.error"));
+      insertGridColumnAtIndex(columnToDelete, columnToDeleteIndex);
+      rowData.value = rowDataOldValue;
+      setGridData({ rowData: rowData.value });
+    }
   }
-});
+  async function onAddColumn(column) {
+    try {
+      const newColumn = await dataStoreStore.addDataStoreColumn(dataStoreId, projectId, column);
+      addGridColumn(newColumn);
+      rowData.value = rowData.value.map((row) => {
+        return { ...row, [newColumn.name]: null };
+      });
+      setGridData({ rowData: rowData.value });
+      telemetry2.track("User added data table column", {
+        column_id: newColumn.id,
+        column_type: newColumn.type,
+        data_table_id: dataStoreId
+      });
+      return { success: true, httpStatus: 200 };
+    } catch (error) {
+      const addColumnError = dataStoreTypes.getAddColumnError(error);
+      return {
+        success: false,
+        httpStatus: addColumnError.httpStatus,
+        errorMessage: addColumnError.message
+      };
+    }
+  }
+  const onColumnMoved = async (moveEvent) => {
+    if (!moveEvent.finished || moveEvent.source !== "uiColumnMoved" || moveEvent.toIndex === void 0 || !moveEvent.column) {
+      return;
+    }
+    const oldIndex = colDefs.value.findIndex((col) => col.colId === moveEvent.column.getColId());
+    const newIndex = moveEvent.toIndex - 2;
+    try {
+      await dataStoreStore.moveDataStoreColumn(
+        dataStoreId,
+        projectId,
+        moveEvent.column.getColId(),
+        newIndex
+      );
+      moveGridColumn(oldIndex, newIndex);
+    } catch (error) {
+      toast.showError(error, i18n.baseText("dataStore.moveColumn.error"));
+      gridApi.value.moveColumnByIndex(moveEvent.toIndex, oldIndex + 1);
+    }
+  };
+  async function onAddRowClick() {
+    try {
+      await ensureItemOnPage(totalItems.value + 1);
+      contentLoading.value = true;
+      toggleSave(true);
+      const insertedRow = await dataStoreStore.insertEmptyRow(dataStoreId, projectId);
+      const newRow = insertedRow;
+      rowData.value.push(newRow);
+      setTotalItems(totalItems.value + 1);
+      setGridData({ rowData: rowData.value });
+      focusFirstEditableCell(newRow.id);
+      telemetry2.track("User added row to data table", {
+        data_table_id: dataStoreId
+      });
+    } catch (error) {
+      toast.showError(error, i18n.baseText("dataStore.addRow.error"));
+    } finally {
+      toggleSave(false);
+      contentLoading.value = false;
+    }
+  }
+  const onCellValueChanged = async (params) => {
+    const { data, api, oldValue, colDef } = params;
+    const value = params.data[colDef.field];
+    const cellType = isAGGridCellType(colDef.cellDataType) ? dataStoreTypes.mapToDataStoreColumnType(colDef.cellDataType) : void 0;
+    if (value === void 0 || areValuesEqual(oldValue, value, cellType)) {
+      return;
+    }
+    if (typeof data.id !== "number") {
+      throw new Error("Expected row id to be a number");
+    }
+    const fieldName = String(colDef.field);
+    const id = data.id;
+    try {
+      toggleSave(true);
+      await dataStoreStore.updateRow(dataStoreId, projectId, id, {
+        [fieldName]: value
+      });
+      telemetry2.track("User edited data table content", {
+        data_table_id: dataStoreId,
+        column_id: colDef.colId,
+        column_type: colDef.cellDataType
+      });
+    } catch (error) {
+      const validOldValue = isDataStoreValue(oldValue) ? oldValue : null;
+      const revertedData = { ...data, [fieldName]: validOldValue };
+      api.applyTransaction({
+        update: [revertedData]
+      });
+      toast.showError(error, i18n.baseText("dataStore.updateRow.error"));
+    } finally {
+      toggleSave(false);
+    }
+  };
+  async function fetchDataStoreRows() {
+    try {
+      contentLoading.value = true;
+      const fetchedRows = await dataStoreStore.fetchDataStoreContent(
+        dataStoreId,
+        projectId,
+        currentPage.value,
+        pageSize.value,
+        `${currentSortBy.value}:${currentSortOrder.value}`
+      );
+      rowData.value = fetchedRows.data;
+      setTotalItems(fetchedRows.count);
+      setGridData({ rowData: rowData.value, colDefs: colDefs.value });
+      handleClearSelection();
+    } catch (error) {
+      toast.showError(error, i18n.baseText("dataStore.fetchContent.error"));
+    } finally {
+      contentLoading.value = false;
+    }
+  }
+  const handleDeleteSelected = async () => {
+    if (selectedRowIds.value.size === 0) return;
+    const confirmResponse = await message.confirm(
+      i18n.baseText("dataStore.deleteRows.confirmation", {
+        adjustToNumber: selectedRowIds.value.size,
+        interpolate: { count: selectedRowIds.value.size }
+      }),
+      i18n.baseText("dataStore.deleteRows.title"),
+      {
+        confirmButtonText: i18n.baseText("generic.delete"),
+        cancelButtonText: i18n.baseText("generic.cancel")
+      }
+    );
+    if (confirmResponse !== MODAL_CONFIRM) {
+      return;
+    }
+    try {
+      toggleSave(true);
+      const idsToDelete = Array.from(selectedRowIds.value);
+      await dataStoreStore.deleteRows(dataStoreId, projectId, idsToDelete);
+      await fetchDataStoreRows();
+      telemetry2.track("User deleted rows in data table", {
+        data_table_id: dataStoreId,
+        deleted_row_count: idsToDelete.length
+      });
+    } catch (error) {
+      toast.showError(error, i18n.baseText("dataStore.deleteRows.error"));
+    } finally {
+      toggleSave(false);
+    }
+  };
+  const onCellKeyDown = async (params) => {
+    const event = params.event;
+    const target = event.target;
+    const isSelectionColumn = params.column.getColId() === "ag-Grid-SelectionColumn";
+    const isEditing2 = params.api.getEditingCells().length > 0 || target instanceof HTMLInputElement && !isSelectionColumn;
+    if (isEditing2) {
+      return;
+    }
+    if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === "c") {
+      event.preventDefault();
+      await handleCopyFocusedCell(params);
+      return;
+    }
+    if (event.key === "Escape") {
+      handleClearSelection();
+      return;
+    }
+    if (event.key !== "Delete" && event.key !== "Backspace" || selectedRowIds.value.size === 0) {
+      return;
+    }
+    event.preventDefault();
+    await handleDeleteSelected();
+  };
+  return {
+    onDeleteColumn,
+    onAddColumn,
+    onColumnMoved,
+    onAddRowClick,
+    contentLoading,
+    onCellValueChanged,
+    fetchDataStoreRows,
+    handleDeleteSelected,
+    onCellKeyDown
+  };
+};
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "DataStoreTable",
   props: {
@@ -41715,572 +42774,84 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       UndoRedoEditModule,
       CellStyleModule,
       PinnedRowModule,
-      ScrollApiModule
+      ScrollApiModule,
+      ColumnApiModule
     ]);
     const props = __props;
     const emit = __emit;
+    const gridContainerRef = useTemplateRef("gridContainerRef");
     const i18n = useI18n();
-    const toast = useToast();
-    const message = useMessage();
-    const { mapToAGCellType } = useDataStoreTypes();
-    const dataStoreStore = useDataStoreStore();
-    const { copy: copyToClipboard } = useClipboard({ onPaste: onClipboardPaste });
-    const gridApi = ref(null);
-    const colDefs = ref([]);
+    const dataStoreGridBase = useDataStoreGridBase({
+      gridContainerRef,
+      onDeleteColumn: onDeleteColumnFunction,
+      onAddRowClick: onAddRowClickFunction,
+      onAddColumn: onAddColumnFunction
+    });
     const rowData = ref([]);
-    const rowSelection = {
-      mode: "multiRow",
-      enableClickSelection: false,
-      checkboxes: (params) => params.data?.id !== ADD_ROW_ROW_ID,
-      isRowSelectable: (params) => params.data?.id !== ADD_ROW_ROW_ID
-    };
-    const currentSortBy = ref(DEFAULT_ID_COLUMN_NAME);
-    const currentSortOrder = ref("asc");
-    const contentLoading = ref(false);
-    const lastFocusedCell = ref(null);
-    const isTextEditorOpen = ref(false);
-    const gridContainer = useTemplateRef("gridContainer");
-    const pageSizeOptions = [10, 20, 50];
-    const currentPage = ref(1);
-    const pageSize = ref(20);
-    const totalItems = ref(0);
-    const rows = ref([]);
-    const selectedRowIds = ref(/* @__PURE__ */ new Set());
-    const selectedCount = computed(() => selectedRowIds.value.size);
     const hasRecords = computed(() => rowData.value.length > 0);
-    const onGridReady = (params) => {
-      gridApi.value = params.api;
-      if (gridContainer?.value) {
-        params.api.setGridOption("popupParent", gridContainer.value);
-      }
-    };
-    const refreshGridData = () => {
-      if (!gridApi.value) return;
-      gridApi.value.setGridOption("columnDefs", colDefs.value);
-      gridApi.value.setGridOption("rowData", rowData.value);
-      gridApi.value.setGridOption("pinnedBottomRowData", [{ id: ADD_ROW_ROW_ID }]);
-    };
-    const focusFirstEditableCell = (rowId) => {
-      if (!gridApi.value) return;
-      const rowNode = gridApi.value.getRowNode(String(rowId));
-      if (rowNode?.rowIndex === null) return;
-      const firstEditableCol = colDefs.value[1];
-      if (!firstEditableCol?.colId) return;
-      gridApi.value.ensureIndexVisible(rowNode.rowIndex);
-      gridApi.value.setFocusedCell(rowNode.rowIndex, firstEditableCol.colId);
-      gridApi.value.startEditingCell({ rowIndex: rowNode.rowIndex, colKey: firstEditableCol.colId });
-    };
-    const setCurrentPage = async (page) => {
-      currentPage.value = page;
-      await fetchDataStoreContent();
-    };
-    const setPageSize = async (size) => {
-      pageSize.value = size;
-      currentPage.value = 1;
-      await fetchDataStoreContent();
-    };
-    const onDeleteColumn = async (columnId) => {
-      if (!gridApi.value) return;
-      const columnToDelete = colDefs.value.find((col) => col.colId === columnId);
-      if (!columnToDelete) return;
-      const promptResponse = await message.confirm(
-        i18n.baseText("dataStore.deleteColumn.confirm.message", {
-          interpolate: { name: columnToDelete.headerName ?? "" }
-        }),
-        i18n.baseText("dataStore.deleteColumn.confirm.title"),
-        {
-          confirmButtonText: i18n.baseText("generic.delete"),
-          cancelButtonText: i18n.baseText("generic.cancel")
-        }
-      );
-      if (promptResponse !== MODAL_CONFIRM) {
-        return;
-      }
-      const columnToDeleteIndex = colDefs.value.findIndex((col) => col.colId === columnId);
-      colDefs.value = colDefs.value.filter((def) => def.colId !== columnId);
-      const rowDataOldValue = [...rowData.value];
-      rowData.value = rowData.value.map((row) => {
-        const { [columnToDelete.field]: _, ...rest } = row;
-        return rest;
-      });
-      refreshGridData();
-      try {
-        await dataStoreStore.deleteDataStoreColumn(
-          props.dataStore.id,
-          props.dataStore.projectId,
-          columnId
-        );
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.deleteColumn.error"));
-        colDefs.value.splice(columnToDeleteIndex, 0, columnToDelete);
-        rowData.value = rowDataOldValue;
-        refreshGridData();
-      }
-    };
-    const onAddColumn = async (column) => {
-      try {
-        const newColumn = await dataStoreStore.addDataStoreColumn(
-          props.dataStore.id,
-          props.dataStore.projectId,
-          column
-        );
-        if (!newColumn) {
-          throw new Error(i18n.baseText("generic.unknownError"));
-        }
-        colDefs.value = [
-          ...colDefs.value.slice(0, -1),
-          createColumnDef(newColumn),
-          ...colDefs.value.slice(-1)
-        ];
-        rowData.value = rowData.value.map((row) => {
-          return { ...row, [newColumn.name]: null };
-        });
-        refreshGridData();
-        return true;
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.addColumn.error"));
-        return false;
-      }
-    };
-    const createColumnDef = (col, extraProps = {}) => {
-      const columnDef = {
-        colId: col.id,
-        field: col.name,
-        headerName: col.name,
-        sortable: true,
-        flex: 1,
-        editable: (params) => params.data?.id !== ADD_ROW_ROW_ID,
-        resizable: true,
-        lockPinned: true,
-        headerComponent: _sfc_main$6,
-        headerComponentParams: { onDelete: onDeleteColumn, allowMenuActions: true },
-        cellEditorPopup: false,
-        cellDataType: mapToAGCellType(col.type),
-        cellClass: (params) => {
-          if (params.data?.id === ADD_ROW_ROW_ID) {
-            return "add-row-cell";
-          }
-          if (params.column.getUserProvidedColDef()?.cellDataType === "boolean") {
-            return "boolean-cell";
-          }
-          return "";
-        },
-        valueGetter: (params) => {
-          if (params.data?.[col.name] === null || params.data?.[col.name] === void 0) {
-            return null;
-          }
-          if (col.type === "date") {
-            const value = params.data?.[col.name];
-            if (typeof value === "string") {
-              return new Date(value);
-            }
-          }
-          return params.data?.[col.name];
-        },
-        cellRendererSelector: (params) => {
-          if (params.data?.id === ADD_ROW_ROW_ID || col.id === "add-column") {
-            return {};
-          }
-          let rowValue = params.data?.[col.name];
-          if (rowValue === void 0) {
-            rowValue = null;
-          }
-          if (rowValue === null) {
-            return { component: _sfc_main$3, params: { value: NULL_VALUE } };
-          }
-          if (rowValue === "") {
-            return { component: _sfc_main$3, params: { value: EMPTY_VALUE } };
-          }
-          return void 0;
-        }
-      };
-      if (col.type === "string") {
-        columnDef.cellEditor = "agLargeTextCellEditor";
-        columnDef.cellEditorPopup = true;
-        columnDef.cellEditorPopupPosition = "over";
-        columnDef.cellEditorParams = (params) => ({
-          value: params.value ?? "",
-          // Rely on the backend to limit the length of the value
-          maxLength: 999999999
-        });
-        columnDef.valueSetter = (params) => {
-          let originalValue = params.data[col.name];
-          if (originalValue === void 0) {
-            originalValue = null;
-          }
-          let newValue = params.newValue;
-          if (!isDataStoreValue(newValue)) {
-            return false;
-          }
-          if (originalValue === null && newValue === "") {
-            return false;
-          }
-          if (isTextEditorOpen.value && newValue === null) {
-            newValue = "";
-          }
-          params.data[col.name] = newValue;
-          return true;
-        };
-      }
-      if (col.type === "date") {
-        columnDef.cellEditorSelector = () => ({
-          component: _sfc_main$2
-        });
-        columnDef.valueFormatter = (params) => {
-          const value = params.value;
-          if (value === null || value === void 0) return "";
-          return value.toISOString();
-        };
-      }
-      return {
-        ...columnDef,
-        ...extraProps
-      };
-    };
-    const onColumnMoved = async (moveEvent) => {
-      if (!moveEvent.finished || moveEvent.source !== "uiColumnMoved" || moveEvent.toIndex === void 0 || !moveEvent.column) {
-        return;
-      }
-      const oldIndex = colDefs.value.findIndex((col) => col.colId === moveEvent.column.getColId());
-      try {
-        await dataStoreStore.moveDataStoreColumn(
-          props.dataStore.id,
-          props.dataStore.projectId,
-          moveEvent.column.getColId(),
-          moveEvent.toIndex - 2
-          // ag grid index start from 1 and also we need to account for the id column
-        );
-        const fromIndex = oldIndex - 1;
-        const toIndex = moveEvent.toIndex - 2;
-        const middleWithIndex = colDefs.value.slice(1, -1).map((col, index) => ({ ...col, index }));
-        const reorderedMiddle = reorderItem(middleWithIndex, fromIndex, toIndex).sort((a, b) => a.index - b.index).map(({ index, ...col }) => col);
-        colDefs.value = [colDefs.value[0], ...reorderedMiddle, colDefs.value[colDefs.value.length - 1]];
-        refreshGridData();
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.moveColumn.error"));
-        gridApi.value?.moveColumnByIndex(moveEvent.toIndex, oldIndex);
-      }
-    };
-    const onAddRowClick = async () => {
-      try {
-        if (currentPage.value * pageSize.value < totalItems.value + 1) {
-          await setCurrentPage(Math.ceil((totalItems.value + 1) / pageSize.value));
-        }
-        contentLoading.value = true;
-        emit("toggleSave", true);
-        const insertedRow = await dataStoreStore.insertEmptyRow(props.dataStore);
-        const newRow = insertedRow;
-        rowData.value.push(newRow);
-        totalItems.value += 1;
-        refreshGridData();
-        await nextTick();
-        focusFirstEditableCell(newRow.id);
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.addRow.error"));
-      } finally {
-        emit("toggleSave", false);
-        contentLoading.value = false;
-      }
-    };
-    const initColumnDefinitions = () => {
-      const systemDateColumnOptions = {
-        editable: false,
-        suppressMovable: true,
-        lockPinned: true,
-        lockPosition: "right",
-        headerComponentParams: {
-          allowMenuActions: false
-        }
-      };
-      colDefs.value = [
-        // Always add the ID column, it's not returned by the back-end but all data stores have it
-        // We use it as a placeholder for new datastores
-        createColumnDef(
-          {
-            id: DEFAULT_ID_COLUMN_NAME,
-            name: DEFAULT_ID_COLUMN_NAME,
-            type: "string"
-          },
-          {
-            editable: false,
-            sortable: false,
-            suppressMovable: true,
-            headerComponent: null,
-            lockPosition: true,
-            minWidth: DATA_STORE_ID_COLUMN_WIDTH,
-            maxWidth: DATA_STORE_ID_COLUMN_WIDTH,
-            resizable: false,
-            cellClass: (params) => params.data?.id === ADD_ROW_ROW_ID ? "add-row-cell" : "id-column",
-            cellRendererSelector: (params) => {
-              if (params.value === ADD_ROW_ROW_ID) {
-                return {
-                  component: _sfc_main$4,
-                  params: { onClick: onAddRowClick }
-                };
-              }
-              return void 0;
-            }
-          }
-        ),
-        // Append other columns
-        ...orderBy(props.dataStore.columns, "index").map((col) => createColumnDef(col)),
-        createColumnDef(
-          {
-            index: props.dataStore.columns.length + 1,
-            id: "createdAt",
-            name: "createdAt",
-            type: "date"
-          },
-          systemDateColumnOptions
-        ),
-        createColumnDef(
-          {
-            index: props.dataStore.columns.length + 2,
-            id: "updatedAt",
-            name: "updatedAt",
-            type: "date"
-          },
-          systemDateColumnOptions
-        ),
-        createColumnDef(
-          {
-            index: props.dataStore.columns.length + 3,
-            id: "add-column",
-            name: "Add Column",
-            type: "string"
-          },
-          {
-            editable: false,
-            suppressMovable: true,
-            lockPinned: true,
-            lockPosition: "right",
-            resizable: false,
-            headerComponent: _sfc_main$5,
-            headerComponentParams: { onAddColumn }
-          }
-        )
-      ];
-    };
-    const onCellValueChanged = async (params) => {
-      const { data, api, oldValue, colDef } = params;
-      const value = params.data[colDef.field];
-      if (value === void 0 || value === oldValue) {
-        return;
-      }
-      if (typeof data.id !== "number") {
-        throw new Error("Expected row id to be a number");
-      }
-      const fieldName = String(colDef.field);
-      const id = data.id;
-      try {
-        emit("toggleSave", true);
-        await dataStoreStore.updateRow(props.dataStore.id, props.dataStore.projectId, id, {
-          [fieldName]: value
-        });
-      } catch (error) {
-        const validOldValue = isDataStoreValue(oldValue) ? oldValue : null;
-        const revertedData = { ...data, [fieldName]: validOldValue };
-        api.applyTransaction({
-          update: [revertedData]
-        });
-        toast.showError(error, i18n.baseText("dataStore.updateRow.error"));
-      } finally {
-        emit("toggleSave", false);
-      }
-    };
-    const onCellClicked = (params) => {
-      const clickedCellColumn = params.column.getColId();
-      const clickedCellRow = params.rowIndex;
-      if (clickedCellRow === null || params.api.isEditing({ rowIndex: clickedCellRow, column: params.column, rowPinned: null }))
-        return;
-      const wasAlreadyFocused = lastFocusedCell.value && lastFocusedCell.value.rowIndex === clickedCellRow && lastFocusedCell.value.colId === clickedCellColumn;
-      if (wasAlreadyFocused && params.column.getColDef()?.editable) {
-        params.api.startEditingCell({
-          rowIndex: clickedCellRow,
-          colKey: clickedCellColumn
-        });
-      }
-      lastFocusedCell.value = {
-        rowIndex: clickedCellRow,
-        colId: clickedCellColumn
-      };
-    };
-    const fetchDataStoreContent = async () => {
-      try {
-        contentLoading.value = true;
-        const fetchedRows = await dataStoreStore.fetchDataStoreContent(
-          props.dataStore.id,
-          props.dataStore.projectId,
-          currentPage.value,
-          pageSize.value,
-          `${currentSortBy.value}:${currentSortOrder.value}`
-        );
-        rowData.value = fetchedRows.data;
-        totalItems.value = fetchedRows.count;
-        refreshGridData();
-        handleClearSelection();
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.fetchContent.error"));
-      } finally {
-        contentLoading.value = false;
-        if (gridApi.value) {
-          gridApi.value.refreshHeader();
-        }
-      }
-    };
-    onClickOutside(gridContainer, () => {
-      resetLastFocusedCell();
-      gridApi.value?.clearFocusedCell();
-    });
-    function onClipboardPaste(data) {
-      if (!gridApi.value) return;
-      const focusedCell = gridApi.value.getFocusedCell();
-      const isEditing2 = gridApi.value.getEditingCells().length > 0;
-      if (!focusedCell || isEditing2) return;
-      const row = gridApi.value.getDisplayedRowAtIndex(focusedCell.rowIndex);
-      if (!row) return;
-      const colDef = focusedCell.column.getColDef();
-      if (colDef.cellDataType === "text") {
-        row.setDataValue(focusedCell.column.getColId(), data);
-      } else if (colDef.cellDataType === "number") {
-        if (!Number.isNaN(Number(data))) {
-          row.setDataValue(focusedCell.column.getColId(), Number(data));
-        }
-      } else if (colDef.cellDataType === "date") {
-        if (!Number.isNaN(Date.parse(data))) {
-          row.setDataValue(focusedCell.column.getColId(), new Date(data));
-        }
-      } else if (colDef.cellDataType === "boolean") {
-        if (data === "true") {
-          row.setDataValue(focusedCell.column.getColId(), true);
-        } else if (data === "false") {
-          row.setDataValue(focusedCell.column.getColId(), false);
-        }
-      }
-    }
-    const resetLastFocusedCell = () => {
-      lastFocusedCell.value = null;
-    };
-    const initialize = async () => {
-      initColumnDefinitions();
-      await fetchDataStoreContent();
-    };
-    const onSortChanged2 = async (event) => {
-      const oldSortBy = currentSortBy.value;
-      const oldSortOrder = currentSortOrder.value;
-      const sortedColumn = event.columns?.filter((col) => col.getSort() !== null).pop() ?? null;
-      if (sortedColumn) {
-        const colId = sortedColumn.getColId();
-        const columnDef = colDefs.value.find((col) => col.colId === colId);
-        currentSortBy.value = columnDef?.field || colId;
-        currentSortOrder.value = sortedColumn.getSort() ?? "asc";
-      } else {
-        currentSortBy.value = DEFAULT_ID_COLUMN_NAME;
-        currentSortOrder.value = "asc";
-      }
-      if (oldSortBy !== currentSortBy.value || oldSortOrder !== currentSortOrder.value) {
-        currentPage.value = 1;
-        await fetchDataStoreContent();
-      }
-    };
-    onMounted(async () => {
-      await initialize();
+    const {
+      currentPage,
+      pageSize,
+      totalItems,
+      pageSizeOptions,
+      ensureItemOnPage,
+      setTotalItems,
+      setCurrentPage,
+      setPageSize
+    } = useDataStorePagination({
+      onChange: fetchDataStoreRowsFunction
+    });
+    const selection = useDataStoreSelection({
+      gridApi: dataStoreGridBase.gridApi
+    });
+    const dataStoreOperations = useDataStoreOperations({
+      colDefs: dataStoreGridBase.colDefs,
+      rowData,
+      deleteGridColumn: dataStoreGridBase.deleteColumn,
+      setGridData: dataStoreGridBase.setGridData,
+      insertGridColumnAtIndex: dataStoreGridBase.insertColumnAtIndex,
+      dataStoreId: props.dataStore.id,
+      projectId: props.dataStore.projectId,
+      addGridColumn: dataStoreGridBase.addColumn,
+      moveGridColumn: dataStoreGridBase.moveColumn,
+      gridApi: dataStoreGridBase.gridApi,
+      totalItems,
+      setTotalItems,
+      ensureItemOnPage,
+      focusFirstEditableCell: dataStoreGridBase.focusFirstEditableCell,
+      toggleSave: emit.bind(null, "toggleSave"),
+      currentPage,
+      pageSize,
+      currentSortBy: dataStoreGridBase.currentSortBy,
+      currentSortOrder: dataStoreGridBase.currentSortOrder,
+      handleClearSelection: selection.handleClearSelection,
+      selectedRowIds: selection.selectedRowIds,
+      handleCopyFocusedCell: dataStoreGridBase.handleCopyFocusedCell
+    });
+    async function onDeleteColumnFunction(columnId) {
+      await dataStoreOperations.onDeleteColumn(columnId);
+    }
+    async function onAddColumnFunction(column) {
+      return await dataStoreOperations.onAddColumn(column);
+    }
+    async function onAddRowClickFunction() {
+      await dataStoreOperations.onAddRowClick();
+    }
+    async function fetchDataStoreRowsFunction() {
+      await dataStoreOperations.fetchDataStoreRows();
+    }
+    const initialize = async (params) => {
+      dataStoreGridBase.onGridReady(params);
+      dataStoreGridBase.loadColumns(props.dataStore.columns);
+      await dataStoreOperations.fetchDataStoreRows();
+    };
+    const customNoRowsOverlay = `<div class="no-rows-overlay ag-overlay-no-rows-center" data-test-id="data-store-no-rows-overlay">${i18n.baseText("dataStore.noRows")}</div>`;
+    watch([dataStoreGridBase.currentSortBy, dataStoreGridBase.currentSortOrder], async () => {
+      await setCurrentPage(1);
     });
-    const onCellEditingStarted = (params) => {
-      if (params.column.getColDef().cellDataType === "text") {
-        isTextEditorOpen.value = true;
-      } else {
-        isTextEditorOpen.value = false;
-      }
-    };
-    const onCellEditingStopped = (params) => {
-      if (params.column.getColDef().cellDataType === "text") {
-        isTextEditorOpen.value = false;
-      }
-    };
-    const onSelectionChanged = () => {
-      if (!gridApi.value) return;
-      const selectedNodes = gridApi.value.getSelectedNodes();
-      const newSelectedIds = /* @__PURE__ */ new Set();
-      selectedNodes.forEach((node) => {
-        if (typeof node.data?.id === "number") {
-          newSelectedIds.add(node.data.id);
-        }
-      });
-      selectedRowIds.value = newSelectedIds;
-    };
-    const onCellKeyDown = async (params) => {
-      if (params.api.getEditingCells().length > 0) {
-        return;
-      }
-      const event = params.event;
-      if ((event.metaKey || event.ctrlKey) && event.key.toLowerCase() === "c") {
-        event.preventDefault();
-        await handleCopyFocusedCell(params);
-        return;
-      }
-      if (event.key !== "Delete" && event.key !== "Backspace" || selectedRowIds.value.size === 0) {
-        return;
-      }
-      event.preventDefault();
-      await handleDeleteSelected();
-    };
-    const handleCopyFocusedCell = async (params) => {
-      const focused = params.api.getFocusedCell();
-      if (!focused) {
-        return;
-      }
-      const row = params.api.getDisplayedRowAtIndex(focused.rowIndex);
-      const colDef = focused.column.getColDef();
-      if (row?.data && colDef.field) {
-        const rawValue = row.data[colDef.field];
-        const text = rawValue === null || rawValue === void 0 ? "" : String(rawValue);
-        await copyToClipboard(text);
-      }
-    };
-    const handleDeleteSelected = async () => {
-      if (selectedRowIds.value.size === 0) return;
-      const confirmResponse = await message.confirm(
-        i18n.baseText("dataStore.deleteRows.confirmation", {
-          adjustToNumber: selectedRowIds.value.size,
-          interpolate: { count: selectedRowIds.value.size }
-        }),
-        i18n.baseText("dataStore.deleteRows.title"),
-        {
-          confirmButtonText: i18n.baseText("generic.delete"),
-          cancelButtonText: i18n.baseText("generic.cancel")
-        }
-      );
-      if (confirmResponse !== MODAL_CONFIRM) {
-        return;
-      }
-      try {
-        emit("toggleSave", true);
-        const idsToDelete = Array.from(selectedRowIds.value);
-        await dataStoreStore.deleteRows(props.dataStore.id, props.dataStore.projectId, idsToDelete);
-        rows.value = rows.value.filter((row) => !selectedRowIds.value.has(row.id));
-        rowData.value = rows.value;
-        await fetchDataStoreContent();
-        toast.showToast({
-          title: i18n.baseText("dataStore.deleteRows.success"),
-          message: "",
-          type: "success"
-        });
-      } catch (error) {
-        toast.showError(error, i18n.baseText("dataStore.deleteRows.error"));
-      } finally {
-        emit("toggleSave", false);
-      }
-    };
-    const handleClearSelection = () => {
-      selectedRowIds.value = /* @__PURE__ */ new Set();
-      if (gridApi.value) {
-        gridApi.value.deselectAll();
-      }
-    };
     __expose({
-      addRow: onAddRowClick,
-      addColumn: onAddColumn
+      addRow: dataStoreOperations.onAddRowClick,
+      addColumn: dataStoreOperations.onAddColumn
     });
     return (_ctx, _cache) => {
       const _component_el_pagination = resolveComponent("el-pagination");
@@ -42288,8 +42859,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         class: normalizeClass(_ctx.$style.wrapper)
       }, [
         createBaseVNode("div", {
-          ref_key: "gridContainer",
-          ref: gridContainer,
+          ref_key: "gridContainerRef",
+          ref: gridContainerRef,
           class: normalizeClass([_ctx.$style["grid-container"], { [_ctx.$style["has-records"]]: hasRecords.value }]),
           "data-test-id": "data-store-grid"
         }, [
@@ -42301,58 +42872,59 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             "animate-rows": false,
             theme: unref(n8nTheme),
             "suppress-drag-leave-hides-columns": true,
-            loading: contentLoading.value,
-            "row-selection": rowSelection,
+            loading: unref(dataStoreOperations).contentLoading.value,
+            "row-selection": unref(selection).rowSelection,
             "get-row-id": (params) => String(params.data.id),
             "stop-editing-when-cells-lose-focus": true,
             "undo-redo-cell-editing": true,
             "suppress-multi-sort": true,
-            onGridReady,
-            onCellValueChanged,
-            onColumnMoved,
-            onCellClicked,
-            onCellEditingStarted,
-            onCellEditingStopped,
-            onColumnHeaderClicked: resetLastFocusedCell,
-            onSelectionChanged,
-            onSortChanged: onSortChanged2,
-            onCellKeyDown
-          }, null, 8, ["row-height", "header-height", "theme", "loading", "get-row-id"])
+            "overlay-no-rows-template": customNoRowsOverlay,
+            onGridReady: initialize,
+            onCellValueChanged: unref(dataStoreOperations).onCellValueChanged,
+            onColumnMoved: unref(dataStoreOperations).onColumnMoved,
+            onCellClicked: unref(dataStoreGridBase).onCellClicked,
+            onCellEditingStarted: unref(dataStoreGridBase).onCellEditingStarted,
+            onCellEditingStopped: unref(dataStoreGridBase).onCellEditingStopped,
+            onColumnHeaderClicked: unref(dataStoreGridBase).resetLastFocusedCell,
+            onSelectionChanged: unref(selection).onSelectionChanged,
+            onSortChanged: unref(dataStoreGridBase).onSortChanged,
+            onCellKeyDown: unref(dataStoreOperations).onCellKeyDown
+          }, null, 8, ["row-height", "header-height", "theme", "loading", "row-selection", "get-row-id", "onCellValueChanged", "onColumnMoved", "onCellClicked", "onCellEditingStarted", "onCellEditingStopped", "onColumnHeaderClicked", "onSelectionChanged", "onSortChanged", "onCellKeyDown"])
         ], 2),
         createBaseVNode("div", {
           class: normalizeClass(_ctx.$style.footer)
         }, [
           createVNode(_component_el_pagination, {
-            "current-page": currentPage.value,
+            "current-page": unref(currentPage),
             "onUpdate:currentPage": [
-              _cache[0] || (_cache[0] = ($event) => currentPage.value = $event),
-              setCurrentPage
+              _cache[0] || (_cache[0] = ($event) => isRef(currentPage) ? currentPage.value = $event : null),
+              unref(setCurrentPage)
             ],
-            "page-size": pageSize.value,
-            "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => pageSize.value = $event),
+            "page-size": unref(pageSize),
+            "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => isRef(pageSize) ? pageSize.value = $event : null),
             "data-test-id": "data-store-content-pagination",
             background: "",
-            total: totalItems.value,
-            "page-sizes": pageSizeOptions,
+            total: unref(totalItems),
+            "page-sizes": unref(pageSizeOptions),
             layout: "total, prev, pager, next, sizes",
-            onSizeChange: setPageSize
-          }, null, 8, ["current-page", "page-size", "total"])
+            onSizeChange: unref(setPageSize)
+          }, null, 8, ["current-page", "page-size", "total", "page-sizes", "onUpdate:currentPage", "onSizeChange"])
         ], 2),
         createVNode(SelectedItemsInfo, {
-          "selected-count": selectedCount.value,
-          onDeleteSelected: handleDeleteSelected,
-          onClearSelection: handleClearSelection
-        }, null, 8, ["selected-count"])
+          "selected-count": unref(selection).selectedCount.value,
+          onDeleteSelected: unref(dataStoreOperations).handleDeleteSelected,
+          onClearSelection: unref(selection).handleClearSelection
+        }, null, 8, ["selected-count", "onDeleteSelected", "onClearSelection"])
       ], 2);
     };
   }
 });
-const wrapper = "_wrapper_1bnk4_123";
-const footer = "_footer_1bnk4_241";
+const wrapper = "_wrapper_1x5db_123";
+const footer = "_footer_1x5db_252";
 const style0$1 = {
   wrapper,
-  "grid-container": "_grid-container_1bnk4_130",
-  "has-records": "_has-records_1bnk4_234",
+  "grid-container": "_grid-container_1x5db_130",
+  "has-records": "_has-records_1x5db_242",
   footer
 };
 const cssModules$1 = {
@@ -42426,7 +42998,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const onAddColumn = async (column) => {
       if (!dataStoreTableRef.value) {
-        return false;
+        return {
+          success: false,
+          errorMessage: i18n.baseText("dataStore.error.tableNotInitialized")
+        };
       }
       return await dataStoreTableRef.value.addColumn(column);
     };
@@ -42484,7 +43059,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["onClick"]),
-              createVNode(_sfc_main$5, {
+              createVNode(_sfc_main$4, {
                 "use-text-trigger": true,
                 "popover-id": "ds-details-add-column-popover",
                 params: { onAddColumn }