@budibase/frontend-core 2.7.36-alpha.1 → 2.7.36-alpha.2

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.7.36-alpha.1",
+  "version": "2.7.36-alpha.2",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.7.36-alpha.1",
-    "@budibase/shared-core": "2.7.36-alpha.1",
+    "@budibase/bbui": "2.7.36-alpha.2",
+    "@budibase/shared-core": "2.7.36-alpha.2",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
     "svelte": "^3.46.2"
   },
-  "gitHead": "8d3bbb718b4e3dea5e1da2dfa30fac231ef4fe22"
+  "gitHead": "9e73358c0b5d945e052a08f6a9277a4d263eec01"
 }

package/src/components/grid/layout/Grid.svelte

@@ -68,6 +68,7 @@
     rowHeight,
     contentLines,
     gridFocused,
+    error,
   } = context
 
   // Keep config store up to date with props
@@ -149,8 +150,15 @@
         </div>
       </div>
     </div>
+  {:else if $error}
+    <div class="grid-error">
+      <div class="grid-error-title">There was a problem loading your grid</div>
+      <div class="grid-error-subtitle">
+        {$error}
+      </div>
+    </div>
   {/if}
-  {#if $loading}
+  {#if $loading && !$error}
     <div in:fade|local={{ duration: 130 }} class="grid-loading">
       <ProgressCircle />
     </div>
@@ -273,6 +281,25 @@
     opacity: 0.6;
   }
 
+  /* Error */
+  .grid-error {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+  }
+  .grid-error-title {
+    font-size: 18px;
+    font-weight: 600;
+  }
+  .grid-error-subtitle {
+    font-size: 16px;
+  }
+
   /* Disable checkbox animation anywhere in the grid data */
   .grid-data-outer :global(.spectrum-Checkbox-box:before),
   .grid-data-outer :global(.spectrum-Checkbox-box:after),

package/src/components/grid/stores/rows.js

@@ -14,6 +14,7 @@ export const createStores = () => {
   const rowChangeCache = writable({})
   const inProgressChanges = writable({})
   const hasNextPage = writable(false)
+  const error = writable(null)
 
   // Generate a lookup map to quick find a row by ID
   const rowLookupMap = derived(
@@ -47,6 +48,7 @@ export const createStores = () => {
     rowChangeCache,
     inProgressChanges,
     hasNextPage,
+    error,
   }
 }
 
@@ -68,6 +70,7 @@ export const deriveStores = context => {
     inProgressChanges,
     previousFocusedRowId,
     hasNextPage,
+    error,
   } = context
   const instanceLoaded = writable(false)
   const fetch = writable(null)
@@ -122,7 +125,17 @@ export const deriveStores = context => {
 
     // Subscribe to changes of this fetch model
     unsubscribe = newFetch.subscribe(async $fetch => {
-      if ($fetch.loaded && !$fetch.loading) {
+      if ($fetch.error) {
+        // Present a helpful error to the user
+        let message = "An unknown error occurred"
+        if ($fetch.error.status === 403) {
+          message = "You don't have access to this data"
+        } else if ($fetch.error.message) {
+          message = $fetch.error.message
+        }
+        error.set(message)
+      } else if ($fetch.loaded && !$fetch.loading) {
+        error.set(null)
         hasNextPage.set($fetch.hasNextPage)
         const $instanceLoaded = get(instanceLoaded)
         const resetRows = $fetch.resetKey !== lastResetKey

package/src/fetch/DataFetch.js

@@ -57,6 +57,7 @@ export default class DataFetch {
       cursor: null,
       cursors: [],
       resetKey: Math.random(),
+      error: null,
     })
 
     // Merge options with their default values
@@ -252,6 +253,10 @@ export default class DataFetch {
     try {
       return await this.API.fetchTableDefinition(datasource.tableId)
     } catch (error) {
+      this.store.update(state => ({
+        ...state,
+        error,
+      }))
       return null
     }
   }