PR comments, removing console logs, as well as trying to get jest tests working in builder.

packages/builder/package.json

@@ -9,6 +9,7 @@
     "dev:builder": "routify -c dev:vite",
     "dev:vite": "vite --host 0.0.0.0",
     "rollup": "rollup -c -w",
+    "test": "jest",
     "cy:setup": "ts-node ./cypress/ts/setup.ts",
     "cy:setup:ci": "node ./cypress/setup.js",
     "cy:open": "cypress open",
@@ -36,7 +37,8 @@
       "components(.*)$": "<rootDir>/src/components$1",
       "builderStore(.*)$": "<rootDir>/src/builderStore$1",
       "stores(.*)$": "<rootDir>/src/stores$1",
-      "analytics(.*)$": "<rootDir>/src/analytics$1"
+      "analytics(.*)$": "<rootDir>/src/analytics$1",
+      "constants/backend": "<rootDir>/src/constants/backend/index.js"
     },
     "moduleFileExtensions": [
       "js",

packages/builder/src/helpers/data/utils.js

@@ -32,7 +32,6 @@ export function breakQueryString(qs) {
   let paramObj = {}
   for (let param of params) {
     const split = param.split("=")
-    console.log(split[1])
     paramObj[split[0]] = decodeURIComponent(split.slice(1).join("="))
   }
   return paramObj

packages/builder/src/helpers/tests/dataUtils.spec.js

@@ -0,0 +1,37 @@
+import { breakQueryString, buildQueryString } from "../data/utils"
+
+describe("check query string utils", () => {
+  const obj1 = {
+    key1: "123",
+    key2: "   ",
+    key3: "333",
+  }
+
+  const obj2 = {
+    key1: "{{ binding.awd }}",
+    key2: "{{ binding.sed }}  ",
+  }
+
+  it("should build a basic query string", () => {
+    const queryString = buildQueryString(obj1)
+    expect(queryString).toBe("key1=123&key2=%20%20%20&key3=333")
+  })
+
+  it("should be able to break a basic query string", () => {
+    const broken = breakQueryString("key1=123&key2=%20%20%20&key3=333")
+    expect(broken.key1).toBe(obj1.key1)
+    expect(broken.key2).toBe(obj1.key2)
+    expect(broken.key3).toBe(obj1.key3)
+  })
+
+  it("should be able to build with a binding", () => {
+    const queryString = buildQueryString(obj2)
+    expect(queryString).toBe("key1={{ binding.awd }}&key2={{ binding.sed }}%20%20")
+  })
+
+  it("should be able to break with a binding", () => {
+    const broken = breakQueryString("key1={{ binding.awd }}&key2={{ binding.sed }}%20%20")
+    expect(broken.key1).toBe(obj2.key1)
+    expect(broken.key2).toBe(obj2.key2)
+  })
+})

packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte

@@ -347,7 +347,6 @@
     const datasourceUrl = datasource?.config.url
     const qs = query?.fields.queryString
     breakQs = restUtils.breakQueryString(qs)
-    console.log(breakQs)
     breakQs = runtimeToReadableMap(mergedBindings, breakQs)
 
     const path = query.fields.path

packages/builder/src/stores/backend/queries.js

@@ -1,7 +1,7 @@
 import { writable, get } from "svelte/store"
 import { datasources, integrations, tables, views } from "./"
 import { API } from "api"
-import { duplicateName } from "../../helpers/duplicate"
+import { duplicateName } from "helpers/duplicate"
 
 const sortQueries = queryList => {
   queryList.sort((q1, q2) => {

packages/builder/src/stores/backend/tables.js

@@ -2,7 +2,7 @@ import { get, writable } from "svelte/store"
 import { datasources, queries, views } from "./"
 import { cloneDeep } from "lodash/fp"
 import { API } from "api"
-import { SWITCHABLE_TYPES } from "../../constants/backend"
+import { SWITCHABLE_TYPES } from "constants/backend"
 
 export function createTablesStore() {
   const store = writable({})

packages/builder/src/stores/backend/tests/datasources.spec.js.disabled

@@ -1,9 +1,9 @@
-import { get } from 'svelte/store'
+import { get } from "svelte/store"
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
-import { SOME_DATASOURCE, SAVE_DATASOURCE} from './fixtures/datasources'
+import { SOME_DATASOURCE, SAVE_DATASOURCE } from "./fixtures/datasources"
 
 import { createDatasourcesStore } from "../datasources"
 import { queries } from '../queries'
@@ -12,19 +12,19 @@ describe("Datasources Store", () => {
   let store = createDatasourcesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE]})
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE]})
     await store.init()
   })
 
   it("Initialises correctly", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE]})
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE]})
 
     await store.init()
     expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null})
   })
 
   it("fetches all the datasources and updates the store", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_DATASOURCE] })
