dotdata_widgets 0.2.2 → 0.3.0

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

@@ -18,7 +18,7 @@ const PeriodicTimeJoinConditionDraft = zod_1.z.object({
     target_side_column: common_field_draft_1.ColumnDraft,
     source_side_column: common_field_draft_1.ColumnDraft,
     periodic_unit: zod_1.z.string(),
-    num_cycles: zod_1.z.number(),
+    num_cycles: common_field_draft_1.NumberDraft,
 });
 const TimeJoinConditionDraft = zod_1.z.object({
     type: zod_1.z.literal(feature_descriptor_1.JoinCondition.Type.Time),
@@ -41,7 +41,6 @@ var JoinDraft;
             source_table: join.source_table,
             join_conditions: join.join_conditions.map((condition) => {
                 const schema = JoinConditionsDrafts[condition.type];
-                const _condition = condition;
                 const columnFields = Object.entries(schema.shape)
                     .filter(([_, field]) => field.description === 'Column')
                     .map(([colName]) => colName);
@@ -49,7 +48,7 @@ var JoinDraft;
                     var _a;
                     return [
                         field,
-                        (_a = column_1.Column.fromFullName(_condition[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
+                        (_a = column_1.Column.fromFullName(condition[field], tableColumns)) !== null && _a !== void 0 ? _a : {},
                     ];
                 })));
             }),

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/widgets/feature-leaderboard/FeatureLeaderboardView.js

@@ -37,22 +37,21 @@ const FeatureLeaderboardView = ({ model }) => {
                 minWidth: '100%',
                 marginBottom: '2px',
             } }, featureEntries.map(featureEntry => (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(FeatureLeaderboardEntryDrawer_1.FeatureLeaderboardEntryDrawer, { key: featureEntry.feature.id, featureEntry: featureEntry, tableColumn: tableColumns, isWithAssessment: isWithAssessment, onModelChange: mode => {
+            react_1.default.createElement(FeatureLeaderboardEntryDrawer_1.FeatureLeaderboardEntryDrawer, { key: featureEntry.feature.id, featureEntry: featureEntry, originFeatureId: featureEntry.feature.id, tableColumn: tableColumns, isWithAssessment: isWithAssessment, onModelChange: mode => {
                     if (mode === FeatureLeaderboardEntryDrawer_1.DrawerMode.Copy) {
                         const originId = feature_1.FeatureId.getOriginId(featureEntry.feature.id);
                         (0, _utils_1.sha256)(`${new Date()}_${featureEntry.feature.id}`, 8).then(id => {
                             const feature = Object.assign(Object.assign({}, featureEntry), { isAssessed: false, feature: Object.assign(Object.assign({}, featureEntry.feature), { id: `${originId}_${id}` }) });
                             setCopiedFeature({
-                                feature,
+                                feature: Object.assign(Object.assign({}, feature), { signalConfidence: 0 }),
                                 parentId: featureEntry.feature.id,
                             });
                         });
                     }
                     return mode !== FeatureLeaderboardEntryDrawer_1.DrawerMode.Copy;
                 }, isWithActions: isWithActions(featureEntry, isWithAssessment) }),
-            (copiedFeature === null || copiedFeature === void 0 ? void 0 : copiedFeature.parentId) === featureEntry.feature.id ? (react_1.default.createElement("div", { style: { marginLeft: '30px' } },
-                react_1.default.createElement(FeatureLeaderboardEntryDrawer_1.FeatureLeaderboardEntryDrawer, { featureEntry: copiedFeature.feature, tableColumn: tableColumns, isWithAssessment: false, initMode: FeatureLeaderboardEntryDrawer_1.DrawerMode.Copy, onCancel: () => setCopiedFeature(undefined), isWithLikes: false, isWithActions: false }),
-                react_1.default.createElement("br", null))) : null))))));
+            (copiedFeature === null || copiedFeature === void 0 ? void 0 : copiedFeature.parentId) === featureEntry.feature.id ? (react_1.default.createElement("div", { style: { marginBottom: '20px' } },
+                react_1.default.createElement(FeatureLeaderboardEntryDrawer_1.FeatureLeaderboardEntryDrawer, { featureEntry: copiedFeature.feature, originFeatureId: copiedFeature.parentId, tableColumn: tableColumns, isWithAssessment: isWithAssessment, initMode: FeatureLeaderboardEntryDrawer_1.DrawerMode.Copy, onCancel: () => setCopiedFeature(undefined), isWithLikes: false, isWithActions: false }))) : null))))));
 };
 exports.FeatureLeaderboardView = FeatureLeaderboardView;
 function isWithActions(featureEntry, isWithAssessment) {

package/lib/widgets/feature-leaderboard/leaderboard-entry/FeatureLeaderboardEntryDrawer.js

@@ -43,7 +43,7 @@ const FeatureLeaderboardEntryDrawer = (props) => {
         react_1.default.createElement("div", { className: "feature-leaderboard-entry-drawer-details" },
             react_1.default.createElement(material_1.Collapse, { in: mode === DrawerMode.Code || mode === DrawerMode.Copy, unmountOnExit: true },
                 react_1.default.createElement("br", null),
-                react_1.default.createElement(FeatureLeaderboardEntryFeatureEditor_1.FeatureLeaderboardEntryFeatureEditor, { featureId: props.featureEntry.feature.id, featureDescriptor: props.featureEntry.featureDescriptor, tableColumns: props.tableColumn, onClose: onCancel })),
+                react_1.default.createElement(FeatureLeaderboardEntryFeatureEditor_1.FeatureLeaderboardEntryFeatureEditor, { mode: mode, featureId: props.featureEntry.feature.id, originFeatureId: props.originFeatureId, featureDescriptor: props.featureEntry.featureDescriptor, tableColumns: props.tableColumn, onClose: onCancel })),
             react_1.default.createElement(material_1.Collapse, { in: mode === DrawerMode.Details, unmountOnExit: true },
                 react_1.default.createElement(FeatureLeaderboardEntryDetails_1.FeatureLeaderboardEntryDetails, { entry: props.featureEntry })))));
 };

