Merge branch 'CreditMutuelArkea-feature/faq/dercbot-621-merge-managem…

…ent-and-training-in-a-single-main-menu-entry'

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

@@ -92,34 +92,39 @@ export class BotAdminAppComponent implements AuthListener, OnInit, OnDestroy {
         hidden: !this.state.hasRole(UserRole.nlpUser)
       },
       {
-        title: 'Settings',
-        icon: 'settings-outline',
-        link: '/configuration',
-        hidden: !this.state.hasRole(UserRole.admin)
+        title: 'FAQ',
+        icon: 'message-square-outline',
+        hidden: !this.state.hasRole(UserRole.faqBotUser),
+        children: [
+          {
+            link: '/faq/management',
+            title: 'Management',
+            icon: 'book-open-outline'
+          },
+          {
+            link: '/faq/training',
+            title: 'Training',
+            icon: 'checkmark-square-outline'
+          }
+        ]
       },
       {
-        title: 'FAQ Training',
-        icon: {
-          icon: 'school',
-          pack: 'material-icons'
-        },
+        title: 'FAQ training',
+        icon: 'checkmark-square-outline',
         link: '/faq/training',
-        hidden: !this.state.hasRole(UserRole.faqNlpUser)
-      },
-      {
-        title: 'FAQ Management',
-        icon: {
-          icon: 'question_answer',
-          pack: 'material-icons'
-        },
-        link: '/faq/management',
-        hidden: !this.state.hasRole(UserRole.faqBotUser)
+        hidden: !this.state.hasRole(UserRole.faqNlpUser) || this.state.hasRole(UserRole.faqBotUser)
       },
       {
         title: 'Answers',
         icon: 'color-palette-outline',
         link: '/build/i18n',
         hidden: this.state.hasRole(UserRole.botUser) || !this.state.hasRole(UserRole.faqBotUser)
+      },
+      {
+        title: 'Settings',
+        icon: 'settings-outline',
+        link: '/configuration',
+        hidden: !this.state.hasRole(UserRole.admin)
       }
     ];
   }

bot/admin/web/src/app/faq/faq-management/faq-management-filters/faq-management-filters.component.html

@@ -1,18 +1,4 @@
 <nb-card class="mb-0">
-  <nb-card-header class="d-flex align-items-center justify-content-between">
-    Filters
-    <button
-      *ngIf="isFiltered"
-      nbButton
-      nbTooltip="Clear all filters"
-      ghost
-      shape="round"
-      (click)="clearFilters()"
-      data-testid="clear-button"
-    >
-      <nb-icon icon="close-outline"></nb-icon>
-    </button>
-  </nb-card-header>
   <nb-card-body>
     <form
       class="grid"
@@ -27,7 +13,7 @@
           nbInput
           fullWidth
           fieldSize="medium"
-          placeholder="Search"
+          placeholder="Search a faq"
           type="text"
           formControlName="search"
         />
@@ -56,6 +42,18 @@
       >
         Active
       </nb-checkbox>
+
+      <button
+        *ngIf="isFiltered"
+        nbButton
+        nbTooltip="Clear all filters"
+        ghost
+        shape="round"
+        (click)="clearFilters()"
+        data-testid="clear-button"
+      >
+        <nb-icon icon="close-outline"></nb-icon>
+      </button>
     </form>
   </nb-card-body>
 </nb-card>

bot/admin/web/src/app/faq/faq-management/faq-management-filters/faq-management-filters.component.scss

@@ -9,6 +9,12 @@
 
 @include media-breakpoint-up(sm) {
   .grid {
-    grid-template-columns: repeat(auto-fit, minmax(15rem, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr));
+  }
+}
+
+@include media-breakpoint-up(md) {
+  .grid {
+    grid-template-columns: 1fr 1fr 1fr 3rem;
   }
 }

bot/admin/web/src/app/faq/faq-management/faq-management.component.html

@@ -1,4 +1,4 @@
-<div class="d-flex flex-wrap mb-2">
+<div class="d-flex flex-wrap mt-3 mb-2">
   <h1 class="flex-grow-1">FAQ Management</h1>
 
   <section class="grid-actions">

bot/admin/web/src/app/faq/faq-routing.module.ts

@@ -3,24 +3,27 @@ import { RouterModule, Routes } from '@angular/router';
 import { ApplicationResolver } from '../core-nlp/application.resolver';
 import { AuthGuard } from '../core-nlp/auth/auth.guard';
 import { FaqManagementComponent } from './faq-management/faq-management.component';
