Skip to content

fix(folders): ensure context and toolbar folder creation respect parent #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonreshetov merged 3 commits into from
Nov 26, 2025
Merged

fix(folders): ensure context and toolbar folder creation respect parent #640

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c215c6
fix(folders): ensure context and toolbar folder creation respect parent
Zhangfen21082 Nov 21, 2025
9915b07
fix: resolve merge conflicts with upstream
Zhangfen21082 Nov 24, 2025
b487c99
fix:remote extra code
Zhangfen21082 Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable node/prefer-global/process */
import { readFileSync } from 'node:fs'
import { existsSync, readFileSync } from 'node:fs'
import path from 'node:path'
import { app, BrowserWindow, Menu } from 'electron'
import { initApi } from './api'
Expand Down Expand Up @@ -115,7 +115,12 @@ else {
}

try {
const jsonDbPath = `${store.preferences.get('storagePath')}/db.json`
const storagePath = store.preferences.get('storagePath')
const jsonDbPath = `${storagePath}/db.json`

if (!existsSync(jsonDbPath))
return

const jsonData = readFileSync(jsonDbPath, 'utf8')

migrateJsonToSqlite(JSON.parse(jsonData))
Expand Down
85 changes: 46 additions & 39 deletions src/renderer/components/sidebar/folders/Tree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,45 +234,52 @@ provide(treeKeys, {
</div>
</ContextMenu.Trigger>
<ContextMenu.Content>
<ContextMenu.Item @click="createFolderAndSelect(contextNode?.id)">
{{ i18n.t("action.new.folder") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item @click="onRenameFolder">
{{ i18n.t("action.rename") }}
</ContextMenu.Item>
<ContextMenu.Item @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item @click="onSetCustomIcon">
{{ i18n.t("action.setCustomIcon") }}
</ContextMenu.Item>
<ContextMenu.Item
v-if="contextNode?.icon"
@click="onRemoveCustomIcon"
>
{{ i18n.t("action.removeCustomIcon") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Sub>
<ContextMenu.SubTrigger>
{{ i18n.t("action.defaultLanguage") }}
</ContextMenu.SubTrigger>
<ContextMenu.SubContent>
<PerfectScrollbar :options="{ minScrollbarLength: 20 }">
<div class="max-h-[250px]">
<ContextMenu.Item
v-for="language in languages"
:key="language.value"
@click="onSelectLanguage(language.value)"
>
{{ language.name }}
</ContextMenu.Item>
</div>
</PerfectScrollbar>
</ContextMenu.SubContent>
</ContextMenu.Sub>
<template v-if="isContextMultiSelection">
<ContextMenu.Item @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.Item>
</template>
<template v-else>
<ContextMenu.Item @click="createFolderAndSelect(contextNode?.id)">
{{ i18n.t("action.new.folder") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item @click="onRenameFolder">
{{ i18n.t("action.rename") }}
</ContextMenu.Item>
<ContextMenu.Item @click="onDeleteFolder">
{{ i18n.t("action.delete.common") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item @click="onSetCustomIcon">
{{ i18n.t("action.setCustomIcon") }}
</ContextMenu.Item>
<ContextMenu.Item
v-if="contextNode?.icon"
@click="onRemoveCustomIcon"
>
{{ i18n.t("action.removeCustomIcon") }}
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Sub>
<ContextMenu.SubTrigger>
{{ i18n.t("action.defaultLanguage") }}
</ContextMenu.SubTrigger>
<ContextMenu.SubContent>
<PerfectScrollbar :options="{ minScrollbarLength: 20 }">
<div class="max-h-[250px]">
<ContextMenu.Item
v-for="language in languages"
:key="language.value"
@click="onSelectLanguage(language.value)"
>
{{ language.name }}
</ContextMenu.Item>
</div>
</PerfectScrollbar>
</ContextMenu.SubContent>
</ContextMenu.Sub>
</template>
</ContextMenu.Content>
</ContextMenu.Root>
</PerfectScrollbar>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.