@budibase/server 2.5.6-alpha.33 → 2.5.6-alpha.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.33",
+  "version": "2.5.6-alpha.34",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.6-alpha.33",
-    "@budibase/client": "2.5.6-alpha.33",
-    "@budibase/pro": "2.5.6-alpha.32",
-    "@budibase/shared-core": "2.5.6-alpha.33",
-    "@budibase/string-templates": "2.5.6-alpha.33",
-    "@budibase/types": "2.5.6-alpha.33",
+    "@budibase/backend-core": "2.5.6-alpha.34",
+    "@budibase/client": "2.5.6-alpha.34",
+    "@budibase/pro": "2.5.6-alpha.33",
+    "@budibase/shared-core": "2.5.6-alpha.34",
+    "@budibase/string-templates": "2.5.6-alpha.34",
+    "@budibase/types": "2.5.6-alpha.34",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "145bbc2667e43ab4c67e3403b29d3af02936756f"
+  "gitHead": "7968ddb9253cdc7176f68a50923262f47711811d"
 }

package/src/api/controllers/datasource.ts

@@ -12,7 +12,15 @@ import { getIntegration } from "../../integrations"
 import { getDatasourceAndQuery } from "./row/utils"
 import { invalidateDynamicVariables } from "../../threads/utils"
 import { db as dbCore, context, events } from "@budibase/backend-core"
-import { UserCtx, Datasource, Row } from "@budibase/types"
+import {
+  UserCtx,
+  Datasource,
+  Row,
+  CreateDatasourceResponse,
+  UpdateDatasourceResponse,
+  UpdateDatasourceRequest,
+  CreateDatasourceRequest,
+} from "@budibase/types"
 import sdk from "../../sdk"
 
 export async function fetch(ctx: UserCtx) {
@@ -146,7 +154,7 @@ async function invalidateVariables(
   await invalidateDynamicVariables(toInvalidate)
 }
 
-export async function update(ctx: UserCtx) {
+export async function update(ctx: UserCtx<any, UpdateDatasourceResponse>) {
   const db = context.getAppDB()
   const datasourceId = ctx.params.datasourceId
   let datasource = await sdk.datasources.get(datasourceId)
@@ -187,15 +195,17 @@ export async function update(ctx: UserCtx) {
   }
 }
 
-export async function save(ctx: UserCtx) {
+export async function save(
+  ctx: UserCtx<CreateDatasourceRequest, CreateDatasourceResponse>
+) {
   const db = context.getAppDB()
   const plus = ctx.request.body.datasource.plus
   const fetchSchema = ctx.request.body.fetchSchema
 
   const datasource = {
     _id: generateDatasourceID({ plus }),
-    type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE,
     ...ctx.request.body.datasource,
+    type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE,
   }
 
   let schemaError = null
@@ -218,7 +228,7 @@ export async function save(ctx: UserCtx) {
     }
   }
 
-  const response: any = {
+  const response: CreateDatasourceResponse = {
     datasource: await sdk.datasources.removeSecretSingle(datasource),
   }
   if (schemaError) {

package/src/integration-test/postgres.spec.ts

@@ -349,7 +349,7 @@ describe("row api - postgres", () => {
       },
       plus: true,
       source: "POSTGRES",
-      type: "datasource",
+      type: "datasource_plus",
       _id: expect.any(String),
       _rev: expect.any(String),
       createdAt: expect.any(String),