@aglyn/plugins-marketplace 1.0.0-beta.291 → 1.0.0-beta.293

package/src/lib/components/org-seller-panel.component.js

@@ -20,7 +20,7 @@ import { mdiDotsVertical } from "@aglyn/shared-data-mdi";
 import { AppLink, CardDisplay, MdiIcon } from "@aglyn/shared-ui-jsx";
 import { useSnackbar } from "@aglyn/shared-ui-snackstack";
 import { Alert, Avatar, Button, Chip, Divider, IconButton, Menu, MenuItem, Stack, TextField, Typography } from "@mui/material";
-import { PUBLISHER_AGREEMENT_TITLE, publisherAgreementPresentation, publisherAgreementState } from "../model/publisher-agreement.js";
+import { PUBLISHER_AGREEMENT_TITLE, PUBLISHER_AGREEMENT_VERSION, publisherAgreementPresentation, publisherAgreementState } from "../model/publisher-agreement.js";
 /*
   THE LEGAL NAME, not `useBranding().branding.productName` (AGL-2351).
 
@@ -42,7 +42,8 @@ import { pluginDocsHelp, useMediaPicker } from "@aglyn/aglyn";
 import { useFirestoreCollection } from "@aglyn/tenant-feature-instance";
 import { useFirestoreDoc } from "@aglyn/tenant-feature-instance";
 import EditListingDialog from "./edit-listing-dialog.component.js";
-import { acceptPublisherAgreement } from "./publisher-agreement-client.js";
+import { PublisherAgreementCheckbox, usePublisherAgreementConsent } from "./publisher-agreement-checkbox.component.js";
+import PublisherAgreementConfirmDialog from "./publisher-agreement-confirm-dialog.component.js";
 import PublisherAgreementSummary from "./publisher-agreement-summary.component.js";
 import { listingPath, publishPluginPath } from "../model/marketplace-paths.js";
 import { payoutReadiness } from "../model/payout-readiness.js";
@@ -58,7 +59,7 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
  * navigated to is mounted at all, so the others never subscribe.
  */ export function OrgSellerPanel(props) {
     var _ref, _ref1, _ref2, _profile_lastPayoutFailureCents, _profile_lastPayoutFailureReason;
-    var _profile_publisherAgreement, _profile_publisherAgreement1, _rowMenu_listing, _rowMenu_listing1, _rowMenu_listing2, _rowMenu_listing3, _rowMenu_listing4, _rowMenu_listing5, _rowMenu_listing6, _rowMenu_listing7;
+    var _profile_publisherAgreement, _rowMenu_listing, _rowMenu_listing1, _rowMenu_listing2, _rowMenu_listing3, _rowMenu_listing4, _rowMenu_listing5, _rowMenu_listing6;
     const { orgId, section, basePath } = props;
     const router = useRouter();
     const firestore = useFirestore();
@@ -263,8 +264,13 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
         profile == null ? void 0 : profile.linkedinUrl
     ]);
     const validHandle = HANDLE_PATTERN.test(handle);
+    // The publisher agreement, agreed to on this save (AGL-4105).
+    const profileAgreement = usePublisherAgreementConsent();
+    const [profileBusy, setProfileBusy] = useState(false);
     const handleSave = useCallback(async ()=>{
         if (!orgId || !validHandle || !displayName.trim()) return;
+        if (!profileAgreement.consent) return;
+        setProfileBusy(true);
         try {
             // Server-owned (AGL-652): the handle must be claimed transactionally in
             // publisherHandles, which a client write cannot do — two orgs racing
@@ -288,7 +294,8 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
                     supportUrl: supportUrl.trim(),
                     githubUrl: githubUrl.trim(),
                     xUrl: xUrl.trim(),
-                    linkedinUrl: linkedinUrl.trim()
+                    linkedinUrl: linkedinUrl.trim(),
+                    agreement: profileAgreement.consent
                 })
             });
             const payload = await response.json().catch(()=>null);
