Skip to content

Commit ac0f501

Browse files
evandorevandor
committed
351 removed uistore filter
1 parent c990ab6 commit ac0f501

File tree

6 files changed

+60
-90
lines changed

6 files changed

+60
-90
lines changed

‎layouts/SidePanelPageTabList.vue‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<!-- there's only one (default) column now -->
88

99
<vue-draggable-next
10-
v-if="tabsForColumn().length > 0"
10+
v-if="tabs.length > 0"
1111
class="q-ma-none"
12-
:list="tabsForColumn() as Array<IndexedTab>"
12+
:list="tabs"
1313
:group="{ name: 'tabs', pull: 'clone' }"
1414
@change="(event: any) => handleDragAndDrop(event, column)">
1515
<SidePanelTabListHelper
16-
v-for="tab in tabsForColumn() as Array<IndexedTab>"
16+
v-for="tab in tabs"
1717
:tab="tab.tab as Tab"
1818
:index="tab.index"
1919
:type="props.type"
@@ -24,16 +24,17 @@
2424
:hide-menu="props.hideMenu"
2525
:filter="props.filter || ''" />
2626
</vue-draggable-next>
27-
<div v-else class="q-ma-md text-caption">
27+
<div v-else-if="props.filter" class="q-ma-md text-caption">
2828
Filter <em>'{{ props.filter }}'</em> did not match anything inside this collection. Click 'Enter' to search in
2929
all your collections.
3030
</div>
31+
<div v-else-if="props.tabset?.folders.length === 0" class="q-ma-md text-caption">Empty Collection</div>
3132
</template>
3233

3334
<!-- no drag & drop on mobile -->
3435
<template v-else>
3536
<SidePanelTabListHelper
36-
v-for="tab in tabsForColumn() as Array<IndexedTab>"
37+
v-for="tab in tabs"
3738
:tab="tab.tab as Tab"
3839
:index="0"
3940
:type="props.type"
@@ -53,7 +54,6 @@
5354
</template>
5455

