@datagrok/hit-triage 1.7.7 → 1.8.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # HitTriage changelog
 
+## 1.8.0 (2025-12-09)
+
+* Improved collaboration support
+* Automatic sygnaling of changes in campaigns between multiple users.
+
 ## 1.7.7 (2025-09-19)
 
 * Sortable campaigns table columns via doubleclick.

package/databases/hitdesign/0000_init.sql

@@ -0,0 +1,20 @@
+-- Simple lock table
+CREATE TABLE hitdesign.campaign_locks (
+    app_name VARCHAR(100) NOT NULL,
+    campaign_id VARCHAR(255) NOT NULL,
+    expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
+    --optional: user who holds the lock
+    locked_by TEXT,
+    PRIMARY KEY (app_name, campaign_id)
+);
+
+CREATE TABLE hitdesign.update_logs (
+    app_name VARCHAR(100) NOT NULL,
+    campaign_id VARCHAR(255) NOT NULL,
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (app_name, campaign_id)
+);
+
+GRANT ALL PRIVILEGES ON SCHEMA hitdesign TO CURRENT_USER;
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA hitdesign TO :LOGIN;
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA hitdesign TO :LOGIN;

package/dist/package.js

@@ -3658,6 +3658,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _package__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../package */ "./src/package.ts");
 /* harmony import */ var _consts__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./consts */ "./src/app/consts.ts");
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./utils */ "./src/app/utils.ts");
+/* harmony import */ var _package_api__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../package-api */ "./src/package-api.ts");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -3671,6 +3672,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
+
 class HitAppBase {
     get appName() { return this._appName; }
     // public layouts: Promise<DG.ViewLayout[]>;
@@ -3751,9 +3753,12 @@ class HitAppBase {
         const df1MolCol = (_b = (_a = df1.col(molColName1)) === null || _a === void 0 ? void 0 : _a.toList()) === null || _b === void 0 ? void 0 : _b.filter((it) => !!it).map((it) => datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.convert(it, datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.Notation.Unknown, datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.Notation.Smiles));
         const df2MolCol = (_d = (_c = df2.col(molColName2)) === null || _c === void 0 ? void 0 : _c.toList()) === null || _d === void 0 ? void 0 : _d.filter((it) => !!it).map((it) => datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.convert(it, datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.Notation.Unknown, datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.chem.Notation.Smiles));
         if (!df1MolCol || !df2MolCol)
-            throw new Error('Molecule column not found');
+            throw new Error('Molecule column not found'); // should not happen, but just in case
         const df2MolMap = new Map();
         df2MolCol.forEach((it, i) => df2MolMap.set(it, i));
+        // const existingVidValues = new Set<string>();
+        // const vidCol2 = df2.col(ViDColName);
+        // vidCol2?.categories?.forEach((v) => existingVidValues.add(v));
         this.isJoining = true;
         try {
             // first check that all columns are there
@@ -3774,11 +3779,13 @@ class HitAppBase {
                         df2.col(col.name).set(df2.rowCount - 1, value, false);
                     }
                 }
-                else if (addedColNames.length > 0) {
-                    const row = df2MolMap.get(df1MolCol[i]);
-                    for (const colName of addedColNames) {
-                        const value = df1.col(colName).get(i);
-                        df2.col(colName).set(row, value, false);
+                else {
+                    if (addedColNames.length > 0) {
+                        const row = df2MolMap.get(df1MolCol[i]);
+                        for (const colName of addedColNames) {
+                            const value = df1.col(colName).get(i);
+                            df2.col(colName).set(row, value, false);
+                        }
                     }
                 }
             }
@@ -3791,6 +3798,41 @@ class HitAppBase {
         }
         return df2;
     }
+    aquireAndWaitCampaignLock(campaignId_1) {
+        return __awaiter(this, arguments, void 0, function* (campaignId, maxWaitMs = 30000) {
+            var _a;
+            const startTime = Date.now();
+            let errorCount = 0;
+            let lastError = null;
+            const curUser = datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.User.current();
+            const curUserName = curUser ? curUser.friendlyName || curUser.name || 'unknown' : 'unknown';
+            while (Date.now() - startTime < maxWaitMs && errorCount < 5) {
+                try {
+                    const result = yield _package_api__WEBPACK_IMPORTED_MODULE_4__.queries.acquireCampaignLock(this.appName, campaignId, curUserName);
+                    if (result && result.rowCount > 0) {
+                        const res = { aquired: true, expires_at: (_a = result === null || result === void 0 ? void 0 : result.col('expires_at')) === null || _a === void 0 ? void 0 : _a.getString(0) };
+                        return res;
+                    }
+                    lastError = null;
+                    yield datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.delay(200);
+                }
+                catch (err) {
+                    // console.error('Error acquiring campaign lock:', err);
+                    lastError = err;
+                    errorCount++;
+                }
+            }
+            if (lastError)
+                throw lastError;
+            return { aquired: false, expires_at: null };
+        });
+    }
+    releaseCampaignLock(campaignId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            return ((_b = (_a = (yield _package_api__WEBPACK_IMPORTED_MODULE_4__.queries.releaseCampaignLock(this.appName, campaignId))) === null || _a === void 0 ? void 0 : _a.col('updated_at')) === null || _b === void 0 ? void 0 : _b.getString(0)) || null;
+        });
+    }
 }
 HitAppBase.molFileExtReaders = ['sdf', 'mol', 'smi', 'mol2']
     .map((ext) => {
@@ -3835,6 +3877,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(rxjs_operators__WEBPACK_IMPORTED_MODULE_14__);
 /* harmony import */ var _dialogs_permissions_dialog__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./dialogs/permissions-dialog */ "./src/app/dialogs/permissions-dialog.ts");
 /* harmony import */ var _packageSettingsEditor__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../packageSettingsEditor */ "./src/packageSettingsEditor.ts");
