@columenlabs/lumen-ui 0.1.235 → 0.1.236

package/dist/assistant/settings.js

@@ -117,12 +117,20 @@ const wayTest = (k, plan = false) => k?.test
     : null;
 /** A provider's mark: its initial on a tile. */
 const mark = (label) => _jsx(ConnectionLogo, { text: label.charAt(0) });
+/**
+ * Whether the app lets this person use `w` of their own on `p` (the app's `ownWays`, the same
+ * rule the server pays by). A way it does not allow never shows, even when one is still stored:
+ * the server would not run on it, so Settings never says it works.
+ */
+const mayOwn = (p, w) => !p.own_ways || p.own_ways.includes(w);
+/** Whether the person has a way of their own on `p` that the app lets them use. */
+const ownUsable = (p) => (mayOwn(p, 'key') && p.own.set) || (mayOwn(p, 'plan') && !!p.plan?.set);
 /** One provider, collapsed to a row: the person's own key and, where it has one, their plan sign-in. */
 function OwnProviderKey({ client, p }) {
     const { apply, refresh } = useApply(client);
     const ways = [];
-    const may = (w) => !p.own_ways || p.own_ways.includes(w);
-    if (p.signin === 'chatgpt' && (may('plan') || p.plan?.set))
+    const may = (w) => mayOwn(p, w);
+    if (p.signin === 'chatgpt' && may('plan'))
         ways.push({
             id: 'plan',
             label: 'ChatGPT plan',
@@ -139,7 +147,7 @@ function OwnProviderKey({ client, p }) {
             removeText: 'Your API key, if you set one, runs from then on.',
             removeLabel: 'Sign out',
         });
-    if (may('key') || p.own.set)
+    if (may('key'))
         ways.push({
             id: 'key',
             label: 'API key',
@@ -161,10 +169,10 @@ function OwnProviderKey({ client, p }) {
 function Providers({ client }) {
     const { apply } = useApply(client);
     return (_jsx(WithStatus, { client: client, children: (s) => {
-            // A provider the app gives this person no way of their own on shows no row, unless one is
-            // still set (so it can be removed).
-            const rows = s.providers.filter((p) => !p.own_ways || p.own_ways.length > 0 || p.own.set || p.plan?.set);
-            const ownSet = rows.some((p) => p.own.set || p.plan?.set);
+            // A provider the app gives this person no way of their own on shows no row: what shows here
+            // is exactly what the server may pay with.
+            const rows = s.providers.filter((p) => !p.own_ways || p.own_ways.length > 0);
+            const ownSet = rows.some(ownUsable);
             return (_jsxs("div", { className: "flex flex-col", children: [_jsx(LumenExpandList, { children: rows.map((p) => (_jsx(OwnProviderKey, { client: client, p: p }, p.id))) }), ownSet && (_jsx(Row, { label: "Answers run on", info: "Your own key or plan first, with the shared credits behind it; or the shared credits first.", children: _jsx(LumenSelector, { label: "Answers run on", size: "sm", className: "w-44", value: s.pay, options: [
                                 { value: 'own', label: 'Your own first' },
                                 { value: 'app', label: 'Shared credits first' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@columenlabs/lumen-ui",
-  "version": "0.1.235",
+  "version": "0.1.236",
   "description": "Lumen: shared React components (frame, views, widgets, charts, drawers).",
   "license": "MIT",
   "type": "module",
@@ -49,7 +49,7 @@
     "@codemirror/lang-javascript": "6.2.5",
     "@codemirror/lang-json": "6.0.2",
     "@codemirror/lang-sql": "6.10.0",
-    "@columenlabs/lumen-ui-types": "0.1.235",
+    "@columenlabs/lumen-ui-types": "0.1.236",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",