Skip to content
Merged
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
12 changes: 7 additions & 5 deletions webpack/global_index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import BulkChangePuppetCAProxy from './src/Extends/Hosts/BulkActions/BulkChangeP
import BulkRemovePuppetProxy from './src/Extends/Hosts/BulkActions/BulkRemovePuppetProxy';
import BulkRemovePuppetCAProxy from './src/Extends/Hosts/BulkActions/BulkRemovePuppetCAProxy';

const GLOBAL_FILL_PRIORITY = 100;

// register reducers
registerReducer('puppet', reducers);
// add fills
Expand Down Expand Up @@ -40,35 +42,35 @@ addGlobalFill(
'hosts-index-kebab',
'puppet-hosts-index-kebab',
<HostsIndexActionsBar key="puppet-hosts-index-kebab" />,
100
GLOBAL_FILL_PRIORITY
);

addGlobalFill(
'_all-hosts-modals',
'BulkChangePuppetProxy',
<BulkChangePuppetProxy key="bulk-change-puppet-proxy" />,
100
GLOBAL_FILL_PRIORITY
);

addGlobalFill(
'_all-hosts-modals',
'BulkChangePuppetCAProxy',
<BulkChangePuppetCAProxy key="bulk-change-puppet-ca-proxy" />,
100
GLOBAL_FILL_PRIORITY
);

addGlobalFill(
'_all-hosts-modals',
'BulkRemovePuppetCAProxy',
<BulkRemovePuppetCAProxy key="bulk-remove-puppet-ca-proxy" />,
100
GLOBAL_FILL_PRIORITY
);

addGlobalFill(
'_all-hosts-modals',
'BulkRemovePuppetProxy',
<BulkRemovePuppetProxy key="bulk-remove-puppet-proxy" />,
100
GLOBAL_FILL_PRIORITY
);

registerColumns(puppetHostsIndexColumns);
10 changes: 6 additions & 4 deletions webpack/src/foreman_class_edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import $ from 'jquery';
import { sprintf, translate as __ } from 'foremanReact/common/I18n';

const HIGHLIGHT_DURATION = 5000;

export function filterPuppetClasses(item) {
const term = $(item)
.val()
Expand Down Expand Up @@ -59,7 +61,7 @@ export function addPuppetClass(item) {

$('#selected_classes').append(content);

$(`#selected_puppetclass_${id}`).show('highlight', 5000);
$(`#selected_puppetclass_${id}`).show('highlight', HIGHLIGHT_DURATION);
$(`#puppetclass_${id}`)
.addClass('selected-marker')
.hide();
Expand Down Expand Up @@ -87,7 +89,7 @@ function addGroupPuppetClass(item) {

$('#selected_classes').append(content);

$(`#selected_puppetclass_${id}`).show('highlight', 5000);
$(`#selected_puppetclass_${id}`).show('highlight', HIGHLIGHT_DURATION);
$(`#puppetclass_${id}`)
.addClass('selected-marker')
.hide();
Expand Down Expand Up @@ -136,7 +138,7 @@ export function addConfigGroup(item) {
content.append(
`<input id='config_group_ids' name=${type}[config_group_ids][] type='hidden' value=${id}>`
);
$(`#selected_config_group_${id}`).show('highlight', 5000);
$(`#selected_config_group_${id}`).show('highlight', HIGHLIGHT_DURATION);
$(`#config_group_${id}`)
.addClass('selected-marker')
.hide();
Expand All @@ -149,7 +151,7 @@ export function addConfigGroup(item) {
link.text(__(' Remove'));

$('#selected_config_groups').append(content);
$(`#selected_config_group_${id}`).show('highlight', 5000);
$(`#selected_config_group_${id}`).show('highlight', HIGHLIGHT_DURATION);
$(`#config_group_${id}`)
.addClass('selected-marker')
.hide();
Expand Down
Loading