@datagrok/peptides 1.23.1 → 1.23.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/peptides",
   "friendlyName": "Peptides",
-  "version": "1.23.1",
+  "version": "1.23.3",
   "author": {
     "name": "Davit Rizhinashvili",
     "email": "drizhinashvili@datagrok.ai"

package/src/widgets/mutation-cliffs.ts

@@ -4,6 +4,7 @@ import * as C from '../utils/constants';
 import * as type from '../utils/types';
 import {addExpandIconGen, getSeparator, setGridProps} from '../utils/misc';
 import {renderCellSelection} from '../utils/cell-renderer';
+import {SeqTemps} from '@datagrok-libraries/bio/src/utils/macromolecule/seq-handler';
 
 export type MutationCliffsOptions = {
   mutationCliffs: type.MutationCliffs, mutationCliffsSelection: type.Selection, sequenceColumnName: string,
@@ -177,6 +178,7 @@ function cliffsPairsWidgetParts(table: DG.DataFrame, options: MutationCliffsOpti
   substCol.tags[C.TAGS.SEPARATOR] = getSeparator(alignedSeqCol);
   substCol.tags[DG.TAGS.UNITS] = alignedSeqCol.tags[DG.TAGS.UNITS];
   substCol.tags[DG.TAGS.CELL_RENDERER] = 'MacromoleculeDifference';
+  substCol.temp[SeqTemps.notationProvider] = alignedSeqCol.temp[SeqTemps.notationProvider];
 
   let keyPress = false;
   let lastSelectedIndex: number | null = null;
@@ -257,6 +259,10 @@ function cliffsPairsWidgetParts(table: DG.DataFrame, options: MutationCliffsOpti
   uniqueSequencesTable.name = 'Unique sequences that form Mutation Cliffs pairs';
   const seqIdxCol = uniqueSequencesTable.columns.addNewInt('~seqIdx');
   const seqIdxColData = seqIdxCol.getRawData();
+  if (uniqueSequencesTable.col(options.sequenceColumnName)) {
+    uniqueSequencesTable.col(options.sequenceColumnName)!.temp[SeqTemps.notationProvider] =
+      alignedSeqCol.temp[SeqTemps.notationProvider];
+  }
   const selectedIndexes = uniqueSequencesBitSet.getSelectedIndexes();
   seqIdxCol.init((idx) => selectedIndexes[idx]);
   const uniqueSequencesGrid = uniqueSequencesTable.plot.grid();

package/src/widgets/selection.ts

@@ -9,6 +9,7 @@ import {TooltipOptions} from '../utils/tooltips';
 import {calculateMonomerPositionStatistics} from '../utils/algorithms';
 import {AggregationColumns} from '../utils/statistics';
 import {SeqPalette} from '@datagrok-libraries/bio/src/seq-palettes';
+import {SeqTemps} from '@datagrok-libraries/bio/src/utils/macromolecule/seq-handler';
 
 export type SelectionWidgetOptions = {
   tableSelection: DG.BitSet, gridColumns: DG.GridColumnList, positionColumns: DG.Column<string>[],
@@ -29,7 +30,6 @@ export function getSelectionWidget(table: DG.DataFrame, options: SelectionWidget
   const newTable = DG.DataFrame.create(table.rowCount);
   newTable.name = 'Selected compounds';
   newTable.filter.copyFrom(options.tableSelection);
-  const numericalCols = wu(table.columns.numerical);
   let gridSortOrder: {cols: DG.Column[], types: boolean[]} | null = null;
   for (let gridColIdx = 1; gridColIdx < options.gridColumns.length; gridColIdx++) {
     const gridCol = options.gridColumns.byIndex(gridColIdx)!;
@@ -58,8 +58,7 @@ export function getSelectionWidget(table: DG.DataFrame, options: SelectionWidget
     }
     const getValue = !sourceColRawData || !sourceColCategories ?
       (i: number): any => sourceCol.get(i) :
-      numericalCols
-        .some((col) => col.name === sourceCol.name) ? (i: number): number => sourceColRawData[i] :
+      sourceCol.isNumerical ? (i: number): number => sourceColRawData[i] :
         (i: number): string => sourceColCategories[sourceColRawData[i]];
     const col = sourceCol.name === options.activityColumn.name ?
       newTable.columns.addNewFloat(gridCol.name).init((i) => getValue(i) as number) :
@@ -123,5 +122,12 @@ export function getSelectionWidget(table: DG.DataFrame, options: SelectionWidget
       tooltipOptions);
   }
 
+  (table.columns.bySemTypeAll(DG.SEMTYPE.MACROMOLECULE) ?? []).forEach(
+    (col) => {
+      if (newTable.col(col.name))
+        newTable.col(col.name)!.temp[SeqTemps.notationProvider] = col.temp[SeqTemps.notationProvider];
+    },
+  );
+
   return gridHost;
 }