@datagrok/hit-triage 1.3.4 → 1.3.6

package/files/Hit Design/campaigns/DMT1-1/campaign.json

@@ -32,7 +32,6 @@
     "~Molecule.canonicalSmiles": "string"
   },
   "version": 1,
-  "authorUserId": "7a6a9f30-25d0-11ef-c943-0b65a97fa481",
   "permissions": {
     "view": ["a4b45840-9a50-11e6-9cc9-8546b8bf62e6"],
     "edit": ["a4b45840-9a50-11e6-9cc9-8546b8bf62e6"]

package/files/Hit Design/campaigns/DMT2-1/campaign.json

@@ -44,7 +44,6 @@
     "fr_NH2": "int"
   },
   "version": 1,
-  "authorUserId": "7a6a9f30-25d0-11ef-c943-0b65a97fa481",
   "permissions": {
     "view": ["a4b45840-9a50-11e6-9cc9-8546b8bf62e6"],
     "edit": ["a4b45840-9a50-11e6-9cc9-8546b8bf62e6"]

package/package.json

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

package/src/app/consts.ts

@@ -29,6 +29,7 @@ export const i18n = {
   continueCampaigns: 'Continue Campaign',
   createNewCampaignHeader: 'New Campaign',
   selectTemplate: 'Template',
+  noInformation: 'No Information',
 } as const;
 
 export const funcTypeNames = {
@@ -43,4 +44,6 @@ export enum CampaignGroupingType {
   None = 'None',
   Template = 'Template',
   Status = 'Status',
+  Author = 'Author',
+  LastModifiedUser = 'Last Modified User',
 }

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

@@ -645,10 +645,13 @@ export class HitDesignApp<T extends HitDesignTemplate = HitDesignTemplate> exten
 
     return {
       'Template': this.template?.name ?? 'Molecules',
-      'File path': getPathEditor(),
+      'File Path': getPathEditor(),
+      ...(this.campaign?.authorUserFriendlyName ? {'Author': this.campaign.authorUserFriendlyName} : {}),
+      ...(this.campaign?.lastModifiedUserName ? {'Last Modified By': this.campaign.lastModifiedUserName} : {}),
+      ...(this.campaign?.createDate ? {'Create Date': this.campaign.createDate} : {}),
       ...campaignProps,
-      'Number of molecules': (this.dataFrame!.rowCount).toString(),
-      'Enrichment methods': [this.template!.compute.descriptors.enabled ? 'descriptors' : '',
+      'Number of Molecules': (this.dataFrame!.rowCount).toString(),
+      'Enrichment Methods': [this.template!.compute.descriptors.enabled ? 'descriptors' : '',
         ...this.template!.compute.functions.map((func) => func.name)].filter((f) => f && f.trim() !== '').join(', '),
     };
   }
@@ -667,7 +670,7 @@ export class HitDesignApp<T extends HitDesignTemplate = HitDesignTemplate> exten
     // if its first time save author as current user, else keep the same
     const authorUserId = this.campaign?.authorUserId ?? grok.shell.user.id;
     const permissions = this.campaign?.permissions ?? defaultPermissions;
-
+    const authorName = authorUserId ? this.campaign?.authorUserFriendlyName ?? (await grok.dapi.users.find(authorUserId))?.friendlyName : undefined;
     const campaign: HitDesignCampaign = {
       name: campaignName,
       templateName,
@@ -682,6 +685,8 @@ export class HitDesignApp<T extends HitDesignTemplate = HitDesignTemplate> exten
       tilesViewerFormSketch: sketchStateString,
       version: this.version + 1,
       authorUserId,
+      authorUserFriendlyName: authorName,
+      lastModifiedUserName: grok.shell.user.friendlyName,
       permissions,
     };
     if (!this.hasEditPermission) {

package/src/app/hit-design-views/info-view.ts

@@ -253,14 +253,17 @@ export class HitDesignInfoView
       });
       return [shareIcon, deleteIcon];
     };
