I think it's working

Author: Arlen22

packages/admin-vanilla/src/app.tsx

@@ -234,26 +234,20 @@ function deriveBagRecords(items: DataStore, templates: TemplateAdminRecord[], wi
 function derivePluginRecords(items: DataStore, templates: TemplateAdminRecord[], wikis: WikiAdminRecord[]): PluginAdminRecord[] {
   const pluginUsage = new Map<string, Set<string>>();
 
-  const addUsage = (pluginName: string, wikiName: string) => {
-    if (!pluginName || !wikiName) return;
-    const next = pluginUsage.get(pluginName) ?? new Set<string>();
-    next.add(wikiName);
-    pluginUsage.set(pluginName, next);
-  };
-
   for (const wiki of wikis) {
     const wikiName = wiki.slug || wiki.displayName || "";
     wiki.effectivePluginSet.forEach((pluginValue) => {
       const pluginName = pluginValue.split("@")[0]?.trim() ?? pluginValue.trim();
-      addUsage(pluginName, wikiName);
+      if (!pluginName || !wikiName) return;
+      mapGetInit(pluginUsage, pluginName, () => new Set<string>()).add(wikiName);
     });
   }
 
   return items.plugins.map((plugin) => {
     const usedByWikis = Array.from(pluginUsage.get(plugin.name ?? "") ?? []);
     return {
       ...plugin as unknown as PluginAdminRecord,
-      usedByWikis: usedByWikis.join("\n"),
+      usedByWikis,
       usageCount: String(usedByWikis.length),
     };
   });
@@ -745,77 +739,6 @@ function getListColumnLink(tabId: TabId, columnKey: string, item: AdminRecord):
   return mapper ? mapper(item) : null;
 }
 
-function countValueLines(value: readonly string[]): number {
-  return value.length;
-}
-
-function getSidebarFacts(tabId: TabId, draft: AdminRecord): Array<{ label: string; value: string; }>;
-function getSidebarFacts(tabId: TabId, draft: unknown): Array<{ label: string; value: string; }> {
-  if (tabId === "wikis") {
-    definitely<WikiAdminRecord>(draft);
-    return [
-      { label: "Template", value: formatFieldValue(draft.templateName || draft.templateRef?.name) },
-      { label: "Default bag", value: formatFieldValue(draft.defaultWritableBag) },
-      { label: "Compiled", value: formatFieldValue(draft.lastCompiledAt) },
-    ];
-  }
-
-  if (tabId === "templates") {
-    definitely<TemplateAdminRecord>(draft);
-    return [
-      { label: "Readonly bags", value: String((draft.readonlyBags.length)) },
-      { label: "Prefix rules", value: String(draft.writablePrefixBags.length || 0) },
-      { label: "Default bag", value: formatFieldValue(draft.defaultWritableBag) },
-      { label: "Plugins", value: String(draft.plugins.length) },
-      { label: "Validation", value: formatFieldValue(draft.validationStatus || draft.validationReport) },
-    ];
-  }
-
-  if (tabId === "bags") {
-    definitely<BagAdminRecord>(draft);
-    return [
-      { label: "Permission roles", value: String(draft.permissions.length || 0) },
-      { label: "Referenced by templates", value: String(draft.referencedByTemplates.length) },
-      { label: "Referenced by wikis", value: String(draft.referencedByWikis.length) },
-      { label: "Routing roles", value: String(draft.referencedByWikis.length) },
-      // { label: "Tiddlers", value: formatFieldValue(draft.tiddlerCount) },
-      // { label: "Last activity", value: formatFieldValue(draft.lastActivityAt) },
-    ];
-  }
-
-  if (tabId === "plugins") {
-    definitely<PluginAdminRecord>(draft);
-    return [
-      { label: "Version", value: formatFieldValue(draft.version) },
-      { label: "Status", value: formatFieldValue(draft.status) },
-      { label: "Used by wikis", value: String(draft.usedByWikis.length) },
-      { label: "Usage count", value: formatFieldValue(draft.usageCount) },
-      { label: "Draft of", value: formatFieldValue(draft.draftOf) },
-      { label: "Updated", value: formatFieldValue(draft.updatedAt) },
-    ];
-  }
-
-  if (tabId === "roles") {
-    definitely<RoleAdminRecord>(draft);
-    return [
-      { label: "Role name", value: formatFieldValue(draft.roleId) },
-      { label: "Description", value: formatFieldValue(draft.description) },
-    ];
-  }
-
-  if (tabId === "users") {
-    definitely<UserAdminRecord>(draft);
-    return [
-      { label: "Username", value: formatFieldValue(draft.username) },
-      { label: "Email", value: formatFieldValue(draft.email) },
-      { label: "Assigned roles", value: String(draft.userRoles.length) },
-    ];
-  }
-
-  { const t: never = tabId; return []; }
-
-}
-
 function renderSearchableInput({ id, currentValue, placeholder, options, onInput, disabled }: {
   id: string;
   currentValue: string;
@@ -890,15 +813,15 @@ function renderActivityFeedField(ctx: ReadonlyFieldContext<readonly string[]>) {
 }
 
 function renderMetadataTableField(ctx: ReadonlyFieldContext<readonly string[]>) {
-  const lines = ctx.value;
+  const lines = ctx.saved;
   return <dl class="meta-list">{lines.map((line) => {
     const [key, ...rest] = line.split(":");
     return <><dt>{key}</dt><dd>{rest.join(":").trim()}</dd></>;
   })}</dl>;
 }
 
 function renderTableField(ctx: ReadonlyFieldContext) {
-  const { field, value, itemsByTab } = ctx;
+  const { field, saved: value, itemsByTab } = ctx;
   definitely<readonly string[]>(value);
   const lines = value;
   const missingDependencyLines = getMissingDependencyLines(field, value, itemsByTab);
@@ -934,8 +857,8 @@ function renderTableField(ctx: ReadonlyFieldContext) {
 }
 
 function renderCalloutField(ctx: ReadonlyFieldContext) {
-  definitely<string>(ctx.value);
-  return <div class="field-callout"><p>{formatFieldValue(ctx.value)}</p></div>;
+  definitely<string>(ctx.saved);
+  return <div class="field-callout"><p>{formatFieldValue(ctx.saved)}</p></div>;
 }
 
 function renderPreField(ctx: ReadonlyFieldContext) {
@@ -1020,7 +943,7 @@ class SearchMultiselectFieldHandler extends FieldTypeHandler<string[]> {
 
   public override renderSidebar(ctx: ReadonlyFieldContext<readonly string[]>): JSX.Node {
     return <ul>
-      {ctx.value.map(e => <li>{e}</li>)}
+      {ctx.saved.map(e => <li>{e}</li>)}
     </ul>
   }
 
@@ -1293,7 +1216,7 @@ class AutocompleteFieldHandler extends FieldTypeHandler<Reference | null> {
   }
 
   renderSidebar(ctx: ReadonlyFieldContext<Reference | null>) {
-    return ctx.value?.name ?? "";
+    return ctx.saved?.name ?? "";
   }
 
   public override renderEditor(ctx: FieldEditorContext<Reference | null>) {
@@ -1392,15 +1315,16 @@ class ValueListFieldHandler extends FieldTypeHandler<string[]> {
 
   public override renderSidebar(ctx: ReadonlyFieldContext) {
     // TODO: string should probably be a separate class 
-    const lines = typeof ctx.value === "string"
-      ? lineListCodec.parse(ctx.value)
-      : ctx.value as readonly string[];
+    const lines = typeof ctx.saved === "string"
+      ? lineListCodec.parse(ctx.saved)
+      : ctx.saved as readonly string[];
     return <ul class="value-list">{lines.map((line) => <li>{line}</li>)}</ul>;
   }
 
   public override renderEditor(ctx: FieldEditorContext) {
     return this.renderSidebar(ctx);
   }
+
 }
 
 class ActivityFeedFieldHandler extends FieldTypeHandler<readonly string[]> {
@@ -1793,10 +1717,14 @@ class RecordModalElement extends JSXElement {
                   );
                 })}
 
-                <footer class="modal-actions">
-                  <button class="ghost-button" type="button" onclick={onClose} disabled={isSaving}>Cancel</button>
-                  <button class="primary-button" type="button" onclick={onSave} disabled={isSaving || isOpeningItem}>{isSaving ? "Saving..." : modalState.mode === "create" ? `Save ${selectedTab.label.slice(0, -1)}` : "Save changes"}</button>
-                </footer>
+                {modalState.tabId !== "plugins"
+                  ? <footer class="modal-actions">
+                    <button class="ghost-button" type="button" onclick={onClose} disabled={isSaving}>Cancel</button>
+                    <button class="primary-button" type="button" onclick={onSave} disabled={isSaving || isOpeningItem}>{isSaving ? "Saving..." : modalState.mode === "create" ? `Save ${selectedTab.label.slice(0, -1)}` : "Save changes"}</button>
+                  </footer>
+                  : <footer class="modal-actions">
+                    <button class="ghost-button" type="button" onclick={onClose} disabled={isSaving}>Close</button>
+                  </footer>}
               </div>
             </div>
           )}

packages/admin-vanilla/src/definition/tabs.ts

@@ -74,8 +74,8 @@ export interface TabDefinition {
   fieldGroups?: Partial<Record<FieldSection, FieldGroupDefinition[]>>;
 }
 
-const tabs = [
-  {
+const tabs = {
+  wikis: {
     id: "wikis",
     label: "Wikis",
     createLabel: "Create wiki",
@@ -189,7 +189,7 @@ const tabs = [
       "effectivePluginSet",
     ]
   },
-  {
+  templates: {
     id: "templates",
     label: "Templates",
     createLabel: "Create template",
@@ -312,7 +312,7 @@ const tabs = [
       "dependentWikiCount",
     ]
   },
-  {
+  bags: {
     id: "bags",
     label: "Bags",
     createLabel: "Create bag",
@@ -394,50 +394,38 @@ const tabs = [
       "referencedByWikis",
     ]
   },
-  {
+  plugins: {
     id: "plugins",
     label: "Plugins",
     createLabel: "Create plugin",
     eyebrow: "Managed Assets",
     description: "Separately versioned plugins compiled into each wiki’s resolved plugin set. Still work in progress.",
     columns: [
       { key: "name", label: "Name" },
-      { key: "version", label: "Version" },
-      { key: "status", label: "Status" },
+      { key: "description", label: "Description" },
+      { key: "pluginPath", label: "Plugin Path" },
       { key: "usageCount", label: "Usage" },
-      { key: "updatedAt", label: "Updated" },
     ],
     fields: [
-      { key: "name", label: "Name", type: "string", section: "authored", mode: "create edit" },
-      { key: "version", label: "Version", type: "version", section: "authored", mode: "create edit" },
-      { key: "status", label: "Status", type: "select", section: "authored", mode: "create edit" },
-      { key: "description", label: "Description", type: "text", section: "authored", mode: "create edit" },
-      {
-        key: "assetsMetadata",
-        label: "Assets metadata",
-        type: "metadata-table",
-        section: "runtime",
-        mode: "",
-        architecture: "List of shadow tiddlers the plugin contains.",
-      },
-      {
-        key: "usedByWikis",
-        label: "Used by wikis",
-        type: "relationship-table",
-        section: "runtime",
-        mode: "",
-        architecture: "Read-only relationship view derived from compiled recipe-plugin rows, showing exact effective usage of this version.",
-      },
+      { key: "name", label: "Name", type: "string", section: "authored", mode: "server" },
+      { key: "description", label: "Description", type: "text", section: "authored", mode: "server" },
+      { key: "pluginPath", label: "Path", type: "string", section: "authored", mode: "server" },
+      { key: "usageCount", label: "Wiki Count", type: "number", section: "runtime", mode: "" },
+      { key: "usedByWikis", label: "Active Wikis", type: "table", section: "runtime", mode: "" },
     ],
     fieldGroups: {
-      authored: [
-        { title: "Plugin basics", keys: ["name", "description"], width: fullWidth, layout: stackLayout },
-        { title: "Release details", keys: ["version", "status"], width: halfWidth },
+      runtime: [
+        { title: "Used in", description: "List of wikis this plugin is used in. Only includes templates that are in use.", keys: ["usedByWikis"], width: fullWidth, layout: "grid" },
       ],
     },
-    sidebarDisplay: [],
+    sidebarDisplay: [
+      "name", 
+      "description",
+      "usageCount",
+      "pluginPath",
+    ],
   },
-  {
+  roles: {
     id: "roles",
     label: "Roles",
     createLabel: "Create role",
@@ -458,7 +446,7 @@ const tabs = [
     },
     sidebarDisplay: ["roleId", "description"],
   },
-  {
+  users: {
     id: "users",
     label: "Users",
     createLabel: "Create user",
@@ -488,38 +476,24 @@ const tabs = [
       "userRoles",
     ]
   },
-] as const satisfies TabDefinition[];
-
-// tabs.forEach(e => {
-//   const fields = new Set(e.fields.map(e => e.key as string));
-//   if (fields.size !== e.fields.length)
-//     throw new Error("There are fields with duplicate keys in tab " + e.label);
-//   const colsMissing = e.columns.filter(f => !fields.has(f.key as string));
-//   if (colsMissing.length) {
-//     console.log(colsMissing);
-//     throw new Error(`There are columns that don't have a field in tab ${e.label}: ${colsMissing.map(e => e.key)}`);
-//   }
-//   if (Object.keys(e.fieldGroups).some(k => e.fieldGroups[k].some(f => {
-//     f.keys.some(g => !fields.has(g as string))
-//   }))) throw new Error("There are field groups which specify keys that don't exist in " + e.label);
-// })
-
+} as const satisfies Record<string, TabDefinition>;
 
 export function getTab(tabId: TabId): TabDefinition {
-  return tabs.find((tab) => tab.id === tabId) ?? tabs[0];
+  return tabs[tabId];
 }
 export function getAllTabs(): TabDefinition[] {
-  return tabs;
+  return Object.values(tabs);
 }
 
 export type TabDef = typeof tabs;
 
 
 
 type StoredTabKeys<T extends TabDefinition> = {
-  [K in T["id"]]: MapFieldDefinitions<T["fields"]>[number] | "id"
-}[T["id"]];
+  [K in keyof TabDef]: MapFieldDefinitions<T["fields"]>[number] | "id"
+}[keyof TabDef];
 
+type t1 = TabDef[TabId]["fields"][number]["key"]
 
 
 type StoredTabRecord<D extends TabDefinition, T> = Pick<T, StoredTabKeys<D> & keyof T>;
@@ -548,12 +522,12 @@ export interface AdminRecordStore {
 }
 
 export interface DataStore {
-  wikis: StoredTabRecord<TabDef[0], WikiAdminRecord>[];
-  templates: StoredTabRecord<TabDef[1], TemplateAdminRecord>[];
-  bags: StoredTabRecord<TabDef[2], BagAdminRecord>[];
-  plugins: StoredTabRecord<TabDef[3], PluginAdminRecord>[];
-  roles: StoredTabRecord<TabDef[4], RoleAdminRecord>[];
-  users: StoredTabRecord<TabDef[5], UserAdminRecord>[];
+  wikis: StoredTabRecord<TabDef["wikis"], WikiAdminRecord>[];
+  templates: StoredTabRecord<TabDef["templates"], TemplateAdminRecord>[];
+  bags: StoredTabRecord<TabDef["bags"], BagAdminRecord>[];
+  plugins: StoredTabRecord<TabDef["plugins"], PluginAdminRecord>[];
+  roles: StoredTabRecord<TabDef["roles"], RoleAdminRecord>[];
+  users: StoredTabRecord<TabDef["users"], UserAdminRecord>[];
   availableBagNames: Set<string>;
   availablePluginNames: Set<string>;
 };
@@ -630,16 +604,11 @@ export interface BagAdminRecord {
 
 export interface PluginAdminRecord {
   id: string;
-  version: string;
-  description: string;
   name: string;
-  status: string;
-  publishFromDraft: string;
-  assetsMetadata: string;
-  usedByWikis: string;
+  description: string;
+  pluginPath: string;
   usageCount: string;
-  draftOf: string;
-  updatedAt: string;
+  usedByWikis: string[];
 }
 
 export interface RoleAdminRecord {