Skip to content

Commit

Permalink
Merge branch 'master-PRE' into features/ANALYTICS-FIX-PRE
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
#	src/app/analytics/analytics.module.ts
#	src/app/analytics/metrics/tags-analytics/tags-analytics.component.html
#	src/app/analytics/metrics/tags-analytics/tags-analytics.component.ts
#	src/app/app.component.ts
#	src/app/components/navbar/navbar.component.ts
#	src/app/home/home.component.ts
#	src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html
#	src/assets/css/demo.scss
#	src/assets/i18n/ar.json
#	src/assets/i18n/az.json
#	src/assets/i18n/de.json
#	src/assets/i18n/en.json
#	src/assets/i18n/es.json
#	src/assets/i18n/fr.json
#	src/assets/i18n/it.json
#	src/assets/i18n/kk.json
#	src/assets/i18n/pt.json
#	src/assets/i18n/ru.json
#	src/assets/i18n/sr.json
#	src/assets/i18n/sv.json
#	src/assets/i18n/tr.json
#	src/assets/i18n/uk.json
#	src/assets/i18n/uz.json
  • Loading branch information
Nicola Lanzilotto committed Dec 31, 2024
2 parents a81ddc7 + 763975a commit a2c0057
Show file tree
Hide file tree
Showing 134 changed files with 3,115 additions and 3,223 deletions.
136 changes: 135 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,42 @@
- Adds the ability to filter by custom range the tag graph
- Allows to search for conversations by tags not present in the tag list on the "History" page

### 2.7.54
- Fixes the bug: Knowledge base table update date is incorrect

### 2.7.53
- Minor improvements

### 2.7.52
- Improves KB table

### 2.7.51
- Adds the ability to filter by custom range the tag graph

### 2.7.50-rc2
- Fixes the bug: voice quota limit is not calculated correctly

### 2.7.50-rc1
- Adds the ability to select the refresh rate for URL(s) type contents

### 2.7.49
- Improves the conversations graph and analytics overview on the home page

### 2.7.49-rc1
- Adds voice quota usage count

### 2.7.48
- Implements a widget to notify customers about Tiledesk updates

### 2.7.48-rc1
- Implements a widget to notify customers about Tiledesk updates

### 2.7.47
- Fixes the bug: Knowledge Base menu item displays with a delay

### 2.7.47-rc1
- Fixes the bug: Knowledge Base menu item displays with a delay

### 2.7.46
- Adds in Analytics > Metrics the conversations tags graph
- Improves the UI of the sidebar
Expand All @@ -30,6 +54,21 @@
- Adds in Analytics > Metrics the conversations tags graph
- Improves the UI of the sidebar

### 2.7.46-rc5
- Bug fixing

### 2.7.46-rc4
- Improves remove conversation tag method

### 2.7.46-rc3
- Sends a "post" message to the parent when the user resolves a conversation

### 2.7.46-rc2
- Adds in Analytics > Metrics the conversations tags graph

### 2.7.46-rc1
- Improves the add FAQs dialog window

### 2.7.45
- Improves the app store

Expand All @@ -40,12 +79,30 @@
### 2.7.43
- Adds the "Twilio voice" integration

### 2.7.43-rc1
- Refactors dashboard UI

### 2.7.42
- Adds the ability to add the webhook subscriptions "Request Abandoned" and "Request Fully Abandoned"

### 2.7.41
- Fixes the bug: onboarding content is not visible on small height screens

### 2.7.41-rc5
- Refactors dashboard UI (work in progress)

### 2.7.41-rc4
- Fixes bugs on "Twilio voice" integration

### 2.7.41-rc3
- Improves the "Twilio voice" integration

### 2.7.41-rc2
- Adds the "Twilio voice" integration

### 2.7.41-rc1
- Adds the ability to add the webhook subscriptions "Request Abandoned" and "Request Fully Abandoned"

### 2.7.40
- Minor improvements and bug fixing

Expand All @@ -61,6 +118,9 @@
### 2.7.37
- Adds checks to validate Widget footer branding

### 2.7.38-rc2
- Fix chatbot import validation from json

### 2.7.36
- Adds the ability to filter for abandoned conversations in the "Non-real-time conversations" page
- Adds "Guard Role"
Expand Down Expand Up @@ -104,7 +164,24 @@
### 2.7.33
- Adds, on the History page, the ability to filter by conversation duration

### 2.7.32
### 2.7.34-rc4
- Refactors table in Monitor page
- Improves handling of alert windows display

### 2.7.34-rc3
- AI settings and KB preview bug fixing

### 2.7.34-rc2
- Minor improvements

### 2.7.34-rc1
- Adds the ability to select the indexing type for Knowledge Base URL contents
- Adds to AI models used by knowledge bases the ability to add an advanced context and to visualize the contents sources

