dotdata_widgets 0.0.29 → 0.0.121

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

@@ -10,29 +10,38 @@ 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");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 const sourceTypeIcon = {
-    [column_1.Column.SourceType.Integer]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.Bigint]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.Double]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.String]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.Boolean]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.Date]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
-    [column_1.Column.SourceType.Timestamp]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInt, { size: 20 }),
+    [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 }),
+    [column_1.Column.SourceType.Double]: react_1.default.createElement(column_source_type_icons_1.SourceTypeDouble, { size: 20 }),
+    [column_1.Column.SourceType.Float]: react_1.default.createElement(column_source_type_icons_1.SourceTypeFloat, { size: 20 }),
+    [column_1.Column.SourceType.Integer]: react_1.default.createElement(column_source_type_icons_1.SourceTypeInteger, { size: 20 }),
+    [column_1.Column.SourceType.BigInteger]: react_1.default.createElement(column_source_type_icons_1.SourceTypeBigInteger, { size: 20 }),
+    [column_1.Column.SourceType.Long]: react_1.default.createElement(column_source_type_icons_1.SourceTypeLong, { size: 20 }),
+    [column_1.Column.SourceType.Short]: react_1.default.createElement(column_source_type_icons_1.SourceTypeShort, { size: 20 }),
+    [column_1.Column.SourceType.String]: react_1.default.createElement(column_source_type_icons_1.SourceTypeString, { size: 20 }),
+    [column_1.Column.SourceType.Struct]: react_1.default.createElement(column_source_type_icons_1.SourceTypeStruct, { size: 20 }),
+    [column_1.Column.SourceType.Timestamp]: react_1.default.createElement(column_source_type_icons_1.SourceTypeTimestamp, { size: 20 }),
+    [column_1.Column.SourceType.VectorUDT]: react_1.default.createElement(column_source_type_icons_1.SourceTypeVectorUDT, { size: 20 }),
 };
 const ColumnWidget = (props) => {
+    var _a;
     const selectedColumn = (0, _utils_1.isSet)(props.value)
         ? props.columns.find(({ name }) => name === props.value)
         : undefined;
     return (react_1.default.createElement("div", { style: { position: 'relative' } },
-        react_1.default.createElement(material_1.Autocomplete, { style: { width: '180px' }, 
-            // sx={{
-            //   '& .MuiInput-root.MuiInputBase-sizeSmall .MuiInput-input': {
-            //     paddingLeft: selectedColumn ? '26px' : 'revert',
-            //   },
-            // }}
-            options: props.columns, getOptionLabel: (column) => column.name, renderOption: (props, column) => (react_1.default.createElement(material_1.Box, Object.assign({ component: "li", style: { display: 'flex', alignItems: 'center', gap: '4px' } }, props), column.name)), value: selectedColumn !== null && selectedColumn !== void 0 ? selectedColumn : null, size: "small", autoComplete: true, blurOnSelect: true, onBlur: props.onBlur, onChange: (e, value) => {
+        react_1.default.createElement("div", { style: { position: 'absolute', top: '2px' } }, selectedColumn
+            ? (_a = sourceTypeIcon[selectedColumn.sourceType]) !== null && _a !== void 0 ? _a : (react_1.default.createElement(column_source_type_icons_1.SourceTypeUnknown, { size: 20 }))
+            : null),
+        react_1.default.createElement(material_1.Autocomplete, { style: { width: '180px' }, sx: {
+                '& .MuiInput-root.MuiInputBase-sizeSmall .MuiInput-input': {
+                    paddingLeft: selectedColumn ? '26px' : 'revert',
+                },
+            }, options: props.columns, getOptionLabel: (column) => column.name, renderOption: (props, column) => {
+                var _a;
+                return (react_1.default.createElement(material_1.Box, Object.assign({ component: "li", style: { display: 'flex', alignItems: 'center', gap: '4px' } }, props), (_a = sourceTypeIcon[column.sourceType]) !== null && _a !== void 0 ? _a : (react_1.default.createElement(column_source_type_icons_1.SourceTypeUnknown, { size: 20 })),
+                    column.name));
+            }, value: selectedColumn !== null && selectedColumn !== void 0 ? selectedColumn : null, size: "small", autoComplete: true, blurOnSelect: true, onBlur: props.onBlur, onChange: (e, value) => {
                 var _a;
                 e.stopPropagation();
                 if (value) {

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NumberInlineField = exports.NumberWidget = void 0;
+exports.NumberInlineField = exports.NumberInlineEditor = exports.NumberWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
 const _InlineEditorField_1 = require("./_InlineEditorField");
@@ -11,6 +11,10 @@ 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)) }));
 }
 exports.NumberWidget = NumberWidget;
-const NumberInlineField = (params) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, params, { widget: NumberWidget, prettifyFn: val => val })));
+const NumberInlineEditor = (props) => {
+    return react_1.default.createElement(_InlineEditorField_1.InlineEditor, Object.assign({}, props, { widget: NumberWidget }));
+};
+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,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StringInlineField = exports.StringWidget = void 0;
+exports.StringInlineField = exports.StringInlineEditor = exports.StringWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
 const _InlineEditorField_1 = require("./_InlineEditorField");
@@ -11,6 +11,10 @@ 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 StringInlineField = (params) => (react_1.default.createElement(_InlineEditorField_1.InlineEditorField, Object.assign({}, params, { widget: StringWidget })));
+const StringInlineEditor = (props) => {
+    return react_1.default.createElement(_InlineEditorField_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,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableColumnInlineField = exports.TableColumnWidget = void 0;
+exports.TableColumnInlineField = exports.TableColumnInlineEditor = exports.TableColumnWidget = void 0;
 const react_1 = __importDefault(require("react"));
 const column_1 = require("../../../../models/column");
 const _utils_1 = require("../../../../utils");
@@ -21,6 +21,10 @@ const TableColumnWidget = (props) => {
         react_1.default.createElement(ColumnField_1.ColumnWidget, { columns: columns, value: (_c = props.value) === null || _c === void 0 ? void 0 : _c.name, onBlur: props.onBlur, onValueChange: props.onValueChange })));
 };
 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) })));
