Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
Restyle Badge; fix demo clock-in and the clock-out prompt (#1835)
Brad Barbinda2f74b13abd
diff --git a/apps/erp/app/components/AvatarMenu.tsx b/apps/erp/app/components/AvatarMenu.tsxindex 2b720da9cd..91a0fcfb3e 100644--- a/apps/erp/app/components/AvatarMenu.tsx+++ b/apps/erp/app/components/AvatarMenu.tsx@@ -20,13 +20,15 @@ import {DropdownMenuSubContent,DropdownMenuSubTrigger,DropdownMenuTrigger,+ getSystemMode,ItarDisclosure,- Switch,useDisclosure,useEdition,- useMode+ useMode,+ useModePreference} from "@carbon/react";-import { Edition, themes } from "@carbon/utils";+import type { ModePreference } from "@carbon/utils";+import { Edition, modeValidator, themes } from "@carbon/utils";import { Trans, useLingui } from "@lingui/react/macro";import { useLocale } from "@react-aria/i18n";import { useMemo, useState } from "react";@@ -36,6 +38,7 @@ import {LuFileText,LuHouse,LuLanguages,+ LuLaptop,LuLogOut,LuMoon,LuPalette,@@ -59,18 +62,28 @@ const AvatarMenu = () => {const edition = useEdition();const mode = useMode();+ const modePreference = useModePreference();const serverTheme = useTheme();- const nextMode = mode === "dark" ? "light" : "dark";-const fetcher = useFetcher<typeof action>();- const onModeToggle = () => {+ const onModeChange = (value: string) => {+ const parsed = modeValidator.shape.mode.safeParse(value);+ if (!parsed.success || parsed.data === modePreference) return;+ const nextPreference: ModePreference = parsed.data;+ const nextMode =+ nextPreference === "system" ? getSystemMode() : nextPreference;+const formData = new FormData();- formData.append("mode", nextMode);- startModeTransition(nextMode, () => {+ formData.append("mode", nextPreference);+ const persist = () =>fetcher.submit(formData, { method: "post", action: path.to.root });- });++ if (nextMode === mode) {+ persist();+ } else {+ startModeTransition(nextMode, persist);+ }};const localeFetcher = useFetcher<{ ok?: boolean }>();const [isOpen, setIsOpen] = useState(false);@@ -129,22 +142,42 @@ const AvatarMenu = () => {</a></DropdownMenuItem><DropdownMenuSeparator />- <DropdownMenuItem onSelect={(e) => e.preventDefault()}>- <div className="flex items-center justify-between w-full">- <div className="flex items-center justify-start">- <DropdownMenuIcon- icon={mode === "dark" ? <LuMoon /> : <LuSun />}- />- <Trans>Dark Mode</Trans>- </div>- <div>- <Switch- checked={mode === "dark"}- onCheckedChange={onModeToggle}- />- </div>- </div>- </DropdownMenuItem>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <DropdownMenuIcon+ icon={mode === "dark" ? <LuMoon /> : <LuSun />}+ />+ <Trans>Appearance</Trans>+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ <DropdownMenuRadioGroup+ value={modePreference}+ onValueChange={onModeChange}+ >+ <DropdownMenuRadioItem+ value="light"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuSun />} />+ <Trans>Light</Trans>+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="dark"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuMoon />} />+ <Trans>Dark</Trans>+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="system"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuLaptop />} />+ <Trans>System</Trans>+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuSubContent>+ </DropdownMenuSub><DropdownMenuSub><DropdownMenuSubTrigger><DropdownMenuIcon icon={<LuPalette />} />diff --git a/apps/erp/app/components/Layout/Topbar/ModeSwitcher.tsx b/apps/erp/app/components/Layout/Topbar/ModeSwitcher.tsxdeleted file mode 100644index 8f707dcf60..0000000000--- a/apps/erp/app/components/Layout/Topbar/ModeSwitcher.tsx+++ /dev/null@@ -1,44 +0,0 @@-// SPDX-License-Identifier: AGPL-3.0-only-// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,-// including ports, remain AGPLv3; serving them over a network requires releasing their source.--import { IconButton, useMode } from "@carbon/react";-import { useLingui } from "@lingui/react/macro";-import { BiLaptop, BiMoon, BiSun } from "react-icons/bi";-import { useFetcher } from "react-router";-import type { action } from "~/root";-import { startModeTransition } from "~/utils/dom";-import { path } from "~/utils/path";--const ModeSwitcher = () => {- const { t } = useLingui();- const mode = useMode();- const nextMode = mode === "dark" ? "light" : "dark";- const modeLabel = {- light: <BiSun />,- dark: <BiMoon />,- system: <BiLaptop />- };-- const fetcher = useFetcher<typeof action>();-- const onClick = () => {- const formData = new FormData();- formData.append("mode", nextMode);- startModeTransition(nextMode, () => {- fetcher.submit(formData, { method: "post", action: path.to.root });- });- };-- return (- <IconButton- icon={modeLabel[nextMode]}- aria-label={t`Light Mode`}- variant="ghost"- onClick={onClick}- className="hidden sm:block"- />- );-};--export default ModeSwitcher;diff --git a/apps/erp/app/components/TimeCardWarning.tsx b/apps/erp/app/components/TimeCardWarning.tsxindex b77fd37c1c..a004238726 100644--- a/apps/erp/app/components/TimeCardWarning.tsx+++ b/apps/erp/app/components/TimeCardWarning.tsx@@ -4,9 +4,9 @@"use client";+import { ValidatedForm } from "@carbon/form";import {Button,- Input,Modal,ModalBody,ModalContent,@@ -17,11 +17,25 @@ import {toast,VStack} from "@carbon/react";+import {+ formatDateTimeInZone,+ formatRelativeCalendarDays+} from "@carbon/utils";+import {+ getLocalTimeZone,+ now,+ parseAbsolute,+ toCalendarDate,+ toCalendarDateTime,+ today+} from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";+import { useLocale } from "@react-aria/i18n";import { useEffect, useState } from "react";import { useFetcher } from "react-router";+import { setClockOutValidator } from "~/modules/people";import { path } from "~/utils/path";-import { DateTime } from "./DateTime";+import { DateTimePicker, Hidden, Submit } from "./Form";const TWELVE_HOURS_MS = 12 * 60 * 60 * 1000;const CHECK_INTERVAL_MS = 5 * 60 * 1000;@@ -36,8 +50,8 @@ type TimeCardWarningProps = {export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {const { t } = useLingui();+ const { locale } = useLocale();const [showClockWarning, setShowClockWarning] = useState(false);- const [editClockOut, setEditClockOut] = useState("");const fetcher = useFetcher();useEffect(() => {@@ -83,21 +97,31 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {setShowClockWarning(false);};- const handleEditClockOut = () => {- if (!editClockOut || !openClockEntry) return;- const formData = new FormData();- formData.append("intent", "clockOut");- formData.append("clockOut", new Date(editClockOut).toISOString());- fetcher.submit(formData, {- method: "post",- action: path.to.api.timecard- });- };-if (showClockWarning && openClockEntry) {const hoursElapsed = Math.floor((Date.now() - new Date(openClockEntry.clockIn).getTime()) / 3600000);+ const timeZone = getLocalTimeZone();+ const clockedInAt = parseAbsolute(openClockEntry.clockIn, timeZone);+ const clockedInLabel = formatDateTimeInZone(+ openClockEntry.clockIn,+ timeZone,+ locale,+ {+ dateStyle: undefined,+ timeStyle: undefined,+ weekday: "long",+ month: "long",+ day: "numeric",+ hour: "numeric",+ minute: "2-digit"+ }+ );+ const clockedInDaysAgo = formatRelativeCalendarDays(+ toCalendarDate(clockedInAt).toString(),+ today(timeZone).toString(),+ locale+ );return (<Modal@@ -116,40 +140,47 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {</Trans></ModalDescription></ModalHeader>- <ModalBody>- <VStack spacing={4}>- <p className="text-sm text-muted-foreground">- <Trans>- You clocked in at{" "}- <DateTime value={openClockEntry.clockIn} variant="absolute" />- . You can edit your clock-out time below or acknowledge that- you're still working.- </Trans>- </p>- <div className="flex flex-col gap-2">- <label className="text-sm font-medium">- <Trans>Set clock-out time</Trans>- </label>- <Input- type="datetime-local"- value={editClockOut}- onChange={(e) => setEditClockOut(e.target.value)}+ <ValidatedForm+ validator={setClockOutValidator}+ method="post"+ action={path.to.api.timecard}+ fetcher={fetcher}+ >+ <ModalBody>+ <VStack spacing={4}>+ <div className="flex w-full flex-col gap-1 rounded-lg border bg-muted/40 px-4 py-3">+ <span className="text-xs text-muted-foreground">+ <Trans>Clocked in</Trans>+ </span>+ <span className="text-sm font-medium">{clockedInLabel}</span>+ <span className="text-xs text-muted-foreground">+ {clockedInDaysAgo}+ </span>+ </div>+ <p className="text-sm text-muted-foreground">+ <Trans>+ Set the time you stopped working, or acknowledge that you're+ still working.+ </Trans>+ </p>+ <Hidden name="intent" value="clockOut" />+ <DateTimePicker+ name="clockOut"+ label={t`Clock out`}+ minValue={toCalendarDateTime(clockedInAt)}+ maxValue={toCalendarDateTime(now(timeZone))}/>- </div>- </VStack>- </ModalBody>- <ModalFooter>- <Button variant="secondary" onClick={handleClockAcknowledge}>- <Trans>I'm Still Working</Trans>- </Button>- <Button- onClick={handleEditClockOut}- isDisabled={!editClockOut || fetcher.state !== "idle"}- isLoading={fetcher.state !== "idle"}- >- <Trans>Set Clock Out</Trans>- </Button>- </ModalFooter>+ </VStack>+ </ModalBody>+ <ModalFooter>+ <Button variant="secondary" onClick={handleClockAcknowledge}>+ <Trans>I'm Still Working</Trans>+ </Button>+ <Submit>+ <Trans>Set Clock Out</Trans>+ </Submit>+ </ModalFooter>+ </ValidatedForm></ModalContent></Modal>);diff --git a/apps/erp/app/modules/items/ui/Parts/PartsTable.tsx b/apps/erp/app/modules/items/ui/Parts/PartsTable.tsxindex aa66ab46d7..87afa36a1e 100644--- a/apps/erp/app/modules/items/ui/Parts/PartsTable.tsx+++ b/apps/erp/app/modules/items/ui/Parts/PartsTable.tsx@@ -62,6 +62,7 @@ import {Table,TrackingTypeIcon} from "~/components";+import { Enumerable } from "~/components/Enumerable";import { useItemPostingGroups } from "~/components/Form/ItemPostingGroup";import { ReplenishmentSystemIcon } from "~/components/Icons";import { ConfirmDelete } from "~/components/Modals";@@ -193,15 +194,14 @@ const PartsTable = memo(({ data, tags, count }: PartsTableProps) => {const itemPostingGroup = itemPostingGroups.find((group) => group.value === itemPostingGroupId);- const label = itemPostingGroup?.label;- return label ? <Badge variant="secondary">{label}</Badge> : null;+ return <Enumerable value={itemPostingGroup?.label ?? null} />;},meta: {filter: {type: "static",options: itemPostingGroups.map((group) => ({value: group.value,- label: <Badge variant="secondary">{group.label}</Badge>+ label: <Enumerable value={group.label} />}))},icon: <LuGroup />,@@ -536,7 +536,7 @@ const PartsTable = memo(({ data, tags, count }: PartsTableProps) => {)}>- <span>{group.label}</span>+ <Enumerable value={group.label} /></DropdownMenuItem>))}</DropdownMenuSubContent>diff --git a/apps/erp/app/modules/items/ui/Services/ServicesTable.tsx b/apps/erp/app/modules/items/ui/Services/ServicesTable.tsxindex 96ab50301d..1f2dab2595 100644--- a/apps/erp/app/modules/items/ui/Services/ServicesTable.tsx+++ b/apps/erp/app/modules/items/ui/Services/ServicesTable.tsx@@ -59,6 +59,7 @@ import {SupplierAvatarGroup,Table} from "~/components";+import { Enumerable } from "~/components/Enumerable";import { useItemPostingGroups } from "~/components/Form/ItemPostingGroup";import { ReplenishmentSystemIcon } from "~/components/Icons";import { ConfirmDelete } from "~/components/Modals";@@ -165,15 +166,14 @@ const ServicesTable = memo(({ data, tags, count }: ServicesTableProps) => {const itemPostingGroup = itemPostingGroups.find((group) => group.value === itemPostingGroupId);- const label = itemPostingGroup?.label;- return label ? <Badge variant="secondary">{label}</Badge> : null;+ return <Enumerable value={itemPostingGroup?.label ?? null} />;},meta: {filter: {type: "static",options: itemPostingGroups.map((group) => ({value: group.value,- label: <Badge variant="secondary">{group.label}</Badge>+ label: <Enumerable value={group.label} />}))},icon: <LuGroup />@@ -454,7 +454,7 @@ const ServicesTable = memo(({ data, tags, count }: ServicesTableProps) => {)}>- <span>{group.label}</span>+ <Enumerable value={group.label} /></DropdownMenuItem>))}</DropdownMenuSubContent>diff --git a/apps/erp/app/modules/items/ui/Tools/ToolsTable.tsx b/apps/erp/app/modules/items/ui/Tools/ToolsTable.tsxindex 84b8600361..4638bf3f6a 100644--- a/apps/erp/app/modules/items/ui/Tools/ToolsTable.tsx+++ b/apps/erp/app/modules/items/ui/Tools/ToolsTable.tsx@@ -62,6 +62,7 @@ import {Table,TrackingTypeIcon} from "~/components";+import { Enumerable } from "~/components/Enumerable";import { useItemPostingGroups } from "~/components/Form/ItemPostingGroup";import { ReplenishmentSystemIcon } from "~/components/Icons";import { ConfirmDelete } from "~/components/Modals";@@ -180,15 +181,14 @@ const ToolsTable = memo(({ data, tags, count }: ToolsTableProps) => {const itemPostingGroup = itemPostingGroups.find((group) => group.value === itemPostingGroupId);- const label = itemPostingGroup?.label;- return label ? <Badge variant="secondary">{label}</Badge> : null;+ return <Enumerable value={itemPostingGroup?.label ?? null} />;},meta: {filter: {type: "static",options: itemPostingGroups.map((group) => ({value: group.value,- label: <Badge variant="secondary">{group.label}</Badge>+ label: <Enumerable value={group.label} />}))},icon: <LuGroup />@@ -533,7 +533,7 @@ const ToolsTable = memo(({ data, tags, count }: ToolsTableProps) => {)}>- <span>{group.label}</span>+ <Enumerable value={group.label} /></DropdownMenuItem>))}</DropdownMenuSubContent>diff --git a/apps/erp/app/modules/people/people.models.ts b/apps/erp/app/modules/people/people.models.tsindex 026b1ec52a..c171f6a069 100644--- a/apps/erp/app/modules/people/people.models.ts+++ b/apps/erp/app/modules/people/people.models.ts@@ -82,6 +82,12 @@ export const clockOutValidator = z.object({note: zfd.text(z.string().optional())});+// The "Forgot to Clock Out?" prompt: the clock-out is the time being set.+export const setClockOutValidator = z.object({+ intent: z.literal("clockOut"),+ clockOut: z.string().min(1, { message: "Clock out is required" })+});+export const timecardValidator = z.object({id: zfd.text(z.string().optional()),employeeId: z.string().min(1, { message: "Employee is required" }),diff --git a/apps/erp/app/root.tsx b/apps/erp/app/root.tsxindex 7da1fae6f8..46578b18de 100644--- a/apps/erp/app/root.tsx+++ b/apps/erp/app/root.tsx@@ -25,6 +25,7 @@ import {import { RootErrorBoundary } from "@carbon/react/ErrorBoundary";import type { Theme } from "@carbon/utils";import {+ colorSchemeHintScript,getPreferenceHeaders,isSearchParamOnlyNavigation,modeValidator,@@ -155,7 +156,7 @@ export async function loader({ request, context }: LoaderFunctionArgs) {VERCEL_URL,XERO_CLIENT_ID},- mode: getMode(request),+ ...getMode(request),preferences: getPreferenceHeaders(request),result: context.get(flashResultContext),theme: getTheme(request)@@ -244,6 +245,13 @@ export function Document({<head><meta charSet="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />+ {/* Before any paint: records the OS color scheme for a `system` user+ and reloads once if the server rendered the wrong mode. */}+ <script+ nonce={nonce}+ suppressHydrationWarning+ dangerouslySetInnerHTML={{ __html: colorSchemeHintScript }}+ /><Meta /><Links /></head>diff --git a/apps/erp/app/routes/onboarding+/theme.tsx b/apps/erp/app/routes/onboarding+/theme.tsxindex 9fac5e631d..959385998c 100644--- a/apps/erp/app/routes/onboarding+/theme.tsx+++ b/apps/erp/app/routes/onboarding+/theme.tsx@@ -16,6 +16,7 @@ import {RadioGroup,RadioGroupButton,useMode,+ useModePreference,VStack} from "@carbon/react";import type { Theme } from "@carbon/utils";@@ -23,7 +24,7 @@ import { redirect, themes } from "@carbon/utils";import { msg } from "@lingui/core/macro";import { Trans, useLingui } from "@lingui/react/macro";import { useEffect, useState } from "react";-import { BiMoon, BiSun } from "react-icons/bi";+import { BiLaptop, BiMoon, BiSun } from "react-icons/bi";import { RxCheck } from "react-icons/rx";import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";import {@@ -78,6 +79,7 @@ export default function OnboardingTheme() {const { t } = useLingui();const mode = useMode();+ const modePreference = useModePreference();const modeFetcher = useFetcher<typeof modeAction>();const [theme, setTheme] = useState<ThemeValue>(initialTheme as "zinc");@@ -141,17 +143,17 @@ export default function OnboardingTheme() {<OnboardingCardContent><VStack spacing={4}><RadioGroup- value={mode === "dark" ? "dark" : "light"}+ value={modePreference}onValueChange={onModeChange}- aria-label={t`Light or dark mode`}+ aria-label={t`Appearance`}className="flex w-full gap-2"><RadioGroupButtonvalue="light"- autoFocus={mode !== "dark"}+ autoFocus={modePreference === "light"}className={cn("flex-1",- mode == "light" && "border-2 border-primary"+ modePreference === "light" && "border-2 border-primary")}><BiSun />@@ -159,15 +161,26 @@ export default function OnboardingTheme() {</RadioGroupButton><RadioGroupButtonvalue="dark"- autoFocus={mode === "dark"}+ autoFocus={modePreference === "dark"}className={cn("flex-1",- mode == "dark" && "border-2 border-primary"+ modePreference === "dark" && "border-2 border-primary")}><BiMoon /><Trans>Dark</Trans></RadioGroupButton>+ <RadioGroupButton+ value="system"+ autoFocus={modePreference === "system"}+ className={cn(+ "flex-1",+ modePreference === "system" && "border-2 border-primary"+ )}+ >+ <BiLaptop />+ <Trans>System</Trans>+ </RadioGroupButton></RadioGroup><RadioGroupvalue={theme}diff --git a/apps/erp/app/services/mode.server.ts b/apps/erp/app/services/mode.server.tsindex 3dbc5de4de..cabce9ff7a 100644--- a/apps/erp/app/services/mode.server.ts+++ b/apps/erp/app/services/mode.server.ts@@ -3,21 +3,16 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { DOMAIN, getCookieDomain } from "@carbon/auth";-import type { Mode } from "@carbon/utils";+import type { ModePreference } from "@carbon/utils";+import { getModeFromCookies, MODE_COOKIE } from "@carbon/utils";import * as cookie from "cookie";-const cookieName = "mode";--export function getMode(request: Request): Mode | null {- const cookieHeader = request.headers.get("cookie");- const parsed = cookieHeader- ? cookie.parse(cookieHeader)[cookieName]- : "light";- if (parsed === "light" || parsed === "dark") return parsed;- return null;+/** `mode` is what to render; `modePreference` is what the user chose. */+export function getMode(request: Request) {+ return getModeFromCookies(request.headers.get("cookie"));}-export function setMode(mode: Mode | "system") {+export function setMode(mode: ModePreference) {const cookieDomain = getCookieDomain(DOMAIN);const cookieOptions: cookie.SerializeOptions = {path: "/",@@ -28,7 +23,7 @@ export function setMode(mode: Mode | "system") {};return cookie.serialize(- cookieName,+ MODE_COOKIE,mode === "system" ? "" : mode,cookieOptions);diff --git a/apps/mes/app/components/TimeCardWarning.tsx b/apps/mes/app/components/TimeCardWarning.tsxindex d540a2b12b..b928fc2b9e 100644--- a/apps/mes/app/components/TimeCardWarning.tsx+++ b/apps/mes/app/components/TimeCardWarning.tsx@@ -4,9 +4,9 @@"use client";+import { DateTimePicker, Hidden, Submit, ValidatedForm } from "@carbon/form";import {Button,- Input,Modal,ModalBody,ModalContent,@@ -17,10 +17,23 @@ import {toast,VStack} from "@carbon/react";+import {+ formatDateTimeInZone,+ formatRelativeCalendarDays+} from "@carbon/utils";+import {+ getLocalTimeZone,+ now,+ parseAbsolute,+ toCalendarDate,+ toCalendarDateTime,+ today+} from "@internationalized/date";import { Trans, useLingui } from "@lingui/react/macro";+import { useLocale } from "@react-aria/i18n";import { useEffect, useState } from "react";import { useFetcher } from "react-router";-import { DateTime } from "~/components";+import { setClockOutValidator } from "~/services/models";import { path } from "~/utils/path";const TWELVE_HOURS_MS = 12 * 60 * 60 * 1000;@@ -36,8 +49,8 @@ type TimeCardWarningProps = {export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {const { t } = useLingui();+ const { locale } = useLocale();const [showClockWarning, setShowClockWarning] = useState(false);- const [editClockOut, setEditClockOut] = useState("");const fetcher = useFetcher();useEffect(() => {@@ -83,21 +96,31 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {setShowClockWarning(false);};- const handleEditClockOut = () => {- if (!editClockOut || !openClockEntry) return;- const formData = new FormData();- formData.append("intent", "clockOut");- formData.append("clockOut", new Date(editClockOut).toISOString());- fetcher.submit(formData, {- method: "post",- action: path.to.timecard- });- };-if (showClockWarning && openClockEntry) {const hoursElapsed = Math.floor((Date.now() - new Date(openClockEntry.clockIn).getTime()) / 3600000);+ const timeZone = getLocalTimeZone();+ const clockedInAt = parseAbsolute(openClockEntry.clockIn, timeZone);+ const clockedInLabel = formatDateTimeInZone(+ openClockEntry.clockIn,+ timeZone,+ locale,+ {+ dateStyle: undefined,+ timeStyle: undefined,+ weekday: "long",+ month: "long",+ day: "numeric",+ hour: "numeric",+ minute: "2-digit"+ }+ );+ const clockedInDaysAgo = formatRelativeCalendarDays(+ toCalendarDate(clockedInAt).toString(),+ today(timeZone).toString(),+ locale+ );return (<Modal@@ -116,40 +139,47 @@ export function TimeCardWarning({ openClockEntry }: TimeCardWarningProps) {</Trans></ModalDescription></ModalHeader>- <ModalBody>- <VStack spacing={4}>- <p className="text-sm text-muted-foreground">- <Trans>- You clocked in at{" "}- <DateTime value={openClockEntry.clockIn} variant="absolute" />- . You can edit your clock-out time below or acknowledge that- you're still working.- </Trans>- </p>- <div className="flex flex-col gap-2">- <label className="text-sm font-medium">- <Trans>Set clock-out time</Trans>- </label>- <Input- type="datetime-local"- value={editClockOut}- onChange={(e) => setEditClockOut(e.target.value)}+ <ValidatedForm+ validator={setClockOutValidator}+ method="post"+ action={path.to.timecard}+ fetcher={fetcher}+ >+ <ModalBody>+ <VStack spacing={4}>+ <div className="flex w-full flex-col gap-1 rounded-lg border bg-muted/40 px-4 py-3">+ <span className="text-xs text-muted-foreground">+ <Trans>Clocked in</Trans>+ </span>+ <span className="text-sm font-medium">{clockedInLabel}</span>+ <span className="text-xs text-muted-foreground">+ {clockedInDaysAgo}+ </span>+ </div>+ <p className="text-sm text-muted-foreground">+ <Trans>+ Set the time you stopped working, or acknowledge that you're+ still working.+ </Trans>+ </p>+ <Hidden name="intent" value="clockOut" />+ <DateTimePicker+ name="clockOut"+ label={t`Clock out`}+ minValue={toCalendarDateTime(clockedInAt)}+ maxValue={toCalendarDateTime(now(timeZone))}/>- </div>- </VStack>- </ModalBody>- <ModalFooter>- <Button variant="secondary" onClick={handleClockAcknowledge}>- <Trans>I'm Still Working</Trans>- </Button>- <Button- onClick={handleEditClockOut}- isDisabled={!editClockOut || fetcher.state !== "idle"}- isLoading={fetcher.state !== "idle"}- >- <Trans>Set Clock Out</Trans>- </Button>- </ModalFooter>+ </VStack>+ </ModalBody>+ <ModalFooter>+ <Button variant="secondary" onClick={handleClockAcknowledge}>+ <Trans>I'm Still Working</Trans>+ </Button>+ <Submit>+ <Trans>Set Clock Out</Trans>+ </Submit>+ </ModalFooter>+ </ValidatedForm></ModalContent></Modal>);diff --git a/apps/mes/app/components/UserNav.tsx b/apps/mes/app/components/UserNav.tsxindex 42ebc0c47e..e759d5e350 100644--- a/apps/mes/app/components/UserNav.tsx+++ b/apps/mes/app/components/UserNav.tsx@@ -24,14 +24,17 @@ import {Switch,useDisclosure,useMode,+ useModePreference,useRouteData,useSidebar} from "@carbon/react";+import { modeValidator } from "@carbon/utils";import { Trans } from "@lingui/react/macro";import { useRef } from "react";import {LuBuilding,LuChevronDown,+ LuLaptop,LuLogOut,LuMapPin,LuMonitor,@@ -70,12 +73,21 @@ export function UserNav({const { isMobile } = useSidebar();const mode = useMode();+ const modePreference = useModePreference();- const modeSubmitRef = useRef<HTMLButtonElement>(null);const consoleSubmitRef = useRef<HTMLButtonElement>(null);const fetcher = useFetcher<typeof action>();+ const onModeChange = (value: string) => {+ const parsed = modeValidator.shape.mode.safeParse(value);+ if (!parsed.success || parsed.data === modePreference) return;+ document.body.removeAttribute("style");+ const formData = new FormData();+ formData.append("mode", parsed.data);+ fetcher.submit(formData, { method: "post", action: path.to.root });+ };+const updateLocation = (value: string) => {const formData = new FormData();formData.append("location", value);@@ -226,41 +238,42 @@ export function UserNav({) : null}</>)}- <DropdownMenuItem onSelect={(e) => e.preventDefault()}>- <div className="flex items-center justify-between w-full">- <div className="flex items-center justify-start">- <DropdownMenuIcon- icon={mode === "dark" ? <LuMoon /> : <LuSun />}- />- <Trans>Dark Mode</Trans>- </div>- <div>- <Switch- checked={mode === "dark"}- onCheckedChange={() => modeSubmitRef.current?.click()}- />- <fetcher.Form- action={path.to.root}- method="post"- onSubmit={() => {- document.body.removeAttribute("style");- }}- className="sr-only"+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <DropdownMenuIcon+ icon={mode === "dark" ? <LuMoon /> : <LuSun />}+ />+ <Trans>Appearance</Trans>+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ <DropdownMenuRadioGroup+ value={modePreference}+ onValueChange={onModeChange}+ >+ <DropdownMenuRadioItem+ value="light"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuSun />} />+ <Trans>Light</Trans>+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="dark"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuMoon />} />+ <Trans>Dark</Trans>+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="system"+ onSelect={(e) => e.preventDefault()}>- <input- type="hidden"- name="mode"- value={mode === "dark" ? "light" : "dark"}- />- <button- ref={modeSubmitRef}- className="sr-only"- type="submit"- />- </fetcher.Form>- </div>- </div>- </DropdownMenuItem>+ <DropdownMenuIcon icon={<LuLaptop />} />+ <Trans>System</Trans>+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuSubContent>+ </DropdownMenuSub>{!isOperatorPinnedIn && (<>{consoleEnabled && (diff --git a/apps/mes/app/root.tsx b/apps/mes/app/root.tsxindex 0c65d49ad4..144e108bbd 100644--- a/apps/mes/app/root.tsx+++ b/apps/mes/app/root.tsx@@ -25,6 +25,7 @@ import {import { RootErrorBoundary } from "@carbon/react/ErrorBoundary";import type { Theme } from "@carbon/utils";import {+ colorSchemeHintScript,getPreferenceHeaders,isSearchParamOnlyNavigation,modeValidator,@@ -136,7 +137,7 @@ export async function loader({ request, context }: LoaderFunctionArgs) {VERCEL_ENV,VERCEL_URL},- mode: getMode(request),+ ...getMode(request),theme: getTheme(request),preferences,result: context.get(flashResultContext)@@ -227,6 +228,13 @@ function Document({<head><meta charSet="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />+ {/* Before any paint: records the OS color scheme for a `system` user+ and reloads once if the server rendered the wrong mode. */}+ <script+ nonce={nonce}+ suppressHydrationWarning+ dangerouslySetInnerHTML={{ __html: colorSchemeHintScript }}+ /><Meta /><title>{title}</title><Links />diff --git a/apps/mes/app/routes/api+/timecard.ts b/apps/mes/app/routes/api+/timecard.tsindex da22afde41..6fca0a6e33 100644--- a/apps/mes/app/routes/api+/timecard.ts+++ b/apps/mes/app/routes/api+/timecard.ts@@ -22,11 +22,13 @@ export async function action({ request }: ActionFunctionArgs) {}if (intent === "clockOut") {+ const clockOutTime = formData.get("clockOut") as string | null;const note = formData.get("note") as string | null;const result = await clockOut(client, {employeeId: userId,companyId,updatedBy: userId,+ clockOut: clockOutTime || undefined,note: note ?? undefined});return { success: !result.error, error: result.error?.message };diff --git a/apps/mes/app/services/mode.server.ts b/apps/mes/app/services/mode.server.tsindex 3dbc5de4de..cabce9ff7a 100644--- a/apps/mes/app/services/mode.server.ts+++ b/apps/mes/app/services/mode.server.ts@@ -3,21 +3,16 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { DOMAIN, getCookieDomain } from "@carbon/auth";-import type { Mode } from "@carbon/utils";+import type { ModePreference } from "@carbon/utils";+import { getModeFromCookies, MODE_COOKIE } from "@carbon/utils";import * as cookie from "cookie";-const cookieName = "mode";--export function getMode(request: Request): Mode | null {- const cookieHeader = request.headers.get("cookie");- const parsed = cookieHeader- ? cookie.parse(cookieHeader)[cookieName]- : "light";- if (parsed === "light" || parsed === "dark") return parsed;- return null;+/** `mode` is what to render; `modePreference` is what the user chose. */+export function getMode(request: Request) {+ return getModeFromCookies(request.headers.get("cookie"));}-export function setMode(mode: Mode | "system") {+export function setMode(mode: ModePreference) {const cookieDomain = getCookieDomain(DOMAIN);const cookieOptions: cookie.SerializeOptions = {path: "/",@@ -28,7 +23,7 @@ export function setMode(mode: Mode | "system") {};return cookie.serialize(- cookieName,+ MODE_COOKIE,mode === "system" ? "" : mode,cookieOptions);diff --git a/apps/mes/app/services/models.ts b/apps/mes/app/services/models.tsindex 5eafd8e274..b03dab432a 100644--- a/apps/mes/app/services/models.ts+++ b/apps/mes/app/services/models.ts@@ -476,3 +476,9 @@ export const inspectionGaugeValidator = z.object({inspectionFeatureId: z.string().min(1, { message: "Feature is required" }),gaugeId: zfd.text(z.string().optional())});++// The "Forgot to Clock Out?" prompt: the clock-out is the time being set.+export const setClockOutValidator = z.object({+ intent: z.literal("clockOut"),+ clockOut: z.string().min(1, { message: "Clock out is required" })+});diff --git a/apps/starter/app/components/AvatarMenu.tsx b/apps/starter/app/components/AvatarMenu.tsxindex d6132c5877..4f459e34c0 100644--- a/apps/starter/app/components/AvatarMenu.tsx+++ b/apps/starter/app/components/AvatarMenu.tsx@@ -8,13 +8,26 @@ import {DropdownMenuIcon,DropdownMenuItem,DropdownMenuLabel,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,DropdownMenuTrigger,- Switch,- useMode+ useMode,+ useModePreference} from "@carbon/react";-import { useRef, useState } from "react";-import { LuHouse, LuLogOut, LuMoon, LuSun, LuUser } from "react-icons/lu";+import { modeValidator } from "@carbon/utils";+import { useState } from "react";+import {+ LuHouse,+ LuLaptop,+ LuLogOut,+ LuMoon,+ LuSun,+ LuUser+} from "react-icons/lu";import { Form, Link, useFetcher } from "react-router";import { Avatar } from "~/components";import { useUser } from "~/hooks";@@ -26,13 +39,20 @@ const AvatarMenu = () => {const name = `${user.firstName} ${user.lastName}`;const mode = useMode();-- const nextMode = mode === "dark" ? "light" : "dark";- const modeSubmitRef = useRef<HTMLButtonElement>(null);+ const modePreference = useModePreference();const fetcher = useFetcher<typeof action>();const [isOpen, setIsOpen] = useState(false);+ const onModeChange = (value: string) => {+ const parsed = modeValidator.shape.mode.safeParse(value);+ if (!parsed.success || parsed.data === modePreference) return;+ document.body.removeAttribute("style");+ const formData = new FormData();+ formData.append("mode", parsed.data);+ fetcher.submit(formData, { method: "post", action: path.to.root });+ };+return (<DropdownMenu open={isOpen} onOpenChange={setIsOpen}><DropdownMenuTrigger className="outline-none focus-visible:outline-none">@@ -55,33 +75,40 @@ const AvatarMenu = () => {</Link></DropdownMenuItem><DropdownMenuSeparator />- <DropdownMenuItem onSelect={(e) => e.preventDefault()}>- <div className="flex items-center justify-between w-full">- <div className="flex items-center justify-start">- <DropdownMenuIcon- icon={mode === "dark" ? <LuMoon /> : <LuSun />}- />- Dark Mode- </div>- <div>- <Switch- checked={mode === "dark"}- onCheckedChange={() => modeSubmitRef.current?.click()}- />- <fetcher.Form- action={path.to.root}- method="post"- onSubmit={() => {- document.body.removeAttribute("style");- }}- className="sr-only"+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <DropdownMenuIcon icon={mode === "dark" ? <LuMoon /> : <LuSun />} />+ Appearance+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ <DropdownMenuRadioGroup+ value={modePreference}+ onValueChange={onModeChange}+ >+ <DropdownMenuRadioItem+ value="light"+ onSelect={(e) => e.preventDefault()}>- <input type="hidden" name="mode" value={nextMode} />- <button ref={modeSubmitRef} className="sr-only" type="submit" />- </fetcher.Form>- </div>- </div>- </DropdownMenuItem>+ <DropdownMenuIcon icon={<LuSun />} />+ Light+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="dark"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuMoon />} />+ Dark+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem+ value="system"+ onSelect={(e) => e.preventDefault()}+ >+ <DropdownMenuIcon icon={<LuLaptop />} />+ System+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuSubContent>+ </DropdownMenuSub><DropdownMenuSeparator /><DropdownMenuItem onSelect={(e) => e.preventDefault()}><Form method="post" action={path.to.logout}>diff --git a/apps/starter/app/root.tsx b/apps/starter/app/root.tsxindex 213aa4d973..6bc07dba7a 100644--- a/apps/starter/app/root.tsx+++ b/apps/starter/app/root.tsx@@ -16,7 +16,7 @@ import { validator } from "@carbon/form";import { requestIdMiddleware } from "@carbon/logger/middleware.server";import { Button, Heading, Toaster, useMode } from "@carbon/react";import type { Theme } from "@carbon/utils";-import { modeValidator, themes } from "@carbon/utils";+import { colorSchemeHintScript, modeValidator, themes } from "@carbon/utils";import { faviconLinks } from "@carbon/utils/favicon";import { Analytics } from "@vercel/analytics/react";import type React from "react";@@ -89,7 +89,7 @@ export async function loader({ request, context }: LoaderFunctionArgs) {SUPABASE_URL,SUPABASE_ANON_KEY},- mode: getMode(request),+ ...getMode(request),theme: getTheme(request),result: context.get(flashResultContext)},@@ -137,6 +137,7 @@ function Document({mode?: "light" | "dark";theme?: string;}) {+ const nonce = useContext(UNSAFE_FrameworkContext)?.nonce;const selectedTheme = themes.find((t) => t.name === theme) as| Theme| undefined;@@ -174,6 +175,13 @@ function Document({<head><meta charSet="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />+ {/* Before any paint: records the OS color scheme for a `system` user+ and reloads once if the server rendered the wrong mode. */}+ <script+ nonce={nonce}+ suppressHydrationWarning+ dangerouslySetInnerHTML={{ __html: colorSchemeHintScript }}+ /><Meta /><title>{title}</title><Links />diff --git a/apps/starter/app/services/mode.server.ts b/apps/starter/app/services/mode.server.tsindex 2b84929562..8d32e52846 100644--- a/apps/starter/app/services/mode.server.ts+++ b/apps/starter/app/services/mode.server.ts@@ -3,23 +3,18 @@// including ports, remain AGPLv3; serving them over a network requires releasing their source.import { DOMAIN } from "@carbon/auth";-import type { Mode } from "@carbon/utils";+import type { ModePreference } from "@carbon/utils";+import { getModeFromCookies, MODE_COOKIE } from "@carbon/utils";import * as cookie from "cookie";-const cookieName = "mode";--export function getMode(request: Request): Mode | null {- const cookieHeader = request.headers.get("cookie");- const parsed = cookieHeader- ? cookie.parse(cookieHeader)[cookieName]- : "light";- if (parsed === "light" || parsed === "dark") return parsed;- return null;+/** `mode` is what to render; `modePreference` is what the user chose. */+export function getMode(request: Request) {+ return getModeFromCookies(request.headers.get("cookie"));}-export function setMode(mode: Mode | "system") {+export function setMode(mode: ModePreference) {if (mode === "system") {- return cookie.serialize(cookieName, "", { path: "/", maxAge: -1 });+ return cookie.serialize(MODE_COOKIE, "", { path: "/", maxAge: -1 });} else {const cookieOptions: cookie.SerializeOptions = {path: "/",@@ -29,6 +24,6 @@ export function setMode(mode: Mode | "system") {if (DOMAIN && !DOMAIN.startsWith("localhost")) {cookieOptions.domain = DOMAIN;}- return cookie.serialize(cookieName, mode, cookieOptions);+ return cookie.serialize(MODE_COOKIE, mode, cookieOptions);}}diff --git a/packages/database/src/datasets/coverage.ts b/packages/database/src/datasets/coverage.tsindex 8d4e7b87a8..5653716de1 100644--- a/packages/database/src/datasets/coverage.ts+++ b/packages/database/src/datasets/coverage.ts@@ -238,7 +238,7 @@ export const COVERAGE_FLOORS: Record<string, number> = {supplierTax: 11,supplierType: 6,tag: 5,- timeCardEntry: 7,+ timeCardEntry: 6,tool: 2,trackedActivity: 7,trackedActivityInput: 6,diff --git a/packages/database/src/datasets/data/motor/ops.ts b/packages/database/src/datasets/data/motor/ops.tsindex 7d2b80aee0..99fd35c51a 100644--- a/packages/database/src/datasets/data/motor/ops.ts+++ b/packages/database/src/datasets/data/motor/ops.ts@@ -7,7 +7,6 @@ import type {MaintenanceDispatchSpec,MaintenanceScheduleSpec,NoteSpec,- OpenTimecardSpec,OpsData,PeopleAbsenceSpec,PeopleAssignmentSpec,@@ -438,9 +437,6 @@ export const TIMECARDS: TimecardSpec[] = [{ dayOffset: -1, clockIn: "11:30:00", clockOut: "15:03:00" }];-// Clocked in before the first timer on the floor started this morning.-export const OPEN_TIMECARD: OpenTimecardSpec = { clockIn: "06:29:00" };-// None on today, so the MES schedule opens on every work center, not one station.export const PEOPLE_ASSIGNMENTS: PeopleAssignmentSpec[] = [{ dayOffset: -2, workCenter: "Winding Line 1", shift: "A Shift" },@@ -588,7 +584,6 @@ export const motorOps: OpsData = {replacementParts: REPLACEMENT_PARTS,trainings: TRAININGS,timecards: TIMECARDS,- openTimecard: OPEN_TIMECARD,peopleAssignments: PEOPLE_ASSIGNMENTS,peopleAbsences: PEOPLE_ABSENCES,suggestions: SUGGESTIONS,diff --git a/packages/database/src/datasets/data/precision/ops.ts b/packages/database/src/datasets/data/precision/ops.tsindex 2d52d950b8..2a2f9f776f 100644--- a/packages/database/src/datasets/data/precision/ops.ts+++ b/packages/database/src/datasets/data/precision/ops.ts@@ -7,7 +7,6 @@ import type {MaintenanceDispatchSpec,MaintenanceScheduleSpec,NoteSpec,- OpenTimecardSpec,OpsData,PeopleAbsenceSpec,PeopleAssignmentSpec,@@ -424,9 +423,6 @@ export const TIMECARDS: TimecardSpec[] = [{ dayOffset: -1, clockIn: "11:02:00", clockOut: "14:33:00" }];-// Clocked in before the first timer on the floor started this morning.-export const OPEN_TIMECARD: OpenTimecardSpec = { clockIn: "05:57:00" };-// None on today itself, so the MES schedule opens on every work center instead of one station.export const PEOPLE_ASSIGNMENTS: PeopleAssignmentSpec[] = [{ dayOffset: -2, workCenter: "VMC Cell 1", shift: "First Shift" },@@ -569,7 +565,6 @@ export const precisionOps: OpsData = {replacementParts: REPLACEMENT_PARTS,trainings: TRAININGS,timecards: TIMECARDS,- openTimecard: OPEN_TIMECARD,peopleAssignments: PEOPLE_ASSIGNMENTS,peopleAbsences: PEOPLE_ABSENCES,suggestions: SUGGESTIONS,diff --git a/packages/database/src/datasets/data/robotics/ops.ts b/packages/database/src/datasets/data/robotics/ops.tsindex d4cbd93957..d390d26b81 100644--- a/packages/database/src/datasets/data/robotics/ops.ts+++ b/packages/database/src/datasets/data/robotics/ops.ts@@ -7,7 +7,6 @@ import type {MaintenanceDispatchSpec,MaintenanceScheduleSpec,NoteSpec,- OpenTimecardSpec,OpsData,PeopleAbsenceSpec,PeopleAssignmentSpec,@@ -433,9 +432,6 @@ export const TIMECARDS: TimecardSpec[] = [{ dayOffset: -1, clockIn: "12:02:00", clockOut: "15:36:00" }];-// Clocked in before the first timer on the floor started this morning.-export const OPEN_TIMECARD: OpenTimecardSpec = { clockIn: "06:33:00" };-// None on today, so the MES schedule opens on every work center, not one station.export const PEOPLE_ASSIGNMENTS: PeopleAssignmentSpec[] = [{ dayOffset: -2, workCenter: "CNC Mill Cell", shift: "First Shift" },@@ -582,7 +578,6 @@ export const roboticsOps: OpsData = {replacementParts: REPLACEMENT_PARTS,trainings: TRAININGS,timecards: TIMECARDS,- openTimecard: OPEN_TIMECARD,peopleAssignments: PEOPLE_ASSIGNMENTS,peopleAbsences: PEOPLE_ABSENCES,suggestions: SUGGESTIONS,diff --git a/packages/database/src/datasets/data/satellite/ops.ts b/packages/database/src/datasets/data/satellite/ops.tsindex 6ed408a8b4..aed35468b0 100644--- a/packages/database/src/datasets/data/satellite/ops.ts+++ b/packages/database/src/datasets/data/satellite/ops.ts@@ -7,7 +7,6 @@ import type {MaintenanceDispatchSpec,MaintenanceScheduleSpec,NoteSpec,- OpenTimecardSpec,OpsData,PeopleAbsenceSpec,PeopleAssignmentSpec,@@ -423,9 +422,6 @@ export const TIMECARDS: TimecardSpec[] = [{ dayOffset: -1, clockIn: "12:01:00", clockOut: "15:34:00" }];-// Clocked in before the first timer on the floor started this morning.-export const OPEN_TIMECARD: OpenTimecardSpec = { clockIn: "06:31:00" };-// None on today, so the MES schedule opens on every work center, not one station.export const PEOPLE_ASSIGNMENTS: PeopleAssignmentSpec[] = [{ dayOffset: -2, workCenter: "CNC Mill", shift: "Day Shift" },@@ -572,7 +568,6 @@ export const satelliteOps: OpsData = {replacementParts: REPLACEMENT_PARTS,trainings: TRAININGS,timecards: TIMECARDS,- openTimecard: OPEN_TIMECARD,peopleAssignments: PEOPLE_ASSIGNMENTS,peopleAbsences: PEOPLE_ABSENCES,suggestions: SUGGESTIONS,diff --git a/packages/database/src/datasets/tiers/10-ops.ts b/packages/database/src/datasets/tiers/10-ops.tsindex 78b9cec7fb..8e756c7d27 100644--- a/packages/database/src/datasets/tiers/10-ops.ts+++ b/packages/database/src/datasets/tiers/10-ops.ts@@ -70,20 +70,13 @@ export async function runTier10(ctx: Ctx): Promise<void> {// companySettings has no companyId, so the wipe keeps it; without the flag// both apps hide the time clock and redirect away from the timecard pages.- ctx.log("time clock — enabled, clocked in today");+ ctx.log("time clock — enabled");await insertRow(ctx,"companySettings",{ id: ctx.companyId, timeCardEnabled: true },{ onConflict: '("id") DO UPDATE SET "timeCardEnabled" = true' });- // The MES reads the open entry with maybeSingle, so there is exactly one.- await insertRow(ctx, "timeCardEntry", {- employeeId: ctx.userId,- clockIn: resolveTimestamp(ctx.anchor, 0, data.openTimecard.clockIn),- clockOut: null,- note: data.openTimecard.note- });ctx.log(`people assignments — ${data.peopleAssignments.length}, absences — ${data.peopleAbsences.length}`diff --git a/packages/database/src/datasets/types.ts b/packages/database/src/datasets/types.tsindex 6adccd934c..dee756d6dc 100644--- a/packages/database/src/datasets/types.ts+++ b/packages/database/src/datasets/types.ts@@ -1956,12 +1956,6 @@ export type TimecardSpec = {note?: string;};-export type OpenTimecardSpec = {- /** UTC "HH:MM:SS" today; no later than the earliest running production event. */- clockIn: string;- note?: string;-};-/** Never today: a today row pre-filters the MES schedule to that one work center. */export type PeopleAssignmentSpec = {dayOffset: DayOffset;@@ -2078,7 +2072,6 @@ export type OpsData = {replacementParts: ReplacementPartSpec[];trainings: TrainingSpec[];timecards: TimecardSpec[];- openTimecard: OpenTimecardSpec;peopleAssignments: PeopleAssignmentSpec[];peopleAbsences: PeopleAbsenceSpec[];suggestions: SuggestionSpec[];diff --git a/packages/database/src/datasets/validate.ts b/packages/database/src/datasets/validate.tsindex 9308d57577..2be2abad5d 100644--- a/packages/database/src/datasets/validate.ts+++ b/packages/database/src/datasets/validate.ts@@ -6280,33 +6280,6 @@ export function peopleAndTime(ctx: ValidationCtx): void {const { dataset, fail, need } = ctx;const ops = dataset.ops;- const clockIn = secondsOfDay(ops.openTimecard.clockIn);- if (clockIn === null) {- fail(- `ops.openTimecard: clockIn "${ops.openTimecard.clockIn}" is not a UTC "HH:MM:SS"`- );- } else {- const runningStarts = [- OPEN_EVENT_TIME,- dataset.production.batch.running.startTimeOfDay- ];- for (const job of dataset.production.jobs) {- for (const override of job.operationOverrides ?? []) {- if (override.running) {- runningStarts.push(override.running.startTimeOfDay);- }- }- }- const earliest = Math.min(- ...runningStarts.map((time) => secondsOfDay(time) ?? 0)- );- if (clockIn > earliest) {- fail(- `ops.openTimecard: clocked in at ${ops.openTimecard.clockIn}, after a production timer already running today`- );- }- }-const assignmentDays = new Set<number>();const assignedWorkCenters = new Set<string>();const seenAssignments = new Set<string>();diff --git a/packages/locale/locales/de/erp.po b/packages/locale/locales/de/erp.poindex 0844c10f90..66e9cd8eb2 100644--- a/packages/locale/locales/de/erp.po+++ b/packages/locale/locales/de/erp.po@@ -2097,6 +2097,9 @@ msgstr "API-Schlüssel für programmgesteuerten Zugriff auf Ihre Carbon-Daten."msgid "API, webhooks, and integrations"msgstr "API, Webhooks und Integrationen"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Angewendet"@@ -3907,9 +3910,15 @@ msgstr "Klicken Sie hier, um eine PDF-Zeichnung hochzuladen."msgid "Clock In"msgstr "Einstempeln"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Ausstempeln"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Angemeldet seit <0/>"@@ -5480,9 +5489,6 @@ msgstr "Tägliche Nutzung"msgid "Dark"msgstr "Dunkel"-msgid "Dark Mode"-msgstr "Dunkler Modus"-msgid "Dashboard"msgstr "Instrumententafel"@@ -10195,12 +10201,6 @@ msgstr "Gesamtnutzung (Einheiten)"msgid "Light"msgstr "Hell"-msgid "Light Mode"-msgstr "Hellmodus"--msgid "Light or dark mode"-msgstr "Helles oder dunkles Design"-msgid "Lights Out (24×7)"msgstr "Lichter aus (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Richten Sie Carbon um die Betriebsweise Ihres Unternehmens ein: Betriebsmsgid "Set Clock Out"msgstr "Ausstempeln festlegen"-msgid "Set clock-out time"-msgstr "Abmeldungszeit festlegen"-msgid "Set Console PIN"msgstr "Console-PIN festlegen"@@ -16577,6 +16574,9 @@ msgstr "Preisfindung festlegen"msgid "Set Quantity"msgstr "Menge festlegen"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Authentifizierungs-App einrichten"@@ -21335,9 +21335,6 @@ msgstr "Sie können den UI-Stil jederzeit über die Design-Einstellung ändern"msgid "You can only see this key once. Store it safely."msgstr "Du kannst diesen Schlüssel nur einmal sehen. Speichere ihn sicher."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Sie sind um <0/> eingestempelt. Sie können Ihre Ausstempelzeit unten bearbeiten oder bestätigen, dass Sie noch arbeiten."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/de/mes.po b/packages/locale/locales/de/mes.poindex c993f482b8..f672e8ad10 100644--- a/packages/locale/locales/de/mes.po+++ b/packages/locale/locales/de/mes.po@@ -176,6 +176,9 @@ msgstr "Fehlerhafte Einheiten zuordnen"msgid "Allocate units"msgstr "Einheiten zuordnen"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Möchten Sie diesen Schritt wirklich löschen?"@@ -310,9 +313,15 @@ msgstr "Standardstation löschen"msgid "Clock In"msgstr "Einstempeln"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Ausstempeln"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Eingecheckt seit <0/>"@@ -417,8 +426,8 @@ msgstr "Aktuelle Arbeit"msgid "Customer"msgstr "Kunde"-msgid "Dark Mode"-msgstr "Dunkelmodus"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Datum"@@ -811,6 +820,9 @@ msgstr "Diese Seite verlassen"msgid "Let's build something"msgstr "Lassen Sie uns etwas bauen"+msgid "Light"+msgstr ""+msgid "lines"msgstr "Zeilen"@@ -1562,8 +1574,8 @@ msgstr "Sitzung gesperrt"msgid "Set Clock Out"msgstr "Ausstempelzeit setzen"-msgid "Set clock-out time"-msgstr "Ausstempelzeit festlegen"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "In Carbon einrichten"@@ -1687,6 +1699,9 @@ msgstr "Unterstützung erforderlich"msgid "Switch Operator"msgstr "Werker wechseln"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Tag"@@ -1905,9 +1920,6 @@ msgstr "Arbeitsanweisungen"msgid "Yes"msgstr "Ja"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Sie haben sich um <0/> angemeldet. Sie können Ihre Ausstempelzeit unten bearbeiten oder bestätigen, dass Sie noch arbeiten."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Sie sind seit {hoursElapsed} Stunden eingestempelt. Haben Sie das Ausstempeln vergessen?"diff --git a/packages/locale/locales/en/erp.po b/packages/locale/locales/en/erp.poindex 61a028f23b..360a6b294e 100644--- a/packages/locale/locales/en/erp.po+++ b/packages/locale/locales/en/erp.po@@ -2097,6 +2097,9 @@ msgstr "API keys for programmatic access to your Carbon data."msgid "API, webhooks, and integrations"msgstr "API, webhooks, and integrations"+msgid "Appearance"+msgstr "Appearance"+msgid "Applied"msgstr "Applied"@@ -3907,9 +3910,15 @@ msgstr "Click to upload a PDF drawing"msgid "Clock In"msgstr "Clock In"+msgid "Clock out"+msgstr "Clock out"+msgid "Clock Out"msgstr "Clock Out"+msgid "Clocked in"+msgstr "Clocked in"+msgid "Clocked in since <0/>"msgstr "Clocked in since <0/>"@@ -5480,9 +5489,6 @@ msgstr "Daily Usage"msgid "Dark"msgstr "Dark"-msgid "Dark Mode"-msgstr "Dark Mode"-msgid "Dashboard"msgstr "Dashboard"@@ -10195,12 +10201,6 @@ msgstr "Lifetime Usage (Units)"msgid "Light"msgstr "Light"-msgid "Light Mode"-msgstr "Light Mode"--msgid "Light or dark mode"-msgstr "Light or dark mode"-msgid "Lights Out (24×7)"msgstr "Lights Out (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Set Carbon up around how your company runs: sites, parts, BOMs, Bill ofmsgid "Set Clock Out"msgstr "Set Clock Out"-msgid "Set clock-out time"-msgstr "Set clock-out time"-msgid "Set Console PIN"msgstr "Set Console PIN"@@ -16577,6 +16574,9 @@ msgstr "Set Pricing"msgid "Set Quantity"msgstr "Set Quantity"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr "Set the time you stopped working, or acknowledge that you're still working."+msgid "Set up authenticator app"msgstr "Set up authenticator app"@@ -21335,9 +21335,6 @@ msgstr "You can change the UI style any time through the theme setting"msgid "You can only see this key once. Store it safely."msgstr "You can only see this key once. Store it safely."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/en/mes.po b/packages/locale/locales/en/mes.poindex 0de116c0b9..2152f01434 100644--- a/packages/locale/locales/en/mes.po+++ b/packages/locale/locales/en/mes.po@@ -176,6 +176,9 @@ msgstr "Allocate failed units"msgid "Allocate units"msgstr "Allocate units"+msgid "Appearance"+msgstr "Appearance"+msgid "Are you sure you want to delete this step?"msgstr "Are you sure you want to delete this step?"@@ -310,9 +313,15 @@ msgstr "Clear station default"msgid "Clock In"msgstr "Clock In"+msgid "Clock out"+msgstr "Clock out"+msgid "Clock Out"msgstr "Clock Out"+msgid "Clocked in"+msgstr "Clocked in"+msgid "Clocked in since <0/>"msgstr "Clocked in since <0/>"@@ -417,8 +426,8 @@ msgstr "Current work"msgid "Customer"msgstr "Customer"-msgid "Dark Mode"-msgstr "Dark Mode"+msgid "Dark"+msgstr "Dark"msgid "Date"msgstr "Date"@@ -811,6 +820,9 @@ msgstr "Leave this page"msgid "Let's build something"msgstr "Let's build something"+msgid "Light"+msgstr "Light"+msgid "lines"msgstr "lines"@@ -1562,8 +1574,8 @@ msgstr "Session locked"msgid "Set Clock Out"msgstr "Set Clock Out"-msgid "Set clock-out time"-msgstr "Set clock-out time"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr "Set the time you stopped working, or acknowledge that you're still working."msgid "Set up in Carbon"msgstr "Set up in Carbon"@@ -1687,6 +1699,9 @@ msgstr "Support Required"msgid "Switch Operator"msgstr "Switch Operator"+msgid "System"+msgstr "System"+msgid "Tag"msgstr "Tag"@@ -1905,9 +1920,6 @@ msgstr "Work instructions"msgid "Yes"msgstr "Yes"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"diff --git a/packages/locale/locales/es/erp.po b/packages/locale/locales/es/erp.poindex 316130a373..83936e7ca9 100644--- a/packages/locale/locales/es/erp.po+++ b/packages/locale/locales/es/erp.po@@ -2097,6 +2097,9 @@ msgstr "Claves API para acceso programático a tus datos de Carbon."msgid "API, webhooks, and integrations"msgstr "API, webhooks e integraciones"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Aplicado"@@ -3907,9 +3910,15 @@ msgstr "Haga clic para subir un dibujo PDF"msgid "Clock In"msgstr "Fichar entrada"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Fichar salida"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Fichado desde <0/>"@@ -5480,9 +5489,6 @@ msgstr "Uso Diario"msgid "Dark"msgstr "Oscuro"-msgid "Dark Mode"-msgstr "Modo Oscuro"-msgid "Dashboard"msgstr "Panel de control"@@ -10195,12 +10201,6 @@ msgstr "Uso de Vida Útil (Unidades)"msgid "Light"msgstr "Claro"-msgid "Light Mode"-msgstr "Modo Claro"--msgid "Light or dark mode"-msgstr "Modo claro u oscuro"-msgid "Lights Out (24×7)"msgstr "Sin luces (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Configure Carbon de acuerdo con cómo funciona su empresa: ubicaciones,msgid "Set Clock Out"msgstr "Establecer ficha de salida"-msgid "Set clock-out time"-msgstr "Establecer hora de salida"-msgid "Set Console PIN"msgstr "Establecer PIN de Consola"@@ -16577,6 +16574,9 @@ msgstr "Establecer precios"msgid "Set Quantity"msgstr "Establecer Cantidad"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Configurar aplicación autenticadora"@@ -21335,9 +21335,6 @@ msgstr "Puedes cambiar el estilo de la interfaz en cualquier momento a través lmsgid "You can only see this key once. Store it safely."msgstr "Solo puedes ver esta clave una vez. Guárdala de forma segura."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Te fichaste en <0/>. Puedes editar tu hora de salida a continuación o confirmar que aún estás trabajando."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/es/mes.po b/packages/locale/locales/es/mes.poindex d2ae9a9c56..4ca34189cd 100644--- a/packages/locale/locales/es/mes.po+++ b/packages/locale/locales/es/mes.po@@ -176,6 +176,9 @@ msgstr "Asignar unidades fallidas"msgid "Allocate units"msgstr "Asignar unidades"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "¿Está seguro de que desea eliminar este paso?"@@ -310,9 +313,15 @@ msgstr "Borrar estación predeterminada"msgid "Clock In"msgstr "Fichar entrada"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Fichar salida"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Marcado entrada desde <0/>"@@ -417,8 +426,8 @@ msgstr "Trabajo actual"msgid "Customer"msgstr "Cliente"-msgid "Dark Mode"-msgstr "Modo oscuro"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Fecha"@@ -811,6 +820,9 @@ msgstr "Salir de esta página"msgid "Let's build something"msgstr "Construyamos algo"+msgid "Light"+msgstr ""+msgid "lines"msgstr "líneas"@@ -1562,8 +1574,8 @@ msgstr "Sesión bloqueada"msgid "Set Clock Out"msgstr "Establecer Fichar salida"-msgid "Set clock-out time"-msgstr "Establecer hora de salida"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Configurar en Carbon"@@ -1687,6 +1699,9 @@ msgstr "Requiere soporte"msgid "Switch Operator"msgstr "Cambiar operador"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Etiqueta"@@ -1905,9 +1920,6 @@ msgstr "Instrucciones de trabajo"msgid "Yes"msgstr "Sí"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Marcaste entrada a las <0/>. Puedes editar tu hora de salida a continuación o confirmar que aún estás trabajando."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Ha estado fichado durante {hoursElapsed} horas. ¿Olvidó fichar salida?"diff --git a/packages/locale/locales/fr/erp.po b/packages/locale/locales/fr/erp.poindex 303c9414d9..f2efdfca32 100644--- a/packages/locale/locales/fr/erp.po+++ b/packages/locale/locales/fr/erp.po@@ -2097,6 +2097,9 @@ msgstr "Clés API pour un accès programmatique à vos données Carbon."msgid "API, webhooks, and integrations"msgstr "API, Webhooks et Intégrations"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Appliqué"@@ -3907,9 +3910,15 @@ msgstr "Cliquer pour téléverser un dessin PDF"msgid "Clock In"msgstr "Pointage début"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Pointage fin"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Connecté depuis <0/>"@@ -5480,9 +5489,6 @@ msgstr "Utilisation quotidienne"msgid "Dark"msgstr "Sombre"-msgid "Dark Mode"-msgstr "Mode sombre"-msgid "Dashboard"msgstr "Tableau de bord"@@ -10195,12 +10201,6 @@ msgstr "Utilisation de Durée de Vie (Unités)"msgid "Light"msgstr "Clair"-msgid "Light Mode"-msgstr "Mode Clair"--msgid "Light or dark mode"-msgstr "Mode clair ou sombre"-msgid "Lights Out (24×7)"msgstr "Lumières éteintes (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Configurez Carbon en fonction du fonctionnement de votre société : sitmsgid "Set Clock Out"msgstr "Définir le pointage fin"-msgid "Set clock-out time"-msgstr "Définir l'heure de départ"-msgid "Set Console PIN"msgstr "Définir le PIN Console"@@ -16577,6 +16574,9 @@ msgstr "Définir la tarification"msgid "Set Quantity"msgstr "Définir la quantité"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Configurer l'application d'authentification"@@ -21335,9 +21335,6 @@ msgstr "Vous pouvez modifier le style de l'interface utilisateur à tout momentmsgid "You can only see this key once. Store it safely."msgstr "Vous ne pouvez voir cette clé qu'une seule fois. Conservez-la en sécurité."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Vous êtes connecté à <0/>. Vous pouvez modifier votre heure de déconnexion ci-dessous ou confirmer que vous travaillez toujours."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/fr/mes.po b/packages/locale/locales/fr/mes.poindex f24e223b1c..7f8f395eaa 100644--- a/packages/locale/locales/fr/mes.po+++ b/packages/locale/locales/fr/mes.po@@ -176,6 +176,9 @@ msgstr "Allouer les unités défaillantes"msgid "Allocate units"msgstr "Allouer les unités"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Êtes-vous sûr de vouloir supprimer cette étape ?"@@ -310,9 +313,15 @@ msgstr "Effacer la station par défaut"msgid "Clock In"msgstr "Pointage début"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Pointage fin"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Connecté depuis <0/>"@@ -417,8 +426,8 @@ msgstr "Travail actuel"msgid "Customer"msgstr "Client"-msgid "Dark Mode"-msgstr "Mode sombre"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Date"@@ -811,6 +820,9 @@ msgstr "Quitter cette page"msgid "Let's build something"msgstr "Construisons quelque chose"+msgid "Light"+msgstr ""+msgid "lines"msgstr "lignes"@@ -1562,8 +1574,8 @@ msgstr "Session verrouillée"msgid "Set Clock Out"msgstr "Définir le pointage fin"-msgid "Set clock-out time"-msgstr "Définir l'heure de sortie"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Configurer dans Carbon"@@ -1687,6 +1699,9 @@ msgstr "Support requis"msgid "Switch Operator"msgstr "Changer d'opérateur"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Étiquette"@@ -1905,9 +1920,6 @@ msgstr "Modes opératoires"msgid "Yes"msgstr "Oui"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Vous avez pointé à <0/>. Vous pouvez modifier votre heure de départ ci-dessous ou confirmer que vous travaillez toujours."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Vous êtes pointé(e) depuis {hoursElapsed} heures. Avez-vous oublié le pointage fin ?"diff --git a/packages/locale/locales/hi/erp.po b/packages/locale/locales/hi/erp.poindex a431782c9c..c505d33016 100644--- a/packages/locale/locales/hi/erp.po+++ b/packages/locale/locales/hi/erp.po@@ -2097,6 +2097,9 @@ msgstr "आपके Carbon डेटा के लिए प्रोग्रmsgid "API, webhooks, and integrations"msgstr "API, वेबहुक, और एकीकरण"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "लागू"@@ -3907,9 +3910,15 @@ msgstr "PDF ड्राइंग अपलोड करने के लिएmsgid "Clock In"msgstr "कार्य प्रारंभ"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "कार्य समाप्त"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/> से काम में आए"@@ -5480,9 +5489,6 @@ msgstr "दैनिक उपयोग"msgid "Dark"msgstr "गहरा"-msgid "Dark Mode"-msgstr "डार्क मोड"-msgid "Dashboard"msgstr "डैशबोर्ड"@@ -10195,12 +10201,6 @@ msgstr "जीवनकाल उपयोग (इकाइयां)"msgid "Light"msgstr "हल्का"-msgid "Light Mode"-msgstr "लाइट मोड"--msgid "Light or dark mode"-msgstr "हल्का या गहरा थीम"-msgid "Lights Out (24×7)"msgstr "लाइट्स आउट (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Carbon को अपनी कंपनी के संचालन कmsgid "Set Clock Out"msgstr "कार्य समाप्त सेट करें"-msgid "Set clock-out time"-msgstr "घड़ी बंद करने का समय सेट करें"-msgid "Set Console PIN"msgstr "कंसोल पिन सेट करें"@@ -16577,6 +16574,9 @@ msgstr "मूल्य निर्धारण सेट करें"msgid "Set Quantity"msgstr "मात्रा निर्धारित करें"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "प्रमाणकर्ता ऐप सेटअप करें"@@ -21335,9 +21335,6 @@ msgstr "आप किसी भी समय थीम सेटिंग केmsgid "You can only see this key once. Store it safely."msgstr "आप इस कुंजी को केवल एक बार देख सकते हैं। इसे सुरक्षित रूप से संग्रहीत करें।"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "आपने <0/> पर घड़ी में प्रवेश किया। आप नीचे अपने घड़ी से बाहर का समय संपादित कर सकते हैं या यह स्वीकार कर सकते हैं कि आप अभी भी काम कर रहे हैं।"-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/hi/mes.po b/packages/locale/locales/hi/mes.poindex 368d52a25c..323694a1bb 100644--- a/packages/locale/locales/hi/mes.po+++ b/packages/locale/locales/hi/mes.po@@ -176,6 +176,9 @@ msgstr "विफल इकाइयों को आवंटित करेmsgid "Allocate units"msgstr "इकाइयों को आवंटित करें"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "क्या आप वाकई इस चरण को हटाना चाहते हैं?"@@ -310,9 +313,15 @@ msgstr "स्टेशन डिफ़ॉल्ट को साफ़ करmsgid "Clock In"msgstr "कार्य प्रारंभ"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "कार्य समाप्त"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/> से घड़ी चालू है"@@ -417,8 +426,8 @@ msgstr "वर्तमान कार्य"msgid "Customer"msgstr "ग्राहक"-msgid "Dark Mode"-msgstr "डार्क मोड"+msgid "Dark"+msgstr ""msgid "Date"msgstr "तारीख"@@ -811,6 +820,9 @@ msgstr "इस पृष्ठ को छोड़ें"msgid "Let's build something"msgstr "चलिए कुछ बनाते हैं"+msgid "Light"+msgstr ""+msgid "lines"msgstr "लाइनें"@@ -1562,8 +1574,8 @@ msgstr "सत्र लॉक किया गया"msgid "Set Clock Out"msgstr "कार्य समाप्ति सेट करें"-msgid "Set clock-out time"-msgstr "घड़ी बंद करने का समय सेट करें"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Carbon में सेट अप करें"@@ -1687,6 +1699,9 @@ msgstr "समर्थन आवश्यक"msgid "Switch Operator"msgstr "ऑपरेटर स्विच करें"+msgid "System"+msgstr ""+msgid "Tag"msgstr "टैग"@@ -1905,9 +1920,6 @@ msgstr "कार्य निर्देश"msgid "Yes"msgstr "हां"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "आप <0/> पर घड़ी में आए हैं। आप नीचे अपने घड़ी से बाहर का समय संपादित कर सकते हैं या स्वीकार कर सकते हैं कि आप अभी भी काम कर रहे हैं।"-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "आप {hoursElapsed} घंटों से कार्य पर हैं। क्या आप कार्य समाप्त करना भूल गए?"diff --git a/packages/locale/locales/it/erp.po b/packages/locale/locales/it/erp.poindex 84dfe8c5d1..77af9e6e35 100644--- a/packages/locale/locales/it/erp.po+++ b/packages/locale/locales/it/erp.po@@ -2097,6 +2097,9 @@ msgstr "Chiavi API per l'accesso programmatico ai tuoi dati Carbon."msgid "API, webhooks, and integrations"msgstr "API, webhook e integrazioni"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Applicato"@@ -3907,9 +3910,15 @@ msgstr "Fare clic per caricare un disegno PDF"msgid "Clock In"msgstr "Timbra inizio"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Timbra fine"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "In servizio da <0/>"@@ -5480,9 +5489,6 @@ msgstr "Utilizzo Giornaliero"msgid "Dark"msgstr "Scuro"-msgid "Dark Mode"-msgstr "Modalità scura"-msgid "Dashboard"msgstr "Pannello di controllo"@@ -10195,12 +10201,6 @@ msgstr "Utilizzo di Durata (Unità)"msgid "Light"msgstr "Chiaro"-msgid "Light Mode"-msgstr "Modalità Chiara"--msgid "Light or dark mode"-msgstr "Modalità chiara o scura"-msgid "Lights Out (24×7)"msgstr "Spento (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Configura Carbon in base al modo in cui opera la tua azienda: ubicazionimsgid "Set Clock Out"msgstr "Imposta Timbra fine"-msgid "Set clock-out time"-msgstr "Imposta ora di uscita"-msgid "Set Console PIN"msgstr "Imposta PIN Console"@@ -16577,6 +16574,9 @@ msgstr "Imposta Determinazione dei prezzi"msgid "Set Quantity"msgstr "Imposta Quantità"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Configura app autenticatore"@@ -21335,9 +21335,6 @@ msgstr "Puoi cambiare lo stile dell'interfaccia in qualsiasi momento attraversomsgid "You can only see this key once. Store it safely."msgstr "Puoi visualizzare questa chiave solo una volta. Conservala in modo sicuro."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Hai registrato l'ingresso alle <0/>. Puoi modificare l'orario di uscita qui sotto o confermare che stai ancora lavorando."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/it/mes.po b/packages/locale/locales/it/mes.poindex 4ea8413e5f..b6e316bf38 100644--- a/packages/locale/locales/it/mes.po+++ b/packages/locale/locales/it/mes.po@@ -176,6 +176,9 @@ msgstr "Allocare unità non conformi"msgid "Allocate units"msgstr "Assegna unità"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Sei sicuro di voler eliminare questo passo?"@@ -310,9 +313,15 @@ msgstr "Cancella impostazione predefinita della stazione"msgid "Clock In"msgstr "Timbra inizio"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Timbra fine"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Connesso da <0/>"@@ -417,8 +426,8 @@ msgstr "Lavoro attuale"msgid "Customer"msgstr "Cliente"-msgid "Dark Mode"-msgstr "Modalità Scura"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Data"@@ -811,6 +820,9 @@ msgstr "Lascia questa pagina"msgid "Let's build something"msgstr "Costruiamo qualcosa"+msgid "Light"+msgstr ""+msgid "lines"msgstr "righe"@@ -1562,8 +1574,8 @@ msgstr "Sessione bloccata"msgid "Set Clock Out"msgstr "Registra timbra fine"-msgid "Set clock-out time"-msgstr "Imposta orario di uscita"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Configura in Carbon"@@ -1687,6 +1699,9 @@ msgstr "Supporto Richiesto"msgid "Switch Operator"msgstr "Cambia Operatore"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Etichetta"@@ -1905,9 +1920,6 @@ msgstr "Istruzioni di lavoro"msgid "Yes"msgstr "Sì"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Ti sei connesso a <0/>. Puoi modificare l'orario di disconnessione di seguito o confermare che stai ancora lavorando."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Sei timbrato da {hoursElapsed} ore. Hai dimenticato di timbra fine?"diff --git a/packages/locale/locales/ja/erp.po b/packages/locale/locales/ja/erp.poindex 8c12997773..9143022051 100644--- a/packages/locale/locales/ja/erp.po+++ b/packages/locale/locales/ja/erp.po@@ -2097,6 +2097,9 @@ msgstr "Carbonデータへのプログラマティックアクセス用のAPIキmsgid "API, webhooks, and integrations"msgstr "API、Webhook、および連携"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "適用"@@ -3907,9 +3910,15 @@ msgstr "PDFドローイングをアップロードするにはクリック"msgid "Clock In"msgstr "作業開始"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "作業終了"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/>からクロックイン中"@@ -5480,9 +5489,6 @@ msgstr "毎日の使用量"msgid "Dark"msgstr "ダーク"-msgid "Dark Mode"-msgstr "ダークモード"-msgid "Dashboard"msgstr "ダッシュボード"@@ -10195,12 +10201,6 @@ msgstr "ライフタイム使用(ユニット)"msgid "Light"msgstr "ライト"-msgid "Light Mode"-msgstr "ライトモード"--msgid "Light or dark mode"-msgstr "ライト/ダークモード"-msgid "Lights Out (24×7)"msgstr "ライツアウト(24×7)"@@ -16556,9 +16556,6 @@ msgstr "Carbonを会社の運営方法に合わせてセットアップしますmsgid "Set Clock Out"msgstr "作業終了を設定"-msgid "Set clock-out time"-msgstr "退勤時刻を設定"-msgid "Set Console PIN"msgstr "コンソールPINを設定"@@ -16577,6 +16574,9 @@ msgstr "価格設定"msgid "Set Quantity"msgstr "数量を設定"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "認証アプリをセットアップ"@@ -21335,9 +21335,6 @@ msgstr "テーマ設定からいつでもUIスタイルを変更できます"msgid "You can only see this key once. Store it safely."msgstr "このキーは一度だけ表示されます。安全に保管してください。"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "<0/>に出勤しました。下の退勤時刻を編集するか、まだ作業中であることを確認できます。"-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/ja/mes.po b/packages/locale/locales/ja/mes.poindex 5bd0490bd4..9fe41a3727 100644--- a/packages/locale/locales/ja/mes.po+++ b/packages/locale/locales/ja/mes.po@@ -176,6 +176,9 @@ msgstr "不合格ユニットを割り当てる"msgid "Allocate units"msgstr "ユニットを割り当てる"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "このステップを削除してもよろしいですか?"@@ -310,9 +313,15 @@ msgstr "既定ステーションをクリア"msgid "Clock In"msgstr "作業開始"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "作業終了"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/>からクロックイン中"@@ -417,8 +426,8 @@ msgstr "現在の作業"msgid "Customer"msgstr "得意先"-msgid "Dark Mode"-msgstr "ダークモード"+msgid "Dark"+msgstr ""msgid "Date"msgstr "日付"@@ -811,6 +820,9 @@ msgstr "このページを離れる"msgid "Let's build something"msgstr "さあ、何かを作りましょう"+msgid "Light"+msgstr ""+msgid "lines"msgstr "行"@@ -1562,8 +1574,8 @@ msgstr "セッションはロック中です。"msgid "Set Clock Out"msgstr "作業終了を設定"-msgid "Set clock-out time"-msgstr "退勤時間を設定"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Carbonで設定"@@ -1687,6 +1699,9 @@ msgstr "サポート必要"msgid "Switch Operator"msgstr "作業者を切り替える"+msgid "System"+msgstr ""+msgid "Tag"msgstr "タグ"@@ -1905,9 +1920,6 @@ msgstr "作業手順書"msgid "Yes"msgstr "はい"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "あなたは<0/>にクロックインしました。下記でクロックアウト時間を編集するか、まだ作業中であることを確認できます。"-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "作業開始から{hoursElapsed}時間が経過しています。作業終了を忘れていませんか?"diff --git a/packages/locale/locales/ko/erp.po b/packages/locale/locales/ko/erp.poindex 64f4f143a4..ebc60690a5 100644--- a/packages/locale/locales/ko/erp.po+++ b/packages/locale/locales/ko/erp.po@@ -2097,6 +2097,9 @@ msgstr "Carbon 데이터에 프로그래밍 방식으로 접근하기 위한 APImsgid "API, webhooks, and integrations"msgstr "API, 웹훅 및 연동"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "적용됨"@@ -3907,9 +3910,15 @@ msgstr "클릭하여 PDF 도면을 업로드하세요"msgid "Clock In"msgstr "작업 시작"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "작업 종료"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/> 이후로 근무 중"@@ -5480,9 +5489,6 @@ msgstr "매일 사용량"msgid "Dark"msgstr "다크"-msgid "Dark Mode"-msgstr "다크 모드"-msgid "Dashboard"msgstr "대시보드"@@ -10195,12 +10201,6 @@ msgstr "누적 사용량(단위)"msgid "Light"msgstr "라이트"-msgid "Light Mode"-msgstr "라이트 모드"--msgid "Light or dark mode"-msgstr "밝은 테마 또는 어두운 테마"-msgid "Lights Out (24×7)"msgstr "조명 꺼짐 (24×7)"@@ -16556,9 +16556,6 @@ msgstr "회사의 운영 방식에 맞게 Carbon을 설정하세요: 사업장,msgid "Set Clock Out"msgstr "작업 종료 설정"-msgid "Set clock-out time"-msgstr "퇴근 시간 설정"-msgid "Set Console PIN"msgstr "콘솔 PIN 설정"@@ -16577,6 +16574,9 @@ msgstr "가격 책정 설정"msgid "Set Quantity"msgstr "수량 설정"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "인증자 앱 설정"@@ -21335,9 +21335,6 @@ msgstr "테마 설정을 통해 언제든지 UI 스타일을 변경할 수 있msgid "You can only see this key once. Store it safely."msgstr "이 키는 한 번만 확인할 수 있습니다. 안전하게 보관하세요."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "당신은 <0/>에 근무를 시작했습니다. 아래에서 근무 종료 시간을 편집하거나 아직 작업 중임을 확인할 수 있습니다."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/ko/mes.po b/packages/locale/locales/ko/mes.poindex d1beb32607..c71c2e39fd 100644--- a/packages/locale/locales/ko/mes.po+++ b/packages/locale/locales/ko/mes.po@@ -176,6 +176,9 @@ msgstr "실패한 단위 할당"msgid "Allocate units"msgstr "단위 할당"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "이 단계를 삭제하시겠습니까?"@@ -310,9 +313,15 @@ msgstr "스테이션 기본값 초기화"msgid "Clock In"msgstr "작업 시작"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "작업 종료"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/>부터 근무 중"@@ -417,8 +426,8 @@ msgstr "현재 작업"msgid "Customer"msgstr "고객"-msgid "Dark Mode"-msgstr "다크 모드"+msgid "Dark"+msgstr ""msgid "Date"msgstr "날짜"@@ -811,6 +820,9 @@ msgstr "이 페이지 나가기"msgid "Let's build something"msgstr "무언가를 만들어봅시다"+msgid "Light"+msgstr ""+msgid "lines"msgstr "라인"@@ -1562,8 +1574,8 @@ msgstr "세션 잠김"msgid "Set Clock Out"msgstr "작업 종료 설정"-msgid "Set clock-out time"-msgstr "퇴근 시간 설정"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Carbon에서 설정하기"@@ -1687,6 +1699,9 @@ msgstr "지원 필요"msgid "Switch Operator"msgstr "작업자 전환"+msgid "System"+msgstr ""+msgid "Tag"msgstr "태그"@@ -1905,9 +1920,6 @@ msgstr "작업 표준서"msgid "Yes"msgstr "예"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "<0/>에 근무를 시작했습니다. 아래에서 퇴근 시간을 편집하거나 현재 근무 중임을 확인할 수 있습니다."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "{hoursElapsed}시간 동안 작업 중입니다. 작업 종료를 잊으셨나요?"diff --git a/packages/locale/locales/pl/erp.po b/packages/locale/locales/pl/erp.poindex d660da40e1..169b70024d 100644--- a/packages/locale/locales/pl/erp.po+++ b/packages/locale/locales/pl/erp.po@@ -2097,6 +2097,9 @@ msgstr "Klucze API do programowego dostępu do danych Carbon."msgid "API, webhooks, and integrations"msgstr "API, webhooks i integracje"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Zastosowano"@@ -3907,9 +3910,15 @@ msgstr "Kliknij, aby przesłać plik rysunku PDF"msgid "Clock In"msgstr "Rozpoczęcie pracy"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Zakończenie pracy"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Zalogowany od <0/>"@@ -5480,9 +5489,6 @@ msgstr "Codzienne zużycie"msgid "Dark"msgstr "Ciemny"-msgid "Dark Mode"-msgstr "Tryb ciemny"-msgid "Dashboard"msgstr "Panel glowny"@@ -10195,12 +10201,6 @@ msgstr "Użycie Całożycia (Jednostki)"msgid "Light"msgstr "Jasne"-msgid "Light Mode"-msgstr "Tryb jasny"--msgid "Light or dark mode"-msgstr "Tryb jasny lub ciemny"-msgid "Lights Out (24×7)"msgstr "Bez oświetlenia (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Skonfiguruj Carbon zgodnie z tym, jak działa twoja firma: lokalizacje,msgid "Set Clock Out"msgstr "Ustaw zakończenie pracy"-msgid "Set clock-out time"-msgstr "Ustaw czas wylogowania"-msgid "Set Console PIN"msgstr "Ustaw PIN konsoli"@@ -16577,6 +16574,9 @@ msgstr "Ustaw ceny"msgid "Set Quantity"msgstr "Ustaw ilość"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Skonfiguruj aplikację authenticator"@@ -21335,9 +21335,6 @@ msgstr "Możesz zmienić styl interfejsu użytkownika w dowolnym momencie za pomsgid "You can only see this key once. Store it safely."msgstr "Możesz zobaczyć ten klucz tylko raz. Przechowuj go bezpiecznie."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Rozpocząłeś pracę o <0/>. Możesz edytować czas zakończenia pracy poniżej lub potwierdzić, że nadal pracujesz."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/pl/mes.po b/packages/locale/locales/pl/mes.poindex 4221db40d0..139f813753 100644--- a/packages/locale/locales/pl/mes.po+++ b/packages/locale/locales/pl/mes.po@@ -176,6 +176,9 @@ msgstr "Przydziel jednostki z błędami"msgid "Allocate units"msgstr "Przydziel jednostki"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Czy na pewno chcesz usunąć ten krok?"@@ -310,9 +313,15 @@ msgstr "Wyczyść domyślną stację"msgid "Clock In"msgstr "Rozpoczęcie pracy"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Zakończenie pracy"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Zalogowany od <0/>"@@ -417,8 +426,8 @@ msgstr "Bieżąca praca"msgid "Customer"msgstr "Klient"-msgid "Dark Mode"-msgstr "Tryb ciemny"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Data"@@ -811,6 +820,9 @@ msgstr "Opuść tę stronę"msgid "Let's build something"msgstr "Zbudujmy coś"+msgid "Light"+msgstr ""+msgid "lines"msgstr "linie"@@ -1562,8 +1574,8 @@ msgstr "Sesja zablokowana"msgid "Set Clock Out"msgstr "Ustaw zakończenie pracy"-msgid "Set clock-out time"-msgstr "Ustaw czas zakończenia zmiany"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Skonfiguruj w aplikacji Carbon"@@ -1687,6 +1699,9 @@ msgstr "Wymagane wsparcie"msgid "Switch Operator"msgstr "Zmień operatora"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Tag"@@ -1905,9 +1920,6 @@ msgstr "Instrukcje robocze"msgid "Yes"msgstr "Tak"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Zalogowałeś się o <0/>. Możesz edytować czas wylogowania poniżej lub potwierdzić, że nadal pracujesz."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Pracujesz od {hoursElapsed} godzin. Zapomniałeś o zakończeniu pracy?"diff --git a/packages/locale/locales/pt/erp.po b/packages/locale/locales/pt/erp.poindex 7f2e588fa2..55970b0ed2 100644--- a/packages/locale/locales/pt/erp.po+++ b/packages/locale/locales/pt/erp.po@@ -2097,6 +2097,9 @@ msgstr "Chaves de API para acesso programático aos seus dados do Carbon."msgid "API, webhooks, and integrations"msgstr "API, webhooks e integrações"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Aplicado"@@ -3907,9 +3910,15 @@ msgstr "Clique para enviar arquivo de desenho PDF"msgid "Clock In"msgstr "Apontar início"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Apontar fim"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Marcado desde <0/>"@@ -5480,9 +5489,6 @@ msgstr "Uso Diário"msgid "Dark"msgstr "Escuro"-msgid "Dark Mode"-msgstr "Modo Escuro"-msgid "Dashboard"msgstr "Painel"@@ -10195,12 +10201,6 @@ msgstr "Uso de Vida Útil (Unidades)"msgid "Light"msgstr "Claro"-msgid "Light Mode"-msgstr "Modo Claro"--msgid "Light or dark mode"-msgstr "Modo claro ou escuro"-msgid "Lights Out (24×7)"msgstr "Luzes Apagadas (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Configure o Carbon de acordo com como sua empresa funciona: locais, peçmsgid "Set Clock Out"msgstr "Apontar fim"-msgid "Set clock-out time"-msgstr "Definir hora de saída"-msgid "Set Console PIN"msgstr "Definir PIN do Console"@@ -16577,6 +16574,9 @@ msgstr "Definir precificação"msgid "Set Quantity"msgstr "Definir Quantidade"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Configurar aplicativo autenticador"@@ -21335,9 +21335,6 @@ msgstr "Você pode alterar o estilo da interface a qualquer momento através damsgid "You can only see this key once. Store it safely."msgstr "Você só pode ver esta chave uma vez. Guarde-a com segurança."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Você se marcou às <0/>. Você pode editar seu horário de saída abaixo ou confirmar que ainda está trabalhando."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/pt/mes.po b/packages/locale/locales/pt/mes.poindex a0e3d83e5e..f0850b8659 100644--- a/packages/locale/locales/pt/mes.po+++ b/packages/locale/locales/pt/mes.po@@ -176,6 +176,9 @@ msgstr "Alocar unidades com falha"msgid "Allocate units"msgstr "Alocar unidades"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Tem certeza de que deseja excluir esta etapa?"@@ -310,9 +313,15 @@ msgstr "Limpar padrão da estação"msgid "Clock In"msgstr "Apontar início"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Apontar fim"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Registrado desde <0/>"@@ -417,8 +426,8 @@ msgstr "Trabalho atual"msgid "Customer"msgstr "Cliente"-msgid "Dark Mode"-msgstr "Modo Escuro"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Data"@@ -811,6 +820,9 @@ msgstr "Sair desta página"msgid "Let's build something"msgstr "Vamos construir algo"+msgid "Light"+msgstr ""+msgid "lines"msgstr "linhas"@@ -1562,8 +1574,8 @@ msgstr "Sessão bloqueada"msgid "Set Clock Out"msgstr "Definir apontar fim"-msgid "Set clock-out time"-msgstr "Definir horário de saída"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Configurar no Carbon"@@ -1687,6 +1699,9 @@ msgstr "Suporte Necessário"msgid "Switch Operator"msgstr "Trocar Operador"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Etiqueta"@@ -1905,9 +1920,6 @@ msgstr "Instruções de trabalho"msgid "Yes"msgstr "Sim"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Você marcou entrada às <0/>. Você pode editar a hora de saída abaixo ou confirmar que ainda está trabalhando."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Você está apontando há {hoursElapsed} horas. Você esqueceu de apontar fim?"diff --git a/packages/locale/locales/ru/erp.po b/packages/locale/locales/ru/erp.poindex 9e2746b681..f6269b8c87 100644--- a/packages/locale/locales/ru/erp.po+++ b/packages/locale/locales/ru/erp.po@@ -2097,6 +2097,9 @@ msgstr "API-ключи для программного доступа к вашmsgid "API, webhooks, and integrations"msgstr "API, вебхуки и интеграции"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Применено"@@ -3907,9 +3910,15 @@ msgstr "Нажмите, чтобы загрузить чертеж PDF"msgid "Clock In"msgstr "Начало работы"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Окончание работы"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Работаю с <0/>"@@ -5480,9 +5489,6 @@ msgstr "Ежедневное использование"msgid "Dark"msgstr "Тёмный"-msgid "Dark Mode"-msgstr "Тёмный режим"-msgid "Dashboard"msgstr "Панель управления"@@ -10195,12 +10201,6 @@ msgstr "Использование за весь период (Единицы)"msgid "Light"msgstr "Светлая"-msgid "Light Mode"-msgstr "Светлый режим"--msgid "Light or dark mode"-msgstr "Светлая или тёмная тема"-msgid "Lights Out (24×7)"msgstr "Темное производство (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Настройте Carbon в соответствии с тем, какmsgid "Set Clock Out"msgstr "Установить окончание работы"-msgid "Set clock-out time"-msgstr "Установить время выхода"-msgid "Set Console PIN"msgstr "Установить PIN консоли"@@ -16577,6 +16574,9 @@ msgstr "Установить ценообразование"msgid "Set Quantity"msgstr "Установить количество"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Установить приложение аутентификации"@@ -21335,9 +21335,6 @@ msgstr "Вы можете изменить стиль интерфейса в лmsgid "You can only see this key once. Store it safely."msgstr "Вы можете увидеть этот ключ только один раз. Сохраните его в безопасном месте."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Вы зарегистрировались на работу в <0/>. Вы можете изменить время выхода ниже или подтвердить, что вы все еще работаете."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/ru/mes.po b/packages/locale/locales/ru/mes.poindex e88fa3a1f9..70b82e88b1 100644--- a/packages/locale/locales/ru/mes.po+++ b/packages/locale/locales/ru/mes.po@@ -176,6 +176,9 @@ msgstr "Распределить неудачные единицы"msgid "Allocate units"msgstr "Распределить единицы"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Вы уверены, что хотите удалить этот шаг?"@@ -310,9 +313,15 @@ msgstr "Очистить станцию по умолчанию"msgid "Clock In"msgstr "Начало работы"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "Окончание работы"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "Отметился в системе с <0/>"@@ -417,8 +426,8 @@ msgstr "Текущая работа"msgid "Customer"msgstr "Покупатель"-msgid "Dark Mode"-msgstr "Тёмная тема"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Дата"@@ -811,6 +820,9 @@ msgstr "Покинуть эту страницу"msgid "Let's build something"msgstr "Давайте создадим что-то"+msgid "Light"+msgstr ""+msgid "lines"msgstr "строки"@@ -1562,8 +1574,8 @@ msgstr "Сеанс заблокирован"msgid "Set Clock Out"msgstr "Установить окончание работы"-msgid "Set clock-out time"-msgstr "Установить время ухода"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Настроить в Carbon"@@ -1687,6 +1699,9 @@ msgstr "Требуется поддержка"msgid "Switch Operator"msgstr "Сменить оператора"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Тег"@@ -1905,9 +1920,6 @@ msgstr "Рабочие инструкции"msgid "Yes"msgstr "Да"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Вы начали работу в <0/>. Ниже вы можете изменить время окончания работы или подтвердить, что вы все еще работаете."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "Вы находились на работе {hoursElapsed} часов. Вы забыли записать окончание работы?"diff --git a/packages/locale/locales/tr/erp.po b/packages/locale/locales/tr/erp.poindex 3d14474875..6eea791fae 100644--- a/packages/locale/locales/tr/erp.po+++ b/packages/locale/locales/tr/erp.po@@ -2097,6 +2097,9 @@ msgstr "Carbon verilerinize programatik erişim için API anahtarları."msgid "API, webhooks, and integrations"msgstr "API, webhook'lar ve entegrasyonlar"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "Uygulandı"@@ -3907,9 +3910,15 @@ msgstr "PDF çizimi yüklemek için tıklayın"msgid "Clock In"msgstr "İş başlangıcı"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "İş bitişi"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/> tarihinden beri saatlenmiş"@@ -5480,9 +5489,6 @@ msgstr "Günlük Kullanım"msgid "Dark"msgstr "Koyu"-msgid "Dark Mode"-msgstr "Karanlık Mod"-msgid "Dashboard"msgstr "Gösterge Paneli"@@ -10195,12 +10201,6 @@ msgstr "Yaşam Boyu Kullanım (Birimler)"msgid "Light"msgstr "Aydınlık"-msgid "Light Mode"-msgstr "Aydınlık Mod"--msgid "Light or dark mode"-msgstr "Açık veya koyu mod"-msgid "Lights Out (24×7)"msgstr "Işıklar Kapalı (24×7)"@@ -16556,9 +16556,6 @@ msgstr "Carbon'u şirketinizin nasıl çalıştığına göre kurun: lokasyonlarmsgid "Set Clock Out"msgstr "İş bitişi ayarla"-msgid "Set clock-out time"-msgstr "Çıkış zamanını ayarla"-msgid "Set Console PIN"msgstr "Konsol PIN Ayarla"@@ -16577,6 +16574,9 @@ msgstr "Fiyatlandırmayı Ayarla"msgid "Set Quantity"msgstr "Miktarı Ayarla"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "Doğrulayıcı uygulamayı ayarla"@@ -21335,9 +21335,6 @@ msgstr "Kullanıcı arayüzü stilini tema ayarları aracılığıyla istediğinmsgid "You can only see this key once. Store it safely."msgstr "Bu anahtarı yalnızca bir kez görebilirsiniz. Güvenli bir yerde saklayın."-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Saatinizi <0/> tarihinde kaydettiniz. Aşağıda çıkış saatinizi düzenleyebilir veya hala çalışmakta olduğunuzu onaylayabilirsiniz."-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/tr/mes.po b/packages/locale/locales/tr/mes.poindex cd5540a46d..9d58604b32 100644--- a/packages/locale/locales/tr/mes.po+++ b/packages/locale/locales/tr/mes.po@@ -176,6 +176,9 @@ msgstr "Başarısız birimleri tahsis et"msgid "Allocate units"msgstr "Birimleri tahsis et"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "Bu adımı silmek istediğinizden emin misiniz?"@@ -310,9 +313,15 @@ msgstr "İstasyon varsayılanını temizle"msgid "Clock In"msgstr "İş başlangıcı"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "İş bitişi"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "<0/>'den beri kaydedilmiş"@@ -417,8 +426,8 @@ msgstr "Mevcut iş"msgid "Customer"msgstr "Müşteri"-msgid "Dark Mode"-msgstr "Karanlık Mod"+msgid "Dark"+msgstr ""msgid "Date"msgstr "Tarih"@@ -811,6 +820,9 @@ msgstr "Bu sayfadan ayrıl"msgid "Let's build something"msgstr "Bir şeyler inşa edelim"+msgid "Light"+msgstr ""+msgid "lines"msgstr "satırlar"@@ -1562,8 +1574,8 @@ msgstr "Oturum kilitlendi"msgid "Set Clock Out"msgstr "İş bitişini ayarla"-msgid "Set clock-out time"-msgstr "Çıkış zamanını ayarla"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "Carbon'da ayarla"@@ -1687,6 +1699,9 @@ msgstr "Destek Gerekli"msgid "Switch Operator"msgstr "Operatörü Değiştir"+msgid "System"+msgstr ""+msgid "Tag"msgstr "Etiket"@@ -1905,9 +1920,6 @@ msgstr "İş talimatları"msgid "Yes"msgstr "Evet"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "Saat <0/>'te kaydedildiniz. Aşağıda çıkış saatinizi düzenleyebilir veya hala çalışmakta olduğunuzu onaylayabilirsiniz."-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "{hoursElapsed} saattir zaman kaydı yapıyorsunuz. İş bitişini yapmayı unuttunuz mu?"diff --git a/packages/locale/locales/zh/erp.po b/packages/locale/locales/zh/erp.poindex 2318d59a39..3e78015d6c 100644--- a/packages/locale/locales/zh/erp.po+++ b/packages/locale/locales/zh/erp.po@@ -2097,6 +2097,9 @@ msgstr "API密钥用于以编程方式访问您的Carbon数据。"msgid "API, webhooks, and integrations"msgstr "API、Webhook 和集成"+msgid "Appearance"+msgstr ""+msgid "Applied"msgstr "已应用"@@ -3907,9 +3910,15 @@ msgstr "点击上传 PDF 图纸"msgid "Clock In"msgstr "开工"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "收工"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "自 <0/> 打卡"@@ -5480,9 +5489,6 @@ msgstr "每日使用"msgid "Dark"msgstr "深色"-msgid "Dark Mode"-msgstr "深色模式"-msgid "Dashboard"msgstr "仪表板"@@ -10195,12 +10201,6 @@ msgstr "生命周期使用情况(单位)"msgid "Light"msgstr "浅色"-msgid "Light Mode"-msgstr "浅色模式"--msgid "Light or dark mode"-msgstr "亮色或深色模式"-msgid "Lights Out (24×7)"msgstr "熄灯(24×7)"@@ -16556,9 +16556,6 @@ msgstr "根据公司运营方式设置 Carbon:地点、零件、BOM、工序msgid "Set Clock Out"msgstr "设置收工"-msgid "Set clock-out time"-msgstr "设置打卡下班时间"-msgid "Set Console PIN"msgstr "设置控制台PIN"@@ -16577,6 +16574,9 @@ msgstr "设置定价"msgid "Set Quantity"msgstr "设置数量"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""+msgid "Set up authenticator app"msgstr "设置身份验证器应用"@@ -21335,9 +21335,6 @@ msgstr "您可以随时通过主题设置更改UI样式"msgid "You can only see this key once. Store it safely."msgstr "您只能看到此密钥一次。请妥善保管。"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "您于 <0/> 打卡上班。您可以在下方编辑打卡下班时间,或确认您仍在工作。"-#. placeholder {0}: leftoverQuantity === 1 ? "part" : "parts"#. placeholder {1}: job.quantitymsgid ""diff --git a/packages/locale/locales/zh/mes.po b/packages/locale/locales/zh/mes.poindex 29864be029..5344579bfd 100644--- a/packages/locale/locales/zh/mes.po+++ b/packages/locale/locales/zh/mes.po@@ -176,6 +176,9 @@ msgstr "分配不合格单位"msgid "Allocate units"msgstr "分配单位"+msgid "Appearance"+msgstr ""+msgid "Are you sure you want to delete this step?"msgstr "确定要删除此步骤吗?"@@ -310,9 +313,15 @@ msgstr "清除工作站默认值"msgid "Clock In"msgstr "开工"+msgid "Clock out"+msgstr ""+msgid "Clock Out"msgstr "收工"+msgid "Clocked in"+msgstr ""+msgid "Clocked in since <0/>"msgstr "自 <0/> 起打卡"@@ -417,8 +426,8 @@ msgstr "当前工作"msgid "Customer"msgstr "客户"-msgid "Dark Mode"-msgstr "深色模式"+msgid "Dark"+msgstr ""msgid "Date"msgstr "日期"@@ -811,6 +820,9 @@ msgstr "离开此页面"msgid "Let's build something"msgstr "让我们开始构建"+msgid "Light"+msgstr ""+msgid "lines"msgstr "行"@@ -1562,8 +1574,8 @@ msgstr "会话已锁定"msgid "Set Clock Out"msgstr "设置收工"-msgid "Set clock-out time"-msgstr "设置下班打卡时间"+msgid "Set the time you stopped working, or acknowledge that you're still working."+msgstr ""msgid "Set up in Carbon"msgstr "在 Carbon 中设置"@@ -1687,6 +1699,9 @@ msgstr "需要支持"msgid "Switch Operator"msgstr "切换操作员"+msgid "System"+msgstr ""+msgid "Tag"msgstr "标签"@@ -1905,9 +1920,6 @@ msgstr "作业指导书"msgid "Yes"msgstr "是"-msgid "You clocked in at <0/>. You can edit your clock-out time below or acknowledge that you're still working."-msgstr "您在 <0/> 打卡。您可以编辑下方的下班时间,或确认您仍在工作。"-msgid "You've been clocked in for {hoursElapsed} hours. Did you forget to clock out?"msgstr "您已打卡 {hoursElapsed} 小时。您是否忘记收工?"diff --git a/packages/react/src/Badge.tsx b/packages/react/src/Badge.tsxindex e5e7fc47a2..d8b56585a9 100644--- a/packages/react/src/Badge.tsx+++ b/packages/react/src/Badge.tsx@@ -15,28 +15,27 @@ import { LuX } from "react-icons/lu";import { cn } from "./utils/cn";const badgeVariants = cva(- "inline-flex items-center rounded-md px-2 min-h-[1.5rem] font-medium transition-[color,box-shadow] border focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 font-bold text-[12px] uppercase truncate tracking-tight whitespace-nowrap",+ "inline-flex items-center rounded-md px-1.5 min-h-6 text-[12px] leading-4 font-medium whitespace-nowrap truncate border border-transparent transition-[color,box-shadow] focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",{variants: {variant: {- default:- "bg-primary text-primary-foreground shadow:sm dark:shadow hover:bg-primary/80",+ default: "bg-primary text-primary-foreground hover:bg-primary/80",secondary:- "bg-secondary text-secondary-foreground hover:bg-secondary/80",+ "border-black/[0.08] bg-transparent text-foreground/70 dark:text-secondary-foreground dark:border-border",destructive:- "bg-destructive text-destructive-foreground shadow:sm dark:shadow hover:bg-destructive/80",- outline: "text-foreground border border-border",+ "bg-destructive text-destructive-foreground hover:bg-destructive/80",+ outline: "border-border text-foreground",green:- "bg-emerald-100 text-emerald-800 dark:bg-emerald-500/15 dark:text-emerald-400 border-emerald-500/20",+ "border-emerald-600/20 bg-emerald-500/10 text-emerald-700 dark:bg-emerald-500/15 dark:text-emerald-400 dark:border-emerald-500/20",yellow:- "bg-yellow-100 text-yellow-800 dark:bg-yellow-500/15 dark:text-yellow-400 border-yellow-500/20",+ "border-yellow-600/25 bg-yellow-500/15 text-yellow-800 dark:bg-yellow-500/15 dark:text-yellow-400 dark:border-yellow-500/20",orange:- "bg-orange-100 text-orange-800 dark:bg-orange-500/15 dark:text-orange-400 border-orange-500/20",- red: "bg-red-100 text-red-800 dark:bg-red-500/15 dark:text-red-400 border-red-500/20",- blue: "bg-blue-100 text-blue-800 dark:bg-blue-500/15 dark:text-blue-400 border-blue-500/20",- gray: "bg-[#e3e2e080] text-[#32302c] dark:bg-[#373737] dark:text-white hover:bg-[#e3e2e0] dark:hover:bg-[#5a5a5a] ",+ "border-orange-600/20 bg-orange-500/10 text-orange-700 dark:bg-orange-500/15 dark:text-orange-400 dark:border-orange-500/20",+ red: "border-red-600/20 bg-red-500/10 text-red-700 dark:bg-red-500/15 dark:text-red-400 dark:border-red-500/20",+ blue: "border-blue-600/20 bg-blue-500/10 text-blue-700 dark:bg-blue-500/15 dark:text-blue-400 dark:border-blue-500/20",+ gray: "border-black/[0.08] bg-black/[0.04] text-foreground/70 dark:bg-[#373737] dark:text-white dark:border-border",purple:- "bg-violet-100 text-violet-800 dark:bg-violet-500/15 dark:text-violet-400 border-violet-500/20"+ "border-violet-600/20 bg-violet-500/10 text-violet-700 dark:bg-violet-500/15 dark:text-violet-400 dark:border-violet-500/20"}},defaultVariants: {diff --git a/packages/react/src/hooks/index.ts b/packages/react/src/hooks/index.tsindex dee118732d..3541b4d715 100644--- a/packages/react/src/hooks/index.ts+++ b/packages/react/src/hooks/index.ts@@ -15,7 +15,12 @@ import useIsMobile from "./useIsMobile";import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";import { useKeyboardWedge } from "./useKeyboardWedge";import useLocalStorage from "./useLocalStorage";-import { useMode, useOptimisticMode } from "./useMode";+import {+ getSystemMode,+ useMode,+ useModePreference,+ useOptimisticMode+} from "./useMode";import useMount from "./useMount";import { useNanoStore } from "./useNanoStore";import { useNProgress } from "./useNProgress";@@ -31,6 +36,7 @@ import useThrottle from "./useThrottle";import { useUrlParams } from "./useUrlParams";export {+ getSystemMode,useDebounce,useDisclosure,useEdition,@@ -45,6 +51,7 @@ export {useMode,useCloseRoute,useIdle,+ useModePreference,useMount,useNanoStore,useNProgress,diff --git a/packages/react/src/hooks/useMode.tsx b/packages/react/src/hooks/useMode.tsxindex 395fb47559..0484945a95 100644--- a/packages/react/src/hooks/useMode.tsx+++ b/packages/react/src/hooks/useMode.tsx@@ -2,11 +2,19 @@// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,// including ports, remain AGPLv3; serving them over a network requires releasing their source.-import type { Mode } from "@carbon/utils";-import { modeValidator } from "@carbon/utils";+import type { Mode, ModePreference } from "@carbon/utils";+import {+ COLOR_SCHEME_HINT_COOKIE,+ COLOR_SCHEME_HINT_MAX_AGE,+ modeValidator,+ PREFERS_DARK_QUERY+} from "@carbon/utils";+import { useCallback, useSyncExternalStore } from "react";import { useFetchers } from "react-router";import { useRouteData } from "./useRouteData";+type RootModeData = { mode?: Mode; modePreference?: ModePreference };+export function useOptimisticMode() {const fetchers = useFetchers();const modeFetcher = fetchers.find((f) => f.formAction === "/");@@ -21,15 +29,54 @@ export function useOptimisticMode() {}}-export function useMode() {+/** The operating system's mode. Browser only. */+export function getSystemMode(): Mode {+ return window.matchMedia(PREFERS_DARK_QUERY).matches ? "dark" : "light";+}++/** Records the OS mode so the next server render of a `system` user matches. */+function writeColorSchemeHint(mode: Mode) {+ document.cookie = `${COLOR_SCHEME_HINT_COOKIE}=${mode}; Max-Age=${COLOR_SCHEME_HINT_MAX_AGE}; SameSite=Lax; Path=/`;+}++function subscribeToSystemMode(onChange: () => void) {+ const query = window.matchMedia(PREFERS_DARK_QUERY);+ const handler = () => {+ writeColorSchemeHint(getSystemMode());+ // Theme-color previews write one mode's variables onto <body>; drop them,+ // as a manual mode change does, so they don't outlive the mode.+ document.body.removeAttribute("style");+ onChange();+ };+ query.addEventListener("change", handler);+ return () => query.removeEventListener("change", handler);+}++/** The OS mode, live. The server snapshot is the root loader's resolved mode. */+function useSystemMode(serverMode: Mode): Mode {+ const getServerSnapshot = useCallback(() => serverMode, [serverMode]);+ return useSyncExternalStore(+ subscribeToSystemMode,+ getSystemMode,+ getServerSnapshot+ );+}++/** What the user chose: `light`, `dark`, or `system`. */+export function useModePreference(): ModePreference {const optimisticMode = useOptimisticMode();- const routeData = useRouteData<{ mode: Mode }>("/");+ const routeData = useRouteData<RootModeData>("/");- let mode = routeData?.mode ?? "light";+ return (+ optimisticMode ?? routeData?.modePreference ?? routeData?.mode ?? "light"+ );+}- if (optimisticMode && optimisticMode !== "system") {- mode = optimisticMode;- }+/** The mode being rendered: `system` resolved against the OS. */+export function useMode(): Mode {+ const preference = useModePreference();+ const routeData = useRouteData<RootModeData>("/");+ const systemMode = useSystemMode(routeData?.mode ?? "light");- return mode;+ return preference === "system" ? systemMode : preference;}diff --git a/packages/utils/AGENTS.md b/packages/utils/AGENTS.mdindex c8e0b00aca..e3f52a0d71 100644--- a/packages/utils/AGENTS.md+++ b/packages/utils/AGENTS.md@@ -56,6 +56,7 @@ pnpm --filter @carbon/utils typecheck| `headers` | Request facts from the proxy in front of the app: `getClientIp` (LAST `X-Forwarded-For` entry — the one a caller cannot forge; the ALB appends to a caller's header), `getRequestProtocol`, `getRequestHost`, `getRequestOrigin` (the public origin — `request.url` is the internal one behind the proxy). The host is caller-influenced behind the ALB: compare with it, never build a link someone else opens from it (use `getAppUrl()`). Raw reads are refused by `no-raw-forwarded-headers`. Also `getPreferenceHeaders` (locale, platform) || `hash` | The repo's stable content hashes — `fnv1a32`/`fnv1a64` (cache and idempotency keys) and `getBucket`. Browser-safe; never add `node:crypto` here || `math` | `clamp`/`lerp`/`inverseLerp` only — it re-exports nothing |+| `mode` | Light / dark / system. `getModeFromCookies` resolves the root loader's `mode` (what to render) and `modePreference` (what the user chose): the explicit `mode` cookie wins, else the OS hint cookie, else light. `colorSchemeHintScript` is the inline `<head>` script that writes the OS hint and reloads once when a `system` user was rendered in the wrong mode. The browser-side halves (`useMode`, `useModePreference`, `getSystemMode`) live in `@carbon/react` || `precision` | The whole numeric-precision API (re-exported from `@carbon/database/precision`): `SCALE`, `EPSILON`, `RoundingMode`, `round`, `distributeRoundingResidual`, `scrapAllowance`, `applyRate`, `deriveRate`, `isBalanced`, `assertBalanced` || `format` | The ONLY place display/input digit counts are chosen: `moneyFormatOptions` (settlement — the currency's decimals are floor AND ceiling), `rateFormatOptions` (per-unit RATE — those decimals are only the floor, ceiling is `SCALE`), the `PERCENT_FORMAT` / `PERCENT_POINTS_FORMAT` / `SCALE_FORMAT` constants, `cldrCurrencyDecimals`, their `format*` helpers, and `INPUT_FORMAT` / `INPUT_STEP` for editable fields. Call sites pick a KIND, never a digit count || `string` | Slugify, truncate, camelCase/titleCase conversions |diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.tsindex 4b4c7c5e66..ba5705689f 100644--- a/packages/utils/src/index.ts+++ b/packages/utils/src/index.ts@@ -41,6 +41,7 @@ export * from "./keyboard";export * from "./labels";export * from "./llm";export * from "./math";+export * from "./mode";export * from "./object";export * from "./payment-funding";export * from "./pick-guards";diff --git a/packages/utils/src/mode.test.ts b/packages/utils/src/mode.test.tsnew file mode 100644index 0000000000..05c549e738--- /dev/null+++ b/packages/utils/src/mode.test.ts@@ -0,0 +1,136 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import { describe, expect, it } from "vitest";+import {+ COLOR_SCHEME_HINT_COOKIE,+ colorSchemeHintScript,+ getModeFromCookies,+ MODE_COOKIE+} from "./mode";++describe("getModeFromCookies", () => {+ it("defaults to system, rendered light, with no cookies", () => {+ expect(getModeFromCookies(null)).toEqual({+ mode: "light",+ modePreference: "system"+ });+ });++ it("renders a system user in the OS mode the browser reported", () => {+ expect(getModeFromCookies(`${COLOR_SCHEME_HINT_COOKIE}=dark`)).toEqual({+ mode: "dark",+ modePreference: "system"+ });+ });++ it("lets an explicit choice win over the OS", () => {+ expect(+ getModeFromCookies(+ `${MODE_COOKIE}=light; ${COLOR_SCHEME_HINT_COOKIE}=dark`+ )+ ).toEqual({ mode: "light", modePreference: "light" });+ });++ it("treats an unknown mode cookie as system", () => {+ expect(+ getModeFromCookies(+ `${MODE_COOKIE}=blue; ${COLOR_SCHEME_HINT_COOKIE}=dark`+ )+ ).toEqual({ mode: "dark", modePreference: "system" });+ });+});++/** Runs the inline script against a fake browser; returns whether it reloaded. */+function runHintScript({+ cookies,+ osDark,+ cookiesWritable = true+}: {+ cookies: string;+ osDark: boolean;+ cookiesWritable?: boolean;+}) {+ let jar = cookies;+ let reloaded = false;+ const document = {+ get cookie() {+ return jar;+ },+ set cookie(value: string) {+ if (!cookiesWritable) return;+ const pair = value.split(";")[0]!;+ const name = pair.split("=")[0]!;+ const rest = jar+ .split(";")+ .map((c) => c.trim())+ .filter((c) => c && !c.startsWith(`${name}=`));+ jar = [...rest, pair].join("; ");+ },+ documentElement: { style: {} as Record<string, string> }+ };+ const window = {+ matchMedia: () => ({ matches: osDark }),+ location: {+ reload: () => {+ reloaded = true;+ }+ }+ };+ const navigator = { cookieEnabled: true };+ new Function("window", "document", "navigator", colorSchemeHintScript)(+ window,+ document,+ navigator+ );+ return { reloaded, cookies: jar };+}++describe("colorSchemeHintScript", () => {+ it("reloads a system user whose page was rendered light on a dark OS", () => {+ const result = runHintScript({ cookies: "", osDark: true });+ expect(result.reloaded).toBe(true);+ expect(result.cookies).toContain(`${COLOR_SCHEME_HINT_COOKIE}=dark`);+ });++ it("does not reload when the server's light fallback was right", () => {+ const result = runHintScript({ cookies: "", osDark: false });+ expect(result.reloaded).toBe(false);+ expect(result.cookies).toContain(`${COLOR_SCHEME_HINT_COOKIE}=light`);+ });++ it("reloads a system user when the OS changed since the last visit", () => {+ expect(+ runHintScript({+ cookies: `${COLOR_SCHEME_HINT_COOKIE}=dark`,+ osDark: false+ }).reloaded+ ).toBe(true);+ });++ it("does nothing when the hint is current", () => {+ expect(+ runHintScript({+ cookies: `${COLOR_SCHEME_HINT_COOKIE}=dark`,+ osDark: true+ }).reloaded+ ).toBe(false);+ });++ it("records the hint but never reloads an explicit choice", () => {+ const result = runHintScript({+ cookies: `${MODE_COOKIE}=light`,+ osDark: true+ });+ expect(result.reloaded).toBe(false);+ expect(result.cookies).toContain(`${COLOR_SCHEME_HINT_COOKIE}=dark`);+ });++ it("never reloads when the cookie cannot be written", () => {+ expect(+ runHintScript({ cookies: "", osDark: true, cookiesWritable: false })+ .reloaded+ ).toBe(false);+ });+});diff --git a/packages/utils/src/mode.ts b/packages/utils/src/mode.tsnew file mode 100644index 0000000000..7ac8841724--- /dev/null+++ b/packages/utils/src/mode.ts@@ -0,0 +1,76 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import * as cookie from "cookie";+import type { Mode, ModePreference } from "./types";++/**+ * The user's explicit choice, `light` or `dark`. No cookie means `system`:+ * follow the operating system. Written by the apps' root action.+ */+export const MODE_COOKIE = "mode";++/**+ * What the operating system prefers, as the browser last reported it. Written+ * by `colorSchemeHintScript` (and on a live OS change) so the server renders a+ * `system` user in the right mode instead of guessing.+ */+export const COLOR_SCHEME_HINT_COOKIE = "carbon-prefers-color-scheme";++export const PREFERS_DARK_QUERY = "(prefers-color-scheme: dark)";++export const COLOR_SCHEME_HINT_MAX_AGE = 31536000;++function asMode(value: string | undefined): Mode | null {+ return value === "light" || value === "dark" ? value : null;+}++/**+ * Resolve the mode to render from a request's cookie header. An explicit+ * choice wins; otherwise the OS hint; otherwise light, which the hint script+ * corrects with one reload on the first visit from a dark-mode OS.+ */+export function getModeFromCookies(cookieHeader: string | null): {+ mode: Mode;+ modePreference: ModePreference;+} {+ const cookies = cookieHeader ? cookie.parse(cookieHeader) : {};+ const explicit = asMode(cookies[MODE_COOKIE]);+ if (explicit) return { mode: explicit, modePreference: explicit };++ return {+ mode: asMode(cookies[COLOR_SCHEME_HINT_COOKIE]) ?? "light",+ modePreference: "system"+ };+}++/**+ * Inline `<head>` script, run before first paint. It records the OS preference+ * in `COLOR_SCHEME_HINT_COOKIE`, and reloads only when the page was rendered in+ * the wrong mode: the user follows the system, and the server's guess (the+ * previous hint, or light when there was none) disagrees with the OS. It never+ * reloads when the cookie cannot be written, so blocked cookies cannot loop.+ */+export const colorSchemeHintScript = `(function () {+ try {+ if (!navigator.cookieEnabled) return;+ var hint = ${JSON.stringify(COLOR_SCHEME_HINT_COOKIE)};+ var actual = window.matchMedia(${JSON.stringify(PREFERS_DARK_QUERY)}).matches ? "dark" : "light";+ var cookies = {};+ document.cookie.split(";").forEach(function (part) {+ var i = part.indexOf("=");+ if (i > -1) cookies[part.slice(0, i).trim()] = part.slice(i + 1).trim();+ });+ var reported = cookies[hint];+ if (reported === actual) return;+ document.cookie = hint + "=" + actual + "; Max-Age=${COLOR_SCHEME_HINT_MAX_AGE}; SameSite=Lax; Path=/";+ if (document.cookie.indexOf(hint + "=" + actual) === -1) return;+ var explicit = cookies[${JSON.stringify(MODE_COOKIE)}];+ if (explicit === "light" || explicit === "dark") return;+ var rendered = reported === "dark" ? "dark" : "light";+ if (rendered === actual) return;+ document.documentElement.style.visibility = "hidden";+ window.location.reload();+ } catch (e) {}+})();`;diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.tsindex 085753ac8f..33845c0093 100644--- a/packages/utils/src/types.ts+++ b/packages/utils/src/types.ts@@ -13,6 +13,9 @@ export enum Edition {export type Mode = "light" | "dark";+/** What the user chose; `system` follows the operating system. */+export type ModePreference = Mode | "system";+export const modeValidator = z.object({mode: z.enum(["light", "dark", "system"])});