Skip to content
Open
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: 2 additions & 6 deletions packages/buckaroo-js-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@
"/dist"
],
"dependencies": {
"@ag-grid-community/client-side-row-model": "^32.3.9",
"@ag-grid-community/core": "^32.3.9",
"@ag-grid-community/infinite-row-model": "^32.3.9",
"@ag-grid-community/react": "^32.3.9",
"@ag-grid-community/styles": "^32.3.9",
"@ag-grid-community/theming": "^32.3.9",
"ag-grid-community": "^33.3.2",
"ag-grid-react": "^33.3.2",
"hyparquet": "^1.8.2",
"lodash-es": "^4.17.21",
"recharts": "^2.13.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
IDisplayArgs
} from "./DFViewerParts/gridUtils";
import { DatasourceOrRaw, DFViewerInfinite } from "./DFViewerParts/DFViewerInfinite";
import { IDatasource } from "@ag-grid-community/core";
import { IDatasource } from "ag-grid-community";
import { KeyAwareSmartRowCache, PayloadArgs, PayloadResponse, RequestFN } from "./DFViewerParts/SmartRowCache";
import { parquetRead, parquetMetadata } from 'hyparquet'
import { MessageBox } from "./MessageBox";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDatasource, IGetRowsParams } from "@ag-grid-community/core";
import { IDatasource, IGetRowsParams } from "ag-grid-community";
import { keys, times, reduce } from "lodash-es";

export type RawDataWrapper = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DFData, DFDataRow, DFViewerConfig, SDFT } from "./DFWhole";

import { getCellRendererSelector, dfToAgrid, extractPinnedRows, extractSDFT } from "./gridUtils";

import { AgGridReact } from "@ag-grid-community/react"; // the AG Grid React Component
import { AgGridReact } from "ag-grid-react"; // the AG Grid React Component
import {
GetRowIdParams,
GridApi,
Expand All @@ -18,10 +18,10 @@ import {
SortChangedEvent,
CellClassParams,
RefreshCellsParams,
//ColDef,
} from "@ag-grid-community/core";
import { ClientSideRowModelModule } from "@ag-grid-community/client-side-row-model";
import { InfiniteRowModelModule } from "@ag-grid-community/infinite-row-model";
ClientSideRowModelModule,
InfiniteRowModelModule,
PinnedRowModule,
} from "ag-grid-community";

import {
getAutoSize,
Expand All @@ -34,6 +34,7 @@ import { useColorScheme } from '../useColorScheme';

ModuleRegistry.registerModules([ClientSideRowModelModule]);
ModuleRegistry.registerModules([InfiniteRowModelModule]);
ModuleRegistry.registerModules([PinnedRowModule]);


const AccentColor = "#2196F3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// I'm not sure about adding underlying types too

import { ColDef, ColGroupDef, GridOptions } from "@ag-grid-community/core";
import { ColDef, ColGroupDef, GridOptions } from "ag-grid-community";

type AGGrid_ColDef = ColDef;
export type ColDefOrGroup = ColDef|ColGroupDef
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ValueFormatterFunc, ValueFormatterParams } from "@ag-grid-community/core";
import { ValueFormatterFunc, ValueFormatterParams } from "ag-grid-community";
import {
DisplayerArgs,
cellRendererDisplayers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createPortal } from "react-dom";

import { Bar, BarChart, Tooltip } from "recharts";
import { getChartColors } from "./ChartCell";
import { ColDef, Column, Context, GridApi } from "@ag-grid-community/core";
import { ColDef, Column, Context, GridApi } from "ag-grid-community";
import { useColorScheme } from "../useColorScheme";

export interface HistogramNode {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ValueFormatterFunc } from "@ag-grid-community/core";
import { ValueFormatterFunc } from "ag-grid-community";

export const getTextCellRenderer = (formatter: ValueFormatterFunc<any>) => {
const TextCellRenderer = (props: any) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DFViewer } from "./DFViewerInfinite";
import { DFWhole, TooltipConfig } from "./DFWhole";
import { ITooltipParams } from "@ag-grid-community/core";
import { ITooltipParams } from "ag-grid-community";

export function getBakedDFViewer(seriesDf: DFWhole) {
const retFunc = (_props: ITooltipParams) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
CellClassParams,
} from "@ag-grid-community/core";
} from "ag-grid-community";

import { BLUE_TO_YELLOW, DIVERGING_RED_WHITE_BLUE } from "../../baked_data/colorMap";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
import { omit } from "lodash-es";
import { DFData, DFViewerConfig, NormalColumnConfig, MultiIndexColumnConfig, PinnedRowConfig, ColumnConfig } from "./DFWhole";
import { getFloatFormatter } from './Displayer';
import { ColDef, ValueFormatterParams } from '@ag-grid-community/core';
import { ColDef, ValueFormatterParams } from 'ag-grid-community';

describe("testing utility functions in gridUtils ", () => {
// mostly sanity checks to help develop gridUtils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import {
IGetRowsParams,
SizeColumnsToContentStrategy,
SizeColumnsToFitProvidedWidthStrategy,
} from "@ag-grid-community/core";
colorSchemeDark,
colorSchemeLight,
themeAlpine,
Theme,
} from "ag-grid-community";

