Merge branch 'fix/favorites' into chore/all-my-stuffs

# Conflicts:
#	src/tools/tools.store.ts
This commit is contained in:
ShareVB committed 2024-11-03 23:15:48 +01:00
commit 52cd2fb23f
2 files changed
+5 -1

No files matched your search

+1 -1
View File
@@ -6839,7 +6839,7 @@ packages:
/@vueuse/shared@10.0.0(vue@3.3.4): /@vueuse/shared@10.0.0(vue@3.3.4):
resolution: {integrity: sha512-Zh3LgJqvUBWVY3SiMvXanTcfAneGbt63QPczBRDNgQ6jd/ehodO9a1lCFzaA6SWJJoI+ugVTjHFYJdoR656DVQ==} resolution: {integrity: sha512-Zh3LgJqvUBWVY3SiMvXanTcfAneGbt63QPczBRDNgQ6jd/ehodO9a1lCFzaA6SWJJoI+ugVTjHFYJdoR656DVQ==}
dependencies: dependencies:
vue-demi: 0.14.5(vue@3.3.4) vue-demi: 0.14.10(vue@3.3.4)
transitivePeerDependencies: transitivePeerDependencies:
- '@vue/composition-api' - '@vue/composition-api'
- vue - vue
+4
View File
@@ -24,9 +24,11 @@ export const useToolStore = defineStore('tools', () => {
const toolsByCategory = computed<ToolCategory[]>(() => { const toolsByCategory = computed<ToolCategory[]>(() => {
return _.chain(tools.value) return _.chain(tools.value)
.groupBy('category') .groupBy('category')
.map((components, name, path) => ({
.map((components, name, path) => ({ .map((components, name, path) => ({
name, name,
path, path,
path,
components, components,
})) }))
.value(); .value();
@@ -34,6 +36,7 @@ export const useToolStore = defineStore('tools', () => {
const favoriteTools = computed(() => { const favoriteTools = computed(() => {
return favoriteToolsName.value return favoriteToolsName.value
.map(favoriteName => tools.value.find(({ name, path }) => name === favoriteName || path === favoriteName))
.map(favoriteName => tools.value.find(({ name, path }) => name === favoriteName || path === favoriteName)) .map(favoriteName => tools.value.find(({ name, path }) => name === favoriteName || path === favoriteName))
.filter(Boolean) as ToolWithCategory[]; // cast because .filter(Boolean) does not remove undefined from type .filter(Boolean) as ToolWithCategory[]; // cast because .filter(Boolean) does not remove undefined from type
}); });
@@ -53,6 +56,7 @@ export const useToolStore = defineStore('tools', () => {
removeToolFromFavorites({ tool }: { tool: MaybeRef<Tool> }) { removeToolFromFavorites({ tool }: { tool: MaybeRef<Tool> }) {
favoriteToolsName.value = favoriteToolsName.value.filter(name => get(tool).name !== name && get(tool).path !== name); favoriteToolsName.value = favoriteToolsName.value.filter(name => get(tool).name !== name && get(tool).path !== name);
favoriteToolsName.value = favoriteToolsName.value.filter(name => get(tool).name !== name && get(tool).path !== name);
}, },
isToolFavorite({ tool }: { tool: MaybeRef<Tool> }) { isToolFavorite({ tool }: { tool: MaybeRef<Tool> }) {