@aglyn/plugins-marketplace 1.0.0-beta.198 → 1.0.0-beta.200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aglyn/plugins-marketplace",
-  "version": "1.0.0-beta.198",
+  "version": "1.0.0-beta.200",
   "license": "Apache-2.0",
   "homepage": "https://aglyn.com",
   "repository": {
@@ -25,19 +25,19 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@aglyn/aglyn": "1.0.0-beta.198",
-    "@aglyn/aglyn-markdown-editor": "1.0.0-beta.198",
-    "@aglyn/shared-data-enums": "1.0.0-beta.198",
-    "@aglyn/shared-data-mdi": "1.0.0-beta.198",
-    "@aglyn/shared-ui-jsx": "1.0.0-beta.198",
-    "@aglyn/shared-ui-next": "1.0.0-beta.198",
-    "@aglyn/shared-ui-snackstack": "1.0.0-beta.198",
-    "@aglyn/shared-util-email": "1.0.0-beta.198",
-    "@aglyn/shared-util-http": "1.0.0-beta.198",
-    "@aglyn/shared-util-timestamp": "1.0.0-beta.198",
-    "@aglyn/tenant-data-admin": "1.0.0-beta.198",
-    "@aglyn/tenant-feature-instance": "1.0.0-beta.198",
-    "@aglyn/tenant-runtime": "1.0.0-beta.198",
+    "@aglyn/aglyn": "1.0.0-beta.200",
+    "@aglyn/aglyn-markdown-editor": "1.0.0-beta.200",
+    "@aglyn/shared-data-enums": "1.0.0-beta.200",
+    "@aglyn/shared-data-mdi": "1.0.0-beta.200",
+    "@aglyn/shared-ui-jsx": "1.0.0-beta.200",
+    "@aglyn/shared-ui-next": "1.0.0-beta.200",
+    "@aglyn/shared-ui-snackstack": "1.0.0-beta.200",
+    "@aglyn/shared-util-email": "1.0.0-beta.200",
+    "@aglyn/shared-util-http": "1.0.0-beta.200",
+    "@aglyn/shared-util-timestamp": "1.0.0-beta.200",
+    "@aglyn/tenant-data-admin": "1.0.0-beta.200",
+    "@aglyn/tenant-feature-instance": "1.0.0-beta.200",
+    "@aglyn/tenant-runtime": "1.0.0-beta.200",
     "@swc/helpers": "0.5.23"
   },
   "peerDependencies": {

package/src/lib/components/marketplace-browse.component.js

@@ -19,19 +19,22 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { mdiCheckDecagram } from "@aglyn/shared-data-mdi";
 import { AppLink, CardDisplay, MdiIcon } from "@aglyn/shared-ui-jsx";
 import { ListPagination } from "@aglyn/shared-ui-jsx/components/list-pagination.component";
-import { TABLE_PAGE_SIZE_DEFAULT } from "@aglyn/shared-ui-jsx/const/table-pagination";
+import ListQueryNotices, { listQueryRefusals } from "@aglyn/shared-ui-jsx/components/list-query-notices.component";
+import { useListGridFilter } from "@aglyn/shared-ui-jsx/hooks/use-list-grid-filter";
 import { Alert, Chip, Tooltip, Grid, MenuItem, Rating, Stack, TextField, Typography } from "@mui/material";
 import { collection, doc, documentId, getDoc, limit, orderBy, query, where } from "firebase/firestore";
+import { useListQuery } from "@aglyn/tenant-feature-instance/hooks/use-list-query";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { buildRoute, PLATFORM_BRAND_NAME, pluginDocsHelp, Route } from "@aglyn/aglyn";
-import { useConsoleHostRoute, useFirestore, useFirestoreCollection, useFirestoreDoc, useHostOrgId, useUser, useScopeTokens } from "@aglyn/tenant-feature-instance";
+import { useConsoleHostRoute, useFirestore, useFirestoreCollection, useFirestoreDoc, useHostOrgId, useScopeTokens } from "@aglyn/tenant-feature-instance";
 /*
  * The MODULE, not the barrel, for the two PURE helpers — the specs that render
  * this grid mock `@aglyn/tenant-feature-instance` wholesale to stage their
  * Firestore hooks, and a query builder imported through that barrel disappears
  * under the mock. Neither of these is a hook.
  */ import { ceilingedWindow, collectionCeiling } from "@aglyn/tenant-feature-instance/hooks/host-collection-queries";
-import { isListingBrowsable, isListingDeleted, isPrivateListing, listingArtifactType, listingArtifactLabel, resolvePluginInstallState } from "../model/marketplace.js";
+import { LISTING_CATEGORIES, listingArtifactType, listingArtifactLabel, resolvePluginInstallState } from "../model/marketplace.js";
+import { BROWSE_SORTS, browseBase, MARKETPLACE_BROWSE_QUERY } from "../model/listing-query.js";
 import { ListingImage } from "./listing-image.component.js";
 // The console route table is shared (AGL-685), so these go through
 // buildRoute rather than being reassembled from a base string — the shape
@@ -45,6 +48,10 @@ import { ListingImage } from "./listing-image.component.js";
  * bounds an install-state LOOKUP, not the shelf: the listings query has its
  * own cap, and the grid pages what survives the filters.
  */ const INSTALL_STATE_CEILING = 100;
+/** How the browse clauses read in a refusal. */ const BROWSE_HEADERS = {
+    category: 'Category'
+};
+/** How long the search box waits for typing to stop before it asks again. */ const SEARCH_SETTLE_MS = 300;
 /**
  * Marketplace components browse (AGL-44). A read-only catalogue: each card links
  * to the listing's detail page, which is the only place an install happens
@@ -52,21 +59,29 @@ import { ListingImage } from "./listing-image.component.js";
  * site-targeting choice. The card still shows install STATE (installed,
  * org-wide) so the shelf reads honestly, but carries no install action.
  */ export function MarketplaceBrowse(props) {
+    var _ref;
+    var _gridFilter_clauses_find;
     const { hostId } = props;
     const firestore = useFirestore();
-    const { data: user } = useUser();
     const { orgScoped, orgSlug: orgSlugProp, publisherId } = props;
     const [handles, setHandles] = useState({});
     // Listings are org-owned (AGL-652), so "is this mine" is an org comparison.
     // Resolved from the routing mirror rather than a new prop so the component
-    // stays self-contained; hostIndex is signed-in readable.
-    const [viewerOrgId, setViewerOrgId] = useState(null);
+    // stays self-contained; hostIndex is signed-in readable. `undefined` while
+    // it resolves: the shelf's query names the viewer's org in its audience
+    // clause, so it waits for the answer rather than asking twice. A failed
+    // lookup settles at `null` — the public shelf, without the viewer's own
+    // listings in review.
+    const [viewerOrgId, setViewerOrgId] = useState(undefined);
     useEffect(()=>{
         let active = true;
+        setViewerOrgId(undefined);
         void getDoc(doc(firestore, 'hostIndex', hostId)).then((snapshot)=>{
             var _snapshot_get;
             if (active) setViewerOrgId((_snapshot_get = snapshot.get('orgId')) != null ? _snapshot_get : null);
-        }).catch(()=>undefined);
+        }).catch(()=>{
+            if (active) setViewerOrgId(null);
+        });
         return ()=>{
             active = false;
         };
@@ -109,64 +124,75 @@ import { ListingImage } from "./listing-image.component.js";
             handle: (_handles_profileId1 = handles[profileId]) != null ? _handles_profileId1 : profileId
         }) : undefined;
     };
