@datagrok/hit-triage 1.7.5 → 1.7.6

package/dist/package.js

@@ -3153,7 +3153,7 @@ class HitBaseView extends datagrok_api_dg__WEBPACK_IMPORTED_MODULE_0__.ViewBase
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   CampaignGroupingType: () => (/* binding */ CampaignGroupingType),
+/* harmony export */   CampaignGrouping: () => (/* binding */ CampaignGrouping),
 /* harmony export */   CampaignIdKey: () => (/* binding */ CampaignIdKey),
 /* harmony export */   CampaignJsonName: () => (/* binding */ CampaignJsonName),
 /* harmony export */   CampaignTableName: () => (/* binding */ CampaignTableName),
@@ -3221,14 +3221,14 @@ const funcTypeNames = {
 };
 const HDCampaignsGroupingLSKey = 'HDCampaignsGrouping';
 const HDCampaignTableColumnsLSKey = 'HDCampaignTableColumns';
-var CampaignGroupingType;
-(function (CampaignGroupingType) {
-    CampaignGroupingType["None"] = "None";
-    CampaignGroupingType["Template"] = "Template";
-    CampaignGroupingType["Status"] = "Status";
-    CampaignGroupingType["Author"] = "Author";
-    CampaignGroupingType["LastModifiedUser"] = "Last Modified User";
-})(CampaignGroupingType || (CampaignGroupingType = {}));
+var CampaignGrouping;
+(function (CampaignGrouping) {
+    CampaignGrouping["None"] = "None";
+    CampaignGrouping["Template"] = "Template";
+    CampaignGrouping["Status"] = "Status";
+    CampaignGrouping["Author"] = "Author";
+    CampaignGrouping["LastModifiedUser"] = "Last Modified User";
+})(CampaignGrouping || (CampaignGrouping = {}));
 const DefaultCampaignTableInfoGetters = {
     'Code': (info) => info.name,
     'Created': (info) => info.createDate,
@@ -4914,16 +4914,29 @@ class HitDesignInfoView extends _base_view__WEBPACK_IMPORTED_MODULE_10__.HitBase
                     }
                 });
                 // grouping via different campaign properties
-                const sortIcon = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.iconFA('layer-group', () => {
+                const sortIcon = datagrok_api_ui__WEBPACK_IMPORTED_MODULE_1__.iconFA('layer-group', () => __awaiter(this, void 0, void 0, function* () {
                     const menu = datagrok_api_dg__WEBPACK_IMPORTED_MODULE_2__.Menu.popup();
-                    Object.values(_consts__WEBPACK_IMPORTED_MODULE_6__.CampaignGroupingType).forEach((i) => {
+                    Object.values(_consts__WEBPACK_IMPORTED_MODULE_6__.CampaignGrouping).forEach((i) => {
                         menu.item(i, () => __awaiter(this, void 0, void 0, function* () {
                             (0,_utils__WEBPACK_IMPORTED_MODULE_7__.setSavedCampaignsGrouping)(i);
                             yield refreshTable();
                         }));
-                        menu.show({ element: sortingHeader, x: 120, y: sortingHeader.offsetTop + 30 });
                     });
-                });
+                    const campaignFieldsGroup = menu.group('Campaign Fields');
+                    const campaignNamesMap = yield _package__WEBPACK_IMPORTED_MODULE_4__._package.loadCampaigns(this.app.appName, this.deletedCampaigns);
+                    const customFields = new Set();
+                    Object.values(campaignNamesMap).forEach((c) => {
+                        if (c.campaignFields)
+                            Object.keys(c.campaignFields).forEach((field) => customFields.add(field));
+                    });
+                    Array.from(customFields).forEach((field) => {
+                        campaignFieldsGroup.item(field, () => __awaiter(this, void 0, void 0, function* () {
+                            (0,_utils__WEBPACK_IMPORTED_MODULE_7__.setSavedCampaignsGrouping)(`campaignFields.${field}`);
+                            yield refreshTable();
+                        }));
+                    });
+                    menu.show({ element: sortingHeader, x: 120, y: sortingHeader.offsetTop + 30 });
+                }));
                 sortIcon.style.marginBottom = '9px';
                 sortIcon.style.marginLeft = '8px';
                 sortIcon.style.fontSize = '15px';
@@ -6942,7 +6955,7 @@ function setLocalStorageValue(key, value) {
 }
 function getSavedCampaignsGrouping() {
     var _a;
-    return (_a = getLocalStorageValue(_consts__WEBPACK_IMPORTED_MODULE_3__.HDCampaignsGroupingLSKey)) !== null && _a !== void 0 ? _a : _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.None;
+    return (_a = getLocalStorageValue(_consts__WEBPACK_IMPORTED_MODULE_3__.HDCampaignsGroupingLSKey)) !== null && _a !== void 0 ? _a : _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.None;
 }
 function setSavedCampaignsGrouping(value) {
     setLocalStorageValue(_consts__WEBPACK_IMPORTED_MODULE_3__.HDCampaignsGroupingLSKey, value);
@@ -6967,22 +6980,26 @@ function setSavedCampaignTableColumns(columns) {
     setLocalStorageValue(_consts__WEBPACK_IMPORTED_MODULE_3__.HDCampaignTableColumnsLSKey, JSON.stringify(columns));
 }
 const getGroupingKey = (grouping, campaign) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     switch (grouping) {
-        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.Template:
+        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.Template:
             return (_b = (_a = campaign.template) === null || _a === void 0 ? void 0 : _a.key) !== null && _b !== void 0 ? _b : campaign.templateName;
-        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.Status:
+        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.Status:
             return campaign.status;
-        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.Author:
+        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.Author:
             return (_c = campaign.authorUserFriendlyName) !== null && _c !== void 0 ? _c : _consts__WEBPACK_IMPORTED_MODULE_3__.i18n.noInformation;
-        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.LastModifiedUser:
+        case _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.LastModifiedUser:
             return (_d = campaign.lastModifiedUserName) !== null && _d !== void 0 ? _d : _consts__WEBPACK_IMPORTED_MODULE_3__.i18n.noInformation;
         default:
+            if (grouping.startsWith('campaignFields.')) {
+                const fieldName = grouping.replace('campaignFields.', '');
+                return (_f = (_e = campaign.campaignFields) === null || _e === void 0 ? void 0 : _e[fieldName]) !== null && _f !== void 0 ? _f : _consts__WEBPACK_IMPORTED_MODULE_3__.i18n.noInformation;
+            }
             return '';
     }
 };
 function getGroupedCampaigns(campaigns, grouping) {
-    if (grouping === _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGroupingType.None)
+    if (grouping === _consts__WEBPACK_IMPORTED_MODULE_3__.CampaignGrouping.None)
         return { '': campaigns };
     const groupedCampaigns = {};
     for (const campaign of campaigns) {
@@ -7549,7 +7566,7 @@ function demoFileIngest1() {
 }
 //name: Demo Molecules variable
 //tags: HitTriageDataSource
-//input: int numberOfMolecules  { description: Molecules counts }
+//input: double numberOfMolecules  { description: Molecules counts; type: int }
 //output: dataframe result
 function demoFileIngest2(numberOfMolecules) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -7575,7 +7592,7 @@ function gasteigerCellRenderer() {
 }
 //name: Hit Triage package settings editor
 //tags: packageSettingsEditor
-//input: object propList 
+//input: dynamic propList  { type: object }
 //output: widget result
 function htPackageSettingEditor(properties) {
     return __awaiter(this, void 0, void 0, function* () {