mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2026-01-23 04:52:02 -08:00
Fix/sub wiki tag tree (#667)
* fix: different out path on macos * fix: let go hibernation promise, so it's faster on macos * log marker [test-id-TIDGI_MINI_WINDOW_CREATED] * Skip registerShortcutByKey in test * fix: mini window on mac * Remove useless log marker * Update handleAttachToTidgiMiniWindow.ts * fix: log marker check all log files * lint * fix: open in new window now showing wiki title * Update package.json * feat: basic load and save to sub wiki using in-tag-tree-of * fix: load sub-wiki content and prevent echo * fix: test and ui logic * test: refactor subwiki test logic to a file * refactor: shorten steps by using dedicated step, and test underlying micro steps * fix: review * refactor: remove outdated method signature * test: unit cover adaptor subwiki routing * Update FileSystemAdaptor.routing.test.ts * fix: merge issue
This commit is contained in:
parent
8a84d9b468
commit
c2be8e4186
57 changed files with 2176 additions and 414 deletions
|
|
@ -50,7 +50,7 @@ export function useWikiWorkspaceForm(options?: { fromExisted: boolean }) {
|
|||
return firstMainWiki ? { wikiFolderLocation: firstMainWiki.wikiFolderLocation, port: firstMainWiki.port, id: firstMainWiki.id } : { wikiFolderLocation: '', port: 0, id: '' };
|
||||
},
|
||||
);
|
||||
const [tagName, tagNameSetter] = useState<string>('');
|
||||
const [tagNames, tagNamesSetter] = useState<string[]>([]);
|
||||
let mainWikiToLinkIndex = mainWorkspaceList.findIndex((workspace) => workspace.id === mainWikiToLink.id);
|
||||
if (mainWikiToLinkIndex < 0) {
|
||||
mainWikiToLinkIndex = 0;
|
||||
|
|
@ -123,8 +123,8 @@ export function useWikiWorkspaceForm(options?: { fromExisted: boolean }) {
|
|||
wikiPortSetter,
|
||||
mainWikiToLink,
|
||||
mainWikiToLinkSetter,
|
||||
tagName,
|
||||
tagNameSetter,
|
||||
tagNames,
|
||||
tagNamesSetter,
|
||||
gitRepoUrl,
|
||||
gitRepoUrlSetter,
|
||||
parentFolderLocation,
|
||||
|
|
@ -162,7 +162,7 @@ export function workspaceConfigFromForm(form: INewWikiRequiredFormData, isCreate
|
|||
mainWikiID: isCreateMainWorkspace ? null : form.mainWikiToLink.id,
|
||||
name: form.wikiFolderName,
|
||||
storageService: form.storageProvider,
|
||||
tagName: isCreateMainWorkspace ? null : form.tagName,
|
||||
tagNames: isCreateMainWorkspace ? [] : form.tagNames,
|
||||
port: form.wikiPort,
|
||||
wikiFolderLocation: form.wikiFolderLocation!,
|
||||
backupOnInterval: true,
|
||||
|
|
@ -173,6 +173,9 @@ export function workspaceConfigFromForm(form: INewWikiRequiredFormData, isCreate
|
|||
excludedPlugins: [],
|
||||
enableHTTPAPI: false,
|
||||
enableFileSystemWatch: true,
|
||||
includeTagTree: false,
|
||||
fileSystemPathFilterEnable: false,
|
||||
fileSystemPathFilter: null,
|
||||
lastNodeJSArgv: [],
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue