fix: checkbox options not updated (#1000)

* fix: remove value from builder checkbox field * feat: disable reset when saving
opengovsg · Sep 1, 2021 · a877f4e · a877f4e
1 parent d58a7b8
commit a877f4e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 2 deletions.
diff --git a/src/client/components/builder/constants/MapTable.tsx b/src/client/components/builder/constants/MapTable.tsx
@@ -208,6 +208,7 @@ const InputComponent: ConstantFieldComponent = ({
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/logic/CalculatedResult.tsx b/src/client/components/builder/logic/CalculatedResult.tsx
@@ -124,6 +124,7 @@ const InputComponent: OperationFieldComponent = ({
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/logic/ConditionalResult.tsx b/src/client/components/builder/logic/ConditionalResult.tsx
@@ -361,7 +361,7 @@ const InputComponent: OperationFieldComponent = ({
         <HStack>
           {isChanged && (
             <Button
-              isLoading={save.isLoading}
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/logic/DateResult.tsx b/src/client/components/builder/logic/DateResult.tsx
@@ -287,6 +287,7 @@ const InputComponent: OperationFieldComponent = ({
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/logic/MapResult.tsx b/src/client/components/builder/logic/MapResult.tsx
@@ -265,6 +265,7 @@ const InputComponent: OperationFieldComponent = ({
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/CheckboxField.tsx b/src/client/components/builder/questions/CheckboxField.tsx
@@ -81,7 +81,6 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         />
         <Input
           type="text"
-          value={option.label}
           {...register(`options.${i}.label`, {
             required: { value: true, message: 'Option value cannot be empty' },
           })}
@@ -181,6 +180,7 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/DateField.tsx b/src/client/components/builder/questions/DateField.tsx
@@ -113,6 +113,7 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/DropdownField.tsx b/src/client/components/builder/questions/DropdownField.tsx
@@ -144,6 +144,7 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/NumericField.tsx b/src/client/components/builder/questions/NumericField.tsx
@@ -109,6 +109,7 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/RadioField.tsx b/src/client/components/builder/questions/RadioField.tsx
@@ -175,6 +175,7 @@ const InputComponent: QuestionFieldComponent = ({ field, index, toolbar }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}

diff --git a/src/client/components/builder/questions/TitleField.tsx b/src/client/components/builder/questions/TitleField.tsx
@@ -87,6 +87,7 @@ const InputComponent: TitleFieldComponent = ({ title, description }) => {
         <HStack>
           {isChanged && (
             <Button
+              isDisabled={save.isLoading}
               colorScheme="primary"
               variant="outline"
               onClick={() => reset(undefined, { keepValues: false })}