Add rule type to table

guardian · Nov 5, 2024 · 8456b2e · 8456b2e
1 parent 6f475da
commit 8456b2e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/apps/rule-manager/client/src/ts/components/RuleContent.tsx b/apps/rule-manager/client/src/ts/components/RuleContent.tsx
@@ -33,13 +33,17 @@ export const ruleTypeOptions: RuleTypeOption[] = [
 		id: 'regex',
 		label: 'Regex',
 	},
+	{
+		id: 'dictionary',
+		label: 'Dictionary',
+	},
 	{
 		id: 'languageToolXML',
 		label: 'LanguageTool',
 	},
 	{
-		id: 'dictionary',
-		label: 'Dictionary',
+		id: 'languageToolCore',
+		label: 'LT built-in',
 	},
 ];
 

diff --git a/apps/rule-manager/client/src/ts/components/hooks/useRule.ts b/apps/rule-manager/client/src/ts/components/hooks/useRule.ts
@@ -26,6 +26,7 @@ export type BaseRule = {
 	updatedBy: string;
 	updatedAt: string;
 	id?: number;
+	externalId?: string;
 	isArchived: boolean;
 	isPublished: boolean;
 	hasUnpublishedChanges: boolean;

diff --git a/apps/rule-manager/client/src/ts/components/table/PaginatedRulesTable.tsx b/apps/rule-manager/client/src/ts/components/table/PaginatedRulesTable.tsx
@@ -26,6 +26,7 @@ import { TagsContext } from '../context/tags';
 import { EuiDataGridToolBarVisibilityOptions } from '@elastic/eui/src/components/datagrid/data_grid_types';
 import { useEuiFontSize } from '@elastic/eui/src/global_styling/mixins/_typography';
 import { useNavigate } from 'react-router-dom';
+import { ruleTypeOptions } from '../RuleContent';
 
 type EditRuleButtonProps = {
 	editIsEnabled: boolean;
@@ -121,6 +122,12 @@ const TestRule = ({
 };
 
 const columns: EuiDataGridColumn[] = [
+	{
+		id: 'ruleType',
+		display: 'Rule type',
+		isSortable: true,
+		initialWidth: 120,
+	},
 	{
 		id: 'description',
 		display: 'Description',
@@ -338,7 +345,15 @@ export const PaginatedRulesTable = ({
 				if (!rule || isLoading) {
 					return <EuiSkeletonText />;
 				}
-				return getRuleAtRowIndex(rowIndex)[columnId as keyof BaseRule] || '';
+
+				const value =
+					getRuleAtRowIndex(rowIndex)[columnId as keyof BaseRule] || '';
+
+				if (columnId === 'ruleType') {
+					return ruleTypeOptions.find(({ id }) => id === value)?.label ?? '';
+				}
+
+				return value;
 			},
 		[ruleData, isLoading],
 	);