Cache fix adding support for filter routes

src/co/bookmarks/export/popover.js

@@ -17,7 +17,7 @@ export default function BookmarksExportPopover({ spaceId = 0, pin, onClose }) {
 
     //url generation
     const prefix = useMemo(()=>
-        `${API_ENDPOINT_URL}raindrops/${spaceId}`,
+        `${API_ENDPOINT_URL}raindrops/${parseInt(spaceId)||0}`,
         [spaceId]
     )
     const suffix = useMemo(()=>

src/co/bookmarks/footer/index.js

@@ -65,7 +65,7 @@ function BookmarksFooter({ spaceId, compact, compactLimit }) {
                 as={Link}
                 variant='flat'
                 data-block
-                to={`/my/${spaceId}/full`}>
+                to={`/my/${parseInt(spaceId)||0}/full`}>
                 {t.s('showAll')}
             </Button>
         )

src/co/bookmarks/header/regular/open.js

@@ -7,7 +7,7 @@ import Icon from '~co/common/icon'
 export default ({ className, spaceId })=>(
     <Button 
         className={className}
-        href={new URL(`/my/${spaceId}`, config.links.app.index).toString()}
+        href={new URL(`/my/${parseInt(spaceId)||0}`, config.links.app.index).toString()}
         target='_blank'
         title={t.s('openInNewTab')}>
         <Icon name='open' size='micro' />

src/co/bookmarks/item/tags.js

@@ -12,7 +12,7 @@ class BookmarksItemTag extends React.PureComponent {
             <Link 
                 key={tag} 
                 tabIndex='-1'
-                to={'/my/'+spaceId+'/'+encodeURIComponent(tag.includes(' ') ? `"#${tag}"` : `#${tag}`)}>
+                to={'/my/'+(parseInt(spaceId)||0)+'/'+encodeURIComponent(tag.includes(' ') ? `"#${tag}"` : `#${tag}`)}>
                 <Icon name='tag' size='micro' />
                 {tag}
             </Link>

src/co/bookmarks/items/empty/view.js

@@ -21,6 +21,8 @@ export default class BookmarksEmptyView extends React.PureComponent {
         if (spaceId == -101) return null
 
         switch(status.main) {
+            //case 'loaded' is for "loaded but no bookmarks" situation, no effect if there are bookmarks
+            case 'loaded':
             case 'empty':{
 				const _id = parseInt(spaceId)
 

src/data/helpers/bookmarks/index.js

@@ -7,13 +7,19 @@ const emptyObject = {}
 export * from './blankSpace'
 export * from './getUrl'
 export * from './queryIsEqual'
+export * from './spaceCacheId'
 export * from './normalizeRecentSearch'
 
 //Iterator by spaceId prefixes and original
-export const iterateSpaceId = (spaceId, func)=>{
+export const iterateSpaceId = (spaceId, func, spaces)=>{
 	const cleanSpaceId = String(parseInt(spaceId))
 	func(cleanSpaceId)
 	func(cleanSpaceId+'s')
+
+	if (spaces)
+		for(const id of Object.keys(spaces))
+			if (id.startsWith(cleanSpaceId+':'))
+				func(id)
 }
 
 //Saga helpers

src/data/helpers/bookmarks/spaceCacheId.js

@@ -0,0 +1,9 @@
+const FILTER = /^(?:[A-Za-z]+:[A-Za-z]+|❤️)$/
+
+export const getSpaceCacheId = (spaceId, search='')=>{
+	const filter = String(search).trim()
+
+	return String(spaceId) === '0' && FILTER.test(filter) ?
+		`0:${filter}` :
+		spaceId
+}

src/data/reducers/bookmarks/space.js

@@ -1,5 +1,5 @@
 import _ from 'lodash-es'
-import { normalizeBookmarks, blankSpace, queryIsEqual } from '../../helpers/bookmarks'
+import { normalizeBookmarks, blankSpace, queryIsEqual, iterateSpaceId } from '../../helpers/bookmarks'
 import { actualizeSpaceStatus } from './utils'
 import { REHYDRATE } from 'redux-persist/src/constants'
 import {
@@ -340,17 +340,19 @@ export default function(state, action) {switch (action.type) {
 			.set('meta', state.meta.without(ids))
 
 		//remove from *all bookmarks* ids
-		for(const spaceId of [0, '0s']){
+		iterateSpaceId(0, (spaceId)=>{
 			let space = state.spaces[spaceId]
-			if (!space) continue
-			
+			if (!space) return
+
 			space = space
 				.set('ids', _.without(space.ids, ...ids))
 				.set('highlight', space.highlight.without(ids))
 
 			state = state.setIn(['spaces', spaceId], space)
-		}
-
+		}, state.spaces)
+
+		state = actualizeSpaceStatus(state, 0)
+
 		return state
 	}
 }}

src/data/reducers/bookmarks/utils.js

@@ -2,6 +2,8 @@ import _ from 'lodash-es'
 import { iterateSpaceId } from '../../helpers/bookmarks'
 
 export const actualizeSpaceStatus = (state, spaceId)=>{
+	const spaces = state.spaces
+
 	iterateSpaceId(spaceId, (cleanSpaceId)=>{
 		const space = state.getIn(['spaces', cleanSpaceId])
 		var newMainStatus = '',
@@ -23,7 +25,7 @@ export const actualizeSpaceStatus = (state, spaceId)=>{
 
 		if (newNextPageStatus)
 			state = state.setIn(['spaces', cleanSpaceId, 'status', 'nextPage'], 	newNextPageStatus)
-	})
+	}, spaces)
 
 	return state
 }
@@ -42,12 +44,14 @@ export const insertIdToSpace = (state, spaceId, _id)=>{
 }
 
 export const removeIdFromSpace = (state, spaceId, _id)=>{
+	const spaces = state.spaces
+
 	iterateSpaceId(spaceId, (cleanSpaceId)=>{
 		const ids = state.getIn(['spaces', cleanSpaceId, 'ids'])||[]
 		if (ids.length)
 			state = state
 				.setIn(['spaces', cleanSpaceId, 'ids'], ids.filter((id)=>id!=_id))
-	})
+	}, spaces)
 
 	return state
 }

src/routes/my/item/index.js

@@ -18,7 +18,7 @@ import Ask from './tab/ask'
 import Web from './tab/web'
 
 export default function PageMyItem() {
-    const { itemId, cId } = useParams()
+    const { itemId, cId, search } = useParams()
     const dispatch = useDispatch()
 
     //webview
@@ -62,7 +62,7 @@ export default function PageMyItem() {
                         <Route path='web' element={<Web item={item} webViewRef={webViewRef} />} /> : null
                     }
                     {tabs.includes('ask') ?
-                        <Route path='ask' element={<Ask item={item} cId={cId} />} /> : null
+                        <Route path='ask' element={<Ask item={item} cId={cId} search={search} />} /> : null
                     }
 
                     <Route path='*' element={<Any tabs={tabs} />} />

src/routes/my/item/tab/ask.js

@@ -2,16 +2,18 @@ import s from './ask.module.styl'
 import React, { useCallback } from 'react'
 import { useDispatch } from 'react-redux'
 import * as bookmarkActions from '~data/actions/bookmarks'
+import useSpaceCacheId from '../../useSpaceCacheId'
 
 import Stella from '~co/stella'
 
-export default function PageMyItemTabAsk({ item, cId }) {
+export default function PageMyItemTabAsk({ item, cId, search }) {
     const dispatch = useDispatch()
+    const spaceId = useSpaceCacheId(cId, search)
 
     const onToolCalled = useCallback(() => {
         dispatch(bookmarkActions.oneLoad(item._id))
-        dispatch(bookmarkActions.refresh(cId))
-    }, [dispatch, item._id, cId])
+        dispatch(bookmarkActions.refresh(spaceId))
+    }, [dispatch, item._id, spaceId])
 
     return (
         <Stella

src/routes/my/space/bookmarks.js

@@ -2,13 +2,16 @@ import React, { useCallback, useMemo } from 'react'
 import { useSelector } from 'react-redux'
 import { useNavigate, useLocation } from 'react-router-dom'
 import { target, environment, openTab } from '~target'
+import useSpaceCacheId from '../useSpaceCacheId'
 import Bookmarks from '~co/bookmarks'
 
 export default function PageMySpaceBookmarks({ cId, search, itemId }) {
     const { pathname } = useLocation()
     let { raindrops_click } = useSelector(state=>state.config)
     const navigate = useNavigate()
 
+    const spaceId = useSpaceCacheId(cId, search)
+
     const onBookmarkClick = useCallback(item=>{
         //no preview in extension, so open in new tab instead
         if (target == 'extension' && raindrops_click=='preview')
@@ -36,7 +39,7 @@ export default function PageMySpaceBookmarks({ cId, search, itemId }) {
 
     return (
         <Bookmarks 
-            spaceId={cId}
+            spaceId={spaceId}
             search={search}
             full={search || pathname.includes('/full') ? true : false}
             activeId={itemId && parseInt(itemId)}

src/routes/my/space/header/ask.js

@@ -3,15 +3,17 @@ import React, { useState, useCallback } from 'react'
 import t from '~t'
 import { useDispatch, useSelector } from 'react-redux'
 import * as bookmarkActions from '~data/actions/bookmarks'
+import useSpaceCacheId from '../../useSpaceCacheId'
 
 import Button from '~co/common/button'
 import Icon from '~co/common/icon'
 import Modal from '~co/overlay/modal'
 import Stella from '~co/stella'
 
-export default function PageMySpaceHeaderAsk({ itemId, cId }) {
+export default function PageMySpaceHeaderAsk({ itemId, cId, search }) {
     const enabled = useSelector(state=>state.config.ai_assistant)
     const dispatch = useDispatch()
+    const spaceId = useSpaceCacheId(cId, search)
     const [created, setCreated] = useState(false)
     const [visible, setVisible] = useState(false)
 
@@ -22,8 +24,8 @@ export default function PageMySpaceHeaderAsk({ itemId, cId }) {
     }, [])
 
     const onToolCalled = useCallback(() => {
-        dispatch(bookmarkActions.refresh(cId))
-    }, [dispatch, cId])
+        dispatch(bookmarkActions.refresh(spaceId))
+    }, [dispatch, spaceId])
 
     const onClose = useCallback(() => {
         setVisible(false)

src/routes/my/useSpaceCacheId.js

@@ -0,0 +1,7 @@
+import { useMemo } from 'react'
+import { getSpaceCacheId } from '~data/helpers/bookmarks'
+
+//use it instead of raw `cId`
+export default function useSpaceCacheId(cId, search) {
+    return useMemo(()=>getSpaceCacheId(cId, search), [cId, search])
+}