Skip to content
Closed
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
2 changes: 1 addition & 1 deletion common/hogvm/typescript/src/stl/print.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function printHogStringOutput(obj: any): string {
return printHogValue(obj)
}

type ASTNode = Map<string, any> | null
export type ASTNode = Map<string, any> | null

// Note: this printer currently is experimental and used for debugging/printing SQL only.
// When making queries via run(query), we send the AST nodes directly to the server.
Expand Down
11 changes: 11 additions & 0 deletions frontend/src/lib/components/CyclotronJob/CyclotronJobInputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export type CyclotronJobInputsProps = {
// (the workflow builder's auto-save). Only the email input types read these.
emailLiveChanges?: boolean
emailSaveIndicator?: ReactNode
emailSandboxSenderAllowed?: boolean
parentConfiguration?: CyclotronJobInputConfiguration
onInputSchemaChange?: (schema: CyclotronJobInputSchemaType[]) => void
// Classes for the column the inputs are laid out in, so a host with height to spare can let
Expand All @@ -160,6 +161,7 @@ export function CyclotronJobInputs({
emailFieldErrors,
emailLiveChanges,
emailSaveIndicator,
emailSandboxSenderAllowed,
showSource,
sampleGlobalsWithInputs,
className,
Expand Down Expand Up @@ -205,6 +207,7 @@ export function CyclotronJobInputs({
emailFieldErrors={emailFieldErrors}
emailLiveChanges={emailLiveChanges}
emailSaveIndicator={emailSaveIndicator}
emailSandboxSenderAllowed={emailSandboxSenderAllowed}
/>
)
})}
Expand Down Expand Up @@ -308,6 +311,7 @@ function EmailTemplateField({
fieldErrors,
liveChanges,
saveIndicator,
sandboxSenderAllowed,
}: {
schema: CyclotronJobInputSchemaType
value: any
Expand All @@ -316,6 +320,7 @@ function EmailTemplateField({
fieldErrors?: EmailFieldErrors
liveChanges?: boolean
saveIndicator?: ReactNode
sandboxSenderAllowed?: boolean
}): JSX.Element {
return (
<EmailTemplater
Expand All @@ -328,6 +333,7 @@ function EmailTemplateField({
fieldErrors={fieldErrors}
liveChanges={liveChanges}
saveIndicator={saveIndicator}
sandboxSenderAllowed={sandboxSenderAllowed}
/>
)
}
Expand Down Expand Up @@ -717,6 +723,7 @@ type CyclotronJobInputProps = {
emailFieldErrors?: EmailFieldErrors
emailLiveChanges?: boolean
emailSaveIndicator?: ReactNode
emailSandboxSenderAllowed?: boolean
}

function NonFailureStatusCodesField({
Expand Down Expand Up @@ -772,6 +779,7 @@ function CyclotronJobInputRenderer({
emailFieldErrors,
emailLiveChanges,
emailSaveIndicator,
emailSandboxSenderAllowed,
}: CyclotronJobInputProps): JSX.Element {
const templating = schema.templating ?? true

Expand Down Expand Up @@ -917,6 +925,7 @@ function CyclotronJobInputRenderer({
fieldErrors={emailFieldErrors}
liveChanges={emailLiveChanges}
saveIndicator={emailSaveIndicator}
sandboxSenderAllowed={emailSandboxSenderAllowed}
/>
)
case 'non_failure_status_codes':
Expand Down Expand Up @@ -1106,6 +1115,7 @@ function CyclotronJobInputWithSchema({
emailFieldErrors,
emailLiveChanges,
emailSaveIndicator,
emailSandboxSenderAllowed,
}: CyclotronJobInputWithSchemaProps): JSX.Element | null {
const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id: schema.key })
const [editing, setEditing] = useState(false)
Expand Down Expand Up @@ -1276,6 +1286,7 @@ function CyclotronJobInputWithSchema({
emailFieldErrors={emailFieldErrors}
emailLiveChanges={emailLiveChanges}
emailSaveIndicator={emailSaveIndicator}
emailSandboxSenderAllowed={emailSandboxSenderAllowed}
/>
)}
{warning && !value?.secret ? (
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ export const FEATURE_FLAGS = {
WORKFLOWS_LINEAR_VIEW: 'workflows-linear-view', // owner: #team-workflows
WORKFLOWS_OVERVIEW_TAB: 'workflows-overview-tab', // owner: @dmarchuk #team-workflows, experimental Overview tab on a workflow
WORKFLOWS_PUSH_NOTIFICATIONS: 'workflows-push-notifications', // owner: #team-workflows
WORKFLOWS_SANDBOX_SENDER: 'workflows-sandbox-sender', // owner: #team-workflows
WORKFLOWS_SEND_CALENDAR: 'workflows-send-calendar', // owner: @meikelmosby #team-workflows, calendar of scheduled email sends in Broadcasts and Workflows
WORKFLOWS_TILE_CANVAS: 'workflows-tile-canvas', // owner: #team-workflows
WORKFLOWS_TRANSACTIONAL_EMAIL_API: 'workflows-transactional-email-api', // owner: @mayteio #team-workflows
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/lib/integrations/IntegrationsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export function IntegrationsList({
/** Rendered once the list has loaded and nothing matches. */
emptyState?: JSX.Element
}): JSX.Element {
const { integrations, integrationsLoading } = useValues(integrationsLogic)
const { userManagedIntegrations, integrationsLoading } = useValues(integrationsLogic)
const { startPolling, stopPolling } = useActions(integrationsLogic)

useOnMountEffect(() => {
startPolling()
return () => stopPolling()
})
const filteredIntegrations = integrations?.filter((integration) => {
const filteredIntegrations = userManagedIntegrations?.filter((integration) => {
if (onlyKinds && !onlyKinds.includes(integration.kind)) {
return false
}
Expand All @@ -46,7 +46,7 @@ export function IntegrationsList({
filteredIntegrations.map((integration) => (
<IntegrationView key={integration.id} integration={integration} />
))
) : integrationsLoading || integrations === null ? (
) : integrationsLoading || userManagedIntegrations === null ? (
<LemonSkeleton className="h-10" />
) : (
emptyState
Expand Down
Loading
Loading