Refactor indexing rules to use new rule model

alegauss · alegauss · commit cc43d5f3b344 · 2026-01-16T16:44:23.000-03:00
Updated integration indexing rules to use the new TurIntegrationIndexingRule model and service. Added a dynamic field component for managing rule values. Adjusted form fields and routing to match the new data structure and improved form UX with clearer labels and descriptions.
diff --git a/turing-react/src/app/console/integration/integration.instance.indexing.rules.page.tsx b/turing-react/src/app/console/integration/integration.instance.indexing.rules.page.tsx
@@ -1,26 +1,26 @@
 import { IntegrationIndexingRulesForm } from "@/components/integration/integration.indexing.rules.form";
 import { SubPageHeader } from "@/components/sub.page.header";
-import type { TurIntegrationInstance } from "@/models/integration/integration-instance.model";
-import { TurIntegrationInstanceService } from "@/services/integration/integration.service";
+import type { TurIntegrationIndexingRule } from "@/models/integration/integration-indexing-rule.model";
+import { TurIntegrationIndexingRuleService } from "@/services/integration/integration-indexing-rule.service";
 import { IconTools } from "@tabler/icons-react";
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
-const turIntegrationInstanceService = new TurIntegrationInstanceService();
 
 export default function IntegrationInstanceIndexingRulePage() {
-  const { id } = useParams() as { id: string };
-  const [integrationInstance, setIntegrationInstance] = useState<TurIntegrationInstance>({} as TurIntegrationInstance);
+  const { id, ruleId } = useParams() as { id: string, ruleId: string };
+  const [integrationIndexingRules, setIntegrationIndexingRules] = useState<TurIntegrationIndexingRule>({} as TurIntegrationIndexingRule);
+  const turIntegrationIndexingRuleService = new TurIntegrationIndexingRuleService(id || "");
   const [isNew, setIsNew] = useState<boolean>(true);
   useEffect(() => {
     if (id !== "new") {
-      turIntegrationInstanceService.get(id).then(setIntegrationInstance);
+      turIntegrationIndexingRuleService.get(ruleId).then(setIntegrationIndexingRules);
       setIsNew(false);
     }
   }, [id])
   return (
     <>
       <SubPageHeader icon={IconTools} title="Indexing Rules" description="Establish guidelines for how the indexing process will operate." />
-      <IntegrationIndexingRulesForm value={integrationInstance} isNew={isNew} />
+      <IntegrationIndexingRulesForm value={integrationIndexingRules} isNew={isNew} />
     </>
   )
 }
