Merge branch 'main' of github.com:alineacms/alinea

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.5]
+- Alinea will now fail if linked entries cannot be resolved during querying.
+  Before it would log the error but continue - but this is rarely desired.
+
 ## [1.0.4]
 - Fix removing field contents in `Edit.update`. Pass an undefined value to remove
   field contents: 

src/backend/Database.ts

@@ -836,23 +836,26 @@ export class Database implements Syncable {
       if (noChanges) return
 
       await Database.index(tx)
-      const isInserted = sql<boolean>`(${EntryRow.id}, ${coalesce(
-        EntryRow.locale,
-        sql`'null'`
-      )}, ${EntryRow.status}) in ${values(...inserted)}`
-      const entries = await tx.select().from(EntryRow).where(isInserted)
-      for (const entry of entries) {
-        const rowHash = await createRowHash(entry)
-        await tx
-          .update(EntryRow)
-          .set({
-            rowHash
-          })
-          .where(
-            eq(EntryRow.id, entry.id),
-            is(EntryRow.locale, entry.locale),
-            eq(EntryRow.status, entry.status)
-          )
+
+      if (inserted.length > 0) {
+        const isInserted = sql<boolean>`(${EntryRow.id}, ${coalesce(
+          EntryRow.locale,
+          sql`'null'`
+        )}, ${EntryRow.status}) in ${values(...inserted)}`
+        const entries = await tx.select().from(EntryRow).where(isInserted)
+        for (const entry of entries) {
+          const rowHash = await createRowHash(entry)
+          await tx
+            .update(EntryRow)
+            .set({
+              rowHash
+            })
+            .where(
+              eq(EntryRow.id, entry.id),
+              is(EntryRow.locale, entry.locale),
+              eq(EntryRow.status, entry.status)
+            )
+        }
       }
       await this.writeMeta(tx, commitHash)
     })

src/backend/resolver/LinkResolver.ts

@@ -55,8 +55,8 @@ export class LinkResolver {
     function skipErrors(results: Array<any>) {
       return results.map(result => {
         if (result instanceof Error) {
-          console.error(result)
-          return undefined
+          Error.captureStackTrace(result)
+          throw result
         }
         return result
       })

src/core/shape/RichTextShape.ts

@@ -404,7 +404,7 @@ export class RichTextShape<Blocks>
     iterMarks(doc, mark => {
       if (mark[Mark.type] !== 'link') return
       const entryId = mark[LinkMark.entry]
-      if (entryId) links.set(mark, entryId)
+      if (typeof entryId === 'string') links.set(mark, entryId)
     })
     async function loadLinks() {
       const linkIds = Array.from(new Set(links.values()))

src/field/link/EntryLink.ts

@@ -46,7 +46,9 @@ export function entry<Fields = undefined>(
     pickers: {
       entry: entryPicker({
         ...options,
-        withNavigation: Boolean(options.location || !options.condition),
+        withNavigation: Boolean(
+          options.location || (!options.condition && !options.pickChildren)
+        ),
         title: 'Select a page',
         max: 1,
         selection: EntryLink
@@ -73,7 +75,9 @@ export namespace entry {
       pickers: {
         entry: entryPicker<EntryReference, Fields>({
           ...options,
-          withNavigation: !options.condition,
+          withNavigation: Boolean(
+            options.location || (!options.condition && !options.pickChildren)
+          ),
           title: 'Select a page',
           selection: EntryLink
         })

src/picker/entry/EntryPicker.browser.tsx

@@ -9,6 +9,7 @@ import {Workspace} from 'alinea/core/Workspace'
 import {workspaceMediaDir} from 'alinea/core/util/EntryFilenames'
 import {entries} from 'alinea/core/util/Objects'
 import {useConfig} from 'alinea/dashboard/hook/UseConfig'
+import {useEntryEditor} from 'alinea/dashboard/hook/UseEntryEditor'
 import {useFocusList} from 'alinea/dashboard/hook/UseFocusList'
 import {useGraph} from 'alinea/dashboard/hook/UseGraph'
 import {useLocale} from 'alinea/dashboard/hook/UseLocale'
@@ -68,11 +69,13 @@ export function EntryPickerModal({
 }: EntryPickerModalProps) {
   const config = useConfig()
   const graph = useGraph()
+  const editor = useEntryEditor()
   const {
     title,
     defaultView,
     location,
     max,
+    pickChildren,
     condition,
     withNavigation = true,
     showMedia
@@ -89,6 +92,7 @@ export function EntryPickerModal({
   const locale = useLocale()
   const [destination, setDestination] = useState<PickerLocation>({
     workspace: currentWorkspace,
+    parentId: pickChildren ? editor?.entryId : undefined,
     root: showMedia
       ? Workspace.defaultMediaRoot(config.workspaces[currentWorkspace])
       : currentRoot,
@@ -137,7 +141,7 @@ export function EntryPickerModal({
   )
   const query = useMemo((): QueryWithResult<ExporerItemSelect> => {
     const terms = search.replace(/,/g, ' ').split(' ').filter(Boolean)
-    if (!withNavigation && condition) {
+    if (!withNavigation && condition && !pickChildren) {
       return {
         select: Entry,
         search: terms,

src/picker/entry/EntryPicker.ts

@@ -15,7 +15,11 @@ import {EntryReference} from './EntryReference.js'
 export interface EntryPickerOptions<Definition = {}> {
   selection: Projection
   defaultView?: 'row' | 'thumb'
+  /** Show entries from a specific workspace/root */
   location?: {workspace: string; root: string}
+  /** Choose from direct children of the currently edited entry */
+  pickChildren?: boolean
+  /** Filter entries by a condition */
   condition?: Filter<EntryFields & Entry>
   withNavigation?: boolean
   showMedia?: boolean