@@ -303,12 +310,16 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
                 variant: 'success',
                 persist: false
             });
+            // Each save is its own agreement: the next one ticks the box again.
+            profileAgreement.reset();
         } catch (error) {
             console.error(error);
             enqueueSnackbar('An error has occurred', {
                 variant: 'error',
                 allowDuplicate: true
             });
+        } finally{
+            setProfileBusy(false);
         }
     }, [
         orgId,
@@ -323,6 +334,7 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
         githubUrl,
         xUrl,
         linkedinUrl,
+        profileAgreement,
         user,
         enqueueSnackbar
     ]);
@@ -342,40 +354,6 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
         const date = at == null ? void 0 : (_at_toDate = at.toDate) == null ? void 0 : _at_toDate.call(at);
         return date ? date.toLocaleDateString() : '';
     })();
-    const [agreementBusy, setAgreementBusy] = useState(false);
-    const handleAcceptAgreement = useCallback(async ()=>{
-        if (!orgId) return;
-        setAgreementBusy(true);
-        try {
-            // Server-owned, like the handle: an acceptance the accepting party can
-            // write itself is not evidence of anything, and the rules block the
-            // field outright. The same request the agreement dialog a refused
-            // publish opens makes (AGL-3407), so both record one acceptance.
-            const refused = await acceptPublisherAgreement(user, orgId);
-            if (refused) {
-                return void enqueueSnackbar(refused, {
-                    variant: 'warning',
-                    persist: false
-                });
-            }
-            enqueueSnackbar('Agreement accepted — you can publish now', {
-                variant: 'success',
-                persist: false
-            });
-        } catch (error) {
-            console.error(error);
-            enqueueSnackbar('An error has occurred', {
-                variant: 'error',
-                allowDuplicate: true
-            });
-        } finally{
-            setAgreementBusy(false);
-        }
-    }, [
-        orgId,
-        user,
-        enqueueSnackbar
-    ]);
     // The listing open in the full editor (AGL-862), or null when closed.
     const [editListing, setEditListing] = useState(null);
     // Per-row overflow menu (AGL-999): the anchor plus the row it belongs to,
@@ -392,86 +370,81 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
     // write: making a listing public is gated on it actually carrying the docs
     // a stranger needs, and that check has to live somewhere a client can't
     // skip. No re-review either way — the bytes are unchanged.
-    const [visibilityBusy, setVisibilityBusy] = useState('');
-    const handleVisibility = useCallback((listing)=>async ()=>{
-            const next = listing.visibility === 'private' ? 'public' : 'private';
-            setVisibilityBusy(listing.$id);
-            try {
-                const response = await authorizedFetch(user, '/api/marketplace/publish-plugin', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify({
-                        action: 'set-visibility',
-                        listingId: listing.$id,
-                        visibility: next
-                    })
-                });
-                const payload = await response.json().catch(()=>({}));
-                if (!response.ok) {
-                    var _ref;
-                    return void enqueueSnackbar((_ref = payload == null ? void 0 : payload.error) != null ? _ref : 'Visibility change failed', {
-                        variant: 'error',
-                        allowDuplicate: true
-                    });
-                }
-                enqueueSnackbar(next === 'private' ? 'Now private — only your sites can install it' : 'Published to the marketplace', {
-                    variant: 'success',
-                    persist: false
-                });
-            } catch (error) {
-                console.error(error);
-                enqueueSnackbar('An error has occurred', {
-                    variant: 'error',
-                    allowDuplicate: true
-                });
-            } finally{
-                setVisibilityBusy('');
-            }
-        }, [
-        user,
-        enqueueSnackbar
-    ]);
+    //
     // Unpublish ⇄ republish goes through the API too (AGL-3321). It was a
     // client write of `deletedAt`, but browse queries each listing's audience,
     // which only the server re-derives — so the rules now deny the field here.
