From f053438a649694233f7849e94df0bdd22ab60859 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 8 Jan 2025 12:55:26 +0100
Subject: [PATCH] Clean classes

---
 packages/frontend-core/src/fetch/DataFetch.ts  | 18 +++++++-----------
 .../frontend-core/src/fetch/ViewV2Fetch.ts     |  5 +----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/frontend-core/src/fetch/DataFetch.ts b/packages/frontend-core/src/fetch/DataFetch.ts
index a7ed7237ba..3e2b0d7dcf 100644
--- a/packages/frontend-core/src/fetch/DataFetch.ts
+++ b/packages/frontend-core/src/fetch/DataFetch.ts
@@ -223,13 +223,13 @@ export default abstract class DataFetch<
       supportsPagination: paginate && !!features?.supportsPagination,
     }
 
-    // Fetch and enrich schema
-    let schema = this.getSchema(datasource, definition) ?? null
-    schema = this.enrichSchema(schema)
-    if (!schema) {
+    if (!definition?.schema) {
       return
     }
 
+    // Fetch and enrich schema
+    const schema = this.enrichSchema(definition.schema)
+
     // If an invalid sort column is specified, delete it
     if (this.options.sortColumn && !schema[this.options.sortColumn]) {
       this.options.sortColumn = null
@@ -374,11 +374,7 @@ export default abstract class DataFetch<
    * @param schema the datasource schema
    * @return {object} the enriched datasource schema
    */
-  enrichSchema(schema: TableSchema | null): TableSchema | null {
-    if (schema == null) {
-      return null
-    }
-
+  private enrichSchema(schema: TableSchema): TableSchema {
     // Check for any JSON fields so we can add any top level properties
     let jsonAdditions: Record<string, { type: string; nestedJSON: true }> = {}
     for (const fieldKey of Object.keys(schema)) {
@@ -510,7 +506,7 @@ export default abstract class DataFetch<
    * @param state the current store state
    * @return {boolean} whether there is a next page of data or not
    */
-  hasNextPage(state: DataFetchStore<TDefinition, TQuery>): boolean {
+  private hasNextPage(state: DataFetchStore<TDefinition, TQuery>): boolean {
     return state.cursors[state.pageNumber + 1] != null
   }
 
@@ -520,7 +516,7 @@ export default abstract class DataFetch<
    * @param state the current store state
    * @return {boolean} whether there is a previous page of data or not
    */
-  hasPrevPage(state: { pageNumber: number }): boolean {
+  private hasPrevPage(state: { pageNumber: number }): boolean {
     return state.pageNumber > 0
   }
 
diff --git a/packages/frontend-core/src/fetch/ViewV2Fetch.ts b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
index 74ad08f2f4..197b5b4ae5 100644
--- a/packages/frontend-core/src/fetch/ViewV2Fetch.ts
+++ b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
@@ -28,10 +28,7 @@ export default class ViewV2Fetch extends DataFetch<UIView, ViewV2> {
     }
   }
 
-  getDefaultSortColumn(
-    _definition: { primaryDisplay?: string } | null,
-    _schema: Record<string, any>
-  ) {
+  getDefaultSortColumn() {
     return null
   }