+};
+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) {

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

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterTableColumnInlineEditor = void 0;
+const react_1 = __importDefault(require("react"));
+const field_widgets_1 = require("../field-widgets");
+const FilterTableColumnInlineEditor = (props) => {
+    return (react_1.default.createElement(field_widgets_1.TableColumnInlineEditor, { label: "column", value: props.filter.column, onValueChange: column => props.onFilterChange(Object.assign(Object.assign({}, props.filter), { column })), tableColumns: props.tableColumns }));
+};
+exports.FilterTableColumnInlineEditor = FilterTableColumnInlineEditor;
+//# sourceMappingURL=FilterTableColumnInlineEditor.js.map

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

@@ -15,4 +15,5 @@ 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/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./aggregations"), exports);
 __exportStar(require("./filter"), exports);
 __exportStar(require("./join"), exports);
 __exportStar(require("./EditorTemplateRenderer"), exports);
+__exportStar(require("./EditorWrapper"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -9,9 +9,8 @@ const feature_descriptor_1 = require("../../../../models/feature-descriptor");
 const context_1 = require("../../context");
 const JoinConditionTypeSelection_1 = require("./JoinConditionTypeSelection");
 const JoinTableColumnSelector_1 = require("./JoinTableColumnSelector");
-const EditorTemplateRenderer_1 = require("../EditorTemplateRenderer");
+const EditorWrapper_1 = require("../EditorWrapper");
 const field_widgets_1 = require("../field-widgets");
-const _utils_1 = require("../../../../utils");
 const joinConditionEditorTemplate = {
     [feature_descriptor_1.JoinCondition.Type.Geo]: () => [],
     [feature_descriptor_1.JoinCondition.Type.Same]: props => {
@@ -32,12 +31,12 @@ const joinConditionEditorTemplate = {
         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.InlineEditor, { label: "from_value", value: from_value, onValueChange: from_value => {
+            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 }));
-                }, widget: field_widgets_1.StringWidget }),
-            react_1.default.createElement(field_widgets_1.InlineEditor, { label: "to_value", value: to_value, onValueChange: to_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 }));
-                }, widget: field_widgets_1.StringWidget }),
+                } }),
         ];
     },
     [feature_descriptor_1.JoinCondition.Type.PeriodicTime]: props => {
@@ -52,20 +51,33 @@ const joinConditionEditorTemplate = {
         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.InlineEditor, { label: "periodic_unit", value: periodic_unit, onValueChange: periodic_unit => {
+            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 }));
-                }, widget: field_widgets_1.StringWidget }),
-            react_1.default.createElement(field_widgets_1.InlineEditor, { label: "num_cycles", value: num_cycles, onValueChange: num_cycles => {
+                } }),
+            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 }));
-                }, widget: field_widgets_1.NumberWidget }),
+                } }),
         ];
     },
 };
