@headless-adminapp/app 1.4.11 → 1.4.12

package/builders/CommandBuilder/SubgridCommandBuilder.js

@@ -206,7 +206,7 @@ var SubgridCommandBuilder;
                                     fileName: context.secondaryControl.view.name + '.xlsx',
                                     gridColumns: context.secondaryControl.gridColumns,
                                     records: result.records,
-                                    schema: context.secondaryControl.schema,
+                                    attributes: context.secondaryControl.schema.attributes,
                                     schemaStore: context.stores.schemaStore,
                                     locale: context.locale,
                                 });
@@ -240,7 +240,7 @@ var SubgridCommandBuilder;
                                     fileName: context.secondaryControl.view.name + '.csv',
                                     gridColumns: context.secondaryControl.gridColumns,
                                     records: result.records,
-                                    schema: context.secondaryControl.schema,
+                                    attributes: context.secondaryControl.schema.attributes,
                                     schemaStore: context.stores.schemaStore,
                                     locale: context.locale,
                                 });

package/builders/CommandBuilder/ViewCommandBuilder.js

@@ -308,7 +308,7 @@ async function exportRecordsToExcel(context) {
             fileName: context.primaryControl.view.name + '.xlsx',
             gridColumns: context.primaryControl.gridColumns,
             records: result.records,
-            schema: context.primaryControl.schema,
+            attributes: context.primaryControl.schema.attributes,
             schemaStore: context.stores.schemaStore,
             locale: context.locale,
         });
@@ -325,7 +325,7 @@ async function exportRecordsToCSV(context) {
             fileName: context.primaryControl.view.name + '.csv',
             gridColumns: context.primaryControl.gridColumns,
             records: result.records,
-            schema: context.primaryControl.schema,
+            attributes: context.primaryControl.schema.attributes,
             schemaStore: context.stores.schemaStore,
             locale: context.locale,
         });

package/builders/utils.d.ts

