@aglyn/plugins-marketplace 1.19.0 → 1.20.0

package/package.json

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

package/src/lib/components/listing-content.component.d.ts

@@ -1,3 +1,4 @@
+import { type OrgInstallHost } from '../model/marketplace';
 export declare function ListingReadme({ readme }: {
     readme: string;
 }): import("react").JSX.Element;
@@ -41,12 +42,11 @@ export interface MarketplaceListingContentProps {
     /**
      * The org's sites, for the install-targeting picker (AGL-773). Present only
      * at org scope; when given (and non-empty) the CTA offers All sites vs
-     * Selected sites instead of the single org/host choice.
+     * Selected sites instead of the single org/host choice. Each carries the
+     * site's own `disabledPlugins` when the shell has it (AGL-4047), which the
+     * installed-sites panel reads.
      */
-    hosts?: ReadonlyArray<{
-        id: string;
-        label: string;
-    }>;
+    hosts?: ReadonlyArray<OrgInstallHost>;
 }
 /**
  * Marketplace listing detail (AGL-95/419), relocated from the app route —

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

@@ -16,10 +16,12 @@
  */ 'use client';
 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 { LISTING_README_MAX_CHARS, listingArtifactType, installsUnreviewedFallback, listingArtifactLabel, listingInclusions, hasLivePurchaseOf, hasOrgLicenceOf, licensedOrgIdsFor, installTargetsFor, isListingDeleted, isPrivateListing, resolveInstallPlan, resolveOrgInstallSummary, resolvePluginInstallState, resolveUninstallTargets, safePublisherHref, safePublisherImageSrc, allExceptInstallKind } 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 { SiteSharingField } from "@aglyn/shared-ui-jsx/components/site-sharing-field.component";
+import { orgPermissionLabel } from "@aglyn/aglyn/app-utils/org-permissions";
 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";
