Skip to content

fix: Bind this to utils that moved from static to non-static with js api de-globalization #1795

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
mattrunyon merged 5 commits into from
Feb 12, 2024
Merged

fix: Bind this to utils that moved from static to non-static with js api de-globalization #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4326de6
fix: Bind this to ChartUtils methods
mattrunyon Feb 12, 2024
9452d84
Bind more places
mattrunyon Feb 12, 2024
8c1fe1f
fix test failure
mattrunyon Feb 12, 2024
c621439
Move bind call above a debounce
mattrunyon Feb 12, 2024
a37186f
Fix test failure hopefully
mattrunyon Feb 12, 2024
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
3 changes: 2 additions & 1 deletion packages/chart/src/ChartUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import type {
OhlcData,
MarkerSymbol,
} from 'plotly.js';
import { assertNotNull, Range } from '@deephaven/utils';
import { assertNotNull, bindAllMethods, Range } from '@deephaven/utils';
import { ChartTheme } from './ChartTheme';

export type FilterColumnMap = Map<
Expand Down Expand Up @@ -548,6 +548,7 @@ class ChartUtils {
constructor(dh: DhType) {
this.dh = dh;
this.daysOfWeek = Object.freeze(dh.calendar.DayOfWeek.values());
bindAllMethods(this);
}

/**
Expand Down
1 change: 1 addition & 0 deletions packages/iris-grid/src/IrisGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
this.handleGotoValueSelectedFilterChanged.bind(this);
this.handleGotoValueChanged = this.handleGotoValueChanged.bind(this);
this.handleGotoValueSubmitted = this.handleGotoValueSubmitted.bind(this);
this.makeQuickFilter = this.makeQuickFilter.bind(this);
Copy link
Copy Markdown
Collaborator

@vbabich vbabich Feb 12, 2024

Choose a reason for hiding this comment

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

Do we call this makeQuickFilter with the wrong context somewhere?

Copy link
Copy Markdown
Collaborator Author

@mattrunyon mattrunyon Feb 12, 2024

Choose a reason for hiding this comment

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

Not that I'm aware of, it was just something that was a static method before de-globalization and is no longer static

Copy link
Copy Markdown
Collaborator

@vbabich vbabich Feb 12, 2024

Choose a reason for hiding this comment

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

Got it, I couldn't find it either. Probably not necessary to bind then, but doesn't matter since we are doing bindAll in other places.


this.grid = null;
this.lastLoadedConfig = null;
Expand Down
8 changes: 7 additions & 1 deletion packages/iris-grid/src/IrisGridUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ import {
FormattingRule,
} from '@deephaven/jsapi-utils';
import Log from '@deephaven/log';
import { assertNotNull, EMPTY_ARRAY, EMPTY_MAP } from '@deephaven/utils';
import {
assertNotNull,
bindAllMethods,
EMPTY_ARRAY,
EMPTY_MAP,
} from '@deephaven/utils';
import AggregationUtils from './sidebar/aggregations/AggregationUtils';
import AggregationOperation from './sidebar/aggregations/AggregationOperation';
import { FilterData, IrisGridProps, IrisGridState } from './IrisGrid';
Expand Down Expand Up @@ -1144,6 +1149,7 @@ class IrisGridUtils {
constructor(dh: DhType) {
this.dh = dh;
this.tableUtils = new TableUtils(dh);
bindAllMethods(this);
}

/**
Expand Down
5 changes: 5 additions & 0 deletions packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
constructor(irisGrid: IrisGrid, dh: DhType) {
super();

this.getNumberValueEqualsFilter =
this.getNumberValueEqualsFilter.bind(this);
this.getFilterValueForNumberOrChar =
this.getFilterValueForNumberOrChar.bind(this);

this.debouncedUpdateCustomFormat = debounce(
irisGrid.handleFormatSelection,
DEBOUNCE_UPDATE_FORMAT
Expand Down
11 changes: 2 additions & 9 deletions packages/iris-grid/src/sidebar/ChartBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import type {
SeriesPlotStyle,
} from '@deephaven/jsapi-types';
import Log from '@deephaven/log';
import { bindAllMethods } from '@deephaven/utils';
import shortid from 'shortid';
import {
BarIcon,
Expand Down Expand Up @@ -105,15 +106,7 @@ class ChartBuilder extends PureComponent<ChartBuilderProps, ChartBuilderState> {
constructor(props: ChartBuilderProps) {
super(props);

this.handleAddSeries = this.handleAddSeries.bind(this);
this.handleLinkStateChange = this.handleLinkStateChange.bind(this);
this.handleReset = this.handleReset.bind(this);
this.handleSeriesChange = this.handleSeriesChange.bind(this);
this.handleSeriesDeleteClick = this.handleSeriesDeleteClick.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.handleTypeClick = this.handleTypeClick.bind(this);
this.handleXAxisChange = this.handleXAxisChange.bind(this);
this.sendChange = this.sendChange.bind(this);
bindAllMethods(this);

const { model } = props;
const { columns, dh } = model;
Expand Down
⚡