Fix data source questions bugs

Recidiviz · Nov 29, 2024 · 884e7cf · 884e7cf
1 parent 92fa396
commit 884e7cf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/common/components/CheckboxOptions/CheckboxOptions.styles.tsx b/common/components/CheckboxOptions/CheckboxOptions.styles.tsx
@@ -34,7 +34,6 @@ export const CheckboxLabel = styled.div`
   display: flex;
   align-items: center;
   gap: 8px;
-  text-transform: capitalize;
 `;
 
 export const Checkbox = styled.input`

diff --git a/common/components/CheckboxOptions/CheckboxOptions.tsx b/common/components/CheckboxOptions/CheckboxOptions.tsx
@@ -47,7 +47,9 @@ export const CheckboxOptions: React.FC<CheckboxOptionsProps> = ({
   options,
   onChange,
 }) => {
-  const [otherDescriptionValue, setOtherDescriptionValue] = useState("");
+  const [otherDescriptionValue, setOtherDescriptionValue] = useState<
+    string | null
+  >(null);
 
   return (
     <Styled.CheckboxContainer>
@@ -88,7 +90,11 @@ export const CheckboxOptions: React.FC<CheckboxOptionsProps> = ({
                   otherDescription.placeholder ||
                   "Please provide additional information..."
                 }
-                value={otherDescriptionValue || otherDescription.value}
+                value={
+                  otherDescriptionValue !== null
+                    ? otherDescriptionValue
+                    : otherDescription.value || ""
+                }
                 onChange={(e) => {
                   setOtherDescriptionValue(e.target.value);
                   otherDescription.onChange(e.target.value);

diff --git a/publisher/src/components/AgencySettings/AgencySettingsDataSource.tsx b/publisher/src/components/AgencySettings/AgencySettingsDataSource.tsx
@@ -164,16 +164,29 @@ const QuestionCheckboxBlock: React.FC<{
   };
 
   const handleChange = (key: string) => {
-    if (key !== "CURRENT_AGENCY") {
-      updatedSetting[sourceType].collection_method.value = "";
-    }
-    if (key !== "OTHER_AGENCY_OR_SYSTEM") {
-      updatedSetting[sourceType].modification.value = "";
-    }
-    if (key !== "OTHER") {
-      updatedSetting[sourceType][settingType].other_description = "";
+    if (currentKey === key) {
+      setCurrentKey("");
+      updatedSetting[sourceType][settingType].value = "";
+    } else {
+      if (key !== "CURRENT_AGENCY") {
+        updatedSetting[sourceType].collection_method.value = "";
+        if (key !== "OTHER") {
+          updatedSetting[sourceType].collection_method.other_description = "";
+        }
+      }
+      if (key !== "OTHER_AGENCY_OR_SYSTEM") {
+        updatedSetting[sourceType].modification.value = "";
+        if (key !== "OTHER") {
+          updatedSetting[sourceType].modification.other_description = "";
+        }
+      }
+      if (key !== "OTHER") {
+        updatedSetting[sourceType][settingType].other_description = "";
+      }
+
+      setCurrentKey(key);
+      updatedSetting[sourceType][settingType].value = key;
     }
-    updatedSetting[sourceType][settingType].value = key;
   };
 
   return (