### 2.7.33-rc1
- Adds, on the History page, the ability to filter by conversation duration

### 2.7.32-rc1
- Moves the menu item "Apps" from the sidebar to the setting sidebar

### 2.7.31
Expand Down Expand Up @@ -149,9 +226,15 @@
- Adds the ability to select the launch block when a conversation is manually assigned to a chatbot
- Improves the method to get the number of conversations in the monitor page

### 2.7.19-rc1
- Adds the ability to select the launch block when a conversation is manually assigned to a chatbot

### 2.7.18
- Minor improvements and bug fixing

### 2.7.18-rc1
- Improves the method to get the number of conversations in the monitor page

### 2.7.17
- Removes the ability to customize the quotas email template
- Implements the icons for the SMS channel
Expand Down Expand Up @@ -200,6 +283,9 @@
- Deploys in production
- Adds the knowledge base walkthrough on the knowledge base page

### 2.7.7-rc1
- Adds the knowledge base walkthrough on the knowledge base page

### 2.7.6
- Deploys in production
- Adds a warning banner to the home page that displays when the user has used up one or more of his monthly resources
Expand All @@ -211,10 +297,21 @@
### 2.7.4
- Added Time Slots in Operating Hours page

### 2.7.4-rc1
- Fix saving operation hours bug

### 2.7.3
- Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
- Improves the knowledge base page

### 2.7.3-rc2
- Adds the ability, during onboarding, to create a chatbot that automatically answers questions based on the contents of the Knowledge Base
- Improves the knowledge base page
- Improves time slots UI

### 2.7.3-rc1
- Kb onboarding

### 2.7.2
- Deploys in production
- Adds GPT-4o mini language model
Expand All @@ -228,24 +325,61 @@
- Adds the ability to edit the "Quota checkpoint notification" email template
- Adds Twilio SMS channel integration

### 2.6.45-rc2
- Improves time slots UI
- Added translations for time slots

### 2.6.45-rc1
- Added time slots in Operating Hours

### 2.6.44
- Deploys in production
- Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab
- Improvements and bug fixing

### 2.6.44-rc4
- Improvements and bug fixing

### 2.6.44-rc3
- Adds the option "Teammates can only see their own conversations" in the Project Settings > Advanced tab

### 2.6.44-rc2
- Fix vxml voice integration visibility

### 2.6.44-rc1
- Added vxml voice integration
- Added twilio sms integration

### 2.6.43
- Deploys in production
- Improves the quota usage widget
- Minor improvements

### 2.6.43-rc2
- Improves Knowledge Bases page

### 2.6.43-rc1
- Improves quotes widget
- Added voice-vxml and sms-twilio channel in analytics

### 2.6.42
- Deploys in production
- Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page

### 2.6.42-rc1
- Displays all the indexed chunks of a content on the "Manage your Knowledge Bases" page

### 2.6.41
- Deploys in production
- Displays information about the Voice channel

### 2.6.41-rc2
- Adds the Voice Channel integration

### 2.6.41-rc1
- Deploys in production
- Displays information about the Voice channel

