Skip to content

Cleanup of the logTraceUseCallback #122

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

Open
Alex-NRCan wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Cleanup of the logTraceUseCallback #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 0 additions & 75 deletions src/chart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,6 @@ export function GeoChart<
paletteBackgrounds: string[] | undefined,
paletteBorders: string[] | undefined
): void => {
// Log
logger.logTraceUseCallback('GEOCHART - processDatasets', items, catPropertyName);

// Check
if (!items || !catPropertyName) return;

Expand Down Expand Up @@ -622,9 +619,6 @@ export function GeoChart<
paletteBackgrounds: string[] | undefined,
paletteBorders: string[] | undefined
): void => {
// Log
logger.logTraceUseCallback('GEOCHART - processLabels', theChartType, items);

// Check
if (!items || !labelPropertyName) return;

Expand Down Expand Up @@ -688,9 +682,6 @@ export function GeoChart<
*/
const updateDatasetVisibilityUsingState = useCallback(
(theChartRef: ChartJS<TType, TData, TLabel> | undefined, theDatasetRegistry: GeoChartSelectedDataset): void => {
// Log
logger.logTraceUseCallback('GEOCHART - updateDatasetVisibilityUsingState', theChartRef, theDatasetRegistry);

if (!theChartRef) return;

// Get the current dataset labels
Expand All @@ -717,9 +708,6 @@ export function GeoChart<
*/
const updateDataVisibilityUsingState = useCallback(
(theChartRef: ChartJS<TType, TData, TLabel> | undefined, theDatasRegistry: GeoChartSelectedDataset): void => {
// Log
logger.logTraceUseCallback('GEOCHART - updateDataVisibilityUsingState', theChartRef, theDatasRegistry);

// Check
if (!theChartRef) return;

Expand Down Expand Up @@ -764,9 +752,6 @@ export function GeoChart<
theYScale: ScalePossibility,
records: Record<string, unknown>[] | undefined
): void => {
// Log
logger.logTraceUseCallback('GEOCHART - processLoadingRecords', theInputs, theDatasetRegistry, theDatasRegistry, theLanguage);

// Parse the data
const parsedOptions = ChartParsing.createChartJSOptions<TType>(theInputs, parentOptions!, theYScale, theLanguage);
const parsedData = ChartParsing.createChartJSData<TType, TData, TLabel>(
Expand Down Expand Up @@ -817,15 +802,6 @@ export function GeoChart<
xValues: number | number[] | undefined,
yValues: number | number[] | undefined
): void => {
// Log
logger.logTraceUseCallback(
'GEOCHART - processLoadingRecordsFilteringFirst',
theInputs,
theDatasetRegistry,
theDatasRegistry,
theLanguage
);

// If chart type is line
let resItemsFinal: Record<string, unknown>[] = records ? [...records] : [];
if (theInputs?.chart === 'line') {
Expand Down Expand Up @@ -885,9 +861,6 @@ export function GeoChart<
*/
const handleChartJSAfterInit = useCallback(
(chart: ChartJS<TType, TData, TLabel>): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleChartJSAfterInit', chart, datasRegistry, datasetRegistry);

// Make sure the UI fits with the registry state before the first render is made. Mostly useful for pie/doughnut charts.
updateDatasetVisibilityUsingState(chart, datasetRegistry);
updateDataVisibilityUsingState(chart, datasRegistry);
Expand Down Expand Up @@ -923,9 +896,6 @@ export function GeoChart<
*/
const handleDatasourceChanged = useCallback(
async (e: Event, item: typeof MenuItem): Promise<void> => {
// Log
logger.logTraceUseCallback('GEOCHART - handleDatasourceChanged', item);

// If no inputs, return
if (!inputs) return;

Expand Down Expand Up @@ -964,9 +934,6 @@ export function GeoChart<
*/
const handleDatasetChecked = useCallback(
(datasetIndex: number, datasetLabel: string | undefined, checked: boolean): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleDatasetChecked', datasetRegistry);

// If already checked
const isAlreadyChecked = datasetLabel && memoDatasetRegistryChecked.includes(datasetLabel);

Expand Down Expand Up @@ -997,9 +964,6 @@ export function GeoChart<
*/
const handleDataChecked = useCallback(
(dataIndex: number, dataLabel: string, checked: boolean): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleDataChecked', datasRegistry);

// If already checked
const isAlreadyChecked = memoDatasRegistryChecked.includes(dataLabel);

Expand Down Expand Up @@ -1028,9 +992,6 @@ export function GeoChart<
*/
const handleSliderXChange = useCallback(
(newValue: number | number[]): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderXChange', newValue);

// Set the X State for the slider UI itself
setXSliderValues(newValue);
},
Expand All @@ -1043,9 +1004,6 @@ export function GeoChart<
*/
const handleSliderXChangeCommitted = useCallback(
(newValue: number | number[]): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderXChangeCommitted', newValue);

// Set the X values active
setXSliderValuesActive(newValue);

Expand All @@ -1061,9 +1019,6 @@ export function GeoChart<
*/
const handleSliderYChange = useCallback(
(newValue: number | number[]): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderYChange', newValue);

// Set the Y State for the slider UI itself
setYSliderValues(newValue);
},
Expand All @@ -1076,9 +1031,6 @@ export function GeoChart<
*/
const handleSliderYChangeCommitted = useCallback(
(newValue: number | number[]): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderYChangeCommitted', newValue);

// Set the Y values active
setYSliderValuesActive(newValue);

Expand All @@ -1095,9 +1047,6 @@ export function GeoChart<
*/
const handleStepsSwitcherChanged = useCallback(
(e: unknown, item: typeof MenuItem): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleStepsSwitcherChanged', item);

// Set the step switcher
setSelectedSteps(item.props.value as StepsPossibility);

Expand All @@ -1114,9 +1063,6 @@ export function GeoChart<
*/
const handleScalesSwitcherChanged = useCallback(
(e: unknown, item: typeof MenuItem): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleScalesSwitcherChanged', item);

// Set the scale switcher
setSelectedScale(item.props.value as ScalePossibility);

Expand All @@ -1130,9 +1076,6 @@ export function GeoChart<
* Handles when the States must be cleared
*/
const handleResetStates = useCallback((): void => {
// Log
logger.logTraceUseCallback('GEOCHART - handleResetStates');

// Clear all states
setDatasetRegistry(delegateToTurnCheckedToTrue);
setDatasRegistry(delegateToTurnCheckedToTrue);
Expand All @@ -1150,9 +1093,6 @@ export function GeoChart<
*/
const handleSliderXValueFormat = useCallback(
(value: number): string => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderXValueFormat', value);

// Callback in case we're overriding this behavior
const val = onSliderXValueDisplaying?.(value);
if (val) return val;
Expand Down Expand Up @@ -1188,9 +1128,6 @@ export function GeoChart<
*/
const handleSliderYValueFormat = useCallback(
(value: number): string => {
// Log
logger.logTraceUseCallback('GEOCHART - handleSliderYValueFormat', value);

// Callback in case we're overriding this behavior
const val = onSliderYValueDisplaying?.(value);
if (val) return val;
Expand All @@ -1206,9 +1143,6 @@ export function GeoChart<
*/
const handleExportClick = useCallback(
(event: React.MouseEvent<HTMLButtonElement>) => {
// Log
logger.logTraceUseCallback('DATA-TABLE - EXPORT BUTTON - handleClick');

setAnchorEl(event.currentTarget);
},
[logger]
Expand All @@ -1218,19 +1152,13 @@ export function GeoChart<
* Close export menu.
*/
const handleExportClose = useCallback(() => {
// Log
logger.logTraceUseCallback('DATA-TABLE - EXPORT BUTTON - handleClose');

setAnchorEl(null);
}, [logger]);

/**
* Handles when the download filtered button is clicked
*/
const handleDownloadFiltered = useCallback((): void => {
// Log
logger.logTraceUseCallback('DATA-TABLE - EXPORT BUTTON - handleDownloadFiltered');

// Get the data
const data = { ...selectedDatasource! } as GeoChartDatasource;

Expand Down Expand Up @@ -1275,9 +1203,6 @@ export function GeoChart<
* Handles when the download all button is clicked
*/
const handleDownloadAll = useCallback((): void => {
// Log
logger.logTraceUseCallback('DATA-TABLE - EXPORT BUTTON - handleDownloadAll');

// Get the data
const data = { ...selectedDatasource! } as GeoChartDatasource;

Expand Down