@@ -27,7 +29,7 @@ import { mdiCheckCircle, mdiCheckCircleOutline, mdiEmailOutline, mdiGithub, mdiI
 import { AppLink, CardDisplay, GridItems, MdiIcon } from "@aglyn/shared-ui-jsx";
 import { NextPageTitle } from "@aglyn/shared-ui-next/contexts/next-page-title-provider";
 import { useSnackbar } from "@aglyn/shared-ui-snackstack";
-import { Alert, Avatar, Box, Button, Checkbox, Chip, Dialog, DialogActions, DialogContent, DialogTitle, Divider, FormControl, FormControlLabel, FormGroup, FormHelperText, FormLabel, IconButton, Link as MuiLink, Rating, Stack, Tooltip, Typography } from "@mui/material";
+import { Alert, Avatar, Box, Button, Chip, Dialog, DialogActions, DialogContent, DialogTitle, Divider, IconButton, Link as MuiLink, Rating, Stack, Tooltip, Typography } from "@mui/material";
 import { collection, doc, documentId, getDoc, limit, orderBy, query, where } from "firebase/firestore";
 import { useEffect, useMemo, useState } from "react";
 import { useConsoleHostRoute, useFirestore, useFirestoreCollection, useFirestoreDoc, useHostOrgId, useUser, useScopeTokens } from "@aglyn/tenant-feature-instance";
@@ -427,15 +429,23 @@ export function ListingReadme({ readme }) {
     const [updateOpen, setUpdateOpen] = useState(false);
     // Screenshot lightbox (AGL-869): the clicked screenshot's URL, or null.
     const [lightboxUrl, setLightboxUrl] = useState(null);
-    // Org-scope install targeting (AGL-773): All sites vs a chosen subset. Only
-    // engaged at org scope with a known site list; otherwise the per-site tab's
-    // simpler org/host choice (AGL-656) still applies.
+    // Org-scope install targeting (AGL-773): All sites, a chosen subset, or all
+    // sites except some (AGL-4047). Only engaged at org scope with a known site
+    // list; otherwise the per-site tab's simpler org/host choice (AGL-656) still
+    // applies.
     const orgTargeting = Boolean(orgScoped && hosts && hosts.length > 0);
-    const [targeting, setTargeting] = useState('all-sites');
-    const [selectedHostIds, setSelectedHostIds] = useState([]);
+    const [installTo, setInstallTo] = useState({
+        mode: 'all'
+    });
     const allHostIds = useMemo(()=>(hosts != null ? hosts : []).map((h)=>h.id), [
         hosts
     ]);
+    const installSites = useMemo(()=>(hosts != null ? hosts : []).map((host)=>({
+                id: host.id,
+                name: host.label
+            })), [
+        hosts
+    ]);
     // Listings are org-owned (AGL-652) — "did I publish this" is an org
     // comparison, resolved from the routing mirror like the browse grid.
     const [viewerOrgId, setViewerOrgId] = useState(null);
@@ -922,15 +932,49 @@ export function ListingReadme({ readme }) {
     // artifact can host-pin (plugins, components, templates, layouts) — an
     // org-only artifact can't target a subset.
     const canSelectSites = installTargets.includes('host');
+    // "All sites except…" (AGL-4047): a plugin pins once for the workspace and
+    // leaves the chosen sites out, so a site added later gets it; a per-site copy
+    // only picks today's sites; an org-only artifact can't leave one out.
+    const allExceptKind = listing ? allExceptInstallKind(listing) : null;
+    const installModes = useMemo(()=>[
+            'all',
+            ...canSelectSites ? [
+                'selected'
+            ] : [],
+            ...allExceptKind ? [
+                'allExcept'
+            ] : []
+        ], [
+        canSelectSites,
+        allExceptKind
+    ]);
+    // A choice the artifact doesn't offer reads as All sites, never as a plan
+    // that silently means something else.
+    const installChoice = useMemo(()=>installModes.includes(installTo.mode) ? installTo : {
+            mode: 'all'
+        }, [
+        installModes,
+        installTo
+    ]);
+    const targeting = installChoice.mode === 'selected' ? 'selected-sites' : installChoice.mode === 'allExcept' ? 'all-sites-except' : 'all-sites';
     const installPlanSteps = useMemo(()=>listing ? resolveInstallPlan(listing, targeting, {
-            selectedHostIds,
-            allHostIds
+            selectedHostIds: installChoice.mode === 'selected' ? installChoice.hostIds : [],
+            allHostIds,
+            exceptHostIds: installChoice.mode === 'allExcept' ? installChoice.exceptHostIds : []
         }) : [], [
         listing,
         targeting,
-        selectedHostIds,
+        installChoice,
         allHostIds
     ]);
+    const installModeDetails = installTargets.includes('org') ? {
+        all: 'Every site, including sites you add later.',
+        allExcept: 'Every site but the ones you leave out, including sites you add later.'
+    } : {
+        all: `Installs to all ${allHostIds.length} site` + (allHostIds.length === 1 ? '' : 's') + ". New sites won't get it automatically.",
+        allExcept: 'Installs to the sites you have today, but the ones you leave ' + "out. New sites won't get it automatically."
+    };
+    const installToProblem = installChoice.mode === 'selected' && !installChoice.hostIds.length ? 'Pick at least one site.' : installChoice.mode === 'allExcept' && !installChoice.exceptHostIds.length ? 'Choose at least one site to leave out, or choose All sites.' : null;
     const versionHistory = Array.isArray(listing == null ? void 0 : listing.versionHistory) ? [
         ...listing.versionHistory
     ].sort((a, b)=>b.version - a.version) : [];
@@ -940,8 +984,18 @@ export function ListingReadme({ readme }) {
     // something else.
     const installTargetSummary = ()=>{
         if (orgTargeting && !installed) {
-            var _installPlanSteps_;
-            if (installPlanSteps.length === 1 && ((_installPlanSteps_ = installPlanSteps[0]) == null ? void 0 : _installPlanSteps_.scope) === 'org') {
+            var _installPlanSteps_, _orgStep_exceptHostIds;
+            const orgStep = installPlanSteps.length === 1 && ((_installPlanSteps_ = installPlanSteps[0]) == null ? void 0 : _installPlanSteps_.scope) === 'org' ? installPlanSteps[0] : null;
+            if (orgStep == null ? void 0 : (_orgStep_exceptHostIds = orgStep.exceptHostIds) == null ? void 0 : _orgStep_exceptHostIds.length) {
+                // "All sites except…" (AGL-4047): the sites left out, by name.
+                const leftOut = orgStep.exceptHostIds.map((hostId)=>{
+                    var _ref;
+                    var _find;
+                    return (_ref = (_find = (hosts != null ? hosts : []).find((host)=>host.id === hostId)) == null ? void 0 : _find.label) != null ? _ref : hostId;
+                });
+                return `every site except ${leftOut.join(', ')}, ` + 'including sites added later';
+            }
+            if (orgStep) {
                 return 'the whole organization — every site, including sites added later';
             }
             const names = installPlanSteps.filter((step)=>step.scope === 'host').map((step)=>{
@@ -965,10 +1019,13 @@ export function ListingReadme({ readme }) {
     // and which are still free to add. Only meaningful at org scope for a
     // plugin — everything else installs INTO a site and has no pin to survey.
     const orgPluginScope = Boolean(orgTargeting && isPlugin);
-    const orgInstall = useMemo(()=>resolveOrgInstallSummary(hosts != null ? hosts : [], sitePins, orgPin != null ? orgPin : null), [
+    const orgInstall = useMemo(// With each site's own switch (AGL-4047), so a site that turned the plugin
+    // off, or was left out at install, is not listed as running it.
+    ()=>resolveOrgInstallSummary(hosts != null ? hosts : [], sitePins, orgPin != null ? orgPin : null, listingId), [
         hosts,
         sitePins,
-        orgPin
+        orgPin,
+        listingId
     ]);
     /** Run a pin write, then re-read every site's pin. */ const runSiteEdit = async (work)=>{
         try {
@@ -1428,68 +1485,28 @@ export function ListingReadme({ readme }) {
                                                         })
                                                     }) : null,
                                                     orgTargeting && !installed && !(orgPluginScope && orgInstall.installedAnywhere) ? /*#__PURE__*/ _jsxs(Stack, {
-                                                        spacing: 1.5,
+                                                        spacing: 1,
                                                         sx: {
                                                             maxWidth: 420
                                                         },
                                                         children: [
-                                                            /*#__PURE__*/ _jsxs(TextField, {
-                                                                select: true,
-                                                                size: "small",
+                                                            /*#__PURE__*/ _jsx(SiteSharingField, {
                                                                 label: "Install to",
-                                                                value: targeting,
-                                                                onChange: (event)=>setTargeting(event.target.value),
-                                                                helperText: targeting === 'all-sites' ? installTargets.includes('org') ? 'Available on every site — including sites you add later.' : `Installs to all ${allHostIds.length} site` + (allHostIds.length === 1 ? '' : 's') + ". New sites won't get it automatically." : 'Installs only to the sites you choose.',
-                                                                children: [
-                                                                    /*#__PURE__*/ _jsx(MenuItem, {
-                                                                        value: "all-sites",
-                                                                        children: 'All sites'
-                                                                    }),
-                                                                    canSelectSites ? /*#__PURE__*/ _jsx(MenuItem, {
-                                                                        value: "selected-sites",
-                                                                        children: 'Selected sites'
-                                                                    }) : null
-                                                                ]
+                                                                value: installChoice,
+                                                                onChange: setInstallTo,
+                                                                sites: installSites,
+                                                                sitesReady: true,
+                                                                modes: installModes,
+                                                                modeDetails: installModeDetails,
+                                                                listLabels: {
+                                                                    selected: 'Sites to install to'
+                                                                },
+                                                                problem: installToProblem
                                                             }),
-                                                            targeting === 'selected-sites' && canSelectSites ? /*#__PURE__*/ _jsxs(FormControl, {
-                                                                component: "fieldset",
-                                                                error: !selectedHostIds.length,
-                                                                children: [
-                                                                    /*#__PURE__*/ _jsx(FormLabel, {
-                                                                        component: "legend",
-                                                                        sx: {
-                                                                            typography: 'caption'
-                                                                        },
-                                                                        children: 'Sites'
-                                                                    }),
-                                                                    /*#__PURE__*/ _jsx(FormGroup, {
-                                                                        // Scrolls rather than pushing Install off
-                                                                        // the page on an org with many sites.
-                                                                        sx: {
-                                                                            maxHeight: 240,
-                                                                            overflowY: 'auto'
-                                                                        },
-                                                                        children: (hosts != null ? hosts : []).map((host)=>/*#__PURE__*/ _jsx(FormControlLabel, {
-                                                                                control: /*#__PURE__*/ _jsx(Checkbox, {
-                                                                                    size: "small",
-                                                                                    checked: selectedHostIds.includes(host.id),
-                                                                                    onChange: (event)=>setSelectedHostIds((current)=>event.target.checked ? [
-                                                                                                ...current,
-                                                                                                host.id
-                                                                                            ] : current.filter((id)=>id !== host.id))
-                                                                                }),
-                                                                                label: host.label,
-                                                                                slotProps: {
-                                                                                    typography: {
-                                                                                        variant: 'body2'
-                                                                                    }
-                                                                                }
-                                                                            }, host.id))
-                                                                    }),
-                                                                    /*#__PURE__*/ _jsx(FormHelperText, {
-                                                                        children: selectedHostIds.length ? `${selectedHostIds.length} of ${(hosts != null ? hosts : []).length} selected.` : 'Pick at least one site.'
-                                                                    })
-                                                                ]
+                                                            installChoice.mode === 'allExcept' && allExceptKind === 'lasting' ? /*#__PURE__*/ _jsx(Typography, {
+                                                                variant: "caption",
+                                                                color: "text.secondary",
+                                                                children: 'Each site you leave out has the plugin ' + 'switched off, with the same switch as its ' + 'own Admin › Plugins page. Leaving a site ' + 'out takes ' + `“${orgPermissionLabel('site.manage')}” ` + 'there, and anyone holding it, which the ' + 'site’s admins do by default, can turn the ' + 'plugin back on for that site.'
                                                             }) : null
                                                         ]
                                                     }) : installTargets.length > 1 && !installed ? /*#__PURE__*/ _jsxs(TextField, {