fixed formatting issue in case of aggregation (#23)

* fixed formatting issue in case of aggregation

Author: Artur-Sahakyan

FetchToSubgrid/components/ComandBar.tsx

@@ -31,11 +31,9 @@ export const CommandBar = ({
       displayName.current = await dataverseService.getEntityDisplayName(entityName);
     };
     fetchDisplayName();
-  }, []);
+  }, [entityName]);
 
-  const handleNewButtonClick = () => {
-    dataverseService.openRecordForm(entityName, '');
-  };
+  const handleNewButtonClick = () => dataverseService.openNewRecord(entityName);
 
   const handleDeleteButtonClick = async () => {
     const deleteDialogStatus = await dataverseService.openRecordDeleteDialog(entityName);

FetchToSubgrid/services/dataverseService.ts

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-destructuring */
 import { IInputs } from '../generated/ManifestTypes';
 import { WholeNumberType } from '../@types/enums';
 import { IAppWrapperProps } from '../components/AppWrapper';
@@ -23,12 +24,20 @@ export interface IDataverseService {
   openPrimaryEntityForm(entity: Entity, entityName: string): void;
   openErrorDialog(error: Error): Promise<void>;
   openRecordDeleteDialog(entityName: string): Promise<DialogResponse>;
+  getRelationships(parentEntityName: string): any;
+  openNewRecord(entityName: string): void;
   deleteSelectedRecords(
     selectedRecordIds: string[],
     entityName: string,
   ): Promise<void>;
 }
 
+type RelationshipEntity = {
+  ReferencingEntity: string;
+  ReferencingAttribute: string;
+  MetadataId: string;
+};
+
 export class DataverseService implements IDataverseService {
   private _context: ComponentFramework.Context<IInputs>;
 
@@ -73,6 +82,49 @@ export class DataverseService implements IDataverseService {
     return results;
   }
 
+  public async openNewRecord(entityName: string): Promise<void> {
+    // @ts-ignore
+    const contextPage = this._context.page;
+    // @ts-ignore
+    const lookupName: string = this._context.mode.contextInfo.entityRecordName;
+    const parentEntityName: string = contextPage.entityTypeName;
+    const entityId: string = contextPage.entityId;
+
+    const relationshipEntities: RelationshipEntity[] = await this.getRelationships(
+      parentEntityName);
+
+    const relationship: RelationshipEntity | undefined = relationshipEntities.find(
+      relationshipEntity => relationshipEntity.ReferencingEntity === entityName);
+
+    if (relationship) {
+      const lookup: { id: string, name: string, entityType: string } =
+      { id: entityId, name: lookupName, entityType: parentEntityName };
+      const formParameters: { [key: string]: string } =
+       { [relationship.ReferencingAttribute]: JSON.stringify(lookup) };
+
+      this._context.navigation.openForm({ entityName }, formParameters)
+        .then((success: unknown) => console.log(success))
+        .catch((error: unknown) => console.log(error));
+    }
+    else {
+      this._context.navigation.openForm({ entityName });
+    }
+  }
+
+  public async getRelationships(parentEntityName: string): Promise<RelationshipEntity[]> {
+    // @ts-ignore
+    const contextPage = this._context.page;
+    const entityDefinitions = `/api/data/v9.2/EntityDefinitions(LogicalName='${parentEntityName}')`;
+    const relationships = `OneToManyRelationships($select=ReferencingEntity,ReferencingAttribute)`;
+    const logicalName = '&$select=LogicalName';
+
+    const response: Response = await fetch(
+      `${contextPage.getClientUrl()}${entityDefinitions}?$expand=${relationships}${logicalName}`);
+
+    const result = await response.json();
+    return result.OneToManyRelationships;
+  }
+
   public getWholeNumberFieldName(
     format: string,
     entity: Entity,

FetchToSubgrid/utilities/d365Utils.ts

@@ -4,8 +4,8 @@ import { IDataverseService } from '../services/dataverseService';
 import {
   checkIfAttributeRequiresFormattedValue,
   checkIfAttributeIsEntityReference,
-  genereateItemsForEntity,
-  genereateItemsForLinkEntity,
+  generateItemsForEntity,
+  generateItemsForLinkEntity,
 } from './utils';
 import {
   addPagingToFetchXml,
@@ -203,7 +203,7 @@ export const getEntityData = (props: IItemProps, dataverseService: IDataverseSer
   return [entity[fieldName], false];
 };
 
-export const genereateItems = (props: IItemProps, dataverseService: IDataverseService): Entity => {
+export const generateItems = (props: IItemProps, dataverseService: IDataverseService): Entity => {
   const {
     item,
     isLinkEntity,
@@ -224,7 +224,9 @@ export const genereateItems = (props: IItemProps, dataverseService: IDataverseSe
       : getFetchXmlAttributesData(pagingFetchData, false);
 
     return item[entityAggregateAttrNames[index]] = {
-      displayName: entity[entityAggregateAttrNames[index]],
+      displayName: !hasAggregate
+        ? entity[entityAggregateAttrNames[index]]
+        : entity[`${entityAggregateAttrNames[index]}@OData.Community.Display.V1.FormattedValue`],
       isLinkable: false,
       entity,
       fieldName,
@@ -307,8 +309,8 @@ export const getItems = async (
   recordsData.records.entities.forEach(entity => {
     const item: Entity = isAggregate(fetchXml) ? {} : { id: entity[`${recordsData.entityName}id`] };
 
-    genereateItemsForEntity(recordsData, item, entity, dataverseService);
-    genereateItemsForLinkEntity(recordsData, item, entity, dataverseService);
+    generateItemsForEntity(recordsData, item, entity, dataverseService);
+    generateItemsForLinkEntity(recordsData, item, entity, dataverseService);
 
     items.push(item);
   });

FetchToSubgrid/utilities/utils.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { IColumn } from '@fluentui/react';
-import { genereateItems, getColumns, getItems, IItemProps } from './d365Utils';
+import { generateItems, getColumns, getItems, IItemProps } from './d365Utils';
 import { AttributeType } from '../@types/enums';
 import { getFetchXmlParserError, getOrderInFetchXml } from './fetchXmlUtils';
 import { LinkableItem } from '../components/LinkableItems';
@@ -223,7 +223,7 @@ export const getAttributeAliasName = (
   return attribute.attributeAlias;
 };
 
-export const genereateItemsForEntity = (
+export const generateItemsForEntity = (
   recordsData: IRecordsData, item: Entity, entity: Entity, dataverseService: IDataverseService) => {
 
   recordsData.attributesFieldNames.forEach((fieldName: any, index: number) => {
@@ -248,11 +248,11 @@ export const genereateItemsForEntity = (
       hasAliasValue,
     };
 
-    genereateItems(attributes, dataverseService);
+    generateItems(attributes, dataverseService);
   });
 };
 
-export const genereateItemsForLinkEntity = (
+export const generateItemsForLinkEntity = (
   recordsData: IRecordsData, item: Entity, entity: Entity, dataverseService: IDataverseService) => {
   recordsData.linkEntityNames.forEach((linkEntityName: string, i: number) => {
     recordsData.linkEntityAttributes[i].forEach((attr: any, index: number) => {
@@ -274,7 +274,7 @@ export const genereateItemsForLinkEntity = (
         hasAliasValue,
       };
 
-      genereateItems(attributes, dataverseService);
+      generateItems(attributes, dataverseService);
     });
   });
 };