MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean types

This commit is contained in:
Adria Navarro 2025-01-08 14:17:10 +01:00
parent 2fb243a7c7
commit 819ca2129e
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend-core/src/fetch/GroupUserFetch.ts
View File

@ -1,7 +1,6 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import DataFetch from "./DataFetch" import DataFetch, { DataFetchParams } from "./DataFetch"
import { TableNames } from "../constants" import { TableNames } from "../constants"
import { APIClient } from "../api/types"
interface GroupUserQuery { interface GroupUserQuery {
groupId: string groupId: string
@ -17,7 +16,7 @@ export default class GroupUserFetch extends DataFetch<
{}, {},
GroupUserQuery GroupUserQuery
> { > {
constructor(opts: { API: APIClient; query: GroupUserQuery }) { constructor(opts: DataFetchParams<GroupUserDatasource, GroupUserQuery>) {
super({ super({
...opts, ...opts,
datasource: { datasource: {

16
packages/frontend-core/src/fetch/UserFetch.ts
View File

@ -1,30 +1,28 @@
import { get } from "svelte/store" import { get } from "svelte/store"
import DataFetch from "./DataFetch" import DataFetch, { DataFetchParams } from "./DataFetch"
import { TableNames } from "../constants" import { TableNames } from "../constants"
import { utils } from "@budibase/shared-core" import { utils } from "@budibase/shared-core"
import { import {
BasicOperator, BasicOperator,
SearchFilters, SearchFilters,
SearchUsersRequest, SearchUsersRequest,
Table,
} from "@budibase/types" } from "@budibase/types"
import { APIClient } from "../api/types.js"
interface UserFetchQuery { interface UserFetchQuery {
appId: string appId: string
paginated: boolean paginated: boolean
} }
interface UserDatasource {
tableId: string
}
export default class UserFetch extends DataFetch< export default class UserFetch extends DataFetch<
{ tableId: string }, UserDatasource,
{}, {},
UserFetchQuery UserFetchQuery
> { > {
constructor(opts: { constructor(opts: DataFetchParams<UserDatasource, UserFetchQuery>) {
API: APIClient
datasource: Table
query: UserFetchQuery
}) {
super({ super({
...opts, ...opts,
datasource: { datasource: {

5
packages/frontend-core/src/fetch/ViewV2Fetch.ts
View File

@ -12,10 +12,7 @@ export default class ViewV2Fetch extends DataFetch<UIView, ViewV2> {
} }
} }
async getDefinition(datasource: UIView | null): Promise<ViewV2 | null> { async getDefinition(datasource: UIView) {
if (!datasource?.id) {
return null
}
try { try {
const res = await this.API.viewV2.fetchDefinition(datasource.id) const res = await this.API.viewV2.fetchDefinition(datasource.id)
return res?.data return res?.data

6
packages/frontend-core/src/fetch/index.ts
View File

@ -10,7 +10,7 @@ import UserFetch from "./UserFetch.js"
import GroupUserFetch from "./GroupUserFetch" import GroupUserFetch from "./GroupUserFetch"
import CustomFetch from "./CustomFetch" import CustomFetch from "./CustomFetch"
import QueryArrayFetch from "./QueryArrayFetch.js" import QueryArrayFetch from "./QueryArrayFetch.js"
import { TableSchema, UIDatasource } from "@budibase/types" import { UIDatasource } from "@budibase/types"
import { APIClient } from "../api/types.js" import { APIClient } from "../api/types.js"
const DataFetchMap = { const DataFetchMap = {
@ -59,7 +59,7 @@ export const getDatasourceDefinition = async ({
datasource, datasource,
}: { }: {
API: APIClient API: APIClient
datasource: UIDatasource datasource: any
}) => { }) => {
const instance = createEmptyFetchInstance({ API, datasource }) const instance = createEmptyFetchInstance({ API, datasource })
return await instance?.getDefinition(datasource) return await instance?.getDefinition(datasource)
@ -73,7 +73,7 @@ export const getDatasourceSchema = ({
}: { }: {
API: APIClient API: APIClient
datasource: UIDatasource datasource: UIDatasource
definition?: { schema?: TableSchema } definition?: any
}) => { }) => {
const instance = createEmptyFetchInstance({ API, datasource }) const instance = createEmptyFetchInstance({ API, datasource })
return instance?.getSchema(definition) return instance?.getSchema(definition)