Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Multiple Y Field Selection to Plot Wizard #4787

Merged
merged 32 commits into from
Oct 11, 2023

Conversation

julieg18
Copy link
Contributor

@julieg18 julieg18 commented Oct 9, 2023

2/4 main <- #4786 <- this <- #4797 <- #4798

Demo

Screen.Recording.2023-10-10.at.4.45.11.PM.mov

Part of #4654

@julieg18 julieg18 added the product PR that affects product label Oct 9, 2023
@julieg18 julieg18 added this to In progress in VS Code Oct 3 via automation Oct 9, 2023
@julieg18 julieg18 self-assigned this Oct 9, 2023
@julieg18 julieg18 changed the title Add Multiple Y Field Selection in Plot Wizard Add Multiple Y Field Selection to Plot Wizard Oct 9, 2023
x: x.file === y.file ? x.key : { [x.file]: x.key },
y: { [y.file]: y.key }
x: oneFileUsed ? x.key : { [x.file]: x.key },
y
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In plot examples, you typically use brackets for a file's multiple fields:

  - test_vs_train_loss:
      x: epoch
      y:
        training_data.csv: [test_loss, train_loss]

But our yaml library only turns arrays into - lists:

  - test_vs_train_loss:
      x: epoch
      y:
        training_data.csv: 
          - test_loss
          - train_loss

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Q] Does this format still work? I think this is fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Q] Does this format still work? I think this is fine.

Yes, this format still works!

@@ -18,7 +22,7 @@ export type PlotConfigData = {
x: { file: string; key: string }
template: string
title: string
y: { file: string; key: string }
y: { [file: string]: string[] | string }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered making x and y have similar types but decided to keep them different to show that x is only one field while y has multiple. Can update the x type if preferred though :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Q] Are we going to allow selecting multiple x values?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Q] Are we going to allow selecting multiple x values?

Apologies, forgot to update #4654. Will do that now but in summary, quick picks do not retain the order that the user selects the items. Since we can't detect the order the user wants to add the values, it looks like were gonna just want to allow x to be a single value.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻. NW we can wait to see if someone asks for it. Did you confirm this is not possible using both the window.createQuickPick and window.showQuickPick APIs?

Copy link
Contributor Author

@julieg18 julieg18 Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you confirm this is not possible using both the window.createQuickPick and window.showQuickPick APIs?

Yes, as far as I can tell. None of the options show a way to change the order of the selected values. I also looked into some functions that get called on select but they didn't give us enough information for us to easily detect the order.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about something like this using createQuickPick?:

  new Promise(resolve => {
    const quickPick = createQuickPick(items, selectedItems, {
      ...DEFAULT_OPTIONS,
      canSelectMany: true,
      ...options
    })

    let orderedSelection: T[] = []
    quickPick.onDidChangeSelection(selectedItems => {
      const itemValues: T[] = []
      for (const item of selectedItems) {
        if (!orderedSelection.includes(item.value)) {
          orderedSelection.push(item.value)
        }
        itemValues.push(item.value)
      }
      orderedSelection = orderedSelection.filter(item =>
        itemValues.includes(item)
      )
    })

    quickPick.onDidAccept(() => {
      resolve(orderedSelection)
      quickPick.dispose()
    })

    quickPick.onDidHide(() => {
      resolve(undefined)
      quickPick.dispose()
    })

    quickPick.show()
  })

I used quickPickLimitedValues as a base.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks like that could work, thanks! I'll try using this type of quick pick for y fields and update x to have the same type as y so we can allow multiple x fields in a followup :)

@julieg18 julieg18 marked this pull request as ready for review October 9, 2023 16:55
@julieg18 julieg18 mentioned this pull request Oct 10, 2023
8 tasks

const prevFileValue = formattedFields[file]
formattedFields[file] = [
...(typeof prevFileValue === 'string' ? [prevFileValue] : prevFileValue),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not test the opposite with Array.isArray(prevFileValue) instead? Array.isArray() is better for type inference.

It also feels unnecessary to create a new array twice when prevFileValue is a string. Since you are creating formattedFields here, you can just use push without worrying about mutating a variable from elsewhere.

Copy link
Contributor Author

@julieg18 julieg18 Oct 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not test the opposite with Array.isArray(prevFileValue) instead? Array.isArray() is better for type inference.

Typescript doesn't recognize Array.isArray as a proper array check (microsoft/TypeScript#17002). For example, this causes an error:

    if (Array.isArray(formattedFields[file])) {
      formattedFields[key].push(key) // Error: Property 'push' does not exist on type 'string | string[]'.
      continue
    }

Which is why I rely on string check instead of creating some kind of extra util for array checks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It also feels unnecessary to create a new array twice when prevFileValue is a string. Since you are creating formattedFields here, you can just use push without worrying about mutating a variable from elsewhere.

Similar to the previous comment, I chose not to rely on push since according to typescript, formattedFields[key] may be a string or array so I would need to add some as statements:

    if (!formattedFields[file]) {
      formattedFields[file] = key
      continue
    }

    const prevFileValue = formattedFields[file]
    if (Array.isArray(formattedFields[file])) {
      ;(formattedFields[key] as string[]).push(key)
      continue
    }

    formattedFields[file] = [prevFileValue as string, key]

If the above is preferred as more readable though, I'm happy to update :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After looking at this with fresh eyes today, I'm going to go ahead and adjust the code to look similar to the example above. Even though it does have as statements, I think it's more readable than my current solution.

Base automatically changed from add-title-opt-to-plot-wizard to main October 10, 2023 15:49
@julieg18 julieg18 enabled auto-merge (squash) October 11, 2023 12:57
@codeclimate
Copy link

codeclimate bot commented Oct 11, 2023

Code Climate has analyzed commit 39d255e and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 96.1% (85% is the threshold).

This pull request will bring the total coverage in the repository to 95.1% (0.0% change).

View more on Code Climate.

@julieg18 julieg18 merged commit f05ffa0 into main Oct 11, 2023
8 checks passed
VS Code Oct 10 automation moved this from In progress to Done Oct 11, 2023
@julieg18 julieg18 deleted the allow-plot-wizard-multi-y-selection branch October 11, 2023 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
product PR that affects product
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants