@datagrok/hit-triage 1.4.2 → 1.4.3

package/files/cache_config.json

@@ -0,0 +1,27 @@
+[
+  {
+    "path": "/Hit Design",
+    "invalidateOn": "0 * * * *",
+    "preflight": true
+  },
+  {
+    "path": "/Hit Triage",
+    "invalidateOn": "0 * * * *",
+    "preflight": true
+  },
+  {
+    "path": "/Hit Design/campaigns",
+    "invalidateOn": "0 * * * *",
+    "preflight": true
+  },
+  {
+    "path": "/Hit Triage/campaigns",
+    "invalidateOn": "0 * * * *",
+    "preflight": true
+  },
+  {
+    "path": "/",
+    "invalidateOn": "0 * * * *",
+    "preflight": true
+  }
+]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/hit-triage",
   "friendlyName": "HitTriage",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "author": {
     "name": "Davit Rizhinashvili",
     "email": "drizhinashvili@datagrok.ai"

package/src/app/hit-app-base.ts

@@ -78,10 +78,13 @@ export abstract class HitAppBase<T> {
   public async getNewCampaignName(folderName: string, templateKey: string) {
     const templateCampaigns = (await _package.files.list(folderName))
       .map((file) => file.name)
-      .filter((name) => name.startsWith(templateKey));
+      .filter((name) => name.startsWith(`${templateKey}-`) && !!parseInt(name.substring(templateKey.length + 1)));
     if (templateCampaigns.length === 0)
       return templateKey + '-1';
-    const postFixes = templateCampaigns.map((c) => c.split('-')[1]).filter(Boolean).map((c) => parseInt(c, 10)).sort();
+    const postFixes = templateCampaigns
+      .map((c) => c.substring(templateKey.length + 1))
+      .filter(Boolean).map((c) => parseInt(c, 10))
+      .sort((a, b) => a - b);// sort in ascending order
     return templateKey + '-' + ((postFixes[postFixes.length - 1] + 1).toString());
   }
 

package/src/app/hit-design-app.ts

@@ -10,7 +10,7 @@ import {CampaignIdKey, CampaignJsonName, CampaignTableName,
 import {calculateColumns, calculateCellValues, getNewVid} from './utils/calculate-single-cell';
 import '../../css/hit-triage.css';
 import {_package} from '../package';
-import {addBreadCrumbsToRibbons, checkRibbonsHaveSubmit, editableTableField, modifyUrl, toFormatedDateString} from './utils';
+import {addBreadCrumbsToRibbons, checkFileExists, checkRibbonsHaveSubmit, editableTableField, modifyUrl, toFormatedDateString} from './utils';
 import {HitDesignSubmitView} from './hit-design-views/submit-view';
 import {getTilesViewDialog} from './hit-design-views/tiles-view';
 import {HitAppBase} from './hit-app-base';
@@ -842,22 +842,8 @@ export class HitDesignApp<T extends HitDesignTemplate = HitDesignTemplate> exten
           labelElement.remove();
         newPathInput.root.style.width = '100%';
 
-        async function checkFolder() {
-          const newPath = newPathInput.value;
-          if (!newPath || newPath.trim() === '') {
-            grok.shell.error('Path can not be empty');
-            return false;
-          }
-          const exists = await grok.dapi.files.exists(newPath);
-          if (!exists) {
-            grok.shell.error('Given folder does not exist');
-            return false;
-          }
-          return true;
-        }
-
         const saveButton = ui.button('Save', async () => {
-          const exists = await checkFolder();
+          const exists = await checkFileExists(newPathInput.value);
           if (!exists)
             return;
           const newPath = newPathInput.value;

package/src/app/utils.ts

@@ -323,6 +323,19 @@ export function editableTableField(field: HTMLElement, options?: EditableFieldOp
   return container;
 }
 
+export async function checkFileExists(path: string) {
+  if (!path || path.trim() === '') {
+    grok.shell.error('Path can not be empty');
+    return false;
+  }
+  const exists = await grok.dapi.files.exists(path);
+  if (!exists) {
+    grok.shell.error('Given folder does not exist');
+    return false;
+  }
+  return true;
+}
+
 
 // //name: Demo Design with reinvent
 // //input: int numberOfMolecules