+/* harmony import */ var _package_api__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../package-api */ "./src/package-api.ts");
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -3851,6 +3894,8 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
+// @ts-ignore
+
 
 
 
@@ -3873,14 +3918,20 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
         this._molColName = _consts__WEBPACK_IMPORTED_MODULE_4__.HitDesignMolColName;
         this.campaignProps = {};
         this.existingStatuses = [];
+        this._refreshIconTooltip = 'Refresh Campaign';
+        this._updateCheckIntervalId = null;
+        this._needsRefresh = false;
+        this._lastExpiresTimeString = null;
+        this._refreshCampaignIcon = null;
         // some of the subs are on grid, layout application will detach the grid, thus we need to re-init those subs
         this._gridSubs = null;
+        this._isSaving = false;
         this._infoView = infoViewConstructor(this);
         this.multiView = new datagrok_api_dg__WEBPACK_IMPORTED_MODULE_2__.MultiView({ viewFactories: { [this._infoView.name]: () => this._infoView } });
-        this.multiView.tabs.onTabChanged.subscribe((_) => {
+        this.multiView.subs.push(this.multiView.tabs.onTabChanged.subscribe((_) => {
             if (this.multiView.currentView instanceof _base_view__WEBPACK_IMPORTED_MODULE_12__.HitBaseView)
                 this.multiView.currentView.onActivated();
-        });
+        }));
         this.multiView.parentCall = c;
         this.mainView = this.multiView;
         this._initViewSubs();
@@ -4098,6 +4149,21 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             yield this.saveCampaign(true);
         });
     }
