diff --git a/app/Http/Requests/App/Automations/UpdateAutomationRequest.php b/app/Http/Requests/App/Automations/UpdateAutomationRequest.php index 2257fd24..8725bcbc 100644 --- a/app/Http/Requests/App/Automations/UpdateAutomationRequest.php +++ b/app/Http/Requests/App/Automations/UpdateAutomationRequest.php @@ -121,7 +121,7 @@ private function dataRulesForNodeType(?string $type): array NodeType::Trigger->value => [ 'trigger_type' => ['required', Rule::in(array_column(TriggerType::cases(), 'value'))], 'cron' => ['required_if:nodes.*.data.trigger_type,'.TriggerType::Schedule->value, 'string'], - 'schedule_field' => ['sometimes', Rule::in(['minutes', 'hours', 'days', 'weeks', 'months', 'custom'])], + 'schedule_field' => ['sometimes', Rule::in(['minutes', 'hours', 'days', 'weeks', 'months'])], 'schedule_minutes_interval' => ['sometimes', 'integer', 'min:1', 'max:59'], 'schedule_hours_interval' => ['sometimes', 'integer', 'min:1', 'max:23'], 'schedule_days_interval' => ['sometimes', 'integer', 'min:1', 'max:31'], @@ -130,7 +130,6 @@ private function dataRulesForNodeType(?string $type): array 'schedule_weekdays' => ['sometimes', 'array'], 'schedule_weekdays.*' => ['integer', 'min:0', 'max:6'], 'schedule_day_of_month' => ['sometimes', 'integer', 'min:1', 'max:31'], - 'schedule_custom_cron' => ['sometimes', 'nullable', 'string'], 'schedule_timezone' => ['sometimes', 'string', 'timezone'], ], NodeType::FetchRss->value => [ diff --git a/lang/en/automations.php b/lang/en/automations.php index c8340e44..eb6e9078 100644 --- a/lang/en/automations.php +++ b/lang/en/automations.php @@ -241,7 +241,6 @@ 'days' => 'Days', 'weeks' => 'Weeks', 'months' => 'Months', - 'custom' => 'Custom (Cron)', ], 'minutes_interval' => 'Minutes between triggers', 'hours_interval' => 'Hours between triggers', @@ -250,8 +249,6 @@ 'minute' => 'Trigger at minute', 'weekdays' => 'Trigger on weekdays', 'day_of_month' => 'Day of month', - 'custom_cron' => 'Cron expression', - 'custom_cron_hint' => 'Format: minute hour day month weekday', 'timezone_hint' => 'All times in :tz', 'weekday_names' => [ 'sun' => 'Sun', diff --git a/lang/es/automations.php b/lang/es/automations.php index fa683cb5..9b43c1e4 100644 --- a/lang/es/automations.php +++ b/lang/es/automations.php @@ -241,7 +241,6 @@ 'days' => 'Días', 'weeks' => 'Semanas', 'months' => 'Meses', - 'custom' => 'Personalizado (Cron)', ], 'minutes_interval' => 'Minutos entre disparos', 'hours_interval' => 'Horas entre disparos', @@ -250,8 +249,6 @@ 'minute' => 'Disparar al minuto', 'weekdays' => 'Disparar en días', 'day_of_month' => 'Día del mes', - 'custom_cron' => 'Expresión cron', - 'custom_cron_hint' => 'Formato: minuto hora día mes día-de-semana', 'timezone_hint' => 'Todos los horarios en :tz', 'weekday_names' => [ 'sun' => 'Dom', diff --git a/lang/pt-BR/automations.php b/lang/pt-BR/automations.php index fb0e9fd7..0d9361c1 100644 --- a/lang/pt-BR/automations.php +++ b/lang/pt-BR/automations.php @@ -241,7 +241,6 @@ 'days' => 'Dias', 'weeks' => 'Semanas', 'months' => 'Meses', - 'custom' => 'Personalizado (Cron)', ], 'minutes_interval' => 'Minutos entre disparos', 'hours_interval' => 'Horas entre disparos', @@ -250,8 +249,6 @@ 'minute' => 'Disparar no minuto', 'weekdays' => 'Disparar nos dias', 'day_of_month' => 'Dia do mês', - 'custom_cron' => 'Expressão cron', - 'custom_cron_hint' => 'Formato: minuto hora dia mês dia-da-semana', 'timezone_hint' => 'Todos os horários em :tz', 'weekday_names' => [ 'sun' => 'Dom', diff --git a/resources/js/components/automations/config/TriggerNodeConfig.vue b/resources/js/components/automations/config/TriggerNodeConfig.vue index 2a30d183..fb87cbe8 100644 --- a/resources/js/components/automations/config/TriggerNodeConfig.vue +++ b/resources/js/components/automations/config/TriggerNodeConfig.vue @@ -1,6 +1,13 @@