+const InlineJoinConditionEditor = (props) => {
+    const templates = props.joinCondition.type
+        ? joinConditionEditorTemplate[props.joinCondition.type]({
+            tableColumns: props.tableColumns,
+            joinCondition: props.joinCondition,
+            onJoinConditionChange: props.onJoinConditionChange,
+        })
+        : [];
+    return (react_1.default.createElement(EditorWrapper_1.EditorWrapper, { templates: templates, selectorWidth: 130, selectedType: props.joinCondition.type },
+        react_1.default.createElement(JoinConditionTypeSelection_1.JoinConditionSelectionType, { value: props.joinCondition.type, onValueChange: type => props.onJoinConditionChange({
+                type,
+                id: props.joinCondition.id,
+            }) })));
+};
 const JoinConditionEditor = (props) => {
     var _a;
     const [state, dispatch] = (0, context_1.useFeatureDescriptorEditorContext)();
-    const joinCondition = (_a = state.join.join_conditions.find((c) => c.id === props.conditionId)) !== null && _a !== void 0 ? _a : { id: props.conditionId };
-    const [isSummaryVisible, setIsSummaryVisible] = react_1.default.useState(() => (0, _utils_1.isSet)(joinCondition.type));
+    const joinCondition = (_a = state.join.join_conditions.find(({ id }) => id === props.conditionId)) !== null && _a !== void 0 ? _a : { id: props.conditionId };
     const setJoinConditionDraft = (params) => {
         const join = Object.assign(Object.assign({}, state.join), { join_conditions: state.join.join_conditions.map((draft) => draft.id === props.conditionId ? params : draft) });
         dispatch(context_1.FeatureDescriptorEditorActions.setDraftField({
@@ -73,24 +85,7 @@ const JoinConditionEditor = (props) => {
             value: join,
         }));
     };
-    const templates = joinCondition.type
-        ? joinConditionEditorTemplate[joinCondition.type]({
-            tableColumns: props.tableColumns,
-            joinCondition,
-            onJoinConditionChange: setJoinConditionDraft,
-        })
-        : [];
-    return (react_1.default.createElement("div", { style: {
-            display: 'inline-flex',
-        } },
-        react_1.default.createElement("div", { style: { display: 'inline-flex', height: '26px', alignItems: 'center' } }, isSummaryVisible ? (react_1.default.createElement("span", { className: "inline-displayed-value", onClick: () => setIsSummaryVisible(false) }, joinCondition.type)) : (react_1.default.createElement("span", { style: { width: '130px', marginTop: '6px' } },
-            react_1.default.createElement(JoinConditionTypeSelection_1.JoinConditionSelectionType, { onBlur: () => {
-                    setIsSummaryVisible(true);
-                }, value: joinCondition.type, onValueChange: type => setJoinConditionDraft({ type, id: props.conditionId }) })))),
-        react_1.default.createElement("div", { style: { display: 'flex', flexWrap: 'wrap', alignItems: 'center' } },
-            "(",
-            react_1.default.createElement(EditorTemplateRenderer_1.EditorTemplateRenderer, { templates: templates }),
-            ")")));
+    return (react_1.default.createElement(InlineJoinConditionEditor, { joinCondition: joinCondition, tableColumns: props.tableColumns, onJoinConditionChange: setJoinConditionDraft }));
 };
 exports.JoinConditionEditor = JoinConditionEditor;
 //# sourceMappingURL=JoinConditionEditor.js.map

package/lib/feature-descriptor/feature-descriptor-editor/context/feature-descriptor-editor.js

@@ -12,14 +12,6 @@ var FeatureDescriptorEditorActions;
         Join.patchCondition = (0, redux_1.createAction)('Join:PatchCondition', (0, redux_1.props)());
         Join.removeCondition = (0, redux_1.createAction)('Join:RemoveCondition', (0, redux_1.props)());
     })(Join = FeatureDescriptorEditorActions.Join || (FeatureDescriptorEditorActions.Join = {}));