-    /**
-   * NO `where('deletedAt','==',null)` HERE — soft-deleted listings are dropped
-   * in `items` below instead (AGL-1196).
-   *
-   * `deletedAt` flips every time a publisher unpublishes or republishes. A
-   * document that stops matching a live query leaves the query target, and the
-   * client can cache a `noDocument` tombstone at its own path — which is then
-   * served to every reader of that path, including the detail page, which
-   * reads `marketplaceListings/{id}` BY ID. So a browse session open across an
-   * unpublish could 404 a listing that exists, and republishing would not
-   * clear it: a resumed listen only pulls deltas, so an otherwise-unchanged
-   * document is never re-sent (AGL-827, AGL-929).
-   *
-   * Dropping the predicate removes the mechanism rather than healing it: with
-   * no `where`, no document can stop matching. The rule permits it —
-   * `marketplaceListings` is `allow read: if true`, with no `resource.data`
-   * term, so an unconstrained list is not denied. (That is NOT true of the
-   * scoped `datasets` query below, which is why this fix does not generalise.)
-   *
-   * It also fixes a quieter bug: `== null` matches only an EXPLICIT null, and
-   * Firestore cannot express "field is absent". Every publish path stamps
-   * `deletedAt: null` today, so this happens to be exact — but any future
-   * write path that omits the field would make a live listing silently
-   * invisible. An in-memory falsy check treats absent as live, which is what
-   * the dataset and email-template filters in this file already do.
-   *
-   * The cap counts CANDIDATES, not results — private and unreviewed listings
-   * already consume slots and get filtered below, so this is the same class of
-   * consumption, nudged up to leave room for soft-deleted rows. Measured on
-   * production 2026-08-03: 7 listings, 0 soft-deleted, 0 missing the field.
-   *
-   * ## The cap DOES take an `orderBy`, and it is not the same decision
+    /*
+   * THE SHELF IS ITS QUERY (AGL-3321).
    *
-   * A `limit` with no ordering is answered in document-id order, and listing
-   * ids are random — so the ninety this loaded were an arbitrary ninety, and
-   * the client sort below then arranged that sample by date and called it
-   * "Newest". The window is now the newest ninety, which is what the default
-   * sort already claimed it was.
+   * Browse read the newest ninety listings and resolved everything else in
+   * memory — the search box, the category chips, the three sorts, and the
+   * gates that keep deleted, private and unreviewed listings off the shelf.
+   * A listing that was not among those ninety could not be found by any of
+   * them, and "Most installed" sorted a sample.
    *
-   * `orderBy` carries the drop the `where` above was removed to avoid — it
-   * matches only documents that HAVE the field, so a listing without
-   * `createdAt` would not be mis-ordered, it would be invisible. That is safe
-   * here for a reason the `deletedAt` predicate could not offer: a listing is
-   * created by exactly two paths, `publish.ts` and `publish-plugin.ts`, and
-   * both stamp `createdAt` in the same `set` that brings the document into
-   * existence. Every other writer resolves an EXISTING listing by id and
-   * refuses when it is absent, so none of them can produce one without the
-   * field.
+   * Every one of them is on the query now. The gates are one clause, the
+   * listing's written `browseAudience` (see `listingBrowseAudience`), asked
+   * with `array-contains-any` for everyone (`*`) and the viewer's own org —
+   * the owner exemption the in-memory gate carried (AGL-432): a publisher
+   * sees their own listing while it waits on review. A publisher page asks
+   * the same scopes joined to that publisher. The search folds into the same
+   * clause through `browseTokens`, a category is an equality, and each sort
+   * is the query's order; `MARKETPLACE_BROWSE_QUERY` declares them and its
+   * spec pins the composites that serve them.
    *
-   * It also cannot reproduce the tombstone (AGL-827/929) that made a mutable
-   * `where` unsafe: `createdAt` is written under `existing.empty` and never
-   * rewritten, so no document can stop matching mid-session and leave a
-   * `noDocument` cached at a path the detail page reads by id.
-   */ const { data: listings } = useFirestoreCollection(()=>query(collection(firestore, 'marketplaceListings'), orderBy('createdAt', 'desc'), limit(90)), [
-        firestore
-    ], {
-        idField: '$id'
+   * `browseAudience` is MUTABLE — an unpublish, a takedown or a verdict
+   * rewrites it — so a document can stop matching mid-session and be cached
+   * as a `noDocument` tombstone at the path the detail page reads by id
+   * (AGL-827/929). That was why the `deletedAt` predicate came off this query
+   * in AGL-1196; `confirmDisappearances` is the repair that hook documents
+   * for a predicate that cannot be dropped, and this one cannot.
+   */ const gridFilter = useListGridFilter({
+        selectFields: [
+            'category'
+        ]
+    });
+    const [search, setSearch] = useState('');
+    const [searchWords, setSearchWords] = useState([]);
+    useEffect(()=>{
+        const timer = setTimeout(()=>setSearchWords(search.split(/\s+/).filter(Boolean)), SEARCH_SETTLE_MS);
+        return ()=>clearTimeout(timer);
+    }, [
+        search
+    ]);
+    const [sort, setSort] = useState('newest');
+    const category = (_ref = (_gridFilter_clauses_find = gridFilter.clauses.find((clause)=>clause.field === 'category')) == null ? void 0 : _gridFilter_clauses_find.value) != null ? _ref : null;
+    const listingsRef = useMemo(()=>viewerOrgId === undefined ? null : collection(firestore, 'marketplaceListings'), [
+        firestore,
+        viewerOrgId
+    ]);
+    const { rows: shown, status: shelfStatus, hasMore, page, setPage, pageSize, setPageSize, plan } = useListQuery({
+        collection: listingsRef,
+        declaration: MARKETPLACE_BROWSE_QUERY,
+        request: {
+            clauses: gridFilter.clauses,
+            search: searchWords,
+            sort: BROWSE_SORTS[sort],
+            base: browseBase(viewerOrgId, publisherId)
+        },
+        deps: [
+            firestore,
+            viewerOrgId,
+            publisherId
+        ],
+        idField: '$id',
+        confirmDisappearances: true
     });
+    const listings = shown;
+    const filtering = Boolean(category) || searchWords.length > 0;
+    const refusals = useMemo(()=>listQueryRefusals(plan.refused, {
+            fields: MARKETPLACE_BROWSE_QUERY.fields,
+            headers: BROWSE_HEADERS
+        }), [
+        plan
+    ]);
     /*
    * ## The install-state lookups are ORDERED too, and they are not lists
    *
@@ -378,89 +404,7 @@ import { ListingImage } from "./listing-image.component.js";
         listings,
         firestore
     ]);
-    // Browse controls (AGL-95): client-side search/filter/sort over the
-    // fetched page of listings.
-    const [search, setSearch] = useState('');
-    const [category, setCategory] = useState(null);
-    const [sort, setSort] = useState('newest');
-    const categories = useMemo(()=>[
-            ...new Set((listings != null ? listings : []).map((listing)=>listing.category).filter(Boolean))
-        ].sort(), [
-        listings
-    ]);
-    const items = useMemo(()=>{
-        const needle = search.trim().toLowerCase();
-        const filtered = (listings != null ? listings : []).filter((listing)=>{
-            // Private plugins never appear here, not even for the org that owns
-            // them (AGL-968/993). The owner exemption below exists so a publisher
-            // can watch their own SUBMISSION move through review — but a private
-            // listing is not waiting to be listed, it is deliberately not for the
-            // marketplace, and showing it in this grid is the one thing "private"
-            // promises will not happen. Owners reach theirs from
-            // Marketplace › Listings, whose View opens the same detail page
-            // installs happen on.
-            // Soft-deleted listings used to be excluded by the query itself; they
-            // are dropped here now so no mutable field sits in a `where`
-            // (AGL-1196). Unconditional — unlike the review gate below, deletion
-            // has no owner exemption.
-            if (isListingDeleted(listing)) return false;
-            if (isPrivateListing(listing)) return false;
-            // Review queue gate (AGL-432): unreviewed/rejected plugin listings
-            // stay off the public browse; the owner still sees their own (the
-            // detail page shows them the status). UX-level only — the docs are
-            // public-readable by design.
-            if (!isListingBrowsable(listing) && listing.profileId !== viewerOrgId) {
-                return false;
-            }
-            // Publisher page (AGL-869): only this publisher's listings.
-            if (publisherId && listing.profileId !== publisherId) return false;
-            if (category && listing.category !== category) return false;
-            if (!needle) return true;
-            return [
-                listing.displayName,
-                listing.description,
-                listing.category
-            ].filter(Boolean).some((value)=>value.toLowerCase().includes(needle));
-        });
-        return [
-            ...filtered
-        ].sort((a, b)=>{
-            var _ref, _ref1;
-            var _b_createdAt, _a_createdAt;
-            if (sort === 'installed') {
-                var _b_installCount, _a_installCount;
-                return ((_b_installCount = b.installCount) != null ? _b_installCount : 0) - ((_a_installCount = a.installCount) != null ? _a_installCount : 0);
-            }
-            if (sort === 'rated') {
-                var _b_ratingAverage, _a_ratingAverage, _b_ratingCount, _a_ratingCount;
-                // Unrated listings sort last rather than as zero-stars — a new
-                // listing has not been judged badly, it has not been judged.
-                const byAverage = ((_b_ratingAverage = b.ratingAverage) != null ? _b_ratingAverage : -1) - ((_a_ratingAverage = a.ratingAverage) != null ? _a_ratingAverage : -1);
-                return byAverage || ((_b_ratingCount = b.ratingCount) != null ? _b_ratingCount : 0) - ((_a_ratingCount = a.ratingCount) != null ? _a_ratingCount : 0);
-            }
-            return ((_ref = (_b_createdAt = b.createdAt) == null ? void 0 : _b_createdAt.seconds) != null ? _ref : 0) - ((_ref1 = (_a_createdAt = a.createdAt) == null ? void 0 : _a_createdAt.seconds) != null ? _ref1 : 0);
-        });
-    }, [
-        listings,
-        search,
-        category,
-        sort,
-        publisherId,
-        user == null ? void 0 : user.uid
-    ]);
-    /*
-   * The shelf PAGES (AGL-2501). It used to render every card the window held
-   * in one wall, so the only control over how much arrived at once was the
-   * cap in the query — a number the reader cannot see and cannot change.
-   *
-   * Client-side, deliberately, and this is the case `ListPagination`'s
-   * `count` prop exists for. The search box, the category chips and the
-   * owner/review gates are all resolved in memory, so a server page would be
-   * a page of CANDIDATES: a reader filtering to one category would get pages
-   * that were mostly empty and a count that meant nothing. Paging what is
-   * left after the filter is the only version whose numbers are about what is
-   * on screen.
-   */ /**
+    /**
    * The install-state lookups did not read everything they were asked about.
    *
    * Said on the SHELF rather than on the card that is wrong, because there is
@@ -469,25 +413,6 @@ import { ListingImage } from "./listing-image.component.js";
    * chips are a floor — anything marked installed is installed, and something
    * unmarked may still be.
    */ const installStateTruncated = installedTruncated || hostPinsTruncated || orgPinsTruncated || datasetsTruncated || emailsTruncated;
-    const [page, setPage] = useState(0);
-    const [pageSize, setPageSize] = useState(TABLE_PAGE_SIZE_DEFAULT);
-    /*
-   * A new query starts at page one. Page four of a category with two pages
-   * does not exist, and an out-of-range page renders as an empty grid with
-   * nothing saying why — which reads as the filter having broken.
-   */ useEffect(()=>{
-        setPage(0);
-    }, [
-        search,
-        category,
-        sort,
-        pageSize
-    ]);
-    const shown = useMemo(()=>items.slice(page * pageSize, (page + 1) * pageSize), [
-        items,
-        page,
-        pageSize
-    ]);
     return /*#__PURE__*/ _jsxs(CardDisplay, {
         header: 'Marketplace components',
         help: pluginDocsHelp('plugins', {
@@ -515,11 +440,17 @@ import { ListingImage } from "./listing-image.component.js";
                             minWidth: 200
                         }
                     }),
-                    categories.map((value)=>/*#__PURE__*/ _jsx(Chip, {
+                    LISTING_CATEGORIES.map((value)=>/*#__PURE__*/ _jsx(Chip, {
                             label: value,
                             variant: category === value ? 'filled' : 'outlined',
                             color: category === value ? 'primary' : 'default',
-                            onClick: ()=>setCategory((previous)=>previous === value ? null : value)
+                            onClick: ()=>gridFilter.setClauses(category === value ? [] : [
+                                    {
+                                        field: 'category',
+                                        op: 'equals',
+                                        value
+                                    }
+                                ])
                         }, value)),
                     /*#__PURE__*/ _jsxs(TextField, {
                         value: sort,
@@ -554,11 +485,15 @@ import { ListingImage } from "./listing-image.component.js";
                 },
                 children: `Installed state is resolved from the first ${INSTALL_STATE_CEILING} ` + 'install records in this workspace, ordered by id. There are ' + 'more, so a card may not be marked installed even though it is. ' + 'Open a listing to see what this workspace actually runs.'
             }) : null,
-            items.length === 0 ? /*#__PURE__*/ _jsx(Typography, {
+            /*#__PURE__*/ _jsx(ListQueryNotices, {
+                refused: refusals,
+                notices: plan.notices
+            }),
+            shown.length === 0 && page === 0 ? shelfStatus === 'success' ? /*#__PURE__*/ _jsx(Typography, {
                 variant: "body2",
                 color: "text.secondary",
-                children: 'No marketplace components published yet — publish one of your ' + 'reusable components from the Setup page to be the first.'
-            }) : /*#__PURE__*/ _jsxs(_Fragment, {
+                children: filtering ? 'No components match this search.' : 'No marketplace components published yet — publish one of ' + 'your reusable components from the Setup page to be the first.'
+            }) : null : /*#__PURE__*/ _jsxs(_Fragment, {
                 children: [
                     /*#__PURE__*/ _jsx(Grid, {
                         container: true,
@@ -787,7 +722,7 @@ import { ListingImage } from "./listing-image.component.js";
                         page: page,
                         pageSize: pageSize,
                         rowCount: shown.length,
-                        count: items.length,
+                        hasMore: hasMore,
                         onPageChange: setPage,
                         onPageSizeChange: setPageSize
                     })