Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 25 additions & 2 deletions packages/app/src/context/notification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,43 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
const owner = getOwner()
const states = new Map<ServerScope, { dispose: () => void; state: NotificationState }>()

const EMPTY: NotificationState = {
ready: Object.assign(() => false, { promise: undefined }),
session: {
all: () => [],
unseen: () => [],
unseenCount: () => 0,
unseenHasError: () => false,
markViewed: () => {},
},
project: {
all: () => [],
unseen: () => [],
unseenCount: () => 0,
unseenHasError: () => false,
markViewed: () => {},
},
}

const activeServer = createMemo(() => {
if (params.serverKey) return requireServerKey(params.serverKey)
if (search.draftId) {
const draft = tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId)
if (draft) return draft.server
}
return server.key
const key = server.key
const servers = global.servers.list()
if (servers.length > 0 && !servers.some((c) => ServerConnection.key(c) === key)) {
return ServerConnection.key(servers[0])
}
return key
})
const activeDirectory = createMemo(() => decode64(params.dir))
const activeSession = createMemo(() => params.id)

const ensure = (key: ServerConnection.Key) => {
const conn = global.servers.list().find((item) => ServerConnection.key(item) === key)
if (!conn) throw new Error(`Notification server not found: ${key}`)
if (!conn) return EMPTY
const ctx = global.ensureServerCtx(conn)
const existing = states.get(ctx.sdk.scope)
if (existing) return existing.state
Expand Down
29 changes: 27 additions & 2 deletions packages/app/src/context/permission.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,37 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple

const activeServer = createMemo(() => {
if (params.serverKey && settings.general.newLayoutDesigns()) return requireServerKey(params.serverKey)
return activeDraft()?.server ?? server.key
const key = activeDraft()?.server ?? server.key
const servers = global.servers.list()
if (servers.length > 0 && !servers.some((s) => ServerConnection.key(s) === key)) {
return ServerConnection.key(servers[0])
}
return key
})

const EMPTY_API = {
ready: () => true,
respond: () => {},
autoResponds: () => false,
isAutoAccepting: () => false,
isAutoAcceptingDirectory: () => false,
toggleAutoAccept: () => {},
toggleAutoAcceptDirectory: () => {},
enableAutoAccept: () => {},
disableAutoAccept: () => {},
isPermissionAllowAll: () => false,
}
const EMPTY: PermissionState = {
...EMPTY_API,
api: EMPTY_API,
sync: null as never,
enableConfiguredDirectory: () => {},
permissionsEnabled: () => false,
}

const ensure = (key: ServerConnection.Key) => {
const conn = global.servers.list().find((item) => ServerConnection.key(item) === key)
if (!conn) throw new Error(`Permission server not found: ${key}`)
if (!conn) return EMPTY
const ctx = global.ensureServerCtx(conn)
const existing = states.get(ctx.sdk.scope)
if (existing && global.servers.list().some((item) => ServerConnection.key(item) === existing.key)) {
Expand Down
Loading