duplicated available slices #377
Merged
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
|
Code Coverage SummaryDiff against mainResults for commit: 6166519 Minimum allowed coverage is ♻️ This comment has been updated with latest results |
|
Code Coverage SummaryDiff against mainResults for commit: 8328234 Minimum allowed coverage is ♻️ This comment has been updated with latest results |
chlebowa
approved these changes
Jul 11, 2023
| @@ -482,7 +482,7 @@ FilteredData <- R6::R6Class( # nolint | |||
| private$module_add <- module_add | |||
| } | |||
|
|
|||
| lapply(datanames, function(dataname) { | |||
| lapply(self$datanames(), function(dataname) { | |||
There was a problem hiding this comment.
I guess these lines above can be removed now:
datanames <- slices_field(state, "dataname")
checkmate::assert_subset(datanames, self$datanames())
R/FilteredData.R
Outdated
Comment on lines
1098
to
1099
| is_not_expr <- vapply(private$available_teal_slices(), inherits, logical(1), "teal_slice_expr") | ||
| slice_reference[is_duplicated_reference & is_active & !is_not_expr] |
There was a problem hiding this comment.
Suggested change
| is_not_expr <- vapply(private$available_teal_slices(), inherits, logical(1), "teal_slice_expr") | |
| slice_reference[is_duplicated_reference & is_active & !is_not_expr] | |
| is_not_expr <- !vapply(private$available_teal_slices(), inherits, logical(1), "teal_slice_expr") | |
| slice_reference[is_duplicated_reference & is_active & is_not_expr] |
R/FilteredData.R
Outdated
Comment on lines
1127
to
1161
| interactive_choice_mock <- lapply( | ||
| slices_interactive(), | ||
| function(slice) { | ||
| # we need to isolate changes in the fields of the slice (teal_slice) | ||
| shiny::isolate({ | ||
| checkbox_group_element( | ||
| name = session$ns("available_slices_id"), | ||
| value = slice$id, | ||
| label = slice$id, | ||
| checked = if (slice$id %in% active_slices_ids) "checked", | ||
| disabled = slice$locked | ||
| disabled = slice$locked || | ||
| get_default_slice_id(slice) %in% duplicated_slice_refs && | ||
| !slice$id %in% active_slices_ids | ||
| ) | ||
| } | ||
| ) | ||
| }) | ||
| } | ||
| ) | ||
|
|
||
| non_interactive_choice_mock <- lapply( | ||
| slices_fixed(), | ||
| function(slice) { | ||
| non_interactive_choice_mock <- lapply( | ||
| slices_fixed(), | ||
| function(slice) { | ||
| # we need to isolate changes in the fields of the slice (teal_slice) | ||
| isolate( | ||
| checkbox_group_element( | ||
| name = session$ns("available_slices_id"), | ||
| value = slice$id, | ||
| label = slice$id, | ||
| checked = if (slice$id %in% active_slices_ids) "checked", | ||
| disabled = slice$locked | ||
| disabled = slice$locked || | ||
| get_default_slice_id(slice) %in% duplicated_slice_refs && | ||
| !slice$id %in% active_slices_ids | ||
| ) | ||
| } | ||
| ) | ||
| ) | ||
| } | ||
| ) |
There was a problem hiding this comment.
Perhaps assign the function(slice) for cleaner code?
R/FilteredData.R
Outdated
Comment on lines
1166
to
1169
| tags$strong("Fixed filters"), | ||
| non_interactive_choice_mock, | ||
| tags$strong("Iteractive filters"), | ||
| interactive_choice_mock, |
There was a problem hiding this comment.
If the tag$strong are moved into the function that generates the mock elements, it would pre-emptively solve this bug:
R/FilteredDatasetDefault.R
Outdated
Comment on lines
186
to
189
| lapply(state, function(slice) { | ||
| checkmate::assert_true(slice$dataname == private$dataname) | ||
| }) | ||
| checkmate::assert_class(state, "teal_slices") |
There was a problem hiding this comment.
Suggested change
| lapply(state, function(slice) { | |
| checkmate::assert_true(slice$dataname == private$dataname) | |
| }) | |
| checkmate::assert_class(state, "teal_slices") | |
| checkmate::assert_class(state, "teal_slices") | |
| lapply(state, function(slice) { | |
| checkmate::assert_true(slice$dataname == private$dataname) | |
| }) |
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.
Closes #374
Fixes problem when adding new filter based on the variable for which there is already filter in
available_teal_slices. Filters duplicated are disabled from the selection. Filter is disabled when:dataname,varname,experimentandarg. If there is any filter which has exactly the same values in all of these fields then it is duplpicated.Fixed in this PR:
$set_filter_states,teal_sliceattributes were changed only for datasets which hadteal_sliceobject - loop was done on slices-datasets instead of all datasets.character. This also matches logic instate_list_addwhich also accepts multiple elements.