mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 19:07:41 +00:00
Allow disabling plugins from activity bar
This commit is contained in:
@@ -18,6 +18,7 @@ import { useTranslate, type Translate } from '@/i18n/use-translate'
|
||||
|
||||
export type ActivityBarItem = {
|
||||
id: ActiveRightSidebarTab
|
||||
pluginKey?: string
|
||||
icon: React.ComponentType<{ size?: number; className?: string }>
|
||||
title: string
|
||||
shortcut: string
|
||||
@@ -113,6 +114,7 @@ export function TopActivityOverflowMenu({
|
||||
key={item.id}
|
||||
onSelect={() => onSelect(item.id)}
|
||||
data-workspace-board-dismiss=""
|
||||
data-activity-plugin-key={item.pluginKey}
|
||||
className={cn(active && 'bg-accent text-accent-foreground')}
|
||||
aria-current={active ? 'page' : undefined}
|
||||
aria-label={activityItemAriaLabel(item, item.statusIndicator, t)}
|
||||
@@ -165,6 +167,7 @@ export function ActivityBarButton({
|
||||
)}
|
||||
onClick={onClick}
|
||||
data-workspace-board-dismiss=""
|
||||
data-activity-plugin-key={item.pluginKey}
|
||||
aria-label={activityItemAriaLabel(item, effectiveStatus, t)}
|
||||
>
|
||||
<Icon size={isTop ? 16 : 18} />
|
||||
|
||||
@@ -1,23 +1,87 @@
|
||||
import React from 'react'
|
||||
import React, { useState } from 'react'
|
||||
import { Power } from 'lucide-react'
|
||||
import { toast } from 'sonner'
|
||||
import type { ActivityBarPosition } from '@/store/slices/editor/types/open-file'
|
||||
import {
|
||||
ContextMenuContent,
|
||||
ContextMenuItem,
|
||||
ContextMenuLabel,
|
||||
ContextMenuRadioGroup,
|
||||
ContextMenuRadioItem
|
||||
ContextMenuRadioItem,
|
||||
ContextMenuSeparator
|
||||
} from '@/components/ui/context-menu'
|
||||
import { useTranslate } from '@/i18n/use-translate'
|
||||
import { useTranslate, type Translate } from '@/i18n/use-translate'
|
||||
import { usePluginPanelsStore } from '@/store/plugins/catalog/plugin-contribution-catalog'
|
||||
|
||||
async function disableActivityBarPlugin(
|
||||
pluginKey: string,
|
||||
t: Translate,
|
||||
setDisabling: (disabling: boolean) => void
|
||||
): Promise<void> {
|
||||
setDisabling(true)
|
||||
try {
|
||||
const plugins = await window.api.plugins.setEnabled({ pluginKey, enabled: false })
|
||||
usePluginPanelsStore.getState().setPlugins(plugins)
|
||||
} catch {
|
||||
toast.error(
|
||||
t('auto.components.right.sidebar.activityBar.disableFailed', 'Could not disable plugin.')
|
||||
)
|
||||
} finally {
|
||||
setDisabling(false)
|
||||
}
|
||||
}
|
||||
|
||||
export function useActivityBarContextPlugin(): {
|
||||
pluginKey: string | null
|
||||
onContextMenu: React.MouseEventHandler<HTMLElement>
|
||||
onPointerDown: React.PointerEventHandler<HTMLElement>
|
||||
} {
|
||||
const [pluginKey, setPluginKey] = useState<string | null>(null)
|
||||
const updatePluginKey = (event: React.SyntheticEvent<HTMLElement>): void => {
|
||||
const target = event.target
|
||||
setPluginKey(
|
||||
target instanceof Element
|
||||
? (target.closest('[data-activity-plugin-key]')?.getAttribute('data-activity-plugin-key') ??
|
||||
null)
|
||||
: null
|
||||
)
|
||||
}
|
||||
return {
|
||||
pluginKey,
|
||||
onContextMenu: updatePluginKey,
|
||||
onPointerDown: (event) => {
|
||||
if (event.pointerType !== 'mouse') {
|
||||
updatePluginKey(event)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function ActivityBarPositionMenu({
|
||||
currentPosition,
|
||||
onChangePosition
|
||||
onChangePosition,
|
||||
pluginKey
|
||||
}: {
|
||||
currentPosition: ActivityBarPosition
|
||||
onChangePosition: (pos: ActivityBarPosition) => void
|
||||
pluginKey?: string | null
|
||||
}): React.JSX.Element {
|
||||
const t = useTranslate()
|
||||
const [disabling, setDisabling] = useState(false)
|
||||
return (
|
||||
<ContextMenuContent>
|
||||
{pluginKey && typeof window.api?.plugins?.setEnabled === 'function' && (
|
||||
<>
|
||||
<ContextMenuItem
|
||||
disabled={disabling}
|
||||
onSelect={() => void disableActivityBarPlugin(pluginKey, t, setDisabling)}
|
||||
>
|
||||
<Power className="size-4" />
|
||||
{t('auto.components.right.sidebar.activityBar.disablePlugin', 'Disable Plugin')}
|
||||
</ContextMenuItem>
|
||||
<ContextMenuSeparator />
|
||||
</>
|
||||
)}
|
||||
<ContextMenuLabel>
|
||||
{t('auto.components.right.sidebar.index.864111caa2', 'Activity Bar Position')}
|
||||
</ContextMenuLabel>
|
||||
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
shouldRenderDesktopWindowChrome
|
||||
} from '@/lib/desktop-window-chrome'
|
||||
import { getRendererAppPlatform } from '@/lib/renderer-app-platform'
|
||||
import { ActivityBarPositionMenu } from './activity-bar-position-menu'
|
||||
import { ActivityBarPositionMenu, useActivityBarContextPlugin } from './activity-bar-position-menu'
|
||||
import { RightSidebarTopActivityBar } from './right-sidebar-top-activity-bar'
|
||||
import { useRightSidebarActivityItems } from './use-right-sidebar-activity-items'
|
||||
import { useRightSidebarTabRouting } from './use-right-sidebar-tab-routing'
|
||||
@@ -34,6 +34,7 @@ import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/wor
|
||||
|
||||
function RightSidebarInner(): React.JSX.Element {
|
||||
const t = useTranslate()
|
||||
const contextPlugin = useActivityBarContextPlugin()
|
||||
useUiLanguageRevision()
|
||||
const hasDesktopWindowChrome = shouldRenderDesktopWindowChrome({
|
||||
platform: getRendererAppPlatform(),
|
||||
@@ -237,7 +238,11 @@ function RightSidebarInner(): React.JSX.Element {
|
||||
|
||||
{activityBarPosition === 'side' && (
|
||||
<ContextMenu>
|
||||
<ContextMenuTrigger asChild>
|
||||
<ContextMenuTrigger
|
||||
asChild
|
||||
onContextMenu={contextPlugin.onContextMenu}
|
||||
onPointerDown={contextPlugin.onPointerDown}
|
||||
>
|
||||
<div className="flex flex-col items-center w-10 min-w-[40px] bg-sidebar border-l border-border side-activity-bar-windows-inset">
|
||||
<TooltipProvider delayDuration={400}>{sideActivityBarIcons}</TooltipProvider>
|
||||
</div>
|
||||
@@ -245,6 +250,7 @@ function RightSidebarInner(): React.JSX.Element {
|
||||
<ActivityBarPositionMenu
|
||||
currentPosition={activityBarPosition}
|
||||
onChangePosition={setActivityBarPosition}
|
||||
pluginKey={contextPlugin.pluginKey}
|
||||
/>
|
||||
</ContextMenu>
|
||||
)}
|
||||
|
||||
@@ -15,6 +15,7 @@ export function getPluginPanelActivityItems(
|
||||
): ActivityBarItem[] {
|
||||
return panels.map((panel) => ({
|
||||
id: panel.tabKey,
|
||||
pluginKey: panel.pluginKey,
|
||||
icon: resolvePluginPanelIcon(panel.icon),
|
||||
// Manifest titles are plugin-owned and render without app-catalog translation.
|
||||
title: panel.title,
|
||||
|
||||
@@ -8,7 +8,7 @@ import { TooltipProvider } from '@/components/ui/tooltip'
|
||||
import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu'
|
||||
import { ActivityBarButton, TopActivityOverflowMenu } from './activity-bar-buttons'
|
||||
import type { ActivityBarItem } from './activity-bar-buttons'
|
||||
import { ActivityBarPositionMenu } from './activity-bar-position-menu'
|
||||
import { ActivityBarPositionMenu, useActivityBarContextPlugin } from './activity-bar-position-menu'
|
||||
import {
|
||||
RIGHT_SIDEBAR_HEADER_NO_DRAG_CLASS_NAME,
|
||||
RIGHT_SIDEBAR_TOP_ACTIVITY_STRIP_CLASS_NAME,
|
||||
@@ -36,12 +36,17 @@ export function RightSidebarTopActivityBar({
|
||||
activityBarPosition: ActivityBarPosition
|
||||
onChangeActivityBarPosition: (pos: ActivityBarPosition) => void
|
||||
}): React.JSX.Element {
|
||||
const contextPlugin = useActivityBarContextPlugin()
|
||||
return (
|
||||
<ContextMenu>
|
||||
<div className="flex h-[36px] min-h-[36px] items-center border-b border-border right-sidebar-header-inset right-sidebar-header-drag overflow-hidden">
|
||||
{!hasDesktopWindowChrome && (
|
||||
<TooltipProvider delayDuration={400}>
|
||||
<ContextMenuTrigger asChild>
|
||||
<ContextMenuTrigger
|
||||
asChild
|
||||
onContextMenu={contextPlugin.onContextMenu}
|
||||
onPointerDown={contextPlugin.onPointerDown}
|
||||
>
|
||||
<div
|
||||
ref={topActivityStripRef}
|
||||
className={RIGHT_SIDEBAR_TOP_ACTIVITY_STRIP_CLASS_NAME}
|
||||
@@ -96,7 +101,11 @@ export function RightSidebarTopActivityBar({
|
||||
</div>
|
||||
{hasDesktopWindowChrome && (
|
||||
<TooltipProvider delayDuration={400}>
|
||||
<ContextMenuTrigger asChild>
|
||||
<ContextMenuTrigger
|
||||
asChild
|
||||
onContextMenu={contextPlugin.onContextMenu}
|
||||
onPointerDown={contextPlugin.onPointerDown}
|
||||
>
|
||||
<div
|
||||
ref={topActivityStripRef}
|
||||
className={RIGHT_SIDEBAR_WINDOWS_TOP_ACTIVITY_STRIP_CLASS_NAME}
|
||||
@@ -129,6 +138,7 @@ export function RightSidebarTopActivityBar({
|
||||
<ActivityBarPositionMenu
|
||||
currentPosition={activityBarPosition}
|
||||
onChangePosition={onChangeActivityBarPosition}
|
||||
pluginKey={contextPlugin.pluginKey}
|
||||
/>
|
||||
</ContextMenu>
|
||||
)
|
||||
|
||||
@@ -15280,7 +15280,9 @@
|
||||
"needsIsolatedFrames": "This panel is not available: it needs isolated plugin frames, which are turned off."
|
||||
},
|
||||
"activityBar": {
|
||||
"error": "Error"
|
||||
"error": "Error",
|
||||
"disablePlugin": "Disable Plugin",
|
||||
"disableFailed": "Could not disable plugin."
|
||||
},
|
||||
"AiVaultSessionLimitMenu": {
|
||||
"historyDepth": "History depth: {{value0}}",
|
||||
|
||||
Reference in New Issue
Block a user