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

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

- propagate optional parentId so context subfolders stay under their parents
- regenerate API types to expose parentId in foldersAdd schema

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>

* fix: resolve merge conflicts with upstream

* fix:remote extra code

Author: Zhangfen21082

src/main/api/dto/folders.ts

@@ -2,6 +2,7 @@ import Elysia, { t } from 'elysia'
 
 const foldersAdd = t.Object({
   name: t.String(),
+  parentId: t.Optional(t.Union([t.Number(), t.Null()])),
 })
 
 const foldersUpdate = t.Object({

src/main/api/routes/folders.ts

@@ -90,18 +90,19 @@ app
     '/',
     ({ body }) => {
       const db = useDB()
-      const { name } = body
+      const { name, parentId } = body
       const now = Date.now()
 
+      //  (parentId)
       const { maxOrder } = db
         .prepare(
           `
         SELECT COALESCE(MAX(orderIndex), -1) as maxOrder 
         FROM folders 
-        WHERE parentId IS NULL 
+        WHERE parentId ${parentId ? '= ?' : 'IS NULL'}
       `,
         )
-        .get() as { maxOrder: number }
+        .get(...(parentId ? [parentId] : [])) as { maxOrder: number }
 
       const newOrder = maxOrder + 1
 
@@ -120,7 +121,7 @@ app
       const { lastInsertRowid } = stmt.run(
         name,
         'plain_text',
-        null,
+        parentId ?? null,
         0,
         now,
         now,

src/renderer/components/sidebar/folders/Tree.vue

@@ -240,7 +240,7 @@ provide(treeKeys, {
           </ContextMenu.Item>
         </template>
         <template v-else>
-          <ContextMenu.Item @click="createFolderAndSelect">
+          <ContextMenu.Item @click="createFolderAndSelect(contextNode?.id)">
             {{ i18n.t("action.new.folder") }}
           </ContextMenu.Item>
           <ContextMenu.Separator />

src/renderer/components/sidebar/library/Library.vue

@@ -219,7 +219,7 @@ function onResizeTagList(val: number[]) {
       </div>
       <UiActionButton
         :tooltip="i18n.t('action.new.folder')"
-        @click="createFolderAndSelect"
+        @click="createFolderAndSelect()"
       >
         <Plus class="h-4 w-4" />
       </UiActionButton>

src/renderer/composables/useFolders.ts

@@ -281,12 +281,17 @@ async function getFolders(shouldEnsureVisibility = true) {
   }
 }
 
-async function createFolder() {
+async function createFolder(parentId?: number) {
   try {
     const { data } = await api.folders.postFolders({
       name: i18n.t('folder.untitled'),
+      ...(parentId !== undefined && { parentId }),
     })
 
+    if (parentId) {
+      await updateFolder(parentId, { isOpen: 1 })
+    }
+
     await getFolders(false)
 
     return data.id
@@ -296,9 +301,9 @@ async function createFolder() {
   }
 }
 
-async function createFolderAndSelect() {
+async function createFolderAndSelect(parentId?: number) {
   const { clearSnippetsState } = useSnippets()
-  const id = await createFolder()
+  const id = await createFolder(parentId)
 
   if (id) {
     await selectFolder(Number(id))

src/renderer/services/api/generated/index.ts

@@ -160,6 +160,9 @@ export type SnippetsResponse = {
 
 export interface FoldersAdd {
   name: string;
+  parentId?:
+    | (string | (string | (string | (string | (string | (string | number))))))
+    | null;
 }
 
 export type FoldersResponse = {
@@ -465,7 +468,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title massCode API
- * @version 3.11.0
+ * @version 4.2.2
  *
  * Development documentation
  */