Merge branch 'milestone3m' of https://github.com/solidos/solid-ui into milestone3m

Author: timea-solid

src/utils/index.js

@@ -120,11 +120,12 @@ function genUuid () {
  * @param {DomElement} table - will have a tr for each thing
  * @param {Array<NamedNode>} things - ORDERED array of NamedNode objects
  * @param {function({NamedNode})} createNewRow(thing) returns a TR table row for a new thing
+ * @param {function(DomElement, NamedNode)} updateExistingRow(row, thing) optional hook for refreshing matched rows
  *
  * Tolerates out of order elements but puts new ones in order.
  * Can be used for any element type; does not have to be a table and tr.
  */
-function syncTableToArray (table, things, createNewRow) {
+function syncTableToArray (table, things, createNewRow, updateExistingRow) {
   let foundOne
   let row
   let i
@@ -141,6 +142,14 @@ function syncTableToArray (table, things, createNewRow) {
     for (i = 0; i < table.children.length; i++) {
       row = table.children[i]
       if (row.subject && row.subject.sameTerm(thing)) {
+        if (updateExistingRow) {
+          const replacement = updateExistingRow(row, thing)
+          if (replacement && replacement !== row) {
+            row.parentNode.replaceChild(replacement, row)
+            replacement.subject = thing
+            row = replacement
+          }
+        }
         row.trashMe = false
         foundOne = true
         break

src/widgets/buttons.ts

@@ -891,6 +891,7 @@ export type attachmentListOptions = {
 export function attachmentList (dom: HTMLDocument, subject: NamedNode, div: HTMLElement, options: attachmentListOptions = {}) {
   // options = options || {}
   const docsWaitingForRowRefresh = new Set<string>()
+  const hasAsyncEnrichedRowOptions = !!(options.renderSupportingInfo || options.renderNameSuffix)
 
   const deleteAttachment = function (target) {
     if (!kb.updater) {
@@ -917,9 +918,11 @@ export function attachmentList (dom: HTMLDocument, subject: NamedNode, div: HTML
     opt.renderSupportingInfo = options.renderSupportingInfo
     opt.renderNameSuffix = options.renderNameSuffix
 
-    if ((options.renderSupportingInfo || options.renderNameSuffix) && target?.uri && kb.fetcher) {
+    if (hasAsyncEnrichedRowOptions && target?.uri && kb.fetcher) {
       const targetDoc = target.doc()
-      if (targetDoc?.uri && !docsWaitingForRowRefresh.has(targetDoc.uri)) {
+      const requestState = targetDoc?.uri ? kb.fetcher.requested?.[targetDoc.uri] : undefined
+      const shouldWaitForFetch = requestState !== 'done' && requestState !== 'failed'
+      if (targetDoc?.uri && shouldWaitForFetch && !docsWaitingForRowRefresh.has(targetDoc.uri)) {
         docsWaitingForRowRefresh.add(targetDoc.uri)
         // Root fix: these row options can depend on async profile data, so rerender once fetch completes.
         kb.fetcher.nowOrWhenFetched(targetDoc, undefined, () => {
@@ -940,7 +943,18 @@ export function attachmentList (dom: HTMLDocument, subject: NamedNode, div: HTML
   const refresh = function () {
     const things = kb.each(subject, predicate)
     things.sort()
-    utils.syncTableToArray(attachmentTable, things, createNewRow)
+    utils.syncTableToArray(
+      attachmentTable,
+      things,
+      createNewRow,
+      hasAsyncEnrichedRowOptions
+        ? function (row, thing) {
+            // When row content depends on async profile data, recreate matched rows on refresh.
+            const replacement = createNewRow(thing)
+            return replacement
+          }
+        : undefined
+    )
   }
 
   function droppedURIHandler (uris) {