feat(packages/core): mode registrations should be overridable

Fixes #3175

Author: starpit

packages/core/src/models/mmr/show.ts

@@ -114,8 +114,14 @@ async function renderContent<T extends MetadataBearing>(
   } else if (isFunctionContent(content)) {
     const actualContent: ScalarResource | ScalarContent = await content.content(tab, bearer)
     if (!isScalarContent(actualContent)) {
-      return {
-        content: actualContent
+      if (isTable(actualContent) || isMultiTable(actualContent)) {
+        return {
+          content: wrapTable(tab, actualContent)
+        }
+      } else {
+        return {
+          content: actualContent
+        }
       }
     } else {
       return actualContent

packages/core/src/models/mmr/types.ts

@@ -71,8 +71,13 @@ export interface ModeTraits {
   /** should this mode be given preference as the default selected mode? */
   defaultMode?: boolean
 
-  /** sort order; default is as given */
+  /** order in view; lower will be rendered further to the "left" for
+   * LTR; default order registration order */
   order?: number
+
+  /** registration tie-breaker: if more than one plugin offers the
+   * same mode, the one with the highest numeric priority wins */
+  priority?: number
 }
 
 /**

packages/core/src/webapp/views/registrar/modes.ts

@@ -97,8 +97,23 @@ export function apply<Resource extends MetadataBearing>(
       const theMode = isButton(theModeOrButton)
         ? formatButton(tab, resource.resource, theModeOrButton)
         : theModeOrButton
-      if (!modes.find(({ mode }) => mode === theMode.mode)) {
+
+      const idxOfPreexistingRegistrationForSameMode = modes.findIndex(({ mode }) => mode === theMode.mode)
+      if (idxOfPreexistingRegistrationForSameMode < 0) {
         modes.push(theMode)
+      } else {
+        // two plugins register the same mode; see if we can break the
+        // tie using the `priority` field of the modes
+        const oldMode = modes[idxOfPreexistingRegistrationForSameMode]
+        const prio1 = oldMode.priority || 0
+        const prio2 = theMode.priority || 0
+        if (prio2 > prio1) {
+          // splice the override in place, deleting the existing entry
+          if (oldMode.defaultMode && theMode.defaultMode !== false) {
+            theMode.defaultMode = true
+          }
+          modes.splice(idxOfPreexistingRegistrationForSameMode, 1, theMode)
+        }
       }
 
       /* if (grabDefaultMode) {

packages/core/src/webapp/views/sidecar.ts

@@ -301,7 +301,10 @@ export const addNameToSidecarHeader = async (
   }
 
   // handle ToolbarText
-  const toolbarTextSpec = isToolbarText(subtext) ? subtext : isCustomSpec(entity) && entity.toolbarText
+  const toolbarTextSpec = isToolbarText(subtext)
+    ? subtext
+    : isCustomSpec(entity) &&
+      (entity.toolbarText || (isMetadataBearingByReference(entity) && entity.resource.toolbarText))
   const toolbarTextContainer = element('.sidecar-bottom-stripe-toolbar .sidecar-toolbar-text', sidecar)
   const toolbarTextContent = element('.sidecar-toolbar-text-content', toolbarTextContainer)
   removeAllDomChildren(toolbarTextContent)

packages/core/src/webapp/views/table.ts

@@ -21,6 +21,7 @@ import { Tab } from '../tab'
 import { isPopup } from '../popup-core'
 import { getCurrentPrompt } from '../prompt'
 import { _split as split, Split } from '../../repl/split'
+import { isMetadataBearing } from '../../models/entity'
 import {
   Table,
   MultiTable,
@@ -484,6 +485,11 @@ export const formatOneRowResult = (tab: Tab, options: RowFormatOptions = {}) =>
           qexec(entity.onclick, undefined, undefined, { tab })
         }
       }
+    } else if (isMetadataBearing(entity.onclick)) {
+      entityNameClickable.onclick = async () => {
+        const { show } = await import('../../models/mmr/show')
+        return show(tab, entity.onclick)
+      }
     } else {
       entityNameClickable.onclick = entity.onclick
     }

packages/core/web/css/kui-tables.css

@@ -190,8 +190,8 @@ sidecar
   /* table row striping */
   background-color: var(--color-ui-02);
 }
-body sidecar .result-table .entity:nth-child(2n + 1) td,
-body sidecar .result-table .entity:nth-child(2n + 1) .entity-attributes {
+body sidecar .result-table .entity:nth-child(2n) td,
+body sidecar .result-table .entity:nth-child(2n) .entity-attributes {
   /* table row striping in sidecar (when not full screen) */
   background: var(--color-ui-03);
 }