@protobase/ui 0.46.6 → 0.46.8

package/dist/app/record-elsewhere.js

@@ -0,0 +1,25 @@
+import { createWhere, printFilter } from "@protobase/schema";
+//#region src/app/record-elsewhere.ts
+const w = createWhere();
+/**
+* The list request that finds a record the session's organization does not have, and the organization it is in: for a
+* resource whose lists read across the person's organizations (`tenantAcross`), with a key of one field they can
+* filter on. `undefined` for any other resource, whose record is simply not found.
+*/
+const elsewhereRequest = (model, recordKey) => {
+	const [key, ...more] = model.primaryKey;
+	if (!model.tenantAcross || model.tenant === void 0 || key === void 0 || more.length > 0 || !model.fields[key]?.filterable) return void 0;
+	return {
+		filter: printFilter(w.eq(key, recordKey)),
+		pageSize: 1,
+		fields: [key, model.tenant]
+	};
+};
+/** The organization a found row is in, when it is another than `current`; `undefined` when it is not found or is there. */
+const otherOrganization = (model, row, current) => {
+	const tenant = row?.[model.tenant];
+	if (tenant === void 0 || tenant === null || String(tenant) === current) return void 0;
+	return String(tenant);
+};
+//#endregion
+export { elsewhereRequest, otherOrganization };

package/dist/app/record-messages.js