+    API.getDatasources.mockReturnValue({ json: () => [SOME_DATASOURCE] })
 
     await store.fetch()
     expect(get(store)).toEqual({ list: [SOME_DATASOURCE], selected: null })
@@ -44,7 +44,7 @@ describe("Datasources Store", () => {
   })
 
   it("saves the datasource, updates the store and returns status message", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_DATASOURCE})    
+    API.createDatasource.mockReturnValue({ status: 200, json: () => SAVE_DATASOURCE})
 
     await store.save({
       name: 'CoolDB',
@@ -56,11 +56,11 @@ describe("Datasources Store", () => {
     expect(get(store).list).toEqual(expect.arrayContaining([SAVE_DATASOURCE.datasource]))
   })
   it("deletes a datasource, updates the store and returns status message", async () => {
-    api.get.mockReturnValue({ json: () => SOME_DATASOURCE})
+    API.getDatasources.mockReturnValue({ json: () => SOME_DATASOURCE})
 
     await store.fetch()
 
-    api.delete.mockReturnValue({status: 200, message: 'Datasource deleted.'})    
+    API.deleteDatasource.mockReturnValue({status: 200, message: 'Datasource deleted.'})
 
     await store.delete(SOME_DATASOURCE[0])
     expect(get(store)).toEqual({ list: [], selected: null})

packages/builder/src/stores/backend/tests/permissions.spec.js.disabled

@@ -1,6 +1,6 @@
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
 const PERMISSIONS_FOR_RESOURCE = {
     "write": "BASIC",
@@ -13,13 +13,12 @@ describe("Permissions Store", () => {
   const store = createPermissionStore()
 
   it("fetches permissions for specific resource", async () => {
-    api.get.mockReturnValueOnce({ json: () => PERMISSIONS_FOR_RESOURCE})
+    API.getPermissionForResource.mockReturnValueOnce({ json: () => PERMISSIONS_FOR_RESOURCE})
 
     const resourceId = "ta_013657543b4043b89dbb17e9d3a4723a"
 
     const permissions = await store.forResource(resourceId)
 
-    expect(api.get).toBeCalledWith(`/api/permission/${resourceId}`)
     expect(permissions).toEqual(PERMISSIONS_FOR_RESOURCE)
   })
 })

packages/builder/src/stores/backend/tests/queries.spec.js.disabled

@@ -1,9 +1,9 @@
-import { get } from 'svelte/store'
+import { get } from "svelte/store"
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
-import { SOME_QUERY, SAVE_QUERY_RESPONSE } from './fixtures/queries'
+import { SOME_QUERY, SAVE_QUERY_RESPONSE } from "./fixtures/queries"
 
 import { createQueriesStore } from "../queries"
 
@@ -11,26 +11,26 @@ describe("Queries Store", () => {
   let store = createQueriesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
     await store.init()
   })
 
   it("Initialises correctly", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
 
     await store.init()
     expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null})
   })
 
   it("fetches all the queries", async () => {
-    api.get.mockReturnValue({ json: () => [SOME_QUERY]})
+    API.getQueries.mockReturnValue({ json: () => [SOME_QUERY]})
 
     await store.fetch()
     expect(get(store)).toEqual({ list: [SOME_QUERY], selected: null})
   })
 
   it("saves the query, updates the store and returns status message", async () => {
-    api.post.mockReturnValue({ json: () => SAVE_QUERY_RESPONSE})    
+    API.saveQuery.mockReturnValue({ json: () => SAVE_QUERY_RESPONSE})
 
     await store.select(SOME_QUERY.datasourceId, SOME_QUERY)
 
@@ -38,7 +38,7 @@ describe("Queries Store", () => {
   })
   it("deletes a query, updates the store and returns status message", async () => {
 
-    api.delete.mockReturnValue({status: 200, message: `Query deleted.`})  
+    API.deleteQuery.mockReturnValue({status: 200, message: `Query deleted.`})
 
     await store.delete(SOME_QUERY)
     expect(get(store)).toEqual({ list: [], selected: null})

packages/builder/src/stores/backend/tests/roles.spec.js.disabled

@@ -1,10 +1,10 @@
-import { get } from 'svelte/store'
+import { get } from "svelte/store"
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
 
 import { createRolesStore } from "../roles"
-import { ROLES } from './fixtures/roles'
+import { ROLES } from "./fixtures/roles"
 
 describe("Roles Store", () => {
   let store = createRolesStore()
@@ -14,18 +14,17 @@ describe("Roles Store", () => {
   })
 
   it("fetches roles from backend", async () => {
-    api.get.mockReturnValue({ json: () => ROLES})
+    API.getRoles.mockReturnValue({ json: () => ROLES})
     await store.fetch()
 
-    expect(api.get).toBeCalledWith("/api/roles")
     expect(get(store)).toEqual(ROLES)
   })
 
   it("deletes a role", async () => {
-    api.get.mockReturnValueOnce({ json: () => ROLES})
+    API.getRoles.mockReturnValueOnce({ json: () => ROLES})
     await store.fetch()
 
-    api.delete.mockReturnValue({status: 200, message: `Role deleted.`})
+    API.deleteRole.mockReturnValue({status: 200, message: `Role deleted.`})
 
     const updatedRoles = [...ROLES.slice(1)]
     await store.delete(ROLES[0])

packages/builder/src/stores/backend/tests/tables.spec.js.disabled

@@ -1,18 +1,16 @@
-import { get } from 'svelte/store'
+import { get } from "svelte/store"
-import api from 'builderStore/api'
+import { API } from "api"
 
-jest.mock('builderStore/api');
+jest.mock("api")
-
-import { SOME_TABLES, SAVE_TABLES_RESPONSE, A_TABLE } from './fixtures/tables'
 
+import { SOME_TABLES, SAVE_TABLES_RESPONSE, A_TABLE } from "./fixtures/tables"
 import { createTablesStore } from "../tables"
-import { views } from '../views'
 
 describe("Tables Store", () => {
   let store = createTablesStore()
 
   beforeEach(async () => {
-    api.get.mockReturnValue({ json: () => SOME_TABLES})
+    API.getTables.mockReturnValue({ json: () => SOME_TABLES})
     await store.init()
   })
 
@@ -21,7 +19,7 @@ describe("Tables Store", () => {
   })
 
   it("fetches all the tables", async () => {
-    api.get.mockReturnValue({ json: () => SOME_TABLES})
+    API.getTables.mockReturnValue({ json: () => SOME_TABLES})
 
     await store.fetch()
     expect(get(store)).toEqual({ list: SOME_TABLES, selected: {}, draft: {}})
@@ -42,7 +40,7 @@ describe("Tables Store", () => {
   })
 
   it("saving a table also selects it", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
+    API.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
 
     await store.save(A_TABLE)
 
@@ -50,14 +48,14 @@ describe("Tables Store", () => {
   })
 
   it("saving the table returns a response", async () => {
-    api.post.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
+    API.saveTable.mockReturnValue({ status: 200, json: () => SAVE_TABLES_RESPONSE})
 
     const response = await store.save(A_TABLE)
 
     expect(response).toEqual(SAVE_TABLES_RESPONSE)
   })
   it("deleting a table removes it from the store", async () => {
-    api.delete.mockReturnValue({status: 200, message: `Table deleted.`})  
+    API.deleteTable.mockReturnValue({status: 200, message: `Table deleted.`})
 
     await store.delete(A_TABLE)
     expect(get(store).list).toEqual(expect.not.arrayContaining([A_TABLE]))