cleanup

Author: paula-stacho

packages/compass-data-modeling/src/components/diagram-editor.tsx

@@ -235,8 +235,8 @@ const DiagramContent: React.FunctionComponent<{
             openDrawer(DATA_MODELING_DRAWER_ID);
           }}
           onFieldClick={(_evt, { id: fieldPath, nodeId: namespace }) => {
-            _evt.stopPropagation(); // TODO: should this be handled by the diagramming package?
-            if (!Array.isArray(fieldPath)) return; // TODO: could be avoided with generics in the diagramming package
+            _evt.stopPropagation(); // TODO(COMPASS-9659): should this be handled by the diagramming package?
+            if (!Array.isArray(fieldPath)) return; // TODO(COMPASS-9659): could be avoided with generics in the diagramming package
             onFieldSelect(namespace, fieldPath);
             openDrawer(DATA_MODELING_DRAWER_ID);
           }}

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

@@ -14,7 +14,6 @@ import { BSONType } from 'mongodb';
 import {
   createNewRelationship,
   deleteRelationship,
-  renameField,
   selectCurrentModelFromState,
   selectRelationship,
 } from '../../store/diagram';
@@ -26,7 +25,6 @@ import {
 import { useChangeOnBlur } from './use-change-on-blur';
 import { RelationshipsSection } from './relationships-section';
 import { getFieldFromSchema } from '../../utils/schema-traversal';
-import { lowerFirst } from 'lodash';
 
 type FieldDrawerContentProps = {
   namespace: string;
@@ -51,8 +49,8 @@ type FieldDrawerContentProps = {
   onChangeFieldType: (
     namespace: string,
     fieldPath: FieldPath,
-    fromBsonType: string,
-    toBsonType: string
+    fromBsonType: string | string[],
+    toBsonType: string | string[]
   ) => void;
 };
 
@@ -126,6 +124,10 @@ const FieldDrawerContent: React.FunctionComponent<FieldDrawerContentProps> = ({
       [fieldPath, fieldPaths, fieldName]
     );
 
+  const handleTypeChange = (newTypes: string | string[]) => {
+    onChangeFieldType(namespace, fieldPath, types, newTypes);
+  };
+
   return (
     <>
       <DMDrawerSection label="Field properties">
@@ -147,18 +149,15 @@ const FieldDrawerContent: React.FunctionComponent<FieldDrawerContentProps> = ({
             data-testid="lg-combobox-datatype"
             label="Datatype"
             aria-label="Datatype"
-            disabled={true} // TODO: enable when field type change is implemented
+            disabled={true} // TODO(COMPASS-9659): enable when field type change is implemented
             value={types}
             size="small"
             multiselect={true}
             clearable={false}
+            onChange={handleTypeChange}
           >
             {BSON_TYPES.map((type) => (
-              <ComboboxOption
-                key={type}
-                value={lowerFirst(type)}
-                displayName={type}
-              />
+              <ComboboxOption key={type} value={type} />
             ))}
           </Combobox>
         </DMFormFieldContainer>
@@ -206,7 +205,7 @@ export default connect(
             )?.jsonSchema ?? {},
           fieldPath: ownProps.fieldPath,
         })?.fieldTypes ?? [],
-      fieldPaths: [], // TODO get existing field paths
+      fieldPaths: [], // TODO(COMPASS-9659): get existing field paths
       relationships: model.relationships.filter((r) => {
         const [local, foreign] = r.relationship;
         return (
@@ -224,7 +223,7 @@ export default connect(
     onCreateNewRelationshipClick: createNewRelationship,
     onEditRelationshipClick: selectRelationship,
     onDeleteRelationshipClick: deleteRelationship,
-    onRenameField: renameField,
-    onChangeFieldType: () => {}, // TODO: updateFieldSchema,
+    onRenameField: () => {}, // TODO(COMPASS-9659): renameField,
+    onChangeFieldType: () => {}, // TODO(COMPASS-9659): updateFieldSchema,
   }
 )(FieldDrawerContent);

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

@@ -440,29 +440,6 @@ export function renameCollection(
   };
 }
 
-export function renameField(
-  ns: string,
-  from: FieldPath,
-  to: FieldPath
-): DataModelingThunkAction<
-  void,
-  ApplyEditAction | ApplyEditFailedAction | CollectionSelectedAction
-> {
-  return (dispatch) => {
-    const edit: Omit<
-      Extract<Edit, { type: 'RenameField' }>,
-      'id' | 'timestamp'
-    > = {
-      type: 'RenameField',
-      ns,
-      from,
-      to,
-    };
-
-    dispatch(applyEdit(edit));
-  };
-}
-
 export function applyEdit(
   rawEdit: EditAction
 ): DataModelingThunkAction<boolean, ApplyEditAction | ApplyEditFailedAction> {
@@ -703,44 +680,6 @@ function _applyEdit(edit: Edit, model?: StaticModel): StaticModel {
         })),
       };
     }
-    case 'RenameField': {
-      return {
-        ...model,
-        // Update relationships to point to the renamed field.
-        relationships: model.relationships.map((relationship) => {
-          const [local, foreign] = relationship.relationship;
-
-          return {
-            ...relationship,
-            relationship: [
-              {
-                ...local,
-                fields:
-                  local.ns === edit.ns &&
-                  JSON.stringify(local.fields) === JSON.stringify(edit.from)
-                    ? edit.to
-                    : local.fields,
-              },
-              {
-                ...foreign,
-                fields:
-                  local.ns === edit.ns &&
-                  JSON.stringify(local.fields) === JSON.stringify(edit.from)
-                    ? edit.to
-                    : local.fields,
-              },
-            ],
-          };
-        }),
-        collections: model.collections.map((collection) => ({
-          ...collection,
-          // TODO: Rename the field.
-          // jsonSchema: collection.ns !== edit.ns
-          //   ? collection.jsonSchema
-          //   : renameFieldInSchema(collection.jsonSchema, edit.from, edit.to)
-        })),
-      };
-    }
     case 'UpdateCollectionNote': {
       return {
         ...model,