Pulled out simulation parameters #12272

syncrou · 2016-10-28T14:29:49Z

The execute method checkbox is not needed for
Schedule Automate methods, since all methods would
need to be executed, and currently are regardless
of that setting

Before

After

Links

PT #133269097

syncrou · 2016-10-28T14:53:10Z

@miq-bot add_label ui, automate

syncrou · 2016-10-28T14:53:28Z

@miq-bot assign @h-kataria

syncrou · 2016-10-28T14:53:39Z

cc - @gmcculloug

h-kataria · 2016-10-28T15:03:44Z

app/views/layouts/_ae_resolve_options.html.haml

@@ -85,19 +85,6 @@
            :javascript
              miqInitSelectPicker();
              miqSelectPickerEvent('target_id', "#{url}")
- if ae_sim_form


@syncrou this is the code for actual automate simulation screen, do we need to remove Execute Methods checkbox form there as well?

Oh - No - I'll get that fixed.

h-kataria · 2016-10-28T15:06:21Z

@syncrou should also cleanup:
https://github.com/ManageIQ/manageiq/blob/master/app/controllers/ops_controller/settings/automate_schedules.rb#L18

https://github.com/ManageIQ/manageiq/blob/master/app/controllers/ops_controller/settings/automate_schedules.rb#L56

https://github.com/ManageIQ/manageiq/blob/master/app/assets/javascripts/controllers/schedule/schedule_form_controller.js#L77

https://github.com/ManageIQ/manageiq/blob/master/app/assets/javascripts/controllers/schedule/schedule_form_controller.js#L219

syncrou · 2016-10-28T15:06:52Z

@h-kataria - Cool. I'll take care of that.

syncrou · 2016-10-28T17:38:03Z

@h-kataria - Should be all set now after 🍏

h-kataria · 2016-10-31T13:41:14Z

app/views/ops/_schedule_show.html.haml

-          .col-md-10
-            %p.form-control-static
-              = h(@selected_schedule.filter[:parameters][:readonly].to_s.titleize)
+    - if @selected_schedule.filter[:parameters][:attrs].present?


@syncrou this whole block needs to be indented 1 tab in, this code block should be inside https://github.com/syncrou/manageiq/blob/301f34a5eb0fd62b3e6b53487c739b0f6ab124a5/app/views/ops/_schedule_show.html.haml#L49

The execute method checkbox is not needed for Schedule Automate methods, since all methods would need to be executed, and currently are regardless of that setting https://www.pivotaltracker.com/story/show/133269097

miq-bot · 2016-11-01T17:53:20Z

Checked commit syncrou@fd829de with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
2 files checked, 0 offenses detected
Everything looks good. 🍪

gmcculloug · 2016-11-01T18:42:19Z

Tested UI changes. 👍

@syncrou Please include before/after images.

Ran into one issue with the "Request" parameter being passed as expect which will be addressed in a separate PR.

h-kataria · 2016-11-02T16:42:13Z

looks good.

chessbyte · 2016-11-07T16:36:00Z

@gmcculloug @h-kataria euwe/yes or euwe/no please

simaishi · 2017-01-05T14:48:33Z

@syncrou Is there a BZ for this PR?

syncrou · 2017-01-06T14:25:52Z

@simaishi - Hi Satoe, no there was not - It was part of the feature that added the ability to Schedule Automate Jobs. I believe we removed them based on our knowledge of what would be needed - no one reported them as an issue.

simaishi · 2017-01-06T14:57:53Z

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1410807

simaishi · 2017-01-06T15:09:34Z

Euwe backport conflict:

$ git cherry-pick -e -x -m 1 4485b26
error: could not apply 4485b26... Merge pull request #12272 from syncrou/object_request_removal_for_automate_schedule

