@hanzo/app 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/Gate.js CHANGED
@@ -44,7 +44,7 @@ import { useHostname } from './lib/hostname.js';
44
44
  import { useHydrated } from './lib/hydrated.js';
45
45
  import { api } from './lib/api.js';
46
46
  import { usePersonal, useTier } from './lib/tier.js';
47
- import { CHOOSE, ORG, PICKED, assumed, bearer, hasSession, org, orgs as claimed, pick, renew, role, scope, superAdmin, support } from './lib/session.js';
47
+ import { CHOOSE, ORG, assumed, bearer, hasSession, org, orgs as claimed, pick, renew, role, scope, superAdmin, support } from './lib/session.js';
48
48
  import { matches, refusal, slugify } from './lib/orgname.js';
49
49
  import { team as workspace } from './lib/host.js';
50
50
  import { checkoutUrl, money } from './lib/pay.js';
@@ -85,7 +85,6 @@ export function Gate({ children, front = false, forward, signup = false, }) {
85
85
  window.removeEventListener('storage', on);
86
86
  };
87
87
  }, [accessToken]);
88
- const [picked, setPicked] = useState(false);
89
88
  // The team being set up in this page. Once its name is taken the setup owns
90
89
  // the screen until checkout, whatever `Gate` reads of the new organization.
91
90
  const [founding, setFounding] = useState(null);
