@olenbetong/appframe-core 1.3.5 → 1.3.6

package/es/exportDataObject.d.ts

@@ -1,4 +1,4 @@
-import { DataObject, DataObjectOptions } from "@olenbetong/appframe-data";
+import { DataObject, DataObjectOptions, FieldDefinition } from "@olenbetong/appframe-data";
 import { RetrieveParameters } from "@olenbetong/appframe-data";
 export declare type DataExportColumn = {
     name: string;
@@ -42,40 +42,24 @@ export declare type DataObjectReportParams = {
  * @param specifiedOptions Options to override the data object options
  * @returns
  */
-export declare function exportOptionsFromDataObject(dataObject: DataObject<any>, specifiedOptions: Partial<DataObjectOptions<any>>): {
-    allowDelete?: boolean | undefined;
-    allowInsert?: boolean | undefined;
-    allowUpdate?: boolean | undefined;
-    articleId?: string | undefined;
-    dataHandler?: import("@olenbetong/appframe-data").DataHandlerDescriptor | import("@olenbetong/appframe-data").DataHandler<any> | undefined;
-    dataSourceId?: string | undefined;
-    disableAutoload?: boolean | undefined;
-    dynamicLoading?: boolean | undefined;
-    errorHandler?: ((error: string, callback?: Function | undefined) => void) | undefined;
-    fields?: import("@olenbetong/appframe-data").FieldDefinition[] | undefined;
-    groupBy?: string | number | symbol | string[] | null | undefined;
-    hasIDTrig?: boolean | undefined;
-    hasIITrig?: boolean | undefined;
-    hasIUTrig?: boolean | undefined;
-    linkFields?: (string | number | symbol)[] | Record<string | number | symbol, string> | null | undefined;
-    masterDataObject?: import("@olenbetong/appframe-data").AfDataObject<any> | null | undefined;
-    optimisticLocking?: boolean | undefined;
-    parameters?: RetrieveParameters<any> | undefined;
-    selectFirstRow?: boolean | undefined;
-    systemFieldNames?: Record<string, string | number | symbol> | undefined;
-    strict?: boolean | undefined;
-    timeout?: number | undefined;
-    uniqueIdField?: string | number | symbol | undefined;
-    columns: {
-        name: string;
-    }[];
+export declare function exportOptionsFromDataObject(dataObject: DataObject<any>, specifiedOptions: Partial<DataObjectOptions<any>["parameters"] & {
+    columns: FieldDefinition[];
+}>): {
     distinctRows: boolean | undefined;
+    fields?: FieldDefinition[] | undefined;
     filterObject: import("@olenbetong/appframe-data").Filter | undefined;
     filterString: string | undefined;
+    masterChildCriteria?: Partial<any> | undefined;
     maxRecords: number | undefined;
+    skip?: number | undefined;
     sortOrder: Record<string | number | symbol, import("@olenbetong/appframe-data").SortOrder>[] | undefined;
+    uniqueName?: string | undefined;
+    returnTotal?: boolean | undefined;
     whereClause: string | undefined;
     whereObject: import("@olenbetong/appframe-data").Filter | undefined;
+    columns: {
+        name: string;
+    }[];
 };
 /**
  * Get a request object to download a report from a data object.

package/es/index.js

@@ -11,4 +11,4 @@ export { default as SessionHandler } from "./SessionHandler.js";
 export { default as UserSession } from "./UserSession.js";
 export { formDataToDataObjectRecord, formDataToObject, formDataToProcedureParameters } from "./formDataToObject.js";
 export * from "./settings.js";
-export const version = "1.3.5";
+export const version = "1.3.6";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-core",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Javascript libraries to utilize the Appframe framework",
   "type": "module",
   "sideEffects": [
@@ -48,5 +48,5 @@
   "devDependencies": {
     "chalk": "^5.0.1"
   },
-  "gitHead": "031327d770dc68133c253ada235e92e205a84d51"
+  "gitHead": "8ea6dc3c1d3b7fe2e49dfd5c67a561344bb877e9"
 }

package/src/exportDataObject.ts

@@ -1,4 +1,4 @@
-import { DataObject, DataObjectOptions } from "@olenbetong/appframe-data";
+import { DataObject, DataObjectOptions, FieldDefinition } from "@olenbetong/appframe-data";
 import { RetrieveParameters } from "@olenbetong/appframe-data";
 
 import { downloadRequest } from "./downloadRequest.js";
@@ -47,7 +47,7 @@ export type DataObjectReportParams = {
  */
 export function exportOptionsFromDataObject(
   dataObject: DataObject<any>,
-  specifiedOptions: Partial<DataObjectOptions<any>>
+  specifiedOptions: Partial<DataObjectOptions<any>["parameters"] & { columns: FieldDefinition[] }>
 ) {
   return {
     columns: dataObject.getFields().map((field) => ({ name: field.name })),