package/lib/widgets/feature-leaderboard/leaderboard-entry/FeatureLeaderboardEntryFeatureEditor.js

@@ -9,14 +9,19 @@ const widget_model_1 = require("../../../utils/widget-model");
 const widget_api_1 = require("../../../utils/widget-api");
 const ActionFooter_1 = require("../../../components/ActionFooter");
 const feature_descriptor_editor_1 = require("../../../feature-descriptor/feature-descriptor-editor");
+const FeatureLeaderboardEntryDrawer_1 = require("./FeatureLeaderboardEntryDrawer");
 const Footer = (props) => {
+    const [featureLeaderboard] = (0, widget_model_1.useModelState)('value');
     const Widget = widget_api_1.WidgetApi.init((0, widget_model_1.useWidgetModelContext)());
     const [editor] = (0, feature_descriptor_editor_1.useFeatureDescriptorEditorContext)();
     const validatedDraft = react_1.default.useMemo(() => feature_descriptor_editor_1.FeatureDescriptorDraft.validate(editor), [editor]);
     return (react_1.default.createElement(ActionFooter_1.ActionFooter, { primaryButton: { label: 'Save', isDisabled: !validatedDraft.success }, tertiaryButton: { label: 'Cancel' }, onTertiaryButtonClick: props.onClose, onPrimaryButtonClick: () => {
+            const entriesPositions = getEntriesPositions(featureLeaderboard, props.featureId, props.originFeatureId, props.mode);
+            console.log(props.mode, entriesPositions);
             Widget.callMethod('save_feature', {
                 id: props.featureId,
                 descriptor: validatedDraft.data,
+                entries_positions: entriesPositions,
             })
                 .then(() => props.onClose())
                 .catch(e => console.error(e));
@@ -25,7 +30,14 @@ const Footer = (props) => {
 const FeatureLeaderboardEntryFeatureEditor = (props) => {
     return (react_1.default.createElement(feature_descriptor_editor_1.FeatureDescriptorEditorContextProvider, { initFeatureDescriptor: props.featureDescriptor, tableColumns: props.tableColumns },
         react_1.default.createElement(feature_descriptor_editor_1.FeatureDescriptorEditor, { featureDescriptor: props.featureDescriptor, tableColumns: props.tableColumns }),
-        react_1.default.createElement(Footer, { featureId: props.featureId, onClose: props.onClose })));
+        react_1.default.createElement(Footer, { mode: props.mode, featureId: props.featureId, originFeatureId: props.originFeatureId, onClose: props.onClose })));
 };
 exports.FeatureLeaderboardEntryFeatureEditor = FeatureLeaderboardEntryFeatureEditor;
+function getEntriesPositions(featureLeaderboard, featureId, originFeatureId, mode) {
+    return featureLeaderboard.allEntries.map(group => group
+        .map(feature => mode === FeatureLeaderboardEntryDrawer_1.DrawerMode.Code || feature.feature.id !== originFeatureId
+        ? feature.feature.id
+        : [feature.feature.id, featureId])
+        .flat());
+}
 //# sourceMappingURL=FeatureLeaderboardEntryFeatureEditor.js.map

package/lib/widgets/feature-leaderboard/leaderboard-entry/feature-leaderboard-entry-drawer-header/FeatureLeaderboardEntryDrawerHeader.js

@@ -27,7 +27,9 @@ const FeatureLeaderboardEntryDrawerHeader = (props) => {
         react_1.default.createElement(FeatureLabel, { featureEntry: props.featureEntry }),
         isWithAssessment ? (react_1.default.createElement("span", { className: "confidence-label", style: {
                 '--fill': `${props.featureEntry.signalConfidence * 100}%`,
-            } }, _utils_1.Localize.formatNumber(props.featureEntry.signalConfidence))) : null,
+            } }, props.featureEntry.signalConfidence
+            ? _utils_1.Localize.formatNumber(props.featureEntry.signalConfidence)
+            : '')) : null,
         react_1.default.createElement(FeatureLeaderboardEntryExplanation_1.FeatureLeaderboardEntryExplanation, { feature: props.featureEntry.feature, isEdited: props.mode === FeatureLeaderboardEntryDrawer_1.DrawerMode.Edit, onClose: props.onCancel }),
         react_1.default.createElement(FeatureLeaderboardEntryActions_1.FeatureLeaderboardEntryActions, Object.assign({}, props))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotdata_widgets",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "A dotdata widget",
   "keywords": [
     "dotdata",

package/lib/feature-descriptor/feature-descriptor-editor/components/aggregations/ColumnEditor.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColumnEditor = void 0;
-const react_1 = __importDefault(require("react"));
-const field_widgets_1 = require("../field-widgets");
-const ColumnEditor = (columnField = 'column') => (props) => {
-    return [
-        react_1.default.createElement(field_widgets_1.TableColumnInlineField, { key: "text_topic_field", field: `aggregation.${columnField}`, tableColumns: props.tableColumns }),
-    ];
-};
-exports.ColumnEditor = ColumnEditor;
-//# sourceMappingURL=ColumnEditor.js.map

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

@@ -1,13 +0,0 @@
-"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/join/JoinTableColumnSelector.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JoinTableColumnSelector = void 0;
-const react_1 = __importDefault(require("react"));
-const field_widgets_1 = require("../field-widgets");
-const _InlineEditorField_1 = require("../field-widgets/_InlineEditorField");
-function JoinTableColumnSelector(props) {
-    var _a, _b;
-    return (react_1.default.createElement(_InlineEditorField_1.InlineEditor, { label: props.field, widget: field_widgets_1.ColumnWidget, value: (_b = (_a = props.joinCondition) === null || _a === void 0 ? void 0 : _a[props.field]) === null || _b === void 0 ? void 0 : _b.name, widgetProps: { columns: props.columns }, onValueChange: column => props.onJoinConditionChange(Object.assign(Object.assign({}, props.joinCondition), { [props.field]: column })) }));
-}
-exports.JoinTableColumnSelector = JoinTableColumnSelector;
-//# sourceMappingURL=JoinTableColumnSelector.js.map