+    refreshCampaign() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._campaignId || !this.template) {
+                datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.warning('No campaign to refresh');
+                return; // should not happen
+            }
+            if (this._isSaving) {
+                datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.info('Campaign is being saved. Please wait a moment and try again.');
+                return;
+            }
+            clearInterval(this._updateCheckIntervalId);
+            this._refreshIconTooltip = 'Refresh Campaign';
+            yield this.setTemplate(this.template, this._campaignId);
+        });
+    }
     setTemplate(template, campaignId) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -4137,7 +4203,9 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
                 //await this.dataFrame.meta.detectSemanticTypes();
             }
             if (!this.dataFrame) {
-                console.error('DataFrame is empty');
+                datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.error('DataFrame is empty');
+                clearInterval(this._updateCheckIntervalId);
+                this._updateCheckIntervalId = null;
                 return;
             }
             yield this.dataFrame.meta.detectSemanticTypes();
@@ -4156,6 +4224,53 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             (0,_utils__WEBPACK_IMPORTED_MODULE_8__.modifyUrl)(_consts__WEBPACK_IMPORTED_MODULE_4__.CampaignIdKey, (_l = (_j = this._campaignId) !== null && _j !== void 0 ? _j : (_k = this._campaign) === null || _k === void 0 ? void 0 : _k.name) !== null && _l !== void 0 ? _l : '');
             if (this.campaign)
                 this.campaign.template = template;
+            // get the last saved time
+            _package_api__WEBPACK_IMPORTED_MODULE_17__.queries.getLastModified(this.appName, this._campaignId).then((timeDf) => {
+                var _a;
+                const timeStr = (_a = timeDf === null || timeDf === void 0 ? void 0 : timeDf.col('updated_at')) === null || _a === void 0 ? void 0 : _a.getString(0);
+                this._lastExpiresTimeString = timeStr !== null && timeStr !== void 0 ? timeStr : null;
+                this._needsRefresh = false;
+                // add the interval to check for updates
+                clearInterval(this._updateCheckIntervalId);
+                let isChecking = false;
+                this._updateCheckIntervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    if (isChecking || this._needsRefresh)
+                        return;
+                    isChecking = true;
+                    // first, check if this view is still active
+                    if (this._designView && !Array.from(datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.tableViews).some((tv) => tv === this._designView)) {
+                        clearInterval(this._updateCheckIntervalId);
+                        console.log('Clearing campaign update check interval');
+                        this._updateCheckIntervalId = null;
+                        isChecking = false;
+                        return;
+                    }
+                    if (!this._campaignId || !this.template || this._isSaving || this.isJoining || !this._designView || datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.v !== this._designView) {
+                        isChecking = false;
+                        return;
+                    }
+                    try {
+                        const timeDf = yield _package_api__WEBPACK_IMPORTED_MODULE_17__.queries.getLastModified(this.appName, this._campaignId);
+                        const timeStr = (_a = timeDf === null || timeDf === void 0 ? void 0 : timeDf.col('updated_at')) === null || _a === void 0 ? void 0 : _a.getString(0);
+                        if (!timeStr) {
+                            isChecking = false;
+                            return;
+                        }
+                        if (this._lastExpiresTimeString !== timeStr && this._refreshCampaignIcon) {
+                            this._lastExpiresTimeString = timeStr;
+                            datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.hints.addHintIndicator(this._refreshCampaignIcon, true, 10000);
+                            this._refreshIconTooltip = 'New changes available. Click to refresh campaign.';
+                            this._lastExpiresTimeString = timeStr;
+                            this._needsRefresh = true;
+                        }
+                    }
+                    catch (e) {
+                        console.error(e);
+                    }
+                    isChecking = false;
+                }), 3000);
+            }).catch((e) => console.error(e));
         });
     }
     get campaignId() { return this._campaignId; }
@@ -4320,6 +4435,8 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
                 const calculateRibbon = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.iconFA('wrench', getComputeDialog, 'Calculate additional properties');
                 const addNewRowButton = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.icons.add(() => { var _a; (_a = this.dataFrame) === null || _a === void 0 ? void 0 : _a.rows.addNew(null, true); }, 'Add new row');
                 const applyLayoutButton = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.iconSvg('view-layout', () => { this.applyTemplateLayout(view); }, `Apply template layout ${((_a = this.template) === null || _a === void 0 ? void 0 : _a.localLayoutPath) ? '(Loaded from mounted file storage)' : '(Static)'}`);
