Promise has sequenced import tasks in .gbkb.

deploy/kb.gbapp/services/KBService.ts

@@ -359,17 +359,14 @@ export class KBService {
     instanceId: number,
     packageId: number
   ): Promise<GuaribasQuestion[]> {
-    return new Promise<GuaribasQuestion[]>(
-      (resolve, reject) => {
 
     let file = Fs.readFileSync(filePath, "UCS-2")
     let opts = {
       delimiter: "\t"
     }
 
-        parse(file, opts).then((data) => {
-          return asyncPromise.eachSeries(data, line => {
-            return new Promise((resolve, reject) => {
+    let data = await parse(file, opts);
+    return asyncPromise.eachSeries(data, async line => {
 
       // Extracts values from columns in the current line.
 
@@ -420,13 +417,13 @@ export class KBService {
 
         // Now with all the data ready, creates entities in the store.
 
-                GuaribasAnswer.create({
+        let answer1 = await GuaribasAnswer.create({
           instanceId: instanceId,
           content: answer,
           format: format,
           packageId: packageId
-                }).then((answer: GuaribasAnswer) => {
-                  return GuaribasQuestion.create({
+        });
+        await GuaribasQuestion.create({
           from: from,
           to: to,
           subject1: subject1,
@@ -435,23 +432,19 @@ export class KBService {
           subject4: subject4,
           content: question,
           instanceId: instanceId,
-                    answerId: answer.answerId,
+          answerId: answer1.answerId,
           packageId: packageId
-                  }).then((question: GuaribasQuestion) => {
-                    resolve(question)
-                  }).error(reason => reject(reason))
-                }).error(reason => reject(reason))
+        });
+        logger.info(`Question created: ${question.questionId}`)
+        return Promise.resolve(question)
 
       } else {
-                let msg = `[GBImporter] Missing header in file: ${filePath}`;
-                logger.info(msg)
-                resolve(null)
-              }
-            })
-          })
-        }).error(reason => reject(reason))
 
-        resolve(null)
+        // Skips the header.
+
+        return Promise.resolve(null)
+      }
+
     })
   }
 
@@ -540,17 +533,14 @@ export class KBService {
     packageId: number,
     filename: string,
     instance: IGBInstance
-  ): Promise<GuaribasQuestion[]> {
-    return new Promise<GuaribasQuestion[]>(
-      (resolve, reject) => {
-
+  ): Promise<any> {
     var subjects = JSON.parse(Fs.readFileSync(filename, "utf8"))
 
-        const doIt = (subjects: GuaribasSubject[], parentSubjectId: number) =>
-          new Promise((resolve, reject) => {
-            asyncPromise.eachSeries(subjects, item => {
+    const doIt = async (subjects: GuaribasSubject[], parentSubjectId: number) => {
+      return asyncPromise.eachSeries(subjects, async item => {
         let mediaFilename = item.id + ".png"
-              GuaribasSubject.create({
+
+        let value = await GuaribasSubject.create({
           internalId: item.id,
           parentSubjectId: parentSubjectId,
           instanceId: instance.instanceId,
@@ -559,19 +549,21 @@ export class KBService {
           title: item.title,
           description: item.description,
           packageId: packageId
-              }).then((value: any) => {
-                if (item.children) {
-                  doIt(item.children, value.subjectId)
-                }
-              })
-            })
-          })
+        });
+
+        if (item.children) {
+          return Promise.resolve(doIt(item.children, value.subjectId))
+        }
+        else {
+          return Promise.resolve(item);
+        }
 
-        doIt(subjects.children, null)
-        resolve()
       })
     }
 
+    return doIt(subjects.children, null)
+  }
+
   undeployKbFromStorage(
     instance: IGBInstance,
     packageId: number
@@ -607,7 +599,7 @@ export class KBService {
   async deployKb(core: IGBCoreService, deployer: GBDeployer, localPath: string) {
     let packageType = Path.extname(localPath)
     let packageName = Path.basename(localPath)
-    logger.info("[GBDeployer] Opening package: ", packageName)
+    logger.info("[GBDeployer] Opening package: ", localPath)
     let packageObject = JSON.parse(
       Fs.readFileSync(UrlJoin(localPath, "package.json"), "utf8")
     )