Restore the Delete button for servers in a zone

[lgalis]

Restore the Delete button for servers in a zone, selected from the right-side "Roles By Servers" tab

Links

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

---

Before:

After:

[lgalis]

@miq-bot add_label bug, ui, gaprindashvili/yes

[miq-bot]

@lgalis Cannot apply the following label because they are not recognized: ui

[skateman]

@lgalis are you sure this is not breaking anything? Just by analyzing the code, I found some places where the @selected_zone is being used:

ag "@selected_zone" app/
app/views/ops/_settings_evm_servers_tab.html.haml
11:            = @selected_zone.name
17:            = @selected_zone.description
23:            = @selected_zone.settings.key?(:proxy_server_ip) ? @selected_zone.settings[:proxy_server_ip] : ''
29:            = @selected_zone.settings[:ntp] ? @selected_zone.settings[:ntp][:server].join(", ") : ''
36:            = (@selected_zone.settings.key?(:concurrent_vm_scans) && @selected_zone.settings[:concurrent_vm_scans] > 0) ? @selected_zone.settings[:concurrent_vm_scans] : _("Unlimited")
45:            = @selected_zone.miq_servers.count
51:            = @selected_zone.ext_management_systems.count
57:            = @selected_zone.miq_schedules.count

app/views/ops/_smartproxy_affinity.html.haml
2:  = _("Assign Hosts and Datastores to Embedded SmartProxies in Zone: \"%{zone_description}\"") % {:zone_description => @selected_zone.description}
7:      = _("No Servers with the SmartProxy role are in Zone: \"%{zone_description}\"") % {:zone_description => @selected_zone.description}

app/controllers/ops_controller/settings/common.rb
624:    @edit[:key] = "#{@sb[:active_tab]}_edit__#{@selected_zone.id}"
625:    @sb[:selected_zone_id] = @selected_zone.id
628:    children[:hosts] = @selected_zone.hosts.collect(&:id)
629:    children[:storages] = @selected_zone.storages.collect(&:id)
631:    @selected_zone.miq_servers.each do |server|
639:    if @selected_zone.miq_servers.select(&:is_a_proxy?).present?
644:                                                                    @selected_zone)
911:      @right_cell_text = my_zone_name == @selected_zone.name ?
912:        _("Settings %{model} \"%{name}\" (current)") % {:name  => @selected_zone.description,
913:                                                        :model => ui_lookup(:model => @selected_zone.class.to_s)} :
914:        _("Settings %{model} \"%{name}\"") % {:name  => @selected_zone.description,
915:                                              :model => ui_lookup(:model => @selected_zone.class.to_s)}
1210:      @record = @zone = @selected_zone = Zone.find(nodes.last)
1211:      @right_cell_text = my_zone_name == @selected_zone.name ?
1212:          _("Settings %{model} \"%{name}\" (current)") % {:name  => @selected_zone.description,
1213:                                                          :model => ui_lookup(:model => @selected_zone.class.to_s)} :
1214:          _("Settings %{model} \"%{name}\"") % {:name  => @selected_zone.description,
1215:                                                :model => ui_lookup(:model => @selected_zone.class.to_s)}
1217:        if ms.zone_id == @selected_zone.id

app/helpers/application_helper.rb
561:      :selected_zone    => @selected_zone,

app/helpers/application_helper/button/zone_delete.rb
2:  needs :@selected_zone
5:    @error_message = if @selected_zone.name.downcase == 'default'
16:    @selected_zone.ext_management_systems.count > 0 ||
17:      @selected_zone.miq_schedules.count > 0 ||
18:      @selected_zone.miq_servers.count > 0

[lgalis]

@skateman - The setting of the @selected_zone in the diganostics.rb that is removed in this PR was added in #829, where the Configuration menu button was incorrectly changed to include Delete zone instead of Delete Server. This PR reverses that change.
The @selected_zone for other areas of ops is set here : https://github.com/lgalis/manageiq-ui-classic/blob/9700419ab6fe87939b884aeb0dfee46f1a8d4123/app/controllers/ops_controller/settings/common.rb#L1210
I could not find a place where the @selected_zone in Diagnostics is used.

(Note - the diagnostics.rb uses the @selected_server for the current record for zone, server and region depending on the treenode)

[lgalis]

@h-kataria - please review

[h-kataria]

@lgalis when i click on a Zone node in tree on left, i see Configuration button group and Delete Server button after applying this fix but the server node on the right is not displayed as selected, i think that should be highlighted as well.

[miq-bot]

Checked commits lgalis/manageiq-ui-classic@aa12252~...9592445 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
6 files checked, 0 offenses detected
Everything looks fine. ⭐

[lgalis]

@h-kataria - added code to highlight the selected server in teh roles by server tree, in addition to the existing display of the currently selected server in the 'Selected Item' box.
Please re-review.

[martinpovolny]

@lgalis : I'll leave this one to @h-kataria and @skateman. Thx!

[h-kataria]

LGTM, verified changes in UI.

[simaishi]

Gaprindashvili backport details:

$ git log -1
commit 7d279087cfeff7ec2db8d668c86d4d377fff9999
Author: Harpreet Kataria <[email protected]>
Date:   Fri Mar 16 14:58:04 2018 -0400

    Merge pull request #2213 from lgalis/restore_delete_button_for_servers_in_zone
    
    Restore the Delete button for servers in a zone
    (cherry picked from commit 70e9b64659a7b321d878ca1222ae8afe2b0db2a7)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1558092

[carbonin]

@miq-bot add_label fine/yes

[simaishi]

@lgalis Can you please confirm this and related PRs (#3650 and #3652) can to go Fine branch as is?

[lgalis]

@simaishi - I will create a separate PR for FINE

[simaishi]

@lgalis Thank you. I'll mark all 3 PRs as conflict for now.

[simaishi]

Backported to Fine via #3763