Marcellourbani/issue191 (#219)

* small unittest fix

* improved inactive object support

* If i re-save or activate after the first activation of the abap source in vscode, there is no response #191

Author: marcellourbani

client/package-lock.json

@@ -44,7 +44,7 @@
     "@types/uuid": "^9.0.0",
     "@types/vscode": "^1.74.0",
     "@types/vscode-windows-registry": "^1.0.0",
-    "axios": "^0.23.0",
+    "axios": "^1.6.8",
     "jest": "^29.3.1",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.6",
@@ -61,7 +61,7 @@
     "@abaplint/core": "^2.102.65",
     "@types/tmp": "0.2.3",
     "abap_cloud_platform": "^1.1.3",
-    "abap-adt-api": "^5.2.7",
+    "abap-adt-api": "^6.0.0",
     "abapfs": "file:../modules/abapfs",
     "abapobject": "file:../modules/abapObject",
     "client-oauth2": "^4.3.3",

client/package.json

@@ -13,13 +13,13 @@ export interface ActivationEvent {
 }
 
 export class AdtObjectActivator {
-  constructor(private client: ADTClient) {}
+  constructor(private client: ADTClient) { }
   private static instances = new Map<string, AdtObjectActivator>()
   private emitter = new EventEmitter<ActivationEvent>()
   public static get(connId: string) {
     let instance = this.instances.get(connId)
     if (!instance) {
-      instance = new AdtObjectActivator(getClient(connId))
+      instance = new AdtObjectActivator(getClient(connId, false))
       this.instances.set(connId, instance)
     }
     return instance
@@ -54,7 +54,7 @@ export class AdtObjectActivator {
     const { name, path } = object.lockObject
     let result
     const mainProg = await this.getMain(object, uri)
-    result = await this.client.activate(name, path, mainProg)
+    result = await this.client.activate(name, path, mainProg, true)
     if (!result.success) {
       let inactives
       if (result.inactive.length > 0)

client/src/adt/operations/AdtObjectActivator.ts

@@ -199,7 +199,7 @@ const runHandler = (runner: UnitTestRunner) => async (request: TestRunRequest) =
             if (excluded(i)) continue
             const classes = await runUnitUrl(connId, i.id)
             runner.setUrlTypes(classes)
-            const obj = (i: TestItem): TestItem => runner.getUrlType(i.id) === TestResType.object ? i : obj(i.parent!)
+            const obj = (i: TestItem): TestItem => runner.getUrlType(i.id) === TestResType.object || !i.parent ? i : obj(i.parent)
             const resType = runner.getUrlType(i.id)
             const actualResType = resType === TestResType.method && (classes.length > 1 || classes[0] && classes[0].testmethods.length > 1) ? TestResType.object : resType
             setResults(run, classes, obj(i), runner.controller, actualResType)

client/src/adt/operations/UnitTestRunner.ts

@@ -39,6 +39,7 @@ import { createConnection } from "./connectionwizard"
 import { types } from "util"
 import { atcProvider } from "../views/abaptestcockpit"
 import { context } from "../extension"
+import { FsProvider } from "../fs/FsProvider"
 
 export function currentUri() {
   if (!window.activeTextEditor) return
@@ -159,7 +160,7 @@ export class AdtCommands {
           }
           await activator.activate(obj, uri)
           if (editor === window.activeTextEditor) {
-            await obj.loadStructure() // TODO replace with stat?
+            await workspace.fs.stat(uri)
             await showHideActivate(editor)
           }
         }

client/src/commands/commands.ts

@@ -6,7 +6,7 @@ import { cache } from "./functions"
 import { clientTraceUrl, Sources, httpTraceUrl } from "vscode-abap-remote-fs-sharedapi"
 import { LogCallback, LogData, session_types } from "abap-adt-api"
 import { caughtToString } from "."
-import { AxiosRequestHeaders } from "axios"
+import { AxiosRequestHeaders, RawAxiosRequestHeaders } from "axios"
 
 const CALLLOG = "callLog"
 const HTTPLOG = "httpLog"
@@ -30,12 +30,12 @@ interface HttpRequest {
   stateful: boolean
   method: string
   uri: string
-  headers: AxiosRequestHeaders
+  headers: Record<string, string | string[] | number>
   requestBody: any
   debugId: number
 }
 interface HttpLog extends HttpRequest {
-  responseHeaders: AxiosRequestHeaders
+  responseHeaders: Record<string, string | string[] | number>
   duration: number
   statusCode: number
   // unknownResponse: boolean

client/src/lib/mongoClient.ts

@@ -18,7 +18,7 @@ class GitDocProvider implements TextDocumentContentProvider {
     if (!key || !path || !gitScm) throw new Error(`Invalid URL`)
     const client = getClient(uri.authority)
     const { user, password } = gitScm.credentials || {}
-    return client.getObjectSource(path.replace(/#/g, "%23"), user, password)
+    return client.getObjectSource(path.replace(/#/g, "%23"), { gitUser: user, gitPassword: password })
   }
 }
 

client/src/scm/abapGit/documentProvider.ts

@@ -20,6 +20,6 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "abap-adt-api": "^5.2.7"
+    "abap-adt-api": "^6.0.0"
   }
 }

modules/abapObject/package-lock.json

@@ -25,7 +25,7 @@ export interface AbapObjectService {
     transport: string
   ) => Promise<void>
   delete: (path: string, lockId: string, transport: string) => Promise<void>
-  getObjectSource: (path: string) => Promise<string>
+  getObjectSource: (path: string, version?: ObjectVersion) => Promise<string>
   nodeContents: (type: NodeParents, name: string, owner?: string) => Promise<NodeStructure>
 }
 
@@ -74,8 +74,8 @@ export class AOService implements AbapObjectService {
     )
   }
 
-  getObjectSource(path: string) {
-    return this.client.statelessClone.getObjectSource(path)
+  getObjectSource(path: string, version?: ObjectVersion) {
+    return this.client.statelessClone.getObjectSource(path, { version })
   }
 
   private contentsCache = new Map<string, Promise<NodeStructure>>()

modules/abapObject/package.json

@@ -53,17 +53,19 @@ export interface AbapObject {
   readonly canBeWritten: boolean
   /** objcect namespace
    *  i.e. for /UI5/IF_ADT_REP_MODEL is /UI5/
-   */
+  */
   readonly nameSpace: string
   /** object base name
    *   i.e. for /UI5/IF_ADT_REP_MODEL is IF_ADT_REP_MODEL
-   */
+  */
   readonly baseName: string
   /** used to open the object in SAPGUI */
   readonly sapGuiUri: string
   /** supported or only sapgui */
   readonly supported: boolean
   readonly owner?: string
+  readonly modtime: number
+  readonly version: ObjectVersion | undefined
 
   /** loads/updates the object metadata */
   loadStructure: (refresh?: boolean, version?: ObjectVersion) => Promise<AbapObjectStructure>
@@ -120,6 +122,9 @@ export class AbapObjectBase implements AbapObject {
   public get structure(): AbapObjectStructure | undefined {
     return this._structure
   }
+  get modtime() {
+    return this.structure?.metaData["adtcore:changedAt"] ?? 0
+  }
   public set structure(value: AbapObjectStructure | undefined) {
     this._structure = value
   }
@@ -137,6 +142,10 @@ export class AbapObjectBase implements AbapObject {
   get fsName() {
     return `${convertSlash(this.name)}${this.extension}`
   }
+  get version(): ObjectVersion | undefined {
+    const version = this.structure?.metaData["adtcore:version"]
+    if (version === "active" || version === "inactive") return version
+  }
   get lockObject(): AbapObject {
     return this
   }
@@ -183,12 +192,21 @@ export class AbapObjectBase implements AbapObject {
     if (this.expandable) throw ObjectErrors.notLeaf(this)
     return this.service.mainPrograms(this.path)
   }
-
+  private _loadstprom: Promise<AbapObjectStructure> | undefined = undefined
   async loadStructure(refresh = false, version?: ObjectVersion): Promise<AbapObjectStructure> {
-    if (!this.name) throw ObjectErrors.noStructure(this)
-    const base = this.path.replace(/\/source\/main$/, "")
-    this.structure = await this.service.objectStructure(base, refresh, version)
-    return this.structure
+    if (!this._loadstprom) {
+      const loader = async () => {
+        if (!this.name) throw ObjectErrors.noStructure(this)
+        const base = this.path.replace(/\/source\/main$/, "")
+        const structure = await this.service.objectStructure(base, refresh, version)
+        const metaData = structure.metaData
+        if (!this.structure || metaData["adtcore:changedAt"] >= this.modtime)
+          this.structure = structure
+        return this.structure
+      }
+      this._loadstprom = loader().finally(() => this._loadstprom = undefined)
+    }
+    return this._loadstprom
   }
   async delete(lockId: string, transport = "") {
     return this.service.delete(this.path, lockId, transport)
@@ -211,9 +229,11 @@ export class AbapObjectBase implements AbapObject {
   }
 
   async read() {
+    await this._loadstprom
     if (this.expandable) throw ObjectErrors.notLeaf(this)
     if (!this.supported) return SAPGUIONLY
-    return this.service.getObjectSource(this.contentsPath())
+    const version = this.version === "inactive" ? "inactive" : undefined
+    return this.service.getObjectSource(this.contentsPath(), version)
   }
 
   protected filterInvalid(original: NodeStructure): NodeStructure {

modules/abapObject/src/AOService.ts

@@ -20,6 +20,6 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "abap-adt-api": "^5.2.7"
+    "abap-adt-api": "^6.0.0"
   }
 }

modules/abapObject/src/AbapObject.ts

@@ -2,7 +2,7 @@ import { FileStat, FileType, FileSystemError } from "vscode"
 import { AbapObject } from "../../abapObject"
 import { AbapFsService } from "."
 import { AbapFolder, isAbapFolder } from "./abapFolder"
-import { isCreatableTypeId } from "abap-adt-api"
+import { ObjectVersion, isCreatableTypeId } from "abap-adt-api"
 const tag = Symbol("AbapFile")
 
 interface FileCache {
@@ -17,33 +17,33 @@ export class AbapFile implements FileStat {
     readonly object: AbapObject,
     readonly parent: FileStat,
     private service: AbapFsService
-  ) {}
+  ) { }
   get ctime() {
-    if (this.object.structure)
-      return this.object.structure.metaData["adtcore:createdAt"]
-    return 0
+    return this.object.structure?.metaData["adtcore:createdAt"] ?? 0
   }
   get mtime() {
-    if (this.object.structure)
-      return this.object.structure.metaData["adtcore:changedAt"]
-    return 0
+    return this.object.modtime
   }
 
-  get version() {
-    return this.object.structure?.metaData["adtcore:version"]
+  get version(): ObjectVersion | undefined {
+    return this.object.version
   }
 
   private cache: FileCache | undefined
   private timer: NodeJS.Timeout | undefined
 
   async stat() {
-    if (this.object.supported) await this.object.loadStructure()
+    if (this.object.supported) {
+      await this.object.loadStructure()
+      const inactive = this.object.structure?.links?.find(l => l.rel === "http://www.sap.com/adt/relations/objectstates")
+      if (inactive) await this.object.loadStructure(true, "inactive")
+    }
   }
 
   size = 0
   async read() {
     if (!this.object.structure && this.object.supported)
-      await this.object.loadStructure()
+      await this.stat()
     if (this.cache?.mtime === this.mtime) return this.cache.source
     if (this.timer) clearTimeout(this.timer)
     const source = await this.object.read()