Skip to content

Move divider to top of group in experiments table context menu #2083

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 23, 2022
Merged

Move divider to top of group in experiments table context menu #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d8ae27
Move divider to top of group in experiments table context menu
mattseddon Jul 22, 2022
5922ba9
Merge branch 'main' into fix-context-menu-divider-placement
mattseddon Jul 22, 2022
411e3da
fix separator condition for when there are no checkpoints
mattseddon Jul 23, 2022
112b940
Merge branch 'fix-context-menu-divider-placement' of github.com:itera…
mattseddon Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions webview/src/experiments/components/table/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,21 @@ const getRunResumeOptions = (
) => {
const isNotCheckpoint = depth <= 1 || isWorkspace

const resetNeedsSeparator = !hideVaryAndRun && projectHasCheckpoints
const runNeedsSeparator = !hideVaryAndRun && !projectHasCheckpoints

return [
withId(
'Modify, Reset and Run',
MessageFromWebviewType.VARY_EXPERIMENT_PARAMS_RESET_AND_RUN,
!isNotCheckpoint || !projectHasCheckpoints
!isNotCheckpoint || !projectHasCheckpoints,
resetNeedsSeparator
),
withId(
projectHasCheckpoints ? 'Modify and Resume' : 'Modify and Run',
MessageFromWebviewType.VARY_EXPERIMENT_PARAMS_AND_RUN,
!isNotCheckpoint,
!hideVaryAndRun
runNeedsSeparator
),
withId(
'Modify and Queue',
Expand Down
72 changes: 56 additions & 16 deletions webview/src/stories/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,37 @@ const tableData: TableData = {
]
}

const noRunningExperiments = {
...tableData,
hasRunningExperiment: false,
rows: rowsFixture.map(row => ({
...row,
running: false,
subRows: row.subRows?.map(experiment => ({
...experiment,
running: false,
subRows: experiment.subRows?.map(checkpoint => ({
...checkpoint,
running: false
}))
}))
}))
}

const noRunningExperimentsNoCheckpoints = {
...noRunningExperiments,
hasCheckpoints: false,
rows: rowsFixture.map(row => ({
...row,
running: false,
subRows: row.subRows?.map(experiment => ({
...experiment,
running: false,
subRows: []
}))
}))
}

export default {
args: {
tableData
Expand Down Expand Up @@ -101,23 +132,32 @@ WithMiddleStates.play = async ({ canvasElement }) => {

export const WithNoRunningExperiments = Template.bind({})
WithNoRunningExperiments.args = {
tableData: {
...tableData,
hasRunningExperiment: false,
rows: rowsFixture.map(row => ({
...row,
running: false,
subRows: row.subRows?.map(experiment => ({
...experiment,
running: false,
subRows: experiment.subRows?.map(checkpoint => ({
...checkpoint,
running: false
}))
}))
}))
}
tableData: noRunningExperiments
}

const contextMenuPlay = async ({
canvasElement
}: {
canvasElement: HTMLElement
}) => {
const experiment = await within(canvasElement).findByText('[exp-e7a67]')
userEvent.click(experiment, {
Copy link
Contributor Author

@mattseddon mattseddon Jul 22, 2022

Choose a reason for hiding this comment

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

The context menu appears to the left of the element clicked on. I spent about 30 minutes looking into a fix. I don't think there is much value in spending any more time looking.

bubbles: true,
button: 2
})
}

export const WithContextMenu = Template.bind({})
WithContextMenu.args = {
tableData: noRunningExperiments
}
WithContextMenu.play = contextMenuPlay

export const WithContextMenuNoCheckpoints = Template.bind({})
WithContextMenuNoCheckpoints.args = {
tableData: noRunningExperimentsNoCheckpoints
}
WithContextMenuNoCheckpoints.play = contextMenuPlay

export const WithAllDataTypes = Template.bind({})
WithAllDataTypes.args = { tableData: dataTypesTableData }
Expand Down