Merge branch 'master' into master-new

# Conflicts:
#	src/app/knowledge-bases/knowledge-bases.component.ts

CHANGELOG.md

@@ -1,5 +1,21 @@
 # tiledesk-dashboard
 
+### 2.4.69
+- Deploys in production
+- Improvements and bug fixing
+
+### 2.4.68
+- Deploys in production
+- Improvements and bug fixing
+
+### 2.4.67
+- Deploys in production
+- Improvements and bug fixing
+
+### 2.4.66
+- Deploys in production
+- Knowledge Bases Improvements 
+
 ### 2.4.65
 - Deploys in production
 - Improvements and bug fixing

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.4.65",
+  "version": "2.4.69",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",

src/app/components/sidebar/sidebar.component.html

@@ -108,6 +108,9 @@
           #tooltip="matTooltip" matTooltipPosition='right' matTooltipHideDelay="100"
           [ngClass]="{'menu_item_active': CONV_DETAIL_ROUTE_IS_ACTIVE }" style="text-align: center; height: 50px !important;">
           <a class="customAncor" routerLink="project/{{ project._id }}/wsrequests" style="height: 40px;">
+
+          <!-- <a class="customAncor" routerLink="project/{{ project._id }}/all-conversations" style="height: 40px;"> -->
+
             <span class="realtime-icon-wpr" style="width: 30px;">
               <svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg"
                 xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 24 24"

src/app/home/home.component.html

@@ -187,7 +187,7 @@
                   <!-- --------------------- -->
                   <!-- From here -->
                   <!-- --------------------- -->
-                  <button mat-menu-item (click)="$event.stopPropagation()">
+                  <!-- <button mat-menu-item (click)="$event.stopPropagation()">
                     <mat-checkbox class="home-settings-checkbox" [checked]="displayConnectWhatsApp"
                       (change)="switchConnectWhatsApp($event.checked)"></mat-checkbox>
                     <span>Connect WhatsApp </span>
@@ -211,7 +211,7 @@
                     <mat-checkbox class="home-settings-checkbox" [checked]="displayCustomizeWidget"
                       (change)="switchCustomizeWidget($event.checked)"></mat-checkbox>
                     <span>Customize widget</span>
-                  </button> 
+                  </button>  -->
 
                   <!-- --------------------- -->
                   <!-- To here -->

src/app/knowledge-bases/knowledge-bases.component.ts