+                this._refreshCampaignIcon = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.icons.sync(() => __awaiter(this, void 0, void 0, function* () { this.refreshCampaign(); }));
+                datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.tooltip.bind(this._refreshCampaignIcon, () => this._refreshIconTooltip);
                 const permissionsButton = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.iconFA('share', () => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     yield (new _dialogs_permissions_dialog__WEBPACK_IMPORTED_MODULE_15__.PermissionsDialog((_a = this.campaign) === null || _a === void 0 ? void 0 : _a.permissions)).show((res) => {
@@ -4390,6 +4507,7 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
                 }
                 ribbonButtons.unshift(calculateRibbon);
                 ribbonButtons.unshift(addNewRowButton);
+                ribbonButtons.unshift(this._refreshCampaignIcon);
                 ribbons.push(ribbonButtons);
                 // remove project save button from the ribbon
                 ribbons.some((rg) => {
@@ -4721,8 +4839,31 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
     }
     saveCampaign() {
         return __awaiter(this, arguments, void 0, function* (notify = true, isCreating = false, customProps) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+            this._isSaving = true;
             const campaignId = this.campaignId;
+            const someoneElseEditingLoaderTimeout = setTimeout(() => {
+                var _a;
+                if ((_a = this._designView) === null || _a === void 0 ? void 0 : _a.grid)
+                    datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.setUpdateIndicator(this._designView.grid.root, true, 'Someone else is saving the campaign. Please wait...');
+            }, 500);
+            try {
+                const lock = yield this.aquireAndWaitCampaignLock(campaignId);
+                if (!(lock === null || lock === void 0 ? void 0 : lock.aquired)) // could not acquire lock
+                    throw new Error('Could not acquire lock for campaign during 30 seconds');
+            }
+            catch (e) {
+                clearTimeout(someoneElseEditingLoaderTimeout);
+                if ((_a = this._designView) === null || _a === void 0 ? void 0 : _a.grid)
+                    datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.setUpdateIndicator(this._designView.grid.root, false);
+                datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.error('Failed to acquire campaign lock. Someone else might be editing the campaign. Please try again later.');
+                this._isSaving = false;
+                return this.campaign;
+            }
+            clearTimeout(someoneElseEditingLoaderTimeout);
+            if ((_b = this._designView) === null || _b === void 0 ? void 0 : _b.grid)
+                datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.setUpdateIndicator(this._designView.grid.root, true, 'Saving Campaign...');
+            // await DG.delay(3000); // artificial delay to simulate long save
             const templateName = this.template.name;
             const enrichedDf = this.dataFrame;
             const campaignName = campaignId;
@@ -4730,7 +4871,7 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             enrichedDf.columns.toList().forEach((col) => columnSemTypes[col.name] = col.semType);
             const colTypeMap = {};
             enrichedDf.columns.toList().forEach((col) => colTypeMap[col.name] = col.type);
-            const sketchStateString = (_b = (_a = this.campaign) === null || _a === void 0 ? void 0 : _a.tilesViewerFormSketch) !== null && _b !== void 0 ? _b : undefined;
+            const sketchStateString = (_d = (_c = this.campaign) === null || _c === void 0 ? void 0 : _c.tilesViewerFormSketch) !== null && _d !== void 0 ? _d : undefined;
             const getDefaultPerms = () => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const perms = yield (0,_packageSettingsEditor__WEBPACK_IMPORTED_MODULE_16__.getDefaultSharingSettings)();
@@ -4748,16 +4889,16 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
                 return _dialogs_permissions_dialog__WEBPACK_IMPORTED_MODULE_15__.defaultPermissions;
             });
             // if its first time save author as current user, else keep the same
-            const authorUserId = (_d = (_c = this.campaign) === null || _c === void 0 ? void 0 : _c.authorUserId) !== null && _d !== void 0 ? _d : datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.user.id;
-            const permissions = (_f = (_e = this.campaign) === null || _e === void 0 ? void 0 : _e.permissions) !== null && _f !== void 0 ? _f : yield getDefaultPerms();
-            const authorName = authorUserId ? (_h = (_g = this.campaign) === null || _g === void 0 ? void 0 : _g.authorUserFriendlyName) !== null && _h !== void 0 ? _h : (_j = (yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.dapi.users.find(authorUserId))) === null || _j === void 0 ? void 0 : _j.friendlyName : undefined;
+            const authorUserId = (_f = (_e = this.campaign) === null || _e === void 0 ? void 0 : _e.authorUserId) !== null && _f !== void 0 ? _f : datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.user.id;
+            const permissions = (_h = (_g = this.campaign) === null || _g === void 0 ? void 0 : _g.permissions) !== null && _h !== void 0 ? _h : yield getDefaultPerms();
+            const authorName = authorUserId ? (_k = (_j = this.campaign) === null || _j === void 0 ? void 0 : _j.authorUserFriendlyName) !== null && _k !== void 0 ? _k : (_l = (yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.dapi.users.find(authorUserId))) === null || _l === void 0 ? void 0 : _l.friendlyName : undefined;
             const campaign = {
                 name: campaignName,
-                friendlyName: (_m = (_l = (_k = this.campaign) === null || _k === void 0 ? void 0 : _k.friendlyName) !== null && _l !== void 0 ? _l : customProps === null || customProps === void 0 ? void 0 : customProps.friendlyName) !== null && _m !== void 0 ? _m : campaignName,
+                friendlyName: (_p = (_o = (_m = this.campaign) === null || _m === void 0 ? void 0 : _m.friendlyName) !== null && _o !== void 0 ? _o : customProps === null || customProps === void 0 ? void 0 : customProps.friendlyName) !== null && _p !== void 0 ? _p : campaignName,
                 templateName,
-                status: (_p = (_o = this.campaign) === null || _o === void 0 ? void 0 : _o.status) !== null && _p !== void 0 ? _p : 'In Progress',
-                createDate: (_r = (_q = this.campaign) === null || _q === void 0 ? void 0 : _q.createDate) !== null && _r !== void 0 ? _r : (0,_utils__WEBPACK_IMPORTED_MODULE_8__.toFormatedDateString)(new Date()),
-                campaignFields: (_t = (_s = this.campaign) === null || _s === void 0 ? void 0 : _s.campaignFields) !== null && _t !== void 0 ? _t : this.campaignProps,
+                status: (_r = (_q = this.campaign) === null || _q === void 0 ? void 0 : _q.status) !== null && _r !== void 0 ? _r : 'In Progress',
+                createDate: (_t = (_s = this.campaign) === null || _s === void 0 ? void 0 : _s.createDate) !== null && _t !== void 0 ? _t : (0,_utils__WEBPACK_IMPORTED_MODULE_8__.toFormatedDateString)(new Date()),
+                campaignFields: (_v = (_u = this.campaign) === null || _u === void 0 ? void 0 : _u.campaignFields) !== null && _v !== void 0 ? _v : this.campaignProps,
                 columnSemTypes,
                 rowCount: enrichedDf.rowCount,
                 filteredRowCount: enrichedDf.filter.trueCount,
@@ -4772,6 +4913,10 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             };
             if (!this.hasEditPermission) {
                 datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.error('You do not have permission to modify this campaign');
+                if ((_w = this._designView) === null || _w === void 0 ? void 0 : _w.grid)
+                    datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.setUpdateIndicator(this._designView.grid.root, false);
+                yield this.releaseCampaignLock(campaignId);
+                this._isSaving = false;
                 return campaign;
             }
             const campaignPath = `${this.appName}/campaigns/${campaignId}/${_consts__WEBPACK_IMPORTED_MODULE_4__.CampaignJsonName}`;
@@ -4779,8 +4924,8 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             let resDf = enrichedDf;
             if (yield _package__WEBPACK_IMPORTED_MODULE_7__._package.files.exists(campaignPath)) {
                 const prevCamp = JSON.parse(yield _package__WEBPACK_IMPORTED_MODULE_7__._package.files.readAsText(campaignPath));
-                if (((_u = prevCamp.version) !== null && _u !== void 0 ? _u : 0) > this.version) {
-                    campaign.version = Math.max(this.version, ((_v = prevCamp.version) !== null && _v !== void 0 ? _v : 0)) + 1;
+                if (((_x = prevCamp.version) !== null && _x !== void 0 ? _x : 0) > this.version) {
+                    campaign.version = Math.max(this.version, ((_y = prevCamp.version) !== null && _y !== void 0 ? _y : 0)) + 1;
                     if (yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.dapi.files.exists(this._filePath)) {
                         try {
                             const prevCampDf = yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.dapi.files.readCsv(this._filePath);
@@ -4805,7 +4950,13 @@ class HitDesignApp extends _hit_app_base__WEBPACK_IMPORTED_MODULE_11__.HitAppBas
             notify && datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.info('Campaign saved successfully.');
             !notify && isCreating && datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.shell.info('Campaign created successfully.');
             this.campaign = campaign;
-            this.designViewName = (_w = campaign.friendlyName) !== null && _w !== void 0 ? _w : campaign.name;
+            this.designViewName = (_z = campaign.friendlyName) !== null && _z !== void 0 ? _z : campaign.name;
+            const updatedAt = yield this.releaseCampaignLock(campaignId);
+            this._lastExpiresTimeString = updatedAt;
+            if ((_0 = this._designView) === null || _0 === void 0 ? void 0 : _0.grid)
+                datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.setUpdateIndicator(this._designView.grid.root, false);
+            this._isSaving = false;
+            this._refreshIconTooltip = 'Refresh Campaign';
             return campaign;
         });
     }
@@ -5456,10 +5607,11 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
+// @ts-ignore
 
 
 function getTilesViewDialog(app, getTableView) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const tilesViewerSketchStateString = (_a = app.campaign) === null || _a === void 0 ? void 0 : _a.tilesViewerFormSketch;
     let sketchState = null;
     if (tilesViewerSketchStateString && tilesViewerSketchStateString.length > 0) {
@@ -5562,7 +5714,9 @@ function getTilesViewDialog(app, getTableView) {
         else
             hideModal();
     });
+    const colVersion = (_h = (_g = app.dataFrame) === null || _g === void 0 ? void 0 : _g.col(_consts__WEBPACK_IMPORTED_MODULE_3__.TileCategoriesColName)) === null || _h === void 0 ? void 0 : _h.version;
     const closeSub = modal.onClose.subscribe(() => {
+        var _a, _b;
         closeSub.unsubscribe();
         viewChangeSub.unsubscribe();
         stageEditorDialog === null || stageEditorDialog === void 0 ? void 0 : stageEditorDialog.close();
@@ -5580,12 +5734,14 @@ function getTilesViewDialog(app, getTableView) {
             console.error('Failed to save sketch state', e);
         }
         closeViewer();
+        if (colVersion != undefined && ((_b = (_a = app.dataFrame) === null || _a === void 0 ? void 0 : _a.col(_consts__WEBPACK_IMPORTED_MODULE_3__.TileCategoriesColName)) === null || _b === void 0 ? void 0 : _b.version) !== colVersion)
+            app.saveCampaign();
     });
     modal.showModal(true);
-    (_g = modal.getButton('CANCEL')) === null || _g === void 0 ? void 0 : _g.remove();
+    (_j = modal.getButton('CANCEL')) === null || _j === void 0 ? void 0 : _j.remove();
     modal.onOK(() => { });
     // remove the modal background
-    (_h = document.querySelector('.d4-modal-background')) === null || _h === void 0 ? void 0 : _h.remove();
+    (_k = document.querySelector('.d4-modal-background')) === null || _k === void 0 ? void 0 : _k.remove();
 }
 
 
@@ -7327,7 +7483,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   calculateCellValues: () => (/* binding */ calculateCellValues),
 /* harmony export */   calculateColumns: () => (/* binding */ calculateColumns),
-/* harmony export */   getNewVid: () => (/* binding */ getNewVid)
+/* harmony export */   getNewVid: () => (/* binding */ getNewVid),
+/* harmony export */   getNewVidFromArray: () => (/* binding */ getNewVidFromArray),
+/* harmony export */   getNextVid: () => (/* binding */ getNextVid)
 /* harmony export */ });
 /* harmony import */ var datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! datagrok-api/grok */ "datagrok-api/grok");
 /* harmony import */ var datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__);