+import { FaqTabsComponent } from './faq-tabs/faq-tabs.component';
 import { FaqTrainingComponent } from './faq-training/faq-training.component';
 
 const routes: Routes = [
   {
-    path: 'training',
-    component: FaqTrainingComponent,
+    path: '',
     canActivate: [AuthGuard],
+    component: FaqTabsComponent,
     resolve: {
       application: ApplicationResolver
-    }
-  },
-  {
-    path: 'management',
-    component: FaqManagementComponent,
-    canActivate: [AuthGuard],
-    resolve: {
-      application: ApplicationResolver
-    }
+    },
+    children: [
+      {
+        path: 'training',
+        component: FaqTrainingComponent
+      },
+      {
+        path: 'management',
+        component: FaqManagementComponent
+      }
+    ]
   }
 ];
 

bot/admin/web/src/app/faq/faq-tabs/faq-tabs.component.html

@@ -0,0 +1 @@
+<nb-route-tabset [tabs]="tabLinks"></nb-route-tabset>

bot/admin/web/src/app/faq/faq-tabs/faq-tabs.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FaqTabsComponent } from './faq-tabs.component';
+
+describe('FaqTabsComponent', () => {
+  let component: FaqTabsComponent;
+  let fixture: ComponentFixture<FaqTabsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FaqTabsComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FaqTabsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

bot/admin/web/src/app/faq/faq-tabs/faq-tabs.component.ts

@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { StateService } from '../../core-nlp/state.service';
+import { UserRole } from '../../model/auth';
+import { TabLink } from '../../shared/utils';
+
+const managementTab = new TabLink('management', 'Faq management', 'book-open-outline');
+const trainingTab = new TabLink('training', 'Faq training', 'checkmark-square-outline');
+
+@Component({
+  selector: 'tock-faq-tabs',
+  templateUrl: './faq-tabs.component.html',
+  styleUrls: ['./faq-tabs.component.scss']
+})
+export class FaqTabsComponent implements OnInit {
+  UserRole = UserRole;
+  tabLinks = [];
+
+  constructor(private router: Router, public state: StateService) {}
+
+  ngOnInit() {
+    if (this.state.hasRole(UserRole.faqBotUser)) this.tabLinks.push(managementTab);
+    if (this.state.hasRole(UserRole.faqNlpUser)) this.tabLinks.push(trainingTab);
+  }
+}

bot/admin/web/src/app/faq/faq-training/faq-training-filters/faq-training-filters.component.html

@@ -1,5 +1,4 @@
 <nb-card class="mb-0">
-  <nb-card-header>Filters</nb-card-header>
   <nb-card-body>
     <form
       class="grid"
@@ -14,7 +13,7 @@
           nbInput
           fullWidth
           fieldSize="medium"
-          placeholder="Search"
+          placeholder="Search a sentence"
           type="text"
           formControlName="search"
         />

bot/admin/web/src/app/faq/faq-training/faq-training.component.html

@@ -1,4 +1,4 @@
-<header class="mb-2">
+<header class="mt-3 mb-2">
   <h1>FAQ Training</h1>
 </header>
 

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

@@ -12,6 +12,7 @@ import {
   NbFormFieldModule,
   NbIconModule,
   NbInputModule,
+  NbRouteTabsetModule,
   NbSelectModule,
   NbSpinnerModule,
   NbTabsetModule,
@@ -36,6 +37,7 @@ import { FaqManagementSettingsComponent } from './faq-management/faq-management-
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { FaqService } from './services/faq.service';
 import { BotAnalyticsModule } from '../analytics/analytics.module';
+import { FaqTabsComponent } from './faq-tabs/faq-tabs.component';
 
 @NgModule({
   imports: [
@@ -62,7 +64,8 @@ import { BotAnalyticsModule } from '../analytics/analytics.module';
     NbAlertModule,
     NbChatModule,
     InfiniteScrollModule,
-    BotAnalyticsModule
+    BotAnalyticsModule,
+    NbRouteTabsetModule
   ],
   declarations: [
     FaqManagementComponent,
@@ -73,7 +76,8 @@ import { BotAnalyticsModule } from '../analytics/analytics.module';
     FaqManagementFiltersComponent,
     FaqManagementListComponent,
     FaqManagementEditComponent,
-    FaqManagementSettingsComponent
+    FaqManagementSettingsComponent,
+    FaqTabsComponent
   ],
   exports: [],
   providers: [FaqService]