Feature refactor selected columns #614
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
Freymaurer
requested changes
Feb 4, 2025
src/Client/MainComponents/Widgets.fs
Outdated
| model.ProtocolState.TemplatesSelected | ||
| |> List.map (fun template -> Array.init template.Table.Columns.Length (fun _ -> true)) | ||
| |> Array.ofList | ||
| let columns = Array.init model.ProtocolState.TemplatesSelected.Length (fun _ -> Set.empty<int>) |
There was a problem hiding this comment.
You could also do double index. So:
let columns = Set.empty<int,int>where first int is template index and second int is column index. This would avoid initiating anything that is not used.
In addition columns might now be skippedColumns if i understand this correctly
Updated naming
Freymaurer
requested changes
Feb 5, 2025
| (if selectionInformation.SelectedColumns.Length > 0 then | ||
| selectionInformation.SelectedColumns.[tableIndex].[columnIndex] | ||
| (if not selectionInformation.DeSelectedColumns.IsEmpty then | ||
| not (Set.contains (columnIndex, tableIndex) selectionInformation.DeSelectedColumns) |
src/Client/MainComponents/Widgets.fs
Outdated
| |> Array.ofList | ||
| {fst importTypeStateData with SelectedColumns = columns} |> snd importTypeStateData | ||
| //if model.ProtocolState.TemplatesSelected.Length > 0 && (fst importTypeStateData).DeSelectedColumns.Length = 0 then | ||
| // let columns = Array.init model.ProtocolState.TemplatesSelected.Length (fun _ -> Set.empty<int>) |
| let selectedData = selectionInformation.SelectedColumns | ||
| selectedData.[tableIndex].[columnIndex] <- b | ||
| {selectionInformation with SelectedColumns = selectedData} |> setSelectedColumns) | ||
| let selectedData = SelectiveImportModalState.updateDeSelectedColumns(selectionInformation.DeSelectedColumns, tableIndex, columnIndex) |
There was a problem hiding this comment.
change to member for clarity
As this can be run on the Set<int,int> just make it a function toggleSetItem(tableIndex, columnIndex)
| @@ -37,14 +37,13 @@ type SelectiveImportModal = | |||
| style.height(length.perc 100) | |||
| ] | |||
| prop.isChecked | |||
| (if selectionInformation.SelectedColumns.Length > 0 then | |||
| selectionInformation.SelectedColumns.[tableIndex].[columnIndex] | |||
| (if not selectionInformation.DeSelectedColumns.IsEmpty then | |||
There was a problem hiding this comment.
it is "deselect" not "deSelect"
src/Client/Types.fs
Outdated
| TemplateName = None | ||
| } | ||
|
|
||
| static member updateDeSelectedColumns(deSelectedColumns: Set<int*int>, tableIndex: int, columnIndex: int) = |
src/Client/Types.fs
Outdated
| static member getDeSelectedTableColumns (deSelectedColumns: Set<int*int>, tableIndex: int) = | ||
| deSelectedColumns | ||
| |> List.ofSeq | ||
| |> List.map (fun item -> if (fst item) = tableIndex then Some (snd item) else None) |
There was a problem hiding this comment.
List.choose here, not in the line below
Freymaurer
approved these changes
Feb 5, 2025
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 Issue #613