Fixed alphabetical order in Labels table

[nimrodshn]

Fixed the alphabetical order in the Labels table to suit with openshift.
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1439782

cc: @himdel @zakiva
@simon3z

Before:

After:

[himdel]

This looks suspiciously similar to what vm_helper does with labels.

Sounds like we should parametrize textual_labels to not assume custom_attributes , and use that instead.

[himdel]

Perhaps more to the point, @nimrodshn can you do this so that all the label textual summaries use the same approach? (And sort by name.)

[nimrodshn]

@himdel fixed - PTAL.
This now make sure every textual summary calling this key-value method will appear in alphabetical order.

[himdel]

Sorry, a misunderstanding .. I didn't mean "make Selector and Node Selector sorted too", I meant: if this "Labels" section is sorted, then all the label sections in the other summaries should be sorted as well, and ideally share the code to do so.

(Not saying Selector and Node Selector should not be sorted, these are container-specific so ..no problem with that.)

[nimrodshn]

@himdel looking around there is only one other Labels table (at app/helpers/vm_helper/textual_summary.rb) which is already sorted.

[himdel]

@nimrodshn There's also Docker Labels in app/helpers/container_image_helper/textual_summary.rb.. but my point was not "make them all sorted", it was "make all of them sorted the same way, using the same methods".

Right now, the old one is sorted because textual_labels calls @record.custom_attributes, sorts them by name, ale converts to a hash, while the other one is sorted because textual_key_value_group is called on @record.labels and the result is sorted by label.

Either is fine, both are not :).

(And I get that the labels vs custom_attributes difference is probably not something you can address, but I'm sure you can make all of them use the same code to do the sort + convert to hash bit.)

[nimrodshn]

@himdel now it's clear to me! sorry for the missunderstanding...

[nimrodshn]

@himdel Now they are all using textual_key_value_group for consistency. PTAL.

[himdel]

@nimrodshn Looks great, thanks!

Just 2 more things...

• the old textual_labels is now dead code and can be removed
• can you move that method to TextualSummaryHelper please? So that we don't have to include a Container-specific helper in a Vm-specific helper.

[nimrodshn]

@himdel PTAL.

[himdel]

You can safely remove this (and the one in vm_helper), TextualSummaryHelper is included from ApplicationHelper and thus always available.

[nimrodshn]

@himdel Done. 👍

[nimrodshn]

@himdel PTAL [ again :) ]

[miq-bot]

Checked commit nimrodshn@30ffc34 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
3 files checked, 0 offenses detected
Everything looks fine. 👍

[himdel]

Thanks @nimrodshn , merged :)

[nimrodshn]

@himdel hooray!! :)

[simaishi]

Fine backport details:

$ git log -1
commit b9f321b28a650e080debe5c7a1555ba2189e63b5
Author: Martin Hradil <[email protected]>
Date:   Mon May 22 11:43:00 2017 +0000

    Merge pull request #1053 from nimrodshn/fix_alphabetical_order_on_pods
    
    Fixed alphabetical order in Labels table
    (cherry picked from commit bc1d201ab23f20628f3e7b97855363fa9bb205e0)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1460023