@headless-adminapp/app 1.5.2 → 1.5.5

package/board/types.d.ts

@@ -38,7 +38,7 @@ export interface BoardConfig<S extends SchemaAttributes = SchemaAttributes> {
     title: string;
     description: string;
     schema: Schema<S>;
-    sorting: SortingState<S>;
+    sorting: SortingState<Extract<keyof S, string>>;
     projection: {
         columns: Array<keyof S>;
         expand?: Partial<Record<keyof S, string[]>>;

package/builders/CommandBuilder/ViewCommandBuilder.d.ts

@@ -1,4 +1,5 @@
 import type { EntityMainGridCommandContext, EntityMainGridCommandItemExperience } from '@headless-adminapp/core/experience/view';
+import type { SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { Localized } from '@headless-adminapp/core/types';
 import type { Icon } from '@headless-adminapp/icons';
 export declare namespace EnabledRules {
@@ -79,7 +80,7 @@ export declare namespace ViewCommandBuilder {
         };
     }): EntityMainGridCommandItemExperience;
 }
-export declare function exportRecordsToExcel(context: EntityMainGridCommandContext): Promise<void>;
+export declare function exportRecordsToExcel<S extends SchemaAttributes = SchemaAttributes>(context: EntityMainGridCommandContext<S>): Promise<void>;
 export declare function exportRecordsToCSV(context: EntityMainGridCommandContext): Promise<void>;
 export declare function processDeleteRecordRequest(context: EntityMainGridCommandContext, { stringSet, localizedStringSet, }: {
     stringSet: ViewCommandBuilder.DeleteRecordCommandStringSet;

package/builders/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Locale } from '@headless-adminapp/core/experience/locale';
 import type { ColumnCondition, SortingState, View } from '@headless-adminapp/core/experience/view';
-import type { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
+import type { Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { ISchemaStore } from '@headless-adminapp/core/store';
 import type { Filter, IDataService } from '@headless-adminapp/core/transport';
 import type { TransformedViewColumn } from '../datagrid';
@@ -24,7 +24,7 @@ export declare function retriveRecords<S extends SchemaAttributes = SchemaAttrib
     extraFilter?: Filter;
     columnFilters?: Partial<Record<string, ColumnCondition>>;
     schemaStore: ISchemaStore;
-    sorting: SortingState<S>;
+    sorting: SortingState<Extract<keyof S, string>>;
     skip: number;
     limit: number;
-}): Promise<import("@headless-adminapp/core/transport").RetriveRecordsResult<InferredSchemaType<S>>>;
+}): Promise<import("@headless-adminapp/core/transport").RetriveRecordsResult<S>>;

package/builders/utils.js

@@ -177,7 +177,6 @@ async function retriveRecords({ gridColumns, dataService, schema, search, view,
         columnFilters, schemaStore),
         skip,
         limit,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         sort: sorting,
     });
     return result;

package/dataform/utils/saveRecord.js

