@aglyn/plugins-marketplace 1.10.0 → 1.12.0

package/package.json

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

package/src/lib/components/listing-content.component.js

@@ -17,6 +17,9 @@
 import { _ as _extends } from "@swc/helpers/_/_extends";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { LISTING_README_MAX_CHARS, listingArtifactType, installsUnreviewedFallback, listingArtifactLabel, listingInclusions, hasLivePurchaseOf, hasOrgLicenceOf, licensedOrgIdsFor, installTargetsFor, isListingDeleted, isPrivateListing, resolveInstallPlan, resolveOrgInstallSummary, resolvePluginInstallState, resolveUninstallTargets, safePublisherHref, safePublisherImageSrc } from "../model/marketplace.js";
+import { isPublisherMemberElsewhere, landsInPublisherWorkspace, publisherMemberBuyReason } from "../model/own-listing.js";
+import { BlockedControl } from "@aglyn/shared-ui-jsx/components/blocked-control.component";
+import { PrerequisiteNotice } from "@aglyn/shared-ui-jsx/components/prerequisite-notice.component";
 import UninstallImpactDialog from "./uninstall-impact-dialog.component.js";
 import { ListingImage } from "./listing-image.component.js";
 import { buildRoute, parseMarkdownLite, PLATFORM_BRAND_NAME, offeredPluginVersion, PLUGIN_HOST_ABI_VERSION, pluginDocsHelp, resolveMarkdownLink, resolveMediaSrc, Route } from "@aglyn/aglyn";
@@ -377,7 +380,7 @@ export function ListingReadme({ readme }) {
  * version history, publisher block, and the install/buy CTA.
  */ export function MarketplaceListingContent({ hostId, listingId, permissions, orgScoped, orgSlug: orgSlugProp, hosts }) {
     var _ref, _ref1, _pluginState_scope, _ref2, _ref3, _ref4, _listing_ratingAverage, _listing_ratingAverage1, _ref5, _ref6, _ref7, _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19;
-    var _componentInstall_marketplace;
+    var _componentInstall_marketplace, _profile_displayName;
     // The publisher link was `/{hostDocId}/marketplace/publisher/{id}` — the
     // pre-AGL-621 shape, dead since. The sibling browse grid was fixed for
     // exactly this (AGL-673) and this file was missed; both now build the
@@ -869,7 +872,33 @@ export function ListingReadme({ readme }) {
         revocation
     ]);
     const priceUsd = Number((_ref1 = listing == null ? void 0 : listing.priceUsd) != null ? _ref1 : 0);
-    const mustBuy = priceUsd > 0 && !purchased && (listing == null ? void 0 : listing.profileId) !== viewerOrgId && !installed;
+    // Free without a purchase only where the install routes waive it: the
+    // publisher's own listing on a site of the publisher's own workspace
+    // (AGL-2484, AGL-4047). `viewerOrgId` is the acting site's workspace, the
+    // one the install lands in, so a publisher's member acting on a client's
+    // site is asked to buy, as the route would ask.
+    const mustBuy = priceUsd > 0 && !purchased && !landsInPublisherWorkspace(listing == null ? void 0 : listing.profileId, viewerOrgId) && !installed;
+    // A member of the publisher is refused by the sale for any workspace
+    // (AGL-3365), so Buy stays on screen, switched off, with the reason
+    // (AGL-4047). Their OWN member document: the same one `isPublisherMember`
+    // reads, which the rules let anyone read of themselves, so it says nothing of
+    // the publisher's roster. Asked only where Buy is on offer, and only once the
+    // acting workspace is known, so the publisher's own site never flashes it. A
+    // read that fails leaves Buy on, and the sale still decides.
+    const publisherOrgId = typeof (listing == null ? void 0 : listing.profileId) === 'string' ? listing.profileId : '';
+    const { data: ownPublisherMembership } = useFirestoreDoc(()=>mustBuy && viewerOrgId && publisherOrgId && (user == null ? void 0 : user.uid) ? doc(firestore, 'orgs', publisherOrgId, 'members', user.uid) : null, [
+        firestore,
+        mustBuy,
+        viewerOrgId,
+        publisherOrgId,
+        user == null ? void 0 : user.uid
+    ]);
+    const buyBlocked = mustBuy && isPublisherMemberElsewhere({
+        publisherOrgId,
+        targetOrgId: viewerOrgId,
+        publisherMember: Boolean(ownPublisherMembership)
+    });
+    const buyBlockedReason = publisherMemberBuyReason((profile == null ? void 0 : (_profile_displayName = profile.displayName) == null ? void 0 : _profile_displayName.trim()) || (profile == null ? void 0 : profile.handle));
     // Updating an installed plugin stays at its current scope; a fresh install
     // uses the picker (plugins) or the artifact's only target (everything else).
     const installTargetScope = isPlugin && installed ? (_pluginState_scope = pluginState.scope) != null ? _pluginState_scope : undefined : installTargets.length > 1 ? installScope : undefined;
@@ -1480,43 +1509,56 @@ export function ListingReadme({ readme }) {
                                                         },
                                                         children: (purchasesTruncated ? `Checked against the first ${PURCHASE_LOOKUP_CEILING} of your purchases, ordered by id; you have more. ` : `Checked against the first ${COMPONENT_LOOKUP_CEILING} components on this site, ordered by id; there are more. `) + 'If you already own or installed this, it may ' + 'not be reflected here — check your receipts ' + 'before buying again.'
                                                     }) : null,
