Skip to content

Commit

Permalink
Merge pull request #68 from Alex-NRCan/feat-loggers-2
Browse files Browse the repository at this point in the history 
[MINOR] Missing a logger for eslint and renamed a logger function (#68)
  • Loading branch information
@jolevesq
jolevesq authored Jan 23, 2024
2 parents 65bf54f + 936969a commit 13db37a
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/chart.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ export function GeoChart<
setDatasetRegistry({ ...datasetRegistry });
}
},
[datasetRegistry, colorPaletteCategoryBackgroundIndex, colorPaletteCategoryBorderIndex]
[datasetRegistry, colorPaletteCategoryBackgroundIndex, colorPaletteCategoryBorderIndex, logger]
) as (
items: TypeJsonObject[] | undefined,
catPropertyName: string | undefined,
Expand Down Expand Up @@ -797,7 +797,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - PARENT - INPUTS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, parentInputs);
logger.logTraceUseEffect(USE_EFFECT_FUNC, parentInputs);

// Refresh the inputs in this component
setInputs(parentInputs);
Expand All @@ -824,7 +824,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - PARENT - CHARTJS INPUTS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC);
logger.logTraceUseEffect(USE_EFFECT_FUNC);

// Override
setChartType(parentChart!);
Expand All @@ -841,7 +841,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - PARENT - DATASOURCE';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, parentDatasource);
logger.logTraceUseEffect(USE_EFFECT_FUNC, parentDatasource);

// Set the datasource as provided
setSelectedDatasource(parentDatasource);
Expand All @@ -856,7 +856,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - PARENT - LOADING DATASOURCE';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, parentLoadingDatasource);
logger.logTraceUseEffect(USE_EFFECT_FUNC, parentLoadingDatasource);

// If defined, update the state
if (parentLoadingDatasource !== undefined) setIsLoadingDatasource(parentLoadingDatasource);
Expand All @@ -871,7 +871,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - PARENT - ACTION';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, parentAction);
logger.logTraceUseEffect(USE_EFFECT_FUNC, parentAction);

// Set action for the component
if (parentAction) setAction(parentAction);
Expand All @@ -886,7 +886,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - i18n';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC);
logger.logTraceUseEffect(USE_EFFECT_FUNC);

// We have to clone i18n, because otherwise the i18n is shared across all GeoCharts (so we can't have GeoChart simultaneously in diff languages per application).
// I also couldn't make it work with changeLanguage either, so it's just re-cloning when the language changes.
Expand All @@ -910,7 +910,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - PLUGINS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, handleChartJSAfterInit);
logger.logTraceUseEffect(USE_EFFECT_FUNC);

const plugin = {
id: 'geochart-chartjs-plugin',
Expand All @@ -930,7 +930,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - INPUTS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, inputs);
logger.logTraceUseEffect(USE_EFFECT_FUNC, inputs);

// Async function to fetch data from within a sync useEffect :|
const fetchAndSetSelectedDatasource = async (
Expand Down Expand Up @@ -974,7 +974,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - SELECTED DATASOURCE';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, inputs, selectedDatasource);
logger.logTraceUseEffect(USE_EFFECT_FUNC, inputs, selectedDatasource);

// If selectedDatasource is specified
if (inputs && selectedDatasource) {
Expand Down Expand Up @@ -1006,7 +1006,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - DATASOURCE STEPS SLIDERS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, inputs, selectedDatasource);
logger.logTraceUseEffect(USE_EFFECT_FUNC, inputs, selectedDatasource);

// If selectedDatasource is specified
if (inputs && selectedDatasource) {
Expand Down Expand Up @@ -1066,7 +1066,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - CHARTJS OPTIONS+DATA';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, chartOptions, chartData);
logger.logTraceUseEffect(USE_EFFECT_FUNC, chartOptions, chartData);

// If chart options. Validate the parsing we did do follow ChartJS options schema validating
if (chartOptions) setValidatorOptions(schemaValidator.validateOptions(chartOptions));
Expand All @@ -1084,7 +1084,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - DATASETS REGISTRY';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC);
logger.logTraceUseEffect(USE_EFFECT_FUNC);

// Make sure the visibility of the chart aligns with the selected datasets
updateDatasetVisibilityUsingState(chartRef.current, datasetRegistry);
Expand All @@ -1099,7 +1099,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - DATAS REGISTRY';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC);
logger.logTraceUseEffect(USE_EFFECT_FUNC);

// Make sure the visibility of the chart aligns with the selected datas
updateDataVisibilityUsingState(chartRef.current, datasRegistry);
Expand All @@ -1114,7 +1114,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - VALIDATORS - INPUTS';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, hasValidSchemas([validatorInputs]));
logger.logTraceUseEffect(USE_EFFECT_FUNC, hasValidSchemas([validatorInputs]));

// If any error
if (!hasValidSchemas([validatorInputs])) {
Expand All @@ -1137,7 +1137,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - VALIDATORS - OPTIONS+DATA';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, hasValidSchemas([validatorOptions, validatorData]));
logger.logTraceUseEffect(USE_EFFECT_FUNC, hasValidSchemas([validatorOptions, validatorData]));

// If any error
if (!hasValidSchemas([validatorOptions, validatorData])) {
Expand All @@ -1160,7 +1160,7 @@ export function GeoChart<
useEffect(() => {
// Log
const USE_EFFECT_FUNC = 'GEOCHART - CURRENT - ACTION';
logger.logTraceUseEffectMount(USE_EFFECT_FUNC, action);
logger.logTraceUseEffect(USE_EFFECT_FUNC, action);

// If redraw is true, reset the property in the action, set the redraw property to true for the chart, then prep a timer to reset it to false after the redraw has happened.
// A bit funky, but only way I could find without having code the logic within the Parent Component.
Expand Down

0 comments on commit 13db37a

Please sign in to comment.