Fixes #24629: Score details columns in node tables cannot be saved #5566
+30
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
PR updated with a new commit |
clarktsiory
commented
Apr 2, 2024
Comment on lines
+1425
to
+1441
| return c !== null | ||
| && ( | ||
| allColumnsKeys.includes(c.title) | ||
| || (c.data !== undefined && c.title.startsWith("Software")) | ||
| || c.title.startsWith("Property") | ||
| // it is possible that the column data is no longer found in scoresList (e.g. CVE plugin is uninstalled but CVE Score column is saved in cache) | ||
| || (c.value !== undefined && !!scoreList.find(({ id }) => c.title.endsWith("Score") && c.value === id)) | ||
| ) | ||
| }) | ||
|
|
||
| columns = cache.map(function(c) { | ||
| if (c.title.startsWith("Property")) { | ||
| return allColumns.Property(c.value,c.inherited); | ||
| } else { if (c.data.startsWith("software")) { | ||
| } else { if (c.data?.startsWith("software")) { | ||
| return allColumns.Software(c.value); | ||
| } else if (/^.+\sScore$/.test(c.title)) { | ||
| return allColumns["Score details"](c.value); |
There was a problem hiding this comment.
Specifically parse the score details columns from the localstorage, it was just forgotten in previous PRs for score details
clarktsiory
commented
Apr 2, 2024
Comment on lines
+1353
to
1357
| async function reloadTable(gridId) { | ||
| var table = $('#'+gridId).DataTable(); | ||
| table.destroy(); | ||
| createNodeTable(gridId, function(){reloadTable(gridId)}) | ||
| await createNodeTable(gridId, function(){reloadTable(gridId)}) | ||
| } |
There was a problem hiding this comment.
Rewriting to async/await is not necessary here but still a good practice since later we would be able to "await" the reload of the table
|
PR rebased |
clarktsiory
force-pushed
the
bug_24629/score_details_columns_in_node_tables_cannot_be_saved
branch
from
1cf4faa
to
bcedc5d
Compare
|
I want to take some time to review it, to think whether it is the right tool you are using. I have not forgotten it but i need some time !! |
|
We can do without adding async/await and keep it simpler : #5643 score details was not managed correctly when reloading columns cache |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.rudder.io/issues/24629
We also need to await the the ajax for the score list have finished, before parsing the columns data from the cache. So, we just change the
createNodeTablefunction to an async one (which is widely browser-compatible)