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 @@
@@ -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 @@
handleToggle()} />
handleDeleteClick()}
/>
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 @@