fix tests

finos · May 12, 2022 · 735414a · 735414a
1 parent f54e313
commit 735414a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...ocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelPropertyMappingBuilder.ts b/...ocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelPropertyMappingBuilder.ts
@@ -511,7 +511,10 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
           `Can't find property owner class for property '${protocol.property.property}'`,
         );
       }
-      property = getOwnProperty(propertyOwner, protocol.property.property);
+      property =
+        propertyOwner instanceof Class
+          ? getClassProperty(propertyOwner, protocol.property.property)
+          : getOwnProperty(propertyOwner, protocol.property.property);
     }
     // NOTE: mapping for derived property is not supported
     // since we are not doing embedded property mappings yet, the target must have already been added to the mapping

diff --git a/packages/legend-query/src/stores/QueryBuilderExplorerState.ts b/packages/legend-query/src/stores/QueryBuilderExplorerState.ts
@@ -19,6 +19,7 @@ import {
   guaranteeNonNullable,
   addUniqueEntry,
   uniq,
+  returnUndefOnError,
 } from '@finos/legend-shared';
 import {
   type AbstractProperty,
@@ -284,10 +285,10 @@ const isAutoMappedProperty = (
   setImpl: SetImplementation,
 ): boolean => {
   if (setImpl instanceof PureInstanceSetImplementation) {
-    const sourceClass = setImpl.srcClass;
+    const sourceClass = setImpl.srcClass.value;
     return Boolean(
-      sourceClass.value
-        ? getClassProperty(sourceClass.value, property.name)
+      sourceClass
+        ? returnUndefOnError(() => getClassProperty(sourceClass, property.name))
         : undefined,
     );
   }