Merge branch 'master' into conditional-table-colours

packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte

@@ -7,7 +7,7 @@
 
   const { API, cache } = getContext("grid")
 
-  export let value
+  export let value = []
   export let api
   export let readonly
   export let focused
@@ -30,9 +30,10 @@
   let container
   let anchor
 
+  $: fieldValue = parseValue(value)
   $: oneRowOnly = schema?.relationshipType === "one-to-many"
   $: editable = focused && !readonly
-  $: lookupMap = buildLookupMap(value, isOpen)
+  $: lookupMap = buildLookupMap(fieldValue, isOpen)
   $: debouncedSearch(searchString)
   $: {
     if (!focused && isOpen) {
@@ -40,6 +41,13 @@
     }
   }
 
+  const parseValue = value => {
+    if (Array.isArray(value) && value.every(x => x?._id)) {
+      return value
+    }
+    return []
+  }
+
   // Builds a lookup map to quickly check which rows are selected
   const buildLookupMap = (value, isOpen) => {
     let map = {}
@@ -177,13 +185,13 @@
 
   // Toggles whether a row is included in the relationship or not
   const toggleRow = async row => {
-    if (value?.some(x => x._id === row._id)) {
+    if (fieldValue?.some(x => x._id === row._id)) {
       // If the row is already included, remove it and update the candidate
       // row to be the same position if possible
       if (oneRowOnly) {
         await onChange([])
       } else {
-        const newValue = value.filter(x => x._id !== row._id)
+        const newValue = fieldValue.filter(x => x._id !== row._id)
         if (!newValue.length) {
           candidateIndex = null
         } else {
@@ -196,7 +204,7 @@
       if (oneRowOnly) {
         await onChange([row])
       } else {
-        await onChange(sortRows([...(value || []), row]))
+        await onChange(sortRows([...(fieldValue || []), row]))
       }
       candidateIndex = null
     }
@@ -238,7 +246,7 @@
       class:wrap={editable || contentLines > 1}
       on:wheel={e => (focused ? e.stopPropagation() : null)}
     >
-      {#each value || [] as relationship}
+      {#each fieldValue || [] as relationship}
         {#if relationship[primaryDisplay] || relationship.primaryDisplay}
           <div class="badge">
             <span>
@@ -263,9 +271,9 @@
         </div>
       {/if}
     </div>
-    {#if !hideCounter && value?.length}
+    {#if !hideCounter && fieldValue?.length}
       <div class="count">
-        {value?.length || 0}
+        {fieldValue?.length || 0}
       </div>
     {/if}
   </div>

packages/server/src/db/linkedRows/LinkController.ts

@@ -172,6 +172,11 @@ class LinkController {
       const rowField = row[fieldName]
       const field = table.schema[fieldName]
       if (field.type === FieldType.LINK && rowField != null) {
+        // Expects an array of docs with at least their _id
+        if (!Array.isArray(rowField)) {
+          throw new Error("Relationship Error: Invalid value")
+        }
+
         // check which links actual pertain to the update in this row
         const thisFieldLinkDocs = linkDocs.filter(
           linkDoc =>