-    const handleUnpublish = useCallback((listing)=>async ()=>{
-            try {
-                const response = await authorizedFetch(user, '/api/marketplace/publish-plugin', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify({
-                        action: 'set-published',
-                        listingId: listing.$id,
-                        published: Boolean(listing.deletedAt)
-                    })
-                });
-                const payload = await response.json().catch(()=>({}));
-                if (!response.ok) {
-                    var _ref;
-                    return void enqueueSnackbar((_ref = payload == null ? void 0 : payload.error) != null ? _ref : 'Publishing change failed', {
-                        variant: 'error',
-                        allowDuplicate: true
-                    });
-                }
-                enqueueSnackbar(listing.deletedAt ? 'Republished' : 'Unpublished', {
-                    variant: 'success',
-                    persist: false
-                });
-            } catch (error) {
-                console.error(error);
-                enqueueSnackbar('An error has occurred', {
-                    variant: 'error',
-                    allowDuplicate: true
-                });
+    //
+    // Both were saves on the click; each now asks first, with the publisher
+    // agreement above its button (AGL-4105), and is made from that dialog.
+    const [listingChange, setListingChange] = useState(null);
+    const changeListing = useCallback(async (change, agreement)=>{
+        const { kind, listing } = change;
+        const nextVisibility = listing.visibility === 'private' ? 'public' : 'private';
+        try {
+            const response = await authorizedFetch(user, '/api/marketplace/publish-plugin', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(kind === 'visibility' ? {
+                    action: 'set-visibility',
+                    listingId: listing.$id,
+                    visibility: nextVisibility,
+                    agreement
+                } : {
+                    action: 'set-published',
+                    listingId: listing.$id,
+                    published: Boolean(listing.deletedAt),
+                    agreement
+                })
+            });
+            const payload = await response.json().catch(()=>({}));
+            if (!response.ok) {
+                var _ref;
+                return String((_ref = payload == null ? void 0 : payload.error) != null ? _ref : kind === 'visibility' ? 'Visibility change failed' : 'Publishing change failed');
             }
-        }, [
+            enqueueSnackbar(kind === 'visibility' ? nextVisibility === 'private' ? 'Now private — only your sites can install it' : 'Published to the marketplace' : listing.deletedAt ? 'Republished' : 'Unpublished', {
+                variant: 'success',
+                persist: false
+            });
+            return null;
+        } catch (error) {
+            console.error(error);
+            return 'An error has occurred';
+        }
+    }, [
         user,
         enqueueSnackbar
     ]);
+    const listingChangeCopy = (()=>{
+        const listing = listingChange == null ? void 0 : listingChange.listing;
+        const name = (listing == null ? void 0 : listing.displayName) || 'this listing';
+        if ((listingChange == null ? void 0 : listingChange.kind) === 'visibility') {
+            return (listing == null ? void 0 : listing.visibility) === 'private' ? {
+                title: 'Make public?',
+                body: `${name} is offered in the marketplace, not only to your organization’s sites.`,
+                confirmLabel: 'Make public',
+                destructive: false
+            } : {
+                title: 'Make private?',
+                body: `Only your organization’s sites can install ${name}. Private plugins never appear in the marketplace.`,
+                confirmLabel: 'Make private',
+                destructive: false
+            };
+        }
+        return (listing == null ? void 0 : listing.deletedAt) ? {
+            title: 'Republish?',
+            body: `${name} goes back on the marketplace.`,
+            confirmLabel: 'Republish',
+            destructive: false
+        } : {
+            title: 'Unpublish?',
+            body: `${name} comes off the marketplace. You can republish it later.`,
+            confirmLabel: 'Unpublish',
+            destructive: true
+        };
+    })();
     const cards = {
         profile: /*#__PURE__*/ _jsxs(Stack, {
             spacing: 2,
@@ -597,12 +570,17 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
                                 size: "small",
                                 helperText: "https://linkedin.com/…"
                             }),
+                            /*#__PURE__*/ _jsx(PublisherAgreementCheckbox, {
+                                checked: profileAgreement.agreed,
+                                onChange: profileAgreement.setAgreed,
+                                disabled: profileBusy
+                            }),
                             /*#__PURE__*/ _jsx(Button, {
                                 variant: "contained",
                                 color: "primary",
-                                disabled: !validHandle || !displayName.trim(),
+                                disabled: profileBusy || !validHandle || !displayName.trim() || !profileAgreement.agreed,
                                 onClick: handleSave,
-                                children: 'Save profile'
+                                children: profileBusy ? 'Saving…' : 'Save profile'
                             })
                         ]
                     })
