Sorting IP adresses and uptime in tables #435
Conversation
emlun007
changed the title
puppetboard/static/js/tables.js
Outdated
| @@ -16,6 +16,17 @@ | |||
| else return tdTime; | |||
| }); | |||
|
|
|||
| $('thead th.IP Address').data('myIpArray', myIpArray) // save IP adresses from th. IP Addresses (unsure about the name) in myIpArray | |||
There was a problem hiding this comment.
It looks like you're trying to select th.IP Address, following the pattern for .date above.
Are you sure this class exists on any of the table headers? If there isn't a class name identifying IP Address in the html, you'd have to add one for this to work.
If you do add it use an underscore ip_address as CSS classes can't have spaces.
There was a problem hiding this comment.
This is right clicking in chrome on a date header and clicking inspect. It shows class="date".
When I do the same on anything with an IP I don't any unique class.
There was a problem hiding this comment.
The reason I tried IP Address as a table header is when I import the headers from the table I get something like:
"Hostname,IP Address,OS,Architecture,Kernel Version,Reboot required,Puppet Version"
So IP Address must be a header so I wrote th.IP Address
There was a problem hiding this comment.
For the Inventory page I can select the th for IP Address with this:
$("table").find("[aria-label^='IP Address']")
It says find in table where aria-label starts with 'IP Address'.
There was a problem hiding this comment.
I can see them as headers when I try the sorting on inventory.
There was a problem hiding this comment.
I see where you were coming from, but the syntax isn't correct. Just run your selector in the console tab on chrome and you will see it returns 0 items.
There was a problem hiding this comment.
I believe the right way to do it is to use ('.dataTable td') and ('.dataTable th.IP Address'). What do you think @kirkins ?
emlun007
changed the title
|
Update: Now the ip sorter finally works 😃 All you have to do is to write column number in _macros.html which is set to 2nd column by default: { type: 'ip-address', targets: 1 } |
|
I'm testing this now. Everything seems to be working. On the Inventory page IP X.X.0.10 is now considered greater than X.X.0.2 for sorting. Good work @emlun007 |
puppetboard/templates/_macros.html
Outdated
| @@ -56,6 +56,9 @@ | |||
| "search": {"regex": true}, | |||
| // Default sort | |||
| "order": [[ 0, "desc" ]], | |||
| //Sort ipadresses | |||
There was a problem hiding this comment.
NIT: Typo in address and add space to match with line 57. // Sort ip addresses
emlun007
changed the title
|
@kirkins , I have added code for sorting uptime (xxx days) and memory (xxx GiB). The code parses strings to integer (9.99 GiB = 9) and checks in the result is NaN. If the sourse is NaN (e.g. ip address), the original data is shown, if the source is not NaN, it is parsed to integer |
| return parseInt(data)} | ||
| }, | ||
| ], | ||
| // Custom options |
|
Can this be merged, including @vchepkov 's changes? :-) |
|
Sadly, it cannot be merged. This branch has merge conflicts. You can checkout the branch, resolve the conflicts and submit it as a new PR. I'm happy to review and merge it afterwards. |
I have added code in tables.js that will sort the IP adresses in inventory table. Right now, the function does not work properly, most likely because I don't use the right name of the variable with IP Adresses