-    let Aggregation;
-    (function (Aggregation) {
-        Aggregation.setType = (0, redux_1.createAction)('Aggregation:SetType', (0, redux_1.props)());
-    })(Aggregation = FeatureDescriptorEditorActions.Aggregation || (FeatureDescriptorEditorActions.Aggregation = {}));
-    let Filter;
-    (function (Filter) {
-        Filter.setType = (0, redux_1.createAction)('Filter:SetType', (0, redux_1.props)());
-    })(Filter = FeatureDescriptorEditorActions.Filter || (FeatureDescriptorEditorActions.Filter = {}));
 })(FeatureDescriptorEditorActions = exports.FeatureDescriptorEditorActions || (exports.FeatureDescriptorEditorActions = {}));
 exports.featureDescriptorEditorReducer = (0, redux_1.createReducer)((0, redux_1.on)(FeatureDescriptorEditorActions.Join.addNewCondition, updateDraftField('join', joinState => {
     var _a;
@@ -28,11 +20,7 @@ exports.featureDescriptorEditorReducer = (0, redux_1.createReducer)((0, redux_1.
             { id: Math.random() },
         ] }));
 })), (0, redux_1.on)(FeatureDescriptorEditorActions.Join.setCondition, updateDraftField('join', (joinState, action) => (Object.assign(Object.assign({}, joinState), { join_conditions: joinState.join_conditions.map((condition) => condition.id === action.condition.id ? action.condition : condition) })))), (0, redux_1.on)(FeatureDescriptorEditorActions.Join.patchCondition, updateDraftField('join', (joinState, action) => (Object.assign(Object.assign({}, joinState), { join_conditions: joinState.join_conditions.map((condition) => condition.id === action.condition.id
-        ? Object.assign(Object.assign({}, condition), action.condition) : condition) })))), (0, redux_1.on)(FeatureDescriptorEditorActions.Join.removeCondition, updateDraftField('join', (joinState, action) => (Object.assign(Object.assign({}, joinState), { join_conditions: joinState.join_conditions.filter((condition) => condition.id !== action.id) })))), (0, redux_1.on)(FeatureDescriptorEditorActions.Filter.setType, updateDraftField('filter', (_, { filterType }) => ({
-    type: filterType,
-}))), (0, redux_1.on)(FeatureDescriptorEditorActions.Aggregation.setType, updateDraftField('aggregation', (_, { aggregationType }) => ({
-    type: aggregationType,
-}))), (0, redux_1.on)(FeatureDescriptorEditorActions.setDraftField, setDraftField));
+        ? Object.assign(Object.assign({}, condition), action.condition) : condition) })))), (0, redux_1.on)(FeatureDescriptorEditorActions.Join.removeCondition, updateDraftField('join', (joinState, action) => (Object.assign(Object.assign({}, joinState), { join_conditions: joinState.join_conditions.filter((condition) => condition.id !== action.id) })))), (0, redux_1.on)(FeatureDescriptorEditorActions.setDraftField, setDraftField));
 function updateDraftField(field, fn) {
     return function (state, action) {
         return Object.assign(Object.assign({}, state), { [field]: fn(state[field], action) });

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

@@ -17,7 +17,7 @@ const TemporalChangeDraft = zod_1.z.object({
     source_column: common_field_draft_1.ColumnDraft,
     upper_bound: zod_1.z.string(),
     lower_bound: zod_1.z.string(),
-    range_shift: zod_1.z.number(),
+    range_shift: zod_1.z.string(),
 });
 const LatestKDraft = zod_1.z.object({
     source_time_filed: common_field_draft_1.ColumnDraft,
@@ -328,8 +328,6 @@ var AggregationDraft;
         const columnFields = Object.entries(schema.shape)
             .filter(([_, field]) => field.description === 'Column')
             .map(([colName]) => colName);
-        // console.log(z.instanceof(z.number));
-        console.log('columnFields', Object.entries(schema.shape));
         return Object.assign(Object.assign({}, aggr), Object.fromEntries(columnFields.map(field => {
             var _a;
             return [

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

@@ -5,50 +5,78 @@ const zod_1 = require("zod");
 const feature_descriptor_1 = require("../../../models/feature-descriptor");
 const column_1 = require("../../../models/column");
 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(),
+});
+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(),
+});
+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(),
+});
+const FullPassFilterDraft = zod_1.z.object({
+    type: zod_1.z.literal(feature_descriptor_1.Filter.Type.FullPass),
+});
+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(),
+});
+const NgramFilterDraft = zod_1.z.object({
+    type: zod_1.z.literal(feature_descriptor_1.Filter.Type.NgramFilter),
+    column: common_field_draft_1.ColumnDraft,
+    ngram: zod_1.z.array(zod_1.z.string()),
+});
+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()]),
+});
+const WeekdayFilterDraft = zod_1.z.object({
+    type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Weekday),
+    column: common_field_draft_1.ColumnDraft,
+});
+const WeekendFilterDraft = zod_1.z.object({
+    type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Weekend),
+    column: common_field_draft_1.ColumnDraft,
+});
+const FilterDraftUnion = zod_1.z.union([
+    AboveFilterDraft,
+    BelowFilterDraft,
+    BetweenFilterDraft,
+    FullPassFilterDraft,
+    HourOfDayFilterDraft,
+    NgramFilterDraft,
+    ValueFilterDraft,
+    WeekdayFilterDraft,
+    WeekendFilterDraft,
+    zod_1.z.lazy(() => AndFilterDraft),
+]);
+const AndFilterDraft = zod_1.z.object({
+    type: zod_1.z.literal(feature_descriptor_1.Filter.Type.AndFilter),
+    filter1: FilterDraftUnion,
+    filter2: FilterDraftUnion,
+    // Casting is required because of ColumnDraft type. It uses its transformed type instead of the original one
+});
 const FilterDrafts = {
-    [feature_descriptor_1.Filter.Type.Above]: 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(),
-    }),
-    [feature_descriptor_1.Filter.Type.Below]: 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(),
-    }),
-    [feature_descriptor_1.Filter.Type.Between]: 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(),
-    }),
-    [feature_descriptor_1.Filter.Type.FullPass]: zod_1.z.object({
-        type: zod_1.z.literal(feature_descriptor_1.Filter.Type.FullPass),
-    }),
-    [feature_descriptor_1.Filter.Type.HourOfDay]: 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(),
-    }),
-    [feature_descriptor_1.Filter.Type.NgramFilter]: zod_1.z.object({
-        type: zod_1.z.literal(feature_descriptor_1.Filter.Type.NgramFilter),
-        column: common_field_draft_1.ColumnDraft,
-        ngram: zod_1.z.array(zod_1.z.string()),
-    }),
-    [feature_descriptor_1.Filter.Type.Value]: 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()]),
-    }),
-    [feature_descriptor_1.Filter.Type.Weekday]: zod_1.z.object({
-        type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Weekday),
-        column: common_field_draft_1.ColumnDraft,
-    }),
-    [feature_descriptor_1.Filter.Type.Weekend]: zod_1.z.object({
-        type: zod_1.z.literal(feature_descriptor_1.Filter.Type.Weekend),
-        column: common_field_draft_1.ColumnDraft,
-    }),
+    [feature_descriptor_1.Filter.Type.AndFilter]: AndFilterDraft,
+    [feature_descriptor_1.Filter.Type.Above]: AboveFilterDraft,
+    [feature_descriptor_1.Filter.Type.Below]: BelowFilterDraft,
+    [feature_descriptor_1.Filter.Type.Between]: BetweenFilterDraft,
+    [feature_descriptor_1.Filter.Type.FullPass]: FullPassFilterDraft,
+    [feature_descriptor_1.Filter.Type.HourOfDay]: HourOfDayFilterDraft,
+    [feature_descriptor_1.Filter.Type.NgramFilter]: NgramFilterDraft,
+    [feature_descriptor_1.Filter.Type.Value]: ValueFilterDraft,
+    [feature_descriptor_1.Filter.Type.Weekday]: WeekdayFilterDraft,
+    [feature_descriptor_1.Filter.Type.Weekend]: WeekendFilterDraft,
 };
 var FilterDraft;
 (function (FilterDraft) {
@@ -58,13 +86,19 @@ var FilterDraft;
         const columnFields = Object.entries(schema.shape)
             .filter(([_, field]) => field.description === 'Column')
             .map(([colName]) => colName);
-        return Object.assign(Object.assign({}, filter), Object.fromEntries(columnFields.map(field => {
-            var _a;
-            return [
-                field,
-                (_a = column_1.Column.fromFullName(_filter[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
-            ];
-        })));
+        return filter.type === feature_descriptor_1.Filter.Type.AndFilter
+            ? {
+                type: feature_descriptor_1.Filter.Type.AndFilter,
+                filter1: fromFilter(filter.filter1, tableColumns),
+                filter2: fromFilter(filter.filter2, tableColumns),
+            }
+            : Object.assign(Object.assign({}, filter), Object.fromEntries(columnFields.map(field => {
+                var _a;
+                return [
+                    field,
+                    (_a = column_1.Column.fromFullName(_filter[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
+                ];
+            })));
     }
     FilterDraft.fromFilter = fromFilter;
     function validate(filterDraft) {

package/lib/feature-descriptor/feature-exploration-path/exploration-path-header.js

@@ -14,10 +14,6 @@ const ExplorationPathHeader = props => {
             gap: '8px',
             background: 'var(--c-catskill-white)',
         } },
-        react_1.default.createElement("h4", { className: "grey-label", style: { margin: 0 } },
-            "[#",
-            props.explorationPathIndex,
-            "]"),
         react_1.default.createElement("div", null,
             targetTable,
             "[",

package/lib/models/column/column.js

@@ -6,13 +6,18 @@ var Column;
 (function (Column) {
     let SourceType;
     (function (SourceType) {
-        SourceType["Integer"] = "int";
-        SourceType["Bigint"] = "bigint";
+        SourceType["Boolean"] = "boolean";
+        SourceType["Date"] = "date";
         SourceType["Double"] = "double";
+        SourceType["Float"] = "float";
+        SourceType["Integer"] = "int";
+        SourceType["BigInteger"] = "bigint";
+        SourceType["Long"] = "long";
+        SourceType["Short"] = "short";
         SourceType["String"] = "string";
-        SourceType["Boolean"] = "Boolean";
-        SourceType["Timestamp"] = "Timestamp";
-        SourceType["Date"] = "date";
+        SourceType["Struct"] = "struct";
+        SourceType["Timestamp"] = "timestamp";
+        SourceType["VectorUDT"] = "vectorUDT";
     })(SourceType = Column.SourceType || (Column.SourceType = {}));
     function isTypeOf(x) {
         return (0, _utils_1.isSet)(x.name) && (0, _utils_1.isSet)(x.table) && (0, _utils_1.isSet)(x.type);
@@ -47,16 +52,5 @@ var FullColumnName;
         return `${props.table}.${props.name}`;
     }
     FullColumnName.create = create;
-    // export function getTableName(
-    //   fullName: FullColumnName | Unset
-    // ): TableName | Unset {
-    //   return isSet(fullName) ? destruct(fullName).table : undefined;
-    // }
-    //
-    // export function getColumnName(
-    //   fullName: FullColumnName | Unset
-    // ): TableName | Unset {
-    //   return isSet(fullName) ? destruct(fullName).name : undefined;
-    // }
 })(FullColumnName = exports.FullColumnName || (exports.FullColumnName = {}));
 //# sourceMappingURL=column.js.map

package/lib/models/column/table-columns.js

@@ -11,17 +11,4 @@ var TableColumns;
     }
     TableColumns.fromSimplified = fromSimplified;
 })(TableColumns = exports.TableColumns || (exports.TableColumns = {}));
-// export namespace AnalyticDataTypes {
-//   export function filterByColumnType(types: Column.AnalyticType[]) {
-//     return (adt: AnalyticDataTypes): AnalyticDataTypes =>
-//       Object.fromEntries(
-//         Object.entries(adt)
-//           .map(([tableName, columns]) => [
-//             tableName,
-//             columns.filter(({ type }) => types.includes(type)),
-//           ])
-//           .filter(([, columns]) => columns.length)
-//       );
-//   }
-// }
 //# sourceMappingURL=table-columns.js.map

package/lib/models/feature-descriptor/fd_data/aggregation.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Aggregation = void 0;
-const utils_1 = require("./utils");
 var Aggregation;
 (function (Aggregation) {
     let Type;
@@ -82,6 +81,5 @@ var Aggregation;
         Type["TopicWeightSum"] = "TopicWeightSum";
         Type["TopicWeightValue"] = "TopicWeightValue";
     })(Type = Aggregation.Type || (Aggregation.Type = {}));
-    Aggregation.prettify = (utils_1.prettify);
 })(Aggregation = exports.Aggregation || (exports.Aggregation = {}));
 //# sourceMappingURL=aggregation.js.map

package/lib/models/feature-descriptor/fd_data/filter.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Filter = void 0;
-const utils_1 = require("./utils");
 var Filter;
 (function (Filter) {
     let Type;
     (function (Type) {
+        Type["AndFilter"] = "AndFilter";
         Type["Above"] = "Above";
         Type["Below"] = "Below";
         Type["Between"] = "Between";
@@ -16,18 +16,5 @@ var Filter;
         Type["Weekday"] = "Weekday";
         Type["Weekend"] = "Weekend";
     })(Type = Filter.Type || (Filter.Type = {}));
-    Filter.isFullPass = isTypeOf(Filter.Type.FullPass);
-    Filter.isAbove = isTypeOf(Filter.Type.Above);
-    Filter.isBelow = isTypeOf(Filter.Type.Below);
-    Filter.isNgramFilter = isTypeOf(Filter.Type.NgramFilter);
-    Filter.isBetween = isTypeOf(Filter.Type.Between);
-    Filter.isHourOfDay = isTypeOf(Filter.Type.HourOfDay);
-    Filter.isValue = isTypeOf(Filter.Type.Value);
-    Filter.isWeekday = isTypeOf(Filter.Type.Weekday);
-    Filter.isWeekend = isTypeOf(Filter.Type.Weekend);
-    Filter.prettify = (utils_1.prettify);
 })(Filter = exports.Filter || (exports.Filter = {}));
-function isTypeOf(type) {
-    return (f) => f.type === type;
-}
 //# sourceMappingURL=filter.js.map

package/lib/models/feature-descriptor/fd_data/join.js

@@ -1,13 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JoinCondition = exports.Join = void 0;
-var Join;
-(function (Join) {
-    function prettify(join) {
-        return `Join(target_table='${join.target_table}', source_table='${join.source_table}')  ... TODO add conditions`;
-    }
-    Join.prettify = prettify;
-})(Join = exports.Join || (exports.Join = {}));
+exports.JoinCondition = void 0;
 var JoinCondition;
 (function (JoinCondition) {
     let Type;

package/lib/widgets/feature-leaderboard/FeatureLeaderboardOverview.js

@@ -9,10 +9,10 @@ const overview_slider_1 = require("./leaderboard-overview/overview-slider");
 const material_1 = require("@mui/material");
 const MAX_COLLINEARITY_TOOLTIP = 'Maximum correlation of any two features on the list';
 const CONFIDENCE_TOOLTIP = 'The probability that a feature is better than a random feature';
-const FeatureLeaderboardOverview = ({ isAssessed, confidence, setConfidence, maxCollinearity, setMaxCollinearity, setSearch, }) => {
+const FeatureLeaderboardOverview = ({ isWithAssessment, confidence, setConfidence, maxCollinearity, setMaxCollinearity, setSearch, }) => {
     const [searchPhrase, setSearchPhrase] = react_1.default.useState(() => '');
     return (react_1.default.createElement("div", { style: { display: 'flex' } },
-        isAssessed ? (react_1.default.createElement(react_1.default.Fragment, null,
+        isWithAssessment ? (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(overview_slider_1.OverviewSlider, { value: maxCollinearity, setValue: setMaxCollinearity, label: "Max collinearity:", labelTooltip: MAX_COLLINEARITY_TOOLTIP }),
             react_1.default.createElement(overview_slider_1.OverviewSlider, { value: confidence, setValue: setConfidence, label: "Confidence:", labelTooltip: CONFIDENCE_TOOLTIP }))) : null,
         react_1.default.createElement("span", { style: { marginLeft: 'auto', width: '30%' } },