Merge pull request #151 from decaf-dev/revert-150-add-duplicate-rule

Revert "feat: add duplicate rule button"

src/obsidian/custom-filter-modal.ts → 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,
 		});
 	}

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;
 

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;

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",
 		});

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;
 

src/svelte/custom-filter-app/components/content-filter.svelte → 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

src/svelte/custom-filter-app/components/file-name-filter.svelte → 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

src/svelte/custom-filter-app/components/filter-rule-list.svelte → 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}

src/svelte/custom-filter-app/components/filter-rule.svelte → 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>

src/svelte/custom-filter-app/components/folder-filter.svelte → 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

src/svelte/custom-filter-app/components/group-edit-view.svelte → src/svelte/properties-filter-app/components/group-edit-view.svelte

@@ -3,15 +3,15 @@
 	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";
 	import { createPropertyFilter } from "../utils";
 	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

src/svelte/custom-filter-app/components/group-list.svelte → 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;

src/svelte/custom-filter-app/components/property-filter.svelte → 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