### 2.6.40
- Deploys in production
- Displays a dialog box that allows to update the plan when the knowledge bases limit is reached
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions src/app/activities/activities.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ActivitiesService } from './activities-service/activities.service';
import { FormGroup, FormControl } from '@angular/forms';
import { goToCDSVersion } from 'app/utils/util';
import { AppConfigService } from 'app/services/app-config.service';
import { ProjectUser } from 'app/models/project-user';
import { RoleService } from 'app/services/role.service';
@Component({
selector: 'appdashboard-activities',
Expand Down Expand Up @@ -392,12 +393,12 @@ export class ActivitiesComponent implements OnInit, OnDestroy {
activity['closed_by_label'] = storedTeammate['firstname'] + ' ' + storedTeammate['lastname']
} else {
this.usersService.getProjectUserByUserId(activity.actor.id)
.subscribe((projectUser: any) => {
.subscribe((projectUser: ProjectUser) => {

if (projectUser && projectUser[0] && projectUser[0].id_user) {
this.usersLocalDbService.saveMembersInStorage(projectUser[0].id_user._id, projectUser[0].id_user, 'activities');
if (projectUser && projectUser.id_user) {
this.usersLocalDbService.saveMembersInStorage(projectUser.id_user._id, projectUser.id_user, 'activities');
this.logger.log('ActivitiesComponent] GET projectUser by USER-ID projectUser id', projectUser);
activity['closed_by_label'] = projectUser[0].id_user.firstname + ' ' + projectUser[0].id_user.lastname
activity['closed_by_label'] = projectUser.id_user.firstname + ' ' + projectUser.id_user.lastname
} else {

activity['closed_by_label'] = activity.target.object.userFullname
Expand Down
11 changes: 11 additions & 0 deletions src/app/analytics/analytics.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ import { MatIconModule } from '@angular/material/icon';
import { MatButtonModule } from '@angular/material/button';
import { MatNativeDateModule } from '@angular/material/core';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MomentDateAdapter } from '@angular/material-moment-adapter';

// import { MAT_DATE_RANGE_SELECTION_STRATEGY } from '@angular/material/datepicker';
// import { Max7DaysDateRangeSelectionStrategy } from './metrics/tags-analytics/max7-days-date-range-selection-strategy';

const routes: Routes = [
{ path: "", component: AnalyticsComponent},
Expand Down Expand Up @@ -66,7 +70,14 @@ const routes: Routes = [
MatButtonModule,
MatNativeDateModule,
MatProgressSpinnerModule
// MomentDateAdapter
],
// providers: [
// {
// provide: MAT_DATE_RANGE_SELECTION_STRATEGY,
// useClass: Max7DaysDateRangeSelectionStrategy,
// },
// ],
exports: [
RouterModule
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ export class TagsAnalyticsComponent implements OnInit {

getUserChartTypePreference(currentUserId: string) {
let storedChartTypeUserPreference = localStorage.getItem(`chartStackedColumns-${currentUserId}`)
this.logger.log('[TAG-ANALYTICS] STORED CHART TYPE PREFERENCE', storedChartTypeUserPreference)
console.log('[TAG-ANALYTICS] STORED CHART TYPE PREFERENCE', storedChartTypeUserPreference)
if (!storedChartTypeUserPreference) {
this.chartStackedColumns = true;
this.chartBasicColumns = false;
this.logger.log('[TAG-ANALYTICS] NO STORED CHART TYPE PREFERENCE chartStackedColumns', this.chartStackedColumns, 'chartBasicColumns ', this.chartBasicColumns)
console.log('[TAG-ANALYTICS] NO STORED CHART TYPE PREFERENCE chartStackedColumns', this.chartStackedColumns, 'chartBasicColumns ', this.chartBasicColumns)
} else {
if (storedChartTypeUserPreference === 'false') {
this.chartStackedColumns = false;
Expand Down
19 changes: 8 additions & 11 deletions src/app/app-store/app-store.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import { PricingBaseComponent } from 'app/pricing/pricing-base/pricing-base.comp
import { FaqKbService } from 'app/services/faq-kb.service';
import { ChatbotModalComponent } from 'app/bots/bots-list/chatbot-modal/chatbot-modal.component';
import { MatDialog } from '@angular/material/dialog';
// const swal = require('sweetalert');
import { ProjectUser } from 'app/models/project-user';
const swal = require('sweetalert');
const Swal = require('sweetalert2')
@Component({
selector: 'appdashboard-app-store',
Expand Down Expand Up @@ -269,16 +270,12 @@ export class AppStoreComponent extends PricingBaseComponent implements OnInit, O
}

getProjectUserRole() {
this.usersService.project_user_role_bs
.pipe(
takeUntil(this.unsubscribe$)
)
.subscribe((user_role) => {
this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', user_role);
if (user_role) {
this.USER_ROLE = user_role;
}
});
this.usersService.projectUser_bs.pipe(takeUntil(this.unsubscribe$)).subscribe((projectUser: ProjectUser) => {
this.logger.log('[APP-STORE] - GET PROJECT-USER ROLE ', projectUser);
if (projectUser) {
this.USER_ROLE = projectUser.role;
}
});
}


Expand Down
1 change: 1 addition & 0 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
// this.current_selected_prjct_user = projects.find(prj => prj.id_project.id === project._id);
// this.logger.log('[APP-COMPONENT] current_selected_prjct_user ', this.current_selected_prjct_user)


// this.USER_ROLE = this.current_selected_prjct_user.role
// this.logger.log('[APP-COMPONENT] USER_ROLE ', this.USER_ROLE)
// }
Expand Down
3 changes: 1 addition & 2 deletions src/app/app.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Routes, RouterModule } from '@angular/router';
import { UserProfileComponent } from './user-profile/user-profile.component';

import { AuthGuard } from './core/auth.guard';
import { AdminGuard } from './core/admin.guard';
import { ProjectProfileGuard } from './core/project-profile.guard';
import { PendingChangesGuard } from './core/pending-changes.guard';
import { CoreModule } from './core/core.module';
Expand Down Expand Up @@ -1289,6 +1288,6 @@ const routes: Routes = [
RouterModule.forRoot(routes)
],
exports: [RouterModule],
providers: [AuthGuard, AdminGuard, ProjectProfileGuard, RoleGuard]
providers: [AuthGuard, ProjectProfileGuard, PendingChangesGuard]
})
export class AppRoutingModule { }
Loading

0 comments on commit a2c0057

Please sign in to comment.