$ git diff
diff --cc app/assets/javascripts/controllers/schedule/schedule_form_controller.js
index d647eaf,4a06521..0000000
--- a/app/assets/javascripts/controllers/schedule/schedule_form_controller.js
+++ b/app/assets/javascripts/controllers/schedule/schedule_form_controller.js
@@@ -74,7 -74,7 +74,11 @@@ ManageIQ.angular.app.controller('schedu
          $scope.scheduleModel.object_request  = data.object_request;
          $scope.scheduleModel.target_class    = data.target_class;
          $scope.scheduleModel.target_id       = data.target_id;
++<<<<<<< HEAD
 +        $scope.scheduleModel.ui_attrs        = data.ui_attrs;
++=======
+         $scope.scheduleModel.attrs           = data.attrs;
++>>>>>>> 4485b26... Merge pull request #12272 from syncrou/object_request_removal_for_automate_schedule
  
          $scope.setTimerType();
  
diff --cc app/controllers/ops_controller/settings/automate_schedules.rb
index 3006a4e,e77a462..0000000
--- a/app/controllers/ops_controller/settings/automate_schedules.rb
+++ b/app/controllers/ops_controller/settings/automate_schedules.rb
@@@ -10,10 -11,10 +10,14 @@@ module OpsController::Settings::Automat
        :instance_name   => automate_request[:instance_name],
        :object_message  => automate_request[:object_message],
        :object_request  => automate_request[:object_request],
 -      :target_class    => automate_request[:target_class],
 +      :target_class    => automate_request[:object_class],
        :target_classes  => automate_request[:target_classes],
        :target_id       => automate_request[:target_id],
++<<<<<<< HEAD
 +      :ui_attrs        => automate_request[:ui_attrs]
++=======
+       :attrs           => automate_request[:attrs]
++>>>>>>> 4485b26... Merge pull request #12272 from syncrou/object_request_removal_for_automate_schedule
      }
    end
  
@@@ -50,15 -51,15 +54,20 @@@
        targets = Rbac.filtered(automate_request[:target_class]).select(:id, :name)
        automate_request[:targets] = targets.sort_by { |t| t.name.downcase }.collect { |t| [t.name, t.id.to_s] }
      end
++<<<<<<< HEAD
 +    automate_request[:target_id]      = filter[:ui][:ui_object][:target_id] || ""
 +    automate_request[:ui_attrs]       = filter[:ui][:ui_attrs] || []
++=======
+     automate_request[:target_id]      = filter[:parameters][:target_id] || ""
+     automate_request[:attrs]          = filter[:parameters][:attrs] || []
++>>>>>>> 4485b26... Merge pull request #12272 from syncrou/object_request_removal_for_automate_schedule
  
 -    if automate_request[:attrs].empty?
 -      AE_MAX_RESOLUTION_FIELDS.times { automate_request[:attrs].push([]) }
 +    if automate_request[:ui_attrs].empty?
 +      AE_MAX_RESOLUTION_FIELDS.times { automate_request[:ui_attrs].push([]) }
      else
        # add empty array if @resolve[:new][:attrs] length is less than AE_MAX_RESOLUTION_FIELDS
 -      len = automate_request[:attrs].length
 -      AE_MAX_RESOLUTION_FIELDS.times { automate_request[:attrs].push([]) if len < AE_MAX_RESOLUTION_FIELDS }
 +      len = automate_request[:ui_attrs].length
 +      AE_MAX_RESOLUTION_FIELDS.times { automate_request[:ui_attrs].push([]) if len < AE_MAX_RESOLUTION_FIELDS }
      end
      automate_request
    end
diff --cc app/views/ops/_schedule_show.html.haml
index 199b6eb,1eba0c5..0000000
--- a/app/views/ops/_schedule_show.html.haml
+++ b/app/views/ops/_schedule_show.html.haml
@@@ -77,10 -77,10 +77,17 @@@
              %p.form-control-static
                = h(@object_name)
  
++<<<<<<< HEAD
 +      - if @selected_schedule.filter[:ui][:ui_attrs].present?
 +        %div
 +          = _("Attribute/Value Pairs")
 +          - @selected_schedule.filter[:ui][:ui_attrs].each_with_index do |attr, i|
