Merge pull request #1588 from Budibase/fix/no-page-load

Fix/no page load

packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@@ -291,7 +291,7 @@
     />
     {#if relationshipOptions && relationshipOptions.length > 0}
       <RadioGroup
-        disabled={originalName}
+        disabled={originalName != null}
         label="Define the relationship"
         bind:value={field.relationshipType}
         options={relationshipOptions}

packages/server/src/utilities/workerRequests.js

@@ -9,7 +9,8 @@ function getAppRole(appId, user) {
   if (!user.roles) {
     return user
   }
-  user.roleId = user.roles[appId]
+  // always use the deployed app
+  user.roleId = user.roles[getDeployedAppID(appId)]
   if (!user.roleId) {
     user.roleId = BUILTIN_ROLE_IDS.PUBLIC
   }
@@ -97,8 +98,6 @@ exports.deleteGlobalUser = async (ctx, globalId) => {
 }
 
 exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => {
-  // always use the deployed app
-  appId = getDeployedAppID(appId)
   const endpoint = globalId
     ? `/api/admin/users/${globalId}`
     : `/api/admin/users`
@@ -136,7 +135,6 @@ exports.getGlobalSelf = async (ctx, appId = null) => {
 }
 
 exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => {
-  appId = getDeployedAppID(appId)
   let user,
     endpoint,
     body = {}

packages/standard-components/src/forms/validation.js

@@ -77,6 +77,9 @@ const lengthConstraint = maxLength => value => {
 }
 
 const numericalConstraint = (constraint, error) => value => {
+  if (value == null || value === "") {
+    return null
+  }
   if (isNaN(value)) {
     return "Must be a number"
   }