Skip to content

fix: Dashboard cleanup #3585

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

Merged
isTravis merged 2 commits into from
Apr 16, 2026
Merged

fix: Dashboard cleanup #3585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1c3d1
Hide dashboard dropdown for non members. Flip quick link icon order
isTravis Apr 16, 2026
c7acd73
Merge branch 'main' into tr/dashboard-cleanup
isTravis Apr 16, 2026
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
4 changes: 2 additions & 2 deletions client/components/GlobalControls/GlobalControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const GlobalControls = (props: Props) => {
loginData,
communityData: { hideCreatePubButton },
scopeData: {
activePermissions: { canManage },
activePermissions: { canManage, canView },
},
} = usePageContext();

Expand Down Expand Up @@ -87,7 +87,7 @@ const GlobalControls = (props: Props) => {
<>
{canCreatePub && <CreatePubButton />}
{renderSearch()}
{renderDashboardMenu()}
{canView && renderDashboardMenu()}
{renderNotificiations()}
</>
);
Expand Down
34 changes: 17 additions & 17 deletions client/components/ScopeDropdown/ScopeDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,23 +190,6 @@ const ScopeDropdown = (props: Props) => {
</div>
{scope.showSettings && scope.type !== 'Page' && (
<div className="settings">
{renderDropddownButton(
scope,
'settings',
pubPubIcons.settings,
)}
{renderDropddownButton(
scope,
'members',
pubPubIcons.member,
)}
{renderDropddownButton(scope, 'impact', pubPubIcons.impact)}
{scope.type === 'Collection' &&
renderDropddownButton(
scope,
'layout',
pubPubIcons.layout,
)}
<a
href={`/${
(
Expand All @@ -221,6 +204,23 @@ const ScopeDropdown = (props: Props) => {
<Icon icon="globe" iconSize={12} />
</Tooltip>
</a>
{scope.type === 'Collection' &&
renderDropddownButton(
scope,
'layout',
pubPubIcons.layout,
)}
{renderDropddownButton(scope, 'impact', pubPubIcons.impact)}
{renderDropddownButton(
scope,
'members',
pubPubIcons.member,
)}
{renderDropddownButton(
scope,
'settings',
pubPubIcons.settings,
)}
</div>
)}
{scope.showSettings && scope.type === 'Page' && (
Expand Down
Loading