only use undefined to move attribute to front

concord-consortium · Jan 9, 2025 · 1fd429c · 1fd429c
1 parent 622e800
commit 1fd429c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/v3/src/components/case-tile-common/attribute-header-divider.tsx b/v3/src/components/case-tile-common/attribute-header-divider.tsx
@@ -24,8 +24,11 @@ export const AttributeHeaderDivider = ({ before = false, columnKey, cellElt, get
       if (!targetCollection || !dataSet || (dataSet !== dataset) || !dragAttrId) return
 
       const sourceCollection = dataSet.getCollectionForAttribute(dragAttrId)
+      // If the columnKey is the special kIndexColumnKey then we use undefined for
+      // afterAttrId. This means the attribute will be moved to the beginning
+      const maybeColumnKey = columnKey === kIndexColumnKey ? undefined : columnKey
       moveAttribute({
-        afterAttrId: before ? kIndexColumnKey : columnKey,
+        afterAttrId: before ? undefined : maybeColumnKey,
         attrId: dragAttrId,
         dataset,
         includeNotifications: true,

diff --git a/v3/src/components/common/edit-formula-modal.tsx b/v3/src/components/common/edit-formula-modal.tsx
@@ -1,5 +1,5 @@
 import {
-  Box, Button, Flex, FormControl, FormLabel, Input, ModalBody, ModalFooter, Tooltip
+  Box, Button, Flex, FormControl, FormLabel, ModalBody, ModalFooter, Tooltip
 } from "@chakra-ui/react"
 import React, { useCallback, useEffect, useRef, useState } from "react"
 import { observer } from "mobx-react-lite"

diff --git a/v3/src/models/data/data-set-utils.ts b/v3/src/models/data/data-set-utils.ts
@@ -1,5 +1,4 @@
 import { isAlive } from "mobx-state-tree"
-import { kIndexColumnKey } from "../../components/case-tile-common/case-tile-types"
 import { logMessageWithReplacement } from "../../lib/log-message"
 import { AttributeFormulaAdapter } from "../formula/attribute-formula-adapter"
 import { FilterFormulaAdapter } from "../formula/filter-formula-adapter"
@@ -74,7 +73,7 @@ export function moveAttribute({
 }: IMoveAttributeParameters) {
   const firstAttr: IAttribute | undefined = getCollectionAttrs(targetCollection, dataset)[0]
   const options: IMoveAttributeOptions =
-    !afterAttrId || afterAttrId === kIndexColumnKey ? { before: firstAttr?.id } : { after: afterAttrId }
+    afterAttrId ? { after: afterAttrId }: { before: firstAttr?.id }
 
   // bail if we're moving the attribute before/after itself
   if (attrId === options.after || attrId === options.before) return