refactor: drop unread per-trigger write flag and its user plumbing (#12519)

This commit is contained in:
AlexRV12
2026-11-18 17:47:15 +01:00
committed by GitHub
parent 97b80aef5e
commit 0c8db19b51
7 changed files with 63 additions and 147 deletions
@@ -1181,8 +1181,7 @@
opWorkspace,
initialPath,
true,
$primaryScheduleStore,
$userStore
$primaryScheduleStore
)
}
@@ -483,8 +483,7 @@
opWorkspace,
initialPath,
false,
$primaryScheduleStore,
$userStore
$primaryScheduleStore
)
}
@@ -225,7 +225,7 @@
}
async function loadTriggers(): Promise<void> {
await triggersState.fetchTriggers(triggersCount, workspace, path, true, undefined, actingUser)
await triggersState.fetchTriggers(triggersCount, workspace, path, true)
}
let pinnedVersion: number | undefined = $state(undefined)
@@ -274,7 +274,7 @@
}
async function loadTriggers(path: string): Promise<void> {
await triggersState.fetchTriggers(triggersCount, workspace, path, false, undefined, actingUser)
await triggersState.fetchTriggers(triggersCount, workspace, path, false)
}
async function loadScript(hash: string): Promise<void> {
@@ -1,5 +1,4 @@
<script lang="ts">
import { userStore } from '$lib/stores'
import FlowCard from '../flows/common/FlowCard.svelte'
import { getContext, onDestroy, createEventDispatcher } from 'svelte'
import type { TriggerContext } from '$lib/components/triggers'
@@ -191,101 +190,53 @@
triggersState.deleteTrigger(triggersCount, trigger)
if (triggerType === 'schedule') {
await triggersState.fetchSchedules(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
undefined,
$userStore
)
await triggersState.fetchSchedules(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'websocket') {
await triggersState.fetchWebsocketTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'postgres') {
await triggersState.fetchPostgresTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'kafka') {
await triggersState.fetchKafkaTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'nats') {
await triggersState.fetchNatsTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchNatsTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'gcp') {
await triggersState.fetchGcpTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchGcpTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'azure') {
await triggersState.fetchAzureTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'sqs') {
await triggersState.fetchSqsTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchSqsTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'mqtt') {
await triggersState.fetchMqttTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchMqttTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'amqp') {
await triggersState.fetchAmqpTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchAmqpTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'http') {
await triggersState.fetchHttpTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
)
await triggersState.fetchHttpTriggers(triggersCount, $operatingWorkspace, currentPath, isFlow)
} else if (triggerType === 'email') {
await triggersState.fetchEmailTriggers(
triggersCount,
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'nextcloud') {
await triggersState.fetchNativeTriggers(
@@ -293,8 +244,7 @@
'nextcloud',
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'google') {
await triggersState.fetchNativeTriggers(
@@ -302,8 +252,7 @@
'google',
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
} else if (triggerType === 'github') {
await triggersState.fetchNativeTriggers(
@@ -311,8 +260,7 @@
'github',
$operatingWorkspace,
currentPath,
isFlow,
$userStore
isFlow
)
}
@@ -23,16 +23,13 @@ import {
type NativeTrigger,
type NativeServiceName
} from '$lib/gen'
import { enterpriseLicense, userWorkspaces } from '$lib/stores'
import { enterpriseLicense } from '$lib/stores'
import { getLightConfig, sortTriggers, updateTriggersCount, type Trigger } from './utils'
import { get, type Writable } from 'svelte/store'
import type { TriggerType } from './utils'
import type { UserExt } from '$lib/stores'
import type { ScheduleTrigger } from '../triggers'
import { formatCron, generateRandomString } from '$lib/utils'
import { canEditItem } from '$lib/editRights'
import { capabilitiesIn } from '$lib/roleCapabilities'
export class Triggers {
#triggers = $state<Trigger[]>([])
@@ -129,18 +126,8 @@ export class Triggers {
updateTriggersCount(triggersCountStore, type, 'remove')
}
updateTriggers(
remoteTriggers: any[],
type: TriggerType,
workspaceId: string,
user: UserExt | undefined = undefined
): number {
updateTriggers(remoteTriggers: any[], type: TriggerType): number {
const currentTriggers = this.#triggers
const caps = capabilitiesIn(
user,
get(userWorkspaces).find((w) => w.id === workspaceId)
)
const kind = type === 'schedule' ? 'schedule' : 'trigger'
// Identify triggers with draftConfig to preserve
const configuredTriggers = currentTriggers.filter(
(t) => t.type === type && !t.isDraft && t.draftConfig
@@ -159,7 +146,6 @@ export class Triggers {
path: trigger.path,
isPrimary: type === 'schedule' && trigger.path === trigger.script_path,
isDraft: false,
canWrite: canEditItem(kind, trigger.path, trigger.extra_perms, user, caps),
draftConfig: draftConfig,
lightConfig: getLightConfig(type, trigger)
}
@@ -177,8 +163,7 @@ export class Triggers {
workspaceId: string | undefined,
path: string,
isFlow: boolean,
primarySchedule?: ScheduleTrigger | undefined | false,
user: UserExt | undefined = undefined
primarySchedule?: ScheduleTrigger | undefined | false
): Promise<void> {
if (!workspaceId) return
try {
@@ -207,7 +192,7 @@ export class Triggers {
isFlow
})
const scheduleCount = this.updateTriggers(allDeployedSchedules, 'schedule', workspaceId, user)
const scheduleCount = this.updateTriggers(allDeployedSchedules, 'schedule')
const updatedPrimarySchedule = this.#triggers.find((s) => s.isPrimary)
triggersCountStore.update((triggersCount) => {
return {
@@ -232,8 +217,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -242,7 +226,7 @@ export class Triggers {
path,
isFlow
})
const wsCount = this.updateTriggers(wsTriggers, 'websocket', workspaceId, user)
const wsCount = this.updateTriggers(wsTriggers, 'websocket')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -258,8 +242,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -268,7 +251,7 @@ export class Triggers {
path,
isFlow
})
const pgCount = this.updateTriggers(pgTriggers, 'postgres', workspaceId, user)
const pgCount = this.updateTriggers(pgTriggers, 'postgres')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -284,8 +267,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -294,7 +276,7 @@ export class Triggers {
path,
isFlow
})
const kafkaCount = this.updateTriggers(kafkaTriggers, 'kafka', workspaceId, user)
const kafkaCount = this.updateTriggers(kafkaTriggers, 'kafka')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -310,8 +292,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -320,7 +301,7 @@ export class Triggers {
path,
isFlow
})
const natsCount = this.updateTriggers(natsTriggers, 'nats', workspaceId, user)
const natsCount = this.updateTriggers(natsTriggers, 'nats')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -336,8 +317,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -346,7 +326,7 @@ export class Triggers {
path,
isFlow
})
const mqttCount = this.updateTriggers(mqttTriggers, 'mqtt', workspaceId, user)
const mqttCount = this.updateTriggers(mqttTriggers, 'mqtt')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -362,8 +342,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -372,7 +351,7 @@ export class Triggers {
path,
isFlow
})
const amqpCount = this.updateTriggers(amqpTriggers, 'amqp', workspaceId, user)
const amqpCount = this.updateTriggers(amqpTriggers, 'amqp')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -388,8 +367,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -398,7 +376,7 @@ export class Triggers {
path,
isFlow
})
const sqsCount = this.updateTriggers(sqsTriggers, 'sqs', workspaceId, user)
const sqsCount = this.updateTriggers(sqsTriggers, 'sqs')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -414,8 +392,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -424,7 +401,7 @@ export class Triggers {
path,
isFlow
})
const gcpCount = this.updateTriggers(gcpTriggers, 'gcp', workspaceId, user)
const gcpCount = this.updateTriggers(gcpTriggers, 'gcp')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -440,8 +417,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -450,7 +426,7 @@ export class Triggers {
path,
isFlow
})
const azureCount = this.updateTriggers(azureTriggers, 'azure', workspaceId, user)
const azureCount = this.updateTriggers(azureTriggers, 'azure')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -466,8 +442,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -476,7 +451,7 @@ export class Triggers {
path,
isFlow
})
const httpCount = this.updateTriggers(httpTriggers, 'http', workspaceId, user)
const httpCount = this.updateTriggers(httpTriggers, 'http')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -492,8 +467,7 @@ export class Triggers {
triggersCountStore: Writable<TriggersCount | undefined>,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -502,7 +476,7 @@ export class Triggers {
path,
isFlow
})
const emailCount = this.updateTriggers(emailTriggers, 'email', workspaceId, user)
const emailCount = this.updateTriggers(emailTriggers, 'email')
triggersCountStore.update((triggersCount) => {
return {
...(triggersCount ?? {}),
@@ -519,8 +493,7 @@ export class Triggers {
serviceName: NativeServiceName,
workspaceId: string | undefined,
path: string,
isFlow: boolean,
user: UserExt | undefined = undefined
isFlow: boolean
): Promise<void> {
if (!workspaceId) return
try {
@@ -535,10 +508,9 @@ export class Triggers {
path: t.external_id,
script_path: t.script_path,
is_flow: t.is_flow,
extra_perms: {},
service_config: t.service_config
}))
const count = this.updateTriggers(triggerData, serviceName, workspaceId, user)
const count = this.updateTriggers(triggerData, serviceName)
const countProperty = `${serviceName}_count`
triggersCountStore.update((triggersCount) => {
return {
@@ -556,30 +528,29 @@ export class Triggers {
workspaceId: string | undefined,
path: string,
isFlow: boolean,
primarySchedule: ScheduleTrigger | undefined | false = undefined,
user: UserExt | undefined = undefined
primarySchedule: ScheduleTrigger | undefined | false = undefined
): Promise<void> {
if (!workspaceId) return
// Fetch each type of trigger
await Promise.all([
this.fetchSchedules(triggersCountStore, workspaceId, path, isFlow, primarySchedule, user),
this.fetchHttpTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchWebsocketTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchPostgresTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchMqttTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchAmqpTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchNativeTriggers(triggersCountStore, 'nextcloud', workspaceId, path, isFlow, user),
this.fetchNativeTriggers(triggersCountStore, 'google', workspaceId, path, isFlow, user),
this.fetchNativeTriggers(triggersCountStore, 'github', workspaceId, path, isFlow, user),
this.fetchSchedules(triggersCountStore, workspaceId, path, isFlow, primarySchedule),
this.fetchHttpTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchWebsocketTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchPostgresTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchMqttTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchAmqpTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchNativeTriggers(triggersCountStore, 'nextcloud', workspaceId, path, isFlow),
this.fetchNativeTriggers(triggersCountStore, 'google', workspaceId, path, isFlow),
this.fetchNativeTriggers(triggersCountStore, 'github', workspaceId, path, isFlow),
...(get(enterpriseLicense)
? [
this.fetchKafkaTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchSqsTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchGcpTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchEmailTriggers(triggersCountStore, workspaceId, path, isFlow, user),
this.fetchNatsTriggers(triggersCountStore, workspaceId, path, isFlow, user)
this.fetchKafkaTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchSqsTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchGcpTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchAzureTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchEmailTriggers(triggersCountStore, workspaceId, path, isFlow),
this.fetchNatsTriggers(triggersCountStore, workspaceId, path, isFlow)
]
: [])
])
@@ -120,7 +120,6 @@ export type Trigger = {
path?: string
isDraft?: boolean
isPrimary?: boolean
canWrite?: boolean
id?: string
draftConfig?: Record<string, any>
captureConfig?: Record<string, any>