From c56bcbd0b65e9917db52b02ac440c5323a5990e4 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:17:53 -0600 Subject: [PATCH 01/10] refactor: remove unnecessary migration --- src/migrations/migrate_1_17_2.ts | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/migrations/migrate_1_17_2.ts diff --git a/src/migrations/migrate_1_17_2.ts b/src/migrations/migrate_1_17_2.ts deleted file mode 100644 index bfc1b35..0000000 --- a/src/migrations/migrate_1_17_2.ts +++ /dev/null @@ -1,9 +0,0 @@ -import License from "src/svelte/shared/services/license"; -import MigrationInterface from "./migration_interface"; - -export default class Migrate_1_17_2 implements MigrationInterface { - migrate(data: Record) { - License.getInstance().setStoredDeviceRegistered(false); - return data as unknown as Record; - } -} From adfbc00e6e0b3197411d82a438ad9f78b9924b14 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:21:03 -0600 Subject: [PATCH 02/10] refactor: rename to fileName --- src/svelte/shared/services/license.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/svelte/shared/services/license.ts b/src/svelte/shared/services/license.ts index 738eb94..f71fbce 100644 --- a/src/svelte/shared/services/license.ts +++ b/src/svelte/shared/services/license.ts @@ -197,7 +197,7 @@ export default class License { * @param value - The license key */ private updateLicenseKey(value: string) { - Logger.trace({ filename: "license.ts", functionName: "updateLicenseKey", message: "called" }); + Logger.trace({ fileName: "license.ts", functionName: "updateLicenseKey", message: "called" }); this.licenseKey = value; this.setStoredLicenseKey(value); } @@ -207,14 +207,14 @@ export default class License { * @param value - The registration status of the device */ private updateDeviceRegistered(value: boolean) { - Logger.trace({ filename: "license.ts", functionName: "updateDeviceRegistered", message: "called" }); + Logger.trace({ fileName: "license.ts", functionName: "updateDeviceRegistered", message: "called" }); this.isDeviceRegistered = value; this.isDeviceRegisteredStore.set(value); this.setStoredDeviceRegistered(value); } private setStoredLicenseKey(value: string) { - Logger.trace({ filename: "license.ts", functionName: "setStoredLicenseKey", message: "called" }); + Logger.trace({ fileName: "license.ts", functionName: "setStoredLicenseKey", message: "called" }); localStorage.setItem(LOCAL_STORAGE_LICENSE_KEY, value); } @@ -231,7 +231,7 @@ export default class License { } setStoredDeviceRegistered(value: boolean) { - Logger.trace({ filename: "license.ts", functionName: "setStoredDeviceRegistered", message: "called" }); + Logger.trace({ fileName: "license.ts", functionName: "setStoredDeviceRegistered", message: "called" }); localStorage.setItem(LOCAL_STORAGE_DEVICE_REGISTERED, value.toString()); } From b41d1280536248fad46628eea418b0279068651b Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Wed, 26 Jun 2024 05:59:12 -0600 Subject: [PATCH 03/10] refactor: update log messages --- src/svelte/shared/services/license.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/svelte/shared/services/license.ts b/src/svelte/shared/services/license.ts index f71fbce..d0f0262 100644 --- a/src/svelte/shared/services/license.ts +++ b/src/svelte/shared/services/license.ts @@ -21,13 +21,13 @@ export default class License { const storedDeviceRegistered = this.getStoredDeviceRegistered(); this.isDeviceRegistered = storedDeviceRegistered; this.isDeviceRegisteredStore.set(storedDeviceRegistered); - Logger.debug({ fileName: "license.ts", functionName: "constructor", message: "loaded storedDeviceRegistered", }, storedDeviceRegistered); + Logger.debug({ fileName: "license.ts", functionName: "constructor", message: "loaded stored device registration", }, storedDeviceRegistered); this.responseMessage = ""; const storedKey = this.getStoredLicenseKey(); this.licenseKey = storedKey; - Logger.debug({ fileName: "license.ts", functionName: "constructor", message: "loaded storedKey" }, storedKey); + Logger.debug({ fileName: "license.ts", functionName: "constructor", message: "loaded stored license key" }, storedKey); } async registerDevice(licenseKey: string) { From 08f904239cbc81fb0dc4c0723be56bf46d1ec673 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:22:08 -0600 Subject: [PATCH 04/10] feat: remove width restrictions --- src/svelte/app/components/feed-card.svelte | 1 - src/svelte/app/components/list-item.svelte | 1 - 2 files changed, 2 deletions(-) diff --git a/src/svelte/app/components/feed-card.svelte b/src/svelte/app/components/feed-card.svelte index c36c09d..3b7dd20 100644 --- a/src/svelte/app/components/feed-card.svelte +++ b/src/svelte/app/components/feed-card.svelte @@ -108,7 +108,6 @@ diff --git a/src/svelte/app/components/list-view.svelte b/src/svelte/app/components/list-view.svelte index b93afd9..85d66b8 100644 --- a/src/svelte/app/components/list-view.svelte +++ b/src/svelte/app/components/list-view.svelte @@ -24,6 +24,6 @@
{#each displayedItems as file (file.path)} - + {/each}
From b8f2ef23ad76fd255f53b4e55d51fb9b1b3a92c2 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:33:20 -0600 Subject: [PATCH 08/10] fix: include frontmatter content in filter by search --- .../app/services/filters/search-filter.ts | 24 +------------------ src/svelte/app/services/render-utils.ts | 14 +---------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/svelte/app/services/filters/search-filter.ts b/src/svelte/app/services/filters/search-filter.ts index 1ae867a..4520fa8 100644 --- a/src/svelte/app/services/filters/search-filter.ts +++ b/src/svelte/app/services/filters/search-filter.ts @@ -8,41 +8,19 @@ export const filterBySearch = (file: FileRenderData, value: string) => { const compare = value.toLowerCase().trim(); - const { name, tags, path, content, custom1, custom2, custom3 } = file; + const { name, path, content, } = file; if (name.toLowerCase().includes(compare)) { return true; } - if (path.toLowerCase().includes(compare)) { return true; } - //TODO should this include the frontmatter? if (content !== null && content.toLowerCase().includes(compare)) { return true; } - if ( - tags !== null && tags.some((tag) => - tag.toLowerCase().includes(compare) - ) - ) { - return true; - } - - if (custom1 !== null && custom1.toLowerCase().includes(compare)) { - return true; - } - - if (custom2 !== null && custom2.toLowerCase().includes(compare)) { - return true; - } - - if (custom3 !== null && custom3.toLowerCase().includes(compare)) { - return true; - } - return false; } diff --git a/src/svelte/app/services/render-utils.ts b/src/svelte/app/services/render-utils.ts index 061140e..deb2652 100644 --- a/src/svelte/app/services/render-utils.ts +++ b/src/svelte/app/services/render-utils.ts @@ -4,7 +4,6 @@ import { FileRenderData } from "../types"; import { getTimeMillis, isDateSupported } from "../../shared/services/time-utils"; import Logger from "js-logger"; import { loadPropertyValue } from "src/svelte/shared/services/load-property-value"; -import { removeFrontmatterBlock } from "./frontmatter-utils"; export const formatFileDataForRender = (settings: VaultExplorerPluginSettings, file: TFile, frontmatter: FrontMatterCache | undefined, content: string | null): FileRenderData => { const tags: string[] | null = loadPropertyValue(frontmatter, "tags", PropertyType.LIST); @@ -51,22 +50,11 @@ export const formatFileDataForRender = (settings: VaultExplorerPluginSettings, f const { name, basename, extension, path } = file; const displayName = extension === "md" ? basename : name; - let filteredContent = ""; - if (content != null) { - filteredContent = removeFrontmatterBlock(content); - - const length = filteredContent.length; - if (length > 250) { - filteredContent = filteredContent.slice(0, 250); - filteredContent += "..."; - } - } - return { name: displayName, path, url, - content: filteredContent, + content, tags, favorite, createdMillis, From 7535514dfb35464ae6a026558a501ec830af2289 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:39:41 -0600 Subject: [PATCH 09/10] fix: add displayContent as a reactive statement --- src/svelte/app/components/feed-card.svelte | 21 +++++++++++++++++++-- src/svelte/app/components/feed-view.svelte | 1 - 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/svelte/app/components/feed-card.svelte b/src/svelte/app/components/feed-card.svelte index 2ad7aea..db81463 100644 --- a/src/svelte/app/components/feed-card.svelte +++ b/src/svelte/app/components/feed-card.svelte @@ -9,6 +9,7 @@ import { formatBearTime } from "../services/time-utils"; import Stack from "src/svelte/shared/components/stack.svelte"; import Tag from "src/svelte/shared/components/tag.svelte"; + import { removeFrontmatterBlock } from "../services/frontmatter-utils"; export let name: string; export let path: string; @@ -55,6 +56,20 @@ } const creationString = formatBearTime(createdMillis); + + function getDisplayContent(content: string | null) { + if (content != null) { + const contentWithoutFrontmatter = removeFrontmatterBlock(content); + if (contentWithoutFrontmatter.length > 250) { + return contentWithoutFrontmatter.slice(0, 250) + "..."; + } else { + return contentWithoutFrontmatter; + } + } + return content; + } + + $: displayContent = getDisplayContent(content);
@@ -80,8 +95,10 @@ > {name}
- {#if content != null && content.length > 0} -
{content}
+ {#if displayContent != null && displayContent.length > 0} +
+ {displayContent} +
{/if} {#if tags != null}
diff --git a/src/svelte/app/components/feed-view.svelte b/src/svelte/app/components/feed-view.svelte index 38507fc..3d09440 100644 --- a/src/svelte/app/components/feed-view.svelte +++ b/src/svelte/app/components/feed-view.svelte @@ -44,7 +44,6 @@ Date: Thu, 27 Jun 2024 17:43:30 -0600 Subject: [PATCH 10/10] chore: bump version --- manifest.json | 2 +- package.json | 2 +- versions.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 30c4268..cf468fe 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "vault-explorer", "name": "Vault Explorer", - "version": "1.17.2", + "version": "1.18.0", "minAppVersion": "1.4.13", "description": "Explore your vault in visual format", "author": "DecafDev", diff --git a/package.json b/package.json index 012def3..b34d743 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-vault-explorer", - "version": "1.17.2", + "version": "1.18.0", "description": "Explore your vault in visual format", "main": "main.js", "scripts": { diff --git a/versions.json b/versions.json index 882a783..8a7c585 100644 --- a/versions.json +++ b/versions.json @@ -75,5 +75,6 @@ "1.16.0": "1.4.13", "1.17.0": "1.4.13", "1.17.1": "1.4.13", - "1.17.2": "1.4.13" + "1.17.2": "1.4.13", + "1.18.0": "1.4.13" }