@datagrok/sequence-translator 1.8.0 → 1.9.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/sequence-translator",
   "friendlyName": "Sequence Translator",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "author": {
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
@@ -28,7 +28,7 @@
     "@datagrok-libraries/utils": "^4.3.7",
     "@types/react": "^18.0.15",
     "cash-dom": "^8.1.0",
-    "datagrok-api": "^1.24.0",
+    "datagrok-api": "^1.23.0",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",
     "openchemlib": "6.0.1",
@@ -83,7 +83,7 @@
     "build-all": "npm --prefix ./../../libraries/chem-meta run build && npm --prefix ./../../js-api run build && npm --prefix ./../../libraries/utils run build && npm --prefix ./../../libraries/bio run build && npm --prefix ./../../libraries/tutorials run build && npm run build"
   },
   "canEdit": [
-    "Developers"
+    "Administrators"
   ],
   "canView": [
     "All users"

package/src/apps/translator/view/ui.ts

@@ -471,7 +471,7 @@ class ColumnInputsManager {
   private selectColumnIfTableNotNull(
     table: DG.DataFrame | null, columnName: string, columnLabel: REQUIRED_COLUMN_LABEL
   ): void {
-    if (table !== null) {
+    if (table !== null && columnName) {
       const selectedColumn = table.getCol(columnName);
       this.eventBus.selectColumn(columnLabel, selectedColumn);
     }

package/src/package-test.ts

@@ -34,5 +34,5 @@ export async function test(category: string, test: string, testContext: TestCont
 
 //name: initAutoTests
 export async function initAutoTests() {
-  await initTests(_package, _package.getModule('package-test.js'));
+  await initTests(_package as any, _package.getModule('package-test.js'));
 }

package/src/package.ts

@@ -27,6 +27,7 @@ import {CyclizedNotationProvider} from './utils/cyclized';
 import {getSeqHelper} from '@datagrok-libraries/bio/src/utils/seq-helper';
 import {PolyToolTags} from './consts';
 import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+import { getPTCombineDialog } from './polytool/pt-combine-dialog';
 
 export const _package: OligoToolkitPackage = new OligoToolkitPackage({debug: true}/**/);
 
@@ -302,6 +303,12 @@ export async function getPtChemEnumeratorDialog(cell?: DG.Cell) {
   return polyToolEnumerateChemUI(cell);
 }
 
+//name: Combine Sequences
+//top-menu: Bio | PolyTool | Combine Sequences...
+export async function getPolyToolCombineDialog() {
+  getPTCombineDialog();
+}
+
 
 //name: applyNotationProviderForHarmonizedSequence
 //input: column col

package/src/polytool/pt-combine-dialog.ts

@@ -0,0 +1,131 @@
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+export async function getPTCombineDialog() {
+
+    const createEditor = () => {
+        const editorDiv = ui.divH([]);
+        const tableEditor = ui.input.table('Table', {value: undefined, tooltipText: 'Table with sequences'});
+        const columnEditor = ui.input.choice('Column', {items: [] as string[], value: undefined, tooltipText: 'Sequence column'});
+
+        tableEditor.onChanged.subscribe(async () => {
+            const table = tableEditor.value;
+            if (!table) {
+                columnEditor.items = [];
+                columnEditor.value = null;
+                return;
+            }
+            await table.meta.detectSemanticTypes();
+            await grok.data.detectSemanticTypes(table);
+            const stringColumns = Array.from(table.columns.categorical);
+            const stringColumnsNames = stringColumns.map((c) => c.name);
+            columnEditor.items = stringColumnsNames;
+            columnEditor.value = stringColumns.find((c) => c.semType === DG.SEMTYPE.MACROMOLECULE)?.name ?? stringColumnsNames.find((c) => {
+                const lc = c.toLowerCase();
+                return lc.includes('seq') || lc.includes('pep');
+            }) ?? stringColumnsNames[0];
+        });
+        editorDiv.appendChild(tableEditor.root);
+        editorDiv.appendChild(columnEditor.root);
+        editorDiv.style.alignItems = 'center';
+        return {root: editorDiv, getValue: () => ({table: tableEditor.value, column: columnEditor.value})};
+    }
+    type Editor = ReturnType<typeof createEditor>;
+
+    const editors: Editor[] = [];
+    const editorsDiv = ui.divV([]);
+
+    const insertNewEditor = (index: number) => {
+        const editorDiv = createEditor();
+        const removeButton = ui.icons.delete(() => {
+            if (!editorDiv.root.parentElement || editors.length < 2)
+                return;
+            editorDiv.root.remove();
+            const editorIndex = editors.indexOf(editorDiv);
+            if (editorIndex !== -1) {
+                editors.splice(editorIndex, 1);
+            }
+        }, 'Remove');
+        const addEditor = ui.icons.add(() => {
+            let editorIndex = editors.indexOf(editorDiv);
+            if (editorIndex === -1) {
+                editorIndex = editors.length;
+            }
+            insertNewEditor(editorIndex + 1);
+        }, 'Add');
+        editorDiv.root.appendChild(removeButton);
+        editorDiv.root.appendChild(addEditor);
+        removeButton.style.marginLeft = '8px';
+        removeButton.style.marginRight = '8px';
+        removeButton.style.color = 'var(--blue-1)';
+        addEditor.style.color = 'var(--blue-1)';
+
+        
+        const prevEditor = editors[index];
+        if (prevEditor) {
+            editorsDiv.insertBefore(editorDiv.root, prevEditor.root);
+        } else {
+            editorsDiv.appendChild(editorDiv.root);
+        }
+        editors.splice(index, 0, editorDiv);
+    }
+    insertNewEditor(0);
+
+    function validate() {
+        const values = editors.map((e) => e.getValue());
+        const tables = values.map((v) => v.table);
+        const columns = values.map((v) => v.column);
+        return tables.every((t) => !!t) && columns.every((c) => !!c);
+    }
+
+    const separatorInput = ui.input.string('Separator', {value: '-', tooltipText: 'Separator for sequences', nullable: false});
+
+    ui.dialog('Combine Sequences')
+        .add(editorsDiv)
+        .add(separatorInput.root)
+        .onOK(async () => {
+            if (!validate()) {
+                grok.shell.error('Please fill all the fields');
+                return;
+            }
+            const values = editors.map((e) => e.getValue());
+            const tables = values.map((v) => v.table);
+            const columns = values.map((v) => v.column);
+            const separator = separatorInput.value;
+            const cols = columns.map((c, i) => tables[i]!.col(c!)!.toList().filter((v) => !!v));
+            // do a DFS to generate all combinations
+            let curIndex = 0;
+            const totalLength = cols.reduce((acc, c) => acc * c.length, 1);
+            if (totalLength > 10_000_000) {
+                grok.shell.error('Too many combinations. Maximum allowed is 10M');
+                return;
+            }
+            const result: string[] = new Array(totalLength).fill(null);
+
+            const dfs = (cur: string, depth: number) => {
+                if (depth === cols.length) {
+                    result[curIndex++] = cur;
+                    return;
+                }
+                const actCur = `${cur}${cur ? separator : ''}`;
+                const col = cols[depth];
+                for (let i = 0; i < cols[depth].length; i++) {
+                    dfs(actCur + col[i], depth + 1);
+                }
+            }
+            dfs('', 0);
+            const df = DG.DataFrame.fromColumns([DG.Column.fromStrings('Combined', result)]);
+            df.name = 'Combined Sequences';
+            await df.meta.detectSemanticTypes();
+            await grok.data.detectSemanticTypes(df);
+            grok.shell.addTableView(df);
+        })
+        .show({resizable: true});
+
+   
+
+
+
+
+}