@@ -4,10 +4,11 @@ import { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp
 import { ISchemaStore } from '@headless-adminapp/core/store';
 import { Filter, IDataService } from '@headless-adminapp/core/transport';
 import { TransformedViewColumn } from '../datagrid';
-type ExportFn<S extends SchemaAttributes = SchemaAttributes> = (option: {
-    schema: Schema<S>;
+export type ExportColumn<S extends SchemaAttributes = SchemaAttributes> = Omit<TransformedViewColumn<S>, 'id' | 'component' | 'width' | 'maxWidth'>;
+export type ExportFn<S extends SchemaAttributes = SchemaAttributes> = (option: {
+    attributes: S;
     records: unknown[];
-    gridColumns: TransformedViewColumn<SchemaAttributes>[];
+    gridColumns: ExportColumn<S>[];
     schemaStore: ISchemaStore;
     fileName: string;
     locale: Locale;
@@ -27,4 +28,3 @@ export declare function retriveRecords<S extends SchemaAttributes = SchemaAttrib
     skip: number;
     limit: number;
 }): Promise<import("@headless-adminapp/core/transport").RetriveRecordsResult<InferredSchemaType<S>>>;
-export {};

package/builders/utils.js

@@ -27,34 +27,38 @@ exports.exportRecordsXLS = exports.exportRecordsCSV = void 0;
 exports.retriveRecords = retriveRecords;
 const utils_1 = require("../datagrid/DataGridProvider/utils");
 const utils_2 = require("../utils");
-const getHeaders = (schema, gridColumns, schemaStore) => {
+const getHeaders = (attributes, gridColumns, schemaStore) => {
     const headers = gridColumns.map((column) => {
         if (column.name.indexOf('.') !== -1) {
             const [lookup, field] = column.name.split('.');
-            const entity = schema.attributes[lookup].entity;
+            const entity = attributes[lookup].entity;
             const lookupSchema = schemaStore.getSchema(entity);
-            return `${lookupSchema.attributes[field]?.label} (${schema.attributes[lookup]?.label})`;
+            return `${lookupSchema.attributes[field]?.label} (${attributes[lookup]?.label})`;
         }
-        return column.label ?? schema.attributes[column.name]?.label;
+        return column.label ?? attributes[column.name]?.label;
     });
     return headers;
 };
-function getAttribute({ column, schema, schemaStore, }) {
+function getAttribute({ column, attributes, schemaStore, }) {
     let attribute;
     if (column.expandedKey) {
         const lookup = column.name;
         const field = column.expandedKey;
-        const entity = schema.attributes[lookup].entity;
+        const entity = attributes[lookup].entity;
         const lookupSchema = schemaStore.getSchema(entity);
         attribute = lookupSchema.attributes[field];
     }
     else {
-        attribute = schema.attributes[column.name];
+        attribute = attributes[column.name];
     }
     return attribute;
 }
-function extractAttributeData({ column, record, schema, schemaStore, }) {
-    const attribute = getAttribute({ column, schema, schemaStore });
+function extractAttributeData({ column, record, attributes, schemaStore, }) {
+    const attribute = getAttribute({
+        column,
+        attributes,
+        schemaStore,
+    });
     let value;
     if (column.expandedKey) {
         const lookup = column.name;
@@ -69,15 +73,15 @@ function extractAttributeData({ column, record, schema, schemaStore, }) {
         value,
     };
 }
-const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fileName, locale, }) => {
+const exportRecordsCSV = async ({ attributes, records, gridColumns, schemaStore, fileName, locale, }) => {
     const csvDownload = await Promise.resolve().then(() => __importStar(require('json-to-csv-export')));
-    const headers = getHeaders(schema, gridColumns, schemaStore);
+    const headers = getHeaders(attributes, gridColumns, schemaStore);
     const cellData = records.map((record) => {
         return gridColumns.map((column) => {
             const { attribute, value } = extractAttributeData({
                 column,
                 record,
-                schema,
+                attributes,
                 schemaStore,
             });
             if (attribute.type === 'money' || attribute.type === 'number') {
@@ -94,15 +98,15 @@ const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fil
     });
 };
 exports.exportRecordsCSV = exportRecordsCSV;
-const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schemaStore, locale, }) => {
+const exportRecordsXLS = async ({ fileName, gridColumns, records, attributes, schemaStore, locale, }) => {
     const ExcelJS = await Promise.resolve().then(() => __importStar(require('exceljs')));
-    const headers = getHeaders(schema, gridColumns, schemaStore);
+    const headers = getHeaders(attributes, gridColumns, schemaStore);
     const cellData = records.map((item) => {
         return gridColumns.map((column) => {
             const { attribute, value } = extractAttributeData({
                 column,
                 record: item,
-                schema,
+                attributes,
                 schemaStore,
             });
             if (!value) {
@@ -128,7 +132,11 @@ const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schema
         worksheet.addRow(row);
     });
     gridColumns.forEach((column, index) => {
-        const attribute = getAttribute({ column, schema, schemaStore });
+        const attribute = getAttribute({
+            column,
+            attributes: attributes,
+            schemaStore,
+        });
         const sheetColumn = worksheet.getColumn(index + 1);
         let formatFn = (value) => (0, utils_2.getAttributeFormattedValue)(attribute, value, locale) ?? '';
         if (attribute?.type === 'money') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,5 +38,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "a021ad89086df820727f8dc87e57a039b0126bf2"
+  "gitHead": "ff83d8ca2e616d6125781975cfc1dde6a1fc05c3"
 }

package/utils/getAttributeFormattedValue.d.ts

@@ -8,7 +8,7 @@ interface AttributeFormattedValueStringsSet {
 export declare function getAttributeLookupsFormattedValue(value: unknown, options?: {
     maxCount?: number;
 }): string;
-export declare function getAttributeAttachmentFormattedValue(value: unknown): string;
+export declare function getAttributeAttachmentFormattedValue(value: unknown): string | null;
 export declare function getAttributeDateFormattedValue(attribute: DateAttribute, value: unknown, locale: Locale): string;
 export declare function getAttributeDateRangeFormattedValue(value: unknown, locale: Locale): string;
 export declare function getAttributeBooleanFormattedValue(attribute: BooleanAttribute, value: unknown, options?: {

package/utils/getAttributeFormattedValue.js

@@ -35,7 +35,15 @@ function getAttributeLookupsFormattedValue(value, options) {
     }
 }
 function getAttributeAttachmentFormattedValue(value) {
-    return value?.url ?? null;
+    const name = value?.name;
+    const url = value?.url;
+    if (name) {
+        return name;
+    }
+    if (url) {
+        return url;
+    }
+    return null;
 }
 function getAttributeDateFormattedValue(attribute, value, locale) {
     if (attribute.format === 'datetime') {