From 7d7c27fa928640d075ce9233932b2761e6d740d7 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 8 Jan 2025 12:49:17 +0100
Subject: [PATCH] Simplify determineFeatureFlags

---
 packages/frontend-core/src/fetch/DataFetch.ts      | 9 ++++-----
 packages/frontend-core/src/fetch/GroupUserFetch.ts | 2 +-
 packages/frontend-core/src/fetch/QueryFetch.ts     | 3 ++-
 packages/frontend-core/src/fetch/TableFetch.ts     | 2 +-
 packages/frontend-core/src/fetch/UserFetch.ts      | 2 +-
 packages/frontend-core/src/fetch/ViewV2Fetch.ts    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-core/src/fetch/DataFetch.ts b/packages/frontend-core/src/fetch/DataFetch.ts
index f34f6ddeb7..a7ed7237ba 100644
--- a/packages/frontend-core/src/fetch/DataFetch.ts
+++ b/packages/frontend-core/src/fetch/DataFetch.ts
@@ -216,7 +216,7 @@ export default abstract class DataFetch<
     const definition = await this.getDefinition(datasource)
 
     // Determine feature flags
-    const features = this.determineFeatureFlags(definition)
+    const features = await this.determineFeatureFlags()
     this.features = {
       supportsSearch: !!features?.supportsSearch,
       supportsSort: !!features?.supportsSort,
@@ -421,14 +421,13 @@ export default abstract class DataFetch<
   }
 
   /**
-   * Determine the feature flag for this datasource definition
-   * @param definition
+   * Determine the feature flag for this datasource
    */
-  determineFeatureFlags(_definition: TDefinition | null): {
+  async determineFeatureFlags(): Promise<{
     supportsPagination: boolean
     supportsSearch?: boolean
     supportsSort?: boolean
-  } {
+  }> {
     return {
       supportsSearch: false,
       supportsSort: false,
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.ts b/packages/frontend-core/src/fetch/GroupUserFetch.ts
index 0c5ac7486d..2f5cacd1a2 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.ts
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.ts
@@ -26,7 +26,7 @@ export default class GroupUserFetch extends DataFetch<
     })
   }
 
-  determineFeatureFlags() {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: false,
diff --git a/packages/frontend-core/src/fetch/QueryFetch.ts b/packages/frontend-core/src/fetch/QueryFetch.ts
index dec7cd2183..a6ddcd8f01 100644
--- a/packages/frontend-core/src/fetch/QueryFetch.ts
+++ b/packages/frontend-core/src/fetch/QueryFetch.ts
@@ -11,7 +11,8 @@ interface QueryDatasource {
 }
 
 export default class QueryFetch extends DataFetch<QueryDatasource, Query> {
-  determineFeatureFlags(definition: Query) {
+  async determineFeatureFlags() {
+    const definition = await this.getDefinition(this.options.datasource)
     const supportsPagination =
       !!definition?.fields?.pagination?.type &&
       !!definition?.fields?.pagination?.location &&
diff --git a/packages/frontend-core/src/fetch/TableFetch.ts b/packages/frontend-core/src/fetch/TableFetch.ts
index 48a3413716..433de69b59 100644
--- a/packages/frontend-core/src/fetch/TableFetch.ts
+++ b/packages/frontend-core/src/fetch/TableFetch.ts
@@ -3,7 +3,7 @@ import DataFetch from "./DataFetch"
 import { SortOrder, Table, UITable } from "@budibase/types"
 
 export default class TableFetch extends DataFetch<UITable, Table> {
-  determineFeatureFlags() {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: true,
diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
index 43efc7767f..199dacde00 100644
--- a/packages/frontend-core/src/fetch/UserFetch.ts
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -34,7 +34,7 @@ export default class UserFetch extends DataFetch<
     })
   }
 
-  determineFeatureFlags() {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: false,
diff --git a/packages/frontend-core/src/fetch/ViewV2Fetch.ts b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
index d541a692b6..74ad08f2f4 100644
--- a/packages/frontend-core/src/fetch/ViewV2Fetch.ts
+++ b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
@@ -4,7 +4,7 @@ import { get } from "svelte/store"
 import { helpers } from "@budibase/shared-core"
 
 export default class ViewV2Fetch extends DataFetch<UIView, ViewV2> {
-  determineFeatureFlags() {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: true,