Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-ui): narrow subject ids for the operator variant in the share panel

Mde3616122e82
diff --git a/control-ui/components/GfsGrantPanel.tsx b/control-ui/components/GfsGrantPanel.tsx
index b6da5efad..706e972b6 100644
--- a/control-ui/components/GfsGrantPanel.tsx
+++ b/control-ui/components/GfsGrantPanel.tsx
@@ -58,6 +58,11 @@ function hostOnlySubject(subject: { type: string }): boolean {
return subject.type === 'host'
}
+/** Stable per-subject merge key. The operator variant carries no id. */
+function subjectKey(subject: GfsSubjectInput): string {
+ return `${subject.type}:${'id' in subject ? subject.id : ''}`
+}
+
const OPERATOR_OPTION: SelectionDropdownOption = {
value: OPERATOR_VALUE,
label: 'Operator',
@@ -111,7 +116,7 @@ export function GfsGrantPanel({ resource }: GfsGrantPanelProps): React.JSX.Eleme
// descendant coverage unioned, both row ids retained for revoke.
const bySubject = new Map<string, GfsExistingAccessItem>()
const entryFor = (subject: GfsSubjectInput): GfsExistingAccessItem => {
- const key = `${subject.type}:${subject.id ?? ''}`
+ const key = subjectKey(subject)
let entry = bySubject.get(key)
if (!entry) {
entry = { subject, permissions: [], inherit: false, grantId: null, shareIds: [] }
@@ -323,10 +328,7 @@ export function GfsGrantPanel({ resource }: GfsGrantPanelProps): React.JSX.Eleme
subjectLabel(left).localeCompare(subjectLabel(right), undefined, {
numeric: true,
sensitivity: 'base',
- }) ||
- `${left.subject.type}:${left.subject.id ?? ''}`.localeCompare(
- `${right.subject.type}:${right.subject.id ?? ''}`
- )
+ }) || subjectKey(left.subject).localeCompare(subjectKey(right.subject))
),
[existingAccess, subjectLabel]
)
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index ac1890943..d399cc875 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.569",
+ "version": "0.1.570",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.569",
+ "version": "0.1.570",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index d7cdcecc9..8f01207f0 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.569",
+ "version": "0.1.570",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",