use memoized fn

Author: paula-stacho

packages/compass-data-modeling/src/components/drawer/field-drawer-content.tsx

@@ -13,9 +13,10 @@ import { BSONType } from 'mongodb';
 import {
   createNewRelationship,
   deleteRelationship,
-  extractFieldsFromSchema,
+  getCurrentDiagramFromState,
   renameField,
-  selectCurrentModelFromState,
+  selectCurrentModel,
+  selectFieldsForCurrentModel,
   selectRelationship,
 } from '../../store/diagram';
 import type { DataModelingState } from '../../store/reducer';
@@ -196,7 +197,8 @@ export default connect(
     state: DataModelingState,
     ownProps: { namespace: string; fieldPath: FieldPath }
   ) => {
-    const model = selectCurrentModelFromState(state);
+    const diagram = getCurrentDiagramFromState(state);
+    const model = selectCurrentModel(diagram.edits);
     const collectionSchema = model.collections.find(
       (collection) => collection.ns === ownProps.namespace
     )?.jsonSchema;
@@ -209,7 +211,9 @@ export default connect(
           jsonSchema: collectionSchema,
           fieldPath: ownProps.fieldPath,
         })?.fieldTypes ?? [],
-      fieldPaths: extractFieldsFromSchema(collectionSchema),
+      fieldPaths: selectFieldsForCurrentModel(diagram.edits)[
+        ownProps.namespace
+      ],
       relationships: model.relationships.filter(({ relationship }) =>
         isRelationshipOfAField(
           relationship,

packages/compass-data-modeling/src/store/diagram.ts

@@ -822,9 +822,7 @@ export const selectCurrentModelFromState = (state: DataModelingState) => {
   return selectCurrentModel(selectCurrentDiagramFromState(state).edits);
 };
 
-export function extractFieldsFromSchema(
-  parentSchema: MongoDBJSONSchema
-): FieldPath[] {
+function extractFieldsFromSchema(parentSchema: MongoDBJSONSchema): FieldPath[] {
   const fields: FieldPath[] = [];
   traverseSchema({
     jsonSchema: parentSchema,