@@ -611,42 +589,28 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
                     header: PUBLISHER_AGREEMENT_TITLE,
                     help: pluginDocsHelp('publisherHandbook', {
                         anchor: '#the-publisher-agreement',
-                        excerpt: 'The terms your organization publishes under — accepted once, ' + 're-asked when they change.'
+                        excerpt: 'The terms your organization publishes under — agreed to on ' + 'every save in the marketplace.'
                     }),
                     contentGutterX: true,
                     contentGutterY: true,
                     children: /*#__PURE__*/ _jsxs(Stack, {
                         spacing: 2,
                         children: [
-                            agreementState === 'current' ? /*#__PURE__*/ _jsx(Alert, {
-                                severity: "success",
-                                children: `Accepted — version ${profile == null ? void 0 : (_profile_publisherAgreement = profile.publisherAgreement) == null ? void 0 : _profile_publisherAgreement.version}` + (acceptedOn ? ` on ${acceptedOn}` : '')
-                            }) : null,
                             agreementPresentation.unavailableNotice ? /*#__PURE__*/ _jsx(Alert, {
                                 severity: "warning",
                                 children: agreementPresentation.unavailableNotice
-                            }) : agreementState === 'current' ? null : /*#__PURE__*/ _jsx(Alert, {
-                                severity: agreementState === 'outdated' ? 'warning' : 'info',
-                                children: agreementState === 'outdated' ? 'These terms have changed since your organization accepted ' + `them (you accepted ${profile == null ? void 0 : (_profile_publisherAgreement1 = profile.publisherAgreement) == null ? void 0 : _profile_publisherAgreement1.version}). ` + 'Publishing is paused until someone who can bind the ' + 'organization accepts the current version.' : 'Your organization has not accepted these terms. You can ' + 'set up a profile without them, but you cannot publish.'
+                            }) : /*#__PURE__*/ _jsx(Typography, {
+                                variant: "body2",
+                                color: "text.secondary",
+                                children: 'Every save in the marketplace — this profile, a listing, its ' + 'price or visibility, a new version, a component, template ' + `or layout — asks you to tick “I agree to the ${PUBLISHER_AGREEMENT_TITLE}” ` + 'first. We record who agreed, to which version, and when.'
+                            }),
+                            agreementState === 'none' ? null : /*#__PURE__*/ _jsx(Typography, {
+                                variant: "body2",
+                                children: `Last agreed to: version ${profile == null ? void 0 : (_profile_publisherAgreement = profile.publisherAgreement) == null ? void 0 : _profile_publisherAgreement.version}` + (acceptedOn ? `, on ${acceptedOn}` : '') + (agreementState === 'outdated' ? `. The current version is ${PUBLISHER_AGREEMENT_VERSION}, ` + 'which your next save agrees to.' : '.')
                             }),
                             /*#__PURE__*/ _jsx(PublisherAgreementSummary, {
                                 documentUrl: agreementPresentation.documentUrl
-                            }),
-                            agreementPresentation.canAccept ? /*#__PURE__*/ _jsx(Button, {
-                                variant: "contained",
-                                color: "primary",
-                                disabled: agreementBusy,
-                                onClick: ()=>void handleAcceptAgreement(),
-                                sx: {
-                                    alignSelf: 'flex-start'
-                                },
-                                children: agreementBusy ? 'Recording…' : agreementState === 'outdated' ? 'Accept the current version' : 'Accept on behalf of this organization'
-                            }) : null,
-                            agreementPresentation.canAccept ? /*#__PURE__*/ _jsx(Typography, {
-                                variant: "caption",
-                                color: "text.secondary",
-                                children: 'Accepting binds the organization, not you personally — only ' + 'an owner or admin can do it, and we record who did and when.'
-                            }) : null
+                            })
                         ]
                     })
                 })