5556
<script setup lang="ts">
56-
import _ from 'lodash'
5757
import { SPECIAL_ID_FOR_NO_GROUP_ASSIGNED } from 'src/boot/constants'
5858
import SidePanelTabListHelper from 'src/tabsets/layouts/SidePanelTabListHelper.vue'
5959
import { IndexedTab } from 'src/tabsets/models/IndexedTab'
@@ -62,7 +62,7 @@ import { Tabset, TabsetType } from 'src/tabsets/models/Tabset'
6262
import { TabsetColumn } from 'src/tabsets/models/TabsetColumn'
6363
import TabsetService from 'src/tabsets/services/TabsetService'
6464
import { useTabsetService } from 'src/tabsets/services/TabsetService2'
65-
import { PropType, ref, watchEffect } from 'vue'
65+
import { PropType, ref, watch } from 'vue'
6666
import { VueDraggableNext } from 'vue-draggable-next'
6767
6868
const props = defineProps({
@@ -77,7 +77,14 @@ const props = defineProps({
7777
filter: { type: String, required: false },
7878
})
7979
80-
const tabs = ref<Tab[]>([])
80+
const tabs = ref<IndexedTab[]>([])
81+
82+
watch(
83+
() => props.filter,
84+
(a: string | undefined, b: string | undefined) => {
85+
tabs.value = tabsForColumn()
86+
},
87+
)
8188
8289
const handleDragAndDrop = async (event: any, column: TabsetColumn) => {
8390
console.log('SidePanelPageTabList d&d event:', event)
@@ -87,16 +94,8 @@ const handleDragAndDrop = async (event: any, column: TabsetColumn) => {
8794
const tabsInColumn = tabsForColumn()
8895
const movedElement: Tab = tabsInColumn[moved.oldIndex]!.tab
8996
const realNewIndex = tabsInColumn[moved.newIndex]!.index
90-
console.log(` '${movedElement.id}' ${moved.oldIndex} -> ${realNewIndex}`)
97+
// console.log(` '${movedElement.id}' ${moved.oldIndex} -> ${realNewIndex}`)
9198
await TabsetService.moveTo(movedElement.id, realNewIndex, column)
92-
console.log('hier: ', props.tabset)
93-
if (props.tabset) {
94-
tabs.value = useTabsetService().tabsToShow(props.tabset)
95-
console.log(
96-
'tabs.value',
97-
_.map(tabs.value, (t: Tab) => t.url),
98-
)
99-
}
10099
}
101100
if (added) {
102101
console.log(
@@ -111,17 +110,6 @@ const handleDragAndDrop = async (event: any, column: TabsetColumn) => {
111110
}
112111
}
113112
114-
watchEffect(() => {
115-
// TODO why was this done in the first place? Updates from where?
116-
//const tabset = useTabsStore().useTabsetsStore(props.tabset?.id || "")
117-
if (props.tabset) {
118-
tabs.value = useTabsetService().tabsToShow(props.tabset)
119-
} else {
120-
console.warn('could not determine tabset...')
121-
tabs.value = []
122-
}
123-
})
124-
125113
const getColumns = () => {
126114
return [new TabsetColumn(SPECIAL_ID_FOR_NO_GROUP_ASSIGNED, '')]
127115
}
@@ -131,7 +119,7 @@ const tabsForColumn = (): IndexedTab[] => {
131119
return property && property.toLowerCase().indexOf(props.filter!.toLowerCase()!) >= 0
132120
}
133121
134-
return (tabs.value as Tab[])
122+
return (props.tabset?.tabs as Tab[])
135123
.filter((t: Tab) => {
136124
if (!props.filter || props.filter.trim() === '') {
137125
return true
@@ -142,8 +130,9 @@ const tabsForColumn = (): IndexedTab[] => {
142130
return props.tabset && props.tabset.type === TabsetType.RSS_FOLDER ? b.created - a.created : 0
143131
})
144132
.map((t: Tab, index: number) => new IndexedTab(index, t))
145-
//return _.map(tabs.value as Tab[], (t: Tab, index: number) => new IndexedTab(index, t))
146133
}
134+
135+
tabs.value = tabsForColumn()
147136
</script>
148137

149138
<style>

‎pages/TabsetPage.vue‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,17 @@
121121
$q.screen.gt.xs
122122
"
123123
flat
124-
:text-color="useUiStore().tabsFilter ? 'secondary' : 'primary'"
125124
:disable="tabset?.type === TabsetType.DYNAMIC"
126-
:label="useUiStore().tabsFilter"
125+
label="???"
127126
class="cursor-pointer q-ml-lg"
128127
size="12px"
129128
icon="o_filter_alt">
130-
<q-popup-edit
131-
:model-value="useUiStore().tabsFilter"
132-
v-slot="scope"
133-
@update:model-value="(val: string) => setFilter(val)">
134-
<q-input v-model="scope.value" dense autofocus counter @keyup.enter="scope.set" />
135-
</q-popup-edit>
129+
<!-- <q-popup-edit-->
130+
<!-- :model-value="useUiStore().tabsFilter"-->
131+
<!-- v-slot="scope"-->
132+
<!-- @update:model-value="(val: string) => setFilter(val)">-->
133+
<!-- <q-input v-model="scope.value" dense autofocus counter @keyup.enter="scope.set" />-->
134+
<!-- </q-popup-edit>-->
136135
<q-tooltip class="tooltip" :delay="200" anchor="center left" self="center right">
137136
Filter this tabset
138137
</q-tooltip>
@@ -298,7 +297,7 @@ const setNewName = async (newValue: string) => {
298297
const setFilter = (newValue: string) => {
299298
console.log('filter', newValue)
300299
const useValue = newValue && newValue.trim().length > 0 ? newValue.trim() : undefined
301-
useUiStore().tabsFilter = useValue
300+
// useUiStore().tabsFilter = useValue
302301
useUiStore().setHighlightTerm(useValue)
303302
JsUtils.runCssHighlight()
304303
}

‎pages/TabsetPageCards.vue‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ watchEffect(() => {
9494
9595
function currentTabs(): Tab[] {
9696
//console.log("got", props.tabset.tabs)
97-
const filter = useUiStore().tabsFilter
98-
if (filter && filter.trim() !== '') {
99-
return _.orderBy(
100-
_.filter(props.tabset.tabs, (t: Tab) => {
101-
return (
102-
(t.url || '')?.indexOf(filter) >= 0 ||
103-
(t.title || '')?.indexOf(filter) >= 0 ||
104-
t.description.indexOf(filter) >= 0
105-
)
106-
}),
107-
getOrder(),
108-
[orderDesc.value ? 'desc' : 'asc'],
109-
)
110-
}
97+
// const filter = useUiStore().tabsFilter
98+
// if (filter && filter.trim() !== '') {
99+
// return _.orderBy(
100+
// _.filter(props.tabset.tabs, (t: Tab) => {
101+
// return (
102+
// (t.url || '')?.indexOf(filter) >= 0 ||
103+
// (t.title || '')?.indexOf(filter) >= 0 ||
104+
// t.description.indexOf(filter) >= 0
105+
// )
106+
// }),
107+
// getOrder(),
108+
// [orderDesc.value ? 'desc' : 'asc'],
109+
// )
110+
// }
111111
return _.orderBy(props.tabset.tabs, getOrder(), [orderDesc.value ? 'desc' : 'asc'])
112112
}
113113

‎pages/pwa/TabsetPageCards.vue‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,20 @@ watchEffect(() => {
7777
7878
function currentTabs(): Tab[] {
7979
//console.log("got", props.tabset.tabs)
80-
const filter = useUiStore().tabsFilter
81-
if (filter && filter.trim() !== '') {
82-
return _.orderBy(
83-
_.filter(props.tabsetFolder.tabs, (t: Tab) => {
84-
return (
85-
(t.url || '')?.indexOf(filter) >= 0 ||
86-
(t.title || '')?.indexOf(filter) >= 0 ||
87-
t.description.indexOf(filter) >= 0
88-
)
89-
}),
90-
getOrder(),
91-
[orderDesc.value ? 'desc' : 'asc'],
92-
)
93-
}
80+
// const filter = useUiStore().tabsFilter
81+
// if (filter && filter.trim() !== '') {
82+
// return _.orderBy(
83+
// _.filter(props.tabsetFolder.tabs, (t: Tab) => {
84+
// return (
85+
// (t.url || '')?.indexOf(filter) >= 0 ||
86+
// (t.title || '')?.indexOf(filter) >= 0 ||
87+
// t.description.indexOf(filter) >= 0
88+
// )
89+
// }),
90+
// getOrder(),
91+
// [orderDesc.value ? 'desc' : 'asc'],
92+
// )
93+
// }
9494
return _.orderBy(props.tabsetFolder.tabs, getOrder(), [orderDesc.value ? 'desc' : 'asc'])
9595
}
9696

‎services/TabsetService.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,14 @@ class TabsetService {
309309
const currentTabset = useTabsetsStore().getCurrentTabset!
310310
const activeFolder = useTabsetsStore().getActiveFolder(currentTabset)
311311
let tabs = activeFolder ? activeFolder.tabs : currentTabset.tabs
312-
console.log(
313-
'tabs before',
314-
_.map(tabs, (t: any) => t.url),
315-
)
312+
// console.log(
313+
// 'tabs before',
314+
// _.map(tabs, (t: any) => t.url),
315+
// )
316316
//tabs = _.filter(tabs, (t: Tab) => t.columnId === column.id)
317317
const oldIndex = _.findIndex(tabs, (t: any) => t.id === tabId)
318318
if (oldIndex >= 0) {
319-
console.log('found old index', oldIndex)
319+
// console.log('found old index', oldIndex)
320320
const tab = tabs.splice(oldIndex, 1)[0]
321321
tabs.splice(newIndex, 0, tab!)
322322

‎services/TabsetService2.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -595,23 +595,6 @@ export function useTabsetService() {
595595
})
596596
}
597597

598-
const tabsToShow = (tabset: Tabset): Tab[] => {
599-
let tabs: Tab[] = tabset.tabs
600-
601-
// TODO order??
602-
const filter = useUiStore().tabsFilter
603-
if (!filter || filter.trim() === '') {
604-
return tabs
605-
}
606-
return _.filter(tabs, (t: Tab) => {
607-
return (
608-
(t.url || '')?.indexOf(filter) >= 0 ||
609-
(t.title || '')?.indexOf(filter) >= 0 ||
610-
t.description?.indexOf(filter) >= 0
611-
)
612-
})
613-
}
614-
615598
const findFolder = (folders: Tabset[], folderId: string): Tabset | undefined => {
616599
for (const f of folders || []) {
617600
if (f.id === folderId) {
@@ -1005,7 +988,6 @@ export function useTabsetService() {
1005988
saveBlob,
1006989
getBlob,
1007990
reloadTabset,
1008-
tabsToShow,
1009991
deleteTabsetDescription,
1010992
findTabInFolder,
1011993
moveTabToFolder,

0 commit comments

Comments
 (0)