dotdata_widgets 0.2.3 → 0.3.0

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/BooleanField.js

@@ -3,29 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BooleanInlineField = exports.BooleanWidget = void 0;
+exports.BooleanInlineEditor = exports.BooleanWidget = void 0;
 const react_1 = __importDefault(require("react"));
-const lodash_1 = require("lodash");
-const context_1 = require("../../context");
 function BooleanWidget(props) {
     return (react_1.default.createElement("span", { style: { cursor: 'pointer' }, onDoubleClick: () => props.onValueChange(!props.value) }, props.value ? 'true' : 'false'));
 }
 exports.BooleanWidget = BooleanWidget;
-const BooleanInlineField = (props) => {
-    var _a, _b;
-    const [state, dispatch] = (0, context_1.useFeatureDescriptorEditorContext)();
-    const value = (_a = (0, lodash_1.get)(state, props.field)) !== null && _a !== void 0 ? _a : null;
-    const onValueChange = (value) => {
-        dispatch(context_1.FeatureDescriptorEditorActions.setDraftField({
-            field: props.field,
-            value,
-        }));
-    };
-    const label = (_b = props.field.split('.').pop()) !== null && _b !== void 0 ? _b : '';
-    return (react_1.default.createElement("span", { className: "inline-editor", onClick: () => onValueChange(!value) },
-        label,
+const BooleanInlineEditor = (props) => {
+    return (react_1.default.createElement("span", { className: "inline-editor", onClick: () => props.onValueChange(!props.value) },
+        props.label,
         react_1.default.createElement("span", { className: "equal-sign" }, "="),
-        react_1.default.createElement("span", { className: "inline-displayed-value boolean-value" }, value ? 'true' : 'false')));
+        react_1.default.createElement("span", { className: "inline-displayed-value boolean-value" }, props.value ? 'true' : 'false')));
 };
-exports.BooleanInlineField = BooleanInlineField;
+exports.BooleanInlineEditor = BooleanInlineEditor;
 //# sourceMappingURL=BooleanField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/ChipField.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChipInlineField = exports.ChipInlineEditor = exports.ChipWidget = void 0;
+exports.ChipInlineEditor = exports.ChipWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 function ChipWidget(props) {
     var _a;
     const values = ((_a = props.value) !== null && _a !== void 0 ? _a : []).join(',');
@@ -23,9 +23,7 @@ function ChipWidget(props) {
 }
 exports.ChipWidget = ChipWidget;
 const ChipInlineEditor = (props) => {
-    return (react_1.default.createElement(_InlineEditorField_1.InlineEditor, Object.assign({}, props, { prettifyFn: chips => chips.join(', '), widget: ChipWidget })));
+    return (react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { prettifyFn: chips => chips.join(', '), widget: ChipWidget })));
 };
 exports.ChipInlineEditor = ChipInlineEditor;
-const ChipInlineField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { prettifyFn: chips => chips.join(', '), widget: ChipWidget })));
-exports.ChipInlineField = ChipInlineField;
 //# sourceMappingURL=ChipField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/ColumnField.js

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColumnInputField = exports.ColumnWidget = void 0;
+exports.ColumnInlineEditor = exports.ColumnWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
 const column_1 = require("../../../../models/column");
 const _utils_1 = require("../../../../utils");
 const column_source_type_icons_1 = require("../../../../components/column-source-type-icons");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 const sourceTypeIcon = {
     [column_1.Column.SourceType.Boolean]: react_1.default.createElement(column_source_type_icons_1.SourceTypeBoolean, { size: 20 }),
     [column_1.Column.SourceType.Date]: react_1.default.createElement(column_source_type_icons_1.SourceTypeDate, { size: 20 }),
@@ -51,6 +51,8 @@ const ColumnWidget = (props) => {
             }, renderInput: params => (react_1.default.createElement(material_1.TextField, Object.assign({}, params, { variant: "standard", placeholder: "Column" }))) })));
 };
 exports.ColumnWidget = ColumnWidget;
