merge conflicts

Tanuj1718 · Mar 4, 2025 · 462b90f · 462b90f
1 parent da7b252
commit 462b90f
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/components/ValueSet/ValueSetForm.tsx b/src/components/ValueSet/ValueSetForm.tsx
@@ -27,6 +27,8 @@ import {
 } from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 
+import useAppHistory from "@/hooks/useAppHistory";
+
 import mutate from "@/Utils/request/mutate";
 import {
   TERMINOLOGY_SYSTEMS,
@@ -400,6 +402,7 @@ export function ValueSetForm({
   isSubmitting,
 }: ValueSetFormProps) {
   const { t } = useTranslation();
+  const { goBack } = useAppHistory();
 
   const form = useForm<ValuesetFormType>({
     resolver: zodResolver(valuesetFormSchema),
@@ -490,12 +493,19 @@ export function ValueSetForm({
           <RuleFields type="exclude" form={form} />
         </div>
 
-        <Button
-          type="submit"
-          disabled={isSubmitting || !form.formState.isDirty}
-        >
-          {isSubmitting ? t("saving") : t("save_valueset")}
-        </Button>
+        <div className="flex gap-2 w-full justify-end">
+          <Button
+            variant="outline"
+            disabled={isSubmitting}
+            type="button"
+            onClick={() => goBack("/admin/valuesets")}
+          >
+            {t("cancel")}
+          </Button>
+          <Button variant="primary" type="submit" disabled={isSubmitting}>
+            {isSubmitting ? t("saving") : t("save_valueset")}
+          </Button>
+        </div>
       </form>
     </Form>
   );