fix: generate responses

Composer/packages/client/src/recoilModel/atoms/appState.ts

@@ -235,7 +235,9 @@ export const formDialogGenerationProgressingState = atom({
   default: false,
 });
 
-export const formDialogErrorState = atom<(Error & { kind: 'templateFetch' | 'generation' | 'deletion' }) | undefined>({
+export const formDialogErrorState = atom<
+  (Error & { kind: 'templateFetch' | 'generation' | 'deletion'; logs?: string[] }) | undefined
+>({
   key: getFullyQualifiedKey('formDialogError'),
   default: undefined,
 });

Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts

@@ -93,6 +93,7 @@ export const formDialogsDispatcher = () => {
             schemaId,
           }),
           kind: 'generation',
+          logs: ex.data?.logs,
         });
       } finally {
         set(formDialogGenerationProgressingState, false);
@@ -113,8 +114,8 @@ export const formDialogsDispatcher = () => {
           return;
         }
 
-        await httpClient.delete(`/formDialogs/${projectId}/${dialogId}`);
-        await reloadProject(projectId);
+        const response = await httpClient.delete(`/formDialogs/${projectId}/${dialogId}`);
+        await reloadProject(response.data.id);
       } catch (ex) {
         set(formDialogErrorState, {
           ...ex,

Composer/packages/server/src/controllers/formDialog.ts

@@ -67,9 +67,14 @@ const generate = async (req: Request, res: Response) => {
 
     const templatesDirs = await getTemplateDirs();
 
-    await currentProject.generateDialog(name, templatesDirs);
-    const updatedProject = await BotProjectService.getProjectById(projectId, user);
-    res.status(200).json({ id: projectId, ...updatedProject.getProject() });
+    const result = await currentProject.generateDialog(name, templatesDirs);
+
+    if (!result.success) {
+      res.status(500).json({ id: projectId, errors: result.errors });
+      return;
+    }
+
+    res.status(200).json({ id: projectId });
   } else {
     res.status(404).json({
       message: `Could not generate form dialog. Project ${projectId} not found.`,
@@ -91,8 +96,7 @@ const deleteDialog = async (req: Request, res: Response) => {
         throw new Error('root dialog is not allowed to delete');
       }
       await currentProject.deleteFormDialog(dialogId);
-      const updatedProject = await BotProjectService.getProjectById(projectId, user);
-      res.status(200).json({ id: projectId, ...updatedProject.getProject() });
+      res.status(200).json({ id: projectId });
     } catch (e) {
       res.status(400).json({
         message: e.message,

Composer/packages/server/src/models/bot/botProject.ts

@@ -549,15 +549,20 @@ export class BotProject implements IBotProject {
     return qnaEndpointKey;
   };
 
-  public async generateDialog(name: string, templateDirs?: string[]) {
+  public async generateDialog(name: string, templateDirs?: string[]): Promise<{ success: boolean; errors: string[] }> {
     const defaultLocale = this.settings?.defaultLanguage || defaultLanguage;
     const relativePath = defaultFilePath(this.name, defaultLocale, `${name}${FileExtensions.FormDialogSchema}`, {});
     const schemaPath = Path.resolve(this.dir, relativePath);
 
     const dialogPath = defaultFilePath(this.name, defaultLocale, `${name}${FileExtensions.Dialog}`, {});
     const outDir = Path.dirname(Path.resolve(this.dir, dialogPath));
 
+    const errors: string[] = [];
+
     const feedback = (type: FeedbackType, message: string): void => {
+      if (type == FeedbackType.error) {
+        errors.push(message);
+      }
       // eslint-disable-next-line no-console
       console.log(`${type} - ${message}`);
     };
@@ -596,7 +601,7 @@ export class BotProject implements IBotProject {
     // merge - if generated assets should be merged with any user customized assets
     // singleton - if the generated assets should be merged into a single dialog
     // feeback - a callback for status and progress and generation happens
-    await generate(
+    const success = await generate(
       generateParams.schemaPath,
       generateParams.prefix,
       generateParams.outDir,
@@ -608,6 +613,8 @@ export class BotProject implements IBotProject {
       generateParams.singleton,
       generateParams.feedback
     );
+
+    return { success, errors };
   }
 
   public async deleteFormDialog(dialogId: string) {