chore: move rules forms

Signed-off-by: Mark Phelps <[email protected]>
flipt-io · Feb 5, 2025 · abe5c55 · abe5c55
1 parent 78f73a7
commit abe5c55
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/ui/src/app/flags/rules/Rules.tsx b/ui/src/app/flags/rules/Rules.tsx
@@ -24,7 +24,7 @@ import { ButtonWithPlus, TextButton } from '~/components/Button';
 import Loading from '~/components/Loading';
 import Modal from '~/components/Modal';
 import DeletePanel from '~/components/panels/DeletePanel';
-import RuleForm from '~/components/rules/forms/RuleForm';
+import RuleForm from '~/components/rules/RuleForm';
 import Rule from '~/components/rules/Rule';
 import SortableRule from '~/components/rules/SortableRule';
 import Slideover from '~/components/Slideover';
@@ -36,7 +36,7 @@ import {
   IVariant,
   toFilterableVariant
 } from '~/types/Variant';
-import SingleDistributionFormInput from '~/components/rules/forms/SingleDistributionForm';
+import SingleDistributionFormInput from '~/components/rules/SingleDistributionForm';
 import { FlagFormContext } from '~/components/flags/FlagFormContext';
 import { v4 as uuid } from 'uuid';
 import { selectCurrentEnvironment } from '~/app/environments/environmentsApi';
@@ -285,6 +285,7 @@ export default function Rules({ flag, rules, variants }: RulesProps) {
                               flag={flag}
                               rule={rule}
                               segments={segments}
+                              variants={variants}
                               onDelete={() => {
                                 setActiveRule(null);
                                 setDeletingRule(rule);

diff --git a/...nts/rules/forms/MultiDistributionForm.tsx → ...omponents/rules/MultiDistributionForm.tsx b/...nts/rules/forms/MultiDistributionForm.tsx → ...omponents/rules/MultiDistributionForm.tsx
diff --git a/...ponents/rules/forms/QuickEditRuleForm.tsx → ...rc/components/rules/QuickEditRuleForm.tsx b/...ponents/rules/forms/QuickEditRuleForm.tsx → ...rc/components/rules/QuickEditRuleForm.tsx
@@ -8,7 +8,7 @@ import { FilterableSegment, ISegment, segmentOperators } from '~/types/Segment';
 import { FilterableVariant, IVariant } from '~/types/Variant';
 import { cls } from '~/utils/helpers';
 import { distTypes } from './RuleForm';
-import SingleDistributionFormInput from '~/components/rules/forms/SingleDistributionForm';
+import SingleDistributionFormInput from './SingleDistributionForm';
 import { IDistribution } from '~/types/Distribution';
 
 type QuickEditRuleFormProps = {

diff --git a/ui/src/components/rules/Rule.tsx b/ui/src/components/rules/Rule.tsx
@@ -3,7 +3,7 @@ import { IFlag } from '~/types/Flag';
 import { ISegment } from '~/types/Segment';
 import { cls } from '~/utils/helpers';
 import Dropdown from '~/components/Dropdown';
-import QuickEditRuleForm from './forms/QuickEditRuleForm';
+import QuickEditRuleForm from './QuickEditRuleForm';
 import { IRule } from '~/types/Rule';
 import { IVariant } from '~/types/Variant';
 

diff --git a/ui/src/components/rules/forms/RuleForm.tsx → ui/src/components/rules/RuleForm.tsx b/ui/src/components/rules/forms/RuleForm.tsx → ui/src/components/rules/RuleForm.tsx
@@ -2,10 +2,8 @@ import { Dialog } from '@headlessui/react';
 import { XMarkIcon } from '@heroicons/react/24/outline';
 import { FieldArray, Form, Formik } from 'formik';
 import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
 import { Link } from 'react-router';
 import * as Yup from 'yup';
-import { selectCurrentNamespace } from '~/app/namespaces/namespacesApi';
 import { Button } from '~/components/Button';
 import SegmentsPicker from '~/components/forms/SegmentsPicker';
 import Loading from '~/components/Loading';

diff --git a/...ts/rules/forms/SingleDistributionForm.tsx → ...mponents/rules/SingleDistributionForm.tsx b/...ts/rules/forms/SingleDistributionForm.tsx → ...mponents/rules/SingleDistributionForm.tsx
diff --git a/ui/src/components/rules/SortableRule.tsx b/ui/src/components/rules/SortableRule.tsx
@@ -1,20 +1,21 @@
 import { useSortable } from '@dnd-kit/sortable';
-import { IEvaluatable } from '~/types/Evaluatable';
 import { IFlag } from '~/types/Flag';
 import { ISegment } from '~/types/Segment';
 import Rule from './Rule';
 import { IRule } from '~/types/Rule';
+import { IVariant } from '~/types/Variant';
 
 type SortableRuleProps = {
   flag: IFlag;
   rule: IRule;
   segments: ISegment[];
+  variants: IVariant[];
   onSuccess: () => void;
   onDelete: () => void;
 };
 
 export default function SortableRule(props: SortableRuleProps) {
-  const { flag, rule, segments, onSuccess, onDelete } = props;
+  const { flag, rule, segments, variants, onSuccess, onDelete } = props;
   const {
     isDragging,
     attributes,
@@ -46,6 +47,7 @@ export default function SortableRule(props: SortableRuleProps) {
       flag={flag}
       rule={rule}
       segments={segments}
+      variants={variants}
       onSuccess={onSuccess}
       onDelete={onDelete}
     />