fix: import accounts issue

packages/server/src/services/Import/ImportFileUpload.ts

@@ -61,20 +61,38 @@ export class ImportFileUploadService {
       resource: _resourceName,
       columns: coumnsStringified,
     });
-    const resourceColumns = this.resourceService.getResourceImportableFields(
+    const resourceColumnsMap = this.resourceService.getResourceImportableFields(
       tenantId,
       _resourceName
     );
-    const resourceColumnsTransformeed = Object.entries(resourceColumns).map(
-      ([key, { name }]: [string, IModelMetaField]) => ({ key, name })
-    );
+    const resourceColumns = this.getResourceColumns(resourceColumnsMap);
+
     return {
       import: {
         importId: importFile.importId,
         resource: importFile.resource,
       },
       sheetColumns,
-      resourceColumns: resourceColumnsTransformeed,
+      resourceColumns,
     };
   }
+
+  getResourceColumns(resourceColumns: { [key: string]: IModelMetaField }) {
+    return Object.entries(resourceColumns)
+      .map(
+        ([key, { name, importHint, required, order }]: [
+          string,
+          IModelMetaField
+        ]) => ({
+          key,
+          name,
+          required,
+          hint: importHint,
+          order,
+        })
+      )
+      .sort((a, b) =>
+        a.order && b.order ? a.order - b.order : a.order ? -1 : b.order ? 1 : 0
+      );
+  }
 }

packages/server/src/services/Import/interfaces.ts

@@ -25,7 +25,12 @@ export interface ImportFileUploadPOJO {
     resource: string;
   };
   sheetColumns: string[];
-  resourceColumns: { key: string; name: string }[];
+  resourceColumns: {
+    key: string;
+    name: string;
+    required?: boolean;
+    hint?: string;
+  }[];
 }
 
 export interface ImportFileMapPOJO {
@@ -45,7 +50,6 @@ export interface ImportFilePreviewPOJO {
   unmappedColumnsCount: number;
 }
 
-
 export interface ImportOperSuccess {
   data: unknown;
   index: number;
@@ -54,4 +58,4 @@ export interface ImportOperSuccess {
 export interface ImportOperError {
   error: ImportInsertError;
   index: number;
-}
+}