Skip to content

Commit ed62788

Browse files
author
JelteMX
committed
Code cleanup
1 parent 6e5db1f commit ed62788

File tree

14 files changed

+260
-269
lines changed

14 files changed

+260
-269
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dynamictable",
33
"widgetName": "DynamicTable",
4-
"version": "1.3.3",
4+
"version": "1.3.4",
55
"description": "Dynamic (Tree) Table for Mendix",
66
"copyright": "Jelte Lagendijk 2019",
77
"author": "Jelte Lagendijk <jelte.lagendijk@mendix.com>",

‎src/DynamicTable.tsx‎

Lines changed: 92 additions & 204 deletions
Large diffs are not rendered by default.

‎src/components/Alerts.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ReactNode, createElement } from "react";
22
import classNames from "classnames";
3-
import { ValidationMessage } from "../util/validation";
3+
import { ValidationMessage } from "../lib/validation";
44
import { observer } from "mobx-react";
55

66
type TypeBootstrapStyle = "default" | "primary" | "success" | "info" | "inverse" | "warning" | "danger";

‎src/components/DynamicTreeTableContainer.tsx‎

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import ReactResizeDetector from "react-resize-detector";
55
import { TableStore } from "../store/store";
66
import { SelectionMode, DynamicTableSettingsProps } from "../../typings/DynamicTableProps";
77
import Table, { TableRowSelection, ColumnProps, TableEventListeners } from "antd/es/table";
8-
import { TableRecord } from "../util/table";
8+
import { TableRecord } from "../lib/interfaces";
99
import { SizeContainer } from "./SizeContainer";
10-
import { ClickCellType } from "../util/titlehelper";
10+
import { ClickCellType } from "../lib/titlehelper";
1111
import { Alerts } from "./Alerts";
1212

