fixes #956 story builder: story creation regression - not allowed to update the story

Signed-off-by: Julien Buret <jburet@voyages-sncf.com>

Author: vsct-jburet

bot/admin/web/src/app/bot/story/story-dialog.component.ts

@@ -112,7 +112,7 @@ export class StoryDialogComponent implements OnInit {
       this.dialogRef.close({
         name: this.name.trim(),
         label: !this.label || this.label.trim().length === 0 ? this.name.trim() : this.label.trim(),
-        tag: this.tag.trim(),
+        tag: this.tag ? this.tag.trim() : null,
         intent: this.intent.trim(),
         description: !this.description || this.description.trim().length === 0 ? "" : this.description.trim(),
         category: !this.category || this.category.trim().length === 0 ? "default" : this.category.trim(),

bot/admin/web/src/app/bot/story/story-tag.component.css

@@ -17,3 +17,6 @@
 .story-tag {
   margin-top: 15px;
 }
+.story-select {
+  min-width: 300px;
+}

bot/admin/web/src/app/bot/story/story-tag.component.html

@@ -17,7 +17,8 @@
 <div class="story-tag">
   <mat-form-field>
     <mat-label>Tag :</mat-label>
-    <mat-select [(ngModel)]="selectedTag" (ngModelChange)="selectedTagChange.emit($event)" name="storyTag" disableRipple>
+    <mat-select [(ngModel)]="selectedTag" (ngModelChange)="selectedTagChange.emit($event)" name="storyTag" disableRipple panelClass="story-select">
+      <mat-option value="">None</mat-option>
       <mat-option *ngFor="let tag of tags" [value]="tag.value">
         {{tag.viewValue}}
       </mat-option>

bot/admin/web/src/app/bot/story/story-tag.component.ts

@@ -35,8 +35,8 @@ export class StoryTagComponent {
   selectedTagChange: EventEmitter<String> = new EventEmitter<String>();
 
   tags: Tag[] = [
-    {value: 'ENABLE', viewValue: 'Enable'},
-    {value: 'DISABLE', viewValue: 'Disable'}
+    {value: 'ENABLE', viewValue: 'Enable Tag (triggers a bot activation)'},
+    {value: 'DISABLE', viewValue: 'Disable Tag (triggers a bot deactivation)'}
   ];
 
 }

bot/admin/web/src/app/bot/story/story.component.html

@@ -61,32 +61,26 @@
   <div class="content">
 
     <!-- Settings card -->
-    <mat-card class="answer-card">
-      <mat-card-header>
-        <mat-card-title>Settings</mat-card-title>
-        <mat-card-subtitle>
-          <span class="intent" matTooltip="Main Intent">{{story.intent.name}}</span>
-          <span class="category" matTooltip="Story category">&nbsp;[{{story.category}}]</span>
-        </mat-card-subtitle>
-      </mat-card-header>
-
-      <mat-card-content class="answer-card-content">
-        <!-- Story description -->
-        <div *ngif="story.description">
-          Description : {{story.description}}
-        </div>
-
-        <!-- Story node -->
-        <ul *ngIf="storyNode">
-          <li *ngIf="storyNode.intent">Intent: <b>{{storyNode.intent}}</b></li>
-          <li *ngIf="storyNode.step">Step: <b>{{storyNode.step}}</b></li>
-          <li *ngIf="storyNode.entities.length !==0">Entities: <b>{{storyNode.entities}}</b></li>
-        </ul>
+    <mat-expansion-panel class="answer-card">
+      <mat-expansion-panel-header>
+        <mat-panel-title><span class="intent" matTooltip="Main Intent">{{story.intent.name}}</span><span class="category" matTooltip="Story category">&nbsp;[{{story.category}}]</span></mat-panel-title>
+        <mat-panel-description>
+          <!-- Story description -->
+          <span *ngIf="story.description">
+            {{story.description}}
+          </span>
 
+          <!-- Story node -->
+          <ul *ngIf="storyNode">
+            <li *ngIf="storyNode.intent">Intent: <b>{{storyNode.intent}}</b></li>
+            <li *ngIf="storyNode.step">Step: <b>{{storyNode.step}}</b></li>
+            <li *ngIf="storyNode.entities.length !==0">Entities: <b>{{storyNode.entities}}</b></li>
+          </ul>
+        </mat-panel-description>
+      </mat-expansion-panel-header>
         <!-- Story tag -->
         <tock-story-tag class="story-tag" [(selectedTag)]="storyTag"></tock-story-tag>
-      </mat-card-content>
-    </mat-card>
+    </mat-expansion-panel>
 
     <div *ngIf="!story.hideDetails && !story.isBuiltIn()">
       <!-- Mandatory entities -->

bot/admin/web/src/app/bot/story/story.component.ts

@@ -24,7 +24,7 @@ import {
   StoryStep
 } from "../model/story";
 import {BotService} from "../bot-service";
-import { MatDialog } from "@angular/material/dialog";
+import {MatDialog} from "@angular/material/dialog";
 import {StateService} from "../../core-nlp/state.service";
 import {ConfirmDialogComponent} from "../../shared-nlp/confirm-dialog/confirm-dialog.component";
 import {StoryDialogComponent} from "./story-dialog.component";
@@ -160,7 +160,7 @@ export class StoryComponent implements OnInit, OnChanges {
       if (result && result.name) {
         this.story.storyId = result.name;
         this.story.name = result.label;
-        this.story.tags = [result.tag];
+        this.storyTag = result.tag;
         this.story.intent.name = result.intent;
         this.story.category = result.category;
         this.story.description = result.description;
@@ -173,7 +173,7 @@ export class StoryComponent implements OnInit, OnChanges {
 
   private saveStory(selectStoryAfterSave: boolean) {
     this.story.steps = StoryStep.filterNew(this.story.steps);
-    this.story.tags = [this.storyTag];
+    this.story.tags = !this.storyTag || this.storyTag.length === 0 ? [] : [this.storyTag];
     if (this.story._id) {
       this.bot.saveStory(this.story).subscribe(s => {
         this.story.selected = selectStoryAfterSave;