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.

Sign up for GitHub

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

Fix: Nav Item Api & Webhook and Functions stay selected #7628

Merged
merged 5 commits into from
Oct 13, 2024
Merged

Fix: Nav Item Api & Webhook and Functions stay selected #7628

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcad9b8
Fixed Nav Item Api & Webhook and Functions stay selected like when na…
tushar110302 Oct 13, 2024
32d1a85
similiar fix for integrations
ehconitin Oct 13, 2024
25153a0
reverse
ehconitin Oct 13, 2024
c8ed80f
Merge remote-tracking branch 'upstream/main' into fix/settings-nav-it…
ehconitin Oct 13, 2024
b32d372
Address comment
FelixMalfait Oct 13, 2024
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
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const SettingsNavigationDrawerItem = ({
Icon,
label,
indentationLevel,
matchSubPages = false,
matchSubPages = true,
path,
soon,
subItemState,
Expand Down
7 changes: 2 additions & 5 deletions packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ type SettingsNavigationItem = {
label: string;
path: SettingsPath;
Icon: IconComponent;
matchSubPages?: boolean;
ehconitin marked this conversation as resolved.
Show resolved Hide resolved
indentationLevel?: NavigationDrawerItemIndentationLevel;
};

Expand Down Expand Up @@ -90,14 +89,12 @@ export const SettingsNavigationDrawerItems = () => {
label: 'Emails',
path: SettingsPath.AccountsEmails,
Icon: IconMail,
matchSubPages: true,
ehconitin marked this conversation as resolved.
Show resolved Hide resolved
indentationLevel: 2,
},
{
label: 'Calendars',
path: SettingsPath.AccountsCalendars,
Icon: IconCalendarEvent,
matchSubPages: true,
ehconitin marked this conversation as resolved.
Show resolved Hide resolved
indentationLevel: 2,
},
];
Expand All @@ -109,7 +106,7 @@ export const SettingsNavigationDrawerItems = () => {
return matchPath(
{
path: pathName,
end: !accountSubSetting.matchSubPages,
end: true,
},
ehconitin marked this conversation as resolved.
Show resolved Hide resolved
currentPathName,
);
Expand All @@ -134,6 +131,7 @@ export const SettingsNavigationDrawerItems = () => {
label="Accounts"
path={SettingsPath.Accounts}
Icon={IconAt}
matchSubPages={false}
/>
{accountSubSettings.map((navigationItem, index) => (
<SettingsNavigationDrawerItem
Expand Down Expand Up @@ -174,7 +172,6 @@ export const SettingsNavigationDrawerItems = () => {
label="Data model"
path={SettingsPath.Objects}
Icon={IconHierarchy2}
matchSubPages
/>
<SettingsNavigationDrawerItem
label="Integrations"
Expand Down
Loading