fix(general): tslint being applied in all sources.

package.json

@@ -66,7 +66,7 @@
     "botbuilder-choices": "4.0.0-preview1.2",
     "botbuilder-dialogs": "4.2.0",
     "botbuilder-prompts": "4.0.0-preview1.2",
-    "botlib": "0.1.19",
+    "botlib": "^0.1.21",
     "chai": "4.2.0",
     "child_process": "^1.0.2",
     "chokidar": "2.1.2",

packages/admin.gbapp/dialogs/AdminDialog.ts

@@ -38,14 +38,14 @@
 
 const UrlJoin = require('url-join');
 import { BotAdapter } from 'botbuilder';
-import { WaterfallDialog, WaterfallStep, WaterfallStepContext } from 'botbuilder-dialogs';
-import { GBMinInstance } from 'botlib';
-import { IGBDialog } from 'botlib';
+import { WaterfallDialog } from 'botbuilder-dialogs';
+import { GBMinInstance, IGBDialog } from 'botlib';
 import { GBConfigService } from '../../core.gbapp/services/GBConfigService';
 import { GBDeployer } from '../../core.gbapp/services/GBDeployer';
 import { GBImporter } from '../../core.gbapp/services/GBImporterService';
 import { GBAdminService } from '../services/GBAdminService';
 import { Messages } from '../strings';
+import { AzureDeployerService } from '../../azuredeployer.gbapp/services/AzureDeployerService';
 
 /**
  * Dialogs for administration tasks.
@@ -79,7 +79,10 @@ export class AdminDialog extends IGBDialog {
   }
 
   public static async rebuildIndexPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) {
-    await deployer.rebuildIndex(min.instance);
+    await deployer.rebuildIndex(
+      min.instance,
+      new AzureDeployerService(deployer).getKBSearchSchema(min.instance.searchIndex)
+    );
   }
 
   public static async addConnectionCommand(min: GBMinInstance, text: any) {
@@ -136,7 +139,7 @@ export class AdminDialog extends IGBDialog {
           if (text === 'quit') {
             return await step.replaceDialog('/');
           } else if (cmdName === 'createFarm') {
-            await AdminDialog.createFarmCommand(text, deployer);
+            await AdminDialog.createFarmCommand(text, min);
 
             return await step.replaceDialog('/admin', { firstRun: false });
           } else if (cmdName === 'deployPackage') {
@@ -224,20 +227,19 @@ export class AdminDialog extends IGBDialog {
 
           await min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
 
-          const url = `https://login.microsoftonline.com/${min.instance.authenticatorTenant}/oauth2/authorize?client_id=${
-            min.instance.authenticatorClientId
-          }&response_type=code&redirect_uri=${UrlJoin(
+          const url = `https://login.microsoftonline.com/${
+            min.instance.authenticatorTenant
+          }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${UrlJoin(
             min.instance.botEndpoint,
             min.instance.botId,
             '/token'
           )}&state=${state}&response_mode=query`;
 
           await step.context.sendActivity(Messages[locale].consent(url));
 
-          return await step.replaceDialog('/ask', {isReturning: true});
+          return await step.replaceDialog('/ask', { isReturning: true });
         }
       ])
     );
   }
-
 }

packages/admin.gbapp/index.ts

@@ -36,15 +36,18 @@
 
 'use strict';
 
-import urlJoin = require('url-join');
-
 import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib';
 import { Sequelize } from 'sequelize-typescript';
 import { AdminDialog } from './dialogs/AdminDialog';
 import { GuaribasAdmin } from './models/AdminModel';
 
 export class GBAdminPackage implements IGBPackage {
-  public sysPackages: IGBPackage[] = null;
+  public sysPackages: IGBPackage[] = undefined;
+
+  public unloadPackage(core: IGBCoreService): void {}
+  public getDialogs(min: GBMinInstance) {}
+  public unloadBot(min: GBMinInstance): void {}
+  public onNewSession(min: GBMinInstance, step: any): void {}
 
   public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {
     core.sequelize.addModels([GuaribasAdmin]);

packages/admin.gbapp/services/GBAdminService.ts

@@ -37,7 +37,7 @@
 'use strict';
 
 import { AuthenticationContext, TokenResponse } from 'adal-node';
-import { IGBCoreService } from 'botlib';
+import { IGBCoreService, IGBAdminService } from 'botlib';
 import { GuaribasInstance } from '../../core.gbapp/models/GBModel';
 import { GuaribasAdmin } from '../models/AdminModel';
 const UrlJoin = require('url-join');
@@ -47,7 +47,7 @@ const PasswordGenerator = require('strict-password-generator').default;
 /**
  * Services for server administration.
  */
