diff --git a/src/svelte/app/components/list-item.svelte b/src/svelte/app/components/list-item.svelte
index a41d9a3..2a8ede5 100644
--- a/src/svelte/app/components/list-item.svelte
+++ b/src/svelte/app/components/list-item.svelte
@@ -18,7 +18,6 @@
export let extension: string;
export let path: string;
export let tags: string[] | null;
- export let isFavorite: boolean | null;
export let showTags: boolean;
export let isSmallScreenSize: boolean;
@@ -82,10 +81,7 @@
function handleItemContextMenu(e: Event) {
const nativeEvent = e as MouseEvent;
- openContextMenu(plugin, path, nativeEvent, {
- isFavorite,
- onFavoriteChange: handleFavoriteChange,
- });
+ openContextMenu(plugin, path, nativeEvent, {});
}
function handleItemMouseOver(e: MouseEvent) {
diff --git a/src/svelte/app/components/list-view.svelte b/src/svelte/app/components/list-view.svelte
index bed9ee5..27a0e4d 100644
--- a/src/svelte/app/components/list-view.svelte
+++ b/src/svelte/app/components/list-view.svelte
@@ -33,7 +33,6 @@
{isSmallScreenSize}
path={fileRenderData.path}
tags={fileRenderData.tags}
- isFavorite={fileRenderData.isFavorite}
on:favoritePropertyChange
/>
{/each}
diff --git a/src/svelte/app/components/table-view.svelte b/src/svelte/app/components/table-view.svelte
index 739063a..ea698cc 100644
--- a/src/svelte/app/components/table-view.svelte
+++ b/src/svelte/app/components/table-view.svelte
@@ -42,11 +42,6 @@
key: "tags",
label: "Tags",
},
- {
- key: "isFavorite",
- label: "Favorite",
- format: (value: unknown) => (value === true ? "Yes" : "No"),
- },
{
key: "createdMillis",
label: "Created",
@@ -85,10 +80,6 @@
};
});
- function handleFavoriteChange(filePath: string, value: boolean) {
- dispatch("favoritePropertyChange", { filePath, value });
- }
-
function handleRowClick(path: string) {
if (plugin === null) return;
@@ -108,18 +99,11 @@
});
}
- function handleRowContextMenu(
- e: Event,
- path: string,
- isFavorite: boolean | null,
- ) {
+ function handleRowContextMenu(e: Event, path: string) {
if (plugin === null) return;
const nativeEvent = e as MouseEvent;
- openContextMenu(plugin, path, nativeEvent, {
- isFavorite,
- onFavoriteChange: handleFavoriteChange,
- });
+ openContextMenu(plugin, path, nativeEvent, {});
}
function getValue(item: FileRenderData, column: TColumn): unknown {
@@ -171,11 +155,7 @@
}}
on:focus={() => {}}
on:contextmenu={(e) =>
- handleRowContextMenu(
- e,
- filteredItem.path,
- filteredItem.isFavorite,
- )}
+ handleRowContextMenu(e, filteredItem.path)}
on:mouseover={(e) =>
handleRowMouseOver(e, filteredItem.path)}
>
diff --git a/src/svelte/app/index.svelte b/src/svelte/app/index.svelte
index 36a8bfe..1f31c75 100644
--- a/src/svelte/app/index.svelte
+++ b/src/svelte/app/index.svelte
@@ -4,13 +4,11 @@
// ============================================
import Stack from "../shared/components/stack.svelte";
import Flex from "../shared/components/flex.svelte";
- import FavoritesFilter from "./components/favorites-filter.svelte";
import TabList from "../shared/components/tab-list.svelte";
import Tab from "../shared/components/tab.svelte";
import { Notice, TFile } from "obsidian";
import {
TCustomFilter,
- TFavoritesFilter,
TSearchFilter,
TSortFilter,
TTimestampFilter,
@@ -21,7 +19,6 @@
import VaultExplorerPlugin from "src/main";
import GridView from "./components/grid-view.svelte";
import ListView from "./components/list-view.svelte";
- import { filterByFavorites } from "./services/filters/favorite-filter";
import { filterBySearch } from "./services/filters/search-filter";
import { filterByTimestamp } from "./services/filters/timestamp-filter";
import { filterByGroups } from "./services/filters/custom/filter-by-groups";
@@ -82,10 +79,6 @@
isEnabled: true,
value: "",
};
- let favoritesFilter: TFavoritesFilter = {
- isEnabled: false,
- value: false,
- };
let timestampFilter: TTimestampFilter = {
isEnabled: true,
value: "all",
@@ -146,7 +139,6 @@
shouldCollapseFilters = settings.shouldCollapseFilters;
pageSize = settings.pageSize;
searchFilter = settings.filters.search;
- favoritesFilter = settings.filters.favorites;
sortFilter = settings.filters.sort;
timestampFilter = settings.filters.timestamp;
currentView = settings.currentView;
@@ -171,7 +163,6 @@
});
searchFilter = plugin.settings.filters.search;
- favoritesFilter = plugin.settings.filters.favorites;
sortFilter = plugin.settings.filters.sort;
timestampFilter = plugin.settings.filters.timestamp;
customFilter = plugin.settings.filters.custom;
@@ -579,10 +570,6 @@
searchFilter.value = e.target.value;
}, DEBOUNCE_INPUT_TIME);
- const debounceFavoriteFilterChange = _.debounce((value) => {
- favoritesFilter.value = value;
- }, DEBOUNCE_INPUT_TIME);
-
function handleReshuffleClick() {
randomFileSortStore.load(plugin.app);
}
@@ -620,7 +607,6 @@
plugin.settings.filters.search = searchFilter;
plugin.settings.filters.sort = sortFilter;
plugin.settings.filters.timestamp = timestampFilter;
- plugin.settings.filters.favorites = favoritesFilter;
plugin.settings.currentView = currentView;
plugin.settings.filters.custom = customFilter;
plugin.settings.viewOrder = viewOrder;
@@ -778,12 +764,6 @@
sortFilter.value = value;
}
- function handleFavoritesChange(e: CustomEvent) {
- const nativeEvent = e.detail.nativeEvent;
- const value = (nativeEvent.target as HTMLInputElement).checked;
- debounceFavoriteFilterChange(value);
- }
-
function handleCoverImageFitChange(e: CustomEvent) {
const { filePath, value } = e.detail as {
filePath: string;
@@ -895,7 +875,6 @@
) {
formatted = filteredCustom.map((loadedFile) => {
const { id, file } = loadedFile;
- const isFavorite = favoritesCache.get(file.path) ?? null;
const content = contentCache.get(file.path) ?? null;
return formatFileDataForRender({
@@ -904,7 +883,6 @@
fileId: id,
file,
fileContent: content,
- fileFavorite: isFavorite,
});
});
}
@@ -917,15 +895,7 @@
return true;
});
- $: filteredFavorites = filteredSearch.filter((file) => {
- const { isEnabled, value } = favoritesFilter;
- if (isEnabled) {
- return filterByFavorites(file, value);
- }
- return true;
- });
-
- $: filteredTimestamp = filteredFavorites.filter((file) => {
+ $: filteredTimestamp = filteredSearch.filter((file) => {
const { modifiedMillis, createdMillis } = file;
return filterByTimestamp({
value: timestampFilter.value,
@@ -967,7 +937,6 @@
$: searchFilter,
sortFilter,
timestampFilter,
- favoritesFilter,
currentView,
customFilter,
viewOrder,
@@ -1003,12 +972,6 @@
- {#if favoritesFilter.isEnabled}
-
- {/if}
{#if timestampFilter.isEnabled}
void;
onCoverImageFitChange?: (
filePath: string,
value: CoverImageFit
@@ -35,16 +31,6 @@ export const openContextMenu = (
item.setTitle("Open in new window");
item.onClick(() => openInNewWindow(plugin, filePath));
});
- menu.addSeparator();
- menu.addItem((item) => {
- item.setTitle(
- isFavorite ? "Remove from favorites" : "Add to favorites"
- );
- item.onClick(() => {
- const newValue = isFavorite !== null ? !isFavorite : true;
- onFavoriteChange(filePath, newValue);
- });
- });
if (coverImageFit !== undefined && onCoverImageFitChange !== undefined) {
menu.addSeparator();
menu.addItem((item) => {
diff --git a/src/svelte/app/services/filters/favorite-filter.ts b/src/svelte/app/services/filters/favorite-filter.ts
deleted file mode 100644
index 4b4673c..0000000
--- a/src/svelte/app/services/filters/favorite-filter.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { FileRenderData } from "../../types";
-
-export const filterByFavorites = (
- file: FileRenderData,
- onlyFavorites: boolean
-) => {
- if (onlyFavorites) {
- return file.isFavorite;
- }
- return true;
-};
diff --git a/src/svelte/app/services/render-data.ts b/src/svelte/app/services/render-data.ts
index f468d08..5833755 100644
--- a/src/svelte/app/services/render-data.ts
+++ b/src/svelte/app/services/render-data.ts
@@ -46,14 +46,12 @@ export const formatFileDataForRender = ({
file,
fileId,
fileContent,
- fileFavorite,
}: {
app: App;
settings: VaultExplorerPluginSettings;
file: TFile;
fileId: string;
fileContent: string | null;
- fileFavorite: boolean | null;
}): FileRenderData => {
const { name, basename, extension, path } = file;
@@ -96,17 +94,6 @@ export const formatFileDataForRender = ({
PropertyType.TEXT
);
- let isFavorite: boolean | null;
- if (fileFavorite === null) {
- isFavorite = loadPropertyValue(
- fileFrontmatter,
- favoriteProp,
- PropertyType.CHECKBOX
- );
- } else {
- isFavorite = fileFavorite;
- }
-
let coverImageFit: CoverImageFit | null = loadPropertyValue(
fileFrontmatter,
coverImageFitProp,
@@ -250,7 +237,6 @@ export const formatFileDataForRender = ({
content: fileContent,
tags,
imageUrl,
- isFavorite,
createdMillis,
modifiedMillis,
custom1,
diff --git a/src/svelte/app/types.ts b/src/svelte/app/types.ts
index b0b16cb..282a464 100644
--- a/src/svelte/app/types.ts
+++ b/src/svelte/app/types.ts
@@ -12,7 +12,6 @@ export interface FileRenderData {
url: string | null;
imageUrl: string | null;
tags: string[] | null;
- isFavorite: boolean | null;
createdMillis: number;
modifiedMillis: number;
custom1: string | null;
diff --git a/src/types/index.guard.ts b/src/types/index.guard.ts
index bb54582..655b2cc 100644
--- a/src/types/index.guard.ts
+++ b/src/types/index.guard.ts
@@ -30,11 +30,6 @@ export function isVaultExplorerPluginSettings(obj: unknown): obj is VaultExplore
typeof typedObj["filters"]["search"] === "function") &&
typeof typedObj["filters"]["search"]["isEnabled"] === "boolean" &&
typeof typedObj["filters"]["search"]["value"] === "string" &&
- (typedObj["filters"]["favorites"] !== null &&
- typeof typedObj["filters"]["favorites"] === "object" ||
- typeof typedObj["filters"]["favorites"] === "function") &&
- typeof typedObj["filters"]["favorites"]["isEnabled"] === "boolean" &&
- typeof typedObj["filters"]["favorites"]["value"] === "boolean" &&
(typedObj["filters"]["sort"] !== null &&
typeof typedObj["filters"]["sort"] === "object" ||
typeof typedObj["filters"]["sort"] === "function") &&
@@ -608,9 +603,7 @@ export function isVaultExplorerPluginSettings(obj: unknown): obj is VaultExplore
typeof e["isEnabled"] === "boolean"
) &&
(typedObj["views"]["grid"]["coverImageFit"] === "cover" ||
- typedObj["views"]["grid"]["coverImageFit"] === "contain" ||
- typedObj["views"]["grid"]["coverImageFit"] === "scale-down" ||
- typedObj["views"]["grid"]["coverImageFit"] === "none") &&
+ typedObj["views"]["grid"]["coverImageFit"] === "contain") &&
typeof typedObj["views"]["grid"]["loadSocialMediaImage"] === "boolean" &&
(typedObj["views"]["list"] !== null &&
typeof typedObj["views"]["list"] === "object" ||
diff --git a/src/types/index.ts b/src/types/index.ts
index 2e0ca16..c55c033 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -13,7 +13,6 @@ export interface VaultExplorerPluginSettings {
};
filters: {
search: TSearchFilter;
- favorites: TFavoritesFilter;
sort: TSortFilter;
timestamp: TTimestampFilter;
custom: TCustomFilter;
@@ -97,10 +96,6 @@ export interface TSearchFilter extends BaseFilter {
value: string;
}
-export interface TFavoritesFilter extends BaseFilter {
- value: boolean;
-}
-
export interface TSortFilter extends BaseFilter {
value: SortFilterOption;
}
diff --git a/src/types/types-1.41.1.ts b/src/types/types-1.41.1.ts
new file mode 100644
index 0000000..83b10ac
--- /dev/null
+++ b/src/types/types-1.41.1.ts
@@ -0,0 +1,332 @@
+export interface VaultExplorerPluginSettings_1_41_1 {
+ properties: {
+ favorite: string;
+ url: string;
+ image: string;
+ coverImageFit: string;
+ createdDate: string;
+ modifiedDate: string;
+ custom1: string;
+ custom2: string;
+ custom3: string;
+ };
+ filters: {
+ search: TSearchFilter;
+ favorites: TFavoritesFilter;
+ sort: TSortFilter;
+ timestamp: TTimestampFilter;
+ custom: TCustomFilter;
+ };
+ views: {
+ dashboard: TDashboardView;
+ grid: TGridView;
+ list: TListView;
+ table: TTableView;
+ feed: TFeedView;
+ recommended: TRecommendedView;
+ related: TRelatedView;
+ };
+ titleWrapping: WordBreak;
+ enableClockUpdates: boolean;
+ enableFileIcons: boolean;
+ loadBodyTags: boolean;
+ currentView: TExplorerView | null;
+ pageSize: number;
+ filterGroupsWidth: string;
+ shouldWrapFilterGroups: boolean;
+ shouldCollapseFilters: boolean;
+ viewOrder: TExplorerView[];
+ configDir: string;
+ pluginVersion: string | null;
+ logLevel: string;
+}
+
+type FileInteractionStyle = "title" | "content";
+
+interface BaseView {
+ isEnabled: boolean;
+}
+
+interface TTableView extends BaseView {}
+
+interface TListView extends BaseView {
+ showTags: boolean;
+}
+
+interface TGridView extends BaseView {
+ coverImageSources: CoverImageSource[];
+ coverImageFit: CoverImageFit;
+ loadSocialMediaImage: boolean;
+}
+
+interface CoverImageSource {
+ type: CoverImageSourceType;
+ isEnabled: boolean;
+}
+
+type CoverImageFit = "cover" | "contain";
+
+type CoverImageSourceType =
+ | "image-property"
+ | "url-property"
+ | "frontmatter"
+ | "body";
+
+interface TDashboardView extends BaseView {}
+
+type CollapseStyle = "no-new-lines" | "no-extra-new-lines";
+
+interface TFeedView extends BaseView {
+ collapseStyle: CollapseStyle;
+ removeH1: boolean;
+ lineClampSmall: number;
+ lineClampMedium: number;
+ lineClampLarge: number;
+}
+
+interface TRecommendedView extends BaseView {}
+
+interface TRelatedView extends BaseView {}
+
+interface BaseFilter {
+ isEnabled: boolean;
+}
+
+interface TSearchFilter extends BaseFilter {
+ value: string;
+}
+
+interface TFavoritesFilter extends BaseFilter {
+ value: boolean;
+}
+
+interface TSortFilter extends BaseFilter {
+ value: SortFilterOption;
+}
+
+interface TTimestampFilter extends BaseFilter {
+ value: TimestampFilterOption;
+}
+
+interface TCustomFilter extends BaseFilter {
+ selectedGroupId: string;
+ groups: TFilterGroup[];
+}
+
+type TimestampFilterOption =
+ | "created-today"
+ | "modified-today"
+ | "created-this-week"
+ | "modified-this-week"
+ | "created-2-weeks"
+ | "modified-2-weeks"
+ | "all";
+
+type SortFilterOption =
+ | "file-name-asc"
+ | "file-name-desc"
+ | "modified-asc"
+ | "modified-desc"
+ | "random";
+
+type WordBreak = "normal" | "break-word";
+
+enum TExplorerView {
+ DASHBOARD = "dashboard",
+ GRID = "grid",
+ LIST = "list",
+ FEED = "feed",
+ TABLE = "table",
+ RECOMMENDED = "recommended",
+ RELATED = "related",
+}
+
+type FilterOperator = "and" | "or";
+
+enum TextFilterCondition {
+ IS = "is",
+ IS_NOT = "is-not",
+ CONTAINS = "contains",
+ DOES_NOT_CONTAIN = "does-not-contain",
+ STARTS_WITH = "starts-with",
+ ENDS_WITH = "ends-with",
+ EXISTS = "exists",
+ DOES_NOT_EXIST = "does-not-exist",
+}
+
+enum ListFilterCondition {
+ CONTAINS = "contains",
+ DOES_NOT_CONTAIN = "does-not-contain",
+ EXISTS = "exists",
+ DOES_NOT_EXIST = "does-not-exist",
+}
+
+enum NumberFilterCondition {
+ IS_EQUAL = "is-equal",
+ IS_NOT_EQUAL = "is-not-equal",
+ IS_GREATER = "is-greater",
+ IS_LESS = "is-less",
+ IS_GREATER_OR_EQUAL = "is-greater-or-equal",
+ IS_LESS_OR_EQUAL = "is-less-or-equal",
+ EXISTS = "exists",
+ DOES_NOT_EXIST = "does-not-exist",
+}
+
+enum CheckboxFilterCondition {
+ IS = "is",
+ IS_NOT = "is-not",
+ EXISTS = "exists",
+ DOES_NOT_EXIST = "does-not-exist",
+}
+
+enum DateFilterCondition {
+ IS = "is",
+ IS_BEFORE = "is-before",
+ IS_AFTER = "is-after",
+ IS_ON_OR_BEFORE = "is-on-or-before",
+ IS_ON_OR_AFTER = "is-on-or-after",
+ EXISTS = "exists",
+ DOES_NOT_EXIST = "does-not-exist",
+}
+
+enum ContentFilterCondition {
+ CONTAINS = "contains",
+ DOES_NOT_CONTAIN = "does-not-contain",
+ IS_EMPTY = "is-empty",
+ IS_NOT_EMPTY = "is-not-empty",
+}
+
+enum FolderFilterCondition {
+ IS = "is",
+ IS_NOT = "is-not",
+}
+
+enum FileNameFilterCondition {
+ IS = "is",
+ IS_NOT = "is-not",
+ CONTAINS = "contains",
+ DOES_NOT_CONTAIN = "does-not-contain",
+ STARTS_WITH = "starts-with",
+ ENDS_WITH = "ends-with",
+}
+
+type FilterCondition =
+ | TextFilterCondition
+ | NumberFilterCondition
+ | DateFilterCondition
+ | CheckboxFilterCondition
+ | ListFilterCondition
+ | ContentFilterCondition
+ | FolderFilterCondition
+ | FileNameFilterCondition;
+
+//This matches the Obsidian property types
+enum PropertyType {
+ TEXT = "text",
+ NUMBER = "number",
+ LIST = "list",
+ CHECKBOX = "checkbox",
+ DATE = "date",
+ DATETIME = "datetime",
+}
+
+enum FilterRuleType {
+ PROPERTY = "property",
+ FOLDER = "folder",
+ FILE_NAME = "file-name",
+ CONTENT = "content",
+}
+
+enum DatePropertyFilterValue {
+ TODAY = "today",
+ TOMORROW = "tomorrow",
+ YESTERDAY = "yesterday",
+ ONE_WEEK_FROM_NOW = "one-week-from-now",
+ ONE_WEEK_AGO = "one-week-ago",
+ ONE_MONTH_FROM_NOW = "one-month-from-now",
+ ONE_MONTH_AGO = "one-month-ago",
+ CUSTOM = "custom",
+}
+
+interface BaseFilterRule {
+ id: string;
+ operator: FilterOperator;
+ type: FilterRuleType;
+ condition: FilterCondition;
+ isEnabled: boolean;
+ value: string;
+ matchWhenPropertyDNE: boolean;
+}
+
+interface TextPropertyFilterRule extends BaseFilterRule {
+ type: FilterRuleType.PROPERTY;
+ propertyType: PropertyType.TEXT;
+ propertyName: string;
+ condition: TextFilterCondition;
+}
+
+interface NumberPropertyFilterRule extends BaseFilterRule {
+ type: FilterRuleType.PROPERTY;
+ propertyType: PropertyType.NUMBER;
+ propertyName: string;
+ condition: NumberFilterCondition;
+}
+
+interface ListPropertyFilterRule extends BaseFilterRule {
+ type: FilterRuleType.PROPERTY;
+ propertyType: PropertyType.LIST;
+ propertyName: string;
+ condition: ListFilterCondition;
+}
+
+interface CheckboxPropertyFilterRule extends BaseFilterRule {
+ type: FilterRuleType.PROPERTY;
+ propertyType: PropertyType.CHECKBOX;
+ propertyName: string;
+ condition: CheckboxFilterCondition;
+}
+
+interface DatePropertyFilterRule extends BaseFilterRule {
+ type: FilterRuleType.PROPERTY;
+ propertyType: PropertyType.DATE | PropertyType.DATETIME;
+ propertyName: string;
+ condition: DateFilterCondition;
+ valueData: string;
+}
+
+interface FolderFilterRule extends BaseFilterRule {
+ type: FilterRuleType.FOLDER;
+ condition: FolderFilterCondition;
+ includeSubfolders: boolean;
+}
+
+interface FileNameFilterRule extends BaseFilterRule {
+ type: FilterRuleType.FILE_NAME;
+ condition: FileNameFilterCondition;
+}
+
+interface ContentFilterRule extends BaseFilterRule {
+ type: FilterRuleType.CONTENT;
+ condition: ContentFilterCondition;
+}
+
+type TFilterRule =
+ | PropertyFilterRule
+ | FolderFilterRule
+ | FileNameFilterRule
+ | ContentFilterRule;
+
+type PropertyFilterRule =
+ | TextPropertyFilterRule
+ | NumberPropertyFilterRule
+ | ListPropertyFilterRule
+ | CheckboxPropertyFilterRule
+ | DatePropertyFilterRule;
+
+interface TFilterGroup {
+ id: string;
+ name: string;
+ rules: TFilterRule[];
+ isEnabled: boolean;
+ isSticky: boolean;
+}
diff --git a/test-vault/.obsidian/plugins/vault-explorer/data.json b/test-vault/.obsidian/plugins/vault-explorer/data.json
index 4be5278..0bc1b96 100644
--- a/test-vault/.obsidian/plugins/vault-explorer/data.json
+++ b/test-vault/.obsidian/plugins/vault-explorer/data.json
@@ -105,6 +105,6 @@
"feed"
],
"configDir": ".vaultexplorer",
- "pluginVersion": "1.41.0",
+ "pluginVersion": "1.41.1",
"logLevel": "trace"
}
\ No newline at end of file