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

Clean up hide column terminology #4304

Merged
merged 1 commit into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 4 deletions extension/src/experiments/webview/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export class WebviewMessages {
})
case MessageFromWebviewType.TOGGLE_EXPERIMENT_STAR:
return this.setExperimentStars(message.payload)
case MessageFromWebviewType.HIDE_EXPERIMENTS_TABLE_COLUMN:
return this.hideTableColumn(message.payload)
case MessageFromWebviewType.EXPERIMENTS_TABLE_HIDE_COLUMN_PATH:
return this.hideColumnPath(message.payload)
case MessageFromWebviewType.EXPERIMENTS_TABLE_MOVE_TO_START:
return this.movePathToStart(message.payload)
case MessageFromWebviewType.OPEN_PARAMS_FILE_TO_THE_SIDE:
Expand Down Expand Up @@ -382,13 +382,13 @@ export class WebviewMessages {
return commandPromise
}

private hideTableColumn(path: string) {
private hideColumnPath(path: string) {
this.columns.unselect(path)

this.notifyChanged()

sendTelemetryEvent(
EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN,
EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN_PATH,
{ path },
undefined
)
Expand Down
5 changes: 3 additions & 2 deletions extension/src/telemetry/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ export const EventName = Object.assign(
'views.experimentsTable.focusFiltersTree',
VIEWS_EXPERIMENTS_TABLE_FOCUS_SORTS_TREE:
'views.experimentsTable.focusSortsTree',
VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN: 'views.experimentsTable.columnHidden',
VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN_PATH:
'views.experimentsTable.hideColumnPath',
VIEWS_EXPERIMENTS_TABLE_MOVE_TO_START: 'views.experimentsTable.moveToStart',
VIEWS_EXPERIMENTS_TABLE_OPEN_PARAMS_FILE:
'views.experimentsTable.paramsFileOpened',
Expand Down Expand Up @@ -247,7 +248,7 @@ export interface IEventNamePropertyMapping {
}
[EventName.VIEWS_EXPERIMENTS_TABLE_CREATED]: undefined
[EventName.VIEWS_EXPERIMENTS_TABLE_FOCUS_CHANGED]: WebviewFocusChangedProperties
[EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN]: {
[EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN_PATH]: {
path: string
}
[EventName.VIEWS_EXPERIMENTS_TABLE_MOVE_TO_START]: { path: string }
Expand Down
4 changes: 2 additions & 2 deletions extension/src/test/suite/experiments/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -477,14 +477,14 @@ suite('Experiments Test Suite', () => {

mockMessageReceived.fire({
payload: mockColumnId,
type: MessageFromWebviewType.HIDE_EXPERIMENTS_TABLE_COLUMN
type: MessageFromWebviewType.EXPERIMENTS_TABLE_HIDE_COLUMN_PATH
})

expect(mockUnselect).to.be.calledOnce
expect(mockUnselect).to.be.calledWithExactly(mockColumnId)

expect(mockSendTelemetryEvent).to.be.calledWithExactly(
EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN,
EventName.VIEWS_EXPERIMENTS_TABLE_HIDE_COLUMN_PATH,
{ path: mockColumnId },
undefined
)
Expand Down
4 changes: 2 additions & 2 deletions extension/src/webview/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export enum MessageFromWebviewType {
SORT_COLUMN = 'sort-column',
TOGGLE_EXPERIMENT = 'toggle-experiment',
TOGGLE_EXPERIMENT_STAR = 'toggle-experiment-star',
HIDE_EXPERIMENTS_TABLE_COLUMN = 'hide-experiments-table-column',
EXPERIMENTS_TABLE_HIDE_COLUMN_PATH = 'experiments-table-hide-column-path',
EXPERIMENTS_TABLE_MOVE_TO_START = 'experiments-table-move-to-start',
SELECT_EXPERIMENTS = 'select-experiments',
SELECT_COLUMNS = 'select-columns',
Expand Down Expand Up @@ -132,7 +132,7 @@ export type MessageFromWebview =
payload: string[]
}
| {
type: MessageFromWebviewType.HIDE_EXPERIMENTS_TABLE_COLUMN
type: MessageFromWebviewType.EXPERIMENTS_TABLE_HIDE_COLUMN_PATH
payload: string
}
| {
Expand Down
6 changes: 3 additions & 3 deletions webview/src/experiments/components/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ describe('App', () => {
.map(item => item.textContent)

expect(menuitems).toStrictEqual([
'Hide Column',
'Hide',
'Move to Start',
'Set Max Header Height',
'Select Columns',
Expand Down Expand Up @@ -888,7 +888,7 @@ describe('App', () => {
fireEvent.contextMenu(placeholder, { bubbles: true })
advanceTimersByTime(100)

const hideOption = screen.getByText('Hide Column')
const hideOption = screen.getByText('Hide')

mockPostMessage.mockClear()

Expand All @@ -897,7 +897,7 @@ describe('App', () => {
expect(mockPostMessage).toHaveBeenCalledTimes(1)
expect(mockPostMessage).toHaveBeenCalledWith({
payload: 'Created',
type: MessageFromWebviewType.HIDE_EXPERIMENTS_TABLE_COLUMN
type: MessageFromWebviewType.EXPERIMENTS_TABLE_HIDE_COLUMN_PATH
})
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ export const getMenuOptions = (
const menuOptions: MessagesMenuOptionProps[] = [
{
disabled: isFromExperimentColumn(header),
id: 'hide-column',
label: 'Hide Column',
id: 'hide',
label: 'Hide',
message: {
payload: leafColumn.id,
type: MessageFromWebviewType.HIDE_EXPERIMENTS_TABLE_COLUMN
type: MessageFromWebviewType.EXPERIMENTS_TABLE_HIDE_COLUMN_PATH
}
},
{
Expand Down
Loading