++=======
+       - if @selected_schedule.filter[:parameters][:attrs].present?
+         %div
+           = _("Attribute/Value Pairs")
+           - @selected_schedule.filter[:parameters][:attrs].each_with_index do |attr, i|
++>>>>>>> 4485b26... Merge pull request #12272 from syncrou/object_request_removal_for_automate_schedule
              .form-group
                %label.control-label.col-md-2
                  = (i + 1).to_s

simaishi · 2017-01-06T15:09:46Z

@syncrou Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport.

…_for_automate_schedule Pulled out simulation parameters (cherry picked from commit 4485b26)

simaishi · 2017-01-20T14:07:51Z

Backported to Euwe via #13472

miq-bot added automate ui labels Oct 28, 2016

miq-bot assigned h-kataria Oct 28, 2016

h-kataria reviewed Oct 28, 2016

View reviewed changes

syncrou force-pushed the object_request_removal_for_automate_schedule branch 2 times, most recently from ed2bb82 to 5a81984 Compare October 28, 2016 17:37

syncrou force-pushed the object_request_removal_for_automate_schedule branch from 5a81984 to 301f34a Compare October 28, 2016 19:31

h-kataria suggested changes Oct 31, 2016

View reviewed changes

Pulled out simulation parameters

fd829de

The execute method checkbox is not needed for Schedule Automate methods, since all methods would need to be executed, and currently are regardless of that setting https://www.pivotaltracker.com/story/show/133269097

syncrou force-pushed the object_request_removal_for_automate_schedule branch from 301f34a to fd829de Compare November 1, 2016 17:47

h-kataria approved these changes Nov 2, 2016

View reviewed changes

h-kataria added this to the Sprint 49 Ending Nov 14, 2016 milestone Nov 2, 2016

h-kataria merged commit 4485b26 into ManageIQ:master Nov 2, 2016

syncrou added the euwe/yes label Nov 7, 2016

simaishi added the euwe/conflict label Jan 6, 2017

syncrou pushed a commit to syncrou/manageiq that referenced this pull request Jan 12, 2017

Merge pull request ManageIQ#12272 from syncrou/object_request_removal…

0e76567

…_for_automate_schedule Pulled out simulation parameters (cherry picked from commit 4485b26)

syncrou mentioned this pull request Jan 12, 2017

[EUWE] Pulled out simulation parameters #13472

Merged

simaishi added euwe/backported and removed euwe/conflict labels Jan 20, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pulled out simulation parameters #12272

Pulled out simulation parameters #12272

syncrou commented Oct 28, 2016 •

edited

Loading

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

h-kataria Oct 28, 2016

syncrou Oct 28, 2016 •

edited

Loading

h-kataria commented Oct 28, 2016

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

h-kataria Oct 31, 2016

miq-bot commented Nov 1, 2016

gmcculloug commented Nov 1, 2016

h-kataria commented Nov 2, 2016

chessbyte commented Nov 7, 2016

simaishi commented Jan 5, 2017

syncrou commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 20, 2017

Pulled out simulation parameters #12272

Pulled out simulation parameters #12272

Conversation

syncrou commented Oct 28, 2016 • edited Loading

Links

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

h-kataria Oct 28, 2016

Choose a reason for hiding this comment

syncrou Oct 28, 2016 • edited Loading

Choose a reason for hiding this comment

h-kataria commented Oct 28, 2016

syncrou commented Oct 28, 2016

syncrou commented Oct 28, 2016

h-kataria Oct 31, 2016

Choose a reason for hiding this comment

miq-bot commented Nov 1, 2016

gmcculloug commented Nov 1, 2016

h-kataria commented Nov 2, 2016

chessbyte commented Nov 7, 2016

simaishi commented Jan 5, 2017

syncrou commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 6, 2017

simaishi commented Jan 20, 2017

syncrou commented Oct 28, 2016 •

edited

Loading

syncrou Oct 28, 2016 •

edited

Loading