@@ -7435,9 +7593,13 @@ function calculateCellValues(values_1, descriptors_1, functions_1) {
 }
 ;
 function getNewVid(vidCol) {
+    var _a;
+    return getNewVidFromArray((_a = vidCol.categories) !== null && _a !== void 0 ? _a : []);
+}
+function getNewVidFromArray(vidArray) {
     let maxId = 0;
-    if (vidCol.length > 1) {
-        for (const vid of vidCol.toList()) {
+    if (vidArray.length > 1) {
+        for (const vid of vidArray) {
             if (!vid || !vid.startsWith(_consts__WEBPACK_IMPORTED_MODULE_2__.ViDColFormat[0]) || vid.length !== _consts__WEBPACK_IMPORTED_MODULE_2__.ViDColFormat.length)
                 continue;
             const num = parseInt(vid.substring(1));
@@ -7449,6 +7611,9 @@ function getNewVid(vidCol) {
     }
     return `V${''.concat(...new Array(_consts__WEBPACK_IMPORTED_MODULE_2__.ViDColFormat.length - 1 - (maxId + 1).toString().length).fill('0'))}${maxId + 1}`;
 }
+function getNextVid(maxVid) {
+    return `V${''.concat(...new Array(_consts__WEBPACK_IMPORTED_MODULE_2__.ViDColFormat.length - 1 - (maxVid + 1).toString().length).fill('0'))}${maxVid + 1}`;
+}
 function calculateColumns(resultMap, dataFrame, molColName) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -7552,6 +7717,144 @@ function calculateColumns(resultMap, dataFrame, molColName) {
 }
 
 
+/***/ }),
+
+/***/ "./src/package-api.ts":
+/*!****************************!*\
+  !*** ./src/package-api.ts ***!
+  \****************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   funcs: () => (/* binding */ funcs),
+/* harmony export */   queries: () => (/* binding */ queries)
+/* harmony export */ });
+/* harmony import */ var datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! datagrok-api/grok */ "datagrok-api/grok");
+/* harmony import */ var datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__);
+var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+/**
+This file is auto-generated by the grok api command.
+If you notice any changes, please push them to the repository.
+Do not edit this file manually.
+*/
+
+var queries;
+(function (queries) {
+    /**
+    Acquire a lock for a campaign. If the lock is expired, it will be removed and a new lock will be created.
+    */
+    function acquireCampaignLock(appName, campaignId, lockedBy) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.data.query('HitTriage:AcquireCampaignLock', { appName, campaignId, lockedBy });
+        });
+    }
+    queries.acquireCampaignLock = acquireCampaignLock;
+    /**
+    Release a lock for a campaign.
+    */
+    function releaseCampaignLock(appName, campaignId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.data.query('HitTriage:ReleaseCampaignLock', { appName, campaignId });
+        });
+    }
+    queries.releaseCampaignLock = releaseCampaignLock;
+    /**
+    Get the last modified time of a campaign lock release (same as save).
+    */
+    function getLastModified(appName, campaignId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.data.query('HitTriage:GetLastModified', { appName, campaignId });
+        });
+    }
+    queries.getLastModified = getLastModified;
+})(queries || (queries = {}));
+var funcs;
+(function (funcs) {
+    function hitTriageAppTreeBrowser(treeNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:HitTriageAppTreeBrowser', { treeNode });
+        });
+    }
+    funcs.hitTriageAppTreeBrowser = hitTriageAppTreeBrowser;
+    function hitDesignAppTreeBrowser(treeNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:HitDesignAppTreeBrowser', { treeNode });
+        });
+    }
+    funcs.hitDesignAppTreeBrowser = hitDesignAppTreeBrowser;
+    function peptiHitAppTreeBrowser(treeNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:PeptiHitAppTreeBrowser', { treeNode });
+        });
+    }
+    funcs.peptiHitAppTreeBrowser = peptiHitAppTreeBrowser;
+    function hitTriageApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:HitTriageApp', {});
+        });
+    }
+    funcs.hitTriageApp = hitTriageApp;
+    function hitDesignApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:HitDesignApp', {});
+        });
+    }
+    funcs.hitDesignApp = hitDesignApp;
+    function peptiHitApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:PeptiHitApp', {});
+        });
+    }
+    funcs.peptiHitApp = peptiHitApp;
+    function demoFileIngest() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:DemoFileIngest', {});
+        });
+    }
+    funcs.demoFileIngest = demoFileIngest;
+    function demoFileIngest1() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:DemoFileIngest1', {});
+        });
+    }
+    funcs.demoFileIngest1 = demoFileIngest1;
+    function demoFileIngest2(numberOfMolecules) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:DemoFileIngest2', { numberOfMolecules });
+        });
+    }
+    funcs.demoFileIngest2 = demoFileIngest2;
+    function demoFileSubmit(df, molecules) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:DemoFileSubmit', { df, molecules });
+        });
+    }
+    funcs.demoFileSubmit = demoFileSubmit;
+    function gasteigerCellRenderer() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:GasteigerCellRenderer', {});
+        });
+    }
+    funcs.gasteigerCellRenderer = gasteigerCellRenderer;
+    function htPackageSettingEditor(propList) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield datagrok_api_grok__WEBPACK_IMPORTED_MODULE_0__.functions.call('HitTriage:HtPackageSettingEditor', { propList });
+        });
+    }
+    funcs.htPackageSettingEditor = htPackageSettingEditor;
+})(funcs || (funcs = {}));
+
+
 /***/ }),
 
 /***/ "./src/package.g.ts":
