Add Ansible related inputs to GOD haml #5166

ZitaNemeckova · 2019-01-17T10:10:59Z

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1650559

Go to Automation -> Automate -> Generic Object -> create or edit a button -> select Button type to be Ansible Playbook

Depends on ManageIQ/manageiq#18379

Before:

After:

Ansible Catalog Item is required!

@miq-bot add_label wip, bug, hammer/yes, gaprindashvili/yes, generic objects, automation/
automate

miq-bot · 2019-01-17T10:11:18Z

@ZitaNemeckova Cannot apply the following label because they are not recognized: automation/

ZitaNemeckova · 2019-02-01T14:43:15Z

@miq-bot add_label pending core

ZitaNemeckova · 2019-02-13T13:38:35Z

@miq-bot remove_label wip, pending core

himdel · 2019-02-22T08:38:13Z

app/assets/javascripts/components/generic_object/main-custom-button-form.js

+        if (vm.customButtonRecordId) {
+          vm.newRecord = false;
+          miqService.sparkleOn();
+          dataPromise = API.get('/api/custom_buttons/' + vm.customButtonRecordId + '?attributes=resource_action,uri_attributes')


this won't work - you're setting dataPromise after you use it in $q.all, so we never wait for this one.

But.. looks like no part of this request depends on anything from the options request, right? (I mean to make the request, not to process the response.)

So, maybe something like...

var optionsPromise = API.options('/api/custom_buttons') .then(function(response) { _.forEach(response.data.custom_button_types, function(name, id) { vm.button_types.push({id: id, name: name}); }); }); if (vm.customButtonRecordId) { vm.newRecord = false; //miqService.sparkleOn(); - see second coment var dataPromise = API.get('/api/custom_buttons/' + vm.customButtonRecordId + '?attributes=resource_action,uri_attributes'); .then(getCustomButtonFormData) // getCustomButtonFormData already waits for optionsPromise inside .catch(miqService.handleFailure); } else { vm.newRecord = true; vm.modelCopy = angular.copy( vm.customButtonModel ); }

?

Also, since we're always waiting for some responses,
we should probably sparkleOn every time (not only with id), and sparkleOff in the big $q.all block.

himdel · 2019-02-22T08:42:34Z

app/assets/javascripts/components/generic_object/main-custom-button-form.js

@@ -258,8 +283,14 @@ function mainCustomButtonFormController(API, miqService, $q, $http) {
        vm.customButtonModel.attribute_names,
        vm.customButtonModel.attribute_values);

+      if(vm.customButtonModel.uri_attributes.hosts == undefined || vm.customButtonModel.uri_attributes.hosts === "localhost" || vm.customButtonModel.uri_attributes.hosts == null) {


missing spaces after if, and before { on line 288

also, no point testing both vm.customButtonModel.uri_attributes.hosts == undefined and vm.customButtonModel.uri_attributes.hosts == null. Those are exactly the same thing without ===.

(And this should really be just if (!vm.customButtonModel.uri_attributes.hosts || vm.customButtonModel.uri_attributes.hosts === 'localhost') .. comparing against null or undefined is usually not what you want :).

himdel · 2019-02-22T08:43:38Z

app/assets/javascripts/components/generic_object/main-custom-button-form.js

@@ -243,7 +267,8 @@ function mainCustomButtonFormController(API, miqService, $q, $http) {

    vm.genericObjectDefinitionRecordId = response.applies_to_id;

-    optionsPromise.then(function() {
+    vm.customButtonModel.uri_attributes = response.uri_attributes;
+
      if (vm.customButtonModel.current_visibility === 'role') {


bad indent for this whole block? (246..262 in original)

app/views/static/generic_object/main_custom_button_form.html.haml

ZitaNemeckova · 2019-05-01T13:27:18Z

@miq-bot add_label changelog/yes

ZitaNemeckova · 2019-05-03T12:21:44Z

@himdel please re-review, thanks :)

himdel · 2019-05-03T13:38:02Z

Sure, but fix the miq-bot error please? :)

app/assets/javascripts/components/generic_object/main-custom-button-form.js

himdel · 2019-05-03T13:46:19Z

app/views/static/generic_object/main_custom_button_form.html.haml

+    %label.control-label.col-md-2
+      = _("Inventory")
+    .col-md-8
+      %input{:type => "radio", :id => "inventory_localhost", :value => "localhost", 'ng-model' => 'vm.inventory'}


We now have those 3 options in:

app/views/static/generic_object/main_custom_button_form.html.haml 44: = label_tag('inventory_localhost', _("Localhost"), "title" => _('Run on localhost')) 47: = label_tag('inventory_event_target', _("Target Machine"), "title" => _('Run on the target of the Policy Event')) 50: = label_tag(_("Specific Hosts")) app/views/shared/_playbook_options.html.haml 24: = label_tag('inventory_localhost', _("Localhost"), "title" => _('Run on localhost')) 29: = label_tag('inventory_event_target', _("Target Machine"), "title" => _('Run on the target of the Policy Event')) 34: = label_tag('inventory_manual', _("Specific Hosts"), "title" => _('Enter a comma separated list of IP or DNS names')) app/views/miq_policy/_action_options.html.haml 341: = label_tag('inventory_localhost', _("Localhost"), "title" => _('Run on localhost')) 347: = label_tag('inventory_event_target', _("Target Machine"), "title" => _('Run on the target of the Policy Event')) 353: = label_tag('inventory_manual', _("Specific Hosts"), "title" => _('Enter a comma separated list of IP or DNS names'))

Time for a partial, I think ;)

EDIT: never mind, the other 2 are non-angular ..

Also, the inputs are missing name="inventory". Otherwise, you have 3 unrelated radio buttons, instead of one radio button group (it probably works anyway because they do share the same ng-model).

app/views/static/generic_object/main_custom_button_form.html.haml

miq-bot · 2019-05-30T13:51:39Z

Checked commits ZitaNemeckova/manageiq-ui-classic@38e6ad7~...285c611 with ruby 2.3.3, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
3 files checked, 1 offense detected

**

💣 💥 🔥 🚒 - Linter/Haml - Linter::Haml STDERR:

warning: parser/current is loading parser/ruby23, which recognizes
warning: 2.3.8-compliant syntax, but you are running 2.3.3.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.

Remove unused id Fix bad ids and bad intent Move dataPromise out of OptionsPromise because they don't depend on each other

ZitaNemeckova · 2019-06-21T12:48:41Z

@himdel This is ready for another review :)

ZitaNemeckova · 2019-06-21T12:49:58Z

@romanblanco could you test/have a look at this one, please?

romanblanco · 2019-06-21T12:52:12Z

@miq-bot assign @romanblanco

romanblanco

Tested, works 👍

miq-bot changed the title ~~Add Ansible related inputs to GOD haml~~ [WIP] Add Ansible related inputs to GOD haml Jan 17, 2019

miq-bot added bug gaprindashvili/yes generic objects wip labels Jan 17, 2019

ZitaNemeckova mentioned this pull request Jan 22, 2019

Add uri_attributes as virtual_attribute to CustomButton ManageIQ/manageiq#18379

Merged

miq-bot added the pending core label Feb 1, 2019

ZitaNemeckova force-pushed the add_ansible_to_GOD branch from 12e13f4 to e8f8885 Compare February 12, 2019 14:12

miq-bot changed the title ~~[WIP] Add Ansible related inputs to GOD haml~~ Add Ansible related inputs to GOD haml Feb 13, 2019

miq-bot removed wip pending core labels Feb 13, 2019

himdel added the automation/automate label Feb 22, 2019

himdel reviewed Feb 22, 2019

View reviewed changes

app/views/static/generic_object/main_custom_button_form.html.haml Outdated Show resolved Hide resolved

ZitaNemeckova added 7 commits March 18, 2019 10:29

Add Ansible related inputs to GOD haml

38e6ad7

Make async flow more human friendly

bd7e0a4

Use one catch for all Promises instead of having catch per Promise

ef160fe

Get, link and use missing data for Ansible inputs

8b5c970

Save uri_attributes only for button_type ansible_playbook

d0c7525

Mock missing GET request service_template_ansible_playbooks

8229151

Make Playbook Catalog item required

ea340a9

ZitaNemeckova force-pushed the add_ansible_to_GOD branch from 5d52a94 to 9c82507 Compare March 18, 2019 13:36

miq-bot added the changelog/yes label May 1, 2019

himdel reviewed May 3, 2019

View reviewed changes

app/assets/javascripts/components/generic_object/main-custom-button-form.js Outdated Show resolved Hide resolved

himdel reviewed May 3, 2019

View reviewed changes

app/views/static/generic_object/main_custom_button_form.html.haml Outdated Show resolved Hide resolved

himdel reviewed May 3, 2019

View reviewed changes

app/views/static/generic_object/main_custom_button_form.html.haml Outdated Show resolved Hide resolved

ZitaNemeckova force-pushed the add_ansible_to_GOD branch from 9c82507 to abda080 Compare May 9, 2019 12:14

ZitaNemeckova force-pushed the add_ansible_to_GOD branch from abda080 to 285c611 Compare May 30, 2019 13:47

Final clean-up fixes

285c611

Remove unused id Fix bad ids and bad intent Move dataPromise out of OptionsPromise because they don't depend on each other

miq-bot assigned romanblanco Jun 21, 2019

romanblanco approved these changes Jun 21, 2019

View reviewed changes

himdel added this to the Sprint 114 Ending Jun 24, 2019 milestone Jun 21, 2019

himdel merged commit 655f798 into ManageIQ:master Jun 21, 2019

ZitaNemeckova deleted the add_ansible_to_GOD branch June 21, 2019 14:09

ZitaNemeckova mentioned this pull request Oct 22, 2019

Fix edit of GOD custom button #6322

Merged

Fryguy added hammer/yes? and removed hammer/yes labels Nov 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Ansible related inputs to GOD haml #5166

Add Ansible related inputs to GOD haml #5166

ZitaNemeckova commented Jan 17, 2019 •

edited

Loading

miq-bot commented Jan 17, 2019

ZitaNemeckova commented Feb 1, 2019

ZitaNemeckova commented Feb 13, 2019

himdel Feb 22, 2019 •

edited

Loading

himdel Feb 22, 2019

himdel Feb 22, 2019

himdel Feb 22, 2019

ZitaNemeckova commented May 1, 2019

ZitaNemeckova commented May 3, 2019

himdel commented May 3, 2019

himdel May 3, 2019 •

edited

Loading

himdel May 3, 2019 •

edited

Loading

miq-bot commented May 30, 2019

ZitaNemeckova commented Jun 21, 2019

ZitaNemeckova commented Jun 21, 2019

romanblanco commented Jun 21, 2019

romanblanco left a comment

Add Ansible related inputs to GOD haml #5166

Add Ansible related inputs to GOD haml #5166

Conversation

ZitaNemeckova commented Jan 17, 2019 • edited Loading

miq-bot commented Jan 17, 2019

ZitaNemeckova commented Feb 1, 2019

ZitaNemeckova commented Feb 13, 2019

himdel Feb 22, 2019 • edited Loading

Choose a reason for hiding this comment

himdel Feb 22, 2019

Choose a reason for hiding this comment

himdel Feb 22, 2019

Choose a reason for hiding this comment

himdel Feb 22, 2019

Choose a reason for hiding this comment

ZitaNemeckova commented May 1, 2019

ZitaNemeckova commented May 3, 2019

himdel commented May 3, 2019

himdel May 3, 2019 • edited Loading

Choose a reason for hiding this comment

himdel May 3, 2019 • edited Loading

Choose a reason for hiding this comment

miq-bot commented May 30, 2019

ZitaNemeckova commented Jun 21, 2019

ZitaNemeckova commented Jun 21, 2019

romanblanco commented Jun 21, 2019

romanblanco left a comment

Choose a reason for hiding this comment

ZitaNemeckova commented Jan 17, 2019 •

edited

Loading

himdel Feb 22, 2019 •

edited

Loading

himdel May 3, 2019 •

edited

Loading

himdel May 3, 2019 •

edited

Loading