[Tock studio] Bot and Nlp modules merge (theopenconversationkit#1700)

* Front Bot and Nlp modules merged

* Deleting an unnecessary comment

* [DERCBOT-1099] Remove NLP Module

* Updates, fixes and cleaning after fusion (wip)

* Updates, fixes and cleaning after fusion (wip)

* Updates, fixes and cleaning after fusion (wip)

* Updates, fixes and cleaning after fusion

* Removal of  Docker doc that should not appear in this repo

* Fix dark mode text colors

* Modules and components refacto

* Shared components reorg

---------

Co-authored-by: Mohamed ASSOUKTI <mohamed.assoukti@partnre.com>

Author: rkuffer

bot/admin/web/.gitignore

@@ -8,26 +8,6 @@
 # dependencies
 /node_modules
 
-# nlp admin folders symbolic links for windows
-/src/app/applications
-/src/app/archive
-/src/app/build
-/src/app/core-nlp
-/src/app/entities
-/src/app/inbox
-/src/app/intents
-/src/app/logs
-/src/app/model
-/src/app/nlp-tabs
-/src/app/quality-nlp
-/src/app/scroll
-/src/app/search
-/src/app/sentence-analysis
-/src/app/sentences-scroll
-/src/app/shared-nlp
-/src/app/test-nlp
-/src/app/try
-
 # IDEs and editors
 /.idea
 .project

bot/admin/web/Dockerfile

@@ -2,94 +2,8 @@
 
 ## Local run instructions
 
-Since Tock can be used as a Bot platform or a NLP-only platform,
-the _Bot Admin_ Web frontent extends the _NLP Admin_ Web frontend.
-
-To build/run the frontend, one can:
-
-- merge NLP sources (from NLP assembly) to a temporary folder
-  (namely `target/frontend`),
-- or set symbolic links to NLP sources.
-
-> For CI/release builds, Maven merges sources to a temporary folder.
-
-### Merge sources to target folder
-
-This is how Maven builds the frontend for deployment.
-
-Use Maven to merge sources to the `target/frontend` temporary folder:
-
-```
-mvn generate-resources
-cd target/frontend
-```
-
-Then run NPM to setup and launch [Angular CLI](https://cli.angular.io/):
-
-```
-npm install
-npm install -g @angular/cli
-ng serve
-```
-
-> Don't forget to start the
-> [_Bot Admin_ server](https://github.com/theopenconversationkit/tock/blob/master/.idea/runConfigurations/BotAdmin.xml).
-
-### Symlinks alternative
-
-One can alternatively add these symbolic links to merge sources in `src` folder:
-
-> For unix users, in the current directory (bot/admin/web):
-
-```
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/applications" src/app/applications
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/archive" src/app/archive
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/build" src/app/build
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/core-nlp" src/app/core-nlp
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/entities" src/app/entities
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/inbox" src/app/inbox
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/intents" src/app/intents
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/logs" src/app/logs
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/model" src/app/model
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/nlp-tabs" src/app/nlp-tabs
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/quality-nlp" src/app/quality-nlp
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/scroll" src/app/scroll
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/search" src/app/search
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/sentence-analysis" src/app/sentence-analysis
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/sentences-scroll" src/app/sentences-scroll
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/shared-nlp" src/app/shared-nlp
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/test-nlp" src/app/test-nlp
-ln -s "$(pwd)/../../../nlp/admin/web/src/app/try" src/app/try
-```
-
-> For Windows users, in the current directory (bot/admin/web):
-
-Use the CMD and not PowerShell to execute these commands
-
-```
-mklink /D "src/app/applications" "%cd%/../../../nlp/admin/web/src/app/applications/"
-mklink /D "src/app/archive" "%cd%/../../../nlp/admin/web/src/app/archive/"
-mklink /D "src/app/build" "%cd%/../../../nlp/admin/web/src/app/build/"
-mklink /D "src/app/core-nlp" "%cd%/../../../nlp/admin/web/src/app/core-nlp/"
-mklink /D "src/app/entities" "%cd%/../../../nlp/admin/web/src/app/entities/"
-mklink /D "src/app/inbox" "%cd%/../../../nlp/admin/web/src/app/inbox/"
-mklink /D "src/app/intents" "%cd%/../../../nlp/admin/web/src/app/intents/"
-mklink /D "src/app/logs" "%cd%/../../../nlp/admin/web/src/app/logs/"
-mklink /D "src/app/model" "%cd%/../../../nlp/admin/web/src/app/model/"
-mklink /D "src/app/nlp-tabs" "%cd%/../../../nlp/admin/web/src/app/nlp-tabs/"
-mklink /D "src/app/quality-nlp" "%cd%/../../../nlp/admin/web/src/app/quality-nlp/"
-mklink /D "src/app/scroll" "%cd%/../../../nlp/admin/web/src/app/scroll/"
-mklink /D "src/app/search" "%cd%/../../../nlp/admin/web/src/app/search/"
-mklink /D "src/app/sentence-analysis" "%cd%/../../../nlp/admin/web/src/app/sentence-analysis/"
-mklink /D "src/app/sentences-scroll" "%cd%/../../../nlp/admin/web/src/app/sentences-scroll/"
-mklink /D "src/app/shared-nlp" "%cd%/../../../nlp/admin/web/src/app/shared-nlp/"
-mklink /D "src/app/test-nlp" "%cd%/../../../nlp/admin/web/src/app/test-nlp/"
-mklink /D "src/app/try" "%cd%/../../../nlp/admin/web/src/app/try/"
-```
-
-Then run NPM to setup and launch [Angular CLI](https://cli.angular.io/):
-
 ```
+cd bot/admin/web
 npm install
 npm install -g @angular/cli
 ng serve
@@ -98,17 +12,6 @@ ng serve
 > Don't forget to start the
 > [_Bot Admin_ server](https://github.com/theopenconversationkit/tock/blob/master/.idea/runConfigurations/BotAdmin.xml).
 
-## Package instructions
-
-To build/package the frontend:
-
-```
-mvn install
-```
-
-Maven runs NPM / Angular scripts automatically from merged sources folder. They produce the `web`
-assembly, ie. the deployable _Bot Admin_ frontend application.
-
 ## Troubleshooting
 
 ### Windows setup

bot/admin/web/README.md

@@ -33,16 +33,6 @@
     <project.build.frontend.directory>${project.build.directory}/frontend</project.build.frontend.directory>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>ai.tock</groupId>
-      <artifactId>tock-nlp-admin-web</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <classifier>sources</classifier>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>

bot/admin/web/pom.xml

@@ -20,14 +20,14 @@ import { StateService } from 'src/app/core-nlp/state.service';
 import { BotConfigurationService } from 'src/app/core/bot-configuration.service';
 import { BotApplicationConfiguration, ConnectorType } from 'src/app/core/model/configuration';
 
-import { SelectBotEvent } from '../../shared/select-bot/select-bot.component';
 import { AnalyticsService } from '../analytics.service';
 import { ChartData } from '../chart/ChartData';
 import { DialogFlowRequest } from '../flow/flow';
 import { UserAnalyticsPreferences } from '../preferences/UserAnalyticsPreferences';
 import { UserAnalyticsQueryResult } from '../users/users';
 import { UserFilter } from '../users/users.component';
-import {toISOStringWithoutOffset} from "../../shared/utils";
+import { toISOStringWithoutOffset } from '../../shared/utils';
+import { SelectBotEvent } from '../../shared/components';
 
 @Component({
   selector: 'tock-activity',

bot/admin/web/src/app/analytics/activity/activity.component.ts

@@ -17,13 +17,11 @@
 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { SharedModule } from '../shared-nlp/shared.module';
 import { AnalyticsTabsComponent } from './analytics-tabs.component';
 import { UsersComponent } from './users/users.component';
 import { AnalyticsService } from './analytics.service';
 import { BotSharedModule } from '../shared/bot-shared.module';
 import { BotModule } from '../bot/bot.module';
-import { NlpModule } from '../nlp-tabs/nlp.module';
 import { MomentModule } from 'ngx-moment';
 import { DialogsComponent } from './dialogs/dialogs.component';
 import {
@@ -44,9 +42,11 @@ import {
   NbUserModule,
   NbCalendarRangeModule,
   NbDialogModule,
-  NbRadioModule
+  NbRadioModule,
+  NbToggleModule,
+  NbIconModule
 } from '@nebular/theme';
-import { ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ChartComponent } from './chart/chart.component';
 import { ChartDialogComponent } from './chart-dialog/chart-dialog.component';
 import { ActivityComponent } from './activity/activity.component';
@@ -70,13 +70,12 @@ export function importEcharts() {
   schemas: [NO_ERRORS_SCHEMA],
   imports: [
     CommonModule,
-    SharedModule,
+    FormsModule,
     AnalyticsRoutingModule,
     InfiniteScrollModule,
     MomentModule,
     BotSharedModule,
     BotModule,
-    NlpModule,
     NbRouteTabsetModule,
     NbCheckboxModule,
     NbCardModule,
@@ -96,6 +95,8 @@ export function importEcharts() {
     NbCalendarRangeModule,
     NbDialogModule.forRoot(),
     NbRadioModule,
+    NbToggleModule,
+    NbIconModule,
     NgxEchartsModule.forRoot({
       echarts: importEcharts
     }),

bot/admin/web/src/app/analytics/analytics.module.ts

@@ -20,13 +20,13 @@ import { StateService } from 'src/app/core-nlp/state.service';
 import { BotConfigurationService } from 'src/app/core/bot-configuration.service';
 import { BotApplicationConfiguration, ConnectorType } from 'src/app/core/model/configuration';
 
-import { SelectBotEvent } from '../../shared/select-bot/select-bot.component';
 import { AnalyticsService } from '../analytics.service';
 import { DialogFlowRequest } from '../flow/flow';
 import { UserAnalyticsPreferences } from '../preferences/UserAnalyticsPreferences';
 import { UserAnalyticsQueryResult } from '../users/users';
 import { UserFilter } from '../users/users.component';
-import {toISOStringWithoutOffset} from "../../shared/utils";
+import { toISOStringWithoutOffset } from '../../shared/utils';
+import { SelectBotEvent } from '../../shared/components';
 
 @Component({
   selector: 'tock-behavior',

bot/admin/web/src/app/analytics/behavior/behavior.component.ts

@@ -158,14 +158,6 @@ <h1 *ngIf="total === 0">
           </tock-chat-ui>
         </nb-card-body>
       </nb-card>
-
-      <!-- <tock-display-dialog
-          [dialog]="dialog"
-          [intentsToHide]="filter.intentsToHide"
-        >
-          <div *ngIf="dialog.actions.length === 0">No dialog</div>
-        </tock-display-dialog> -->
-      <p></p>
     </div>
   </div>
 </div>

bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list.component.html

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import { Component, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ViewChild } from '@angular/core';
 import { DialogsListComponent } from './dialogs-list/dialogs-list.component';
 
 @Component({
   selector: 'tock-dialogs',
   templateUrl: './dialogs.component.html',
   styleUrls: ['./dialogs.component.css']
 })
-export class DialogsComponent {
+export class DialogsComponent implements AfterViewInit {
   @ViewChild('dialogsList') dialogsList: DialogsListComponent;
 
   count: string = '';

bot/admin/web/src/app/analytics/dialogs/dialogs.component.ts

@@ -17,7 +17,6 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { BotService } from '../../bot/bot-service';
 import { AnalyticsService } from '../analytics.service';
-import { NlpService } from '../../nlp-tabs/nlp.service';
 import { StateService } from '../../core-nlp/state.service';
 import {
   ApplicationDialogFlow,
@@ -30,13 +29,13 @@ import { BotConfigurationService } from '../../core/bot-configuration.service';
 import { entityColor } from '../../model/nlp';
 import { KeyValue } from '@angular/common';
 import { NodeTransition, NodeTypeFilter, NodeTypeFilters, StoryNode } from './node';
-import { SelectBotEvent } from '../../shared/select-bot/select-bot.component';
 import { AnswerConfigurationType, StoryDefinitionConfiguration, StorySearchQuery, StoryStep } from '../../bot/model/story';
 import { Subscription } from 'rxjs';
 import { NbToastrService } from '@nebular/theme';
 import { ChartData } from '../chart/ChartData';
 import { toISOStringWithoutOffset } from '../../shared/utils';
 import { ChartType } from 'angular-google-charts';
+import { SelectBotEvent } from '../../shared/components';
 
 @Component({
   selector: 'tock-flow',
@@ -182,7 +181,6 @@ export class FlowComponent implements OnInit, OnDestroy {
   };
 
   constructor(
-    private nlp: NlpService,
     public state: StateService,
     private analytics: AnalyticsService,
     private bot: BotService,

bot/admin/web/src/app/analytics/flow/flow.component.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
 import { AnalyticsService } from '../../analytics.service';
 import { RatingReportQueryResult } from './RatingReportQueryResult';
 import { DialogsListComponent } from '../../dialogs/dialogs-list/dialogs-list.component';
@@ -23,7 +23,7 @@ import { DialogsListComponent } from '../../dialogs/dialogs-list/dialogs-list.co
   templateUrl: './satisfaction-details.component.html',
   styleUrls: ['./satisfaction-details.component.css']
 })
-export class SatisfactionDetailsComponent implements OnInit {
+export class SatisfactionDetailsComponent implements OnInit, AfterViewInit {
   loading = false;
 
   count: string = '';

bot/admin/web/src/app/analytics/satisfaction/satisfaction-details/satisfaction-details.component.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { SharedModule } from '../shared-nlp/shared.module';
 import { CommonModule } from '@angular/common';
 import { Injectable, NgModule } from '@angular/core';
 import { ApplicationsComponent } from './applications/applications.component';
@@ -30,11 +29,14 @@ import {
   NbCardModule,
   NbCheckboxModule,
   NbDialogModule,
+  NbIconModule,
+  NbInputModule,
   NbRadioModule,
   NbRouteTabsetModule,
   NbSelectModule,
   NbSpinnerModule,
   NbTabsetModule,
+  NbToggleModule,
   NbTooltipModule
 } from '@nebular/theme';
 import { UserLogsComponent } from './user/user-logs.component';
@@ -48,6 +50,7 @@ import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap';
 import { CreateNamespaceComponent } from './namespace/create-namespace/create-namespace.component';
 import { ApplicationsRoutingModule } from './applications-routing.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { BotSharedModule } from '../shared/bot-shared.module';
 
 @Injectable()
 export class NlpApplicationConfig implements ApplicationConfig {
@@ -60,7 +63,7 @@ export class NlpApplicationConfig implements ApplicationConfig {
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule,
+    BotSharedModule,
     MomentModule,
     ApplicationsRoutingModule,
     NbTabsetModule,
@@ -76,6 +79,9 @@ export class NlpApplicationConfig implements ApplicationConfig {
     NbAccordionModule,
     NbSpinnerModule,
     NbRadioModule,
+    NbIconModule,
+    NbToggleModule,
+    NbInputModule,
     NgJsonEditorModule,
     NbDialogModule.forRoot(),
     NgbPaginationModule,