From 9da9935c95a94d570d0208b06463e6bec3790061 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 29 Jan 2024 23:25:12 +0100
Subject: [PATCH] Types

---
 .../server/src/tests/utilities/TestConfiguration.ts    | 10 +++++++---
 packages/server/src/tests/utilities/api/datasource.ts  |  2 +-
 packages/types/src/shared/typeUtils.ts                 |  2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 58e1ae9e0e..d96655af43 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -62,6 +62,7 @@ import {
   User,
   UserRoles,
   View,
+  WithRequired,
 } from "@budibase/types"
 
 import API from "./api"
@@ -794,17 +795,19 @@ class TestConfiguration {
 
   async createDatasource(config?: {
     datasource: Datasource
-  }): Promise<Datasource & Required<Pick<Datasource, "_id">>> {
+  }): Promise<WithRequired<Datasource, "_id">> {
     config = config || basicDatasource()
     const response = await this.api.datasource.create(config.datasource)
     this.datasource = response
     return { ...this.datasource, _id: this.datasource!._id! }
   }
 
-  async updateDatasource(datasource: Datasource): Promise<Datasource> {
+  async updateDatasource(
+    datasource: Datasource
+  ): Promise<WithRequired<Datasource, "_id">> {
     const response = await this.api.datasource.update(datasource)
     this.datasource = response
-    return this.datasource!
+    return { ...this.datasource, _id: this.datasource!._id! }
   }
 
   async restDatasource(cfg?: any) {
@@ -819,6 +822,7 @@ class TestConfiguration {
 
   async dynamicVariableDatasource() {
     let datasource = await this.restDatasource()
+
     const basedOnQuery = await this.createQuery({
       ...basicQuery(datasource._id!),
       fields: {
diff --git a/packages/server/src/tests/utilities/api/datasource.ts b/packages/server/src/tests/utilities/api/datasource.ts
index 7f4af6f3da..bcd7a71089 100644
--- a/packages/server/src/tests/utilities/api/datasource.ts
+++ b/packages/server/src/tests/utilities/api/datasource.ts
@@ -12,7 +12,7 @@ export class DatasourceAPI extends TestAPI {
     super(config)
   }
 
-  create = async <B extends boolean>(
+  create = async <B extends boolean = false>(
     config: Datasource,
     {
       expectStatus,
diff --git a/packages/types/src/shared/typeUtils.ts b/packages/types/src/shared/typeUtils.ts
index df0e049455..c7ecebed0a 100644
--- a/packages/types/src/shared/typeUtils.ts
+++ b/packages/types/src/shared/typeUtils.ts
@@ -7,3 +7,5 @@ export type ISO8601 = string
 export type RequiredKeys<T> = {
   [K in keyof Required<T>]: T[K]
 }
+
+export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>