@hanzo/build 0.2.85 → 0.2.87

package/lib/api/github.d.ts

@@ -78,6 +78,13 @@ export interface Installation {
 }
 /** The accounts this org has bound the App on. An org admin adds one through `/v1/provider/github/connect`. */
 export declare function installations(t: Target): Promise<Installation[]>;
+/**
+ * Whether this page reaches GitHub at all, and as whom: the person's own
+ * connection first, else the accounts the org has bound the App on. An org that
+ * installed the App (onboarding's Connect GitHub) has its repositories to sync
+ * without the person connecting their own, so it reads as connected too.
+ */
+export declare function linked(me: Connection, installed: Installation[]): Connection;
 /** One repository the GitHub connection grants this organization. */
 export interface Grant {
     owner: string;

package/lib/api/github.js

@@ -98,6 +98,18 @@ export async function installations(t) {
         .map((i) => ({ login: str(i.login), type: str(i.type), grant: str(i.grant), connected: i.connected === true }))
         .filter((i) => i.login);
 }
+/**
+ * Whether this page reaches GitHub at all, and as whom: the person's own
+ * connection first, else the accounts the org has bound the App on. An org that
+ * installed the App (onboarding's Connect GitHub) has its repositories to sync
+ * without the person connecting their own, so it reads as connected too.
+ */
+export function linked(me, installed) {
+    if (me.connected)
+        return me;
+    const bound = installed.filter((i) => i.connected).map((i) => i.login);
+    return bound.length ? { configured: me.configured, connected: true, login: bound.join(', @') } : me;
+}
 /**
  * One row of GET /v1/provider/github/repos (apps/provider github_index.go
  * repoView): `owner`, `name`, `full_name`, `private`, `default_branch`,

package/lib/api/provider.d.ts

@@ -29,7 +29,12 @@ export declare const SOCIAL: readonly {
 }[];
 /** The provider's consent page for this org; its return lands on `back` when that is a Hanzo app page. */
 export declare function authorize(t: Target, id: string, back?: string): Promise<string>;
-export declare function disconnect(t: Target, id: string): Promise<void>;
+/**
+ * Forget the org's connection to a provider: every account, or the one `account`
+ * names (a GitHub login). For GitHub the platform also removes its App from an
+ * account no other org uses, so connecting that account again is a fresh install.
+ */
+export declare function disconnect(t: Target, id: string, account?: string): Promise<void>;
 export interface Channel {
     id: string;
     name: string;

package/lib/api/provider.js

@@ -5,7 +5,7 @@
  *
  *   GET  /v1/provider/{id}              one connector and this org's connection to it
  *   POST /v1/provider/{id}/connect      {return} → {authorizeUrl}: the provider's own consent page (org admin)
- *   POST /v1/provider/{id}/disconnect   forget the org's connection (org admin)
+ *   POST /v1/provider/{id}/disconnect   {account?} → forget the org's connection, or one account of it (org admin)
  *   GET  /v1/provider/slack/channels    the connected workspace's channels, a page at a time
  *
  * Connecting leaves this page once, for the provider's consent screen, and only
@@ -76,8 +76,13 @@ export async function authorize(t, id, back) {
         throw new Sentence(phrase('The platform did not name a {provider} address to connect at'), { provider: id });
     return url;
 }
-export async function disconnect(t, id) {
-    await call(t, 'POST', `/v1/provider/${seg(id)}/disconnect`, {});
+/**
+ * Forget the org's connection to a provider: every account, or the one `account`
+ * names (a GitHub login). For GitHub the platform also removes its App from an
+ * account no other org uses, so connecting that account again is a fresh install.
+ */
+export async function disconnect(t, id, account) {
+    await call(t, 'POST', `/v1/provider/${seg(id)}/disconnect`, account ? { account } : {});
 }
 export async function channels(t, cursor = '') {
     const raw = obj(await call(t, 'GET', `/v1/provider/slack/channels${query({ cursor })}`));

package/lib/forge.js

@@ -30,7 +30,8 @@ import { useHost, useTarget } from './host.js';
 import { path } from './route.js';
 import { Customize } from './customize/index.js';
 import { Sync } from './sync.js';
-import { connect, connection, grants, syncIssues } from './api/github.js';
+import { connect, connection, disconnect as unlink, grants, installations, linked, syncIssues } from './api/github.js';
+import { disconnect } from './api/provider.js';
 import { here, useBack } from './back.js';
 import { Out } from './out.js';
 import { ask, assemble, attach, closes, facets, handle, home, keyOf, matches, pickProjects, place } from './merge.js';
@@ -145,19 +146,31 @@ function Choice({ label, icon, says, onPress }) {
     return (_jsxs(YStack, { render: "button", "aria-label": label, onPress: onPress, flex: 1, minW: 240, gap: "$2", p: "$4", rounded: "$4", borderWidth: 1, borderColor: "$borderColor", bg: "$panel", items: "flex-start", hoverStyle: { borderColor: '$edge', bg: '$hover' }, focusVisibleStyle: { outlineWidth: 2, outlineStyle: 'solid', outlineColor: '$outlineColor' }, children: [icon, _jsxs(XStack, { items: "center", gap: "$1.5", children: [_jsx(SizableText, { size: "$4", color: "$ink", fontWeight: "500", children: label }), _jsx(ArrowRight, { size: 14, 'data-i18n-mirror': '' })] }), _jsx(SizableText, { size: "$2", color: "$soft", text: "start", children: says })] }));
 }
 /**
- * The person's GitHub connection, in one line: who it is connected as and the
- * way to sync, or the one press that connects it. GitHub returns here, and this
- * page finishes the connect (../back.ts).
+ * The GitHub connection, in one line: who it is connected as and the way to
+ * sync, or the one press that connects it. The person's own connection, or else
+ * the accounts the org has bound the App on (`linked`), so an org that installed
+ * the App in onboarding does not read as unconnected here. GitHub returns here,
+ * and this page finishes the connect (../back.ts).
+ *
+ * Disconnect lets go of it, so another account can be connected: the person's own
+ * link, or (for an org admin) the org's App accounts, which the platform also
+ * uninstalls on GitHub. It asks once before doing either.
  */
 function GitHubLink({ onSync }) {
     const host = useHost();
     const target = useTarget();
     const { t } = useI18n();
     const me = useRead(() => connection(target), null, [target]);
+    // An org whose installations cannot be read falls back to the person's own connection.
+    const installed = useRead(() => installations(target).catch(() => []), [], [target]);
     const [note, setNote] = useState('');
     const [busy, setBusy] = useState(false);
-    useBack(target, true, setNote, me.reload);
-    const c = me.value;
+    const [asking, setAsking] = useState(false);
+    useBack(target, true, setNote, () => {
+        me.reload();
+        installed.reload();
+    });
+    const c = me.value ? linked(me.value, installed.value) : null;
     // A connection that cannot be read says nothing here: Sync from GitHub above still works.
     if (me.error || !c || !c.configured)
         return note ? _jsx(Note, { children: note }) : null;
@@ -172,7 +185,31 @@ function GitHubLink({ onSync }) {
             setBusy(false);
         }
     };
-    return (_jsxs(XStack, { items: "center", gap: "$3", px: "$3", py: "$2.5", rounded: "$3", borderWidth: 1, borderColor: "$borderColor", bg: "$panel", flexWrap: "wrap", children: [_jsx(Github, { size: 16 }), _jsxs(YStack, { flex: 1, minW: 200, children: [_jsx(SizableText, { size: "$2", color: "$ink", children: c.connected ? t('GitHub connected as {login}', { login: `@${c.login}` }) : t('Connect GitHub to bring your repositories here') }), _jsx(SizableText, { size: "$1", color: "$soft", children: note || (c.connected ? t('Choose repositories to mirror; each stays in step with GitHub.') : t('One step on GitHub, then pick the repositories to sync.')) })] }), c.connected ? (_jsxs(Button, { size: "sm", variant: "outline", onPress: onSync, children: [_jsx(RefreshCw, { size: 14 }), t('Sync repositories')] })) : (_jsxs(Button, { size: "sm", variant: "primary", disabled: busy, onPress: () => void link(), children: [_jsx(Github, { size: 14 }), busy ? t('Opening GitHub…') : t('Connect GitHub')] }))] }));
+    // The person's own link is theirs to drop; the org's App accounts are an org admin's.
+    const own = me.value?.connected === true;
+    const leave = c.connected && (own || host.admin);
+    const drop = async () => {
+        setBusy(true);
+        setNote('');
+        try {
+            await (own ? unlink(target) : disconnect(target, 'github'));
+            setAsking(false);
+            setNote(t('GitHub is disconnected. Connect it again to choose another account.'));
+            me.reload();
+            installed.reload();
+        }
+        catch (e) {
+            setNote(e.message);
+        }
+        finally {
+            setBusy(false);
+        }
+    };
+    return (_jsxs(XStack, { items: "center", gap: "$3", px: "$3", py: "$2.5", rounded: "$3", borderWidth: 1, borderColor: "$borderColor", bg: "$panel", flexWrap: "wrap", children: [_jsx(Github, { size: 16 }), _jsxs(YStack, { flex: 1, minW: 200, children: [_jsx(SizableText, { size: "$2", color: "$ink", children: c.connected ? t('GitHub connected as {login}', { login: `@${c.login}` }) : t('Connect GitHub to bring your repositories here') }), _jsx(SizableText, { size: "$1", color: "$soft", children: asking
+                            ? own
+                                ? t('Disconnect your GitHub from Hanzo?')
+                                : t('Disconnect @{login}? Hanzo’s GitHub App is removed from it too, unless another organization uses it.', { login: c.login })
+                            : note || (c.connected ? t('Choose repositories to mirror; each stays in step with GitHub.') : t('One step on GitHub, then pick the repositories to sync.')) })] }), c.connected && asking ? (_jsxs(XStack, { gap: "$2", children: [_jsx(Button, { size: "sm", variant: "outline", disabled: busy, onPress: () => setAsking(false), children: t('Cancel') }), _jsx(Button, { size: "sm", variant: "primary", disabled: busy, onPress: () => void drop(), children: busy ? t('Disconnecting…') : t('Disconnect') })] })) : c.connected ? (_jsxs(XStack, { gap: "$2", children: [_jsxs(Button, { size: "sm", variant: "outline", onPress: onSync, children: [_jsx(RefreshCw, { size: 14 }), t('Sync repositories')] }), leave ? (_jsx(Button, { size: "sm", variant: "outline", disabled: busy, onPress: () => setAsking(true), children: t('Disconnect') })) : null] })) : (_jsxs(Button, { size: "sm", variant: "primary", disabled: busy, onPress: () => void link(), children: [_jsx(Github, { size: 14 }), busy ? t('Opening GitHub…') : t('Connect GitHub')] }))] }));
 }
 /** The menus' words, marked (`phrase`) and drawn through `t`; GitHub and Hanzo are names, drawn as given. */
 const KINDS = { all: phrase('Issues and pull requests'), issue: phrase('Issues'), pr: phrase('Pull requests') };

package/lib/settings/integrations.js

@@ -85,7 +85,7 @@ export function Integrations() {
                                             ? t('This deployment cannot connect GitHub yet.')
                                             : me.connected
                                                 ? t('Connected as @{login}', { login: me.login })
-                                                : t('Not connected'), trailing: me?.configured ? (me.connected ? (_jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void act(() => unlinkGithub(target), t('Your GitHub is disconnected'), mine.reload), children: t('Disconnect') })) : (_jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void away(() => connect(target, here())), children: t('Connect') }))) : null }), installed.error ? (_jsx(Row, { title: t('App installations'), detail: told(installed.error, t) })) : (installed.value.map((i) => (_jsx(Row, { leading: _jsx(Github, { size: 16 }), title: i.login, detail: [i.type, i.grant === 'all' ? t('every repository') : i.grant === 'selected' ? t('selected repositories') : ''].filter(Boolean).join(' · '), trailing: _jsx(SizableText, { size: "$1", color: i.connected ? '$ink' : '$soft', children: i.connected ? t('Installed') : t('Removed on GitHub') }) }, i.login)))), !installed.error && !installed.loading && installed.value.length === 0 ? (_jsx(Row, { title: t('No GitHub accounts installed'), detail: t('Install the App on a GitHub account to bring its repositories here.') })) : null] }), host.admin ? (_jsx(XStack, { children: _jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void away(() => authorize(target, 'github', here())), children: t('Install on a GitHub account') }) })) : (_jsx(SizableText, { size: "$1", color: "$soft", children: t('An org admin installs the App on a GitHub account.') }))] }), _jsxs(Group, { title: "Slack", detail: t('Talk to Hanzo from your workspace’s channels.'), children: [_jsxs(Card, { children: [_jsx(Row, { first: true, leading: _jsx(Slack, { size: 16 }), title: s?.connected && s.account ? s.account : 'Slack', detail: slack.error
+                                                : t('Not connected'), trailing: me?.configured ? (me.connected ? (_jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void act(() => unlinkGithub(target), t('Your GitHub is disconnected'), mine.reload), children: t('Disconnect') })) : (_jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void away(() => connect(target, here())), children: t('Connect') }))) : null }), installed.error ? (_jsx(Row, { title: t('App installations'), detail: told(installed.error, t) })) : (installed.value.map((i) => (_jsx(Row, { leading: _jsx(Github, { size: 16 }), title: i.login, detail: [i.type, i.grant === 'all' ? t('every repository') : i.grant === 'selected' ? t('selected repositories') : ''].filter(Boolean).join(' · '), trailing: _jsxs(XStack, { gap: "$2", items: "center", children: [_jsx(SizableText, { size: "$1", color: i.connected ? '$ink' : '$soft', children: i.connected ? t('Installed') : t('Removed on GitHub') }), host.admin ? (_jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void act(() => disconnect(target, 'github', i.login), t('@{login} is disconnected', { login: i.login }), installed.reload), children: t('Disconnect') })) : null] }) }, i.login)))), !installed.error && !installed.loading && installed.value.length === 0 ? (_jsx(Row, { title: t('No GitHub accounts installed'), detail: t('Install the App on a GitHub account to bring its repositories here.') })) : null] }), host.admin ? (_jsx(XStack, { children: _jsx(Button, { size: "sm", variant: "outline", disabled: working, onPress: () => void away(() => authorize(target, 'github', here())), children: t('Install on a GitHub account') }) })) : (_jsx(SizableText, { size: "$1", color: "$soft", children: t('An org admin installs the App on a GitHub account.') }))] }), _jsxs(Group, { title: "Slack", detail: t('Talk to Hanzo from your workspace’s channels.'), children: [_jsxs(Card, { children: [_jsx(Row, { first: true, leading: _jsx(Slack, { size: 16 }), title: s?.connected && s.account ? s.account : 'Slack', detail: slack.error
                                     ? told(slack.error, t)
                                     : !s
                                         ? t('Reading…')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/build",
-  "version": "0.2.85",
+  "version": "0.2.87",
   "type": "module",
   "license": "Apache-2.0 OR MIT",
   "description": "Hanzo Build — say what you want, watch it built, deployed and running. The builder as a component, mounted by the Hanzo app at hanzo.ai.",