Merge pull request #1166 from Budibase/bug/minor-fix

Quick fix

packages/builder/cypress.json

@@ -1,5 +1,8 @@
 {
-  "baseUrl": "http://localhost:4001/_builder/",
+  "baseUrl": "http://localhost:4005/_builder/",
   "video": true,
-  "projectId": "bmbemn"
+  "projectId": "bmbemn",
+  "env": {
+    "PORT": "4005"
+  }
 }

packages/builder/cypress/integration/createApp.spec.js

@@ -2,7 +2,7 @@ context('Create an Application', () => {
 
     beforeEach(() => {
         cy.server()
-        cy.visit('localhost:4001/_builder')
+        cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
     })
 
     // https://on.cypress.io/interacting-with-elements
@@ -11,7 +11,7 @@ context('Create an Application', () => {
         // https://on.cypress.io/type
         cy.createApp('My Cool App', 'This is a description')
 
-        cy.visit('localhost:4001/_builder')
+        cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
 
         cy.contains('My Cool App').should('exist')
     })

packages/builder/cypress/integration/createAutomation.spec.js

@@ -1,7 +1,7 @@
 context("Create a automation", () => {
   before(() => {
     cy.server()
-    cy.visit("localhost:4001/_builder")
+    cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
 
     cy.createApp(
       "Automation Test App",

packages/builder/cypress/integration/createBinding.spec.js

@@ -1,6 +1,6 @@
 xcontext('Create a Binding', () => {
     before(() => {
-        cy.visit('localhost:4001/_builder')
+        cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
         cy.createApp('Binding App', 'Binding App Description')
         cy.navigateToFrontend()
     })

packages/builder/cypress/integration/createComponents.spec.js

@@ -1,7 +1,7 @@
 xcontext("Create Components", () => {
   before(() => {
     cy.server()
-    cy.visit("localhost:4001/_builder")
+    cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
     // https://on.cypress.io/type
     cy.createApp("Table App", "Table App Description")
     cy.createTable("dog", "name", "age")

packages/builder/cypress/integration/createTable.spec.js

@@ -1,6 +1,6 @@
 context("Create a Table", () => {
   before(() => {
-    cy.visit("localhost:4001/_builder")
+    cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
     cy.createApp("Table App", "Table App Description")
   })
 

packages/builder/cypress/integration/createUser.spec.js

@@ -2,7 +2,7 @@ context('Create a User', () => {
 
     before(() => {
         cy.server()
-        cy.visit('localhost:4001/_builder')
+        cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
         // https://on.cypress.io/type
         cy.createApp('User App', 'This app is used to test user creation')
     })

packages/builder/cypress/integration/createView.spec.js

@@ -8,7 +8,7 @@ function removeSpacing(headers) {
 
 context("Create a View", () => {
   before(() => {
-    cy.visit("localhost:4001/_builder")
+    cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
     cy.createApp("View App", "View App Description")
     cy.createTable("data")
     cy.addColumn("data", "group", "Text")

packages/builder/cypress/integration/screens.spec.js

@@ -2,7 +2,7 @@
 context('Screen Tests', () => {
     before(() => {
         cy.server()
-        cy.visit('localhost:4001/_builder')
+        cy.visit(`localhost:${Cypress.env("PORT")}/_builder`)
         cy.createApp('Conor Cy App', 'Table App Description')
         cy.navigateToFrontend()
     })

packages/builder/cypress/setup.js

@@ -6,6 +6,7 @@
 const rimraf = require("rimraf")
 const { join, resolve } = require("path")
 const initialiseBudibase = require("../../server/src/utilities/initialiseBudibase")
+const cypressConfig = require("../cypress.json")
 
 const homedir = join(require("os").homedir(), ".budibase")
 
@@ -14,6 +15,7 @@ rimraf.sync(homedir)
 process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE"
 process.env.NODE_ENV = "cypress"
 process.env.ENABLE_ANALYTICS = "false"
+process.env.PORT = cypressConfig.env.PORT
 
 // Stop info logs polluting test outputs
 process.env.LOG_LEVEL = "error"

packages/builder/package.json

@@ -14,8 +14,8 @@
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "cy:run:ci": "cypress run --browser electron --record --key f308590b-6070-41af-b970-794a3823d451",
-    "cy:test": "start-server-and-test cy:setup http://localhost:4001/_builder cy:run",
+    "cy:test": "start-server-and-test cy:setup http://localhost:4005/_builder cy:run",
-    "cy:ci": "start-server-and-test cy:setup http://localhost:4001/_builder cy:run:ci"
+    "cy:ci": "start-server-and-test cy:setup http://localhost:4005/_builder cy:run:ci"
   },
   "jest": {
     "globals": {

packages/builder/src/analytics.js

@@ -125,7 +125,12 @@ export default {
   requestFeedbackOnDeploy,
   submitFeedback,
   highlightFeedbackIcon,
-  disabled: ifAnalyticsEnabled(disabled),
+  disabled: () => {
+    if (analyticsEnabled == null) {
+      return true
+    }
+    return ifAnalyticsEnabled(disabled)
+  },
   optIn: ifAnalyticsEnabled(optIn),
   optOut: ifAnalyticsEnabled(optOut),
 }

packages/builder/src/builderStore/store/frontend.js

@@ -290,7 +290,7 @@ export const getFrontendStore = () => {
           ...extras,
         }
       },
-      create: (componentName, presetProps) => {
+      create: async (componentName, presetProps) => {
         const selected = get(selectedComponent)
         const asset = get(currentAsset)
         const state = get(store)
@@ -346,7 +346,7 @@ export const getFrontendStore = () => {
         parentComponent._children.push(componentInstance)
 
         // Save components and update UI
-        store.actions.preview.saveSelected()
+        await store.actions.preview.saveSelected()
         store.update(state => {
           state.currentView = "component"
           state.selectedComponentId = componentInstance._id
@@ -360,7 +360,7 @@ export const getFrontendStore = () => {
 
         return componentInstance
       },
-      delete: component => {
+      delete: async component => {
         if (!component) {
           return
         }
@@ -375,7 +375,7 @@ export const getFrontendStore = () => {
           )
           store.actions.components.select(parent)
         }
-        store.actions.preview.saveSelected()
+        await store.actions.preview.saveSelected()
       },
       copy: (component, cut = false) => {
         const selectedAsset = get(currentAsset)
@@ -487,7 +487,7 @@ export const getFrontendStore = () => {
         selected._styles = { normal: {}, hover: {}, active: {} }
         await store.actions.preview.saveSelected()
       },
-      updateProp: (name, value) => {
+      updateProp: async (name, value) => {
         let component = get(selectedComponent)
         if (!name || !component) {
           return
@@ -497,7 +497,7 @@ export const getFrontendStore = () => {
           state.selectedComponentId = component._id
           return state
         })
-        store.actions.preview.saveSelected()
+        await store.actions.preview.saveSelected()
       },
       links: {
         save: async (url, title) => {

packages/builder/src/components/automation/Shared/WebhookDisplay.svelte

@@ -13,7 +13,8 @@
     if (production) {
       return `${appUrl}/${uri}`
     } else {
-      return `http://localhost:4001/${uri}`
+
+      return `${window.location.origin}/${uri}`
     }
   }
 

packages/builder/src/components/backend/DataTable/Table.svelte

@@ -15,7 +15,7 @@
   import TableLoadingOverlay from "./TableLoadingOverlay"
   import TableHeader from "./TableHeader"
   import "@budibase/svelte-ag-grid/dist/index.css"
-  import { TableNames } from "constants"
+  import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
 
   export let schema = {}
   export let data = []
@@ -53,6 +53,9 @@
     if (isUsersTable) {
       schema.email.displayFieldName = "Email"
       schema.roleId.displayFieldName = "Role"
+      if (schema.status) {
+        schema.status.displayFieldName = "Status"
+      }
     }
   }
 
@@ -83,7 +86,7 @@
       if (!allowEditing) {
         return false
       }
-      return !(isUsersTable && ["email", "roleId"].includes(key))
+      return !(isUsersTable && UNEDITABLE_USER_FIELDS.includes(key))
     }
 
     for (let [key, value] of Object.entries(schema || {})) {

packages/builder/src/components/backend/DataTable/ViewDataTable.svelte

@@ -53,6 +53,7 @@
 <Table
   title={decodeURI(name)}
   schema={view.schema}
+  tableId={view.tableId}
   {data}
   {loading}
   bind:hideAutocolumns>

packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte

@@ -168,7 +168,9 @@
     </div>
   {/if}
   <div class="footer">
-    <Button text on:click={addFilter}>Add Filter</Button>
+    <div class="add-filter">
+      <Button text on:click={addFilter}>Add Filter</Button>
+    </div>
     <div class="buttons">
       <Button secondary on:click={onClosed}>Cancel</Button>
       <Button primary on:click={saveView}>Save</Button>
@@ -213,4 +215,8 @@
     margin: 0;
     font-size: var(--font-size-xs);
   }
+
+  .add-filter {
+    margin-right: 16px;
+  }
 </style>

packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte

@@ -23,7 +23,10 @@
   })
 </script>
 
-<ModalContent title="Webhook Endpoints" confirmText="OK" showCancelButton={false}>
+<ModalContent
+  title="Webhook Endpoints"
+  confirmText="OK"
+  showCancelButton={false}>
   <p>See below the list of deployed webhook URLs.</p>
   {#each webhookUrls as webhookUrl}
     <div>

packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte

@@ -39,14 +39,14 @@
     return enrichedStructure
   }
 
-  const onItemChosen = (item, idx) => {
+  const onItemChosen = async (item, idx) => {
     if (item.isCategory) {
       // Select and open this category
       selectedIndex = idx
       popover.show()
     } else {
       // Add this component
-      store.actions.components.create(item.component)
+      await store.actions.components.create(item.component)
       popover.hide()
     }
   }

packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte

@@ -64,8 +64,8 @@
     pasteComponent("below")
   }
 
-  const deleteComponent = () => {
+  const deleteComponent = async () => {
-    store.actions.components.delete(component)
+    await store.actions.components.delete(component)
   }
 
   const storeComponentForCopy = (cut = false) => {

packages/builder/src/constants/index.js

@@ -10,7 +10,7 @@ export const FrontendTypes = {
 }
 
 // fields on the user table that cannot be edited
-export const UNEDITABLE_USER_FIELDS = ["email", "password", "roleId"]
+export const UNEDITABLE_USER_FIELDS = ["email", "password", "roleId", "status"]
 
 export const LAYOUT_NAMES = {
   MASTER: {

packages/server/.env.template

@@ -8,13 +8,10 @@ CLIENT_ID={{clientId}}
 # used to create cookie hashes
 JWT_SECRET={{cookieKey1}}
 
-# port to run http server on
-PORT=4001 
-
 # error level for koa-pino
 LOG_LEVEL=info
 
 DEPLOYMENT_CREDENTIALS_URL="https://dt4mpwwap8.execute-api.eu-west-1.amazonaws.com/prod/"
 DEPLOYMENT_DB_URL="https://couchdb.budi.live:5984"
 SENTRY_DSN=https://a34ae347621946bf8acded18e5b7d4b8@o420233.ingest.sentry.io/5338131
-ENABLE_ANALYTICS="true"
+ENABLE_ANALYTICS="true"

packages/server/package.json

@@ -36,7 +36,7 @@
     "test:integration": "jest routes --runInBand",
     "test:watch": "jest --watch",
     "run:docker": "node src/index",
-    "dev:builder": "nodemon src/index.js",
+    "dev:builder": "PORT=4001 nodemon src/index.js",
     "electron": "electron src/electron.js",
     "build:electron": "electron-builder --dir",
     "publish:electron": "electron-builder -mwl --publish always",

packages/server/src/app.js

@@ -58,8 +58,10 @@ destroyable(server)
 
 server.on("close", () => console.log("Server Closed"))
 
-module.exports = server.listen(env.PORT || 4001, async () => {
+module.exports = server.listen(env.PORT || 0, async () => {
   console.log(`Budibase running on ${JSON.stringify(server.address())}`)
+  env._set("PORT", server.address().port)
+  eventEmitter.emitPort(env.PORT)
   automations.init()
   // only init the self hosting DB info in the Pouch, not needed in self hosting prod
   if (!env.CLOUD) {

packages/server/src/electron.js

@@ -7,6 +7,7 @@ const { existsSync } = require("fs-extra")
 const initialiseBudibase = require("./utilities/initialiseBudibase")
 const { budibaseAppsDir } = require("./utilities/budibaseDir")
 const { openNewGitHubIssue, debugInfo } = require("electron-util")
+const eventEmitter = require("./events")
 
 const budibaseDir = budibaseAppsDir()
 const envFile = join(budibaseDir, ".env")
@@ -17,7 +18,11 @@ async function startApp() {
   }
   // evict environment from cache, so it reloads when next asked
   delete require.cache[require.resolve("./environment")]
+  // store the port incase its going to get overridden
+  const port = process.env.PORT
   require("dotenv").config({ path: envFile })
+  // overwrite the port - don't want to use dotenv for the port
+  require("./environment")._set("PORT", port)
 
   unhandled({
     showDialog: true,
@@ -34,9 +39,6 @@ async function startApp() {
     },
   })
 
-  const APP_URL = "http://localhost:4001/_builder"
-  const APP_TITLE = "Budibase Builder"
-
   let win
 
   function handleRedirect(e, url) {
@@ -46,22 +48,26 @@ async function startApp() {
 
   async function createWindow() {
     app.server = require("./app")
-    win = new BrowserWindow({
+    eventEmitter.on("internal:port", port => {
-      width: 1920,
+      const APP_URL = `http://localhost:${port}/_builder`
-      height: 1080,
+      const APP_TITLE = "Budibase Builder"
-      icon: join(__dirname, "..", "build", "icons", "512x512.png"),
+      win = new BrowserWindow({
-    })
+        width: 1920,
-    win.setTitle(APP_TITLE)
+        height: 1080,
-    win.loadURL(APP_URL)
+        icon: join(__dirname, "..", "build", "icons", "512x512.png"),
-    if (isDev) {
+      })
-      win.webContents.openDevTools()
+      win.setTitle(APP_TITLE)
-    } else {
+      win.loadURL(APP_URL)
-      autoUpdater.checkForUpdatesAndNotify()
+      if (isDev) {
-    }
+        win.webContents.openDevTools()
+      } else {
+        autoUpdater.checkForUpdatesAndNotify()
+      }
 
-    // open _blank in default browser
+      // open _blank in default browser
-    win.webContents.on("new-window", handleRedirect)
+      win.webContents.on("new-window", handleRedirect)
-    win.webContents.on("will-navigate", handleRedirect)
+      win.webContents.on("will-navigate", handleRedirect)
+    })
   }
 
   app.whenReady().then(createWindow)

packages/server/src/events/index.js

@@ -19,6 +19,10 @@ class BudibaseEmitter extends EventEmitter {
   emitTable(eventName, appId, table = null) {
     tableEmission({ emitter: this, eventName, appId, table })
   }
+
+  emitPort(portNumber) {
+    this.emit("internal:port", portNumber)
+  }
 }
 
 const emitter = new BudibaseEmitter()