Skip to content

fix(app): reflect global permission:allow in Settings auto-accept toggle #46226

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

Open
d-morrison wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −5
Open

fix(app): reflect global permission:allow in Settings auto-accept toggle #46226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions packages/app/src/components/settings-general.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,16 @@ export const SettingsGeneral: Component = () => {

const linux = createMemo(() => platform.platform === "desktop" && platform.os === "linux")
const dir = createMemo(() => decode64(params.dir))
const serverSync = useServerSync()
const serverSdk = useServerSDK()
const globalAutoAccept = createMemo(() => {
const perm = (serverSync().data.config as any)?.permission
if (perm === "allow") return true
if (perm && typeof perm === "object" && perm["*"] === "allow") return true
return false
})
const accepting = createMemo(() => {
if (globalAutoAccept()) return true
const value = dir()
if (!value) return false
if (!params.id) return permission.isAutoAcceptingDirectory(value)
Expand Down Expand Up @@ -123,9 +132,6 @@ export const SettingsGeneral: Component = () => {

const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) })))

const serverSync = useServerSync()
const serverSdk = useServerSDK()

const [shells] = createResource(
async () => {
const sdk = serverSdk()
Expand Down Expand Up @@ -321,7 +327,7 @@ export const SettingsGeneral: Component = () => {
description={language.t("toast.permissions.autoaccept.on.description")}
>
<div data-action="settings-auto-accept-permissions">
<Switch checked={accepting()} disabled={!dir()} onChange={toggleAccept} />
<Switch checked={accepting()} disabled={!dir() || globalAutoAccept()} onChange={toggleAccept} />
</div>
</SettingsRow>

Expand Down
9 changes: 8 additions & 1 deletion packages/app/src/components/settings-v2/general-controllers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ export type { ShellOption, ShellSelectOption } from "./general-controller-behavi
export function createPermissionScopeController(sessionID: Accessor<string | undefined>) {
const permission = usePermission()
const serverSync = useServerSync()
const globalAutoAccept = createMemo(() => {
const perm = (serverSync().data.config as any)?.permission
if (perm === "allow") return true
if (perm && typeof perm === "object" && perm["*"] === "allow") return true
return false
})
const directory = createMemo(() => {
const id = sessionID()
if (!id) return undefined
Expand All @@ -33,12 +39,13 @@ export function createPermissionScopeController(sessionID: Accessor<string | und

return {
accepting: createMemo(() => {
if (globalAutoAccept()) return true
const id = sessionID()
const dir = directory()
if (!id || !dir) return false
return permission.isAutoAccepting(id, dir)
}),
enabled: createMemo(() => !!directory()),
enabled: createMemo(() => !globalAutoAccept() && !!directory()),
set: (checked: boolean) => {
const id = sessionID()
const dir = directory()
Expand Down
Loading