-const ColumnInputField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { widget: exports.ColumnWidget, widgetProps: { columns: props.columns } })));
-exports.ColumnInputField = ColumnInputField;
+const ColumnInlineEditor = (props) => {
+    return (react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { widget: exports.ColumnWidget, widgetProps: { columns: props.columns }, prettifyFn: column => column === null || column === void 0 ? void 0 : column.name })));
+};
+exports.ColumnInlineEditor = ColumnInlineEditor;
 //# sourceMappingURL=ColumnField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/DraftEditors.js

@@ -0,0 +1,51 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BooleanEditor = exports.ChipEditor = exports.StringEditor = exports.NumberEditor = exports.TableEditor = exports.ColumnEditor = exports.TableColumnEditor = void 0;
+const react_1 = __importDefault(require("react"));
+const __1 = require("../");
+function TableColumnEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.TableColumnInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })), tableColumns: props.tableColumns }));
+}
+exports.TableColumnEditor = TableColumnEditor;
+function ColumnEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.ColumnInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })), columns: props.columns }));
+}
+exports.ColumnEditor = ColumnEditor;
+function TableEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.TableInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })), tables: props.tables }));
+}
+exports.TableEditor = TableEditor;
+function NumberEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.NumberInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })) }));
+}
+exports.NumberEditor = NumberEditor;
+function StringEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.StringInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })) }));
+}
+exports.StringEditor = StringEditor;
+function ChipEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.ChipInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })) }));
+}
+exports.ChipEditor = ChipEditor;
+function BooleanEditor(props) {
+    const label = props.label;
+    const value = props.draft[label];
+    return (react_1.default.createElement(__1.BooleanInlineEditor, { label: label, value: value, onValueChange: value => props.onDraftChange(Object.assign(Object.assign({}, props.draft), { [label]: value })) }));
+}
+exports.BooleanEditor = BooleanEditor;
+//# sourceMappingURL=DraftEditors.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/NumberField.js

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberInlineField = exports.NumberInlineEditor = exports.NumberWidget = void 0;
+exports.NumberInlineEditor = exports.NumberWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 function NumberWidget(props) {
-    return (react_1.default.createElement(material_1.TextField, { style: { width: '80px' }, value: props.value, variant: "standard", type: "number", autoFocus: true, onBlur: props.onBlur, onChange: e => props.onValueChange(Number(e.target.value)) }));
+    return (react_1.default.createElement(material_1.TextField, { style: { width: '80px' }, value: props.value, variant: "standard", autoFocus: true, onBlur: props.onBlur, onChange: e => {
+            props.onValueChange(e.target.value);
+        } }));
 }
 exports.NumberWidget = NumberWidget;
 const NumberInlineEditor = (props) => {
-    return react_1.default.createElement(_InlineEditorField_1.InlineEditor, Object.assign({}, props, { widget: NumberWidget }));
+    return react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { widget: NumberWidget, valueType: "number" }));
 };
 exports.NumberInlineEditor = NumberInlineEditor;
-const NumberInlineField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { widget: NumberWidget })));
-exports.NumberInlineField = NumberInlineField;
 //# sourceMappingURL=NumberField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/StringField.js

@@ -3,18 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StringInlineField = exports.StringInlineEditor = exports.StringWidget = void 0;
+exports.StringInlineEditor = exports.StringWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 function StringWidget(props) {
     return (react_1.default.createElement(material_1.TextField, { style: { width: '120px' }, value: props.value, variant: "standard", autoFocus: true, onBlur: props.onBlur, onChange: e => props.onValueChange(e.target.value) }));
 }
 exports.StringWidget = StringWidget;
 const StringInlineEditor = (props) => {
-    return react_1.default.createElement(_InlineEditorField_1.InlineEditor, Object.assign({}, props, { widget: StringWidget }));
+    return react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { widget: StringWidget }));
 };
 exports.StringInlineEditor = StringInlineEditor;
