Merge branch '6921-entitydata-common-props-label' into development

huridocs · Jun 21, 2024 · 70f0714 · 70f0714
2 parents 54ec3b7 + 7e207db
commit 70f0714
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/app/react/Markdown/components/EntityData.tsx b/app/react/Markdown/components/EntityData.tsx
@@ -39,6 +39,16 @@ const rootProperties = ['title', 'creationDate', 'editDate'];
 const getPropertyData = ({ formattedEntity, propertyName, newNameGeneration }: Options) =>
   formattedEntity.metadata.find((p: any) => p.name === safeName(propertyName, newNameGeneration));
 
+const getPropertyName = (propertyName: string, _template: IImmutable<ClientTemplateSchema>) => {
+  const template = ensure<IImmutable<ClientTemplateSchema>>(_template);
+  return (
+    template
+      .get('commonProperties')
+      ?.find(p => p?.get('label') === propertyName)
+      ?.get('name') || propertyName
+  );
+};
+
 const extractRootProperty = ({ formattedEntity, propertyName }: Options) =>
   formattedEntity[propertyName];
 
@@ -107,7 +117,8 @@ const EntityData = ({
   let output = <></>;
 
   try {
-    const propertyName = getProperty(propValueOf, propLabelOf);
+    const attributeValue = getProperty(propValueOf, propLabelOf);
+    const propertyName = getPropertyName(attributeValue, template);
     const renderMethod = getMethod(propValueOf, propertyName);
     output = <>{renderMethod({ formattedEntity, propertyName, newNameGeneration, template })}</>;
   } catch (err) {

diff --git a/cypress/e2e/helpers/entityViewPageFixtures.ts b/cypress/e2e/helpers/entityViewPageFixtures.ts
@@ -22,7 +22,7 @@ ${textWithDynamicValues}
 <h4 className="descriptores-title"><Value path="entity.metadata.descriptores.label" /></h4>
 <p className="descriptores-content"><Value path="entity.metadata.descriptores.value.0.value" /></p>
 <h4 className="EntityData-label"><EntityData label-of="title" /></h4>
-<p className="EntityData-title"><EntityData value-of="title" /></p>
+<p className="EntityData-title"><EntityData value-of="Custom Title" /></p>
 <p id="entity-datasets-value"><p>`;
 
 export const script = `var currentEntitySharedId = window.store.getState().page.datasets.getIn(['entity', 'sharedId']);

diff --git a/cypress/e2e/pages/pages.cy.ts b/cypress/e2e/pages/pages.cy.ts
@@ -177,6 +177,8 @@ describe('Pages', () => {
       cy.get('.slider').click();
       cy.contains('Select...');
       cy.get('select.form-control').select('My entity view page');
+      cy.get('.property-edit').eq(0).click();
+      cy.clearAndType('input[name="template.data.commonProperties[0].label"]', 'Custom Title');
       cy.contains('Save').click();
       cy.contains('Saved successfully.');
     });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.171.0-rc3",
+  "version": "1.171.1",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"