Add tooltip for source files showing member count, source length and …

…CCSID
codefori · Feb 18, 2024 · 623b52c · 623b52c
1 parent 7c12bc2
commit 623b52c
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 23 deletions.
diff --git a/src/api/IBMiContent.ts b/src/api/IBMiContent.ts
@@ -506,35 +506,39 @@ export default class IBMiContent {
     let createOBJLIST;
     if (sourceFilesOnly) {
       //DSPFD only
-      createOBJLIST = `Select PHFILE as NAME, ` +
-        `'*FILE' As TYPE, ` +
-        `PHFILA As ATTRIBUTE, ` +
-        `PHTXT As TEXT, ` +
-        `1 As IS_SOURCE, ` +
-        `PHNOMB As NB_MBR ` +
-        `From QTEMP.CODE4IFD Where PHDTAT = 'S'`;
+      createOBJLIST =`select PHFILE as NAME, ` +
+        `'*FILE' as TYPE, ` +
+        `PHFILA as ATTRIBUTE, ` +
+        `PHTXT as TEXT, ` +
+        `1 as IS_SOURCE, ` +
+        `PHNOMB as NB_MBR, ` +
+        'PHMXRL as SOURCE_LENGTH, ' +
+        'PHCSID as CCSID ' +
+        `from QTEMP.CODE4IFD where PHDTAT = 'S'`;
     } else if (!withSourceFiles) {
       //DSPOBJD only
-      createOBJLIST = `Select ODOBNM as NAME, ` +
-        `ODOBTP As TYPE, ` +
-        `ODOBAT As ATTRIBUTE, ` +
-        `ODOBTX As TEXT, ` +
-        `0 As IS_SOURCE ` +
-        `From QTEMP.CODE4IOBJD`;
+      createOBJLIST = `select ODOBNM as NAME, ` +
+        `ODOBTP as TYPE, ` +
+        `ODOBAT as ATTRIBUTE, ` +
+        `ODOBTX as TEXT, ` +
+        `0 as IS_SOURCE ` +
+        `from QTEMP.CODE4IOBJD`;
     }
     else {
       //Both DSPOBJD and DSPFD
-      createOBJLIST = `Select ODOBNM as NAME, ` +
-        `ODOBTP As TYPE, ` +
-        `ODOBAT As ATTRIBUTE, ` +
-        `ODOBTX As TEXT, ` +
-        `Case When PHDTAT = 'S' Then 1 Else 0 End As IS_SOURCE, ` +
-        `PHNOMB As NB_MBR ` +
-        `From QTEMP.CODE4IOBJD  ` +
-        `Left Join QTEMP.CODE4IFD On PHFILE = ODOBNM And PHDTAT = 'S'`;
+      createOBJLIST = `select ODOBNM as NAME, ` +
+        `ODOBTP as TYPE, ` +
+        `ODOBAT as ATTRIBUTE, ` +
+        `ODOBTX as TEXT, ` +
+        `Case When PHDTAT = 'S' Then 1 Else 0 End as IS_SOURCE, ` +
+        `PHNOMB as NB_MBR, ` +
+        'PHMXRL as SOURCE_LENGTH, ' +
+        'PHCSID as CCSID ' +
+        `from QTEMP.CODE4IOBJD  ` +
+        `left join QTEMP.CODE4IFD on PHFILE = ODOBNM And PHDTAT = 'S'`;
     }
 
-    queries.push(`Create Table QTEMP.OBJLIST As (${createOBJLIST}) With DATA`);
+    queries.push(`create table QTEMP.OBJLIST as (${createOBJLIST}) with data`);
 
     const objects = (await this.getQTempTable(queries, "OBJLIST"));
     return objects.map(object => ({
@@ -544,7 +548,9 @@ export default class IBMiContent {
       attribute: String(object.ATTRIBUTE),
       text: String(object.TEXT),
       memberCount: object.NB_MBR !== undefined ? Number(object.NB_MBR) : undefined,
-      sourceFile: Boolean(object.IS_SOURCE)
+      sourceFile: Boolean(object.IS_SOURCE),
+      sourceLength: object.SOURCE_LENGTH !== undefined ? Number(object.SOURCE_LENGTH) : undefined,
+      CCSID: object.CCSID !== undefined ? Number(object.CCSID) : undefined
     } as IBMiObject))
       .filter(object => !typeFilter || typeFilter(object.type))
       .filter(object => nameFilter.test(object.name))

diff --git a/src/locale/ids/da.ts b/src/locale/ids/da.ts
@@ -27,6 +27,9 @@ export const da: Locale = {
   'lines':'Linier',
   'changed':'Ændret',
   'created':'Oprettet',
+  'members':'Members',
+  'length':'Længde',
+  'CCSID':'CCSID',
   // Sandbox:
   'sandbox.input.user.title': `Bruger for server`,
   'sandbox.input.user.prompt': `Indtast brugernavn for {0}`,

diff --git a/src/locale/ids/en.ts b/src/locale/ids/en.ts
@@ -27,6 +27,9 @@ export const en: Locale = {
   'lines':'Lines',
   'changed':'Changed',
   'created':'Created',
+  'members':'Members',
+  'length':'Length',
+  'CCSID':'CCSID',
   // Sandbox:
   'sandbox.input.user.title': `User for server`,
   'sandbox.input.user.prompt': `Enter username for {0}`,

diff --git a/src/locale/ids/fr.ts b/src/locale/ids/fr.ts
@@ -27,6 +27,9 @@ export const fr: Locale = {
   'lines':'Lignes',
   'changed':'Modification',
   'created':'Création',
+  'members':'Members',
+  'length':'Length',
+  'CCSID':'CCSID',
   // Sandbox:
   'sandbox.input.user.title': `Nom d'utilisateur`,
   'sandbox.input.user.prompt': `Entrez le nom d'utilisateur pour {0}`,

diff --git a/src/typings.ts b/src/typings.ts
@@ -101,6 +101,8 @@ export interface IBMiObject extends QsysPath {
   sourceFile?: boolean
   attribute?: string,
   memberCount?: number
+  sourceLength?: number
+  CCSID?: number
 }
 
 export interface IBMiMember {

diff --git a/src/views/objectBrowser.ts b/src/views/objectBrowser.ts
@@ -191,6 +191,11 @@ class ObjectBrowserSourcePhysicalFileItem extends ObjectBrowserItem implements S
     this.description = sourceFile.text;
 
     this.path = [sourceFile.library, sourceFile.name].join(`/`);
+    this.tooltip = `${this.path}`
+      .concat(`\n${t("text")}:\t\t${sourceFile.text}`)
+      .concat(`\n${t("members")}:\t${sourceFile.memberCount}`)
+      .concat(`\n${t("length")}:\t${sourceFile.sourceLength}`)
+      .concat(`\nCCSID:\t\t${sourceFile.CCSID}`)
   }
 
   sortBy(sort: SortOptions) {