From 0202db3efe84c5ef244463bfb29b03a8171300f6 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 31 Jul 2024 12:20:45 +0200 Subject: [PATCH] Unify enums --- packages/builder/src/constants/backend/index.js | 11 ++++------- .../server/src/api/controllers/view/exporters.ts | 14 +++++--------- packages/types/src/sdk/row.ts | 6 ++++++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index ea8d35704f..6fbc36afe2 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -9,7 +9,10 @@ import { Constants } from "@budibase/frontend-core" const { TypeIconMap } = Constants -export { RelationshipType } from "@budibase/types" +export { + RelationshipType, + RowExportFormat as ROW_EXPORT_FORMATS, +} from "@budibase/types" export const AUTO_COLUMN_SUB_TYPES = AutoFieldSubType @@ -307,9 +310,3 @@ export const DatasourceTypes = { GRAPH: "Graph", API: "API", } - -export const ROW_EXPORT_FORMATS = { - CSV: "csv", - JSON: "json", - JSON_WITH_SCHEMA: "jsonWithSchema", -} diff --git a/packages/server/src/api/controllers/view/exporters.ts b/packages/server/src/api/controllers/view/exporters.ts index 9cf114f4e5..946a1b346a 100644 --- a/packages/server/src/api/controllers/view/exporters.ts +++ b/packages/server/src/api/controllers/view/exporters.ts @@ -1,4 +1,6 @@ -import { Row, TableSchema } from "@budibase/types" +import { Row, RowExportFormat, TableSchema } from "@budibase/types" + +export { RowExportFormat as Format } from "@budibase/types" function getHeaders( headers: string[], @@ -46,14 +48,8 @@ export function jsonWithSchema(schema: TableSchema, rows: Row[]) { return JSON.stringify({ schema: newSchema, rows }, undefined, 2) } -export enum Format { - CSV = "csv", - JSON = "json", - JSON_WITH_SCHEMA = "jsonWithSchema", -} - -export function isFormat(format: any): format is Format { - return Object.values(Format).includes(format as Format) +export function isFormat(format: any): format is RowExportFormat { + return Object.values(RowExportFormat).includes(format as RowExportFormat) } export function parseCsvExport(value: string) { diff --git a/packages/types/src/sdk/row.ts b/packages/types/src/sdk/row.ts index b0b137034b..6850359cc3 100644 --- a/packages/types/src/sdk/row.ts +++ b/packages/types/src/sdk/row.ts @@ -30,3 +30,9 @@ export interface SearchResponse { bookmark?: string | number totalRows?: number } + +export enum RowExportFormat { + CSV = "csv", + JSON = "json", + JSON_WITH_SCHEMA = "jsonWithSchema", +}