Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PUI] Make breadcrumbs adjustable #8027

Merged
merged 22 commits into from
Feb 11, 2025
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3d28f40
adjust breadcrumbs to include current item
matmair Aug 22, 2024
3913e74
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Aug 28, 2024
411f31d
Add last breacdrumb to various pages
matmair Aug 28, 2024
5e084b4
Add user settings for last breadcrumb
matmair Aug 28, 2024
327405f
add breacrumbs to company subpages
matmair Aug 28, 2024
481bd8b
use getDetailUrl instead
matmair Aug 28, 2024
914b391
Merge branch 'master' into pui-adjust-breadcrumbs
SchrodingersGat Aug 29, 2024
86c816c
Merge branch 'master' into pui-adjust-breadcrumbs
matmair Aug 29, 2024
16259c0
set default
matmair Aug 29, 2024
553e4a3
Merge branch 'pui-adjust-breadcrumbs' of https://github.com/matmair/I…
matmair Aug 29, 2024
ea788b5
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Sep 1, 2024
b70cceb
change description
matmair Sep 1, 2024
1b9ddf7
Merge branch 'master' into pui-adjust-breadcrumbs
matmair Sep 10, 2024
66d917c
Merge branch 'master' into pui-adjust-breadcrumbs
matmair Sep 16, 2024
1ba4d77
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Nov 10, 2024
4bddce5
Merge branch 'master' into pui-adjust-breadcrumbs
matmair Nov 11, 2024
8987fb4
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 31, 2025
2aa8214
fix styles
matmair Jan 31, 2025
d5dbd54
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Jan 31, 2025
e52c883
fix merge
matmair Jan 31, 2025
81b492a
Merge branch 'master' of https://github.com/inventree/InvenTree into …
matmair Feb 5, 2025
f946fed
rename to camelCase
matmair Feb 10, 2025
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
Prev Previous commit
Next Next commit
Add user settings for last breadcrumb
  • Loading branch information
matmair committed Aug 28, 2024
commit 5e084b4322830222b88c9b9b9151168a90b3bf52
8 changes: 8 additions & 0 deletions src/backend/InvenTree/common/models.py
Original file line number Diff line number Diff line change
@@ -2528,6 +2528,14 @@ class Meta:
'validator': [int, MinValueValidator(0)],
'default': 100,
},
'ENABLE_LAST_BREADCRUMB': {
'name': _('Show Last Breadcrumb'),
'description': _(
'Show the current page in breadcrumbs of the navigation bar (if available)'
),
'default': False,
'validator': bool,
},
'NOTIFICATION_ERROR_REPORT': {
'name': _('Receive error reports'),
'description': _('Receive notifications for system errors'),
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
{% include "InvenTree/settings/setting.html" with key="DISPLAY_SCHEDULE_TAB" icon="fa-calendar-alt" user_setting=True %}
{% include "InvenTree/settings/setting.html" with key="DISPLAY_STOCKTAKE_TAB" icon="fa-clipboard-check" user_setting=True %}
{% include "InvenTree/settings/setting.html" with key="TABLE_STRING_MAX_LENGTH" icon="fa-table" user_setting=True %}
{% include "InvenTree/settings/setting.html" with key="ENABLE_LAST_BREADCRUMB" icon="fa-table" user_setting=True %}
</tbody>
</table>
</div>
19 changes: 16 additions & 3 deletions src/frontend/src/components/nav/PageDetail.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Group, Paper, Space, Stack, Text } from '@mantine/core';
import { useHotkeys } from '@mantine/hooks';
import { Fragment, ReactNode } from 'react';
import { Fragment, ReactNode, useMemo } from 'react';

import { useUserSettingsState } from '../../states/SettingsState';
import { ApiImage } from '../images/ApiImage';
import { StylishText } from '../items/StylishText';
import { Breadcrumb, BreadcrumbList } from './BreadcrumbList';
@@ -14,6 +15,7 @@ interface PageDetailInterface {
detail?: ReactNode;
badges?: ReactNode[];
breadcrumbs?: Breadcrumb[];
last_crumb?: Breadcrumb[];
breadcrumbAction?: () => void;
actions?: ReactNode[];
editAction?: () => void;
@@ -34,11 +36,13 @@ export function PageDetail({
badges,
imageUrl,
breadcrumbs,
last_crumb,
breadcrumbAction,
actions,
editAction,
editEnabled
}: Readonly<PageDetailInterface>) {
const userSettings = useUserSettingsState();
useHotkeys([
[
'mod+E',
@@ -50,12 +54,21 @@ export function PageDetail({
]
]);

// breadcrumb caching
const computedBreadcrumbs = useMemo(() => {
if (userSettings.isSet('ENABLE_LAST_BREADCRUMB')) {
return [...(breadcrumbs ?? []), ...(last_crumb ?? [])];
} else {
return breadcrumbs;
}
}, [breadcrumbs, last_crumb, userSettings]);

return (
<Stack gap="xs">
{breadcrumbs && breadcrumbs.length > 0 && (
{computedBreadcrumbs && computedBreadcrumbs.length > 0 && (
<BreadcrumbList
navCallback={breadcrumbAction}
breadcrumbs={breadcrumbs}
breadcrumbs={computedBreadcrumbs}
/>
)}
<Paper p="xs" radius="xs" shadow="xs">
3 changes: 2 additions & 1 deletion src/frontend/src/pages/Index/Settings/UserSettings.tsx
Original file line number Diff line number Diff line change
@@ -86,7 +86,8 @@ export default function UserSettings() {
'PART_SHOW_QUANTITY_IN_FORMS',
'DISPLAY_SCHEDULE_TAB',
'DISPLAY_STOCKTAKE_TAB',
'TABLE_STRING_MAX_LENGTH'
'TABLE_STRING_MAX_LENGTH',
'ENABLE_LAST_BREADCRUMB'
]}
/>
)
Loading