diff --git a/turing-react/src/app/routes/integration.routes.tsx b/turing-react/src/app/routes/integration.routes.tsx
@@ -25,7 +25,7 @@ export const IntegrationRoutes = (
             <Route path="source" element={<IntegrationInstanceSourceListPage />} />
             <Route path="source/:sourceId" element={<IntegrationInstanceSourcePage />} />
             <Route path="indexing-rule" element={<IntegrationInstanceIndexingRulesListPage />} />
-            <Route path="indexing-rule/:rulesId" element={<IntegrationInstanceIndexingRulesPage />} />
+            <Route path="indexing-rule/:ruleId" element={<IntegrationInstanceIndexingRulesPage />} />
             <Route path="monitoring">
                 <Route index element={<Navigate to="all" replace />} />
                 <Route path=":source" element={<IntegrationInstanceMonitoringPage />} />
diff --git a/turing-react/src/components/integration/dynamic.indexing.rule.field.tsx b/turing-react/src/components/integration/dynamic.indexing.rule.field.tsx
@@ -0,0 +1,51 @@
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { PlusCircle, Trash2 } from 'lucide-react';
+import { useFieldArray, type Control, type UseFormRegister } from 'react-hook-form';
+
+interface DynamicIndexingRuleFieldsProps {
+    control: Control<any>;
+    register: UseFormRegister<any>;
+    fieldName: string;
+}
+
+export function DynamicIndexingRuleFields({ control, register, fieldName }: DynamicIndexingRuleFieldsProps) {
+    const { fields, append, remove } = useFieldArray({
+        control,
+        name: fieldName,
+    });
+
+    const handleAddField = () => {
+        append('');
+    };
+
+    return (
+        <div className="flex flex-col gap-4 w-full">
+            {fields.map((field, index) => (
+                <div key={field.id} className="flex items-center gap-2">
+                    <Input
+                        className="grow"
+                        placeholder="Value"
+                        {...register(`${fieldName}.${index}`)}
+                    />
+                    <Button
+                        variant="ghost"
+                        size="icon"
+                        onClick={() => remove(index)}
+                        aria-label="Remove the field"
+                        type="button"
+                    >
+                        <Trash2 className="h-4 w-4 text-red-500" />
+                    </Button>
+                </div>
+            ))}
+
+            <div className="mt-2">
+                <Button variant="outline" onClick={handleAddField} type="button">
+                    <PlusCircle className="h-4 w-4 mr-2" />
+                    Add
+                </Button>
+            </div>
+        </div>
+    );
+}
diff --git a/turing-react/src/components/integration/integration.indexing.rules.form.tsx b/turing-react/src/components/integration/integration.indexing.rules.form.tsx
@@ -25,44 +25,48 @@ import {
 import {
   Textarea
 } from "@/components/ui/textarea"
-import type { TurIntegrationInstance } from "@/models/integration/integration-instance.model.ts"
-import { TurIntegrationInstanceService } from "@/services/integration/integration.service"
+import type { TurIntegrationIndexingRule } from "@/models/integration/integration-indexing-rule.model"
+import { TurIntegrationIndexingRuleService } from "@/services/integration/integration-indexing-rule.service"
 import { useEffect } from "react"
 import {
   useForm
 } from "react-hook-form"
 import { useNavigate } from "react-router-dom"
 import { toast } from "sonner"
-const turIntegrationInstanceService = new TurIntegrationInstanceService();
+import { DynamicIndexingRuleFields } from "./dynamic.indexing.rule.field"
+
 interface Props {
-  value: TurIntegrationInstance;
+  value: TurIntegrationIndexingRule;
   isNew: boolean;
 }
 
 export const IntegrationIndexingRulesForm: React.FC<Props> = ({ value, isNew }) => {
-  const form = useForm<TurIntegrationInstance>();
-  const { setValue } = form;
+  const form = useForm<TurIntegrationIndexingRule>();
+  const { control, register, setValue } = form;
   const navigate = useNavigate()
   useEffect(() => {
     setValue("id", value.id)
-    setValue("title", value.title);
+    setValue("name", value.name);
     setValue("description", value.description);
-    setValue("vendor", value.vendor);
-    setValue("endpoint", value.endpoint);
-    setValue("enabled", value.enabled);
+    setValue("ruleType", value.ruleType);
+    setValue("source", value.source);
+    setValue("attribute", value.attribute);
+    setValue("values", value.values);
   }, [setValue, value]);
 
 
-  function onSubmit(integrationInstance: TurIntegrationInstance) {
+  function onSubmit(integrationIndexingRule: TurIntegrationIndexingRule) {
     try {
       if (isNew) {
-        turIntegrationInstanceService.create(integrationInstance);
-        toast.success(`The ${integrationInstance.title} Integration Instance was saved`);
+        const turIntegrationIndexingRuleService = new TurIntegrationIndexingRuleService("");
+        turIntegrationIndexingRuleService.create(integrationIndexingRule);
+        toast.success(`The ${integrationIndexingRule.name} Integration Indexing Rule was saved`);
         navigate(ROUTES.INTEGRATION_INSTANCE);
       }
       else {
-        turIntegrationInstanceService.update(integrationInstance);
-        toast.success(`The ${integrationInstance.title} Integration Instance was updated`);
+        const turIntegrationIndexingRuleService = new TurIntegrationIndexingRuleService("");
+        turIntegrationIndexingRuleService.update(integrationIndexingRule);
+        toast.success(`The ${integrationIndexingRule.name} Integration Indexing Rule was updated`);
       }
     } catch (error) {
       console.error("Form submission error", error);
@@ -75,18 +79,18 @@ export const IntegrationIndexingRulesForm: React.FC<Props> = ({ value, isNew })
       <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8 py-8 pr-8">
         <FormField
           control={form.control}
-          name="title"
+          name="name"
           render={({ field }) => (
             <FormItem>
-              <FormLabel>Name</FormLabel>
+              <FormLabel>Rule Name</FormLabel>
               <FormControl>
                 <Input
                   {...field}
-                  placeholder="Title"
+                  placeholder="e.g., Ignore Draft Pages"
                   type="text"
                 />
               </FormControl>
-              <FormDescription>Integration instance title will appear on list.</FormDescription>
+              <FormDescription>A unique, descriptive name to easily identify this rule in the list.</FormDescription>
               <FormMessage />
             </FormItem>
           )}
@@ -97,60 +101,88 @@ export const IntegrationIndexingRulesForm: React.FC<Props> = ({ value, isNew })
           name="description"
           render={({ field }) => (
             <FormItem>
-              <FormLabel>Description</FormLabel>
+              <FormLabel>Rule Description</FormLabel>
               <FormControl>
                 <Textarea
-                  placeholder="Description"
+                  placeholder="e.g., Excludes all draft pages from indexing"
                   className="resize-none"
                   {...field}
                 />
               </FormControl>
-              <FormDescription>Integration instance description will appear on list.</FormDescription>
+              <FormDescription>Provide details about what this rule does and when it should be applied.</FormDescription>
               <FormMessage />
             </FormItem>
           )}
         />
-
         <FormField
           control={form.control}
-          name="vendor"
+          name="source"
           render={({ field }) => (
             <FormItem>
-              <FormLabel>Vendor</FormLabel>
-              <Select onValueChange={field.onChange} value={field.value}>
-                <FormControl>
-                  <SelectTrigger>
-                    <SelectValue placeholder="Choose..." />
-                  </SelectTrigger>
-                </FormControl>
-                <SelectContent>
-                  <SelectItem key="AEM" value="AEM">AEM</SelectItem>
-                  <SelectItem key="WEB_CRAWLER" value="WEB_CRAWLER">Web Crawler</SelectItem>
-                </SelectContent>
-              </Select>
-              <FormDescription>Integration vendor that will be used.</FormDescription>
+              <FormLabel>Content Source</FormLabel>
+              <FormControl>
+                <Input
+                  placeholder="e.g., WKND"
+                  type="text"
+                  {...field} />
+              </FormControl>
+              <FormDescription>The content path or source location where this rule will be applied.</FormDescription>
               <FormMessage />
             </FormItem>
           )}
         />
-
         <FormField
           control={form.control}
-          name="endpoint"
+          name="attribute"
           render={({ field }) => (
             <FormItem>
-              <FormLabel>Endpoint</FormLabel>
+              <FormLabel>Target Attribute</FormLabel>
               <FormControl>
                 <Input
-                  placeholder="URL"
+                  placeholder="e.g., title"
                   type="text"
                   {...field} />
               </FormControl>
-              <FormDescription>Integration instance hostname will be connected.</FormDescription>
+              <FormDescription>The content attribute or property name used to match against the values below.</FormDescription>
               <FormMessage />
             </FormItem>
           )}
         />
+
+        <FormField
+          control={form.control}
+          name="ruleType"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>Action Type</FormLabel>
+              <Select onValueChange={field.onChange} value={field.value}>
+                <FormControl>
+                  <SelectTrigger>
+                    <SelectValue placeholder="Choose..." />
+                  </SelectTrigger>
+                </FormControl>
+                <SelectContent>
+                  <SelectItem key="IGNORE" value="IGNORE">Ignore</SelectItem>
+                </SelectContent>
+              </Select>
+              <FormDescription>Defines the action to take when content matches this rule. "Ignore" will exclude matching content from indexing.</FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormItem>
+          <FormLabel>Matching Values</FormLabel>
+          <FormDescription>Add the values that the attribute should match. Content with matching attribute values will have the rule applied.</FormDescription>
+          <FormControl>
+            <DynamicIndexingRuleFields
+              fieldName="values"
+              control={control}
+              register={register}
+            />
+          </FormControl>
+        </FormItem>
+
         <Button type="submit">Save</Button>
       </form>
     </Form>