-const StringInlineField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { widget: StringWidget })));
-exports.StringInlineField = StringInlineField;
 //# sourceMappingURL=StringField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/TableColumnField.js

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableColumnInlineField = exports.TableColumnInlineEditor = exports.TableColumnWidget = void 0;
+exports.TableColumnInlineEditor = exports.TableColumnWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const column_1 = require("../../../../models/column");
 const _utils_1 = require("../../../../utils");
 const ColumnField_1 = require("./ColumnField");
 const TableField_1 = require("./TableField");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 const TableColumnWidget = (props) => {
     var _a, _b, _c;
     const columns = getAdtColumns(props.tableColumns, (_a = props.value) === null || _a === void 0 ? void 0 : _a.table);
@@ -22,11 +22,9 @@ const TableColumnWidget = (props) => {
 };
 exports.TableColumnWidget = TableColumnWidget;
 const TableColumnInlineEditor = (props) => {
-    return (react_1.default.createElement(_InlineEditorField_1.InlineEditor, Object.assign({}, props, { widget: exports.TableColumnWidget, widgetProps: { tableColumns: props.tableColumns }, prettifyFn: column => column_1.FullColumnName.create(column) })));
+    return (react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { widget: exports.TableColumnWidget, widgetProps: { tableColumns: props.tableColumns }, prettifyFn: column => column_1.FullColumnName.create(column) })));
 };
 exports.TableColumnInlineEditor = TableColumnInlineEditor;
-const TableColumnInlineField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { widget: exports.TableColumnWidget, prettifyFn: column => column_1.FullColumnName.create(column), widgetProps: { tableColumns: props.tableColumns } })));
-exports.TableColumnInlineField = TableColumnInlineField;
 function getAdtColumns(tableColumns, tableName) {
     var _a;
     return (0, _utils_1.isSet)(tableName) ? (_a = tableColumns[tableName]) !== null && _a !== void 0 ? _a : [] : [];

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/TableField.js

@@ -3,15 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableInlineField = exports.TableWidget = void 0;
+exports.TableInlineEditor = exports.TableWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
-const _InlineEditorField_1 = require("./_InlineEditorField");
+const _InlineDraftEditor_1 = require("./_InlineDraftEditor");
 const TableWidget = (props) => {
     var _a;
     return (react_1.default.createElement(material_1.Autocomplete, { style: { width: '180px' }, options: props.tables, value: (_a = props.value) !== null && _a !== void 0 ? _a : null, size: "small", autoComplete: true, blurOnSelect: true, onBlur: props.onBlur, onChange: (e, value) => value && props.onValueChange(value), renderInput: params => (react_1.default.createElement(material_1.TextField, Object.assign({}, params, { variant: "standard", placeholder: "Table" }))) }));
 };
 exports.TableWidget = TableWidget;
-const TableInlineField = (props) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, props, { widget: exports.TableWidget, widgetProps: { tables: props.tables } })));
-exports.TableInlineField = TableInlineField;
+const TableInlineEditor = (props) => {
+    return (react_1.default.createElement(_InlineDraftEditor_1.InlineEditor, Object.assign({}, props, { widget: exports.TableWidget, widgetProps: { tables: props.tables } })));
+};
+exports.TableInlineEditor = TableInlineEditor;
 //# sourceMappingURL=TableField.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/{_InlineEditorField.js → _InlineDraftEditor.js}

@@ -3,13 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InlineEditorField = exports.InlineEditor = void 0;
+exports.InlineEditor = void 0;
 const react_1 = __importDefault(require("react"));
-const lodash_1 = require("lodash");
 const _utils_1 = require("../../../../utils");
-const context_1 = require("../../context");
 function InlineEditor(props) {
-    var _a;
+    var _a, _b;
     const value = (_a = props.value) !== null && _a !== void 0 ? _a : null;
     const onValueChange = props.onValueChange;
     const [isSummaryVisible, setIsSummaryVisible] = react_1.default.useState(() => true);
@@ -20,9 +18,7 @@ function InlineEditor(props) {
     const displayedValue = props.prettifyFn && (0, _utils_1.isSet)(value)
         ? props.prettifyFn(value)
         : `'${value !== null && value !== void 0 ? value : '...'}'`;
-    const valueTypeClass = typeof value === 'string' || typeof value === 'object'
-        ? 'string-value'
-        : 'number-value';
+    const valueTypeClass = `${(_b = props.valueType) !== null && _b !== void 0 ? _b : 'string'}-value`;
     return (react_1.default.createElement("span", { className: "inline-editor" },
         props.label,
         react_1.default.createElement("span", { className: "equal-sign" }, "="),
@@ -31,18 +27,4 @@ function InlineEditor(props) {
             " "))));
 }
 exports.InlineEditor = InlineEditor;
