@skillcdn/console 0.1.24 → 0.3.1

package/src/console.tsx

@@ -35,6 +35,7 @@ import {
   RULES_PATH,
   RULES_TITLE,
   type TaskState,
+  type WeekStart,
 } from "./api.js";
 import { Board, BoardFilters, type BoardProps, byDue, filterTasks } from "./components/board.js";
 import { Calendar, type CalendarProps, Workload } from "./components/calendar.js";
@@ -44,12 +45,12 @@ import { DecisionForm } from "./components/decision-form.js";
 import { DecisionCard, DecisionList, type DecisionListProps } from "./components/decision-list.js";
 import { EventFeed, type EventFeedProps } from "./components/event-feed.js";
 import { GoalForm, GoalList, type GoalListProps, GoalView, goalMonth } from "./components/goals.js";
+import { PackTokenWays } from "./components/pack-token.js";
 import { PAGE_SIZE } from "./components/paged.js";
 import { ListingForm, PeopleList, type PeopleListProps } from "./components/people.js";
 import {
   MemberList,
   type MemberListProps,
-  PackTokenForm,
   ProjectForm,
   ProjectList,
   type ProjectListProps,
@@ -81,6 +82,12 @@ import {
   Time,
 } from "./components/ui.js";
 import { WorkList, type WorkListProps } from "./components/work.js";
+import {
+  peopleVisibilityOf,
+  WorkspaceSettingsForm,
+  WorkspaceSettingsView,
+  weekStartOf,
+} from "./components/workspace.js";
 import { ConnectPage } from "./connect-page.js";
 import { type ConsoleData, useConsoleData } from "./data.js";
 import { monthOf, today } from "./dates.js";
@@ -98,6 +105,7 @@ import {
   calendarHref,
   customPageHref,
   decisionHref,
+  decisionsHref,
   docHref,
   type GoalTaskView,
   goalHref,
@@ -860,6 +868,7 @@ function ProjectPage(props: {
           tasks={shown}
           month={month}
           today={now}
+          weekStart={weekStartOf(data.me?.workspace)}
           categories={data.categories}
           goals={data.goals}
           taskHref={href}
@@ -1074,6 +1083,7 @@ function ProjectPage(props: {
               tasks={towards}
               month={month}
               today={now}
+              weekStart={weekStartOf(data.me?.workspace)}
               categories={data.categories}
               goals={[goal]}
               taskHref={href}
@@ -1112,6 +1122,8 @@ function ProjectPage(props: {
           taskHref={href}
           docHref={toDoc}
           decisionHref={(decision) => decisionHref(key, decision.id)}
+          page={route.page}
+          pageHref={(page) => decisionsHref(key, page)}
           onAnswer={onAnswer}
           onUpdate={onUpdate}
           busy={busy}
@@ -1217,19 +1229,34 @@ function ProjectPage(props: {
     const me = data.me?.person ?? undefined;
     const configures = owner;
     const members = words.projects.members;
+    // In a project open to the workspace everyone is a member already (ADR-0035): the list is
+    // everyone, nobody is added or removed, and an owner is made from a row. Where the People
+    // page shows a member only whom they share a project with, an owner lists someone the list
+    // does not show by their login.
+    const open = project.visibility === "workspace";
+    const narrowed =
+      peopleVisibilityOf(data.me?.workspace) === "shared_projects" && me?.role !== "admin";
     return (
       <>
         <div className="sc-page-head">
           <h1 className="sc-page-title">{members.title}</h1>
         </div>
-        <p className="sc-lead">{words.vocabulary.visibility[project.visibility]}</p>
+        {open && <p className="sc-lead">{members.open}</p>}
         {error !== undefined && <Callout tone="danger">{error}</Callout>}
         <components.MemberList
           members={data.members}
           people={data.people.filter(inWorkspace)}
           me={me}
+          open={open}
           busy={busy}
-          onAdd={configures ? (input) => void act(() => data.actions.addMember(input)) : undefined}
+          onAdd={
+            configures && !open
+              ? (input) => void act(() => data.actions.addMember(input))
+              : undefined
+          }
+          lookup={
+            configures && !open && narrowed ? (login) => data.actions.findPerson(login) : undefined
+          }
           onChangeRole={
             configures
               ? (member, role) =>
@@ -1237,7 +1264,7 @@ function ProjectPage(props: {
               : undefined
           }
           onRemove={
-            configures
+            configures && !open
               ? (member) => void act(() => data.actions.removeMember(member.person.id))
               : undefined
           }
@@ -1379,28 +1406,33 @@ function ProjectSettingsPage(props: {
       <>
         {head}
         {error !== undefined && <Callout tone="danger">{error}</Callout>}
-        <section className="sc-panel sc-panel-form" aria-label={words.projects.packToken.aria}>
-          <PackTokenForm
-            set={project.packToken !== null}
-            busy={busy}
-            onSubmit={(token) =>
-              void act(async () => {
-                await data.actions.setPackToken(token);
-                navigation.replace(here);
-              })
-            }
-            onRemove={
-              project.packToken === null
-                ? undefined
-                : () =>
-                    void act(async () => {
-                      await data.actions.removePackToken();
-                      navigation.replace(here);
-                    })
-            }
-            onCancel={() => navigation.back(here)}
-          />
-        </section>
+        <PackTokenWays
+          title={settings.packToken}
+          intro={words.projects.packToken.intro}
+          set={project.packToken !== null}
+          setAt={project.packToken?.setAt}
+          busy={busy}
+          onStart={data.actions.connectPackToken}
+          poll={data.actions.packTokenConnection}
+          onCancelConnect={data.actions.cancelPackTokenConnection}
+          onConnected={() => navigation.replace(here)}
+          onSubmit={(token) =>
+            void act(async () => {
+              await data.actions.setPackToken(token);
+              navigation.replace(here);
+            })
+          }
+          onRemove={
+            project.packToken === null
+              ? undefined
+              : () =>
+                  void act(async () => {
+                    await data.actions.removePackToken();
+                    navigation.replace(here);
+                  })
+          }
+          onBack={() => navigation.back(here)}
+        />
       </>
     );
   }
@@ -1452,7 +1484,9 @@ function ProjectSettingsPage(props: {
               {owner && (
                 <>
                   {" "}
-                  <a href={projectSettingsHref(key, "pack-token")}>{settings.packTokenEdit}</a>
+                  <a href={projectSettingsHref(key, "pack-token")}>
+                    {project.packToken === null ? settings.packTokenAdd : settings.packTokenEdit}
+                  </a>
                 </>
               )}
             </dd>
@@ -1513,7 +1547,7 @@ function ProjectSettingsPage(props: {
  * from, which whoever runs the console set. Read by everyone; the rules written by an administrator.
  */
 function WorkspaceSettingsPage(props: {
-  readonly form: "rules" | undefined;
+  readonly form: "rules" | "workspace" | "pack-token" | undefined;
   readonly data: ConsoleData;
   readonly navigation: Navigation;
 }) {
@@ -1521,7 +1555,8 @@ function WorkspaceSettingsPage(props: {
   const { form, data, navigation } = props;
   const { busy, error, act } = useAction();
   const administrator = data.me?.person?.role === "admin";
-  const skills = data.me?.workspace.skills;
+  const workspace = data.me?.workspace;
+  const skills = workspace?.skills;
   const [rules, setRules] = useState<RestRules | undefined>(undefined);
   useEffect(() => {
     const controller = new AbortController();
@@ -1584,10 +1619,90 @@ function WorkspaceSettingsPage(props: {
       </>
     );
   }
+  if (form === "pack-token") {
+    if (!administrator || workspace === undefined) {
+      return <NothingHere />;
+    }
+    const held = workspace.skills.packToken ?? null;
+    return (
+      <>
+        {head}
+        {error !== undefined && <Callout tone="danger">{error}</Callout>}
+        <PackTokenWays
+          title={words.settings.skillsToken}
+          intro={words.settings.skillsTokenIntro}
+          set={held !== null}
+          setAt={held?.setAt}
+          busy={busy}
+          onStart={data.actions.connectWorkspacePackToken}
+          poll={data.actions.workspacePackTokenConnection}
+          onCancelConnect={data.actions.cancelWorkspacePackTokenConnection}
+          onConnected={() => navigation.replace(PATHS.settings)}
+          onSubmit={(token) =>
+            void act(async () => {
+              await data.actions.setWorkspacePackToken(token);
+              navigation.replace(PATHS.settings);
+            })
+          }
+          onRemove={
+            held === null
+              ? undefined
+              : () =>
+                  void act(async () => {
+                    await data.actions.removeWorkspacePackToken();
+                    navigation.replace(PATHS.settings);
+                  })
+          }
+          onBack={() => navigation.back(PATHS.settings)}
+        />
+      </>
+    );
+  }
+  if (form === "workspace") {
+    if (!administrator || workspace === undefined) {
+      return <NothingHere />;
+    }
+    return (
+      <>
+        {head}
+        {error !== undefined && <Callout tone="danger">{error}</Callout>}
+        <section className="sc-panel sc-panel-form" aria-label={words.settings.workspace.aria}>
+          <h2 className="sc-section-title">{words.settings.workspace.title}</h2>
+          <WorkspaceSettingsForm
+            workspace={workspace}
+            busy={busy}
+            onSubmit={(patch) =>
+              void act(async () => {
+                await data.actions.updateWorkspace(patch);
+                navigation.replace(PATHS.settings);
+              })
+            }
+            onCancel={() => navigation.back(PATHS.settings)}
+          />
+        </section>
+      </>
+    );
+  }
   return (
     <>
       {head}
       {error !== undefined && <Callout tone="danger">{error}</Callout>}
+      {workspace !== undefined && (
+        <section className="sc-panel" aria-label={words.settings.workspace.aria}>
+          <div className="sc-section-head">
+            <h2 className="sc-section-title">{words.settings.workspace.title}</h2>
+            {administrator && (
+              <a
+                className="sc-button sc-button-secondary sc-button-sm"
+                href={settingsHref("workspace")}
+              >
+                {words.common.edit}
+              </a>
+            )}
+          </div>
+          <WorkspaceSettingsView workspace={workspace} />
+        </section>
+      )}
       <section className="sc-panel" aria-label={words.rules.title}>
         <h2 className="sc-section-title">{words.rules.title}</h2>
         {rules === undefined ? (
@@ -1648,6 +1763,30 @@ function WorkspaceSettingsPage(props: {
                 )}
               </dd>
             </div>
+            {skills.address !== null && (
+              <div>
+                <dt>{words.settings.skillsToken}</dt>
+                <dd>
+                  {skills.packToken == null ? (
+                    <span className="sc-muted">{words.projects.settings.packTokenNone}</span>
+                  ) : (
+                    <>
+                      {words.projects.settings.packTokenSet} <Time iso={skills.packToken.setAt} />
+                    </>
+                  )}
+                  {administrator && (
+                    <>
+                      {" "}
+                      <a href={settingsHref("pack-token")}>
+                        {skills.packToken == null
+                          ? words.projects.settings.packTokenAdd
+                          : words.projects.settings.packTokenEdit}
+                      </a>
+                    </>
+                  )}
+                </dd>
+              </div>
+            )}
           </dl>
           <p className="sc-muted">{words.settings.skillsFromConfiguration}</p>
         </section>
@@ -1774,6 +1913,8 @@ function PlatePage(props: {
   readonly empty: { readonly title: string; readonly body: string };
   /** What a refusal says where the plate may not be the asker's to see; the server's words otherwise. */
   readonly refused?: { readonly title: string; readonly body: string } | undefined;
+  /** The day the week begins on, as the workspace says (ADR-0035). */
+  readonly weekStart?: WeekStart | undefined;
 }) {
   const words = useWords();
   const { components, load, couldNotLoad, refused } = props;
@@ -1834,6 +1975,7 @@ function PlatePage(props: {
         <components.WorkList
           work={plate}
           week={props.week}
+          weekStart={props.weekStart}
           taskHref={(projectKey, task) => taskHref(projectKey, task.number)}
           decisionHref={(projectKey, decisionId) => decisionHref(projectKey, decisionId)}
           weekHref={props.weekHref}
@@ -1857,6 +1999,7 @@ function WorkPage(props: {
       load={work}
       title={words.work.title}
       week={props.week}
+      weekStart={weekStartOf(props.data.me?.workspace)}
       weekHref={workHref}
       loading={words.work.loading}
       couldNotLoad={words.work.couldNotLoad}
@@ -1885,6 +2028,7 @@ function PersonWorkPage(props: {
       title={words.people.workOf(name)}
       aside={<LinkButton href={PATHS.people}>{words.nav.people}</LinkButton>}
       week={props.week}
+      weekStart={weekStartOf(data.me?.workspace)}
       weekHref={(day) => personWorkHref(id, day)}
       loading={words.people.loadingWork}
       couldNotLoad={words.people.couldNotLoadWork}
@@ -1955,6 +2099,8 @@ function WorkspacePage(props: {
     const making = route.name === "new-listing" && administrator;
     // An owner sees the work of the people in their projects; the console refuses the rest.
     const oversees = administrator || data.projects.some((project) => project.role === "owner");
+    // The list is what the policy shows (ADR-0035): everyone, or the people one shares a project with.
+    const narrowed = peopleVisibilityOf(data.me?.workspace) === "shared_projects" && !administrator;
     return (
       <>
         <div className="sc-page-head">
@@ -1965,6 +2111,7 @@ function WorkspacePage(props: {
             </LinkButton>
           )}
         </div>
+        {narrowed && <p className="sc-lead">{words.people.narrowed}</p>}
         {error !== undefined && <Callout tone="danger">{error}</Callout>}
         {making && (
           <section className="sc-panel sc-panel-form" aria-label={words.people.letInAria}>

package/src/data.ts

@@ -32,6 +32,8 @@ import {
   type RestMemberPatch,
   type RestMePatch,
   type RestOrganization,
+  type RestPackConnect,
+  type RestPackConnectStarted,
   type RestPerson,
   type RestPersonPatch,
   type RestPersonWork,
@@ -54,6 +56,9 @@ import {
   type RestVersion,
   type RestVersions,
   type RestWork,
+  type RestWorkspace,
+  type RestWorkspacePackConnect,
+  type RestWorkspacePatch,
   restEventSchema,
 } from "./api.js";
 
@@ -80,6 +85,11 @@ export interface ConsoleActions {
   /** Sets the pack token of the project the page is on, or takes it away; for an owner (ADR-0028). */
   setPackToken(token: string): Promise<RestProject>;
   removePackToken(): Promise<RestProject>;
+  /** Asks the deployment to connect the project's pack with a code a person approves (ADR-0036); for an owner. */
+  connectPackToken(): Promise<RestPackConnectStarted>;
+  /** How that connection stands; once connected, the project is the one answered. */
+  packTokenConnection(signal?: AbortSignal): Promise<RestPackConnect>;
+  cancelPackTokenConnection(): Promise<void>;
   addMember(input: RestMemberInput): Promise<RestMember>;
   updateMember(personId: string, patch: RestMemberPatch): Promise<RestMember>;
   removeMember(personId: string): Promise<void>;
@@ -133,6 +143,16 @@ export interface ConsoleActions {
   removeListing(id: string): Promise<void>;
   /** Keeps the person's own choice of language (ADR-0012). */
   updateMe(patch: RestMePatch): Promise<RestMe>;
+  /** Changes the workspace's settings (ADR-0035); for an administrator. `me` says them from then on. */
+  updateWorkspace(patch: RestWorkspacePatch): Promise<RestWorkspace>;
+  /** The workspace's SkillCDN token (ADR-0036), for an administrator: set, taken away, or connected with a code. */
+  setWorkspacePackToken(token: string): Promise<RestWorkspace>;
+  removeWorkspacePackToken(): Promise<RestWorkspace>;
+  connectWorkspacePackToken(): Promise<RestPackConnectStarted>;
+  workspacePackTokenConnection(signal?: AbortSignal): Promise<RestWorkspacePackConnect>;
+  cancelWorkspacePackTokenConnection(): Promise<void>;
+  /** One person of the workspace by their exact login, or nobody: what an owner lists someone the People page does not show by. */
+  findPerson(login: string, signal?: AbortSignal): Promise<RestPerson | undefined>;
   /** Marks a run that will not come back as abandoned. */
   abandonRun(id: string): Promise<RestRun>;
   /** Everything that happened to one task of the project, oldest first. */
@@ -245,6 +265,28 @@ async function readTasks(
   return { items };
 }
 
+/** How many pages of the decisions are read before the record is shown as it stands. */
+const DECISIONS_MAX_PAGES = 20;
+
+/**
+ * The decisions of a project, whole: page after page while the server says there is more, so
+ * that the record is read to its end and the pages turn it without asking again.
+ */
+async function readDecisions(
+  scope: ProjectClient,
+  signal: AbortSignal | undefined,
+): Promise<{ readonly items: RestDecision[] }> {
+  const items: RestDecision[] = [];
+  for (let page = 0; page < DECISIONS_MAX_PAGES; page += 1) {
+    const result = await scope.decisions({ limit: LIST_LIMIT, offset: page * LIST_LIMIT }, signal);
+    items.push(...result.items);
+    if (!result.more) {
+      break;
+    }
+  }
+  return { items };
+}
+
 const wordsOf = (failure: unknown, fallback: string): string =>
   failure instanceof ApiError ? failure.message : fallback;
 
@@ -310,7 +352,7 @@ export function useConsoleData(client: ConsoleClient, projectKey: string | undef
         await Promise.all([
           scope.get(signal),
           readTasks(scope, signal),
-          scope.decisions(undefined, signal),
+          readDecisions(scope, signal),
           scope.goals({}, signal),
           scope.runs(undefined, signal),
           scope.members(signal),
@@ -427,7 +469,15 @@ export function useConsoleData(client: ConsoleClient, projectKey: string | undef
           // No answer at all is said on the page as the deployment being out of reach,
           // rather than waited for.
           if (!signal.aborted) {
-            setSkills({ address: null, source: "", page: null, status: "unavailable", items: [] });
+            setSkills({
+              address: null,
+              source: "",
+              page: null,
+              status: "unavailable",
+              refusal: null,
+              items: [],
+              mount: null,
+            });
           }
         });
       if (typeof EventSource === "undefined") {
@@ -508,6 +558,15 @@ export function useConsoleData(client: ConsoleClient, projectKey: string | undef
         setProject(changed);
         return changed;
       },
+      connectPackToken: () => scope().connectPackToken(),
+      async packTokenConnection(signal) {
+        const state = await scope().packTokenConnection(signal);
+        if (state.status === "connected") {
+          setProject(state.project);
+        }
+        return state;
+      },
+      cancelPackTokenConnection: () => scope().cancelPackTokenConnection(),
       async addMember(input) {
         const member = await scope().addMember(input);
         await refreshProject();
@@ -619,6 +678,34 @@ export function useConsoleData(client: ConsoleClient, projectKey: string | undef
         setMe(answer);
         return answer;
       },
+      async updateWorkspace(patch) {
+        const workspace = await client.updateWorkspace(patch);
+        setMe((current) => (current === undefined ? undefined : { ...current, workspace }));
+        // The member visibility may have changed: the people are read again under the new setting.
+        await refreshWorkspace();
+        return workspace;
+      },
+      async setWorkspacePackToken(token) {
+        const workspace = await client.setWorkspacePackToken({ token });
+        setMe((current) => (current === undefined ? undefined : { ...current, workspace }));
+        return workspace;
+      },
+      async removeWorkspacePackToken() {
+        const workspace = await client.removeWorkspacePackToken();
+        setMe((current) => (current === undefined ? undefined : { ...current, workspace }));
+        return workspace;
+      },
+      connectWorkspacePackToken: () => client.connectWorkspacePackToken(),
+      async workspacePackTokenConnection(signal) {
+        const state = await client.workspacePackTokenConnection(signal);
+        if (state.status === "connected") {
+          const { workspace } = state;
+          setMe((current) => (current === undefined ? undefined : { ...current, workspace }));
+        }
+        return state;
+      },
+      cancelWorkspacePackTokenConnection: () => client.cancelWorkspacePackTokenConnection(),
+      findPerson: (login, signal) => client.findPerson(login, signal),
       async abandonRun(id) {
         const run = await scope().endRun(id, { status: "abandoned" });
         await refreshProject();

package/src/dates.ts

@@ -1,3 +1,5 @@
+import type { WeekStart } from "./vocabulary.js";
+
 // Days, as the plan is made in (ADR-0019): `2026-10-20`, read and written as the strings they
 // are, so that a deadline is the same day wherever the people are. The browser's own clock says
 // which day is today; nothing here looks at it unless asked.
@@ -62,8 +64,27 @@ export function addMonths(month: string, count: number): string {
   return `${String(date.getFullYear()).padStart(4, "0")}-${String(date.getMonth() + 1).padStart(2, "0")}`;
 }
 
-/** The weekday a week begins on where the language is spoken: 1 for Monday, 7 for Sunday. */
-export function firstDayOfWeek(language: string): number {
+/**
+ * The language and region of the device the pages are read on, as the browser says: `ko-KR`,
+ * `en-GB`. The fallback where there is no browser to ask. The week begins as this has it
+ * where the workspace leaves the choice to the system default (ADR-0035).
+ */
+export function deviceLanguage(fallback: string): string {
+  const browser = (globalThis as { readonly navigator?: { readonly language?: string } }).navigator;
+  return browser?.language ?? fallback;
+}
+
+/**
+ * The weekday a week begins on: as the workspace says (ADR-0035), Monday or Sunday, else as the
+ * language and region have it, the device's by {@link deviceLanguage}. 1 for Monday, 7 for Sunday.
+ */
+export function firstDayOfWeek(language: string, weekStart?: WeekStart | undefined): number {
+  if (weekStart === "monday") {
+    return 1;
+  }
+  if (weekStart === "sunday") {
+    return 7;
+  }
   try {
     const locale = new Intl.Locale(language) as Intl.Locale & {
       readonly weekInfo?: { readonly firstDay: number };