@byline/host-tanstack-start 1.1.0 → 1.2.1

package/dist/server-fns/auth/current-user.js

@@ -1,16 +1,13 @@
 import { createServerFn } from "@tanstack/react-start";
 import { AuthError } from "@byline/auth";
-import { getServerConfig } from "@byline/core";
-import { createAdminUsersRepository } from "@byline/db-postgres/admin";
 import { getAdminRequestContext } from "../../auth/auth-context.js";
+import { bylineCore } from "../../integrations/byline-core.js";
 const getCurrentAdminUser = createServerFn({
     method: 'GET'
 }).handler(async ()=>{
     const { actor } = await getAdminRequestContext();
     if (!actor) throw new Error('unexpected null actor after getAdminRequestContext');
-    const db = getServerConfig().db.drizzle;
-    const users = createAdminUsersRepository(db);
-    const row = await users.getById(actor.id);
+    const row = await bylineCore().adminStore.adminUsers.getById(actor.id);
     if (!row) throw new Error('admin user not found for current session');
     return {
         id: row.id,
@@ -33,9 +30,7 @@ const getCurrentAdminUserSoft = createServerFn({
             throw err;
         }
         if (!actor) return null;
-        const db = getServerConfig().db.drizzle;
-        const users = createAdminUsersRepository(db);
-        const row = await users.getById(actor.id);
+        const row = await bylineCore().adminStore.adminUsers.getById(actor.id);
         if (!row) return null;
         return {
             id: row.id,

package/dist/server-fns/collections/index.d.ts

@@ -9,6 +9,7 @@ export * from './delete';
 export * from './get';
 export * from './history';
 export * from './list';
+export * from './restore-version';
 export * from './stats';
 export * from './status';
 export * from './update';

package/dist/server-fns/collections/index.js

@@ -3,6 +3,7 @@ export * from "./delete.js";
 export * from "./get.js";
 export * from "./history.js";
 export * from "./list.js";
+export * from "./restore-version.js";
 export * from "./stats.js";
 export * from "./status.js";
 export * from "./update.js";

package/dist/server-fns/collections/restore-version.d.ts

@@ -0,0 +1,21 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+export declare const restoreDocumentVersion: import("@tanstack/react-start").RequiredFetcher<undefined, (input: {
+    collection: string;
+    id: string;
+    versionId: string;
+}) => {
+    collection: string;
+    id: string;
+    versionId: string;
+}, Promise<{
+    status: "ok";
+    documentId: string;
+    documentVersionId: string;
+    sourceVersionId: string;
+}>>;

package/dist/server-fns/collections/restore-version.js

@@ -0,0 +1,41 @@
+import { createServerFn } from "@tanstack/react-start";
+import { ERR_NOT_FOUND, getLogger, getServerConfig } from "@byline/core";
+import { restoreDocumentVersion } from "@byline/core/services";
+import { getAdminRequestContext } from "../../auth/auth-context.js";
+import { ensureCollection } from "../../integrations/api-utils.js";
+const restore_version_restoreDocumentVersion = createServerFn({
+    method: 'POST'
+}).inputValidator((input)=>input).handler(async ({ data: input })=>{
+    const { collection: path, id, versionId } = input;
+    const logger = getLogger();
+    const config = await ensureCollection(path);
+    if (!config) throw ERR_NOT_FOUND({
+        message: 'Collection not found',
+        details: {
+            collectionPath: path
+        }
+    }).log(logger);
+    const serverConfig = getServerConfig();
+    const ctx = {
+        db: serverConfig.db,
+        definition: config.definition,
+        collectionId: config.collection.id,
+        collectionVersion: config.collection.version,
+        collectionPath: path,
+        logger,
+        defaultLocale: serverConfig.i18n.content.defaultLocale,
+        slugifier: serverConfig.slugifier,
+        requestContext: await getAdminRequestContext()
+    };
+    const result = await restoreDocumentVersion(ctx, {
+        documentId: id,
+        sourceVersionId: versionId
+    });
+    return {
+        status: 'ok',
+        documentId: result.documentId,
+        documentVersionId: result.documentVersionId,
+        sourceVersionId: result.sourceVersionId
+    };
+});
+export { restore_version_restoreDocumentVersion as restoreDocumentVersion };

package/dist/server-fns/collections/upload.js

@@ -2,7 +2,7 @@ import { createServerFn } from "@tanstack/react-start";
 import { ERR_NOT_FOUND, ERR_VALIDATION, getServerConfig, getUploadFields } from "@byline/core";
 import { getLogger, withLogContext } from "@byline/core/logger";
 import { uploadField } from "@byline/core/services";
-import { extractImageMeta, generateImageVariants, isBypassMimeType } from "@byline/storage-local";
+import { extractImageMeta, generateImageVariants, isBypassMimeType } from "@byline/core/image";
 import { getAdminRequestContext } from "../../auth/auth-context.js";
 import { ensureCollection } from "../../integrations/api-utils.js";
 function parseUploadFormData(data) {

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "type": "module",
   "license": "MPL-2.0",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -101,27 +101,17 @@
     "react-swipeable": "^7.0.2",
     "uuid": "^14.0.0",
     "zod": "^4.4.2",
-    "@byline/admin": "1.1.0",
-    "@byline/auth": "1.1.0",
-    "@byline/core": "1.1.0",
-    "@byline/ui": "1.1.0",
-    "@byline/client": "1.1.0"
+    "@byline/admin": "1.2.1",
+    "@byline/auth": "1.2.1",
+    "@byline/core": "1.2.1",
+    "@byline/client": "1.2.1",
+    "@byline/ui": "1.2.1"
   },
   "peerDependencies": {
     "@tanstack/react-router": "^1.167.0",
     "@tanstack/react-start": "^1.167.0",
     "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@byline/db-postgres": "1.1.0",
-    "@byline/storage-local": "1.1.0"
-  },
-  "peerDependenciesMeta": {
-    "@byline/db-postgres": {
-      "optional": false
-    },
-    "@byline/storage-local": {
-      "optional": false
-    }
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.14",
@@ -138,9 +128,7 @@
     "rimraf": "^6.1.3",
     "typescript": "6.0.3",
     "typescript-plugin-css-modules": "^5.2.0",
-    "vitest": "^4.1.5",
-    "@byline/db-postgres": "1.1.0",
-    "@byline/storage-local": "1.1.0"
+    "vitest": "^4.1.5"
   },
   "publishConfig": {
     "access": "public",

package/src/admin-shell/admin-roles/container.tsx

@@ -29,7 +29,7 @@ import type React from 'react'
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Button, CloseIcon, Drawer, IconButton, Modal, useToastManager } from '@byline/ui'
+import { Button, CloseIcon, Drawer, IconButton, Modal, useToastManager } from '@byline/ui/react'
 import { LocalDateTime, RolePermissions, UpdateRole } from '@byline/ui/react'
 import cx from 'classnames'
 

package/src/admin-shell/admin-roles/delete.tsx

@@ -20,7 +20,7 @@
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui'
+import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { type AdminRoleResponse, deleteAdminRole } from '../../server-fns/admin-roles/index.js'

package/src/admin-shell/admin-roles/list.tsx

@@ -40,7 +40,7 @@ import {
   Table,
   useSortable,
   useToastManager,
-} from '@byline/ui'
+} from '@byline/ui/react'
 import { CreateAdminRole, LocalDateTime } from '@byline/ui/react'
 import cx from 'classnames'
 

package/src/admin-shell/admin-users/container.tsx

@@ -12,7 +12,7 @@ import type React from 'react'
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Button, CloseIcon, Drawer, EditIcon, IconButton, Modal, useToastManager } from '@byline/ui'
+import { Button, CloseIcon, Drawer, EditIcon, IconButton, Modal, useToastManager } from '@byline/ui/react'
 import { LocalDateTime, SetPassword, UpdateUser, UserRoles } from '@byline/ui/react'
 import cx from 'classnames'
 

package/src/admin-shell/admin-users/delete.tsx

@@ -23,7 +23,7 @@
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui'
+import { Alert, Button, LoaderEllipsis, Modal } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { type AdminUserResponse, deleteAdminUser } from '../../server-fns/admin-users/index.js'

package/src/admin-shell/admin-users/list.tsx

@@ -22,7 +22,7 @@ import {
   Select,
   Table,
   useToastManager,
-} from '@byline/ui'
+} from '@byline/ui/react'
 import { CreateAdminUser, LocalDateTime } from '@byline/ui/react'
 import cx from 'classnames'
 

package/src/admin-shell/chrome/admin-app-bar.tsx

@@ -10,7 +10,7 @@
 
 import { useState } from 'react'
 
-import { Button } from '@byline/ui'
+import { Button } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { adminSignOut, type CurrentAdminUser } from '../../server-fns/auth/index.js'

package/src/admin-shell/chrome/dashboard.tsx

@@ -8,7 +8,7 @@
 
 import type { WorkflowStatus } from '@byline/core'
 import { getClientConfig, getWorkflowStatuses } from '@byline/core'
-import { Card, Container, Section } from '@byline/ui'
+import { Card, Container, Section } from '@byline/ui/react'
 import cx from 'classnames'
 
 import styles from './dashboard.module.css'

package/src/admin-shell/chrome/drawer-toggle.tsx

@@ -6,7 +6,7 @@
  * Copyright (c) Infonomic Company Limited
  */
 
-import { IconButton, Tooltip } from '@byline/ui'
+import { IconButton, Tooltip } from '@byline/ui/react'
 import cx from 'classnames'
 
 import styles from './drawer-toggle.module.css'

package/src/admin-shell/chrome/menu-drawer.tsx

@@ -12,7 +12,7 @@ import { useRouterState } from '@tanstack/react-router'
 import { ADMIN_PERMISSIONS_ABILITIES } from '@byline/admin/admin-permissions'
 import { ADMIN_ROLES_ABILITIES } from '@byline/admin/admin-roles'
 import { ADMIN_USERS_ABILITIES } from '@byline/admin/admin-users'
-import { HomeIcon, RolesIcon, SettingsSlidersIcon, UserIcon, UsersIcon } from '@byline/ui'
+import { HomeIcon, RolesIcon, SettingsSlidersIcon, UserIcon, UsersIcon } from '@byline/ui/react'
 import cx from 'classnames'
 import { useSwipeable } from 'react-swipeable'
 

package/src/admin-shell/chrome/preview-toggle.tsx

@@ -23,7 +23,7 @@
 
 import { useEffect, useState } from 'react'
 
-import { EyeClosedIcon, EyeOpenIcon } from '@byline/ui'
+import { EyeClosedIcon, EyeOpenIcon } from '@byline/ui/react'
 import cx from 'classnames'
 
 import {

package/src/admin-shell/chrome/route-error.tsx

@@ -16,7 +16,7 @@ import type { ErrorComponentProps, NotFoundRouteProps } from '@tanstack/react-ro
 import { useRouter } from '@tanstack/react-router'
 
 import { BylineError, ErrorCodes } from '@byline/core'
-import { Alert, Button, Container, Section } from '@byline/ui'
+import { Alert, Button, Container, Section } from '@byline/ui/react'
 import cx from 'classnames'
 
 import styles from './route-error.module.css'

package/src/admin-shell/chrome/router-pager.tsx

@@ -8,14 +8,14 @@
 
 import { useRouterState } from '@tanstack/react-router'
 
-import type { PaginationProps } from '@byline/ui'
+import type { PaginationProps } from '@byline/ui/react'
 import {
   ChevronLeftDoubleIcon,
   ChevronLeftIcon,
   ChevronRightDoubleIcon,
   ChevronRightIcon,
   Pagination,
-} from '@byline/ui'
+} from '@byline/ui/react'
 
 import { Link } from './loose-router.js'
 

package/src/admin-shell/chrome/th-sortable.tsx

@@ -10,7 +10,7 @@ import type React from 'react'
 import { useEffect, useState } from 'react'
 import { useRouterState } from '@tanstack/react-router'
 
-import { Table } from '@byline/ui'
+import { Table } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { useNavigate } from './loose-router.js'

package/src/admin-shell/collections/api.tsx

@@ -8,7 +8,7 @@
 
 import type { CollectionDefinition } from '@byline/core'
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
-import { Container, Section } from '@byline/ui'
+import { Container, Section } from '@byline/ui/react'
 import cx from 'classnames'
 import { allExpanded, darkStyles, JsonView } from 'react-json-view-lite'
 

package/src/admin-shell/collections/create.tsx

@@ -9,7 +9,7 @@
 import { useState } from 'react'
 
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
-import { Container, Section, useToastManager } from '@byline/ui'
+import { Container, Section, useToastManager } from '@byline/ui/react'
 import { FormRenderer } from '@byline/ui/react'
 
 import { createCollectionDocument } from '../../server-fns/collections/index.js'

package/src/admin-shell/collections/edit.tsx

@@ -11,7 +11,7 @@ import { useState } from 'react'
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
 import { getDefaultStatus, getWorkflowStatuses } from '@byline/core'
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
-import { Container, Section, useToastManager } from '@byline/ui'
+import { Container, Section, useToastManager } from '@byline/ui/react'
 import { FormRenderer } from '@byline/ui/react'
 
 import {

package/src/admin-shell/collections/history.module.css

@@ -24,6 +24,7 @@
 }
 
 @media (min-width: 40rem) {
+
   .head,
   :global(.byline-coll-history-head) {
     flex-direction: row;
@@ -73,6 +74,7 @@
 }
 
 @media (min-width: 40rem) {
+
   .options,
   :global(.byline-coll-history-options) {
     flex-direction: row;
@@ -143,14 +145,61 @@
   opacity: 0.75;
 }
 
+.colRestore,
+:global(.byline-coll-history-col-restore) {
+  width: 1%;
+  white-space: nowrap;
+  background-color: var(--gray-50);
+}
+
+:is([data-theme="dark"], :global(.dark)) .colRestore,
+:is([data-theme="dark"], :global(.dark)) :global(.byline-coll-history-col-restore) {
+  background-color: oklch(from var(--canvas-800) calc(l * 1.1) c h);
+}
+
+.restoreCell,
+:global(.byline-coll-history-restore-cell) {
+  white-space: nowrap;
+}
+
+.restoreButton,
+:global(.byline-coll-history-restore-button) {
+  opacity: 0;
+  transition: opacity 0.15s ease;
+}
+
+:global(tr:hover) .restoreButton,
+:global(tr:hover .byline-coll-history-restore-button) {
+  opacity: 1;
+}
+
+.restoreButton:focus,
+:global(.byline-coll-history-restore-button:focus) {
+  opacity: 1;
+}
+
+.restoreModal,
+:global(.byline-coll-history-restore-modal) {
+  max-width: 32rem;
+}
+
+.restoreModalHead,
+:global(.byline-coll-history-restore-modal-head) {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 1rem;
+}
+
 .pageSize,
 :global(.byline-coll-history-page-size) {
   /* fallback */
 }
 
 @media (min-width: 40rem) {
+
   .pageSize,
   :global(.byline-coll-history-page-size) {
     margin-left: auto;
   }
-}
+}