Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/components/SideNavigator/SideNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
IconBook,
IconStarActive
} from '../icons'
import { getStorageItemId } from '../../lib/nav'

const Description = styled.nav`
margin-left: 15px;
Expand Down Expand Up @@ -212,7 +213,7 @@ export default () => {

<div className='storageList'>
{storageEntries.map(([, storage]) => {
const itemId = `storage:${storage.id}`
const itemId = getStorageItemId(storage.id)
const storageIsFolded = !sideNavOpenedItemSet.has(itemId)
const showPromptToCreateFolder = (folderPathname: string) => {
prompt({
Expand Down
3 changes: 2 additions & 1 deletion src/lib/generalStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { localLiteStorage } from 'ltstrg'
import { useSetState } from 'react-use'
import { generalStatusKey } from './localStorageKeys'
import { createStoreContext } from './context'
import { getFolderItemId } from './nav'
import { getFolderItemId, getStorageItemId } from './nav'

export type ViewModeType = 'edit' | 'preview' | 'split'

Expand Down Expand Up @@ -91,6 +91,7 @@ function useGeneralStatusStore() {
const folderPathElements = folderPathname.slice(1).split('/')
const itemIdListToOpen = []
let currentPathname = ''
itemIdListToOpen.push(getStorageItemId(storageId))
for (const element of folderPathElements) {
currentPathname = `${currentPathname}/${element}`
itemIdListToOpen.push(getFolderItemId(storageId, currentPathname))
Expand Down
8 changes: 6 additions & 2 deletions src/lib/nav.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
export function getStorageItemId(storageId: string) {
return `storage:${storageId}`
}

export function getFolderItemId(storageId: string, folderPathname: string) {
return `storage:${storageId}/folder:${folderPathname}`
return `${getStorageItemId(storageId)}/folder:${folderPathname}`
}

export function getTagListItemId(storageId: string) {
return `storage:${storageId}/tags`
return `${getStorageItemId(storageId)}/tags`
}
21 changes: 21 additions & 0 deletions src/lib/specs/nav.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { getStorageItemId, getFolderItemId, getTagListItemId } from '../nav'

describe('getStorageItemId', () => {
it('returns a correct storage path', () => {
expect(getStorageItemId('test_storage')).toBe('storage:test_storage')
})
})

describe('getFolderItemId', () => {
it('returns a correct folder item path', () => {
expect(getFolderItemId('test_storage', 'test_folder')).toBe(
'storage:test_storage/folder:test_folder'
)
})
})

describe('getTagListItemId', () => {
it('returns a correct tags path', () => {
expect(getTagListItemId('test_storage')).toBe('storage:test_storage/tags')
})
})