-    const table = ui.table(Object.values(campaignNamesMap), (info) =>
-      ([ui.link(info.name, () => this.setCampaign(info.name), '', ''),
+
+    const table = ui.table(Object.values(grouppedCampaigns).flat(), (info) =>
+      ([ui.link(info.name, () => this.setCampaign(info.name), 'Continue Campaign', ''),
         info.createDate,
+        info.authorUserFriendlyName ?? '',
+        info.lastModifiedUserName ?? '',
         info.rowCount,
         info.status,
         ...(deleteAndShareCampaignIcons(info)),
       ]),
-    ['Name', 'Created', 'Molecules', 'Status', '']);
+    ['Name', 'Created', 'Author', 'Last Modified by', 'Molecules', 'Status', '', '']);
     table.style.color = 'var(--grey-5)';
     table.style.marginLeft = '24px';
     processGroupingTable(table, grouppedCampaigns);

package/src/app/types.ts

@@ -119,7 +119,9 @@ export type HitTriageCampaign = {
     columnTypes?: {[key: string]: string},
     version?: number,
     permissions?: TriagePermissions,
-    authorUserId?: string
+    authorUserId?: string,
+    authorUserFriendlyName?: string,
+    lastModifiedUserName?: string,
 };
 
 export type TriagePermissions = {

package/src/app/utils.ts

@@ -3,7 +3,7 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 import {Subscription} from 'rxjs';
-import {CampaignGroupingType, CampaignJsonName, ComputeQueryMolColName, HDCampaignsGroupingLSKey} from './consts';
+import {CampaignGroupingType, CampaignJsonName, ComputeQueryMolColName, HDCampaignsGroupingLSKey, i18n} from './consts';
 import {AppName, CampaignsType, HitDesignCampaign, HitTriageCampaign, TriagePermissions} from './types';
 import {_package} from '../package';
 
@@ -128,6 +128,11 @@ export async function loadCampaigns<T extends AppName>(
         !await checkViewPermissions(campaignJson.authorUserId, campaignJson.permissions)
       )
         continue;
+      if (campaignJson.authorUserId && !campaignJson.authorUserFriendlyName) {
+        const user = await grok.dapi.users.find(campaignJson.authorUserId);
+        if (user)
+          campaignJson.authorUserFriendlyName = user.friendlyName;
+      }
       campaignNamesMap[campaignJson.name] = campaignJson;
     } catch (e) {
       continue;
@@ -141,13 +146,12 @@ async function checkPermissions(authorId: string, groupIdList: string[]): Promis
   const userGroupId = DG.User.current().group?.id;
   if (authorId === userId)
     return true;
-  const dapiGroups = grok.dapi.groups;
   for (const groupId of groupIdList) {
-    const group = await dapiGroups.find(groupId);
+    const group = await grok.dapi.groups.find(groupId);
     if (!group)
       continue;
     if (group.personal) {
-      const user = await dapiGroups.getUser(group);
+      const user = await grok.dapi.groups.getUser(group);
       if (user?.id === userId)
         return true;
     } else if (userGroupId && group.members.length > 0) {
@@ -188,6 +192,10 @@ export const getGroupingKey = <T extends HitDesignCampaign | HitTriageCampaign =
     return campaign.template?.key ?? campaign.templateName;
   case CampaignGroupingType.Status:
     return campaign.status;
+  case CampaignGroupingType.Author:
+    return campaign.authorUserFriendlyName ?? i18n.noInformation;
+  case CampaignGroupingType.LastModifiedUser:
+    return campaign.lastModifiedUserName ?? i18n.noInformation;
   default:
     return '';
   }
@@ -207,7 +215,7 @@ export function getGroupedCampaigns<T extends HitDesignCampaign | HitTriageCampa
   return groupedCampaigns;
 }
 
-export function processGroupingTable<T extends HitDesignCampaign | HitTriageCampaign = HitDesignCampaign>(table: HTMLTableElement, groupedCampaigns: {[key: string]: T[]}, numCols = 6) {
+export function processGroupingTable<T extends HitDesignCampaign | HitTriageCampaign = HitDesignCampaign>(table: HTMLTableElement, groupedCampaigns: {[key: string]: T[]}, numCols = 8) {
   table.classList.add('hit-design-groupped-campaigns-table');
   const keys = Object.keys(groupedCampaigns);
   if (keys.length < 2)