gramene-search 2.11.0 → 2.11.2

package/dist/index.js

@@ -2426,10 +2426,12 @@ const $0f839422d0d8c772$var$grameneFieldCatalog = (0, $gXNCa$reduxbundler.create
     }
 });
 // Auto-fetch the field catalog only when a view that needs it (exprViz fields
-// modal, exporter field tree) is enabled. Other views never read it.
+// modal, exporter field tree, attribute-table column picker) is enabled. Other
+// views never read it.
 const $0f839422d0d8c772$var$FIELD_CATALOG_VIEWS = [
     'exprViz',
-    'export'
+    'export',
+    'attrTable'
 ];
 $0f839422d0d8c772$var$grameneFieldCatalog.reactGrameneFieldCatalog = (0, $gXNCa$reduxbundler.createSelector)('selectGrameneFieldCatalogShouldUpdate', 'selectGrameneViewsOn', (shouldUpdate, viewsOn)=>{
     if (!shouldUpdate) return;
@@ -4823,24 +4825,54 @@ const $4b8473139e48e77e$export$705aff68da3ddba0 = [
 
 
 // Backing store for the "Attribute table" view: the genes in the current search
-// result set, fetched in pages and rendered as a gene × attribute table (basic
-// identity columns + the expression-attribute heatmap + any extra attribute
-// columns the user picks from the field catalog).
+// result set, fetched in pages and rendered as a gene × attribute table.
 //
 // Paging mirrors exprViz's doFetchExprVizData: a recursive fetchPage(offset)
 // with a request-id guard so a superseded fetch can never write stale rows.
+//
+// The offered columns are deliberately limited to two field-catalog groups —
+// Core identifiers and Expression attributes — and *all* of them are fetched up
+// front. That keeps the column picker a pure visibility control: toggling a
+// column is instant and never triggers a refetch.
 const $12feb7ca48271e17$var$PAGE_SIZE = 1000;
 const $12feb7ca48271e17$var$MAX_GENES = 5000;
-// Identity/basic columns that are always fetched.
-const $12feb7ca48271e17$var$BASE_FIELDS = [
+// The catalog groups whose fields the column picker offers.
+const $12feb7ca48271e17$export$53e90de8d659db95 = [
+    'core',
+    'exprattrs'
+];
+// The 'core' group's fields (bundles/../fieldCatalog.overlay.json).
+const $12feb7ca48271e17$export$9d77d82cc773e55e = [
     'id',
     'name',
+    'alt_id',
+    'synonyms',
+    'description',
+    'summary',
+    'biotype',
     'system_name',
     'taxon_id',
+    'db_type'
+];
+// Always fetched, so visibility toggles never need the network. taxon_id is
+// needed by the genome filter even when its column is hidden.
+const $12feb7ca48271e17$var$FETCH_FIELDS = [
+    ...new Set([
+        ...$12feb7ca48271e17$export$9d77d82cc773e55e,
+        ...(0, $4b8473139e48e77e$export$705aff68da3ddba0)
+    ])
+];
+const $12feb7ca48271e17$export$e4bc2ac09afbc604 = [
+    'id',
+    'name',
+    'system_name',
     'biotype',
-    'region',
-    'start',
-    'end'
+    'expr_class__attr_ss',
+    'expr_organ_level__attr_ss',
+    'expr_tau__attr_f',
+    'expr_max_tpm__attr_f',
+    'expr_activated_by__attr_ss',
+    'expr_repressed_by__attr_ss'
 ];
 let $12feb7ca48271e17$var$fetchPendingId = 0;
 // Only send fq=taxon_id:(...) when the user has actually subset the genomes —
@@ -4857,8 +4889,10 @@ function $12feb7ca48271e17$var$genomeSubset(g, m) {
         key: subset ? sorted.join(',') : ''
     };
 }
-function $12feb7ca48271e17$var$computeSignature(q, g, m, selectedFields) {
-    return `${q}|${$12feb7ca48271e17$var$genomeSubset(g, m).key}|${(selectedFields || []).slice().sort().join(',')}`;
+// Visible columns are deliberately NOT part of the signature — they don't
+// affect what we fetch.
+function $12feb7ca48271e17$var$computeSignature(q, g, m) {
+    return `${q}|${$12feb7ca48271e17$var$genomeSubset(g, m).key}`;
 }
 const $12feb7ca48271e17$var$attrTable = {
     name: 'attrTable',
@@ -4871,7 +4905,7 @@ const $12feb7ca48271e17$var$attrTable = {
             signature: null,
             error: null,
             requestId: 0,
-            selectedFields: [] // extra attribute columns chosen from the field catalog
+            visibleFields: $12feb7ca48271e17$export$e4bc2ac09afbc604.slice()
         };
         return (state = initialState, { type: type, payload: payload })=>{
             switch(type){
@@ -4908,34 +4942,39 @@ const $12feb7ca48271e17$var$attrTable = {
                     };
                 case 'ATTRTABLE_FIELD_TOGGLED':
                     {
-                        const set = new Set(state.selectedFields);
+                        const set = new Set(state.visibleFields);
                         if (set.has(payload)) set.delete(payload);
                         else set.add(payload);
                         return {
                             ...state,
-                            selectedFields: [
+                            visibleFields: [
                                 ...set
                             ]
                         };
                     }
                 case 'ATTRTABLE_FIELDS_BULK_SET':
                     {
-                        const set = new Set(state.selectedFields);
+                        const set = new Set(state.visibleFields);
                         (payload.names || []).forEach((n)=>{
                             if (payload.selected) set.add(n);
                             else set.delete(n);
                         });
                         return {
                             ...state,
-                            selectedFields: [
+                            visibleFields: [
                                 ...set
                             ]
                         };
                     }
+                case 'ATTRTABLE_FIELDS_RESET':
+                    return {
+                        ...state,
+                        visibleFields: $12feb7ca48271e17$export$e4bc2ac09afbc604.slice()
+                    };
                 case 'GRAMENE_SEARCH_CLEARED':
                     return {
                         ...initialState,
-                        selectedFields: state.selectedFields
+                        visibleFields: state.visibleFields
                     };
                 default:
                     return state;
@@ -4943,10 +4982,9 @@ const $12feb7ca48271e17$var$attrTable = {
         };
     },
     doFetchAttrTable: ()=>({ dispatch: dispatch, store: store })=>{
-            const { selectedFields: selectedFields } = store.selectAttrTable();
             const q = store.selectGrameneFiltersQueryString();
             const { fq: fq } = $12feb7ca48271e17$var$genomeSubset(store.selectGrameneGenomes(), store.selectGrameneMaps());
-            const signature = $12feb7ca48271e17$var$computeSignature(q, store.selectGrameneGenomes(), store.selectGrameneMaps(), selectedFields);
+            const signature = $12feb7ca48271e17$var$computeSignature(q, store.selectGrameneGenomes(), store.selectGrameneMaps());
             const requestId = ++$12feb7ca48271e17$var$fetchPendingId;
             dispatch({
                 type: 'ATTRTABLE_FETCH_STARTED',
@@ -4957,13 +4995,7 @@ const $12feb7ca48271e17$var$attrTable = {
             });
             const api = store.selectGrameneAPI();
             // Explicit fl — never fl=*, which would drag in every per-sample __expr column.
-            const fl = [
-                ...new Set([
-                    ...$12feb7ca48271e17$var$BASE_FIELDS,
-                    ...(0, $4b8473139e48e77e$export$705aff68da3ddba0),
-                    ...selectedFields
-                ])
-            ].join(',');
+            const fl = $12feb7ca48271e17$var$FETCH_FIELDS.join(',');
             const fetchPage = (offset)=>{
                 if (requestId !== $12feb7ca48271e17$var$fetchPendingId) return; // superseded
                 const rows = Math.min($12feb7ca48271e17$var$PAGE_SIZE, $12feb7ca48271e17$var$MAX_GENES - offset);
@@ -5006,16 +5038,17 @@ const $12feb7ca48271e17$var$attrTable = {
                     selected: selected
                 }
             }),
+    doResetAttrTableFields: ()=>({ dispatch: dispatch })=>dispatch({
+                type: 'ATTRTABLE_FIELDS_RESET'
+            }),
     selectAttrTable: (state)=>state.attrTable,
-    selectAttrTableSelectedFields: (state)=>state.attrTable.selectedFields,
-    // Fetch only while the view is actually on, and only when the query context or
-    // the chosen columns have changed. A toggle made mid-load is picked up when the
-    // in-flight fetch settles (the signature will no longer match).
+    selectAttrTableVisibleFields: (state)=>state.attrTable.visibleFields,
+    // Fetch only while the view is on, and only when the query context changes.
     reactAttrTableFetch: (0, $gXNCa$reduxbundler.createSelector)('selectAttrTable', 'selectGrameneFiltersStatus', 'selectGrameneViewsOn', 'selectGrameneFiltersQueryString', 'selectGrameneGenomes', 'selectGrameneMaps', (at, filtersStatus, viewsOn, q, g, m)=>{
         if (!at || filtersStatus === 'init') return;
         if (!viewsOn || !viewsOn.has('attrTable')) return;
         if (at.status === 'loading') return;
-        const sig = $12feb7ca48271e17$var$computeSignature(q, g, m, at.selectedFields);
+        const sig = $12feb7ca48271e17$var$computeSignature(q, g, m);
         if (at.signature === sig && (at.status === 'ready' || at.status === 'error')) return;
         return {
             actionCreator: 'doFetchAttrTable'
@@ -8125,7 +8158,11 @@ const $cd8bc494277e92a4$export$44e8c3b1eee47e9e = {
     // Stay hidden until its async data lands; tbrowse's auto-enable effect flips
     // it on once isAvailable() turns true (same lifecycle as neighborhood/genome).
     isAvailable: (data)=>Boolean(data.hostData && data.hostData.exprAttrs && data.hostData.exprAttrs.organs && data.hostData.exprAttrs.organs.length),
-    defaultVisible: false
+    defaultVisible: false,
+    // Join tbrowse's built-in 'detail' group (MSA / Neighborhood / Gene
+    // structure): only one of these wide per-leaf tracks shows at a time
+    // unless the user decouples the group with the `multi` toggle.
+    exclusiveGroup: 'detail'
 };
 
 
@@ -16910,42 +16947,68 @@ var $1fd2507769d5bd00$export$2e2bcd8739ae039 = (0, $gXNCa$reduxbundlerreact.conn
 
 
 const { MAX_GENES: $8f8e530286a37ce9$var$MAX_GENES } = (0, $12feb7ca48271e17$export$d00a9fd01497b827);
+// expr_organ_level expands into one column per organ (the heatmap block); every
+// other offered field maps to exactly one column.
+const $8f8e530286a37ce9$var$ORGAN_FIELD = 'expr_organ_level__attr_ss';
 const $8f8e530286a37ce9$var$DEFAULT_COL_DEF = {
     resizable: true,
     sortable: true,
     filter: false,
     suppressHeaderMenuButton: true
 };
-// ↑activated / ↓repressed condition chips, matching the tbrowse Expression zone.
-const $8f8e530286a37ce9$var$StressCell = ({ value: value })=>{
-    const { up: up = [], down: down = [] } = value || {};
-    if (!up.length && !down.length) return null;
-    const chip = (c, dir, key)=>/*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("span", {
-            style: {
-                fontSize: 10,
-                lineHeight: '16px',
-                padding: '0 4px',
-                borderRadius: 2,
-                marginRight: 3,
-                whiteSpace: 'nowrap',
-                background: (0, $4b8473139e48e77e$export$c6dbe9be8c8b382e)[dir].bg,
-                color: (0, $4b8473139e48e77e$export$c6dbe9be8c8b382e)[dir].fg
-            },
-            children: (dir === 'up' ? "\u2191" : "\u2193") + c
-        }, key);
-    return /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsxs)("span", {
-        children: [
-            up.map((c, i)=>chip(c, 'up', `u${i}`)),
-            down.map((c, i)=>chip(c, 'down', `d${i}`))
-        ]
-    });
+const $8f8e530286a37ce9$var$WIDTHS = {
+    id: 190,
+    name: 130,
+    system_name: 150,
+    biotype: 120,
+    taxon_id: 100,
+    db_type: 100,
+    alt_id: 180,
+    synonyms: 160,
+    description: 260,
+    summary: 260,
+    expr_class__attr_ss: 150,
+    expr_tau__attr_f: 80,
+    expr_max_tpm__attr_f: 100,
+    expr_n_organs_detected__attr_i: 90,
+    expr_activated_by__attr_ss: 190,
+    expr_repressed_by__attr_ss: 190,
+    expr_specific_to__attr_ss: 150,
+    expr_enhanced_in__attr_ss: 150,
+    expr_high_in__attr_ss: 150
 };
+const $8f8e530286a37ce9$var$joinValues = (p)=>Array.isArray(p.value) ? p.value.map((v)=>String(v).replace(/_/g, ' ')).join(', ') : p.value ?? '';
+// ↑activated / ↓repressed condition chips.
+const $8f8e530286a37ce9$var$chipRenderer = (dir)=>({ value: value })=>{
+        const list = Array.isArray(value) ? value : value ? [
+            value
+        ] : [];
+        if (!list.length) return null;
+        return /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("span", {
+            children: list.map((c, i)=>/*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("span", {
+                    style: {
+                        fontSize: 10,
+                        lineHeight: '16px',
+                        padding: '0 4px',
+                        borderRadius: 2,
+                        marginRight: 3,
+                        whiteSpace: 'nowrap',
+                        background: (0, $4b8473139e48e77e$export$c6dbe9be8c8b382e)[dir].bg,
+                        color: (0, $4b8473139e48e77e$export$c6dbe9be8c8b382e)[dir].fg
+                    },
+                    children: (dir === 'up' ? "\u2191" : "\u2193") + c
+                }, i))
+        });
+    };
 const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
-    const { attrTable: attrTable, fieldCatalog: fieldCatalog, fieldCatalogByName: fieldCatalogByName, doToggleAttrTableField: doToggleAttrTableField, doBulkSetAttrTableFields: doBulkSetAttrTableFields } = props;
+    const { attrTable: attrTable, fieldCatalog: fieldCatalog, fieldCatalogByName: fieldCatalogByName, doToggleAttrTableField: doToggleAttrTableField, doBulkSetAttrTableFields: doBulkSetAttrTableFields, doResetAttrTableFields: doResetAttrTableFields } = props;
     const [showColumns, setShowColumns] = (0, $gXNCa$react.useState)(false);
     const [fieldQuery, setFieldQuery] = (0, $gXNCa$react.useState)('');
-    const { docs: docs, total: total, truncated: truncated, status: status, error: error, selectedFields: selectedFields } = attrTable;
-    // Row objects + the organ union and TPM range needed to build the heatmap.
+    const { docs: docs, total: total, truncated: truncated, status: status, error: error, visibleFields: visibleFields } = attrTable;
+    const visibleSet = (0, $gXNCa$react.useMemo)(()=>new Set(visibleFields), [
+        visibleFields
+    ]);
+    // Rows + the organ union and TPM range the heatmap needs.
     const { rows: rows, organs: organs, tpmRange: tpmRange } = (0, $gXNCa$react.useMemo)(()=>{
         const organSet = new Set();
         let tpmMin = Infinity;
@@ -16957,27 +17020,12 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
                 if (a.maxTpm < tpmMin) tpmMin = a.maxTpm;
                 if (a.maxTpm > tpmMax) tpmMax = a.maxTpm;
             }
-            const row = {
-                id: d.id,
-                name: d.name,
-                system_name: d.system_name,
-                biotype: d.biotype,
-                location: d.region ? `${d.region}:${d.start}-${d.end}` : '',
-                _cls: (0, $4b8473139e48e77e$export$1f04174626f2ac64)(a.cls) || '',
-                _tau: a.tau,
-                _maxTpm: a.maxTpm,
-                _stress: {
-                    up: a.activatedBy,
-                    down: a.repressedBy
-                },
+            return {
+                ...d,
                 _organ: a.organLevels,
                 _specific: a.specificTo,
                 _enhanced: a.enhancedIn
             };
-            (selectedFields || []).forEach((f)=>{
-                row[f] = d[f];
-            });
-            return row;
         });
         return {
             rows: out,
@@ -16988,130 +17036,126 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
             }
         };
     }, [
-        docs,
-        selectedFields
+        docs
+    ]);
+    // Only the Core identifiers + Expression attributes groups are offered, in
+    // catalog order. Falls back to the built-in lists until the catalog loads.
+    const orderedFields = (0, $gXNCa$react.useMemo)(()=>{
+        const groups = fieldCatalog && fieldCatalog.groups || [];
+        const out = [];
+        (0, $12feb7ca48271e17$export$53e90de8d659db95).forEach((gid)=>{
+            const g = groups.find((x)=>x.id === gid);
+            if (g && g.fields) out.push(...g.fields);
+        });
+        return out.length ? out : [
+            ...(0, $12feb7ca48271e17$export$9d77d82cc773e55e),
+            ...(0, $4b8473139e48e77e$export$705aff68da3ddba0)
+        ];
+    }, [
+        fieldCatalog
+    ]);
+    const pickerCatalog = (0, $gXNCa$react.useMemo)(()=>{
+        if (!fieldCatalog || !fieldCatalog.groups) return null;
+        return {
+            ...fieldCatalog,
+            groups: fieldCatalog.groups.filter((g)=>(0, $12feb7ca48271e17$export$53e90de8d659db95).includes(g.id))
+        };
+    }, [
+        fieldCatalog
     ]);
     const columnDefs = (0, $gXNCa$react.useMemo)(()=>{
-        const cols = [
-            {
-                colId: 'id',
-                field: 'id',
-                headerName: 'Gene ID',
-                pinned: 'left',
-                width: 190
-            },
-            {
-                colId: 'name',
-                field: 'name',
-                headerName: 'Name',
-                pinned: 'left',
-                width: 130
-            },
-            {
-                colId: 'system_name',
-                field: 'system_name',
-                headerName: 'Species',
-                width: 150
-            },
-            {
-                colId: 'biotype',
-                field: 'biotype',
-                headerName: 'Biotype',
-                width: 120
-            },
-            {
-                colId: 'location',
-                field: 'location',
-                headerName: 'Location',
-                width: 150
-            },
-            {
-                colId: '_cls',
-                field: '_cls',
-                headerName: 'Expression class',
-                width: 150
-            },
-            {
-                colId: '_tau',
-                field: '_tau',
-                headerName: 'Tau',
-                width: 80,
-                type: 'numericColumn',
-                valueFormatter: (p)=>Number.isFinite(p.value) ? p.value.toFixed(3) : ''
-            },
-            {
-                colId: '_maxTpm',
-                field: '_maxTpm',
-                headerName: 'Max TPM',
-                width: 100,
-                type: 'numericColumn',
-                valueFormatter: (p)=>(0, $4b8473139e48e77e$export$8eaa32ef86afdd9c)(p.value),
-                cellStyle: (p)=>({
-                        background: (0, $4b8473139e48e77e$export$4b443417c5259620)(p.value, tpmRange)
-                    })
-            },
-            {
-                colId: '_stress',
-                field: '_stress',
-                headerName: 'Stress',
-                width: 220,
-                sortable: false,
-                // The renderer draws the chips; the formatter just keeps ag-grid from
-                // warning about an object-valued cell with no formatter.
-                valueFormatter: ()=>'',
-                cellRenderer: $8f8e530286a37ce9$var$StressCell
+        const labelOf = (f)=>fieldCatalogByName && fieldCatalogByName[f] && fieldCatalogByName[f].label || f;
+        const cols = [];
+        orderedFields.forEach((f)=>{
+            if (!visibleSet.has(f)) return;
+            const headerName = labelOf(f);
+            const width = $8f8e530286a37ce9$var$WIDTHS[f] || 150;
+            if (f === $8f8e530286a37ce9$var$ORGAN_FIELD) {
+                organs.forEach((o)=>cols.push({
+                        // No ':' in colId — ag-grid uses colId in internal CSS selectors, where
+                        // a colon is a metacharacter and silently breaks the column.
+                        colId: `organ_${o}`,
+                        headerName: (0, $4b8473139e48e77e$export$f8541c2790c3baeb)(o),
+                        headerTooltip: (0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o),
+                        width: 46,
+                        valueGetter: (p)=>p.data && p.data._organ[o] || '',
+                        valueFormatter: ()=>'',
+                        tooltipValueGetter: (p)=>{
+                            const lvl = p.data && p.data._organ[o];
+                            if (!lvl) return `${(0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o)}: not assayed`;
+                            const sp = p.data._specific.has(o) ? " \xb7 specific" : p.data._enhanced.has(o) ? " \xb7 enhanced" : '';
+                            return `${(0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o)}: ${(0, $4b8473139e48e77e$export$433053e2c141d410)[lvl] || lvl}${sp}`;
+                        },
+                        comparator: (a, b)=>((0, $4b8473139e48e77e$export$a61929d6d484c6d4)[a] ?? -1) - ((0, $4b8473139e48e77e$export$a61929d6d484c6d4)[b] ?? -1),
+                        cellStyle: (p)=>{
+                            const style = {
+                                background: p.value ? (0, $4b8473139e48e77e$export$b352e11f7a2ac9c5)[p.value] || 'transparent' : 'transparent'
+                            };
+                            if (p.data && p.data._specific.has(o)) style.boxShadow = `inset 0 0 0 2px ${0, $4b8473139e48e77e$export$39a35029fe99c21}`;
+                            else if (p.data && p.data._enhanced.has(o)) style.boxShadow = `inset 0 0 0 1px ${0, $4b8473139e48e77e$export$39a35029fe99c21}`;
+                            return style;
+                        }
+                    }));
+                return;
+            }
+            if (f === 'expr_max_tpm__attr_f') {
+                cols.push({
+                    colId: f,
+                    field: f,
+                    headerName: headerName,
+                    width: width,
+                    type: 'numericColumn',
+                    valueFormatter: (p)=>(0, $4b8473139e48e77e$export$8eaa32ef86afdd9c)(p.value),
+                    cellStyle: (p)=>({
+                            background: (0, $4b8473139e48e77e$export$4b443417c5259620)(p.value, tpmRange)
+                        })
+                });
+                return;
+            }
+            if (f === 'expr_tau__attr_f') {
+                cols.push({
+                    colId: f,
+                    field: f,
+                    headerName: headerName,
+                    width: width,
+                    type: 'numericColumn',
+                    valueFormatter: (p)=>Number.isFinite(p.value) ? p.value.toFixed(3) : ''
+                });
+                return;
+            }
+            if (f === 'expr_activated_by__attr_ss' || f === 'expr_repressed_by__attr_ss') {
+                cols.push({
+                    colId: f,
+                    field: f,
+                    headerName: headerName,
+                    width: width,
+                    sortable: false,
+                    valueFormatter: ()=>'',
+                    cellRenderer: $8f8e530286a37ce9$var$chipRenderer(f === 'expr_activated_by__attr_ss' ? 'up' : 'down')
+                });
+                return;
             }
-        ];
-        // Per-organ heatmap: one narrow, colour-only column per organ.
-        organs.forEach((o)=>{
-            cols.push({
-                // No ':' in colId — ag-grid uses colId in internal CSS selectors, where a
-                // colon is a metacharacter and silently breaks rendering of the column.
-                colId: `organ_${o}`,
-                headerName: (0, $4b8473139e48e77e$export$f8541c2790c3baeb)(o),
-                headerTooltip: (0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o),
-                width: 46,
-                valueGetter: (p)=>p.data && p.data._organ[o] || '',
-                valueFormatter: ()=>'',
-                tooltipValueGetter: (p)=>{
-                    const lvl = p.data && p.data._organ[o];
-                    if (!lvl) return `${(0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o)}: not assayed`;
-                    const sp = p.data._specific.has(o) ? " \xb7 specific" : p.data._enhanced.has(o) ? " \xb7 enhanced" : '';
-                    return `${(0, $4b8473139e48e77e$export$50c1f966fd3af83e)(o)}: ${(0, $4b8473139e48e77e$export$433053e2c141d410)[lvl] || lvl}${sp}`;
-                },
-                comparator: (a, b)=>((0, $4b8473139e48e77e$export$a61929d6d484c6d4)[a] ?? -1) - ((0, $4b8473139e48e77e$export$a61929d6d484c6d4)[b] ?? -1),
-                cellStyle: (p)=>{
-                    const lvl = p.value;
-                    const style = {
-                        background: lvl ? (0, $4b8473139e48e77e$export$b352e11f7a2ac9c5)[lvl] || 'transparent' : 'transparent'
-                    };
-                    if (p.data && p.data._specific.has(o)) style.boxShadow = `inset 0 0 0 2px ${0, $4b8473139e48e77e$export$39a35029fe99c21}`;
-                    else if (p.data && p.data._enhanced.has(o)) style.boxShadow = `inset 0 0 0 1px ${0, $4b8473139e48e77e$export$39a35029fe99c21}`;
-                    return style;
-                }
-            });
-        });
-        // Extra attribute columns chosen from the field catalog.
-        (selectedFields || []).forEach((f)=>{
-            const meta = fieldCatalogByName && fieldCatalogByName[f] || {};
             cols.push({
                 colId: f,
                 field: f,
-                headerName: meta.label || f,
+                headerName: headerName,
                 headerTooltip: f,
-                width: 170,
-                valueFormatter: (p)=>Array.isArray(p.value) ? p.value.join(', ') : p.value ?? ''
+                width: width,
+                pinned: f === 'id' || f === 'name' ? 'left' : undefined,
+                valueFormatter: $8f8e530286a37ce9$var$joinValues
             });
         });
         return cols;
     }, [
+        orderedFields,
+        visibleSet,
         organs,
-        selectedFields,
-        fieldCatalogByName,
-        tpmRange
+        tpmRange,
+        fieldCatalogByName
     ]);
     const shown = rows.length;
     const loading = status === 'loading';
+    const organShown = visibleSet.has($8f8e530286a37ce9$var$ORGAN_FIELD);
     return /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsxs)("div", {
         className: "attrtable-view",
         children: [
@@ -17142,7 +17186,7 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
                             loading && " \u2014 loading\u2026"
                         ]
                     }),
-                    /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("div", {
+                    organShown && /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("div", {
                         className: "attrtable-legend",
                         title: "expression level",
                         children: (0, $4b8473139e48e77e$export$4bb936dc8856d37a).map((lv)=>/*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("span", {
@@ -17157,8 +17201,9 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
                         variant: showColumns ? 'primary' : 'outline-secondary',
                         onClick: ()=>setShowColumns((v)=>!v),
                         children: [
-                            "Columns",
-                            selectedFields.length ? ` (${selectedFields.length})` : ''
+                            "Columns (",
+                            columnDefs.length,
+                            ")"
                         ]
                     })
                 ]
@@ -17185,19 +17230,33 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
             showColumns && /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsxs)("div", {
                 className: "attrtable-columns-panel",
                 children: [
-                    /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("input", {
-                        type: "search",
-                        className: "form-control form-control-sm attrtable-field-search",
-                        placeholder: "Search fields\u2026",
-                        value: fieldQuery,
-                        onChange: (e)=>setFieldQuery(e.target.value)
+                    /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsxs)("div", {
+                        className: "attrtable-columns-head",
+                        children: [
+                            /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("input", {
+                                type: "search",
+                                className: "form-control form-control-sm attrtable-field-search",
+                                placeholder: "Search fields\u2026",
+                                value: fieldQuery,
+                                onChange: (e)=>setFieldQuery(e.target.value)
+                            }),
+                            /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)((0, $gXNCa$reactbootstrap.Button), {
+                                size: "sm",
+                                variant: "link",
+                                onClick: doResetAttrTableFields,
+                                children: "Reset"
+                            })
+                        ]
                     }),
-                    /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)((0, $08e62a9eec4f328f$export$8af8343a8541cf1f), {
-                        catalog: fieldCatalog,
-                        selectedFields: selectedFields,
+                    pickerCatalog ? /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)((0, $08e62a9eec4f328f$export$8af8343a8541cf1f), {
+                        catalog: pickerCatalog,
+                        selectedFields: visibleFields,
                         onToggle: doToggleAttrTableField,
                         onBulkSet: doBulkSetAttrTableFields,
                         query: fieldQuery
+                    }) : /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("div", {
+                        className: "exporter-panel-empty",
+                        children: "Loading field catalog\u2026"
                     })
                 ]
             }),
@@ -17206,6 +17265,11 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
                 children: /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("em", {
                     children: "No genes to show."
                 })
+            }) : columnDefs.length === 0 ? /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("div", {
+                className: "attrtable-empty",
+                children: /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("em", {
+                    children: "No columns selected \u2014 pick some under \u201CColumns\u201D."
+                })
             }) : /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)("div", {
                 className: "ag-theme-quartz attrtable-aggrid",
                 children: /*#__PURE__*/ (0, $gXNCa$reactjsxruntime.jsx)((0, $gXNCa$aggridreact.AgGridReact), {
@@ -17223,7 +17287,7 @@ const $8f8e530286a37ce9$var$AttrTableViewCmp = (props)=>{
         ]
     });
 };
-var $8f8e530286a37ce9$export$2e2bcd8739ae039 = (0, $gXNCa$reduxbundlerreact.connect)('selectAttrTable', 'selectFieldCatalog', 'selectFieldCatalogByName', 'doToggleAttrTableField', 'doBulkSetAttrTableFields', $8f8e530286a37ce9$var$AttrTableViewCmp);
+var $8f8e530286a37ce9$export$2e2bcd8739ae039 = (0, $gXNCa$reduxbundlerreact.connect)('selectAttrTable', 'selectFieldCatalog', 'selectFieldCatalogByName', 'doToggleAttrTableField', 'doBulkSetAttrTableFields', 'doResetAttrTableFields', $8f8e530286a37ce9$var$AttrTableViewCmp);