1313
const DEBOUNCE = 250;
@@ -34,54 +34,16 @@ export interface DynamicTreeTableContainerProps {
3434
export class DynamicTreeTableContainer extends Component<DynamicTreeTableContainerProps, {}> {
3535
onExpand = this.expanderHandler.bind(this);
3636
onRowClassName = this.rowClassName.bind(this);
37+
clearDebounce = this._clearDebounce.bind(this);
38+
onRow = this._onRow.bind(this);
3739

3840
private debounce: number | null = null;
3941

4042
render(): ReactNode {
41-
const { selectMode, clickToSelect, store, hideSelectBoxes, className, ui } = this.props;
43+
const { selectMode, store, hideSelectBoxes, className, ui } = this.props;
4244

4345
const removeValidation = store.removeValidationMessage.bind(store);
4446

45-
const clearDebounce = (): void => {
46-
if (this.debounce !== null) {
47-
clearTimeout(this.debounce);
48-
this.debounce = null;
49-
}
50-
};
51-
52-
const onRow = (record: TableRecord): { [name: string]: () => void } => {
53-
return {
54-
onClick: (): void => {
55-
clearDebounce();
56-
this.debounce = window.setTimeout(() => {
57-
// this.onRowClick(record);
58-
if (selectMode && selectMode !== "none" && clickToSelect) {
59-
const selected = [...store.selectedRowsIds];
60-
const findKey = selected.findIndex(s => s === record.key);
61-
const isSelected = findKey !== -1;
62-
if (isSelected && selectMode === "single") {
63-
store.setSelected([]);
64-
} else if (isSelected && selectMode === "multi") {
65-
selected.splice(findKey, 1);
66-
store.setSelected(selected);
67-
} else if (!isSelected && selectMode === "single") {
68-
store.setSelected([record.key]);
69-
} else if (!isSelected && selectMode === "multi") {
70-
selected.push(record.key);
71-
store.setSelected(selected);
72-
}
73-
}
74-
}, DEBOUNCE);
75-
},
76-
onDoubleClick: (): void => {
77-
clearDebounce();
78-
this.debounce = window.setTimeout(() => {
79-
// this.onRowDblClick(record); // double click row
80-
}, DEBOUNCE);
81-
}
82-
};
83-
};
84-
8547
let rowSelection: TableRowSelection<TableRecord> | undefined;
8648

8749
if (selectMode && selectMode !== "none") {
@@ -130,7 +92,7 @@ export class DynamicTreeTableContainer extends Component<DynamicTreeTableContain
13092
dataSource={store.tableRows}
13193
loading={store.isLoading}
13294
onExpand={this.onExpand}
133-
onRow={onRow}
95+
onRow={this.onRow()}
13496
rowSelection={rowSelection}
13597
pagination={false}
13698
rowClassName={this.onRowClassName}
@@ -161,6 +123,52 @@ export class DynamicTreeTableContainer extends Component<DynamicTreeTableContain
161123
);
162124
}
163125

126+
private _clearDebounce(): void {
127+
if (this.debounce !== null) {
128+
clearTimeout(this.debounce);
129+
this.debounce = null;
130+
}
131+
}
132+
133+
private _onRow() {
134+
const { selectMode, clickToSelect, store } = this.props;
135+
136+
const onRow = (record: TableRecord): { [name: string]: () => void } => {
137+
return {
138+
onClick: (): void => {
139+
this.clearDebounce();
140+
this.debounce = window.setTimeout(() => {
141+
// this.onRowClick(record);
142+
if (selectMode && selectMode !== "none" && clickToSelect) {
143+
const selected = [...store.selectedRowsIds];
144+
const findKey = selected.findIndex(s => s === record.key);
145+
const isSelected = findKey !== -1;
146+
if (isSelected && selectMode === "single") {
147+
store.setSelected([]);
148+
} else if (isSelected && selectMode === "multi") {
149+
selected.splice(findKey, 1);
150+
store.setSelected(selected);
151+
} else if (!isSelected && selectMode === "single") {
152+
store.setSelected([record.key]);
153+
} else if (!isSelected && selectMode === "multi") {
154+
selected.push(record.key);
155+
store.setSelected(selected);
156+
}
157+
}
158+
}, DEBOUNCE);
159+
},
160+
onDoubleClick: (): void => {
161+
this.clearDebounce();
162+
this.debounce = window.setTimeout(() => {
163+
// this.onRowDblClick(record); // double click row
164+
}, DEBOUNCE);
165+
}
166+
};
167+
};
168+
169+
return onRow;
170+
}
171+
164172
private getColumns(dataColumns: Array<ColumnProps<TableRecord>>): Array<ColumnProps<TableRecord>> {
165173
const { ui, emptyClickHandler } = this.props;
166174
const leftWidth = ui.settingsTableLeftColumnWidth || 200;

‎src/util/helperobject.ts‎ renamed to ‎src/lib/helperobject.ts‎

File renamed without changes.

‎src/lib/interfaces.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { IAction } from "@jeltemx/mendix-react-widget-utils";
2+
3+
export type AxisSelection = "row" | "column";
4+
export interface Action extends IAction {}
5+
export type ActionReturn = string | number | boolean | mendix.lib.MxObject | mendix.lib.MxObject[] | void;
6+
export type NodeType = "unknown" | "row" | "column" | "entry";
7+
8+
export interface TableRecord {
9+
key: string;
10+
guid: string;
11+
children?: string[];
12+
_mxReferences?: string[];
13+
_className?: string;
14+
_classObj: {
15+
[key: string]: string;
16+
};
17+
[other: string]: unknown;
18+
}

‎src/lib/methods.ts‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import { ClickCellType } from "./titlehelper";
2+
import { FullAction, Nanoflow } from "../../typings/DynamicTableProps";
3+
import { OpenPageAs } from "@jeltemx/mendix-react-widget-utils";
4+
import { Action } from "./interfaces";
5+
6+
export const getClassMethod = (attr: string): ((obj: mendix.lib.MxObject) => string) => {
7+
return (obj: mendix.lib.MxObject): string => {
8+
if (!obj || !attr) {
9+
return "";
10+
}
11+
return obj.get(attr) as string;
12+
};
13+
};
14+
15+
export const getSortMethod = (attr: string): ((obj: mendix.lib.MxObject) => string | null | number) => {
16+
return (obj: mendix.lib.MxObject): string | null | number => {
17+
if (!obj || !attr) {
18+
return null;
19+
}
20+
return obj.get(attr) as string | number;
21+
};
22+
};
23+
24+
export interface ActionPreparation {
25+
object?: mendix.lib.MxObject | null;
26+
action?: Action;
27+
}
28+
29+
export const prepareAction = (
30+
_obj: mendix.lib.MxObject,
31+
_clickType: ClickCellType,
32+
entityProp: string,
33+
clickType: ClickCellType,
34+
fullAction: FullAction,
35+
pageName: string,
36+
openAs: OpenPageAs,
37+
microflow: string,
38+
nanoflow: Nanoflow
39+
): ActionPreparation => {
40+
const entityName = _obj.getEntity();
41+
42+
const action: Action = {};
43+
let object: mendix.lib.MxObject | null = null;
44+
45+
if (entityName === entityProp) {
46+
object = _obj;
47+
}
48+
if (clickType !== _clickType) {
49+
return { object, action };
50+
}
51+
if (fullAction === "open" && pageName) {
52+
action.page = {
53+
pageName,
54+
openAs
55+
};
56+
} else if (fullAction === "microflow" && microflow) {
57+
action.microflow = microflow;
58+
} else if (fullAction === "nanoflow" && nanoflow.nanoflow) {
59+
action.nanoflow = nanoflow;
60+
}
61+
62+
return { object, action };
63+
};

‎src/lib/props.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { DynamicTableSettingsProps, DynamicTableContainerProps } from "../../typings/DynamicTableProps";
2+
3+
export const getPartialUIProps = (props: DynamicTableContainerProps): DynamicTableSettingsProps => {
4+
const {
5+
settingsTableCellColumnWidth,
6+
settingsTableLeftColumnWidth,
7+
settingsHeight,
8+
settingsHeightUnit,
9+
settingsTableLockHeaderRow,
10+
settingsTableLockLeftColumn,
11+
settingsWidth,
12+
settingsWidthUnit
13+
} = props;
14+
15+
return {
16+
settingsHeight,
17+
settingsHeightUnit,
18+
settingsTableCellColumnWidth,
19+
settingsTableLeftColumnWidth,
20+
settingsTableLockHeaderRow,
21+
settingsTableLockLeftColumn,
22+
settingsWidth,
23+
settingsWidthUnit
24+
};
25+
};

‎src/util/titlehelper.tsx‎ renamed to ‎src/lib/titlehelper.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TitleDataSourceType, Nanoflow } from "../../typings/DynamicTableProps";
2-
import { Action, ActionReturn, NodeType } from "../DynamicTable";
2+
import { Action, ActionReturn, NodeType } from "./interfaces";
33
import { ReactNode, createElement } from "react";
44
import classNames from "classnames";
55
import TemplateComponent from "react-mustache-template-component";

‎src/util/validation.ts‎ renamed to ‎src/lib/validation.ts‎

File renamed without changes.

0 commit comments

Comments
 (0)