Skip to content

Extensions: fix install button type and place of alert in menu #5508

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
poulch merged 2 commits into from
Mar 25, 2025
Merged

Extensions: fix install button type and place of alert in menu #5508

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
9980554
Fix install button
Mar 25, 2025
ae9a9df
Fix list group adornment
Mar 25, 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
6 changes: 1 addition & 5 deletions src/components/Sidebar/menu/ItemGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,9 @@ export const ItemGroup: React.FC<Props> = ({ menuItem }) => {
<Text size={3} fontWeight="medium">
{menuItem.label}
</Text>
{menuItem.endAdornment && <Box>{menuItem.endAdornment}</Box>}
</Box>
</Link>
{menuItem.endAdornment && (
<Box position="absolute" right={9} top={2} zIndex={"3"}>
{menuItem.endAdornment}
</Box>
)}
</List.ItemGroup.Trigger>
<List.ItemGroup.Content>
<Box
Expand Down
5 changes: 3 additions & 2 deletions src/extensions/components/ExtenionItem/components/AppInstallButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const AppInstallButton = ({ manifestUrl }: { manifestUrl: string }) => {
if (!hasManagedAppsPermission) {
return (
<ButtonWithTooltip
variant="primary"
variant="secondary"
disabled
tooltip={intl.formatMessage(buttonMessages.noPermission)}
>
Expand All @@ -29,7 +29,7 @@ export const AppInstallButton = ({ manifestUrl }: { manifestUrl: string }) => {
if (IS_CLOUD_INSTANCE) {
return (
<Link href={AppUrls.resolveAppInstallUrl(manifestUrl)}>
<Button variant="primary" data-test-id="app-install-button">
<Button variant="secondary" data-test-id="app-install-button">
<FormattedMessage {...buttonMessages.install} />
</Button>
</Link>
Expand All @@ -39,6 +39,7 @@ export const AppInstallButton = ({ manifestUrl }: { manifestUrl: string }) => {
return (
<span tabIndex={0}>
<ButtonWithTooltip
variant="secondary"
tooltip={intl.formatMessage(messages.installationCloudOnly)}
data-test-id="app-install-button"
disabled
Expand Down
Loading