diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx index 4cba36b9375db..91379ce97fe22 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx @@ -24,11 +24,11 @@ const StructuredPropValues = ({ schemaFieldEntity, propColumn }: Props) => { const entityRegistry = useEntityRegistry(); const property = schemaFieldEntity.structuredProperties?.properties?.find( - (prop) => prop.structuredProperty.urn === propColumn?.entity.urn, + (prop) => prop.structuredProperty.urn === propColumn?.entity?.urn, ); const propRow = property ? mapStructuredPropertyToPropertyRow(property) : undefined; const values = propRow?.values; - const isRichText = propRow?.dataType?.info.type === StdDataType.RichText; + const isRichText = propRow?.dataType?.info?.type === StdDataType.RichText; const hasMoreValues = values && values.length > 2; const displayedValues = hasMoreValues ? values.slice(0, 1) : values; diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx index 64953928990ee..fc7892f6ba6cc 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/StructuredPropertyBadge.tsx @@ -41,8 +41,8 @@ const StructuredPropertyBadge = ({ structuredProperties }: Props) => { if (!badgeStructuredProperty) return null; - const propertyValue = propRow?.values[0].value; - const relatedDescription = propRow?.structuredProperty.definition.allowedValues?.find( + const propertyValue = propRow?.values[0]?.value; + const relatedDescription = propRow?.structuredProperty?.definition?.allowedValues?.find( (v) => getStructuredPropertyValue(v.value) === propertyValue, )?.description; @@ -56,7 +56,7 @@ const StructuredPropertyBadge = ({ structuredProperties }: Props) => { Value - {propRow?.values[0].value} + {propRow?.values[0]?.value} {relatedDescription && ( @@ -79,7 +79,7 @@ const StructuredPropertyBadge = ({ structuredProperties }: Props) => { > { property, currentProperties, ); - const isRichText = propertyRow?.dataType?.info.type === StdDataType.RichText; + const isRichText = propertyRow?.dataType?.info?.type === StdDataType.RichText; const values = propertyRow?.values; const hasMultipleValues = values && values.length > 1; const propertyName = getDisplayName(property.entity as StructuredPropertyEntity); diff --git a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx index 05fd91d4680ac..b5f3cd770078a 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/Form.tsx @@ -57,7 +57,7 @@ function Form({ formUrn }: Props) { const title = formAssociation?.form?.info?.name; const associatedUrn = formAssociation?.associatedUrn; const description = formAssociation?.form?.info?.description; - const owners = formAssociation?.form.ownership?.owners; + const owners = formAssociation?.form?.ownership?.owners; return ( diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx index 1714f0d1872e3..92691b1ad2239 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal.tsx @@ -99,7 +99,7 @@ export default function EditStructuredPropertyModal({ return ( { const searchAcrossEntities = data?.searchAcrossEntities; const noOfProperties = searchAcrossEntities?.searchResults?.length; - const badgeProperty = searchAcrossEntities?.searchResults.find( + const badgeProperty = searchAcrossEntities?.searchResults?.find( (prop) => (prop.entity as StructuredPropertyEntity).settings?.showAsAssetBadge, )?.entity; diff --git a/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx b/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx index 1f08995e237ec..25f1d67239042 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/ViewAdvancedOptions.tsx @@ -32,7 +32,7 @@ const ViewAdvancedOptions = ({ propEntity }: Props) => { {propEntity && ( Qualified Name - {propEntity?.definition.qualifiedName} + {propEntity?.definition?.qualifiedName} )} diff --git a/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx b/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx index 2fd36a29c8e76..bc91a90989d2c 100644 --- a/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx +++ b/datahub-web-react/src/app/govern/structuredProperties/ViewStructuredPropsDrawer.tsx @@ -40,9 +40,9 @@ const ViewStructuredPropsDrawer = ({ const selectedPropEntity = selectedProperty && (selectedProperty?.entity as StructuredPropertyEntity); - const allowedValues = selectedPropEntity?.definition.allowedValues; + const allowedValues = selectedPropEntity?.definition?.allowedValues; - const allowedTypes = selectedPropEntity?.definition.typeQualifier?.allowedTypes; + const allowedTypes = selectedPropEntity?.definition?.typeQualifier?.allowedTypes; const propType = getValueTypeLabel( selectedPropEntity.definition.valueType.urn, diff --git a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx index f624d7e6ca796..a7e6f516bb794 100644 --- a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx +++ b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx @@ -156,7 +156,7 @@ export const ExecutionDetailsModal = ({ urn, open, onClose }: Props) => { (status && {getExecutionRequestSummaryText(status)}) || undefined; - const recipeJson = data?.executionRequest?.input.arguments?.find((arg) => arg.key === 'recipe')?.value; + const recipeJson = data?.executionRequest?.input?.arguments?.find((arg) => arg.key === 'recipe')?.value; let recipeYaml: string; try { recipeYaml = recipeJson && YAML.stringify(JSON.parse(recipeJson), 8, 2).trim();