-function InlineEditorField(props) {
-    var _a, _b;
-    const [state, dispatch] = (0, context_1.useFeatureDescriptorEditorContext)();
-    const value = (_a = (0, lodash_1.get)(state, props.field)) !== null && _a !== void 0 ? _a : null;
-    const onValueChange = (value) => {
-        dispatch(context_1.FeatureDescriptorEditorActions.setDraftField({
-            field: props.field,
-            value,
-        }));
-    };
-    const label = (_b = props.field.split('.').pop()) !== null && _b !== void 0 ? _b : '';
-    return (react_1.default.createElement(InlineEditor, Object.assign({}, props, { label: label, value: value, onValueChange: onValueChange })));
-}
-exports.InlineEditorField = InlineEditorField;
-//# sourceMappingURL=_InlineEditorField.js.map
+//# sourceMappingURL=_InlineDraftEditor.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/field-widgets/index.js

@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./_InlineEditorField"), exports);
+__exportStar(require("./_InlineDraftEditor"), exports);
+__exportStar(require("./DraftEditors"), exports);
 __exportStar(require("./StringField"), exports);
 __exportStar(require("./NumberField"), exports);
 __exportStar(require("./ChipField"), exports);

package/lib/feature-descriptor/feature-descriptor-editor/components/filter/index.js

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FilterTypeSelection"), exports);
-__exportStar(require("./FilterTableColumnInlineEditor"), exports);
 //# sourceMappingURL=index.js.map

package/lib/feature-descriptor/feature-descriptor-editor/components/join/JoinConditionEditor.js

@@ -8,7 +8,6 @@ const react_1 = __importDefault(require("react"));
 const feature_descriptor_1 = require("../../../../models/feature-descriptor");
 const context_1 = require("../../context");
 const JoinConditionTypeSelection_1 = require("./JoinConditionTypeSelection");
-const JoinTableColumnSelector_1 = require("./JoinTableColumnSelector");
 const EditorWrapper_1 = require("../EditorWrapper");
 const field_widgets_1 = require("../field-widgets");
 const joinConditionEditorTemplate = {
@@ -17,46 +16,28 @@ const joinConditionEditorTemplate = {
         var _a, _b;
         const [state] = (0, context_1.useFeatureDescriptorEditorContext)();
         return [
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, Object.assign({ field: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [] }, props)),
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, Object.assign({ field: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [] }, props)),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [] }, props)),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [] }, props)),
         ];
     },
     [feature_descriptor_1.JoinCondition.Type.Time]: props => {
         var _a, _b;
         const [state] = (0, context_1.useFeatureDescriptorEditorContext)();
-        const from_value = 'from_value' in props.joinCondition
-            ? props.joinCondition.from_value
-            : null;
-        const to_value = 'to_value' in props.joinCondition ? props.joinCondition.to_value : null;
         return [
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, { field: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [], joinCondition: props.joinCondition, onJoinConditionChange: props.onJoinConditionChange }),
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, { field: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [], joinCondition: props.joinCondition, onJoinConditionChange: props.onJoinConditionChange }),
-            react_1.default.createElement(field_widgets_1.StringInlineEditor, { label: "from_value", value: from_value, onValueChange: from_value => {
-                    props.onJoinConditionChange(Object.assign(Object.assign({}, props.joinCondition), { from_value }));
-                } }),
-            react_1.default.createElement(field_widgets_1.StringInlineEditor, { label: "to_value", value: to_value, onValueChange: to_value => {
-                    props.onJoinConditionChange(Object.assign(Object.assign({}, props.joinCondition), { to_value }));
-                } }),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [] }, props)),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [] }, props)),
+            react_1.default.createElement(field_widgets_1.StringEditor, Object.assign({ label: "from_value" }, props)),
+            react_1.default.createElement(field_widgets_1.StringEditor, Object.assign({ label: "to_value" }, props)),
         ];
     },
     [feature_descriptor_1.JoinCondition.Type.PeriodicTime]: props => {
         var _a, _b;
         const [state] = (0, context_1.useFeatureDescriptorEditorContext)();
-        const periodic_unit = 'periodic_unit' in props.joinCondition
-            ? props.joinCondition.periodic_unit
-            : null;
-        const num_cycles = 'num_cycles' in props.joinCondition
-            ? props.joinCondition.num_cycles
-            : null;
         return [
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, Object.assign({ field: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [] }, props)),
-            react_1.default.createElement(JoinTableColumnSelector_1.JoinTableColumnSelector, Object.assign({ field: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [] }, props)),
-            react_1.default.createElement(field_widgets_1.StringInlineEditor, { label: "periodic_unit", value: periodic_unit, onValueChange: periodic_unit => {
-                    props.onJoinConditionChange(Object.assign(Object.assign({}, props.joinCondition), { periodic_unit }));
-                } }),
-            react_1.default.createElement(field_widgets_1.NumberInlineEditor, { label: "num_cycles", value: num_cycles, onValueChange: num_cycles => {
-                    props.onJoinConditionChange(Object.assign(Object.assign({}, props.joinCondition), { num_cycles }));
-                } }),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "target_side_column", columns: (_a = props.tableColumns[state.join.target_table]) !== null && _a !== void 0 ? _a : [] }, props)),
+            react_1.default.createElement(field_widgets_1.ColumnEditor, Object.assign({ label: "source_side_column", columns: (_b = props.tableColumns[state.join.source_table]) !== null && _b !== void 0 ? _b : [] }, props)),
+            react_1.default.createElement(field_widgets_1.StringEditor, Object.assign({ label: "periodic_unit" }, props)),
+            react_1.default.createElement(field_widgets_1.NumberEditor, Object.assign({ label: "num_cycles" }, props)),
         ];
     },
 };