@@ -776,28 +740,42 @@ const HANDLE_PATTERN = /^[a-z0-9][a-z0-9-]{2,29}$/;
                             children: 'Edit listing'
                         }),
                         ((_ref2 = rowMenu == null ? void 0 : (_rowMenu_listing2 = rowMenu.listing) == null ? void 0 : _rowMenu_listing2.artifactType) != null ? _ref2 : rowMenu == null ? void 0 : (_rowMenu_listing3 = rowMenu.listing) == null ? void 0 : _rowMenu_listing3.type) === 'plugin' ? /*#__PURE__*/ _jsx(MenuItem, {
-                            disabled: visibilityBusy === (rowMenu == null ? void 0 : (_rowMenu_listing4 = rowMenu.listing) == null ? void 0 : _rowMenu_listing4.$id),
                             onClick: ()=>{
                                 const listing = rowMenu == null ? void 0 : rowMenu.listing;
                                 closeRowMenu();
-                                if (listing) void handleVisibility(listing)();
+                                if (listing) setListingChange({
+                                    kind: 'visibility',
+                                    listing
+                                });
                             },
-                            children: (rowMenu == null ? void 0 : (_rowMenu_listing5 = rowMenu.listing) == null ? void 0 : _rowMenu_listing5.visibility) === 'private' ? 'Make public…' : 'Make private'
+                            children: (rowMenu == null ? void 0 : (_rowMenu_listing4 = rowMenu.listing) == null ? void 0 : _rowMenu_listing4.visibility) === 'private' ? 'Make public…' : 'Make private…'
                         }) : null,
                         /*#__PURE__*/ _jsx(Divider, {}),
                         /*#__PURE__*/ _jsx(MenuItem, {
                             sx: {
-                                color: (rowMenu == null ? void 0 : (_rowMenu_listing6 = rowMenu.listing) == null ? void 0 : _rowMenu_listing6.deletedAt) ? undefined : 'error.main'
+                                color: (rowMenu == null ? void 0 : (_rowMenu_listing5 = rowMenu.listing) == null ? void 0 : _rowMenu_listing5.deletedAt) ? undefined : 'error.main'
                             },
                             onClick: ()=>{
                                 const listing = rowMenu == null ? void 0 : rowMenu.listing;
                                 closeRowMenu();
-                                if (listing) void handleUnpublish(listing)();
+                                if (listing) setListingChange({
+                                    kind: 'published',
+                                    listing
+                                });
                             },
-                            children: (rowMenu == null ? void 0 : (_rowMenu_listing7 = rowMenu.listing) == null ? void 0 : _rowMenu_listing7.deletedAt) ? 'Republish' : 'Unpublish'
+                            children: (rowMenu == null ? void 0 : (_rowMenu_listing6 = rowMenu.listing) == null ? void 0 : _rowMenu_listing6.deletedAt) ? 'Republish…' : 'Unpublish…'
                         })
                     ]
                 }),
+                /*#__PURE__*/ _jsx(PublisherAgreementConfirmDialog, {
+                    open: Boolean(listingChange),
+                    title: listingChangeCopy.title,
+                    body: listingChangeCopy.body,
+                    confirmLabel: listingChangeCopy.confirmLabel,
+                    destructive: listingChangeCopy.destructive,
+                    onConfirm: (agreement)=>listingChange ? changeListing(listingChange, agreement) : Promise.resolve(null),
+                    onClose: ()=>setListingChange(null)
+                }),
                 /*#__PURE__*/ _jsx(EditListingDialog, {
                     orgId: orgId,
                     listing: editListing,