From 5f29ce9d97421022a43df7a11a931f5362f63de4 Mon Sep 17 00:00:00 2001
From: DecafDev <40307803+decaf-dev@users.noreply.github.com>
Date: Sat, 6 Jul 2024 12:40:43 -0600
Subject: [PATCH] Revert "feat: add duplicate rule button (#150)"

This reverts commit 81f57c13c9bf0bf7e0390c20530c7a38be3d3aa7.
---
 ...er-modal.ts => properties-filter-modal.ts} | 12 ++-
 .../app/components/custom-filter.svelte       |  6 +-
 .../app/components/group-tag-list.svelte      |  4 +-
 src/svelte/app/index.svelte                   | 26 ++---
 .../filters/custom/filter-by-groups.ts        | 10 +-
 .../components/content-filter.svelte          |  1 -
 .../components/display-name-utils.ts          |  0
 .../components/file-name-filter.svelte        |  1 -
 .../components/filter-rule-list.svelte        |  8 +-
 .../components/filter-rule.svelte             | 28 +-----
 .../components/folder-filter.svelte           |  1 -
 .../components/group-edit-view.svelte         |  5 +-
 .../components/group-list-item.svelte         |  0
 .../components/group-list.svelte              |  6 +-
 .../components/property-filter.svelte         |  1 -
 .../index.svelte                              | 96 ++++---------------
 .../utils.ts                                  |  0
 src/types/index.ts                            |  9 +-
 18 files changed, 60 insertions(+), 154 deletions(-)
 rename src/obsidian/{custom-filter-modal.ts => properties-filter-modal.ts} (57%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/content-filter.svelte (98%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/display-name-utils.ts (100%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/file-name-filter.svelte (97%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/filter-rule-list.svelte (91%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/filter-rule.svelte (87%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/folder-filter.svelte (99%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/group-edit-view.svelte (94%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/group-list-item.svelte (100%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/group-list.svelte (93%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/components/property-filter.svelte (99%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/index.svelte (84%)
 rename src/svelte/{custom-filter-app => properties-filter-app}/utils.ts (100%)

diff --git a/src/obsidian/custom-filter-modal.ts b/src/obsidian/properties-filter-modal.ts
similarity index 57%
rename from src/obsidian/custom-filter-modal.ts
rename to src/obsidian/properties-filter-modal.ts
index aecfaceb..8930802c 100644
--- a/src/obsidian/custom-filter-modal.ts
+++ b/src/obsidian/properties-filter-modal.ts
@@ -1,12 +1,14 @@
 import { Modal } from "obsidian";
-import CustomFilterApp from "../svelte/custom-filter-app/index.svelte";
+import PropertiesFilterApp from "../svelte/properties-filter-app/index.svelte";
 import VaultExplorerPlugin from "src/main";
 
-export default class CustomFilterModal extends Modal {
-	component: CustomFilterApp | null;
+export default class PropertiesFilterModal extends Modal {
+	component: PropertiesFilterApp | null;
 	plugin: VaultExplorerPlugin;
 
-	constructor(plugin: VaultExplorerPlugin) {
+	constructor(
+		plugin: VaultExplorerPlugin,
+	) {
 		super(plugin.app);
 		this.plugin = plugin;
 		this.component = null;
@@ -15,7 +17,7 @@ export default class CustomFilterModal extends Modal {
 	onOpen(): void {
 		const { contentEl } = this;
 
-		this.component = new CustomFilterApp({
+		this.component = new PropertiesFilterApp({
 			target: contentEl,
 		});
 	}
diff --git a/src/svelte/app/components/custom-filter.svelte b/src/svelte/app/components/custom-filter.svelte
index 9268f471..0538948a 100644
--- a/src/svelte/app/components/custom-filter.svelte
+++ b/src/svelte/app/components/custom-filter.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
 	import VaultExplorerPlugin from "src/main";
-	import PropertiesFilterModal from "src/obsidian/custom-filter-modal";
+	import PropertiesFilterModal from "src/obsidian/properties-filter-modal";
 	import IconButton from "src/svelte/shared/components/icon-button.svelte";
 	import Stack from "src/svelte/shared/components/stack.svelte";
 	import store from "src/svelte/shared/services/store";
-	import { TFilterGroup } from "src/types";
+	import { FilterGroup } from "src/types";
 	import GroupTagList from "./group-tag-list.svelte";
 
-	export let groups: TFilterGroup[] = [];
+	export let groups: FilterGroup[] = [];
 
 	let plugin: VaultExplorerPlugin;
 
diff --git a/src/svelte/app/components/group-tag-list.svelte b/src/svelte/app/components/group-tag-list.svelte
index 64b33e78..539bf0dd 100644
--- a/src/svelte/app/components/group-tag-list.svelte
+++ b/src/svelte/app/components/group-tag-list.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { TFilterGroup } from "src/types";
+	import { FilterGroup } from "src/types";
 	import GroupTag from "./group-tag.svelte";
 	import Stack from "src/svelte/shared/components/stack.svelte";
 	import ScrollButton from "src/svelte/shared/components/scroll-button.svelte";
@@ -9,7 +9,7 @@
 	import VaultExplorerPlugin from "src/main";
 	import EventManager from "src/event/event-manager";
 
-	export let groups: TFilterGroup[] = [];
+	export let groups: FilterGroup[] = [];
 	let plugin: VaultExplorerPlugin;
 	let tagContainerRef: HTMLDivElement | null;
 	let enableScrollButtons = false;
diff --git a/src/svelte/app/index.svelte b/src/svelte/app/index.svelte
index 78c7b710..5e4f6561 100644
--- a/src/svelte/app/index.svelte
+++ b/src/svelte/app/index.svelte
@@ -170,7 +170,7 @@
 	onMount(() => {
 		function handleFilterToggleSettingChange() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleFilterToggleSettingChange",
 				message: "called",
 			});
@@ -198,7 +198,7 @@
 	onMount(() => {
 		function handleClockUpdatesSettingChange() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleClockUpdatesSettingChange",
 				message: "called",
 			});
@@ -233,7 +233,7 @@
 	onMount(() => {
 		function handlePropertiesFilterUpdate() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handlePropertiesFilterUpdate",
 				message: "called",
 			});
@@ -255,7 +255,7 @@
 	onMount(() => {
 		const handleCreateFile = (...data: unknown[]) => {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleCreateFile",
 				message: "called",
 			});
@@ -277,7 +277,7 @@
 	onMount(() => {
 		const handleDeleteFile = (...data: unknown[]) => {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleDeleteFile",
 				message: "called",
 			});
@@ -301,7 +301,7 @@
 	onMount(() => {
 		const handleFileRename = (...data: unknown[]) => {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleFileRename",
 				message: "called",
 			});
@@ -331,7 +331,7 @@
 	onMount(() => {
 		const handleFileModify = async (...data: unknown[]) => {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleFileModify",
 				message: "called",
 			});
@@ -352,7 +352,7 @@
 	onMount(() => {
 		const handleMetadataChange = (...data: unknown[]) => {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleMetadataChange",
 				message: "called",
 			});
@@ -374,7 +374,7 @@
 	onMount(() => {
 		function handleViewToggleSettingChange() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handleViewToggleSettingChange",
 				message: "called",
 			});
@@ -398,7 +398,7 @@
 	onMount(() => {
 		function handlePageSizeSettingChange() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handlePageSizeSettingChange",
 				message: "called",
 			});
@@ -421,7 +421,7 @@
 	onMount(() => {
 		function handlePropertySettingChange() {
 			Logger.trace({
-				fileName: "app/index.svelte",
+				fileName: "app/index.ts",
 				functionName: "handlePropertySettingChange",
 				message: "called",
 			});
@@ -454,7 +454,7 @@
 
 	function updateTimeValues() {
 		Logger.trace({
-			fileName: "app/index.svelte",
+			fileName: "app/index.ts",
 			functionName: "updateTimeValues",
 			message: "called",
 		});
@@ -470,7 +470,7 @@
 
 	function updateFrontmatterCacheTime() {
 		Logger.trace({
-			fileName: "app/index.svelte",
+			fileName: "app/index.ts",
 			functionName: "updateFrontmatterCacheTime",
 			message: "called",
 		});
diff --git a/src/svelte/app/services/filters/custom/filter-by-groups.ts b/src/svelte/app/services/filters/custom/filter-by-groups.ts
index 1c845fcf..b0201de1 100644
--- a/src/svelte/app/services/filters/custom/filter-by-groups.ts
+++ b/src/svelte/app/services/filters/custom/filter-by-groups.ts
@@ -1,7 +1,7 @@
 import { FrontMatterCache } from "obsidian";
 import {
-	TFilterRule,
-	TFilterGroup,
+	FilterRule,
+	FilterGroup,
 	DatePropertyFilterValue,
 	PropertyFilterRule,
 	FilterRuleType,
@@ -29,7 +29,7 @@ export const filterByGroups = (
 	filePath: string,
 	fileFrontmatter: FrontMatterCache | undefined,
 	fileContent: string | null,
-	groups: TFilterGroup[]
+	groups: FilterGroup[]
 ) => {
 	return groups.every((group) => {
 		if (!group.isEnabled) return true;
@@ -48,7 +48,7 @@ const filterByGroup = (
 	filePath: string,
 	fileFrontmatter: FrontMatterCache | undefined,
 	fileContent: string | null,
-	group: TFilterGroup
+	group: FilterGroup
 ) => {
 	let result: boolean | null = null;
 
@@ -81,7 +81,7 @@ const filterByRule = (
 	filePath: string,
 	frontmatter: FrontMatterCache | undefined,
 	fileContent: string | null,
-	filter: TFilterRule
+	filter: FilterRule
 ) => {
 	const { type } = filter;
 
diff --git a/src/svelte/custom-filter-app/components/content-filter.svelte b/src/svelte/properties-filter-app/components/content-filter.svelte
similarity index 98%
rename from src/svelte/custom-filter-app/components/content-filter.svelte
rename to src/svelte/properties-filter-app/components/content-filter.svelte
index 134d2908..9a9c3019 100644
--- a/src/svelte/custom-filter-app/components/content-filter.svelte
+++ b/src/svelte/properties-filter-app/components/content-filter.svelte
@@ -44,7 +44,6 @@
 	{condition}
 	{isEnabled}
 	on:ruleDeleteClick
-	on:ruleDuplicateClick
 	on:ruleTypeChange
 	on:ruleConditionChange
 	on:ruleOperatorChange
diff --git a/src/svelte/custom-filter-app/components/display-name-utils.ts b/src/svelte/properties-filter-app/components/display-name-utils.ts
similarity index 100%
rename from src/svelte/custom-filter-app/components/display-name-utils.ts
rename to src/svelte/properties-filter-app/components/display-name-utils.ts
diff --git a/src/svelte/custom-filter-app/components/file-name-filter.svelte b/src/svelte/properties-filter-app/components/file-name-filter.svelte
similarity index 97%
rename from src/svelte/custom-filter-app/components/file-name-filter.svelte
rename to src/svelte/properties-filter-app/components/file-name-filter.svelte
index 8f07aeda..f4fc7fda 100644
--- a/src/svelte/custom-filter-app/components/file-name-filter.svelte
+++ b/src/svelte/properties-filter-app/components/file-name-filter.svelte
@@ -28,7 +28,6 @@
 	{condition}
 	{isEnabled}
 	on:ruleDeleteClick
-	on:ruleDuplicateClick
 	on:ruleTypeChange
 	on:ruleConditionChange
 	on:ruleOperatorChange
diff --git a/src/svelte/custom-filter-app/components/filter-rule-list.svelte b/src/svelte/properties-filter-app/components/filter-rule-list.svelte
similarity index 91%
rename from src/svelte/custom-filter-app/components/filter-rule-list.svelte
rename to src/svelte/properties-filter-app/components/filter-rule-list.svelte
index ddfb6865..fc28f0a2 100644
--- a/src/svelte/custom-filter-app/components/filter-rule-list.svelte
+++ b/src/svelte/properties-filter-app/components/filter-rule-list.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 	import Stack from "src/svelte/shared/components/stack.svelte";
 	import PropertyFilter from "./property-filter.svelte";
-	import { TFilterRule, FilterRuleType, PropertyType } from "src/types";
+	import { FilterRule, FilterRuleType, PropertyType } from "src/types";
 	import ContentFilter from "./content-filter.svelte";
 	import FolderFilter from "./folder-filter.svelte";
 	import FileNameFilter from "./file-name-filter.svelte";
 
-	export let rules: TFilterRule[] = [];
+	export let rules: FilterRule[] = [];
 </script>
 
 <Stack direction="column" spacing="md" width="100%">
@@ -32,7 +32,6 @@
 				on:ruleValueChange
 				on:ruleToggle
 				on:ruleDeleteClick
-				on:ruleDuplicateClick
 				on:propertyNameChange
 				on:propertyTypeChange
 				on:propertyValueDataChange
@@ -54,7 +53,6 @@
 				on:ruleOperatorChange
 				on:ruleValueChange
 				on:ruleToggle
-				on:ruleDuplicateClick
 				on:ruleDeleteClick
 			/>
 		{/if}
@@ -74,7 +72,6 @@
 				on:ruleOperatorChange
 				on:ruleValueChange
 				on:ruleToggle
-				on:ruleDuplicateClick
 				on:ruleDeleteClick
 				on:folderSubfoldersToggle
 			/>
@@ -94,7 +91,6 @@
 				on:ruleOperatorChange
 				on:ruleValueChange
 				on:ruleToggle
-				on:ruleDuplicateClick
 				on:ruleDeleteClick
 			/>
 		{/if}
diff --git a/src/svelte/custom-filter-app/components/filter-rule.svelte b/src/svelte/properties-filter-app/components/filter-rule.svelte
similarity index 87%
rename from src/svelte/custom-filter-app/components/filter-rule.svelte
rename to src/svelte/properties-filter-app/components/filter-rule.svelte
index 435c3b9c..7856c871 100644
--- a/src/svelte/custom-filter-app/components/filter-rule.svelte
+++ b/src/svelte/properties-filter-app/components/filter-rule.svelte
@@ -23,7 +23,6 @@
 	import { createEventDispatcher } from "svelte";
 	import Wrap from "src/svelte/shared/components/wrap.svelte";
 	import License from "src/svelte/shared/services/license";
-	import { Menu } from "obsidian";
 
 	export let index: number;
 	export let id: string;
@@ -43,27 +42,6 @@
 			enablePremiumFeatures = isRegistered;
 		});
 
-	function handleActionsClick(e: CustomEvent) {
-		const nativeEvent = e.detail.nativeEvent as MouseEvent;
-
-		const menu = new Menu();
-		menu.setUseNativeMenu(true);
-
-		menu.addItem((item) => {
-			item.setTitle("Duplicate");
-			item.onClick(() => handleDuplicateClick());
-		});
-		menu.addItem((item) => {
-			item.setTitle("Delete");
-			item.onClick(() => handleDeleteClick());
-		});
-		menu.showAtMouseEvent(nativeEvent);
-	}
-
-	function handleDuplicateClick() {
-		dispatch("ruleDuplicateClick", { id });
-	}
-
 	function handleDeleteClick() {
 		dispatch("ruleDeleteClick", { id });
 	}
@@ -156,9 +134,9 @@
 		<Stack spacing="sm" align="center">
 			<Switch value={isEnabled} on:change={() => handleToggle()} />
 			<IconButton
-				ariaLabel="Rule actions"
-				iconId="ellipsis-vertical"
-				on:click={handleActionsClick}
+				ariaLabel="Delete filter rule"
+				iconId="trash"
+				on:click={() => handleDeleteClick()}
 			/>
 			<slot name="after-toggle"></slot>
 		</Stack>
diff --git a/src/svelte/custom-filter-app/components/folder-filter.svelte b/src/svelte/properties-filter-app/components/folder-filter.svelte
similarity index 99%
rename from src/svelte/custom-filter-app/components/folder-filter.svelte
rename to src/svelte/properties-filter-app/components/folder-filter.svelte
index 2782c2fa..eba07fc8 100644
--- a/src/svelte/custom-filter-app/components/folder-filter.svelte
+++ b/src/svelte/properties-filter-app/components/folder-filter.svelte
@@ -108,7 +108,6 @@
 	{condition}
 	{isEnabled}
 	on:ruleDeleteClick
-	on:ruleDuplicateClick
 	on:ruleTypeChange
 	on:ruleConditionChange
 	on:ruleOperatorChange
diff --git a/src/svelte/custom-filter-app/components/group-edit-view.svelte b/src/svelte/properties-filter-app/components/group-edit-view.svelte
similarity index 94%
rename from src/svelte/custom-filter-app/components/group-edit-view.svelte
rename to src/svelte/properties-filter-app/components/group-edit-view.svelte
index 4ad05e2a..c2604748 100644
--- a/src/svelte/custom-filter-app/components/group-edit-view.svelte
+++ b/src/svelte/properties-filter-app/components/group-edit-view.svelte
@@ -3,7 +3,7 @@
 	import IconButton from "src/svelte/shared/components/icon-button.svelte";
 	import Stack from "src/svelte/shared/components/stack.svelte";
 
-	import { TFilterGroup } from "src/types";
+	import { FilterGroup } from "src/types";
 	import FilterRuleList from "./filter-rule-list.svelte";
 
 	import { createEventDispatcher } from "svelte";
@@ -11,7 +11,7 @@
 	import Spacer from "src/svelte/shared/components/spacer.svelte";
 	const dispatch = createEventDispatcher();
 
-	export let selectedGroup: TFilterGroup;
+	export let selectedGroup: FilterGroup;
 
 	function handleFilterAddClick() {
 		const newFilter = createPropertyFilter();
@@ -44,7 +44,6 @@
 				on:ruleValueChange
 				on:ruleToggle
 				on:ruleDeleteClick
-				on:ruleDuplicateClick
 				on:propertyTypeChange
 				on:propertyNameChange
 				on:propertyMatchWhenPropertyDNEChange
diff --git a/src/svelte/custom-filter-app/components/group-list-item.svelte b/src/svelte/properties-filter-app/components/group-list-item.svelte
similarity index 100%
rename from src/svelte/custom-filter-app/components/group-list-item.svelte
rename to src/svelte/properties-filter-app/components/group-list-item.svelte
diff --git a/src/svelte/custom-filter-app/components/group-list.svelte b/src/svelte/properties-filter-app/components/group-list.svelte
similarity index 93%
rename from src/svelte/custom-filter-app/components/group-list.svelte
rename to src/svelte/properties-filter-app/components/group-list.svelte
index 601bd44c..0deab38e 100644
--- a/src/svelte/custom-filter-app/components/group-list.svelte
+++ b/src/svelte/properties-filter-app/components/group-list.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 	import IconButton from "src/svelte/shared/components/icon-button.svelte";
 	import Stack from "src/svelte/shared/components/stack.svelte";
-	import { TFilterGroup } from "src/types";
+	import { FilterGroup } from "src/types";
 
-	export let groups: TFilterGroup[];
-	export let selectedGroup: TFilterGroup | undefined;
+	export let groups: FilterGroup[];
+	export let selectedGroup: FilterGroup | undefined;
 
 	let listContainerRef: HTMLDivElement | null;
 	let previousLength = 0;
diff --git a/src/svelte/custom-filter-app/components/property-filter.svelte b/src/svelte/properties-filter-app/components/property-filter.svelte
similarity index 99%
rename from src/svelte/custom-filter-app/components/property-filter.svelte
rename to src/svelte/properties-filter-app/components/property-filter.svelte
index 265b691f..4ff7a818 100644
--- a/src/svelte/custom-filter-app/components/property-filter.svelte
+++ b/src/svelte/properties-filter-app/components/property-filter.svelte
@@ -89,7 +89,6 @@
 	{condition}
 	{isEnabled}
 	on:ruleDeleteClick
-	on:ruleDuplicateClick
 	on:ruleTypeChange
 	on:ruleConditionChange
 	on:ruleOperatorChange
diff --git a/src/svelte/custom-filter-app/index.svelte b/src/svelte/properties-filter-app/index.svelte
similarity index 84%
rename from src/svelte/custom-filter-app/index.svelte
rename to src/svelte/properties-filter-app/index.svelte
index 2c48aa08..fbb65da4 100644
--- a/src/svelte/custom-filter-app/index.svelte
+++ b/src/svelte/properties-filter-app/index.svelte
@@ -8,6 +8,7 @@
 		DateFilterCondition,
 		ListFilterCondition,
 		NumberFilterCondition,
+		FilterGroup,
 		TextFilterCondition,
 		DatePropertyFilterValue,
 		PropertyType,
@@ -15,8 +16,6 @@
 		ContentFilterCondition,
 		FolderFilterCondition,
 		FileNameFilterCondition,
-		TFilterRule,
-		TFilterGroup,
 	} from "src/types";
 	import { generateRandomId } from "../shared/services/random";
 	import GroupEditView from "./components/group-edit-view.svelte";
@@ -24,10 +23,9 @@
 	import GroupList from "./components/group-list.svelte";
 	import Flex from "../shared/components/flex.svelte";
 	import Divider from "../shared/components/divider.svelte";
-	import Logger from "js-logger";
 
 	let selectedGroupId: string = "";
-	let groups: TFilterGroup[] = [];
+	let groups: FilterGroup[] = [];
 	let plugin: VaultExplorerPlugin;
 
 	$: selectedGroup = groups.find((group) => group.id === selectedGroupId);
@@ -59,7 +57,7 @@
 	}
 
 	function handleGroupAddClick() {
-		const newGroup: TFilterGroup = {
+		const newGroup: FilterGroup = {
 			id: generateRandomId(),
 			name: `Group ${groups.length + 1}`,
 			rules: [createPropertyFilter()],
@@ -116,7 +114,7 @@
 	function handleRuleConditionChange(e: CustomEvent) {
 		const { id, condition } = e.detail;
 
-		const newGroups: TFilterGroup[] = groups.map((group) =>
+		const newGroups = groups.map((group) =>
 			group.id === selectedGroupId
 				? {
 						...group,
@@ -168,77 +166,16 @@
 
 	function handleRuleDeleteClick(e: CustomEvent) {
 		const { id } = e.detail;
-		Logger.trace({
-			fileName: "custom-filter-app/index.svelte",
-			functionName: "handleRuleDeleteClick",
-			message: "called",
-		});
-		Logger.debug(
-			{
-				fileName: "custom-filter-app/index.svelte",
-				functionName: "handleRuleDeleteClick",
-				message: "deleting rule",
-			},
-			{ id },
-		);
-
-		const newGroups: TFilterGroup[] = groups.map((group) => {
-			if (group.id === selectedGroupId) {
-				const newRules: TFilterRule[] = group.rules.filter(
-					(rule) => rule.id !== id,
-				);
-				return {
-					...group,
-					rules: newRules,
-				};
-			}
-			return group;
-		});
-
-		groups = newGroups;
-	}
-
-	function handleRuleDuplicateClick(e: CustomEvent) {
-		const { id } = e.detail;
 
-		Logger.trace({
-			fileName: "custom-filter-app/index.svelte",
-			functionName: "handleRuleDuplicateClick",
-			message: "called",
-		});
-		Logger.debug(
-			{
-				fileName: "custom-filter-app/index.svelte",
-				functionName: "handleRuleDuplicateClick",
-				message: "duplicating rule",
-			},
-			{ id },
+		const newGroups = groups.map((group) =>
+			group.id === selectedGroupId
+				? {
+						...group,
+						rules: group.rules.filter((rule) => rule.id !== id),
+					}
+				: group,
 		);
 
-		const newGroups: TFilterGroup[] = groups.map((group) => {
-			if (group.id === selectedGroupId) {
-				const rule = group.rules.find((rule) => rule.id === id);
-				if (!rule) {
-					throw new Error(`Rule with id ${id} not found`);
-				}
-
-				const newRules: TFilterRule[] = [
-					...group.rules,
-					{
-						...rule,
-						id: generateRandomId(),
-					},
-				];
-
-				return {
-					...group,
-					rules: newRules,
-				};
-			}
-
-			return group;
-		});
-
 		groups = newGroups;
 	}
 
@@ -313,7 +250,7 @@
 			throw new Error(`Unhandled filter type: ${type}`);
 		}
 
-		const newGroups: TFilterGroup[] = groups.map((group) => {
+		const newGroups: FilterGroup[] = groups.map((group) => {
 			if (group.id === selectedGroupId) {
 				const newRules = group.rules.map((rule) => {
 					if (rule.id === id) {
@@ -358,7 +295,7 @@
 			throw new Error(`Unhandled filter type: ${propertyType}`);
 		}
 
-		const newGroups: TFilterGroup[] = groups.map((group) =>
+		const newGroups: FilterGroup[] = groups.map((group) =>
 			group.id === selectedGroupId
 				? {
 						...group,
@@ -388,7 +325,7 @@
 	function handleRuleValueChange(e: CustomEvent) {
 		const { id, value } = e.detail;
 
-		const newGroups: TFilterGroup[] = groups.map((group) => {
+		const newGroups: FilterGroup[] = groups.map((group) => {
 			const { rules } = group;
 			if (group.id === selectedGroupId) {
 				const newRules = rules.map((rule) => {
@@ -438,7 +375,7 @@
 	function handleFolderSubfoldersToggle(e: CustomEvent) {
 		const { id, includeSubfolders } = e.detail;
 
-		const newGroups: TFilterGroup[] = groups.map((group) =>
+		const newGroups: FilterGroup[] = groups.map((group) =>
 			group.id === selectedGroupId
 				? {
 						...group,
@@ -461,7 +398,7 @@
 	function handlePropertyMatchWhenPropertyDNEChange(e: CustomEvent) {
 		const { id, matchWhenDNE } = e.detail;
 
-		const newGroups: TFilterGroup[] = groups.map((group) =>
+		const newGroups: FilterGroup[] = groups.map((group) =>
 			group.id === selectedGroupId
 				? {
 						...group,
@@ -501,7 +438,6 @@
 				on:ruleAddClick={handleRuleAddClick}
 				on:ruleConditionChange={handleRuleConditionChange}
 				on:ruleDeleteClick={handleRuleDeleteClick}
-				on:ruleDuplicateClick={handleRuleDuplicateClick}
 				on:ruleValueChange={handleRuleValueChange}
 				on:ruleOperatorChange={handleRuleOperatorChange}
 				on:ruleToggle={handleRuleToggle}
diff --git a/src/svelte/custom-filter-app/utils.ts b/src/svelte/properties-filter-app/utils.ts
similarity index 100%
rename from src/svelte/custom-filter-app/utils.ts
rename to src/svelte/properties-filter-app/utils.ts
diff --git a/src/types/index.ts b/src/types/index.ts
index b4856da0..f4a8b086 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -75,7 +75,7 @@ export interface TTimestampFilter extends BaseFilter {
 
 export interface TCustomFilter extends BaseFilter {
 	selectedGroupId: string;
-	groups: TFilterGroup[];
+	groups: FilterGroup[];
 }
 
 export type TimestampFilterOption =
@@ -277,12 +277,11 @@ export interface ContentFilterRule extends BaseFilterRule {
 	condition: ContentFilterCondition;
 }
 
-export type TFilterRule =
+export type FilterRule =
 	| PropertyFilterRule
 	| FolderFilterRule
 	| FileNameFilterRule
 	| ContentFilterRule;
-
 export type PropertyFilterRule =
 	| TextPropertyFilterRule
 	| NumberPropertyFilterRule
@@ -290,10 +289,10 @@ export type PropertyFilterRule =
 	| CheckboxPropertyFilterRule
 	| DatePropertyFilterRule;
 
-export interface TFilterGroup {
+export interface FilterGroup {
 	id: string;
 	name: string;
-	rules: TFilterRule[];
+	rules: FilterRule[];
 	isEnabled: boolean;
 	isSticky: boolean;
 }