@@ -64,8 +45,8 @@ const InlineJoinConditionEditor = (props) => {
     const templates = props.joinCondition.type
         ? joinConditionEditorTemplate[props.joinCondition.type]({
             tableColumns: props.tableColumns,
-            joinCondition: props.joinCondition,
-            onJoinConditionChange: props.onJoinConditionChange,
+            draft: props.joinCondition,
+            onDraftChange: props.onJoinConditionChange,
         })
         : [];
     return (react_1.default.createElement(EditorWrapper_1.EditorWrapper, { templates: templates, selectorWidth: 130, selectedType: props.joinCondition.type },

package/lib/feature-descriptor/feature-descriptor-editor/models/aggregation-draft.js

@@ -22,12 +22,12 @@ const TemporalChangeDraft = zod_1.z.object({
 const LatestKDraft = zod_1.z.object({
     source_time_filed: common_field_draft_1.ColumnDraft,
     source_field: common_field_draft_1.ColumnDraft,
-    k: zod_1.z.number(),
+    k: common_field_draft_1.NumberDraft,
 });
 const TopicWeightDraft = zod_1.z.object({
     text_topic_field: common_field_draft_1.ColumnDraft,
     original_text_column_name: common_field_draft_1.ColumnDraft,
-    index: zod_1.z.number(),
+    index: common_field_draft_1.NumberDraft,
 });
 const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.AbsoluteTemporalChangeCountRecords]: TemporalChangeDraft.omit({ source_column: true }).merge(zod_1.z.object({
@@ -48,13 +48,13 @@ const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.AnyBetween]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.AnyBetween),
         field: common_field_draft_1.ColumnDraft,
-        lower_edge: zod_1.z.number(),
-        upper_edge: zod_1.z.number(),
+        lower_edge: common_field_draft_1.NumberDraft,
+        upper_edge: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.AnyValue]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.AnyValue),
         field: common_field_draft_1.ColumnDraft,
-        value: zod_1.z.number(),
+        value: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.AsIs]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.AsIs),
@@ -64,14 +64,14 @@ const AggregationDrafts = {
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.C3),
         source_time_field: common_field_draft_1.ColumnDraft,
         source_field: common_field_draft_1.ColumnDraft,
-        lag: zod_1.z.number(),
+        lag: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.CWT]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.CWT),
         source_time_field: common_field_draft_1.ColumnDraft,
         source_field: common_field_draft_1.ColumnDraft,