@@ -106,14 +105,6 @@ export function Gate({ children, front = false, forward, signup = false, }) {
106
105
  const supporting = Boolean(current) && assumed() === current;
107
106
  const open = !asks || live || supporting;
108
107
  const { client } = useAi();
109
- useEffect(() => {
110
- try {
111
- setPicked(Boolean(localStorage.getItem(PICKED)));
112
- }
113
- catch {
114
- setPicked(true);
115
- }
116
- }, [accessToken]);
117
108
  // Back from checkout: the plan may be live now.
118
109
  useEffect(() => {
119
110
  const back = () => {
@@ -136,7 +127,6 @@ export function Gate({ children, front = false, forward, signup = false, }) {
136
127
  }, []);
137
128
  const choose = useCallback((o) => {
138
129
  pick(o);
139
- setPicked(true);
140
130
  setChoosing(false);
141
131
  }, []);
142
132
  // The organization a link arrives for. hanzo.ai opens the workspace at
@@ -155,11 +145,6 @@ export function Gate({ children, front = false, forward, signup = false, }) {
155
145
  if (members.includes(asked))
156
146
  choose(asked);
157
147
  }, [door, hydrated, isLoading, isAuthenticated, members, choose]);
158
- // One organization is not a choice.
159
- useEffect(() => {
160
- if (members.length === 1 && !picked)
161
- choose(members[0]);
162
- }, [members, picked, choose]);
163
148
  // The template chosen at creation, set up once the organization opens.
164
149
  useEffect(() => {
165
150
  if (!open || !client)
@@ -213,11 +198,17 @@ export function Gate({ children, front = false, forward, signup = false, }) {
213
198
  return _jsx(Landing, { member: true });
214
199
  return door ? _jsx(Start, { onFounded: setFounding, first: true }) : _jsx(Create, {});
215
200
  }
216
- if (!current || (members.length > 1 && !picked))
201
+ // The organization this browser works in is the choice (session.ts `org`: the
202
+ // SDK's selection when the token names it, else the person's only one). Only a
203
+ // browser working in none of the person's is asked, so a sign-in goes straight
204
+ // to the app in the organization the person last worked in, and the account
205
+ // menu switches it (`choosing`).
206
+ if (!current)
217
207
  return _jsx(Pick, { members: members, current: current, onPick: choose });
218
- // Asked for over an open app, the app keeps its place under the chooser and closing it goes back.
208
+ // Asked for over an open app, the app keeps its place under the chooser and closing it goes back;
209
+ // asked for from a plan's page (`swap`), the chooser stands alone, since that app is not open.
219
210
  if (choosing)
220
- return _jsxs(_Fragment, { children: [_jsx(Held, { veiled: true, children: children }), _jsx(Pick, { members: members, current: current, onPick: choose, onClose: () => setChoosing(false) })] });
211
+ return _jsxs(_Fragment, { children: [open ? _jsx(Held, { veiled: true, children: children }) : null, _jsx(Pick, { members: members, current: current, onPick: choose, onClose: () => setChoosing(false) })] });
221
212
  if (open)
222
213
  return forward ? _jsx(Forward, { to: forward }) : _jsx(_Fragment, { children: _jsx(Held, { veiled: false, children: children }) });
223
214
  // IN THE WORKSPACE NOTHING OPENS WITHOUT A LIVE PLAN. Every branch here
@@ -230,7 +221,7 @@ export function Gate({ children, front = false, forward, signup = false, }) {
230
221
  return _jsxs(_Fragment, { children: [_jsx(Held, { veiled: true, children: children }), _jsx(Veil, {})] });
231
222
  if (free && personal === null)
232
223
  return _jsxs(_Fragment, { children: [_jsx(Held, { veiled: true, children: children }), _jsx(Veil, {})] });
233
- const swap = () => setPicked(false);
224
+ const swap = () => setChoosing(true);
234
225
  if (door) {
235
226
  // A billing OUTAGE is ours; the plan is still the condition.
236
227
  if (!tier)
@@ -449,7 +440,6 @@ function CreateDialog({ onClose }) {
449
440
  try {
450
441
  if (template)
451
442
  localStorage.setItem(SETUP, template);
452
- localStorage.setItem(PICKED, '1');
453
443
  }
454
444
  catch {
455
445
  /* the next load re-derives both */
@@ -182,12 +182,10 @@ export declare function scope(): Record<string, string>;
182
182
  export declare function renew(): void;
183
183
  /** Fired on `window` when the organization this browser works in changes. */
184
184
  export declare const ORG = "hanzo:org";
185
- /** This person picked an organization in this browser. `own()` clears it with the person. */
186
- export declare const PICKED = "hanzo:org:picked";
187
185
  /**
188
- * Work in this organization from now on: the SDK's selection, noted as picked
189
- * and announced. Noted here, so a choice made anywhere — the shell's gate, the
190
- * app's account menu — is one the gate does not ask for again.
186
+ * Work in this organization from now on: the SDK's selection, announced. A choice
187
+ * made anywhere (the shell's gate, the app's account menu) is the one `org()`
188
+ * answers, so the gate does not ask for it again.
191
189
  */
192
190
  export declare function pick(o: string): void;
193
191
  /** Fired on `window` to open the organization chooser over the shell. */
@@ -453,17 +453,14 @@ export function renew() {
453
453
  }
454
454
  /** Fired on `window` when the organization this browser works in changes. */
455
455
  export const ORG = 'hanzo:org';
456
- /** This person picked an organization in this browser. `own()` clears it with the person. */
457
- export const PICKED = 'hanzo:org:picked';
458
456
  /**
459
- * Work in this organization from now on: the SDK's selection, noted as picked
460
- * and announced. Noted here, so a choice made anywhere — the shell's gate, the
461
- * app's account menu — is one the gate does not ask for again.
457
+ * Work in this organization from now on: the SDK's selection, announced. A choice
458
+ * made anywhere (the shell's gate, the app's account menu) is the one `org()`
459
+ * answers, so the gate does not ask for it again.
462
460
  */
463
461
  export function pick(o) {
464
462
  try {
465
463
  window.localStorage.setItem(`${PREFIX}current_org`, o);
466
- window.localStorage.setItem(PICKED, '1');
467
464
  }
468
465
  catch {
469
466
  /* the choice lives only in this page */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hanzo/app",
3
- "version": "0.3.4",
3
+ "version": "0.3.5",
4
4
  "description": "Hanzo's app: the shell and its apps (Home, Chat, Inbox, Contacts, Meet, Calendar, Drive, Board, Work, Bots), once, for every Hanzo surface.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",