-                                                    /*#__PURE__*/ _jsx(Box, {
+                                                    /*#__PURE__*/ _jsxs(Box, {
                                                         sx: {
                                                             display: orgPluginScope && orgInstall.installedAnywhere ? 'none' : undefined
                                                         },
-                                                        children: /*#__PURE__*/ _jsx(Button, {
-                                                            // Full-width and contained (AGL-1005): in a
-                                                            // sidebar card this is the page's primary action,
-                                                            // and "already installed and current" is the only
-                                                            // state where it steps back to an outline.
-                                                            fullWidth: true,
-                                                            variant: upToDate ? 'outlined' : 'contained',
-                                                            color: "primary",
-                                                            disabled: Boolean(upToDate) || !(listing == null ? void 0 : listing.profileId) || // Paying is under way in the panel below.
-                                                            buying || Boolean(payPanel) || // Nothing selected to install to (AGL-773).
-                                                            orgTargeting && !installed && !mustBuy && installPlanSteps.length === 0,
-                                                            onClick: // A site starter is bought to create a site
-                                                            // with, so that is the permission it asks for,
-                                                            // as the pay door does (AGL-4049).
-                                                            (artifactType === SITE_STARTER_ARTIFACT_TYPE ? permissions.createHosts : permissions.installPlugins) ? ()=>// Buying opens the payment panel below,
-                                                                // which is its own confirmation; a free or
-                                                                // entitled install confirms its targets
-                                                                // first (AGL-867). Updating a copied
-                                                                // artifact reviews the diff before writing
-                                                                // anything (AGL-1018).
-                                                                mustBuy ? buy(listing) : copiedUpdatable ? openUpdateReview() : setConfirmOpen(true) : ()=>enqueueSnackbar('Your team role does not allow installing from the marketplace', {
-                                                                    variant: 'warning',
-                                                                    persist: false
-                                                                }),
-                                                            children: upToDate ? `Installed (v${installedVersion})` : copiedUpdatable ? // update would do and writes nothing. Without
-                                                            // an ordered version pair there is no "to
-                                                            // vN" to promise (AGL-1034), so it says the
-                                                            // honest, smaller thing.
-                                                            updateStatus.state === 'update-available' ? `Review update to v${offeredVersion}` : 'Review this version' : artifactInstall ? // draft, so this stays enabled (AGL-789). A
-                                                            // theme has no "again" — there is one per
-                                                            // site, and re-pressing this re-applies it.
-                                                            artifactType === 'theme' ? `Applied (v${installedVersion}) · re-apply` : `${artifactType === 'emailTemplate' ? 'Draft added' : 'Added'} (v${installedVersion}) · add again` : installed ? `Update to v${offeredVersion}` : mustBuy ? licensedElsewhere ? `Buy for this workspace — $${priceUsd}` : `Buy for $${priceUsd}` : unreviewedInstall ? `Install unreviewed v${listing == null ? void 0 : listing.latestVersion} for testing` : orgTargeting || installTargets.length > 1 ? 'Install' : 'Add to this site'
-                                                        })
+                                                        children: [
+                                                            /*#__PURE__*/ _jsx(BlockedControl, {
+                                                                blocked: buyBlocked,
+                                                                reason: buyBlockedReason,
+                                                                fullWidth: true,
+                                                                children: /*#__PURE__*/ _jsx(Button, {
+                                                                    // Full-width and contained (AGL-1005): in a
+                                                                    // sidebar card this is the page's primary action,
+                                                                    // and "already installed and current" is the only
+                                                                    // state where it steps back to an outline.
+                                                                    fullWidth: true,
+                                                                    variant: upToDate ? 'outlined' : 'contained',
+                                                                    color: "primary",
+                                                                    disabled: Boolean(upToDate) || !(listing == null ? void 0 : listing.profileId) || // Paying is under way in the panel below.
+                                                                    buying || Boolean(payPanel) || // Nothing selected to install to (AGL-773).
+                                                                    orgTargeting && !installed && !mustBuy && installPlanSteps.length === 0,
+                                                                    onClick: // A site starter is bought to create a site
+                                                                    // with, so that is the permission it asks for,
+                                                                    // as the pay door does (AGL-4049).
+                                                                    (artifactType === SITE_STARTER_ARTIFACT_TYPE ? permissions.createHosts : permissions.installPlugins) ? ()=>// Buying opens the payment panel below,
+                                                                        // which is its own confirmation; a free or
+                                                                        // entitled install confirms its targets
+                                                                        // first (AGL-867). Updating a copied
+                                                                        // artifact reviews the diff before writing
+                                                                        // anything (AGL-1018).
+                                                                        mustBuy ? buy(listing) : copiedUpdatable ? openUpdateReview() : setConfirmOpen(true) : ()=>enqueueSnackbar('Your team role does not allow installing from the marketplace', {
+                                                                            variant: 'warning',
+                                                                            persist: false
+                                                                        }),
+                                                                    children: upToDate ? `Installed (v${installedVersion})` : copiedUpdatable ? // update would do and writes nothing. Without
+                                                                    // an ordered version pair there is no "to
+                                                                    // vN" to promise (AGL-1034), so it says the
+                                                                    // honest, smaller thing.
+                                                                    updateStatus.state === 'update-available' ? `Review update to v${offeredVersion}` : 'Review this version' : artifactInstall ? // draft, so this stays enabled (AGL-789). A
+                                                                    // theme has no "again" — there is one per
+                                                                    // site, and re-pressing this re-applies it.
+                                                                    artifactType === 'theme' ? `Applied (v${installedVersion}) · re-apply` : `${artifactType === 'emailTemplate' ? 'Draft added' : 'Added'} (v${installedVersion}) · add again` : installed ? `Update to v${offeredVersion}` : mustBuy ? licensedElsewhere ? `Buy for this workspace — $${priceUsd}` : `Buy for $${priceUsd}` : unreviewedInstall ? `Install unreviewed v${listing == null ? void 0 : listing.latestVersion} for testing` : orgTargeting || installTargets.length > 1 ? 'Install' : 'Add to this site'
+                                                                })
+                                                            }),
+                                                            buyBlocked ? /*#__PURE__*/ _jsx(PrerequisiteNotice, {
+                                                                sx: {
+                                                                    mt: 1
+                                                                },
+                                                                children: buyBlockedReason
+                                                            }) : null
+                                                        ]
                                                     }),
                                                     payPanel,
                                                     !orgPluginScope && isPlugin && installed ? /*#__PURE__*/ _jsx(Button, {