-        index: zod_1.z.number(),
-        width: zod_1.z.number(),
+        index: common_field_draft_1.NumberDraft,
+        width: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.ClosestTimeDifference]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.ClosestTimeDifference),
@@ -86,13 +86,13 @@ const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.CountBetween]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.CountBetween),
         field: common_field_draft_1.ColumnDraft,
-        lower_edge: zod_1.z.number(),
-        upper_edge: zod_1.z.number(),
+        lower_edge: common_field_draft_1.NumberDraft,
+        upper_edge: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.CountOfValue]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.CountOfValue),
         field: common_field_draft_1.ColumnDraft,
-        value: zod_1.z.number(),
+        value: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.CountRecords]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.CountRecords),
@@ -115,13 +115,13 @@ const AggregationDrafts = {
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.GridTargetMeanEncode),
         latitude_field: common_field_draft_1.ColumnDraft,
         longitude_field: common_field_draft_1.ColumnDraft,
-        encoder_id: zod_1.z.number(),
+        encoder_id: common_field_draft_1.NumberDraft,
         distance: zod_1.z.string(),
     }),
     [feature_descriptor_1.Aggregation.Type.HistogramEqualityRatio]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.HistogramEqualityRatio),
         field: common_field_draft_1.ColumnDraft,
-        value: zod_1.z.number(),
+        value: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.Hour]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.Hour),
@@ -199,7 +199,7 @@ const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.N1RedundantRatioOfValue]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.N1RedundantRatioOfValue),
         field: common_field_draft_1.ColumnDraft,
-        ratio_value: zod_1.z.union([zod_1.z.number(), zod_1.z.string(), zod_1.z.boolean()]),
+        ratio_value: zod_1.z.union([common_field_draft_1.NumberDraft, zod_1.z.string(), zod_1.z.boolean()]),
         null_inclusion: zod_1.z.boolean(),
     }),
     [feature_descriptor_1.Aggregation.Type.N1RedundantSum]: zod_1.z.object({
@@ -210,13 +210,13 @@ const AggregationDrafts = {
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.N1RedundantTopicWeightMean),
         text_topic_field: common_field_draft_1.ColumnDraft,
         original_text_column_name: common_field_draft_1.ColumnDraft,
-        index: zod_1.z.number(),
+        index: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.N1RedundantTopicWeightSum]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.N1RedundantTopicWeightSum),
         text_topic_field: common_field_draft_1.ColumnDraft,
         original_text_column_name: common_field_draft_1.ColumnDraft,
-        index: zod_1.z.number(),
+        index: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.NgramCount]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.NgramCount),
@@ -234,13 +234,13 @@ const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.RatioBetween]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.RatioBetween),
         field: common_field_draft_1.ColumnDraft,
-        lower_edge: zod_1.z.number(),
-        upper_edge: zod_1.z.number(),
+        lower_edge: common_field_draft_1.NumberDraft,
+        upper_edge: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.RatioOfValue]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.RatioOfValue),
         field: common_field_draft_1.ColumnDraft,
