From 672e37090460415ea48d22210234368635d54c01 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 11 Aug 2023 16:01:53 +0100 Subject: [PATCH] Default state of view is no data returned. --- packages/server/src/sdk/app/views/index.ts | 22 +++++++++---------- .../src/sdk/app/views/tests/views.spec.ts | 8 +++---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts index 3649e93a43..c8eb54891b 100644 --- a/packages/server/src/sdk/app/views/index.ts +++ b/packages/server/src/sdk/app/views/index.ts @@ -82,18 +82,16 @@ export function enrichSchema(view: View | ViewV2, tableSchema: TableSchema) { const anyViewOrder = Object.values(view.schema || {}).some( ui => ui.order != null ) - if (Object.keys(view.schema || {}).length > 0) { - for (const key of Object.keys(schema)) { - // if nothing specified in view, then it is not visible - const ui = view.schema?.[key] || { visible: false } - if (ui.visible === false) { - schema[key].visible = false - } else { - schema[key] = { - ...schema[key], - ...ui, - order: anyViewOrder ? ui?.order ?? undefined : schema[key].order, - } + for (const key of Object.keys(schema)) { + // if nothing specified in view, then it is not visible + const ui = view.schema?.[key] || { visible: false } + if (ui.visible === false) { + schema[key].visible = false + } else { + schema[key] = { + ...schema[key], + ...ui, + order: anyViewOrder ? ui?.order ?? undefined : schema[key].order, } } } diff --git a/packages/server/src/sdk/app/views/tests/views.spec.ts b/packages/server/src/sdk/app/views/tests/views.spec.ts index 09fe5fa17a..833a0c9bdc 100644 --- a/packages/server/src/sdk/app/views/tests/views.spec.ts +++ b/packages/server/src/sdk/app/views/tests/views.spec.ts @@ -49,7 +49,7 @@ describe("table sdk", () => { } describe("enrichViewSchemas", () => { - it("should fetch the default schema if not overriden", async () => { + it("should fetch the default schema if not overridden", async () => { const tableId = basicTable._id! const view: ViewV2 = { version: 2, @@ -66,7 +66,7 @@ describe("table sdk", () => { name: { type: "string", name: "name", - visible: true, + visible: false, order: 2, width: 80, constraints: { @@ -76,7 +76,7 @@ describe("table sdk", () => { description: { type: "string", name: "description", - visible: true, + visible: false, width: 200, constraints: { type: "string", @@ -85,7 +85,7 @@ describe("table sdk", () => { id: { type: "number", name: "id", - visible: true, + visible: false, order: 1, constraints: { type: "number",