@aglyn/plugins-marketplace 1.2.0 → 1.4.0

package/README.md

@@ -33,7 +33,7 @@ It also registers a `rating` custom field type (`registerCustomFieldType`) with
 - Install: `marketplace/install`, `install-plugin`, `install-layout`, `install-template`, `install-theme`, `install-dataset-schema`, `install-email-starter`, `install-email-template`, and `update-artifact` for reconciling an installed copy with a newer published version.
 - Publish: `marketplace/publish`, `publish-plugin`, `publish-layout`, `publish-template`, `publish-theme`, `publish-dataset-schema`, `publish-email-starter`, `publish-email-template`, `publisher-profile`, `verification-request`.
 - Listings: `marketplace/listing-versions`, `preview-image`, `reviews`, `report`.
-- Paid listings: `marketplace/checkout` and `marketplace/connect`, plus a handler on the platform billing webhook (`registerBillingWebhookHandler`).
+- Paid listings: `marketplace/pay` (in the console, on the workspace's card on file), `marketplace/checkout` (the hosted page, kept for what still links to it), `marketplace/connect` and `marketplace/publisher-standing`, plus a handler on the platform billing webhook (`registerBillingWebhookHandler`).
 
 The server entry also registers the server side of the `rating` field type, so its validators run on write paths where no client loaded the plugin.
 

package/package.json

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

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

@@ -39,6 +39,7 @@ import ListingReviews from "./listing-reviews.component.js";
 import ReportTarget from "./report-target.component.js";
 import PluginSiteSet from "./plugin-site-set.component.js";
 import { MenuItem, TextField } from "@mui/material";
+import { SITE_STARTER_ARTIFACT_TYPE } from "@aglyn/aglyn/app-utils/site-starter";
 import { useMarketplaceActions } from "../hooks/use-marketplace-actions.js";
 import { useArtifactUpdate } from "../hooks/use-artifact-update.js";
 import ArtifactUpdateDialog from "./artifact-update-dialog.component.js";
@@ -392,7 +393,9 @@ export function ListingReadme({ readme }) {
     // than let the server infer it from whichever site the surface happens to
     // be acting through.
     const orgId = useHostOrgId(hostId);
-    const { install, installPlan, buy, uninstall } = useMarketplaceActions(hostId, orgId);
+    const { install, installPlan, buy, uninstall, payPanel, buying } = useMarketplaceActions(hostId, orgId, orgSlug ? buildRoute(Route.MANAGE_BILLING, {
+        orgSlug
+    }) : null);
     /** The uninstall awaiting its impact check and confirmation (AGL-1027). */ const [pendingUninstall, setPendingUninstall] = useState(null);
     const [installScope, setInstallScope] = useState('org');
     // Confirm before writing install pins (AGL-867): the install is deliberate
@@ -1489,9 +1492,13 @@ export function ListingReadme({ readme }) {
                                                             fullWidth: true,
                                                             variant: upToDate ? 'outlined' : 'contained',
                                                             color: "primary",
-                                                            disabled: Boolean(upToDate) || !(listing == null ? void 0 : listing.profileId) || // Nothing selected to install to (AGL-773).
+                                                            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: permissions.installPlugins ? ()=>// Buying goes straight to Stripe checkout,
+                                                            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
@@ -1511,6 +1518,7 @@ export function ListingReadme({ readme }) {
                                                             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'
                                                         })
                                                     }),
+                                                    payPanel,
                                                     !orgPluginScope && isPlugin && installed ? /*#__PURE__*/ _jsx(Button, {
                                                         fullWidth: true,
                                                         size: "small",