Skip to content

Fixes #39409 - Move FieldConstructor from webhooks plugin to core #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofedoren merged 7 commits into from
Jun 16, 2026
Merged

Fixes #39409 - Move FieldConstructor from webhooks plugin to core #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c02399
Fixes #39409 - Move FieldConstructor from webhooks plugin to core
Lukshio Jun 9, 2026
eeec1b4
bump foreman version
Lukshio Jun 9, 2026
d43bcbb
changed import order
Lukshio Jun 9, 2026
13ea8bd
remove outdated props
Lukshio Jun 12, 2026
d871300
Re-test with Core PR
Lukshio Jun 12, 2026
107509e
Remove CI changes
Lukshio Jun 12, 2026
0333951
Allow clearance for selectors
ofedoren Jun 16, 2026
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 lib/foreman_webhooks/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Engine < ::Rails::Engine
initializer 'foreman_webhooks.register_plugin', before: :finisher_hook do |app|
app.reloader.to_prepare do
Foreman::Plugin.register :foreman_webhooks do
requires_foreman '>= 3.18'
requires_foreman '>= 5.0'
register_gettext

apipie_documented_controllers ["#{ForemanWebhooks::Engine.root}/app/controllers/api/v2/*.rb"]
Expand Down
312 changes: 0 additions & 312 deletions ...ack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/FieldConstructor.js
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';

import FieldConstructor from 'foremanReact/components/common/FieldConstructor/FieldConstructor';
import { sprintf, translate as __ } from 'foremanReact/common/I18n';

import './WebhookFormTabs.css';
import FieldConstructor from './FieldConstructor';

const WebhookFormTabs = ({
inputValues,
Expand Down Expand Up @@ -48,7 +48,7 @@ const WebhookFormTabs = ({
type="select"
label={__('Subscribe to')}
required
allowClear={false}
allowClear
options={availableEvents}
isLoading={isEventsLoading}
placeholder={__('Start typing to search...')}
Expand Down Expand Up @@ -93,7 +93,7 @@ const WebhookFormTabs = ({
type="select"
label={__('Template')}
required
allowClear={false}
allowClear
options={webhookTemplates}
isLoading={isTemplatesLoading}
placeholder={__('Start typing to search...')}
Expand All @@ -105,7 +105,7 @@ const WebhookFormTabs = ({
type="select"
label={__('HTTP Method')}
required
allowClear={false}
allowClear
options={httpMethods}
placeholder={__('Start typing to search...')}
/>
Expand Down Expand Up @@ -173,7 +173,6 @@ const WebhookFormTabs = ({
placeholder={__(
"Optional CAs in PEM format concatenated to verify the receiver's SSL certificate"
)}
inputSizeClass="col-md-8"
rows={8}
setValue={updateFieldValue}
/>
Expand All @@ -200,7 +199,6 @@ const WebhookFormTabs = ({
label={__('HTTP Headers')}
labelHelp={__('Optional. Must be a JSON object (ERB allowed)')}
placeholder='{&#13;&#10;"X-Shellhook-Arg-1": "value",&#13;&#10;"X-Shellhook-Arg-2": "<%= @object.id %>"&#13;&#10;}'
inputSizeClass="col-md-8"
rows={8}
setValue={updateFieldValue}
/>
Expand Down
Loading
Loading