@budibase/server 1.0.50-alpha.6 → 1.0.50-alpha.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.50-alpha.6",
+  "version": "1.0.50-alpha.7",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,9 +70,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.50-alpha.6",
-    "@budibase/client": "^1.0.50-alpha.6",
-    "@budibase/string-templates": "^1.0.50-alpha.6",
+    "@budibase/backend-core": "^1.0.50-alpha.7",
+    "@budibase/client": "^1.0.50-alpha.7",
+    "@budibase/string-templates": "^1.0.50-alpha.7",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -168,5 +168,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "a557d325a5be87361fda1b74da6f9a2e8854c61a"
+  "gitHead": "d6368fc066a1b2f70a15934e49e2aa7bb78c518c"
 }

package/scripts/dev/manage.js

@@ -22,21 +22,21 @@ const Commands = {
 }
 
 async function init() {
-  // generate envoy file, always do this incase it has changed
+  // generate nginx file, always do this incase it has changed
   const hostingPath = path.join(process.cwd(), "..", "..", "hosting")
-  const envoyHbsPath = path.join(hostingPath, "envoy.dev.yaml.hbs")
-  const envoyOutputPath = path.join(hostingPath, ".generated-envoy.dev.yaml")
-  const contents = fs.readFileSync(envoyHbsPath, "utf8")
+  const nginxHbsPath = path.join(hostingPath, "nginx.dev.conf.hbs")
+  const nginxOutputPath = path.join(hostingPath, ".generated-nginx.dev.conf")
+  const contents = fs.readFileSync(nginxHbsPath, "utf8")
   const config = {
     address: isLinux() ? "172.17.0.1" : "host.docker.internal",
   }
-  fs.writeFileSync(envoyOutputPath, processStringSync(contents, config))
+  fs.writeFileSync(nginxOutputPath, processStringSync(contents, config))
 
   const envFilePath = path.join(process.cwd(), ".env")
   if (!fs.existsSync(envFilePath)) {
     const envFileJson = {
       PORT: 4001,
-      MINIO_URL: "http://localhost:10000/",
+      MINIO_URL: "http://localhost:4004",
       COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
       REDIS_URL: "localhost:6379",
       WORKER_URL: "http://localhost:4002",

package/scripts/likeCypress.ts

@@ -17,7 +17,7 @@ process.env.JWT_SECRET = "budibase"
 process.env.COUCH_URL = `leveldb://${tmpdir}/.data/`
 process.env.SELF_HOSTED = "1"
 process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/`
-process.env.MINIO_URL = `http://localhost:${MAIN_PORT}/`
+process.env.MINIO_URL = `http://localhost:4004`
 process.env.MINIO_ACCESS_KEY = "budibase"
 process.env.MINIO_SECRET_KEY = "budibase"
 process.env.COUCH_DB_USER = "budibase"

package/src/integrations/dynamodb.ts

@@ -169,13 +169,11 @@ module DynamoModule {
         IndexName: query.index ? query.index : undefined,
         ...query.json,
       }
-      if (query.index) {
-        const response = await this.client.query(params).promise()
-        if (response.Items) {
-          return response.Items
-        }
-        return response
+      const response = await this.client.query(params).promise()
+      if (response.Items) {
+        return response.Items
       }
+      return response
     }
 
     async scan(query: { table: string; json: object; index: null | string }) {