-export class GBAdminService {
+export class GBAdminService implements IGBAdminService {
   public static GB_PROMPT: string = 'GeneralBots: ';
   public static masterBotInstanceId = 0;
 
@@ -76,7 +76,7 @@ export class GBAdminService {
     return credentials;
   }
 
-  public static getRndPassword() {
+  public static getRndPassword(): string {
     const passwordGenerator = new PasswordGenerator();
     const options = {
       upperCaseAlpha: true,
@@ -105,7 +105,7 @@ export class GBAdminService {
     return name;
   }
 
-  public async setValue(instanceId: number, key: string, value: string): Promise<GuaribasAdmin> {
+  public async setValue(instanceId: number, key: string, value: string) {
     const options = { where: {} };
     options.where = { key: key };
     let admin = await GuaribasAdmin.findOne(options);
@@ -115,8 +115,7 @@ export class GBAdminService {
     }
     admin.value = value;
     admin.instanceId = instanceId;
-
-    return admin.save();
+    await admin.save();
   }
 
   public async updateSecurityInfo(

packages/analytics.gblib/index.ts

@@ -43,8 +43,8 @@ import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib';
 import { Sequelize } from 'sequelize-typescript';
 
 export class GBAnalyticsPackage implements IGBPackage {
-  public sysPackages: IGBPackage[] = null;
-
+  public sysPackages: IGBPackage[] = undefined;
+  public getDialogs(min: GBMinInstance) {}
   public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {}
   public unloadPackage(core: IGBCoreService): void {}
   public loadBot(min: GBMinInstance): void {}

packages/azuredeployer.gbapp/dialogs/BotFarmDialog.ts

@@ -40,6 +40,7 @@ import { BotAdapter } from 'botbuilder';
 import { GBMinInstance } from 'botlib';
 import { IGBDialog } from 'botlib';
 import { Messages } from '../strings';
+import { WaterfallDialog } from 'botlib/node_modules/botbuilder-dialogs';
 
 export class BotFarmDialog extends IGBDialog {
   /**
@@ -49,21 +50,20 @@ export class BotFarmDialog extends IGBDialog {
    * @param min The minimal bot instance data.
    */
   public static setup(bot: BotAdapter, min: GBMinInstance) {
-    min.dialogs.add('/createBotFarm', [
+    min.dialogs.add(new WaterfallDialog ('/createBotFarm', [
       async step => {
         const locale = step.context.activity.locale;
-        await step.prompt('choicePrompt', Messages[locale].what_about_me, [
-          '1',
-          '2',
-          '3',
-          '4',
-          '5'
-        ]);
+        await step.prompt('choicePrompt', Messages[locale].what_about_me);
+
+        return step.next();
       },
       async step => {
+
         const locale = step.context.activity.locale;
         await step.context.sendActivity(Messages[locale].thanks);
+
+        return step.next();
       }
-    ]);
+    ]));
   }
 }

packages/azuredeployer.gbapp/dialogs/StartDialog.ts

@@ -37,18 +37,18 @@
 'use strict';
 
 import { IGBInstance } from 'botlib';
+import { IGBInstallationDeployer } from 'botlib';
 import * as fs from 'fs';
 import { GBAdminService } from '../../../packages/admin.gbapp/services/GBAdminService';
 import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigService';
-import { AzureDeployerService } from '../services/AzureDeployerService';
-import { GuaribasInstance } from '../../../packages/core.gbapp/models/GBModel';
 const scanf = require('scanf');
 
 /**
  * Handles command-line dialog for getting info for Boot Bot.
  */
 export class StartDialog {
-  public static async createBaseInstance() {
+
+  public static async createBaseInstance(installationDeployer: IGBInstallationDeployer) {
     // No .env so asks for cloud credentials to start a new farm.
 
     if (!fs.existsSync(`.env`)) {
@@ -75,7 +75,7 @@ export class StartDialog {
     // Connects to the cloud and retrieves subscriptions.
 
     const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password);
-    const list = await AzureDeployerService.getSubscriptions(credentials);
+    const list = await installationDeployer.getSubscriptions(credentials);
 
     let subscriptionId: string;
     while (subscriptionId === undefined) {
@@ -104,9 +104,8 @@ export class StartDialog {
 
     process.stdout.write(`${GBAdminService.GB_PROMPT}Thank you. That is enough information.\nNow building farm...`);
 
-
     // Prepares the first instance on bot farm.
-    const instance: IGBInstance = {};
+    const instance = <IGBInstance>{};
 
     instance.botId = botId;
     instance.cloudUsername = username;
@@ -223,7 +222,7 @@ generate manually an App ID and App Secret.\n`
   private static retrieveLocation() {
     let location = GBConfigService.get('CLOUD_LOCATION');
     if (!location) {
-      process.stdout.write("CLOUD_LOCATION (eg. 'westus'):");
+      process.stdout.write('CLOUD_LOCATION (eg. \'westus\'):');
       location = scanf('%s');
     }
 

packages/azuredeployer.gbapp/index.ts

@@ -40,8 +40,8 @@ import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib';
 import { Sequelize } from 'sequelize-typescript';
 
 export class GBAzureDeployerPackage implements IGBPackage {
-
-  public sysPackages: IGBPackage[] = null;
+  public sysPackages: IGBPackage[] = undefined;
+  public getDialogs(min: GBMinInstance) {}
 
   public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {}