From c239cfec623c0f6ddd8c533d62b6cba1b2dd584c Mon Sep 17 00:00:00 2001
From: franck <franck.petretto@atos.net>
Date: Thu, 4 Apr 2024 11:49:16 +0200
Subject: [PATCH] fix recover <=> creatid switch

---
 src/services.ts | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/services.ts b/src/services.ts
index 7d11b65..685d41d 100644
--- a/src/services.ts
+++ b/src/services.ts
@@ -63,7 +63,7 @@ class Services {
         await services.injectHtml('CREATE_ID');
         services.attachSubmitListener("form4nk", (event) => services.createId(event));
         services.attachClickListener("displayrecover", services.displayRecover);
-        services.displayProcess();
+        await services.displayProcess();
     }
 
     public async createId(event: Event): Promise<void> {
@@ -102,12 +102,12 @@ class Services {
 
     public async displayRecover(): Promise<void> {
         const services = await Services.getInstance();
-        services.injectHtml('RECOVER');
+        await services.injectHtml('RECOVER');
         services.attachSubmitListener("form4nk", services.recover);
         services.attachClickListener("displaycreateid", services.displayCreateId);
         services.attachClickListener("displayrevoke", services.displayRevoke);
         services.attachClickListener("submitButtonRevoke", services.revoke);
-        services.displayProcess();
+        await services.displayProcess();
     }
 
     public async recover(event: Event) {
@@ -133,10 +133,11 @@ class Services {
     }
 
     public async displayRevokeImage(): Promise<void> {
-        Services.instance.injectHtml('REVOKE_IMAGE');
-        Services.instance.attachClickListener("displayupdateanid", Services.instance.displayUpdateAnId);
+        const services = await Services.getInstance();
+        await services.injectHtml('REVOKE_IMAGE');
+        services.attachClickListener("displayupdateanid", services.displayUpdateAnId);
 
-        let imageBytes = await Services.instance.getRecoverImage('assets/4nk_revoke.jpg');
+        let imageBytes = await services.getRecoverImage('assets/4nk_revoke.jpg');
         if (imageBytes != null) {
             let blob = new Blob([imageBytes], {type: 'image/png'});
             var elem = document.getElementById("revoke") as HTMLAnchorElement;
@@ -162,9 +163,10 @@ class Services {
     }
 
     public async displayRevoke(): Promise<void> {
-        Services.instance.injectHtml('REVOKE');
-        Services.instance.attachClickListener("displayrecover", Services.instance.displayRecover);
-        Services.instance.attachSubmitListener("form4nk", Services.instance.revoke);
+        const services = await Services.getInstance();
+        services.injectHtml('REVOKE');
+        services.attachClickListener("displayrecover", Services.instance.displayRecover);
+        services.attachSubmitListener("form4nk", Services.instance.revoke);
     }
 
     public async revoke(event: Event): Promise<void> {
@@ -175,12 +177,14 @@ class Services {
     }
 
     public async displayUpdateAnId() {
-        console.log("JS displayUpdateAnId process : "+Services.instance.current_process);
+        const services = await Services.getInstance();
+
+        console.log("JS displayUpdateAnId process : "+services.current_process);
         let body = "";
         let style = "";
         let script = "";
         try {
-            const processObject = await Services.instance.getProcessByName(Services.instance.current_process!);
+            const processObject = await services.getProcessByName(Services.instance.current_process!);
             if (processObject) {
                 body = processObject.html;
                 style = processObject.style;
@@ -190,8 +194,8 @@ class Services {
             console.error("Failed to retrieve process with Error:", error);
         }
 
-        Services.instance.injectUpdateAnIdHtml(body, style, script);
-        Services.instance.attachSubmitListener("form4nk", Services.instance.updateAnId);
+        services.injectUpdateAnIdHtml(body, style, script);
+        services.attachSubmitListener("form4nk", services.updateAnId);
     }
 
     public injectUpdateAnIdHtml(bodyToInject: string, styleToInject: string, scriptToInject: string) {
@@ -237,7 +241,7 @@ class Services {
         const selectProcess = document.getElementById("selectProcess");
         if (selectProcess) {
             processList.forEach((process) => {
-                let child = new Option(process.id.toString(), process.id.toString());
+                let child = new Option(process.name, process.name);
                 if (!selectProcess.contains(child)) {
                     selectProcess.appendChild(child);
                 }
@@ -285,11 +289,11 @@ class Services {
     }
 
     public async getProcessByName(name: string): Promise<Process | null> {
-        console.error('getProcessByName name: '+name);
+        console.log('getProcessByName name: '+name);
         const indexedDB = await IndexedDB.getInstance();
         const db = indexedDB.getDb();
         const process = await indexedDB.getFirstMatchWithIndex<Process>(db, indexedDB.getStoreList().AnkProcess, 'by_name', name);
-        console.error('getProcessByName process: '+process);
+        console.log('getProcessByName process: '+process);
 
         return process;
     }