Tablecontents (#199)

* run selection with icon

* refactor, update query panel

Author: marcellourbani

client/src/adt/conections.ts

@@ -1,5 +1,5 @@
 import { RemoteManager, createClient } from "../config"
-import { AFsService, Root } from "abapfs"
+import { AFsService, AbapStat, Root, isAbapStat } from "abapfs"
 import { Uri, FileSystemError } from "vscode"
 import { ADTClient } from "abap-adt-api"
 import { LogOutPendingDebuggers } from "./debugger"
@@ -14,7 +14,7 @@ const missing = (connId: string) => {
   return FileSystemError.FileNotFound(`No ABAP server defined for ${connId}`)
 }
 
-export const abapUri = (u: Uri) => u.scheme === ADTSCHEME
+export const abapUri = (u?: Uri) => u?.scheme === ADTSCHEME
 
 async function create(connId: string) {
   const manager = RemoteManager.get()
@@ -71,7 +71,7 @@ export const getRoot = (connId: string) => {
 }
 
 export const uriRoot = (uri: Uri) => {
-  if (uri && uri.scheme === ADTSCHEME) return getRoot(uri.authority)
+  if (abapUri(uri)) return getRoot(uri.authority)
   throw missing(uri.toString())
 }
 

client/src/adt/operations/AdtObjectFinder.ts

@@ -26,7 +26,8 @@ import {
   isAbapFile,
   isAbapStat,
   Root,
-  AbapFile
+  AbapFile,
+  AbapStat
 } from "abapfs"
 
 interface SearchObjectType {
@@ -255,6 +256,16 @@ export function findAbapObject(uri: Uri) {
   throw new Error("Not an ABAP object")
 }
 
+export const uriAbapFile = (uri?: Uri): AbapStat | undefined => {
+  try {
+    if (!uri) return
+    const root = uriRoot(uri)
+    const file = root.getNode(uri.path)
+    if (isAbapStat(file)) return file
+  } catch (error) {
+  }
+}
+
 export const pathSequence = (root: Root, uri: Uri | undefined): FileStat[] => {
   if (uri)
     try {

client/src/commands/commands.ts

@@ -29,7 +29,8 @@ import { AdtObjectActivator } from "../adt/operations/AdtObjectActivator"
 import {
   AdtObjectFinder,
   createUri,
-  findAbapObject
+  findAbapObject,
+  uriAbapFile
 } from "../adt/operations/AdtObjectFinder"
 import { isAbapClassInclude } from "abapobject"
 import { IncludeProvider } from "../adt/includes" // resolve dependencies
@@ -39,12 +40,16 @@ import { types } from "util"
 import { atcProvider } from "../views/abaptestcockpit"
 import { context } from "../extension"
 
-function currentUri() {
+export function currentUri() {
   if (!window.activeTextEditor) return
   const uri = window.activeTextEditor.document.uri
   if (uri.scheme !== ADTSCHEME) return
   return uri
 }
+export function currentAbapFile() {
+  const uri = currentUri()
+  return uriAbapFile(uri)
+}
 
 export function currentEditState() {
   const uri = currentUri()
@@ -82,8 +87,8 @@ export class AdtCommands {
   }
 
   @command(AbapFsCommands.selectDB)
-  private static async selectDB() {
-    return showQuery()
+  private static async selectDB(table?: string) {
+    return showQuery(table)
   }
 
   @command(AbapFsCommands.changeInclude)
@@ -285,6 +290,16 @@ export class AdtCommands {
     FavouritesProvider.get().deleteFavourite(node)
   }
 
+  @command(AbapFsCommands.tableContents)
+  private static showTableContents() {
+    const file = currentAbapFile()
+    if (!file) {
+      window.showInformationMessage("Unable to determine the table to display")
+      return
+    }
+    commands.executeCommand(AbapFsCommands.selectDB, file.object.name)
+  }
+
   @command(AbapFsCommands.unittest)
   private static async runAbapUnit() {
     try {

client/src/commands/registry.ts

@@ -18,6 +18,7 @@ export const AbapFsCommands = {
   createConnection: "abapfs.createConnection",
   showDump: "abapfs.showDump",
   refreshDumps: "abapfs.refreshDumps",
+  tableContents: "abapfs.tableContents",
   // atc
   atcChecks: "abapfs.atcChecks",
   atcIgnore: "abapfs.atcIgnore",

client/src/lib/index.ts

@@ -3,4 +3,5 @@ export * from "./externalmodules"
 export * from "./logger"
 export * from "./vscodefunctions"
 export * from "./mongoClient"
-export * from "./rfsTaskEither"
+export * from "./rfsTaskEither"
+export const viewableObjecttypes: Set<string | undefined> = new Set(["TABL/DT", "VIEW/DV", "DDLS/DF"])

client/src/listeners.ts

@@ -11,13 +11,14 @@ import {
   workspace
 } from "vscode"
 
-import { caughtToString, debounce, log } from "./lib"
+import { caughtToString, debounce, log, viewableObjecttypes } from "./lib"
 import { ADTSCHEME, uriRoot, abapUri, getRoot } from "./adt/conections"
 import { AbapObject } from "abapobject"
 import { isAbapStat } from "abapfs"
 import { isCsrfError } from "abap-adt-api"
 import { LockStatus } from "abapfs/out/lockObject"
 import { IncludeProvider } from "./adt/includes"
+import { uriAbapFile } from "./adt/operations/AdtObjectFinder"
 
 export const listenersubscribers: ((...x: any[]) => Disposable)[] = []
 
@@ -147,24 +148,31 @@ function isInactive(obj: AbapObject): boolean {
   return inactive
 }
 
+function showHidedbIcon(editor?: TextEditor) {
+  try {
+    const type = uriAbapFile(editor?.document.uri)?.object.type
+    commands.executeCommand("setContext", "abapfs:showTableContentIcon", viewableObjecttypes.has(type))
+  } catch (error) { }
+}
+
 export async function showHideActivate(editor?: TextEditor, refresh = false) {
   let shouldShow = false
   const uri = editor?.document.uri
-  if (editor && uri && uri.scheme === ADTSCHEME)
-    try {
-      const root = uriRoot(uri)
-      const lockStatus = await root.lockManager.finalStatus(uri.path)
-      shouldShow = editor.document.isDirty && lockStatus.status === "locked"
-      if (!shouldShow) {
-        const file = root.getNode(uri.path)
-        const obj = isAbapStat(file) && file.object
-        if (!obj) return
-        if (refresh) await obj.loadStructure()
-        shouldShow = obj && isInactive(obj)
-      }
-    } catch (e) {
-      shouldShow = false
+  if (!(uri && abapUri(uri))) return
+  try {
+    const root = uriRoot(uri)
+    const lockStatus = await root.lockManager.finalStatus(uri.path)
+    shouldShow = editor.document.isDirty && lockStatus.status === "locked"
+    if (!shouldShow) {
+      const file = root.getNode(uri.path)
+      const obj = isAbapStat(file) && file.object
+      if (!obj) return
+      if (refresh) await obj.loadStructure()
+      shouldShow = obj && isInactive(obj)
     }
+  } catch (e) {
+    shouldShow = false
+  }
   // race condition, active editor might have changed while async operation was pending
   if (editor !== window.activeTextEditor) return
   await commands.executeCommand("setContext", "abapfs:showActivate", shouldShow)
@@ -181,6 +189,7 @@ export async function activationStateListener(uri: Uri) {
 export async function activeTextEditorChangedListener(
   editor: TextEditor | undefined
 ) {
+  showHidedbIcon(editor)
   try {
     if (editor && editor.document.uri.scheme === ADTSCHEME) {
       await showHideActivate(editor)

client/src/views/query/query.ts

@@ -1,24 +1,20 @@
 import { window } from "vscode"
-import { ADTSCHEME, getClient } from "../../adt/conections"
+import { ADTSCHEME, abapUri, getClient } from "../../adt/conections"
 import { findAbapObject } from "../../adt/operations/AdtObjectFinder"
 import { context } from "../../extension"
 import { QueryPanel } from "./queryPanel"
+import { viewableObjecttypes } from "../../lib"
+import { currentAbapFile, currentUri } from "../../commands/commands"
 
-export async function showQuery() {
-  const editor = window.activeTextEditor
-  if (!editor) return
-  const uri = editor.document.uri
-  const sel = editor.selection.active
-  if (uri.scheme !== ADTSCHEME) return
+export async function showQuery(table?: string) {
+  const uri = currentUri()
+  if (!(uri && abapUri(uri))) return
   const client = getClient(uri.authority)
-  const obj = await findAbapObject(uri)
-
-  let tablename = ""
-
-  if (obj.type === 'DDLS/DF' || obj.type === 'TABL/DT') {
-    tablename = obj.name;
+  if (table) QueryPanel.createOrShow(context.extensionUri, client, table)
+  else {
+    const obj = await findAbapObject(uri)
+    const tablename = viewableObjecttypes.has(obj.type) ? obj.name : ""
+    QueryPanel.createOrShow(context.extensionUri, client, tablename)
   }
 
-  QueryPanel.createOrShow(context.extensionUri, client, tablename);
-
 }