implement PR suggestions

Author: paula-stacho

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

@@ -81,12 +81,16 @@ export function getIsFieldNameValid(
   const siblingFields = existingFields
     .filter(
       (fieldPath) =>
+        // same level
         fieldPath.length === currentFieldPath.length &&
+        // same path to that level
         areFieldPathsEqual(
           fieldPath.slice(0, fieldPath.length - 1),
           currentFieldPath.slice(0, fieldPath.length - 1)
         ) &&
-        !areFieldPathsEqual(fieldPath, currentFieldPath)
+        // not the same field
+        fieldPath[fieldPath.length - 1] !==
+          currentFieldPath[currentFieldPath.length - 1]
     )
     .map((fieldPath) => fieldPath[fieldPath.length - 1]);
 

packages/compass-data-modeling/src/utils/schema-traversal.tsx

@@ -166,20 +166,20 @@ export const getFieldFromSchema = ({
   });
 };
 
-type MutationParameters = {
+type UpdateOperationParameters = {
   update: 'removeField' | 'renameField';
   newFieldName?: string;
 };
 
-const getMutatedSchema = ({
+const applySchemaUpdate = ({
   schema,
   fieldName,
   newFieldName,
   update,
 }: {
   schema: MongoDBJSONSchema;
   fieldName: string;
-} & MutationParameters): MongoDBJSONSchema => {
+} & UpdateOperationParameters): MongoDBJSONSchema => {
   switch (update) {
     case 'removeField': {
       if (!schema.properties || !schema.properties[fieldName])
@@ -221,7 +221,7 @@ export const updateSchema = ({
 }: {
   jsonSchema: MongoDBJSONSchema;
   fieldPath: FieldPath;
-} & MutationParameters): MongoDBJSONSchema => {
+} & UpdateOperationParameters): MongoDBJSONSchema => {
   const newSchema = {
     ...jsonSchema,
   };
@@ -231,7 +231,7 @@ export const updateSchema = ({
   if (newSchema.properties && newSchema.properties[nextInPath]) {
     if (targetReached) {
       // reached the field to remove
-      return getMutatedSchema({
+      return applySchemaUpdate({
         schema: newSchema,
         fieldName: nextInPath,
         update,

packages/compass-data-modeling/src/utils/utils.ts

@@ -14,16 +14,7 @@ export function isSameFieldOrAncestor(
   ancestor: FieldPath,
   child: FieldPath
 ): boolean {
-  if (ancestor.length === child.length)
-    return areFieldPathsEqual(ancestor, child);
-  if (ancestor.length > child.length) return false;
-  // ignore the last character - closing bracket
-  const ancestorPath = JSON.stringify(ancestor).slice(0, -1);
-  const beginningOfChildPath = JSON.stringify(child).slice(
-    0,
-    ancestorPath.length
-  );
-  return ancestorPath === beginningOfChildPath;
+  return ancestor.every((pathPart, index) => pathPart === child[index]);
 }
 
 export function isRelationshipOfAField(