import {
DFWhole,
Expand All @@ -34,7 +38,7 @@ import { getFormatterFromArgs, getCellRenderer, objFormatter, getFormatter } fro
import { CSSProperties, Dispatch, SetStateAction } from "react";
import { CommandConfigT } from "../CommandUtils";
import { KeyAwareSmartRowCache, PayloadArgs } from "./SmartRowCache";
import { colorSchemeDark, colorSchemeLight, themeAlpine, Theme } from "@ag-grid-community/theming";



// for now colDef stuff with less than 3 implementantions should stay in this file
Expand Down
7 changes: 2 additions & 5 deletions packages/buckaroo-js-core/src/components/StatusBar.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
// https://plnkr.co/edit/QTNwBb2VEn81lf4t?open=index.tsx
import React, { useRef, useCallback, useState, memo, useEffect, useMemo } from "react";
import { clone, fromPairs, includes, indexOf, keys, map } from "lodash-es";
import { AgGridReact } from "@ag-grid-community/react"; // the AG Grid React Component
import { ColDef, GridApi, GridOptions, ModuleRegistry } from "@ag-grid-community/core";
import { AgGridReact, CustomCellEditorProps } from "ag-grid-react";
import { ColDef, GridApi, GridOptions, ModuleRegistry, ClientSideRowModelModule, Theme } from "ag-grid-community";
import { basicIntFormatter } from "./DFViewerParts/Displayer";
import { DFMeta } from "./WidgetTypes";
import { BuckarooOptions } from "./WidgetTypes";
import { BuckarooState, BKeys } from "./WidgetTypes";
import { ClientSideRowModelModule } from "@ag-grid-community/client-side-row-model";
import { CustomCellEditorProps } from '@ag-grid-community/react';
import { getThemeForScheme } from "./DFViewerParts/gridUtils";
import { Theme } from "@ag-grid-community/theming";
import { useColorScheme } from "./useColorScheme";

export type setColumFunc = (newCol: string) => void;
Expand Down
2 changes: 1 addition & 1 deletion packages/buckaroo-js-core/src/components/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { clone, pickBy } from "lodash-es";
import { DFWhole } from "./DFViewerParts/DFWhole";
import { ColDef } from "@ag-grid-community/core";
import { ColDef } from "ag-grid-community";

export type setDFFunc = (newDf: DFWhole) => void;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { Meta, StoryObj } from "@storybook/react";
import React, { useMemo, useState } from "react";
import { DFViewerInfinite } from "../components/DFViewerParts/DFViewerInfinite";
import { DFViewerConfig } from "../components/DFViewerParts/DFWhole";
import { IDatasource, IGetRowsParams } from "@ag-grid-community/core";
import { IDatasource, IGetRowsParams } from "ag-grid-community";

const makeContextualDatasource = (dataA: any[], dataB: any[], delayMs = 0): IDatasource => {
const total = Math.max(dataA.length, dataB.length);
Expand Down
17 changes: 7 additions & 10 deletions packages/buckaroo-js-core/src/stories/RawAGGrid.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,17 @@ import { DFData } from "../components/DFViewerParts/DFWhole";
import { createDatasourceWrapper, DatasourceWrapper } from "../components/DFViewerParts/DFViewerDataHelper";

import {SelectBox } from './StoryUtils'
import { AgGridReact } from "@ag-grid-community/react"; // the AG Grid React Component
import { AgGridReact } from "ag-grid-react";
import {
GridOptions,
//IDatasource,
ModuleRegistry,
ColDef,
CellClassParams
} from "@ag-grid-community/core";

import { themeAlpine} from '@ag-grid-community/theming';
import { colorSchemeDark } from '@ag-grid-community/theming';

import { ClientSideRowModelModule } from "@ag-grid-community/client-side-row-model";
import { InfiniteRowModelModule } from "@ag-grid-community/infinite-row-model";
CellClassParams,
themeAlpine,
colorSchemeDark,
ClientSideRowModelModule,
InfiniteRowModelModule,
} from "ag-grid-community";

ModuleRegistry.registerModules([ClientSideRowModelModule]);
ModuleRegistry.registerModules([InfiniteRowModelModule]);
Expand Down
6 changes: 3 additions & 3 deletions packages/buckaroo-js-core/src/style/dcf-npm.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
font-size: 0.95em;
}
.dependent-tabs ul.tabs li.active {
background: var(--ag-range-selection-background-color-3);
color: var(--ag-alpine-active-color);
background: var(--ag-range-selection-background-color);
color: var(--ag-accent-color);
}
.dependent-tabs .output-area {
clear: both;
Expand Down Expand Up @@ -366,7 +366,7 @@
}

.ag-theme-alpine-dark, .ag-theme-alpine {
--ag-grid-size:3px;
--ag-spacing:3px;
--ag-list-item-height: 20px;
}

Expand Down
101 changes: 29 additions & 72 deletions packages/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.