@budibase/frontend-core 3.20.2 → 3.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -17,5 +17,5 @@
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
   },
-  "gitHead": "3582592cff6b755c0e6f5cf7d04f32be18d7a9a8"
+  "gitHead": "00bd6ef4645dfb893f5a83ec78571181ead1f084"
 }

package/src/constants.ts

@@ -2,13 +2,13 @@
  * Operator options for lucene queries
  */
 export {
+  DEFAULT_BB_DATASOURCE_ID,
   OperatorOptions,
   SqlNumberTypeRangeMap,
-  DEFAULT_BB_DATASOURCE_ID,
 } from "@budibase/shared-core"
 export { Feature as Features } from "@budibase/types"
 import { BpmCorrelationKey } from "@budibase/shared-core"
-import { FieldType, BBReferenceFieldSubType } from "@budibase/types"
+import { BBReferenceFieldSubType, FieldType } from "@budibase/types"
 
 export const BannedSearchTypes = [
   FieldType.LINK,

package/src/fetch/DataFetch.ts

@@ -1,7 +1,3 @@
-import { writable, derived, get, Writable, Readable } from "svelte/store"
-import cloneDeep from "lodash/fp/cloneDeep"
-import { QueryUtils } from "../utils"
-import { convertJSONSchemaToTableSchema } from "../utils/json"
 import {
   DataFetchOptions,
   FieldType,
@@ -11,13 +7,17 @@ import {
   SortType,
   TableSchema,
 } from "@budibase/types"
-import { APIClient } from "../api/types"
+import cloneDeep from "lodash/fp/cloneDeep"
+import { derived, get, Readable, writable, Writable } from "svelte/store"
 import { DataFetchType } from "."
+import { APIClient } from "../api/types"
+import { QueryUtils } from "../utils"
+import { convertJSONSchemaToTableSchema } from "../utils/json"
 
 const { buildQuery, limit: queryLimit, runQuery, sort } = QueryUtils
 
-interface DataFetchStore<TDefinition, TQuery> {
-  rows: Row[]
+interface DataFetchStore<TDefinition, TQuery, TRow extends Row> {
+  rows: TRow[]
   info: any
   schema: TableSchema | null
   loading: boolean
@@ -35,8 +35,8 @@ interface DataFetchStore<TDefinition, TQuery> {
   definition?: TDefinition | null
 }
 
-interface DataFetchDerivedStore<TDefinition, TQuery>
-  extends DataFetchStore<TDefinition, TQuery> {
+interface DataFetchDerivedStore<TDefinition, TQuery, TRow extends Row>
+  extends DataFetchStore<TDefinition, TQuery, TRow> {
   hasNextPage: boolean
   hasPrevPage: boolean
   supportsSearch: boolean
@@ -63,6 +63,7 @@ export default abstract class BaseDataFetch<
     primaryDisplay?: string
   },
   TQuery extends {} = SearchFilters,
+  TRow extends Row = Row,
 > {
   API: APIClient
   features: {
@@ -80,8 +81,8 @@ export default abstract class BaseDataFetch<
     clientSideSorting: boolean
     clientSideLimiting: boolean
   }
-  store: Writable<DataFetchStore<TDefinition, TQuery>>
-  derivedStore: Readable<DataFetchDerivedStore<TDefinition, TQuery>>
+  store: Writable<DataFetchStore<TDefinition, TQuery, TRow>>
+  derivedStore: Readable<DataFetchDerivedStore<TDefinition, TQuery, TRow>>
 
   /**
    * Constructs a new DataFetch instance.
@@ -331,7 +332,7 @@ export default abstract class BaseDataFetch<
   }
 
   abstract getData(): Promise<{
-    rows: Row[]
+    rows: TRow[]
     info?: any
     hasNextPage?: boolean
     cursor?: any
@@ -492,7 +493,9 @@ export default abstract class BaseDataFetch<
    * @param state the current store state
    * @return {boolean} whether there is a next page of data or not
    */
-  private hasNextPage(state: DataFetchStore<TDefinition, TQuery>): boolean {
+  private hasNextPage(
+    state: DataFetchStore<TDefinition, TQuery, TRow>
+  ): boolean {
     return state.cursors[state.pageNumber + 1] != null
   }
 

package/src/fetch/GroupUserFetch.ts

@@ -1,6 +1,6 @@
+import { GroupUserDatasource } from "@budibase/types"
 import { get } from "svelte/store"
 import BaseDataFetch, { DataFetchParams } from "./DataFetch"
-import { GroupUserDatasource, InternalTable } from "@budibase/types"
 
 interface GroupUserQuery {
   groupId: string
@@ -22,7 +22,6 @@ export default class GroupUserFetch extends BaseDataFetch<
       ...opts,
       datasource: {
         type: "groupUser",
-        tableId: InternalTable.USER_METADATA,
       },
     })
   }

package/src/fetch/UserFetch.ts

@@ -1,12 +1,13 @@
-import { get } from "svelte/store"
-import BaseDataFetch, { DataFetchParams } from "./DataFetch"
 import { utils } from "@budibase/shared-core"
 import {
-  InternalTable,
   SearchFilters,
   SearchUsersRequest,
+  StrippedUser,
+  User,
   UserDatasource,
 } from "@budibase/types"
+import { get } from "svelte/store"
+import BaseDataFetch, { DataFetchParams } from "./DataFetch"
 
 interface UserFetchQuery {
   appId?: string
@@ -24,14 +25,14 @@ interface UserDefinition {
 export default class UserFetch extends BaseDataFetch<
   UserDatasource,
   UserDefinition,
-  UserFetchQuery
+  UserFetchQuery,
+  User | StrippedUser
 > {
   constructor(opts: DataFetchParams<UserDatasource, UserFetchQuery>) {
     super({
       ...opts,
       datasource: {
         type: "user",
-        tableId: InternalTable.USER_METADATA,
       },
     })
   }

package/src/fetch/index.ts

@@ -1,17 +1,17 @@
-import TableFetch from "./TableFetch"
-import ViewFetch from "./ViewFetch"
-import ViewV2Fetch from "./ViewV2Fetch"
-import QueryFetch from "./QueryFetch"
-import RelationshipFetch from "./RelationshipFetch"
-import NestedProviderFetch from "./NestedProviderFetch"
+import { DataFetchDatasource, Table, ViewV2Enriched } from "@budibase/types"
+import { APIClient } from "../api/types"
+import CustomFetch from "./CustomFetch"
 import FieldFetch from "./FieldFetch"
-import JSONArrayFetch from "./JSONArrayFetch"
-import UserFetch from "./UserFetch"
 import GroupUserFetch from "./GroupUserFetch"
-import CustomFetch from "./CustomFetch"
+import JSONArrayFetch from "./JSONArrayFetch"
+import NestedProviderFetch from "./NestedProviderFetch"
 import QueryArrayFetch from "./QueryArrayFetch"
-import { APIClient } from "../api/types"
-import { DataFetchDatasource, Table, ViewV2Enriched } from "@budibase/types"
+import QueryFetch from "./QueryFetch"
+import RelationshipFetch from "./RelationshipFetch"
+import TableFetch from "./TableFetch"
+import UserFetch from "./UserFetch"
+import ViewFetch from "./ViewFetch"
+import ViewV2Fetch from "./ViewV2Fetch"
 
 export type DataFetchType = keyof typeof DataFetchMap
 
@@ -86,7 +86,7 @@ export const fetchData = <
 }: {
   API: APIClient
   datasource: T
-  options: any
+  options?: any
 }): Type extends keyof DataFetchClassMap
   ? DataFetchClassMap[Type]
   : TableFetch => {