Skip to content

Commit 724c5d7

Browse files
liu-samuelliu-samuel
committed
Convert provision dialog page to React, fix cypress tests to work with conversion
1 parent 9761b10 commit 724c5d7

File tree

4 files changed

+46
-41
lines changed

4 files changed

+46
-41
lines changed

‎app/controllers/miq_ae_customization_controller.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class MiqAeCustomizationController < ApplicationController
77
helper ApplicationHelper::ImportExportHelper
88
include Mixins::GenericSessionMixin
99
include Mixins::BreadcrumbsMixin
10+
include MiqAeCustomizationHelper
1011

1112
before_action :check_privileges
1213
before_action :get_session_data

‎app/helpers/miq_ae_customization_helper.rb‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,35 @@ def dialog_id_action
1717
{:id => '', :action => 'new'}
1818
end
1919
end
20+
21+
def miq_ae_customization_summary(record)
22+
summary = [
23+
miq_ae_customization_basic_info(record),
24+
miq_ae_customization_content(record),
25+
]
26+
safe_join(summary)
27+
end
28+
29+
def miq_ae_customization_basic_info(record)
30+
rows = [
31+
row_data(_('Name'), record.name),
32+
row_data(_('Description'), record.description),
33+
]
34+
miq_structured_list({
35+
:title => _('Basic Information'),
36+
:mode => "miq_ae_customization_summary",
37+
:rows => rows
38+
})
39+
end
40+
41+
def miq_ae_customization_content(record)
42+
rows = [
43+
row_data('', {:input => 'code_mirror', :props => {:mode => 'yaml', :payload => YAML.dump(record.content)}})
44+
]
45+
miq_structured_list({
46+
:title => _('Content'),
47+
:mode => "method_built_in_data",
48+
:rows => rows
49+
})
50+
end
2051
end

‎app/views/miq_ae_customization/_old_dialogs_details.html.haml‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,5 @@
99
= react('MiqAeCustomization',
1010
:dialogRecord => @dialog,
1111
:dialogTypes => dialog_types)
12-
- else
13-
= render :partial => "layouts/flash_msg"
14-
%h3
15-
= _('Basic Information')
16-
.form-horizontal
17-
.form-group
18-
%label.col-md-2.control-label
19-
= _('Name')
20-
.col-md-8
21-
%p.form-control-static
22-
= h(@dialog.name)
23-
.form-group
24-
%label.col-md-2.control-label
25-
= _('Description')
26-
.col-md-8
27-
%p.form-control-static
28-
= h(@dialog.description)
29-
%hr
30-
%h3
31-
= _('Content')
32-
= text_area("script", "data",
33-
:value => h(@dialog.content.to_yaml),
34-
:readonly => "readonly",
35-
:style => "display:none;")
36-
= render(:partial => "layouts/my_code_mirror",
37-
:locals => {:text_area_id => "script_data",
38-
:mode => "yaml",
39-
:line_numbers => true,
40-
:read_only => true})
12+
- if @dialog && !@in_a_form
13+
= miq_ae_customization_summary(@dialog)

‎cypress/e2e/ui/Automation/Embedded-Automate/customization.cy.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ describe('Automation > Embedded Automate > Customization', () => {
1818

1919
it('Clicks on a sample dialog', () => {
2020
cy.get('[title="Sample Configuration Management Provisioning Dialog"]').click({force: true});
21-
cy.get('[class="form-control-static"]').contains('miq_provision_configured_system_foreman_dialogs');
22-
cy.get('[class="form-control-static"]').contains('Sample Configuration Management Provisioning Dialog');
21+
cy.get('.miq_ae_customization_summary').contains('miq_provision_configured_system_foreman_dialogs');
22+
cy.get('.miq_ae_customization_summary').contains('Sample Configuration Management Provisioning Dialog');
2323
cy.get('[class="CodeMirror-code"]').contains('---');
2424
cy.get('[class="CodeMirror-code"]').contains(':buttons:');
2525
});
@@ -33,12 +33,12 @@ describe('Automation > Embedded Automate > Customization', () => {
3333
cy.get('[name="dialog_type"]').select('Configured System Provision');
3434
cy.get('[class="CodeMirror-lines"]').type(':Buttons:');
3535
cy.get('[class="btnRight bx--btn bx--btn--primary"]').click({force: true});
36-
cy.get('[class="col-md-12"]').contains('Test Description');
36+
cy.get('.miq_ae_customization_summary').contains('Test Description');
3737

3838
// check correct data is displaying
3939
cy.contains('Test Description').click({force: true});
40-
cy.get('[class="form-control-static"]').contains('Test User');
41-
cy.get('[class="form-control-static"]').contains('Test Description');
40+
cy.get('.miq_ae_customization_summary').contains('Test User');
41+
cy.get('.miq_ae_customization_summary').contains('Test Description');
4242
cy.get('[class="CodeMirror-code"]').contains('---');
4343
cy.get('[class="CodeMirror-code"]').contains(':Buttons:');
4444

@@ -81,8 +81,8 @@ describe('Automation > Embedded Automate > Customization', () => {
8181
// check correct data is displaying
8282
// cy.get('[id="main_div"]').contains('Test Description');
8383
cy.contains('Test Description').click({force: true});
84-
cy.get('[class="form-control-static"]').contains('Test User');
85-
cy.get('[class="form-control-static"]').contains('Test Description');
84+
cy.get('.miq_ae_customization_summary').contains('Test User');
85+
cy.get('.miq_ae_customization_summary').contains('Test Description');
8686
cy.get('[class="CodeMirror-code"]').contains('---');
8787
cy.get('[class="CodeMirror-code"]').contains(':Buttons:');
8888

@@ -101,16 +101,16 @@ describe('Automation > Embedded Automate > Customization', () => {
101101

102102
// check correct data after editing
103103
cy.contains('Edited Test Description').click({force: true});
104-
cy.get('[class="form-control-static"]').contains('Edited Test User');
105-
cy.get('[class="form-control-static"]').contains('Edited Test Description');
104+
cy.get('.miq_ae_customization_summary').contains('Edited Test User');
105+
cy.get('.miq_ae_customization_summary').contains('Edited Test Description');
106106
cy.get('[class="CodeMirror-code"]').contains('---');
107107
cy.get('[class="CodeMirror-code"]').contains(':Buttons:');
108108
cy.get('[class="CodeMirror-code"]').contains(':submit:');
109109
cy.get('[class="CodeMirror-code"]').contains(':cancel:');
110110

111111
// check correct data after copying
112112
cy.contains('Edited Test Description').click({force: true});
113-
cy.get('[class="form-control-static"]').contains('Edited Test Description');
113+
cy.get('.miq_ae_customization_summary').contains('Edited Test Description');
114114
cy.get('[class="CodeMirror-code"]').contains('---');
115115
cy.get('[class="CodeMirror-code"]').contains(':Buttons:');
116116
cy.get('[class="CodeMirror-code"]').contains(':submit:');
@@ -136,8 +136,8 @@ describe('Automation > Embedded Automate > Customization', () => {
136136

137137
// check correct data is displaying
138138
cy.contains('Test Description').click({force: true});
139-
cy.get('[class="form-control-static"]').contains('Test User');
140-
cy.get('[class="form-control-static"]').contains('Test Description');
139+
cy.get('.miq_ae_customization_summary').contains('Test User');
140+
cy.get('.miq_ae_customization_summary').contains('Test Description');
141141
cy.get('[class="CodeMirror-code"]').contains('---');
142142
cy.get('[class="CodeMirror-code"]').contains(':Buttons:');
143143

0 commit comments

Comments
 (0)