@@ -148,9 +148,17 @@ async function updateRecord({ recordId, values, form, schema, dataService, initi
 async function saveRecord({ values, form, schema, dataService, initialValues, record, schemaStore, }) {
     let recordId;
     if (record) {
-        recordId = record[schema.idAttribute];
+        const idAttributeValue = record[schema.idAttribute];
+        if (typeof idAttributeValue === 'object' &&
+            idAttributeValue !== null &&
+            'id' in idAttributeValue) {
+            recordId = idAttributeValue.id;
+        }
+        else {
+            recordId = idAttributeValue;
+        }
         const updateResult = await updateRecord({
-            recordId,
+            recordId: recordId,
             values,
             form,
             schema,

package/datagrid/DataGridProvider/index.d.ts

@@ -4,7 +4,7 @@ import type { EntityMainGridCommandContext, EntitySubGridCommandContext, View }
 import type { Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { Filter } from '@headless-adminapp/core/transport';
 import { type PropsWithChildren } from 'react';
-export interface DataGridProviderProps<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext> {
+export interface DataGridProviderProps<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext<S> | EntitySubGridCommandContext = EntityMainGridCommandContext<S>> {
     schema: Schema<S>;
     views: LocalizedDataLookup[];
     view: View<S>;
@@ -21,4 +21,4 @@ export interface DataGridProviderProps<S extends SchemaAttributes = SchemaAttrib
     maxRecords?: number;
     disabled?: boolean;
 }
-export declare function DataGridProvider<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext>(props: PropsWithChildren<DataGridProviderProps<S, CommandContext>>): import("react/jsx-runtime").JSX.Element;
+export declare function DataGridProvider<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext<S> | EntitySubGridCommandContext = EntityMainGridCommandContext<S>>(props: PropsWithChildren<DataGridProviderProps<S, CommandContext>>): import("react/jsx-runtime").JSX.Element;

package/datagrid/DataGridProvider/useGridCellRangeResolver.d.ts

@@ -2,4 +2,4 @@ import { type MutableValue } from '@headless-adminapp/app/mutable';
 import type { EntityMainGridCommandContext, EntitySubGridCommandContext } from '@headless-adminapp/core/experience/view';
 import type { SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { GridContextState } from '../context';
-export declare function useGridCellRangeResolver<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext>(context: MutableValue<GridContextState<S, CommandContext>>): void;
+export declare function useGridCellRangeResolver<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext<S> | EntitySubGridCommandContext = EntityMainGridCommandContext<S>>(context: MutableValue<GridContextState<S, CommandContext>>): void;

package/datagrid/context.d.ts

@@ -5,7 +5,7 @@ import { type TransformedViewColumn } from '@headless-adminapp/core/experience/v
 import type { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { Filter, RetriveRecordsResult } from '@headless-adminapp/core/transport';
 export { type TransformedViewColumn } from '@headless-adminapp/core/experience/view/ViewColumn';
-export interface GridContextState<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext> {
+export interface GridContextState<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext<S> | EntitySubGridCommandContext = EntityMainGridCommandContext<S>> {
     schema: Schema<S>;
     view: View<S>;
     viewLookup: LocalizedDataLookup[];
@@ -22,7 +22,7 @@ export interface GridContextState<S extends SchemaAttributes = SchemaAttributes,
     columns: TransformedViewColumn<S>[];
     searchText: string;
     columnFilters: Partial<Record<keyof S, ColumnCondition>>;
-    sorting: SortingState<S>;
+    sorting: SortingState<Extract<keyof S, string>>;
     quickFilterValues: Record<string, unknown>;
     selectedIds: string[];
     cellSelectionRange?: CellSelectionRange | null;
@@ -36,7 +36,7 @@ export interface GridContextState<S extends SchemaAttributes = SchemaAttributes,
     isSubGrid: boolean;
     allowViewSelection: boolean;
 }
-export declare const GridContext: import("react").Context<import("../mutable/context").ContextValue<GridContextState<SchemaAttributes, EntityMainGridCommandContext>>>;
+export declare const GridContext: import("react").Context<import("../mutable/context").ContextValue<GridContextState<SchemaAttributes, EntityMainGridCommandContext<SchemaAttributes>>>>;
 export interface CellSelectionRange {
     start: {
         row: number;

package/datagrid/hooks/useGridSorting.d.ts

@@ -1,3 +1,3 @@
 import type { SortingState } from '@headless-adminapp/core/experience/view';
 import type { SchemaAttributes } from '@headless-adminapp/core/schema';
-export declare function useGridSorting<S extends SchemaAttributes = SchemaAttributes>(): readonly [SortingState<SchemaAttributes>, (value: SortingState<S>) => void];
+export declare function useGridSorting<S extends SchemaAttributes = SchemaAttributes>(): readonly [SortingState<Extract<keyof S, string>>, (value: SortingState<Extract<keyof S, string>>) => void];

package/datagrid/hooks/useGridSorting.js

@@ -8,7 +8,6 @@ function useGridSorting() {
     const sorting = (0, context_1.useContextSelector)(context_2.GridContext, (state) => state.sorting);
     const setValue = (0, context_1.useContextSetValue)(context_2.GridContext);
     const setSorting = (0, react_1.useCallback)((value) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         setValue({ sorting: value });
     }, [setValue]);
     return [sorting, setSorting];

package/datagrid/hooks/useMainGridCommands.d.ts

@@ -1,7 +1,8 @@
 import type { EntityMainGridCommandContext } from '@headless-adminapp/core/experience/view';
+import type { SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { CommandItemState, MenuItemCommandState, UtilityContextState } from '../../command/types';
 export declare function useUtility(): UtilityContextState;
-export declare function useGridControlContext(): EntityMainGridCommandContext['primaryControl'];
-export declare function useMainGridCommandHandlerContext(): EntityMainGridCommandContext;
+export declare function useGridControlContext<S extends SchemaAttributes = SchemaAttributes>(): EntityMainGridCommandContext<S>['primaryControl'];
+export declare function useMainGridCommandHandlerContext<S extends SchemaAttributes = SchemaAttributes>(): EntityMainGridCommandContext<S>;
 export declare function useMainGridCommands(): CommandItemState[][];
 export declare function useMainGridContextCommands(): MenuItemCommandState[][];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,5 +38,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "42d358877a1744b855966feb6d85fcbb7c3c8dae"
+  "gitHead": "be617f4ad13130c9fcfa7760857c062fa896de39"
 }

package/transport/hooks/useRetriveRecords.d.ts

@@ -6,7 +6,7 @@ interface UseRetriveRecordProps<S extends SchemaAttributes = SchemaAttributes> {
     schema: Schema<S>;
     search?: string;
     filter?: Filter | null;
-    sorting?: SortingState<S>;
+    sorting?: SortingState<Extract<keyof S, string>>;
     columns: (keyof S)[];
     expand?: Partial<Record<string, string[]>>;
     maxRecords?: number;