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.

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

Jump to bottom

fix: cellrenderer is missing warning and info #50

Merged
merged 1 commit into from
Oct 31, 2022
Merged

fix: cellrenderer is missing warning and info #50

Show file tree
Hide file tree
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
41 changes: 27 additions & 14 deletions src/components/GridCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { GenericMultiEditCellClass } from "./GenericCellClass";
import { GenericCellRendererParams, GridRendererGenericCell } from "./gridRender/GridRenderGenericCell";
import { ColDef, ICellEditorParams, ICellRendererParams } from "ag-grid-community";
import { GridLoadableCell } from "./GridLoadableCell";
import { GridIcon } from "@components/GridIcon";
import { ValueFormatterParams } from "ag-grid-community/dist/lib/entities/colDef";

export interface GridFormProps<RowType extends GridBaseRow> {
cellEditorParams: ICellEditorParams;
Expand All @@ -30,21 +32,26 @@ export interface GenericCellEditorColDef<
cellRendererParams?: GenericCellRendererParams<RowType>;
}

export const GridCellRenderer = (cellRendererParams: ICellRendererParams) => {
export const GridCellRenderer = (props: ICellRendererParams) => {
const { checkUpdating } = useContext(UpdatingContext);
const colDef = cellRendererParams.colDef;

return colDef?.cellRendererParams?.oldCellRenderer ? (
<GridLoadableCell
isLoading={checkUpdating(
cellRendererParams.colDef?.field ?? cellRendererParams.colDef?.colId ?? "",
cellRendererParams.data.id,
)}
>
<colDef.cellRendererParams.oldCellRenderer {...cellRendererParams} />
const colDef = props.colDef as ColDef;

const rendererParams = colDef.cellRendererParams as GenericCellRendererParams<any> | undefined;
const warningFn = rendererParams?.warning;
const warningText = warningFn ? warningFn(props) : undefined;
const infoFn = rendererParams?.info;
const infoText = infoFn ? infoFn(props) : undefined;

return colDef?.cellRendererParams?.originalCellRenderer ? (
<GridLoadableCell isLoading={checkUpdating(colDef.field ?? colDef.colId ?? "", props.data.id)}>
<>
{typeof warningText === "string" && <GridIcon icon={"ic_warning"} title={warningText} />}
{typeof infoText === "string" && <GridIcon icon={"ic_info"} title={infoText} />}
<colDef.cellRendererParams.originalCellRenderer {...props} />
</>
</GridLoadableCell>
) : (
<GridRendererGenericCell {...cellRendererParams} />
<GridRendererGenericCell {...props} />
);
};

Expand All @@ -55,17 +62,23 @@ export const GridCell = <RowType extends GridBaseRow, FormProps extends GenericC
props: GenericCellEditorColDef<RowType, FormProps>,
): ColDef => {
return {
cellRenderer: GridCellRenderer,
sortable: !!(props?.field || props?.valueGetter),
resizable: true,
...(props.cellEditorParams && {
cellClass: props?.cellEditorParams?.multiEdit ? GenericMultiEditCellClass : undefined,
editable: true,
cellEditor: GenericCellEditorComponent,
}),
// Default value formatter, otherwise react freaks out on objects
valueFormatter: (params: ValueFormatterParams) => {
const types = ["number", "undefined", "boolean", "string"];
if (types.includes(typeof params.value)) return params.value;
else return JSON.stringify(params.value);
},
...props,
cellRenderer: GridCellRenderer,
cellRendererParams: {
originalCellRender: props.cellRenderer,
originalCellRenderer: props.cellRenderer,
...props.cellRendererParams,
},
};
Expand Down
11 changes: 6 additions & 5 deletions src/components/gridRender/GridRenderGenericCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,30 @@ export interface GenericCellColDef<RowType extends GridBaseRow, FormProps extend

export interface GenericCellRendererParams<RowType extends GridBaseRow> {
singleClickEdit?: boolean;
warning?: (props: RowICellRendererParams<RowType>) => string | boolean | undefined;
info?: (props: RowICellRendererParams<RowType>) => string | boolean | undefined;
warning?: (props: RowICellRendererParams<RowType>) => string | boolean | null | undefined;
info?: (props: RowICellRendererParams<RowType>) => string | boolean | null | undefined;
}

export const GridRendererGenericCell = <RowType extends GridBaseRow>(props: ICellRendererParams): JSX.Element => {
const { checkUpdating } = useContext(UpdatingContext);

const cellRendererParams = props.colDef?.cellRendererParams as GenericCellRendererParams<RowType> | undefined;
const colDef = props.colDef as ColDef;
const cellRendererParams = colDef.cellRendererParams as GenericCellRendererParams<RowType> | undefined;
const warningFn = cellRendererParams?.warning;
const warningText = warningFn ? warningFn(props) : undefined;
const infoFn = cellRendererParams?.info;
const infoText = infoFn ? infoFn(props) : undefined;

const defaultFormatter = (props: ValueFormatterParams): string => props.value;
const formatter = props.colDef?.valueFormatter ?? defaultFormatter;
const formatter = colDef.valueFormatter ?? defaultFormatter;
if (typeof formatter === "string") {
console.error("valueFormatter must be a function");
return <span>valueFormatter must be a function</span>;
}
const formatted = formatter(props as ValueFormatterParams);

return (
<GridLoadableCell isLoading={checkUpdating(props.colDef?.field ?? props.colDef?.colId ?? "", props.data.id)}>
<GridLoadableCell isLoading={checkUpdating(colDef.field ?? colDef.colId ?? "", props.data.id)}>
<>
{typeof warningText === "string" && <GridIcon icon={"ic_warning"} title={warningText} />}
{typeof infoText === "string" && <GridIcon icon={"ic_info"} title={infoText} />}
Expand Down