@@ -336,6 +336,7 @@ export class KnowledgeBasesComponent implements OnInit {
     }
     this.openaiService.startScraping(data).subscribe((response: any) => {
       this.logger.log("start scraping response: ", response);
+
       if (response.message && response.message === "Invalid Openai API key") {
         this.notify.showWidgetStyleUpdateNotification("Invalid Openai API key", 4, 'report_problem');
       }

src/app/ws_requests/ws-requests-list/ws-requests-list.component.html

@@ -264,8 +264,6 @@
     <!-- style="padding-left: 10px !important;" -->
     <div class="row">
       <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-
-
         <!-- // --- Test - COUNT OF REQUESTS: ACTIVE, SERVED & UNSERVED as graph -->
         <!-- style="display: none;" -->
         <!-- ---------------------------------------------------------- -->
@@ -334,34 +332,6 @@
           </div> <!-- ./ col-xs-4 -->
 
           <div class="col-xs-7" style="margin-top: 8px;">
-            <!-- <div class="card" style="margin-top:0px"> -->
-            <!-- <div class="card-content"> -->
-            <!-- <div class="requests-chart-container" style="  width: 150px; height: 150px;float: left;"> -->
-            <!-- <canvas id="doughnutChart"></canvas> -->
-
-
-            <!-- // questo è buono -->
-            <!-- <div class="stackedbar-wpr" style="height:80px;">
-              <canvas id="stackedbarChart"></canvas>
-            </div> -->
-
-
-            <!-- <canvas id="MyChart" width="200" height="100"></canvas> -->
-
-            <!-- <div class="grid-container">
-                    <div class="requests-graph">
-                      <div class="graph-wrapper" style=" width:50%;
-                        display:block;
-                        overflow:hidden;
-                        /* margin:0 auto; */
-                        /* padding: 60px 50px; */
-                        max-height: 200px;
-                        background:#fff;
-                        border-radius:4px;">
-                        <canvas id="stacked"></canvas>
-                      </div>
-
-                  </div> -->
 
             <div class="row" style="margin-bottom: 16px;">
               <div class="col-sm-12 filter-convs-title-wpr">
@@ -431,24 +401,25 @@
           <!-- (ROLE_IS_AGENT === false) || (ROLE_IS_AGENT === true && DISPLAY_ALL_TEAMMATES_TO_AGENT) -->
           <!-- the last: ngIf="ROLE_IS_AGENT === false" -->
           <!--  -------------------------------------------------------------------------------------- -->
-          <div class="col-xs-12" style="padding-right: 5px;">
+           <div class="col-xs-12" style="padding-right: 5px;">
             <div class="card card--no-border" style="margin: 5px 0;margin-top: 8px;">
               <div class="card-content"
                 style="padding-top: 0px;padding-left: 0px;padding-right: 0px;padding-bottom: 0px;">
                 <div style="float: left" class="scroll-div-side-btn">
-                  <!-- <button (click)="scrollLeftTeammates()">left</button> -->
+
                   <i class="material-icons" (click)="scrollLeftTeammates()">keyboard_arrow_left</i>
                 </div>
 
                 <div #widgetsContent class="middle-nw">
                   <div class="served-by-conv-a" *ngIf="showRealTeammates === true">
-                    <ng-container class="all-teammates" *ngIf="ONLY_MY_REQUESTS === false">
+                    <!-- *ngIf="ONLY_MY_REQUESTS === false" -->
+                    <ng-container class="all-teammates" >
                       <div class="served-by-conv-b" *ngFor="let agent of projectUserArray">
 
                         <div class="served-by-conv-c tool_tip">
                           <div class="served-by-conv-d">
 
-                            <!-- {{ agent?.id_user?.firstname }} hasImage {{agent.hasImage }} -->
+
                             <div *ngIf="agent?.hasImage" size="42" class="served-by-conv-e">
 
                               <!-- ---------------------------------------- -->
@@ -476,7 +447,6 @@
                             <!-- ---------------------------------------- -->
                             <!-- Usecase No profile image -->
                             <!-- ---------------------------------------- -->
-                            <!-- [ngStyle]="{'background-color': agent?.id_user?.fillColour }"  -->
                             <div *ngIf="!agent?.hasImage" size="42" class="served-by-conv-e">
                               <div class="altenative-conv-avatar-wrap" style="width: 43px; height: 43px; top: -1px;"
                                 [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + agent?.id_user?.fillColour + ')'}">
@@ -485,9 +455,7 @@
                                   {{ agent?.id_user?.fullname_initial }}
                                 </span>
 
-                                <!-- <div class="teammates-no-picture-assigned_requests_count">
-                                {{agent?.number_assigned_requests_rt}}
-                              </div> -->
+
                                 <div class="teammates-no-picture-status-icon"
                                   [ngClass]="{'is-user-online': agent?.user_available_rt === true, 'is-user-offline':agent?.user_available_rt === false   }">
                                 </div>
@@ -509,7 +477,7 @@
                               </span>
 
                             </span>
-                            <!-- <i></i> -->
+
                           </span>
 
                         </div>
@@ -518,25 +486,25 @@
                     <!-- ------------------------------------------------------------------ -->
                     <!-- teammates of the groups to which the current user belongs -->
                     <!-- ------------------------------------------------------------------ -->
-                    <ng-container class="curren-user-teammates" *ngIf="ONLY_MY_REQUESTS === true">
+                    <!-- <ng-container class="curren-user-teammates" *ngIf="ONLY_MY_REQUESTS === true">
                       <div class="served-by-conv-b" *ngFor="let agent of filteredProjectUsersArray">
 
                         <div class="served-by-conv-c tool_tip">
                           <div class="served-by-conv-d">
 
-                            <!-- {{ agent?.id_user?.firstname }} hasImage {{agent.hasImage }} -->
+                           
                             <div *ngIf="agent?.hasImage" size="42" class="served-by-conv-e">
 
-                              <!-- ---------------------------------------- -->
-                              <!-- Usecase Firebase -->
-                              <!-- ---------------------------------------- -->
+                              <!- - ---------------------------------------- - ->
+                              <!- - Usecase Firebase - ->
+                              <!- - ---------------------------------------- - ->
                               <img *ngIf="UPLOAD_ENGINE_IS_FIREBASE"
                                 src="https://firebasestorage.googleapis.com/v0/b/{{storageBucket}}/o/profiles%2F{{agent?.id_user._id}}%2Fphoto.jpg?alt=media"
                                 alt="" onerror="this.src='assets/img/no_image_user.png'">
 
-                              <!-- ---------------------------------------- -->
-                              <!-- Usecase Native -->
-                              <!-- ---------------------------------------- -->
+                              <!- - ---------------------------------------- - ->
+                              <!- - Usecase Native - ->
+                              <!- - ---------------------------------------- - ->
                               <img *ngIf="!UPLOAD_ENGINE_IS_FIREBASE"
                                 src="{{baseUrl}}images?path=uploads%2Fusers%2F{{agent?.id_user._id}}%2Fimages%2Fthumbnails_200_200-photo.jpg"
                                 alt="" onerror="this.src='assets/img/no_image_user.png'">
@@ -546,21 +514,16 @@
                               </div>
                             </div>
 
-                            <!-- ---------------------------------------- -->
-                            <!-- Usecase No profile image -->
-                            <!-- ---------------------------------------- -->
-                            <!-- [ngStyle]="{'background-color': agent?.id_user?.fillColour }"  -->
+                            <!- - ---------------------------------------- - ->
+                            <!- - Usecase No profile image - ->
+                            <!- - ---------------------------------------- - ->
                             <div *ngIf="!agent?.hasImage" size="42" class="served-by-conv-e">
                               <div class="altenative-conv-avatar-wrap" style="width: 43px; height: 43px; top: -1px;"
                                 [ngStyle]="{'background':  'linear-gradient(rgb(255,255,255) -125%,' + agent?.id_user?.fillColour + ')'}">
 
                                 <span class="altenative-conv-avatar" style="line-height: 40px;">
                                   {{ agent?.id_user?.fullname_initial }}
                                 </span>
-
-                                <!-- <div class="teammates-no-picture-assigned_requests_count">
-                                {{agent?.number_assigned_requests_rt}}
-                              </div> -->
                                 <div class="teammates-no-picture-status-icon"
                                   [ngClass]="{'is-user-online': agent?.user_available_rt === true, 'is-user-offline':agent?.user_available_rt === false   }">
                                 </div>
@@ -580,15 +543,11 @@
                               <span *ngIf="agent?.id_user?.lastname">
                                 {{ agent?.id_user?.lastname | slice:0:1 }}.
                               </span>
-
                             </span>
-                            <!-- <i></i> -->
                           </span>
-
                         </div>
                       </div>
-                    </ng-container>
-
+                    </ng-container> -->
                   </div>
 
                   <!-- ---------------------------------------------- -->
@@ -599,10 +558,7 @@
 
                       <div class="served-by-conv-c tool_tip">
                         <div class="served-by-conv-d">
-
-                          <!-- {{ agent?.id_user?.firstname }} hasImage {{agent.hasImage }} -->
                           <div size="42" class="served-by-conv-e">
-                            <!-- {{  agent.hasImage }} -->
                             <div class="skeleton-img"> </div>
 
                           </div>
@@ -611,18 +567,15 @@
                     </div>
                   </div>
                 </div>
-
-
-
                 <div style="float: right" class="scroll-div-side-btn">
-                  <!-- <button (click)="scrollRightTeammates()">right</button> -->
                   <i class="material-icons" (click)="scrollRightTeammates()">keyboard_arrow_right</i>
                 </div>
 
               </div>
             </div>
-          </div>
-          <!-- /.new ********* -->
+          </div>  
+          <!-- .END HERE -->
+
         </div>
       </div>
 

src/app/ws_requests/ws-requests-list/ws-requests-list.component.scss

@@ -720,12 +720,12 @@ $f21blue: #039be5;
 .middle-nw {
   float: left;
   // width: 90%;
-  width: 89%;
+  width: 91%;
   // overflow: auto;
   overflow: hidden;
   /*will change this to hidden later to deny scolling to user*/
   white-space: nowrap;
-  height: 60px;
+  // height: 60px;
 }
 
 // .teammates-with-picture-assigned-requests-count {
@@ -816,7 +816,7 @@ $f21blue: #039be5;
   align-items: center;
   justify-content: center;
   display: flex;
-  margin-top: 4px;
+  margin-top: 9px;
   background: #e4e6eb;
   border-radius: 50%;
   padding: 2px;

src/app/ws_requests/ws-requests-list/ws-requests-list.component.ts

@@ -565,12 +565,13 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
     // createBotsAndUsersArray() {
     this.usersService.getProjectUsersByProjectId().subscribe((_projectUsers: any) => {
       // this.logger.log('% »»» WebSocketJs WF WS-RL - +++ GET PROJECT-USERS ', projectUsers);
-      this.logger.log('[WS-REQUESTS-LIST]- GET PROJECT-USERS RES ', _projectUsers);
+    //  console.log('[WS-REQUESTS-LIST]- GET PROJECT-USERS RES ', _projectUsers);
       if (_projectUsers) {
         this.project_users = _projectUsers
         this.project_user_length = _projectUsers.length;
-        this.logger.log('[WS-REQUESTS-LIST] - GET PROJECT-USERS LENGTH ', this.project_user_length);
-        // this.projectUserArray = _projectUsers;
+        // console.log('[WS-REQUESTS-LIST] - GET PROJECT-USERS LENGTH ', this.project_user_length);
+        // console.log('[WS-REQUESTS-LIST] - GET PROJECT-USERS project_users ', this.project_users);
+        this.projectUserArray = _projectUsers;
 
         _projectUsers.forEach(projectuser => {
 
@@ -593,6 +594,7 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
 
           this.wsRequestsService.subscriptionToWsAllProjectUsersOfTheProject(projectuser.id_user._id);
 
+
           this.listenToAllProjectUsersOfProject$(projectuser)
 
           this.createAgentAvatarInitialsAnfBckgrnd(projectuser.id_user)
@@ -633,7 +635,7 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
         takeUntil(this.unsubscribe$)
       )
       .subscribe((projectUser_from_ws_subscription) => {
-        // console.log('[WS-REQUESTS-LIST] $UBSC TO WS PROJECT-USERS (listenTo) projectUser_from_ws_subscription', projectUser_from_ws_subscription);
+        //  console.log('[WS-REQUESTS-LIST] $UBSC TO WS PROJECT-USERS (listenTo) projectUser_from_ws_subscription', projectUser_from_ws_subscription);
         // this.logger.log('WS-REQUESTS-LIST PROJECT-USERS ', projectuser);
 
         if (projectuser['_id'] === projectUser_from_ws_subscription['_id']) {
@@ -658,8 +660,8 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
         this.projectUserArray = this.tempProjectUserArray;
         // console.log('[WS-REQUESTS-LIST] this.projectUserArray ', this.projectUserArray)
 
-
-        this.getDeptsByProjectId(this.projectUserArray)
+        // COMMENTED NK
+        // this.getDeptsByProjectId(this.projectUserArray)
 
       }, (error) => {
         this.logger.error('[WS-REQUESTS-LIST] $UBSC TO WS PROJECT-USERS - ERROR ', error);
@@ -1103,7 +1105,7 @@ export class WsRequestsListComponent extends WsSharedComponent implements OnInit
   // DEPTS_LAZY: add this 
   addDeptObject(wsrequests) {
     this.departmentService.getDeptsByProjectIdToPromise().then((_departments: any) => {
-      this.logger.log('[WS-REQUESTS-LIST] - (DEPTS_LAZY) GET DEPTS BY PROJECT-ID toPromise', _departments);
+    //  console.log('[WS-REQUESTS-LIST] - (DEPTS_LAZY) GET DEPTS BY PROJECT-ID toPromise', _departments);
 
       wsrequests.forEach(request => {
         if (request.department) {

src/assets/css/demo.scss

@@ -715,7 +715,7 @@ my-app .main-panel .main-content .card {
   padding: 0px;
   display: inline-block;
   flex: 1 1 32px;
-  margin-left: 15px;
+  // margin-left: 15px;
   cursor: pointer;
 }