@@ -9,6 +9,7 @@ const text = defineMessages({
 		loading: "Loading",
 		fetching: "Fetching the record.",
 		noRecord: "This record does not exist, or you cannot see it.",
+		openingElsewhere: "Opening the record in its organization.",
 		couldNotLoad: "Could not load the record",
 		someoneElse: "Someone else",
 		justNow: "just now",
@@ -45,6 +46,7 @@ const text = defineMessages({
 		loading: "Laden",
 		fetching: "Het record wordt opgehaald.",
 		noRecord: "Dit record bestaat niet, of je mag het niet zien.",
+		openingElsewhere: "Het record wordt in zijn organisatie geopend.",
 		couldNotLoad: "Kon het record niet laden",
 		someoneElse: "Iemand anders",
 		justNow: "zojuist",

package/dist/app/record-page.js

@@ -61,6 +61,7 @@ import { HistorySection } from "./history/history-section.js";
 import { CommentsSection } from "./comments/comments-section.js";
 import { useShownLayout } from "./record-mode/use-shown-layout.js";
 import { useRecordEditor } from "./use-record-editor.js";
+import { useRecordElsewhere } from "./use-record-elsewhere.js";
 import { useRelatedRecords } from "./use-related-records.js";
 import { IncomingCard } from "./incoming-card.js";
 import { RelatedSection } from "./related-section.js";
@@ -113,9 +114,9 @@ const RecordPage = ({ resource, recordKey }) => {
 	});
 	if (record.error) return /* @__PURE__ */ jsx("div", {
 		className: "p-8",
-		children: isApiError(record.error) && record.error.status === 404 ? /* @__PURE__ */ jsx(Notice, {
-			title: text("notFound"),
-			children: text$1("noRecord")
+		children: isApiError(record.error) && record.error.status === 404 ? /* @__PURE__ */ jsx(RecordNotFound, {
+			model,
+			recordKey
 		}) : /* @__PURE__ */ jsx(ErrorBanner, {
 			title: text$1("couldNotLoad"),
 			error: record.error
@@ -128,6 +129,25 @@ const RecordPage = ({ resource, recordKey }) => {
 		preview: record.isPlaceholderData
 	}, record.isPlaceholderData ? "preview" : "loaded");
 };
+const RecordNotFound = ({ model, recordKey }) => {
+	const elsewhere = useRecordElsewhere(model, recordKey);
+	if (elsewhere.state === "looking") return /* @__PURE__ */ jsx(Notice, {
+		title: text$1("loading"),
+		children: text$1("fetching")
+	});
+	if (elsewhere.state === "switching") return /* @__PURE__ */ jsx(Notice, {
+		title: text$1("loading"),
+		children: text$1("openingElsewhere")
+	});
+	if (elsewhere.state === "failed") return /* @__PURE__ */ jsx(ErrorBanner, {
+		title: text$1("couldNotLoad"),
+		error: elsewhere.error
+	});
+	return /* @__PURE__ */ jsx(Notice, {
+		title: text("notFound"),
+		children: text$1("noRecord")
+	});
+};
 const LoadedRecord = ({ model, recordKey, stored, preview }) => {
 	const meta = useAdminMeta();
 	const { address, go } = useAppAddress();

package/dist/app/use-record-elsewhere.js

@@ -0,0 +1,43 @@
+import { useAuth } from "../auth/auth-provider.js";
+import { useClient } from "../data/api-provider.js";
+import { elsewhereRequest, otherOrganization } from "./record-elsewhere.js";
+import { useEffect, useMemo, useState } from "react";
+//#region src/app/use-record-elsewhere.ts
+/**
+* For a record not found in the session's organization: looks for it across the person's organizations, and when it is
+* in another one, switches the session there and opens the page again, so the record and everything on its page are
+* read in its own organization. `missing` when it is nowhere else, or the resource does not list across organizations.
+*/
+const useRecordElsewhere = (model, recordKey) => {
+	const client = useClient();
+	const { session, organizations } = useAuth();
+	const request = useMemo(() => organizations ? elsewhereRequest(model, recordKey) : void 0, [
+		organizations,
+		model,
+		recordKey
+	]);
+	const [found, setFound] = useState(request ? { state: "looking" } : { state: "missing" });
+	useEffect(() => {
+		if (!request) return;
+		const look = async () => {
+			const [page, current] = await Promise.all([client.list(model.name, request), session.organizations.current()]);
+			const other = otherOrganization(model, page.items[0], current.organization?.id);
+			if (other === void 0) return setFound({ state: "missing" });
+			setFound({ state: "switching" });
+			await session.organizations.switchTo(other);
+			window.location.reload();
+		};
+		look().catch((error) => setFound({
+			state: "failed",
+			error
+		}));
+	}, [
+		client,
+		session,
+		model,
+		request
+	]);
+	return found;
+};
+//#endregion
+export { useRecordElsewhere };

package/dist/auth/auth-messages.js

@@ -26,7 +26,8 @@ const text = defineMessages({
 		staffReasonRequired: "Say why you sign in as this person, in at least 10 characters.",
 		staffForbidden: "Staff sign-in is turned off for this app.",
 		untrustedCallback: "This page is not on an address the server trusts.",
-		staffFailed: "The staff sign-in did not go through. Try again."
+		staffFailed: "The staff sign-in did not go through. Try again.",
+		passwordLeaked: "This password appears in a known data breach. Choose a different one."
 	},
 	nl: {
 		tooManyRequests: "Te veel pogingen. Wacht een minuut en probeer het opnieuw.",
@@ -53,7 +54,8 @@ const text = defineMessages({
 		staffReasonRequired: "Zeg in minstens 10 tekens waarom je als deze persoon inlogt.",
 		staffForbidden: "Inloggen als medewerker staat uit voor deze app.",
 		untrustedCallback: "Deze pagina staat niet op een adres dat de server vertrouwt.",
-		staffFailed: "De inlog als medewerker lukte niet. Probeer het opnieuw."
+		staffFailed: "De inlog als medewerker lukte niet. Probeer het opnieuw.",
+		passwordLeaked: "Dit wachtwoord komt voor in een bekend datalek. Kies een ander wachtwoord."
 	}
 });
 const providerText = defineMessages({
@@ -94,7 +96,8 @@ const messages = {
 	AUTHENTICATION_FAILED: "passkeyFailed",
 	PREVIOUSLY_REGISTERED: "passkeyAdded",
 	ERROR_AUTHENTICATOR_PREVIOUSLY_REGISTERED: "passkeyAdded",
-	SESSION_NOT_FRESH: "notFresh"
+	SESSION_NOT_FRESH: "notFresh",
+	PASSWORD_COMPROMISED: "passwordLeaked"
 };
 const lookup = (ids, code) => {
 	const id = code ? ids[code] : void 0;

package/dist/auth/reset-password-page.js

@@ -1,5 +1,6 @@
 import { text } from "./messages.js";
 import { useAuth } from "./auth-provider.js";
+import { authMessage } from "./auth-messages.js";
 import { ResetPasswordForm } from "./reset-password-form.js";
 import { useState } from "react";
 import { AuthError } from "@protobase/client";
@@ -10,7 +11,7 @@ const resetPasswordMessage = (error) => {
 	if (error.status === 429) return text("tooManyAttempts");
 	if (error.code === "PASSWORD_TOO_SHORT") return text("useAtLeast", 12);
 	if (error.code === "PASSWORD_TOO_LONG") return text("passwordTooLong");
-	return error.message;
+	return authMessage(error);
 };
 /** Sets a new password with the token of an emailed reset link. */
 const ResetPasswordPage = ({ token, onDone, onRequestNewLink, onBack }) => {

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.46.6";
+var version = "0.46.8";
 var protobase = { "pluginApi": 1 };
 //#endregion
 export { protobase, version };