-        ratio_value: zod_1.z.union([zod_1.z.number(), zod_1.z.string(), zod_1.z.boolean()]),
+        ratio_value: zod_1.z.union([common_field_draft_1.NumberDraft, zod_1.z.string(), zod_1.z.boolean()]),
         null_inclusion: zod_1.z.boolean(),
     }),
     [feature_descriptor_1.Aggregation.Type.Std]: zod_1.z.object({
@@ -266,7 +266,7 @@ const AggregationDrafts = {
     [feature_descriptor_1.Aggregation.Type.TargetMeanEncode]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.TargetMeanEncode),
         field: common_field_draft_1.ColumnDraft,
-        encode_field: zod_1.z.number(),
+        encode_field: common_field_draft_1.NumberDraft,
     }),
     [feature_descriptor_1.Aggregation.Type.TargetTimeDifference]: zod_1.z.object({
         type: zod_1.z.literal(feature_descriptor_1.Aggregation.Type.TargetTimeDifference),
@@ -324,15 +324,14 @@ var AggregationDraft;
 (function (AggregationDraft) {
     function fromAggregation(aggregation, tableColumns) {
         const schema = AggregationDrafts[aggregation.type];
-        const aggr = aggregation;
         const columnFields = Object.entries(schema.shape)
             .filter(([_, field]) => field.description === 'Column')
             .map(([colName]) => colName);
-        return Object.assign(Object.assign({}, aggr), Object.fromEntries(columnFields.map(field => {
+        return Object.assign(Object.assign({}, aggregation), Object.fromEntries(columnFields.map(field => {
             var _a;
             return [
                 field,
-                (_a = column_1.Column.fromFullName(aggr[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
+                (_a = column_1.Column.fromFullName(aggregation[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
             ];
         })));
     }

package/lib/feature-descriptor/feature-descriptor-editor/models/common-field-draft.js

@@ -9,5 +9,22 @@ exports.ColumnDraft = zod_1.z
     name: zod_1.z.string(),
 }, { description: 'Column' })
     .transform(column_1.FullColumnName.create);
-exports.NumberDraft = zod_1.z.number({ description: 'Number' });
+exports.NumberDraft = zod_1.z
+    .union([
+    zod_1.z.literal('inf'),
+    zod_1.z.literal('-inf'),
+    zod_1.z.number(),
+    zod_1.z
+        .string()
+        .refine(val => val !== '' && !isNaN(Number(val)), {
+        message: "Invalid value, must be a number or 'inf' or '-inf'",
+    }),
+])
+    .transform(val => {
+    if (val === 'inf')
+        return 'inf';
+    if (val === '-inf')
+        return -'-inf';
+    return Number(val);
+});
 //# sourceMappingURL=common-field-draft.js.map

package/lib/feature-descriptor/feature-descriptor-editor/models/filter-draft.js

@@ -8,18 +8,18 @@ const common_field_draft_1 = require("./common-field-draft");
 const AboveFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Above),
     column: common_field_draft_1.ColumnDraft,
-    min_inclusive: zod_1.z.number(),
+    min_inclusive: common_field_draft_1.NumberDraft,
 });
 const BelowFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Below),
     column: common_field_draft_1.ColumnDraft,
-    max_exclusive: zod_1.z.number(),
+    max_exclusive: common_field_draft_1.NumberDraft,
 });
 const BetweenFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Between),
     column: common_field_draft_1.ColumnDraft,
-    min_inclusive: zod_1.z.number(),
-    max_exclusive: zod_1.z.number(),
+    min_inclusive: common_field_draft_1.NumberDraft,
+    max_exclusive: common_field_draft_1.NumberDraft,
 });
 const FullPassFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.FullPass),
@@ -27,8 +27,8 @@ const FullPassFilterDraft = zod_1.z.object({
 const HourOfDayFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.HourOfDay),
     column: common_field_draft_1.ColumnDraft,
-    min_hour_inclusive: zod_1.z.number(),
-    max_hour_exclusive: zod_1.z.number(),
+    min_hour_inclusive: common_field_draft_1.NumberDraft,
+    max_hour_exclusive: common_field_draft_1.NumberDraft,
 });
 const NgramFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.NgramFilter),
@@ -38,7 +38,7 @@ const NgramFilterDraft = zod_1.z.object({
 const ValueFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Value),
     column: common_field_draft_1.ColumnDraft,
-    value: zod_1.z.union([zod_1.z.string(), zod_1.z.number(), zod_1.z.boolean()]),
+    value: zod_1.z.union([zod_1.z.string(), common_field_draft_1.NumberDraft, zod_1.z.boolean()]),
 });
 const WeekdayFilterDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Weekday),
@@ -82,7 +82,6 @@ var FilterDraft;
 (function (FilterDraft) {
     function fromFilter(filter, tableColumns) {
         const schema = FilterDrafts[filter.type];
-        const _filter = filter;
         const columnFields = Object.entries(schema.shape)
             .filter(([_, field]) => field.description === 'Column')
             .map(([colName]) => colName);
@@ -96,7 +95,7 @@ var FilterDraft;
                 var _a;
                 return [
                     field,
-                    (_a = column_1.Column.fromFullName(_filter[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
+                    (_a = column_1.Column.fromFullName(filter[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
                 ];
             })));
     }