Merge pull request #20 from concord-consortium/184835669-new-attr-nam…

…e-fix If any collection has attr with same name, add index. (PT-184835669)
concord-consortium · May 3, 2023 · 4749525 · 4749525
2 parents 0cd2df5 + 0048095
commit 4749525
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/hierarchy-view/add-buttons.tsx b/src/components/hierarchy-view/add-buttons.tsx
@@ -62,7 +62,7 @@ export const AddAttribute = ({collection, handleAddAttribute}: IProps) => {
     return (
       <div ref={ref} className={css.createNewAttr}>
         <input type="textbox" defaultValue={"newAttr"} onChange={handleChange}></input>
-        <button onClick={handleNewAttrNameClick}>Add Attribute</button>
+        <button onClick={handleNewAttrNameClick}>Create</button>
       </div>
     );
   };

diff --git a/src/hooks/useCodapState.tsx b/src/hooks/useCodapState.tsx
@@ -167,11 +167,13 @@ export const useCodapState = () => {
   const handleAddAttribute = async (collection: ICollection, attrName: string) => {
     const proposedName = attrName.length ? attrName : "newAttr";
     let newAttributeName;
-    const attrNameAlreadyUsed = collection.attrs.find((attr) => attr.name === proposedName);
+    const allAttributes: Array<any> = [];
+    collections.map((coll) => coll.attrs.map((attr) => allAttributes.push(attr)));
+    const attrNameAlreadyUsed = allAttributes.find((attr) => attr.name === proposedName);
     if (!attrNameAlreadyUsed) {
       newAttributeName = proposedName;
     } else {
-      const attrsWithSameName = collection.attrs.filter((attr) => attr.name.startsWith(proposedName));
+      const attrsWithSameName = allAttributes.filter((attr) => attr.name.startsWith(proposedName));
       const indexes = attrsWithSameName.map((attr) => Number(attr.name.slice(proposedName.length)));
       const highestIndex = Math.max(...indexes);
       if (!highestIndex) {