Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2025-11-14 17:26:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removing a category hides items from the wrapper below (#2103)

Browse Source 
* fix: removing a category hides items from the wrapper below

* refactor: improve variable names
This commit is contained in:
Meier Lukas
2024-08-08 20:59:55 +02:00
committed by GitHub
parent 76d46ec1ba
commit 47c401145d
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/Dashboard/Wrappers/Category/useCategoryActions.tsx
View File

@@ -185,10 +185,20 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
updateConfig( updateConfig(
configName, configName,
(previous) => { (previous) => {
const currentItem = previous.categories.find((category) => category.id === category.id); const currentItem = previous.categories.find(
(previousCategory) => previousCategory.id === category.id
);
if (!currentItem) return previous; if (!currentItem) return previous;
const currentWrapper = previous.wrappers.find(
(previousWrapper) => previousWrapper.position === currentItem?.position
);
if (!currentWrapper) return previous;
// Find the main wrapper // Find the main wrapper
const mainWrapper = previous.wrappers.find((wrapper) => wrapper.position === 0); const mainWrapper = previous.wrappers.find(
(previousWrapper) => previousWrapper.position === 0
);
const mainWrapperId = mainWrapper?.id ?? 'default'; const mainWrapperId = mainWrapper?.id ?? 'default';
const isAppAffectedFilter = (app: AppType): boolean => { const isAppAffectedFilter = (app: AppType): boolean => {
@@ -196,7 +206,7 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
return false; return false;
} }
if (app.area.type !== 'category') { if (app.area.type === 'sidebar') {
return false; return false;
} }
@@ -204,7 +214,10 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
return false; return false;
} }
return app.area.properties.id === currentItem.id; return (
app.area.properties.id === currentItem.id ||
app.area.properties.id === currentWrapper.id
);
}; };
const isWidgetAffectedFilter = (widget: IWidget<string, any>): boolean => { const isWidgetAffectedFilter = (widget: IWidget<string, any>): boolean => {
@@ -212,7 +225,7 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
return false; return false;
} }
if (widget.area.type !== 'category') { if (widget.area.type === 'sidebar') {
return false; return false;
} }
@@ -220,7 +233,10 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
return false; return false;
} }
return widget.area.properties.id === currentItem.id; return (
widget.area.properties.id === currentItem.id ||
widget.area.properties.id === currentWrapper.id
);
}; };
return { return {
@@ -261,9 +277,11 @@ export const useCategoryActions = (configName: string | undefined, category: Cat
}) })
), ),
], ],
categories: previous.categories.filter((category) => category.id !== category.id), categories: previous.categories.filter(
(previousCategory) => previousCategory.id !== category.id
),
wrappers: previous.wrappers.filter( wrappers: previous.wrappers.filter(
(wrapper) => wrapper.position !== currentItem.position (previousWrapper) => previousWrapper.position !== currentItem.position
), ),
}; };
}, },