tweak(adminPanel): RN-1409: Inclusion of Additional Data Fields in Entity Hierarchy Export File

packages/admin-panel-server/src/routes/ExportEntityHierarchiesRoute.ts

@@ -30,7 +30,16 @@ export class ExportEntityHierarchiesRoute extends Route<ExportEntityHierarchiesR
         hierarchy,
         hierarchy,
         {
-          fields: ['name', 'code', 'parent_code'],
+          fields: [
+            'grandparent_name',
+            'grandparent_code',
+            'parent_name',
+            'parent_code',
+            'name',
+            'code',
+            'type',
+            'attributes',
+          ],
         },
         false,
         false,

packages/database/src/modelClasses/Entity.js

@@ -179,6 +179,11 @@ export class EntityRecord extends DatabaseRecord {
     return ancestors && ancestors.length > 0 ? ancestors[0] : undefined;
   }
 
+  async getGrandParent(hierarchyId) {
+    const ancestors = await this.getAncestors(hierarchyId, { generational_distance: 2 });
+    return ancestors && ancestors.length > 0 ? ancestors[0] : undefined;
+  }
+
   async getAncestors(hierarchyId, criteria) {
     return this.model.getAncestorsOfEntities(hierarchyId, [this.id], criteria);
   }

packages/entity-server/src/routes/hierarchy/extendedFieldFunctions.ts

@@ -17,6 +17,16 @@ const getParentCode = async (
   return (await entity.getParent(hierarchyId))?.code;
 };
 
+const getGrandParentCode = async (
+  entity: EntityRecord,
+  context: {
+    hierarchyId: string;
+  },
+) => {
+  const { hierarchyId } = context;
+  return (await entity.getGrandParent(hierarchyId))?.code;
+};
+
 const getChildrenCodes = async (
   entity: EntityRecord,
   context: {
@@ -46,6 +56,16 @@ const getParentName = async (
   return (await entity.getParent(hierarchyId))?.name;
 };
 
+const getGrandParentName = async (
+  entity: EntityRecord,
+  context: {
+    hierarchyId: string;
+  },
+) => {
+  const { hierarchyId } = context;
+  return (await entity.getGrandParent(hierarchyId))?.name;
+};
+
 const getPoint = (entity: EntityRecord) => {
   return entity.getPoint();
 };
@@ -92,6 +112,8 @@ export const extendedFieldFunctions = {
   bounds: getBounds,
   qualified_name: getQualifiedName,
   parent_name: getParentName,
+  grandparent_name: getGrandParentName,
+  grandparent_code: getGrandParentCode,
 };
 
 export const isExtendedField = (field: string): field is keyof typeof extendedFieldFunctions =>