@teselagen/ove 0.5.31-beta.1 → 0.5.31-beta.3

package/helperComponents/PropertiesDialog/utils.d.ts

@@ -1,5 +1,5 @@
-export namespace sizeSchema {
-    let path: string;
-    let type: string;
-    function render(val: any, _record: any, i: any, props: any): import("react/jsx-runtime").JSX.Element;
-}
+export function sizeSchema(isProtein: any): {
+    path: string;
+    type: string;
+    render: (val: any, _record: any) => import("react/jsx-runtime").JSX.Element;
+};

package/index.cjs.js

@@ -34297,18 +34297,14 @@ const viewColumn = {
     return /* @__PURE__ */ React$2.createElement(core.Icon, { className: "dt-eyeIcon", icon: "eye-open" });
   }
 };
-const openColumn = __spreadProps(__spreadValues({}, viewColumn), {
-  render: (val2, record, rowInfo, props) => {
+const openColumn = /* @__PURE__ */ __name(({ onDoubleClick, history }) => __spreadProps(__spreadValues({}, viewColumn), {
+  render: (val2, record, rowInfo) => {
     return /* @__PURE__ */ React$2.createElement(core.Tooltip, { content: "Open" }, /* @__PURE__ */ React$2.createElement(
       core.Button,
       {
         onClick: (e2) => {
           e2.stopPropagation();
-          props.onDoubleClick && props.onDoubleClick(
-            rowInfo.original,
-            rowInfo.index,
-            props.history
-          );
+          onDoubleClick && onDoubleClick(rowInfo.original, rowInfo.index, history);
         },
         minimal: true,
         small: true,
@@ -34317,7 +34313,7 @@ const openColumn = __spreadProps(__spreadValues({}, viewColumn), {
       }
     ));
   }
-});
+}), "openColumn");
 function convertSchema(schema2) {
   let schemaToUse = schema2;
   if (!schemaToUse.fields && Array.isArray(schema2)) {
@@ -46750,9 +46746,7 @@ const ColumnFilterMenu = /* @__PURE__ */ __name(({
     core.Popover,
     {
       position: "bottom",
-      onClose: () => {
-        setColumnFilterMenuOpen(false);
-      },
+      onClose: () => setColumnFilterMenuOpen(false),
       isOpen: columnFilterMenuOpen,
       modifiers: {
         preventOverflow: { enabled: true },
@@ -47419,61 +47413,60 @@ const RenderCell = /* @__PURE__ */ __name(({
     }
   ));
 }, "RenderCell");
-const RenderColumns = /* @__PURE__ */ __name((props) => {
-  const {
-    addFilters,
-    cellRenderer,
-    change,
-    columns,
-    currentParams,
-    compact: compact3,
-    editableCellValue,
-    editingCell,
-    editingCellSelectAll,
-    entities,
-    expandedEntityIdMap,
-    extraCompact,
-    filters,
-    getCellHoverText,
-    isCellEditable,
-    isEntityDisabled,
-    isLocalCall,
-    isSimple,
-    isSingleSelect,
-    isSelectionARectangle,
-    noDeselectAll,
-    noSelect,
-    noUserSelect,
-    onDeselect,
-    onMultiRowSelect,
-    onRowClick,
-    onRowSelect,
-    onSingleRowSelect,
-    order: order2,
-    primarySelectedCellId,
-    reduxFormCellValidation,
-    reduxFormSelectedEntityIdMap,
-    refocusTable,
-    removeSingleFilter = noop$6,
-    schema: schema2,
-    selectedCells,
-    setEditableCellValue,
-    setEditingCell,
-    setExpandedEntityIdMap,
-    setNewParams,
-    setOrder = noop$6,
-    setSelectedCells,
-    shouldShowSubComponent,
-    startCellEdit,
-    SubComponent,
-    tableRef,
-    updateEntitiesHelper,
-    updateValidation,
-    withCheckboxes,
-    withExpandAndCollapseAllButton,
-    withFilter: _withFilter,
-    withSort = true
-  } = props;
+const RenderColumns = /* @__PURE__ */ __name(({
+  addFilters,
+  cellRenderer,
+  change,
+  columns,
+  currentParams,
+  compact: compact3,
+  editableCellValue,
+  editingCell,
+  editingCellSelectAll,
+  entities,
+  expandedEntityIdMap,
+  extraCompact,
+  filters,
+  getCellHoverText,
+  isCellEditable,
+  isEntityDisabled,
+  isLocalCall,
+  isSimple,
+  isSingleSelect,
+  isSelectionARectangle,
+  noDeselectAll,
+  noSelect,
+  noUserSelect,
+  onDeselect,
+  onMultiRowSelect,
+  onRowClick,
+  onRowSelect,
+  onSingleRowSelect,
+  order: order2,
+  primarySelectedCellId,
+  reduxFormCellValidation,
+  reduxFormSelectedEntityIdMap,
+  refocusTable,
+  removeSingleFilter = noop$6,
+  schema: schema2,
+  selectedCells,
+  setEditableCellValue,
+  setEditingCell,
+  setExpandedEntityIdMap,
+  setNewParams,
+  setOrder = noop$6,
+  setSelectedCells,
+  shouldShowSubComponent,
+  startCellEdit,
+  SubComponent,
+  tableRef,
+  updateEntitiesHelper,
+  updateValidation,
+  withCheckboxes,
+  withExpandAndCollapseAllButton,
+  withFilter: _withFilter,
+  withSort = true
+}) => {
   const withFilter = _withFilter === void 0 ? !isSimple : _withFilter;
   const onDragEnd2 = /* @__PURE__ */ __name((cellsToSelect) => {
     const [primaryRowId, primaryCellPath] = primarySelectedCellId.split(":");
@@ -47645,13 +47638,19 @@ const RenderColumns = /* @__PURE__ */ __name((props) => {
     let text2 = typeof val2 !== "string" ? row.value : val2;
     const record = row.original;
     if (column.getClipboardData) {
-      text2 = column.getClipboardData(row.value, record, row, props);
+      text2 = column.getClipboardData(row.value, record, row);
     } else if (column.getValueToFilterOn) {
-      text2 = column.getValueToFilterOn(record, props);
+      text2 = column.getValueToFilterOn(record);
     } else if (column.render) {
-      text2 = column.render(row.value, record, row, props);
+      text2 = column.render(row.value, record, row, {
+        currentParams,
+        setNewParams
+      });
     } else if (cellRenderer && cellRenderer[column.path]) {
-      text2 = cellRenderer[column.path](row.value, row.original, row, props);
+      text2 = cellRenderer[column.path](row.value, row.original, row, {
+        currentParams,
+        setNewParams
+      });
     } else if (text2) {
       text2 = React$2.isValidElement(text2) ? text2 : String(text2);
     }
@@ -47869,17 +47868,18 @@ const RenderColumns = /* @__PURE__ */ __name((props) => {
     }
     if (cellRenderer && cellRenderer[column.path]) {
       tableColumn.Cell = (row) => {
-        const val2 = cellRenderer[column.path](
-          row.value,
-          row.original,
-          row,
-          props
-        );
+        const val2 = cellRenderer[column.path](row.value, row.original, row, {
+          currentParams,
+          setNewParams
+        });
         return val2;
       };
     } else if (column.render) {
       tableColumn.Cell = (row) => {
-        const val2 = column.render(row.value, row.original, row, props);
+        const val2 = column.render(row.value, row.original, row, {
+          currentParams,
+          setNewParams
+        });
         return val2;
       };
     } else if (column.type === "timestamp") {
@@ -48067,12 +48067,13 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
       // }
     ]
   }, props.defaults || {}));
-  let _schema;
-  if (isFunction$6(__schema))
-    _schema = __schema(props);
-  else
-    _schema = __schema;
-  const convertedSchema = convertSchema(_schema);
+  const _schema = React$2.useMemo(() => {
+    if (isFunction$6(__schema))
+      return __schema(props);
+    else
+      return __schema;
+  }, [__schema, props]);
+  const convertedSchema = React$2.useMemo(() => convertSchema(_schema), [_schema]);
   if (isLocalCall) {
     if (!noForm && (!formName || formName === "tgDataTable")) {
       throw new Error(
@@ -48109,20 +48110,11 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
   props = __spreadValues(__spreadValues({}, props), withSelectedEntities2 && typeof withSelectedEntities2 === "string" && {
     [withSelectedEntities2]: selectedEntities
   });
-  console.log("history.location", history);
   const currentParams = React$2.useMemo(() => {
-    const tmp = (urlConnected ? getCurrentParamsFromUrl(
-      history ? history.location : ownProps.location
-    ) : reduxFormQueryParams) || {};
+    const tmp = (urlConnected ? getCurrentParamsFromUrl(history.location) : reduxFormQueryParams) || {};
     tmp.searchTerm = reduxFormSearchInput;
     return tmp;
-  }, [
-    history,
-    ownProps.location,
-    reduxFormQueryParams,
-    reduxFormSearchInput,
-    urlConnected
-  ]);
+  }, [history, reduxFormQueryParams, reduxFormSearchInput, urlConnected]);
   const tableParams = React$2.useMemo(() => {
     if (!isTableParamsConnected) {
       const updateSearch = /* @__PURE__ */ __name((val2) => {
@@ -48159,7 +48151,7 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     _tableParams,
     change,
     currentParams,
-    history.replace,
+    history,
     isTableParamsConnected,
     props,
     selectedEntities,
@@ -48189,6 +48181,9 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     }
     return {};
   }, [
+    props.entities,
+    props.noOrderError,
+    props.isCodeModel,
     convertedSchema,
     currentParams,
     doNotCoercePageSize,
@@ -48223,7 +48218,7 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     doNotShowEmptyRows,
     doNotValidateUntouchedRows,
     editingCellSelectAll,
-    entities: __origEntities = [],
+    entities: _origEntities = [],
     entitiesAcrossPages: _entitiesAcrossPages,
     entityCount,
     errorParsingUrlString,
@@ -48304,10 +48299,11 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     withSort,
     withTitle = !isSimple
   } = props;
-  const _origEntities = useDeepEqualMemo(__origEntities);
-  const entities = useDeepEqualMemo(
-    ((reduxFormEntities == null ? void 0 : reduxFormEntities.length) ? reduxFormEntities : _origEntities) || []
+  const _entities = React$2.useMemo(
+    () => ((reduxFormEntities == null ? void 0 : reduxFormEntities.length) ? reduxFormEntities : _origEntities) || [],
+    [_origEntities, reduxFormEntities]
   );
+  const entities = useDeepEqualMemo(_entities);
   const entitiesAcrossPages = useDeepEqualMemo(_entitiesAcrossPages);
   React$2.useEffect(() => {
     if (change) {
@@ -48344,12 +48340,15 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     withDisplayOptions
   ]);
   const schema2 = React$2.useMemo(() => {
-    const schema22 = convertSchema(_schema);
+    const schema22 = convertedSchema;
     if (isViewable) {
       schema22.fields = [viewColumn, ...schema22.fields];
     }
     if (isOpenable) {
-      schema22.fields = [openColumn, ...schema22.fields];
+      schema22.fields = [
+        openColumn({ onDoubleClick, history }),
+        ...schema22.fields
+      ];
     }
     schema22.fields = schema22.fields.map((field) => {
       if (field.placementPath) {
@@ -48411,13 +48410,15 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     }
     return schema22;
   }, [
-    _schema,
     cellRenderer,
+    convertedSchema,
     entities,
+    history,
     isInfinite,
     isOpenable,
     isSimple,
     isViewable,
+    onDoubleClick,
     showForcedHiddenColumns,
     tableConfig.columnOrderings,
     tableConfig.fieldOptions,
@@ -50242,7 +50243,7 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
     return entities;
   }, [entities, onlyShowRowsWErrors, reduxFormCellValidation]);
   const renderColumns = React$2.useMemo(
-    () => RenderColumns(__spreadProps(__spreadValues({}, props), {
+    () => RenderColumns({
       addFilters,
       cellRenderer,
       change,
@@ -50295,7 +50296,7 @@ const DataTable = /* @__PURE__ */ __name((_y) => {
       withExpandAndCollapseAllButton,
       withFilter,
       withSort
-    })),
+    }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       SubComponent,
@@ -117754,7 +117755,7 @@ function showFileDialog({ multiple = false, onSelect }) {
 }
 __name(showFileDialog, "showFileDialog");
 const name = "@teselagen/ove";
-const version = "0.5.30";
+const version = "0.5.31-beta.2";
 const main = "./src/index.js";
 const type = "module";
 const exports$1 = {
@@ -129889,42 +129890,19 @@ const _ComponentToPrint = class _ComponentToPrint extends React$2.Component {
 };
 __name(_ComponentToPrint, "ComponentToPrint");
 let ComponentToPrint = _ComponentToPrint;
-const sizeSchema = {
+const sizeSchema = /* @__PURE__ */ __name((isProtein2) => ({
   path: "size",
   type: "number",
-  render: (val2, _record, i, props) => {
-    const record = props.isProtein ? convertDnaCaretPositionOrRangeToAA(_record) : _record;
+  render: (val2, _record) => {
+    const record = isProtein2 ? convertDnaCaretPositionOrRangeToAA(_record) : _record;
     const base1Range = convertRangeTo1Based(record);
     const hasJoinedLocations = record.locations && record.locations.length > 1;
-    return /* @__PURE__ */ React$2.createElement("span", null, props.isProtein ? Math.floor(val2 / 3) : val2, " ", /* @__PURE__ */ React$2.createElement("span", { style: { fontSize: 10 } }, hasJoinedLocations ? record.locations.map((loc, i2) => {
+    return /* @__PURE__ */ React$2.createElement("span", null, isProtein2 ? Math.floor(val2 / 3) : val2, " ", /* @__PURE__ */ React$2.createElement("span", { style: { fontSize: 10 } }, hasJoinedLocations ? record.locations.map((loc, i) => {
       const base1Range2 = convertRangeTo1Based(loc);
-      return /* @__PURE__ */ React$2.createElement("span", { key: i2 }, "(", base1Range2.start, "-", base1Range2.end, ")");
+      return /* @__PURE__ */ React$2.createElement("span", { key: i }, "(", base1Range2.start, "-", base1Range2.end, ")");
     }) : /* @__PURE__ */ React$2.createElement("span", null, "(", base1Range.start, "-", base1Range.end, ")")));
   }
-};
-const schema$2 = {
-  fields: [
-    // ...(noColor
-    //   ? []
-    //   : [
-    //       {
-    //         path: "color",
-    //         type: "string",
-    //         render: color => {
-    //           return (
-    //             <ColorPickerPopover>
-    //               <div style={{ height: 20, width: 20, background: color }} />
-    //             </ColorPickerPopover>
-    //           );
-    //         }
-    //       }
-    //     ]),
-    { path: "name", type: "string" },
-    // ...(noType ? [] : [{ path: "type", type: "string" }]),
-    sizeSchema,
-    { path: "strand", type: "string" }
-  ]
-};
+}), "sizeSchema");
 const _RemoveDuplicatesDialog = class _RemoveDuplicatesDialog extends React$2.Component {
   constructor() {
     super(...arguments);
@@ -129970,6 +129948,29 @@ const _RemoveDuplicatesDialog = class _RemoveDuplicatesDialog extends React$2.Co
   render() {
     const { duplicatesToRemoveSelectedEntities, hideModal, type: type2 } = this.props;
     const selectedIds = this.state.dups.map((d2) => d2.id);
+    const schema2 = {
+      fields: [
+        // ...(noColor
+        //   ? []
+        //   : [
+        //       {
+        //         path: "color",
+        //         type: "string",
+        //         render: color => {
+        //           return (
+        //             <ColorPickerPopover>
+        //               <div style={{ height: 20, width: 20, background: color }} />
+        //             </ColorPickerPopover>
+        //           );
+        //         }
+        //       }
+        //     ]),
+        { path: "name", type: "string" },
+        // ...(noType ? [] : [{ path: "type", type: "string" }]),
+        sizeSchema(this.props.isProtein),
+        { path: "strand", type: "string" }
+      ]
+    };
     return /* @__PURE__ */ React$2.createElement("div", { className: classNames(core.Classes.DIALOG_BODY, "tg-min-width-dialog") }, /* @__PURE__ */ React$2.createElement(
       WrappedDT,
       {
@@ -129987,7 +129988,7 @@ const _RemoveDuplicatesDialog = class _RemoveDuplicatesDialog extends React$2.Co
         withSearch: false,
         hideSelectedCount: true,
         isInfinite: true,
-        schema: schema$2,
+        schema: schema2,
         entities: this.state.dups
       }
     ), /* @__PURE__ */ React$2.createElement(
@@ -133611,7 +133612,7 @@ const _AddOrEditAnnotationDialog = class _AddOrEditAnnotationDialog extends Reac
         RenderBases2,
         __spreadValues({}, {
           // ...this.props,
-          // bases,
+          bases,
           defaultLinkedOligoMessage,
           getLinkedOligoLink,
           readOnly: this.props.readOnly,
@@ -134200,9 +134201,9 @@ const CustomContentEditable = generateField(/* @__PURE__ */ __name(function Cust
   start: start2,
   end: end2,
   primerBindsOn,
-  bases,
   forward
 }) {
+  const bases = input.value;
   const [hasTempError, setTempError] = React$2.useState(false);
   const inputRef = React$2.useRef(null);
   const [caretPosition2, setCaretPosition] = React$2.useState({ start: 0, end: 0 });
@@ -134331,7 +134332,6 @@ const RenderBases = /* @__PURE__ */ __name((props) => {
       normalizedSelection,
       sequenceData2.sequence
     );
-    console.log("bps", bps);
     if (!forward) {
       bps = getReverseComplementSequenceString(bps);
     }
@@ -139718,13 +139718,38 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
         });
       }, "onRowSelect"));
       this.commands = getCommands(this);
+    }
+    render() {
+      var _a2;
+      const {
+        readOnly: readOnly2,
+        annotations = {},
+        annotationVisibility: annotationVisibility2,
+        sequenceLength,
+        selectionLayer: selectionLayer2,
+        sequence: sequence2,
+        isProtein: isProtein2,
+        allPartTags,
+        annotationPropertiesSelectedEntities: _annotationPropertiesSelectedEntities,
+        selectedAnnotationId
+      } = this.props;
+      const annotationPropertiesSelectedEntities = _annotationPropertiesSelectedEntities.filter((a2) => annotations[a2.id]);
+      const deleteAnnotation = this.props[`delete${annotationTypeUpper}`];
+      const annotationsToUse = map$3(annotations, (annotation) => {
+        return __spreadProps(__spreadValues(__spreadValues({}, annotation), annotation.strand === void 0 && {
+          strand: annotation.forward ? 1 : -1
+        }), {
+          size: getRangeLength(annotation, sequenceLength)
+        });
+      });
+      const keyedPartTags = (_a2 = getKeyedTagsAndTagOptions(allPartTags)) != null ? _a2 : {};
       this.schema = {
         fields: [
           {
             path: "name",
             type: "string",
-            render: (name2, ann, row, props2) => {
-              const checked = !props2.annotationVisibility[`${annotationType}IndividualToHide`][ann.id];
+            render: (name2, ann) => {
+              const checked = !this.props.annotationVisibility[`${annotationType}IndividualToHide`][ann.id];
               return /* @__PURE__ */ React$2.createElement(React$2.Fragment, null, /* @__PURE__ */ React$2.createElement(
                 core.Icon,
                 {
@@ -139733,9 +139758,9 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
                     e2.stopPropagation();
                     const upperType = startCase(annotationType);
                     if (checked) {
-                      props2[`hide${upperType}Individual`]([ann.id]);
+                      this.props[`hide${upperType}Individual`]([ann.id]);
                     } else {
-                      props2[`show${upperType}Individual`]([ann.id]);
+                      this.props[`show${upperType}Individual`]([ann.id]);
                     }
                   },
                   style: {
@@ -139753,10 +139778,10 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
             {
               path: "bases",
               type: "string",
-              render: (bases, primer, row, props2) => {
+              render: (bases, primer) => {
                 let bps = bases;
                 if (!bases) {
-                  bps = getSequenceWithinRange(primer, props2.sequence);
+                  bps = getSequenceWithinRange(primer, this.props.sequence);
                   if (!primer.forward) {
                     bps = getReverseComplementSequenceString(bps);
                   }
@@ -139781,12 +139806,12 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
               }
             }
           ],
-          sizeSchema,
+          sizeSchema(this.props.isProtein),
           ...withTags && this.props.allPartTags ? [
             {
               path: "tags",
               type: "string",
-              getValueToFilterOn: (o2, { keyedPartTags }) => {
+              getValueToFilterOn: (o2) => {
                 const toRet = (o2.tags || []).map((tagId) => {
                   const tag = keyedPartTags[tagId];
                   if (!tag)
@@ -139795,7 +139820,7 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
                 }).join(" ");
                 return toRet;
               },
-              render: (tags, b3, c2, { keyedPartTags = {} }) => {
+              render: (tags) => {
                 return /* @__PURE__ */ React$2.createElement("div", { style: { display: "flex" } }, (tags || []).map((tagId, i) => {
                   const tag = keyedPartTags[tagId];
                   if (!tag)
@@ -139808,29 +139833,6 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
           { path: "strand", type: "number" }
         ]
       };
-    }
-    render() {
-      const {
-        readOnly: readOnly2,
-        annotations = {},
-        annotationVisibility: annotationVisibility2,
-        sequenceLength,
-        selectionLayer: selectionLayer2,
-        sequence: sequence2,
-        isProtein: isProtein2,
-        allPartTags,
-        annotationPropertiesSelectedEntities: _annotationPropertiesSelectedEntities,
-        selectedAnnotationId
-      } = this.props;
-      const annotationPropertiesSelectedEntities = _annotationPropertiesSelectedEntities.filter((a2) => annotations[a2.id]);
-      const deleteAnnotation = this.props[`delete${annotationTypeUpper}`];
-      const annotationsToUse = map$3(annotations, (annotation) => {
-        return __spreadProps(__spreadValues(__spreadValues({}, annotation), annotation.strand === void 0 && {
-          strand: annotation.forward ? 1 : -1
-        }), {
-          size: getRangeLength(annotation, sequenceLength)
-        });
-      });
       return /* @__PURE__ */ React$2.createElement(
         WrappedDT,
         {
@@ -139951,7 +139953,6 @@ const genericAnnotationProperties = /* @__PURE__ */ __name(({
           formName: "annotationProperties",
           noRouter: true,
           isProtein: isProtein2,
-          keyedPartTags: getKeyedTagsAndTagOptions(allPartTags),
           compact: true,
           isInfinite: true,
           schema: this.schema,
@@ -140314,7 +140315,7 @@ const _OrfProperties = class _OrfProperties extends React$2.Component {
               displayName: "Size (aa)",
               type: "number"
             },
-            sizeSchema,
+            sizeSchema(this.props.isProtein),
             { path: "frame", type: "number" },
             { path: "strand", type: "number" }
           ]