@@ -7652,7 +7955,7 @@ function demoFileIngest1() {
 }
 //name: Demo Molecules variable
 //tags: HitTriageDataSource
-//input: double numberOfMolecules  { description: Molecules counts; type: int }
+//input: int numberOfMolecules { description: Molecules counts }
 //output: dataframe result
 function demoFileIngest2(numberOfMolecules) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -7661,8 +7964,8 @@ function demoFileIngest2(numberOfMolecules) {
 }
 //name: Demo File Submit
 //tags: HitTriageSubmitFunction
-//input: dataframe df  { description: Dataframe }
-//input: string molecules  { description: Molecules column name }
+//input: dataframe df { description: Dataframe }
+//input: string molecules { description: Molecules column name }
 function demoFileSubmit(df, molecules) {
     return __awaiter(this, void 0, void 0, function* () {
         yield _package__WEBPACK_IMPORTED_MODULE_0__.PackageFunctions.demoFileSubmit(df, molecules);
@@ -7678,7 +7981,7 @@ function gasteigerCellRenderer() {
 }
 //name: Hit Triage package settings editor
 //tags: packageSettingsEditor
-//input: dynamic propList  { type: object }
+//input: object propList 
 //output: widget result
 function htPackageSettingEditor(properties) {
     return __awaiter(this, void 0, void 0, function* () {