Merge branch 'master' of github.com:Budibase/budibase

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

@@ -32,7 +32,7 @@ export const getBackendUiStore = () => {
           state.selectedDatabase = db
           if (models && models.length > 0) {
             state.selectedModel = models[0]
-            state.selectedView = `${models[0]._id}`
+            state.selectedView = `all_${models[0]._id}`
           }
           state.breadcrumbs = [db.name]
           state.models = models
@@ -76,7 +76,7 @@ export const getBackendUiStore = () => {
           state.models.push(model)
           state.models = state.models
           state.selectedModel = model
-          state.selectedView = `${model._id}`
+          state.selectedView = `all_${model._id}`
           return state
         }),
     },

packages/builder/src/components/common/Switcher.svelte

@@ -69,7 +69,7 @@
   .switcher > .selected {
     color: var(--ink);
   }
-  
+
   .panel {
     min-height: 0;
     height: 100%;

packages/builder/src/components/nav/SchemaManagementDrawer.svelte

@@ -46,7 +46,7 @@
   function selectModel(model) {
     backendUiStore.update(state => {
       state.selectedModel = model
-      state.selectedView = `${model._id}`
+      state.selectedView = `all_${model._id}`
       return state
     })
   }

packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte

@@ -145,7 +145,7 @@
       regenerateCssForCurrentScreen(s)
       saveCurrentPreviewItem(s)
       selectComponent(s, componentToPaste)
-      
+
       return s
     })
   }

packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte

@@ -108,7 +108,7 @@
     flex-direction: column;
     /* Merge Check */
     overflow-x: hidden;
-    overflow-y:  hidden;
+    overflow-y: hidden;
     padding: 20px;
     box-sizing: border-box;
     /* Merge Check */

packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte

@@ -12,13 +12,13 @@
   const ACCESS_LEVELS = [
     {
       name: "Admin",
-      key: "ADMIN"
+      key: "ADMIN",
     },
     {
       name: "Power User",
-      key: "POWER_USER"
+      key: "POWER_USER",
-    }
+    },
-  ];
+  ]
 
   let selectedTab = "SETUP"
   let testResult

packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte

@@ -43,7 +43,9 @@
 {#if $backendUiStore.selectedDatabase._id && $backendUiStore.selectedModel.name}
   <ModelDataTable {selectRecord} />
 {:else}
-  <i style="color: var(--grey-dark)">create your first model to start building</i>
+  <i style="color: var(--grey-dark)">
+    create your first model to start building
+  </i>
 {/if}
 
 <style>

packages/server/src/api/routes/view.js

@@ -8,7 +8,7 @@ const router = Router()
 
 router
   .get(
-    "/api/:instanceId/view/:viewName",
+    "/api/:instanceId/views/:viewName",
     authorized(READ_VIEW, ctx => ctx.params.viewName),
     recordController.fetchView
   )