Skip to content

Commit f3390cd

Browse files
committed
TextualSummaries: fix rendering of individual parts.
1 parent d89f23c commit f3390cd

14 files changed

+43
-19
lines changed

app/helpers/textual_listview.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ def locals
1313
def self.new_from_hash(h)
1414
new(*h.values_at(*members))
1515
end
16+
17+
def self.data(h)
18+
self.new_from_hash(h).locals
19+
end
1620
end

app/javascript/packs/component-definitions-common.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
22
import { TagGroup, TableListView, GenericGroup } from '@manageiq/react-ui-components/dist/textual_summary';
33
import TextualSummaryWrapper from '../react/textual_summary_wrapper';
4+
import TableListViewWrapper from '../react/table_list_view_wrapper';
5+
import GenericGroupWrapper from '../react/generic_group_wrapper';
46
import { addReact } from '../miq-component/helpers';
57

68
/**
@@ -11,6 +13,8 @@ import { addReact } from '../miq-component/helpers';
1113

1214
addReact('TagGroup', props => <TagGroup {...props} />);
1315
addReact('TableListView', TableListView);
16+
addReact('TableListViewWrapper', TableListViewWrapper);
1417
addReact('GenericGroup', GenericGroup);
18+
addReact('GenericGroupWrapper', GenericGroupWrapper);
1519
addReact('TextualSummaryWrapper', TextualSummaryWrapper);
1620

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import React from 'react';
2+
import { GenericGroup } from '@manageiq/react-ui-components/dist/textual_summary';
3+
import textualSummaryGenericClick from './textual_summary_click';
4+
5+
export default (props) => {
6+
const onClick = props.onClick || textualSummaryGenericClick;
7+
return <GenericGroup onClick={onClick} {...props} />;
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import React from 'react';
2+
import { TableListView } from '@manageiq/react-ui-components/dist/textual_summary';
3+
import textualSummaryGenericClick from './textual_summary_click';
4+
5+
export default (props) => {
6+
const onClick = props.onClick || textualSummaryGenericClick;
7+
return <TableListView onClick={onClick} {...props} />;
8+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
= render :partial => "layouts/flash_msg"
22
.row
33
.col-md-12.col-lg-8
4-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_script_group_properties), @record)
4+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_script_group_properties), @record)
55
.col-md-12.col-lg-8
6-
= react 'TableListView', textual_configuration_script_variables
6+
= react 'TableListViewWrapper', TextualListview.data(textual_configuration_script_variables)
77
.col-md-12.col-lg-8
88
- if @record.survey_spec['spec']
9-
= react 'TableListView', textual_configuration_script_survey
9+
= react 'TableListViewWrapper', TextualListview.data(textual_configuration_script_survey)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
= render :partial => "layouts/flash_msg"
22
.row
33
.col-md-12.col-lg-6
4-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Properties'), textual_inventory_group_properties), @record)
4+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Properties'), textual_inventory_group_properties), @record)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
= render :partial => "layouts/flash_msg"
22
.row
33
.col-md-12.col-lg-8
4-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_script_group_properties), @record)
4+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_script_group_properties), @record)
55
.col-md-12.col-lg-8
6-
= react 'TableListView', textual_configuration_script_variables
6+
= react 'TableListViewWrapper', TextualListview.data(textual_configuration_script_variables)
77
.col-md-12.col-lg-8
88
- if @record.survey_spec['spec']
9-
= react 'TableListView', textual_configuration_script_survey
9+
= react 'TableListViewWrapper', TextualListview.data(textual_configuration_script_survey)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
= render :partial => "layouts/flash_msg"
22
.row
33
.col-md-12.col-lg-6
4-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_profile_group_properties), @record)
5-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Environment'), textual_configuration_profile_group_environment), @record)
6-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Operating System'), textual_configuration_profile_group_os), @record)
4+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Properties'), textual_configuration_profile_group_properties), @record)
5+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Environment'), textual_configuration_profile_group_environment), @record)
6+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Operating System'), textual_configuration_profile_group_os), @record)
77
.col-md-12.col-lg-6
8-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Tenancy'), textual_configuration_profile_group_tenancy), @record)
8+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Tenancy'), textual_configuration_profile_group_tenancy), @record)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
= render :partial => "layouts/flash_msg"
22
.row
33
.col-md-12.col-lg-6
4-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(_('Properties'), textual_inventory_group_properties), @record)
4+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(_('Properties'), textual_inventory_group_properties), @record)

app/views/pxe/_iso_datastore_details.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
= render :partial => "iso_datastore_form"
88
- else
99
= render :partial => "layouts/flash_msg"
10-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(binf, textual_iso_datastore_basicinfo), @record)
10+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(binf, textual_iso_datastore_basicinfo), @record)
1111
- unless @isd.iso_images.empty?
1212
%h3= _('ISO Images')
1313
%table.table.table-bordered.table-striped.table-hover
@@ -27,4 +27,4 @@
2727
= render :partial => "iso_img_form"
2828
- else
2929
= render :partial => "layouts/flash_msg"
30-
= react 'GenericGroup', expand_generic_group(TextualGroup.new(binf, textual_iso_img_info), @record)
30+
= react 'GenericGroupWrapper', expand_generic_group(TextualGroup.new(binf, textual_iso_img_info), @record)

0 commit comments

Comments
 (0)