From c7a7921739358f175b1b22ff75c774aceed6924d Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Fri, 23 Feb 2024 17:28:58 +0100 Subject: [PATCH 01/35] kb list width infinite scroll --- src/app/chatbot-design-studio/utils.ts | 1 + .../knowledge-bases.component.html | 6 +- .../knowledge-bases.component.ts | 67 ++++++-- .../knowledge-base-table.component.html | 135 ++++++++++----- .../knowledge-base-table.component.scss | 11 ++ .../knowledge-base-table.component.ts | 159 +++++++++++------- src/app/utils/util.ts | 10 +- 7 files changed, 265 insertions(+), 124 deletions(-) diff --git a/src/app/chatbot-design-studio/utils.ts b/src/app/chatbot-design-studio/utils.ts index 6df1db856a69..5f61285e0704 100644 --- a/src/app/chatbot-design-studio/utils.ts +++ b/src/app/chatbot-design-studio/utils.ts @@ -315,6 +315,7 @@ export function patchActionId(action) { return action; } + // export function retriveListOfVariables(intents: Array) { // variableList.userDefined = [] // intents.forEach(intent => { diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index cbe46161b11d..a99a9956f07f 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -50,13 +50,15 @@ diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 02388e8cf3a3..4e994e178197 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -14,6 +14,8 @@ import { TranslateService } from '@ngx-translate/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { FaqKbService } from 'app/services/faq-kb.service'; +import { KB_DEFAULT_PARAMS } from 'app/utils/util'; + //import { Router } from '@angular/router'; @Component({ @@ -56,17 +58,12 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { kbFormContent: FormGroup; kbs: any; - kbsList = []; + kbsList: Array; kbsListCount: number = 0; refreshKbsList: boolean = true; + numberPage: number = 0; + - // PREVIEW - // question: string = ""; - // answer: string = ""; - // source_url: any; - // searching: boolean = false; - // error_answer: boolean = false; - // show_answer: boolean = false; kbid_selected: any; interval_id; ARE_NEW_KB: boolean @@ -105,11 +102,12 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { ) { } ngOnInit(): void { - + this.kbsList = []; this.getBrowserVersion(); this.getTranslations(); this.listenSidebarIsOpened(); - this.getListOfKb(); + let paramsDefault = "?limit="+KB_DEFAULT_PARAMS.LIMIT+"&page="+KB_DEFAULT_PARAMS.NUMBER_PAGE+"&sortField="+KB_DEFAULT_PARAMS.SORT_FIELD+"&direction="+KB_DEFAULT_PARAMS.DIRECTION; + this.getListOfKb(paramsDefault); this.kbFormUrl = this.createConditionGroupUrl(); this.kbFormContent = this.createConditionGroupContent(); this.trackPage(); @@ -407,17 +405,49 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // }) // } + onLoadPage(searchParams){ + //console.log('onLoadNextPage:',this.kbsList); + this.numberPage = Math.floor(this.kbsList.length/KB_DEFAULT_PARAMS.LIMIT); + let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT+"&page="+this.numberPage; + if(searchParams.status){ + params +="&status="+searchParams.status; + } + if(searchParams.search){ + params +="&search="+searchParams.search; + } + if(searchParams.sortField){ + params +="&sortField="+searchParams.sortField; + } else { + params +="&sortField="+KB_DEFAULT_PARAMS.SORT_FIELD; + } + if(searchParams.direction){ + params +="&direction="+searchParams.direction; + } else { + params +="&direction="+KB_DEFAULT_PARAMS.DIRECTION; + } + this.getListOfKb(params); + } + + onLoadByFilter(searchParams){ + //console.log('onLoadByFilter:',searchParams); + this.numberPage = 0; + this.kbsList = []; + this.onLoadPage(searchParams); + } + + getListOfKb(params?) { //this.showSpinner = true; this.logger.log("[KNOWLEDGE BASES COMP] getListOfKb "); - let paramsDefault = "?limit=10000&page=0"; - let urlParams = params?params:paramsDefault; - this.kbService.getListOfKb(urlParams).subscribe((kbResp:any) => { - this.logger.log("[KNOWLEDGE BASES COMP] get kbList: ", kbResp); - this.kbs = kbResp; - this.kbsList = kbResp.kbs; - //this.kbsListCount = kbList.count; - this.checkAllStatuses(); + this.kbService.getListOfKb(params).subscribe((resp:any) => { + this.logger.log("[KNOWLEDGE BASES COMP] get kbList: ", resp); + this.kbs = resp; + this.kbsListCount = resp.count; + resp.kbs.forEach(kb => { + this.kbsList.push(kb); + }); + console.log('[KNOWLEDGE BASES COMP] get kbList: ', this.kbs, this.kbsList); + // this.checkAllStatuses(); this.refreshKbsList = !this.refreshKbsList; //this.showSpinner = false; }, (error) => { @@ -679,6 +709,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { * */ checkAllStatuses() { + console.log('[KNOWLEDGE BASES COMP] checkAllStatuses: ', this.kbsList); this.kbsList.forEach(kb => { //if(kb.status == -1){ // this.onRunIndexing(kb); diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 5bcc5b7cd99c..3712cc60fec0 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,27 +1,4 @@ -
- - - +
@@ -30,7 +7,7 @@ {{ 'KbPage.TextSearch' | translate }}
- +
@@ -41,9 +18,10 @@
+ (ngModelChange)="onLoadByFilter($event, 'type')"> {{ 'KbPage.StatusAll' | translate }} {{ 'KbPage.StatusNotStarted' | translate }} {{ 'KbPage.StatusStarted' | translate }} @@ -56,9 +34,90 @@
+
+ + + + + + + + + + + + + + + + + + + + + + + + -
{{ 'KbPage.Type' | translate }}{{ 'KbPage.Status' | translate }} + {{'KbPage.CreatedAt' | translate }} + expand_more + expand_less + + {{'Name' | translate }} + expand_more + expand_less + + + +
+ description + link + lan + + + schedule + cached + check + error + + {{ kb.createdAt | amTimeAgo }} + +
{{ kb.name }}
+
{{getSubtitle(kb)}}
+ 		+
+ + + + + +
+
- + + +
+
Loading...
+ +
+ +
+ + + + + {{ 'KbPage.Status' | translate }} - + block - -> schedule cached check @@ -81,13 +140,13 @@ - + {{'KbPage.CreatedAt' | translate }} {{ kb.createdAt | amTimeAgo }} - + {{'Name' | translate }}
{{ kb.name }}
@@ -95,7 +154,7 @@ - + @@ -105,7 +164,7 @@ - +
- \ No newline at end of file + \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index f54abea64378..919bd04083bf 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -128,4 +128,15 @@ table { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} + +.loading-indicator { + text-align: center; + margin: 50px auto 20px; + display: block; +} +.btn-more { + text-align: center; + margin: 50px auto 20px; + display: block; } \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 283aaf36c38e..358580bf48f8 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -1,9 +1,10 @@ -import { Component, Input, OnInit, ViewChild, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { MatTableDataSource } from '@angular/material/table'; -import { MatSort, Sort } from '@angular/material/sort'; -import { MatPaginator, MatPaginatorIntl } from '@angular/material/paginator'; +import { Component, Input, OnInit, ViewChild, Output, EventEmitter, SimpleChanges, ElementRef, HostListener } from '@angular/core'; +// import { MatTableDataSource } from '@angular/material/table'; +// import { MatSort, Sort } from '@angular/material/sort'; +// import { MatPaginator, MatPaginatorIntl } from '@angular/material/paginator'; import { KB, KbSettings } from 'app/models/kbsettings-model'; import {LiveAnnouncer} from '@angular/cdk/a11y'; +import { KB_DEFAULT_PARAMS } from 'app/utils/util'; @Component({ @@ -15,100 +16,130 @@ import {LiveAnnouncer} from '@angular/cdk/a11y'; export class KnowledgeBaseTableComponent implements OnInit { @Input() refresh: boolean; - @Input() kbs: any; + @Input() kbsList: KB[]; + @Input() kbsListCount: number; @Output() openBaseModalDetail = new EventEmitter(); @Output() openBaseModalDelete = new EventEmitter(); @Output() openBaseModalPreview = new EventEmitter(); @Output() runIndexing = new EventEmitter(); - - kbsList: KB[] = []; - kbsListfilterTypeFilter: KB[] = []; - dataSource: MatTableDataSource; - displayedColumns: string[] = ['type','status','createdAt','name','actions']; + @Output() loadPage = new EventEmitter(); + @Output() loadByFilter = new EventEmitter(); + + timeoutId: any; + // kbsListfilterTypeFilter: KB[] = []; filterType: string; filterText: string; + @ViewChild('tableBody') tableBody: ElementRef; - @ViewChild(MatSort) sort: MatSort; - @ViewChild(MatPaginator) paginator: MatPaginator; + directionDesc: number = KB_DEFAULT_PARAMS.DIRECTION; + isLoading: boolean = false; + SHOW_MORE_BTN: boolean = true; + searchParams: any; constructor( - private _liveAnnouncer: LiveAnnouncer, - public pag: MatPaginatorIntl + private _liveAnnouncer: LiveAnnouncer ) { } ngOnInit(): void { this.filterType = ''; this.filterText = ''; - this.pag.firstPageLabel = 'first page:'; - this.pag.itemsPerPageLabel = 'items per page'; - this.pag.lastPageLabel = 'last page'; - this.pag.nextPageLabel = 'next page'; - this.pag.previousPageLabel = 'previous page'; + this.searchParams = { + "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, + "direction": KB_DEFAULT_PARAMS.DIRECTION, + "status": '', + "search": '', + } + } + + // @HostListener('window:scroll', ['$event']) + // onScroll(event) { + // if (this.isScrolledToBottom() && !this.isLoading && this.SHOW_MORE_BTN) { + // //this.loadData(); + // } + // } + + + // onTableScroll(e) { + // console.log('onTableScroll', e); + // const tableViewHeight = e.target.offsetHeight // viewport + // const tableScrollHeight = e.target.scrollHeight // length of all table + // const scrollLocation = e.target.scrollTop; // how far user scrolled + // } + + + + loadMoreData() { + this.isLoading = true; + this.loadPage.emit(this.searchParams); } + // isScrolledToBottom(): boolean { + // const tableBodyElement = this.tableBody.nativeElement; + // return tableBodyElement.scrollTop + tableBodyElement.clientHeight >= tableBodyElement.scrollHeight; + // } + ngOnChanges(changes: SimpleChanges){ - //console.log('ngOnChanges!!!', changes); - //let xx: MatPaginatorIntl; - //xx.itemsPerPageLabel = "xxx"; - if(this.kbs){ - this.kbsList = this.kbs.kbs; - this.dataSource = new MatTableDataSource(this.kbsList); + console.log('ngOnChanges!!!****** ', changes, changes.kbsListCount, this.kbsList.length); + if(changes.kbsListCount && changes.kbsListCount.currentValue) { + if(changes.kbsListCount.currentValue <= this.kbsList.length){ + this.SHOW_MORE_BTN = false; + } else { + this.SHOW_MORE_BTN = true; + } + } + if(changes.refresh){ + this.isLoading = false; } - // if(this.kbsList) { - // this.dataSource = new MatTableDataSource(this.kbsList); - // this.dataSource.sort = this.sort; - // this.dataSource.paginator = this.paginator; - // } } ngAfterViewInit() { //console.log('ngAfterViewInit!!!-->', this.kbsList); - this.dataSource = new MatTableDataSource(this.kbsList); - this.dataSource.sort = this.sort; - this.sort.active = "updatedAt"; - this.sort.direction = "desc" - this.dataSource.sortData(this.dataSource.data, this.sort); - this.dataSource.paginator = this.paginator; + // this.dataSource = new MatTableDataSource(this.kbsList); + // this.dataSource.sort = this.sort; + // this.sort.active = "updatedAt"; + // this.sort.direction = "desc" + // this.dataSource.sortData(this.dataSource.data, this.sort); + // this.dataSource.paginator = this.paginator; // this.paginator.length = this.dataSource.data.length; // this.paginator.pageSize = 20; } - - applyFilter(filterValue: string, column: string) { + onOrderBy(type){ + this.searchParams.sortField = type; + this.searchParams.direction = this.directionDesc; + this.directionDesc = this.directionDesc*-1; + this.isLoading = true; + this.loadByFilter.next(this.searchParams); + } + + onLoadByFilter(filterValue: string, column: string) { + let status = ''; + let search = ''; if( column == 'type'){ - this.filterType = filterValue; + status = filterValue; } else if(column == 'name'){ - this.filterText= filterValue; - } - //console.log('onOptionSelected:: ', filterValue, column, this.filterType, this.filterText); - this.dataSource.filterPredicate = (data: KB, filter: string) => { - if(this.filterType && this.filterText){ - return data.name.toLowerCase().includes(this.filterText) && data.status.toString() === this.filterType; - } - if(this.filterText && this.filterText != ""){ - return data.name.toLowerCase().includes(this.filterText); - } - if(this.filterType && this.filterType != ""){ - return data.status.toString() === this.filterType; - } - return true; - + search = filterValue; } - this.dataSource.filter = filterValue; - if (this.dataSource.paginator) { - this.dataSource.paginator.firstPage(); + this.searchParams.status = status; + this.searchParams.search = search; + if (this.timeoutId) { + clearTimeout(this.timeoutId); } + this.timeoutId = setTimeout(() => { + this.isLoading = true; + this.loadByFilter.next(this.searchParams); + }, 1000); } /** Announce the change in sort state for assistive technology. */ - announceSortChange(sortState: Sort) { - if (sortState.direction) { - this._liveAnnouncer.announce(`Sorted ${sortState.direction} ending`); - } else { - this._liveAnnouncer.announce('Sorting cleared'); - } - } + // announceSortChange(sortState: Sort) { + // if (sortState.direction) { + // this._liveAnnouncer.announce(`Sorted ${sortState.direction} ending`); + // } else { + // this._liveAnnouncer.announce('Sorting cleared'); + // } + // } onRunIndexing(kb){ diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index e370872971a9..6eb7e177ba9a 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -334,6 +334,14 @@ export enum KB_MAX_NUM { Custom = 3 }; + +export enum KB_DEFAULT_PARAMS { + LIMIT = 4, + NUMBER_PAGE = 0, + DIRECTION = -1, + SORT_FIELD = 'createdAt' +} + // Growth export const featuresPlanA = [ 'CRM', @@ -621,4 +629,4 @@ export const URL_install_tiledesk_on_prestashop = 'https://gethelp.tiledesk.com/ export const URL_install_tiledesk_on_joomla = 'https://gethelp.tiledesk.com/articles/install-tiledesk-on-joomla/' -export const URL_more_info_chatbot_forms = 'https://gethelp.tiledesk.com/articles/tiledesk-chatbot-forms/'; \ No newline at end of file +export const URL_more_info_chatbot_forms = 'https://gethelp.tiledesk.com/articles/tiledesk-chatbot-forms/'; From 09645efdb9f977392e4b20e6b880152dbe644e34 Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Mon, 26 Feb 2024 17:40:19 +0100 Subject: [PATCH 02/35] added customer.io integration restored checkKeyValidity function updated translations --- .../brevo-integration.component.ts | 29 ++--- .../customerio-integration.component.html | 12 +- .../customerio-integration.component.scss | 9 ++ .../customerio-integration.component.ts | 33 +++--- .../hubspot-integration.component.html | 5 +- .../hubspot-integration.component.scss | 3 +- .../hubspot-integration.component.ts | 28 ++--- .../make-integration.component.scss | 1 + .../openai-integration.component.html | 8 +- .../openai-integration.component.scss | 3 +- .../openai-integration.component.ts | 15 ++- .../qapla-integration.component.html | 9 +- .../qapla-integration.component.scss | 3 +- .../qapla-integration.component.ts | 20 ++-- src/app/integrations/utils.ts | 9 +- src/app/services/integration.service.ts | 43 ++----- src/assets/i18n/ar.json | 2 + src/assets/i18n/az.json | 2 + src/assets/i18n/de.json | 2 + src/assets/i18n/en.json | 2 + src/assets/i18n/es.json | 2 + src/assets/i18n/fr.json | 2 + src/assets/i18n/it.json | 3 +- src/assets/i18n/kk.json | 2 + src/assets/i18n/pt.json | 2 + src/assets/i18n/ru.json | 2 + src/assets/i18n/sr.json | 2 + src/assets/i18n/sv.json | 2 + src/assets/i18n/tr.json | 2 + src/assets/i18n/uk.json | 2 + src/assets/i18n/uz.json | 2 + src/environments/environment.ts | 109 +++++++++++++----- 32 files changed, 219 insertions(+), 151 deletions(-) diff --git a/src/app/integrations/list/brevo-integration/brevo-integration.component.ts b/src/app/integrations/list/brevo-integration/brevo-integration.component.ts index 7108cae8481e..ebd2641986f9 100644 --- a/src/app/integrations/list/brevo-integration/brevo-integration.component.ts +++ b/src/app/integrations/list/brevo-integration/brevo-integration.component.ts @@ -41,13 +41,13 @@ export class BrevoIntegrationComponent implements OnInit { } saveIntegration() { - this.checkKey(this.integration.value.apikey).then((status) => { - let data = { - integration: this.integration, - isVerified: status - } - this.onUpdateIntegration.emit(data); - }) + // this.checkKey(this.integration.value.apikey).then((status) => { + // let data = { + // integration: this.integration, + // isVerified: status + // } + // this.onUpdateIntegration.emit(data); + // }) } deleteIntegration() { @@ -56,21 +56,6 @@ export class BrevoIntegrationComponent implements OnInit { } checkKey(key: string) { - return new Promise((resolve, reject) => { - this.integrationService.checkKeyQapla(key).subscribe((resp: any) => { - if (resp.getCouriers.result === 'OK') { - this.isVerified = true; - resolve(true); - } else { - this.isVerified = false; - resolve(false); - } - }, (error) => { - this.logger.error("[INT-Qapla] Key verification failed: ", error); - this.isVerified = false; - resolve(false); - }) - }) } resetValues() { diff --git a/src/app/integrations/list/customerio-integration/customerio-integration.component.html b/src/app/integrations/list/customerio-integration/customerio-integration.component.html index 3dfac51cfe54..53614ed5d9fb 100644 --- a/src/app/integrations/list/customerio-integration/customerio-integration.component.html +++ b/src/app/integrations/list/customerio-integration/customerio-integration.component.html @@ -1,7 +1,11 @@
-

Start for free with Customer.io. Sign up now!

+ - +
@@ -36,7 +40,7 @@
+ [(ngModel)]="integration.value.key">
visibility diff --git a/src/app/integrations/list/customerio-integration/customerio-integration.component.scss b/src/app/integrations/list/customerio-integration/customerio-integration.component.scss index 47308f735c85..2d4bec11b8d7 100644 --- a/src/app/integrations/list/customerio-integration/customerio-integration.component.scss +++ b/src/app/integrations/list/customerio-integration/customerio-integration.component.scss @@ -10,7 +10,16 @@ p { flex-direction: row; align-items: center; justify-content: space-between; + height: 50px; + + .signup { + display: flex; + p { + margin: 0 0 0 5px; + } + } + .status { display: flex; align-items: center; diff --git a/src/app/integrations/list/customerio-integration/customerio-integration.component.ts b/src/app/integrations/list/customerio-integration/customerio-integration.component.ts index acc9da0fc0e4..b9a64fdfe3a7 100644 --- a/src/app/integrations/list/customerio-integration/customerio-integration.component.ts +++ b/src/app/integrations/list/customerio-integration/customerio-integration.component.ts @@ -16,16 +16,18 @@ export class CustomerioIntegrationComponent implements OnInit { keyVisibile: boolean = false; isVerified: boolean; + translateparams: any; + constructor( private integrationService: IntegrationService, private logger: LoggerService ) { } ngOnInit(): void { - this.logger.log("[INT-Customer.io] integration ", this.integration) this.logger.debug("[INT-Customer.io] integration ", this.integration) + this.translateparams = { intname: "Customer.io" }; if (this.integration.value.apikey) { - this.checkKey(this.integration.value.apikey); + this.checkKey(); } } @@ -41,7 +43,9 @@ export class CustomerioIntegrationComponent implements OnInit { } saveIntegration() { - this.checkKey(this.integration.value.apikey).then((status) => { + let apikey = btoa(this.integration.value.siteid + ":" + this.integration.value.key); + this.integration.value.apikey = apikey; + this.checkKey().then((status) => { let data = { integration: this.integration, isVerified: status @@ -55,16 +59,14 @@ export class CustomerioIntegrationComponent implements OnInit { this.onDeleteIntegration.emit(this.integration); } - checkKey(key: string) { - return new Promise((resolve, reject) => { - this.integrationService.checkKeyQapla(key).subscribe((resp: any) => { - if (resp.getCouriers.result === 'OK') { - this.isVerified = true; - resolve(true); - } else { - this.isVerified = false; - resolve(false); - } + checkKey() { + return new Promise((resolve) => { + let url = "https://track.customer.io/api/v1/accounts/region"; + console.log("apikey: ", this.integration.value.apikey); + let apikey = 'Basic ' + this.integration.value.apikey; + this.integrationService.checkIntegrationKeyValidity(url, apikey).subscribe((resp: any) => { + this.isVerified = true; + resolve(true); }, (error) => { this.logger.error("[INT-Customer.io] Key verification failed: ", error); this.isVerified = false; @@ -75,8 +77,9 @@ export class CustomerioIntegrationComponent implements OnInit { resetValues() { this.integration.value = { - apikey: null, - siteid: null + siteid: null, + key: null, + apikey: null } } diff --git a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.html b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.html index 489947e62447..feab5e11230f 100644 --- a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.html +++ b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.html @@ -3,8 +3,7 @@ {{ 'Integration.Signup' | translate }}

- - +
diff --git a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.scss b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.scss index 02d294f6d6a1..d99fe05cb4b6 100644 --- a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.scss +++ b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.scss @@ -10,7 +10,8 @@ p { flex-direction: row; align-items: center; justify-content: space-between; - + height: 50px; + .signup { display: flex; diff --git a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.ts b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.ts index 1a71e0a9860a..6316dcf3e2bc 100644 --- a/src/app/integrations/list/hubspot-integration/hubspot-integration.component.ts +++ b/src/app/integrations/list/hubspot-integration/hubspot-integration.component.ts @@ -28,7 +28,7 @@ export class HubspotIntegrationComponent implements OnInit { this.logger.debug("[INT-Hubspot] integration ", this.integration) this.translateparams = { intname: 'Hubspot' }; if (this.integration.value.apikey) { - this.checkKey(this.integration.value.apikey); + this.checkKey(); } } @@ -44,7 +44,7 @@ export class HubspotIntegrationComponent implements OnInit { } saveIntegration() { - this.checkKey(this.integration.value.apikey).then((status) => { + this.checkKey().then((status) => { let data = { integration: this.integration, isVerified: status @@ -87,27 +87,29 @@ export class HubspotIntegrationComponent implements OnInit { // }) // } - checkKey(key: string) { - return new Promise((resolve, reject) => { - this.integrationService.checkKeyQapla(key).subscribe((resp: any) => { - if (resp.getCouriers.result === 'OK') { - this.isVerified = true; - resolve(true); + checkKey() { + return new Promise((resolve) => { + let url = "https://api.hubapi.com/crm/v3/objects/contacts?limit=10"; + let key = "Bearer " + this.integration.value.apikey; + this.integrationService.checkIntegrationKeyValidity(url, key).subscribe((resp: any) => { + this.isVerified = true; + resolve(true); + }, (error) => { + this.logger.error("[INT-Hubspot] Key verification failed: ", error); + if (error.status === 0) { + resolve(false); } else { this.isVerified = false; resolve(false); + } - }, (error) => { - this.logger.error("[INT-Qapla] Key verification failed: ", error); - this.isVerified = false; - resolve(false); }) }) } resetValues() { this.integration.value = { - apikey: null, + apikey: null } } diff --git a/src/app/integrations/list/make-integration/make-integration.component.scss b/src/app/integrations/list/make-integration/make-integration.component.scss index de09e7606063..ed107d983bb3 100644 --- a/src/app/integrations/list/make-integration/make-integration.component.scss +++ b/src/app/integrations/list/make-integration/make-integration.component.scss @@ -10,6 +10,7 @@ p { flex-direction: row; align-items: center; justify-content: space-between; + height: 50px; .signup { display: flex; diff --git a/src/app/integrations/list/openai-integration/openai-integration.component.html b/src/app/integrations/list/openai-integration/openai-integration.component.html index b1853778886e..f1a5ba980504 100644 --- a/src/app/integrations/list/openai-integration/openai-integration.component.html +++ b/src/app/integrations/list/openai-integration/openai-integration.component.html @@ -5,7 +5,7 @@
- +
- +
diff --git a/src/app/integrations/list/openai-integration/openai-integration.component.scss b/src/app/integrations/list/openai-integration/openai-integration.component.scss index c7d6a88ab4cb..ca63642ce4d1 100644 --- a/src/app/integrations/list/openai-integration/openai-integration.component.scss +++ b/src/app/integrations/list/openai-integration/openai-integration.component.scss @@ -10,7 +10,8 @@ p { flex-direction: row; align-items: center; justify-content: space-between; - + height: 50px; + .signup { display: flex; diff --git a/src/app/integrations/list/openai-integration/openai-integration.component.ts b/src/app/integrations/list/openai-integration/openai-integration.component.ts index d3d6eb245ef8..066f1445b607 100644 --- a/src/app/integrations/list/openai-integration/openai-integration.component.ts +++ b/src/app/integrations/list/openai-integration/openai-integration.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { IntegrationService } from 'app/services/integration.service'; import { LoggerService } from 'app/services/logger/logger.service'; import { OpenaiService } from 'app/services/openai.service'; @@ -18,7 +19,7 @@ export class OpenaiIntegrationComponent implements OnInit { translateparams: any; constructor( - private openaiService: OpenaiService, + private integrationService: IntegrationService, private logger: LoggerService ) { } @@ -26,7 +27,7 @@ export class OpenaiIntegrationComponent implements OnInit { this.logger.debug("[INT-OpenAI] integration ", this.integration) this.translateparams = { intname: 'OpenAI' }; if (this.integration.value.apikey) { - this.checkKey(this.integration.value.apikey); + this.checkKey(); } } @@ -41,7 +42,7 @@ export class OpenaiIntegrationComponent implements OnInit { } saveIntegration() { - this.checkKey(this.integration.value.apikey).then((status) => { + this.checkKey().then((status) => { let data = { integration: this.integration, isVerified: status @@ -55,9 +56,11 @@ export class OpenaiIntegrationComponent implements OnInit { this.onDeleteIntegration.emit(this.integration); } - checkKey(key: string) { - return new Promise((resolve, reject) => { - this.openaiService.checkKeyValidity(key).subscribe((resp) => { + checkKey() { + return new Promise((resolve) => { + let url = "https://api.openai.com/v1/models"; + let key = "Bearer " + this.integration.value.apikey; + this.integrationService.checkIntegrationKeyValidity(url, key).subscribe((resp) => { this.isVerified = true; resolve(true); }, (error) => { diff --git a/src/app/integrations/list/qapla-integration/qapla-integration.component.html b/src/app/integrations/list/qapla-integration/qapla-integration.component.html index 69ee35733068..1aa2b0e09e2c 100644 --- a/src/app/integrations/list/qapla-integration/qapla-integration.component.html +++ b/src/app/integrations/list/qapla-integration/qapla-integration.component.html @@ -5,7 +5,7 @@
- + - + +
diff --git a/src/app/integrations/list/qapla-integration/qapla-integration.component.scss b/src/app/integrations/list/qapla-integration/qapla-integration.component.scss index 7b3b6d55a487..0b414e30778c 100644 --- a/src/app/integrations/list/qapla-integration/qapla-integration.component.scss +++ b/src/app/integrations/list/qapla-integration/qapla-integration.component.scss @@ -10,7 +10,8 @@ p { flex-direction: row; align-items: center; justify-content: space-between; - + height: 50px; + .signup { display: flex; diff --git a/src/app/integrations/list/qapla-integration/qapla-integration.component.ts b/src/app/integrations/list/qapla-integration/qapla-integration.component.ts index 801283d4c3cf..f2f90660ad32 100644 --- a/src/app/integrations/list/qapla-integration/qapla-integration.component.ts +++ b/src/app/integrations/list/qapla-integration/qapla-integration.component.ts @@ -27,7 +27,7 @@ export class QaplaIntegrationComponent implements OnInit { this.logger.debug("[INT-Qapla] integration ", this.integration) this.translateparams = { intname: "Qapla'" }; if (this.integration.value.apikey) { - this.checkKey(this.integration.value.apikey); + this.checkKey(); } } @@ -42,7 +42,7 @@ export class QaplaIntegrationComponent implements OnInit { } saveIntegration() { - this.checkKey(this.integration.value.apikey).then((status) => { + this.checkKey().then((status) => { let data = { integration: this.integration, isVerified: status @@ -56,9 +56,10 @@ export class QaplaIntegrationComponent implements OnInit { this.onDeleteIntegration.emit(this.integration); } - checkKey(key: string) { - return new Promise((resolve, reject) => { - this.integrationService.checkKeyQapla(key).subscribe((resp: any) => { + checkKey() { + return new Promise((resolve) => { + let url = "https://api.qapla.it/1.2/getCouriers/?apiKey=" + this.integration.value.apikey; + this.integrationService.checkIntegrationKeyValidity(url).subscribe((resp: any) => { if (resp.getCouriers.result === 'OK') { this.isVerified = true; resolve(true); @@ -68,8 +69,13 @@ export class QaplaIntegrationComponent implements OnInit { } }, (error) => { this.logger.error("[INT-Qapla] Key verification failed: ", error); - this.isVerified = false; - resolve(false); + // check for CORS policies errors + if (error.status == 0) { + resolve(false); + } else { + this.isVerified = false; + resolve(false); + } }) }) } diff --git a/src/app/integrations/utils.ts b/src/app/integrations/utils.ts index 6b472f938382..e51df2f2998d 100644 --- a/src/app/integrations/utils.ts +++ b/src/app/integrations/utils.ts @@ -55,7 +55,7 @@ export const CATEGORIES_LIST = [ export const INTEGRATIONS_LIST: { [key: string]: { name: string, category: INTEGRATIONS_CATEGORIES, key: INTEGRATIONS_KEYS, src_icon: string, src_logo: string, pro?: boolean, plan: 'Sandbox' | 'Basic' | 'Premium' | 'Custom' } } = { //BREVO: { name: "Brevo", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.BREVO, src_icon: "assets/img/int/brevo.png", src_logo: "assets/img/int/brevo-logo.png", pro: true, plan: 'Premium' }, - //CUSTOMERIO: { name: "Customer.io", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.CUSTOMERIO, src_icon: "assets/img/int/customer-io-logo-color.svg", src_logo: "assets/img/int/customerio-logo.svg", pro: true, plan: 'Premium' }, + CUSTOMERIO: { name: "Customer.io", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.CUSTOMERIO, src_icon: "assets/img/int/customer-io-logo-color.svg", src_logo: "assets/img/int/customerio-logo.svg", pro: true, plan: 'Premium' }, HUBSPOT: { name: "HubSpot", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.HUBSPOT, src_icon: "assets/img/int/hubspot.png", src_logo: "assets/img/int/hubspot-logo.svg", pro: true, plan: 'Premium' }, OPENAI: { name: "OpenAI", category: INTEGRATIONS_CATEGORIES.AI, key: INTEGRATIONS_KEYS.OPENAI, src_icon: "assets/cds/images/actions/openai-icon.svg", src_logo: "assets/img/int/openai-logo.svg", pro: true, plan: 'Custom' }, QAPLA: { name: "Qapla'", category: INTEGRATIONS_CATEGORIES.ECOMMERCE, key: INTEGRATIONS_KEYS.QAPLA, src_icon: "assets/cds/images/actions/qapla.jpg", src_logo: "assets/img/int/qapla-logo.png", pro: true, plan: 'Premium' }, @@ -76,7 +76,7 @@ export const INTEGRATIONS_LIST: { [key: string]: { name: string, category: INTEG export const INTEGRATION_LIST_ARRAY = [ //{ name: "Brevo", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.BREVO, src_icon: "assets/img/int/brevo-icon.png", src_logo: "assets/img/int/brevo-logo.png", pro: true, plan: 'Premium' }, - //{ name: "Customer.io", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.CUSTOMERIO, src_icon: "assets/img/int/customerio-icon.png", src_logo: "assets/img/int/customerio-logo.svg", pro: true, plan: 'Premium' }, + { name: "Customer.io", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.CUSTOMERIO, src_icon: "assets/img/int/customerio-icon.png", src_logo: "assets/img/int/customerio-logo.svg", pro: true, plan: 'Premium' }, { name: "HubSpot", category: INTEGRATIONS_CATEGORIES.CRM, key: INTEGRATIONS_KEYS.HUBSPOT, src_icon: "assets/img/int/hubspot-icon.png", src_logo: "assets/img/int/hubspot-logo.svg", pro: true, plan: 'Premium' }, { name: "OpenAI", category: INTEGRATIONS_CATEGORIES.AI, key: INTEGRATIONS_KEYS.OPENAI, src_icon: "assets/img/int/openai-icon.svg", src_logo: "assets/img/int/openai-logo.svg", pro: true, plan: 'Custom' }, { name: "Qapla'", category: INTEGRATIONS_CATEGORIES.ECOMMERCE, key: INTEGRATIONS_KEYS.QAPLA, src_icon: "assets/img/int/qapla-icon.jpg", src_logo: "assets/img/int/qapla-logo.png", pro: true, plan: 'Premium' }, @@ -145,8 +145,9 @@ export class CustomerioIntegration extends Integration { super(); this.name = INTEGRATIONS_KEYS.CUSTOMERIO; this.value = { - apikey: null, - siteid: null + siteid: null, + key: null, + apikey: null //base64 format of siteid:key } } } diff --git a/src/app/services/integration.service.ts b/src/app/services/integration.service.ts index 651e7ce32a9b..87080368a78f 100644 --- a/src/app/services/integration.service.ts +++ b/src/app/services/integration.service.ts @@ -118,46 +118,21 @@ export class IntegrationService { return this.http.delete(url, httpOptions); } + checkIntegrationKeyValidity(url: string, key?: string) { + + let headers = new HttpHeaders({ + 'Content-Type': 'application/json', + }); - checkKeyQapla(key: string) { - const httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': this.TOKEN - }) + if (key) { + headers = headers.append('Authorization', key) } - const url = "https://api.qapla.it/1.2/getCouriers/?apiKey=" + key; - this.logger.log('[INTEGRATION.SERV] - save integration URL: ', url); - - return this.http.get(url, httpOptions); - } - - checkKeyHubspot(key: string) { const httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': this.TOKEN - }) + headers: headers } - //const url = // get endpoint url - // this.logger.debug('[INTEGRATION.SERV] - save integration URL: ', url); - // return this.http.get(url, httpOptions); - return true; + return this.http.get(url, httpOptions); } - checkKeyCustomerio(key: string) { - const httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': this.TOKEN - }) - } - - //const url = // get endpoint url - // this.logger.debug('[INTEGRATION.SERV] - save integration URL: ', url); - // return this.http.get(url, httpOptions); - return true; - } } diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 3111214c22eb..5f9e9845e928 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "تحديث الآن", "SelectToStart": "حدد التكامل للبدء", "Signup": "اشتراك", + "SignupNow": "أفتح حساب الأن!", + "StartForFree": "ابدأ مجانًا مع {{ intname }}.", "Join": "ينضم", "JoinNow": "{{ intname }} الآن!", "FreeAccount": "مجانا {{ intname }} حساب!", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 5692410a0a85..0e79376c1e8a 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "İndi yenilə", "SelectToStart": "Başlamaq üçün inteqrasiya seçin", "Signup": "Abunə olun", + "SignupNow": "İndi qeydiyyatdan keçin!", + "StartForFree": "ilə pulsuz başlayın {{ intname }}.", "Join": "Qoşulun", "JoinNow": "{{ intname }} İndi!", "FreeAccount": "pulsuz üçün {{ intname }} hesab!", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 9a40a11fe76f..70cbca3e2153 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1908,6 +1908,8 @@ "UpgradeNow": "Jetzt upgraden", "SelectToStart": "Wählen Sie eine Integration aus, um zu starten", "Signup": "Melden Sie sich an", + "SignupNow": "Jetzt registrieren!", + "StartForFree": "Starten Sie kostenlos mit {{ intname }}.", "Join": "Verbinden", "JoinNow": "{{ intname }} Jetzt!", "FreeAccount": "kostenlos {{ intname }} Konto!", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 18220335d18a..5489f4994ec1 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Upgrade now", "SelectToStart": "Select an integration to start", "Signup": "Sign up", + "SignupNow": "Sign up now!", + "StartForFree": "Start for free with {{ intname }}.", "Join": "Join", "JoinNow": "{{ intname }} now!", "FreeAccount": "for a free {{ intname }} account!", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 9c3cc9f06a84..bf8a9db7a450 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Actualizar ahora", "SelectToStart": "Seleccione una integración para comenzar", "Signup": "Inscribirse", + "SignupNow": "¡Regístrate ahora!", + "StartForFree": "Empieza gratis con {{ intname }}.", "Join": "Unirse", "JoinNow": "{{ intname }} ¡ahora!", "FreeAccount": "gratis {{ intname }} ¡cuenta!", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index f6faabcf7720..1b86ab3557ae 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Mettre à jour maintenant", "SelectToStart": "Sélectionnez une intégration pour démarrer", "Signup": "S'inscrire", + "SignupNow": "S'inscrire maintenant!", + "StartForFree": "Commencez gratuitement avec {{ intname }}.", "Join": "Rejoindre", "JoinNow": "{{ intname }} maintenant!", "FreeAccount": "gratuitement {{ intname }} compte!", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 6043d17b88af..508b259d4bdc 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1908,8 +1908,9 @@ "UpgradeNow": "Esegui l'upgrade adesso", "SelectToStart": "Seleziona un'integrazione per iniziare", "Signup": "Registrati", + "Signup now": "Registrati adesso!", + "StartForFree": "Inizia gratuitamente su {{ intname }}.", "Join": "Vai su", - "JoinNow": "{{ intname }} adesso!", "FreeAccount": "per un account {{ intname }} gratuito!", "YourApikey": "La tua key", "OrganizationOptional": "Organizzazione (opzionale)", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index fa65b5699264..0d9cad5ab459 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Қазір жаңарту", "SelectToStart": "Бастау үшін біріктіруді таңдаңыз", "Signup": "Тіркелу", + "SignupNow": "Қазір тіркеліңіз!", + "StartForFree": "тегін бастаңыз {{ intname }}.", "Join": "Қосылыңыз", "JoinNow": "{{ intname }} қазір!", "FreeAccount": "тегін {{ intname }} шот!", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 340a8fd87cd3..ef79cb196aa3 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Atualize agora", "SelectToStart": "Selecione uma integração para começar", "Signup": "Inscrever-se", + "SignupNow": "Inscreva-se agora!", + "StartForFree": "Comece gratuitamente com {{ intname }}.", "Join": "Juntar", "JoinNow": "{{ intname }} agora!", "FreeAccount": "de graça {{ intname }} conta!", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 826ee68eb149..0e4097d39abe 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Обнови сейчас", "SelectToStart": "Выберите интеграцию, чтобы начать", "Signup": "Зарегистрироваться", + "SignupNow": "Войти Сейчас!", + "StartForFree": "Начните бесплатно с {{ intname }}.", "Join": "Присоединиться", "JoinNow": "{{ intname }} сейчас!", "FreeAccount": "бесплатно {{ intname }} счет!", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index bcf71296a129..94319bd7d7c8 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Надоградите сада", "SelectToStart": "Изаберите интеграцију за почетак", "Signup": "Пријави се", + "SignupNow": "Пријавите се сада!", + "StartForFree": "Почните бесплатно са {{ intname }}.", "Join": "Придружити", "JoinNow": "{{ intname }} Сада!", "FreeAccount": "за бесплатно {{ intname }} рачун!", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 4c314dfedf9a..e176b8871dbb 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Uppgradera nu", "SelectToStart": "Välj en integration att starta", "Signup": "Bli Medlem", + "SignupNow": "Anmäl dig nu!", + "StartForFree": "Börja gratis med {{ intname }}.", "Join": "Ansluta sig", "JoinNow": "{{ intname }} nu!", "FreeAccount": "för en gratis {{ intname }} konto!", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 0fb1654783b1..392253c26f2d 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Hemen Yükselt", "SelectToStart": "Başlamak için bir entegrasyon seçin", "Signup": "Üye olmak", + "SignupNow": "Şimdi kayıt ol!", + "StartForFree": "Ücretsiz olarak başlayın {{ intname }}.", "Join": "Katılmak", "JoinNow": "{{ intname }} Şimdi!", "FreeAccount": "ücretsiz {{ intname }} hesap!", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index cdbca8246ba2..6230128c585c 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1909,6 +1909,8 @@ "UpgradeNow": "Оновити зараз", "SelectToStart": "Виберіть інтеграцію, щоб почати", "Signup": "Зареєструватися", + "SignupNow": "Зареєструватися зараз!", + "StartForFree": "Почніть безкоштовно з {{ intname }}.", "Join": "Приєднуйтесь", "JoinNow": "{{ intname }} зараз!", "FreeAccount": "безкоштовно {{ intname }} рахунок!", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 0955f0a85270..77cc1833e249 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1908,6 +1908,8 @@ "UpgradeNow": "Hozir yangilang", "SelectToStart": "Boshlash uchun integratsiyani tanlang", "Signup": "Ro'yxatdan o'tish", + "SignupNow": "Hozir roʻyxatdan oʻting!", + "StartForFree": "bilan bepul boshlang {{ intname }}.", "Join": "Qo'shilish", "JoinNow": "{{ intname }} hozir!", "FreeAccount": "bepul {{ intname }} hisob!", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e925cd501405..93461f7c798d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,36 +1,83 @@ + +// export const environment = { +// production: true, +// t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', +// VERSION: require('../../package.json').version, +// widgetUrl: 'https://widget.tiledesk.com/v3/launch.js', +// botcredendialsURL:'CHANGEIT', +// remoteConfig: true, +// SERVER_BASE_URL:'https://tiledesk-server-pre.herokuapp.com/', +// CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat/', +// testsiteBaseUrl: 'https://widget-pre.tiledesk.com/v2/assets/test_widget_page/index.html', +// wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', +// chatEngine: 'mqtt', +// firebaseAuth: false, +// uploadEngine: 'native', +// baseImageUrl: 'CHANGEIT', +// pushEngine: 'none', +// logLevel: 'Info', +// templatesUrl: 'CHANGEIT', +// appsUrl: 'CHANGEIT', +// promoBannerUrl: 'CHANGEIT', +// chatStoragePrefix: "CHANGEIT", +// firebase: { +// apiKey: 'CHANGEIT', +// authDomain: 'CHANGEIT', +// databaseURL: 'CHANGEIT', +// projectId: 'CHANGEIT', +// storageBucket: 'CHANGEIT', +// messagingSenderId: 'CHANGEIT', +// appId: 'CHANGEIT', +// vapidKey: 'CHANGEIT' +// } +// }; + export const environment = { production: false, - remoteConfig: true, - remoteConfigUrl: './dashboard-config.json', + remoteConfig: false, + t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-IPS:T-ETK:T-RAS:T-PPB:T-PET:T-MTS:T-TIL:T-DGF:T-NAT:T-HPB:F-TOW:T-KNB:T-BAN:T-AST:T-MON:T-CNT:T-AUT:T-WUN:T-INT:T', VERSION: require('../../package.json').version, - t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', - botcredendialsURL: 'CHANGEIT', - WIDGET_BASE_URL: 'http://localhost:4200/', - SERVER_BASE_URL: 'http://localhost:3000/', - CHAT_BASE_URL: 'http://localhost:8080/', - wsUrl: 'ws://localhost:3000/', - chatEngine: 'mqtt', + botcredendialsURL: 'https://tiledesk-df-connector-pre.herokuapp.com/botcredendials/', //'https://dialogflow-proxy-tiledesk.herokuapp.com/botcredendials/', + rasaBotCredentialsURL: "https://tiledesk-server-pre.herokuapp.com/modules/rasa/botcredendials/", // "https://tiledesk-rasa-connector-pre.herokuapp.com/botcredendials/", + WIDGET_BASE_URL: 'https://widget-pre.tiledesk.com/v5/', + SERVER_BASE_URL: 'https://tiledesk-server-pre.herokuapp.com/', + CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat-ionic5/', // '/chat-ionic5/', //'https://support-pre.tiledesk.com/chat-ionic5/' // https://support-pre.tiledesk.com/chat-ionic5-notifcation-item// + wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', + reCaptchaSiteKey:"6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5", + globalRemoteJSSrc: "https://support-pre.tiledesk.com/script/custom_script.js, https://support-pre.tiledesk.com/script/dnpc.js", //https://www.google.com/recaptcha/api.js?render=6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5, firebaseAuth: false, - uploadEngine: 'native', - baseImageUrl: 'CHANGEIT', - pushEngine: 'none', - logLevel: 'Info', - communityTemplatesUrl: 'CHANGEIT', - templatesUrl: 'CHANGEIT', - appsUrl: 'CHANGEIT', - cdsBaseUrl: 'CHANGEIT', - promoBannerUrl: 'CHANGEIT', - whatsappApiUrl: "CHANGEIT", - ticketingEmail: "CHANGEIT", - tiledeskPhoneNumber: "CHANGEIT", + uploadEngine: 'firebase', + baseImageUrl: 'https://tiledesk-server-pre.herokuapp.com/', + pushEngine: 'firebase', + chatEngine: 'firebase', + logLevel: 'info', + communityTemplatesUrl: 'https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/community', + templatesUrl: "https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/templates", // "https://chatbot-templates.herokuapp.com/chatbots/public/templates/", + appsUrl: "https://cd3ff4b5-5a06-44e3-aff2-3ce2ff1b848b-00-3eppvhwsi6nym.janeway.replit.dev/", // "https://tiledesk-apps-server.giovannitroisi3.repl.co/",// "https://tiledesk-apps.herokuapp.com/", + cdsBaseUrl: '/cds/', + whatsappApiUrl: "https://tiledesk-whatsapp-connector-dev.glitch.me/", //"https://tiledesk-whatsapp-connector-c4ce07638b45.herokuapp.com/", //"https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/", // "https://tiledesk-whatsapp-app-pre.giovannitroisi3.repl.co", + // promoBannerUrl: "https://dashbordpromobanner.nicolan74.repl.co/get/dashboard_promo.json", + chatStoragePrefix: "chat_sv5", + tiledeskPhoneNumber: "393201352964", + ticketingEmail: "tickets.tiledesk.com", firebase: { - apiKey: 'CHANGEIT', - authDomain: 'CHANGEIT', - databaseURL: 'CHANGEIT', - projectId: 'CHANGEIT', - storageBucket: 'CHANGEIT', - messagingSenderId: 'CHANGEIT', - appId: 'CHANGEIT', - vapidKey: 'CHANGEIT' - } -}; \ No newline at end of file + apiKey: "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4", + authDomain: "chat21-pre-01.firebaseapp.com", + databaseURL: "https://chat21-pre-01.firebaseio.com", + projectId: "chat21-pre-01", + storageBucket: "chat21-pre-01.appspot.com", + messagingSenderId: "269505353043", + appId: "1:269505353043:web:b82af070572669e3707da6", + vapidKey: "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c" + }, +}; + + + + + + + + + + From 01b735e382fb574f17577b20529261d14ccf21ed Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Mon, 26 Feb 2024 17:51:34 +0100 Subject: [PATCH 03/35] bug fix on update when add, delete a kb content --- src/app/core/notify.service.ts | 2 + .../knowledge-bases.component.ts | 35 ++++-- .../knowledge-base-table.component.html | 111 ++++-------------- .../knowledge-base-table.component.scss | 52 +++++++- .../knowledge-base-table.component.ts | 19 +-- ...modal-detail-knowledge-base.component.html | 6 +- src/app/utils/util.ts | 2 +- src/assets/i18n/it.json | 1 + 8 files changed, 113 insertions(+), 115 deletions(-) diff --git a/src/app/core/notify.service.ts b/src/app/core/notify.service.ts index de5cf54bd9df..f6062e435d83 100755 --- a/src/app/core/notify.service.ts +++ b/src/app/core/notify.service.ts @@ -511,6 +511,8 @@ export class NotifyService { icon_bckgrnd_color = '#d2291c' } else if (notificationColor === 2) { icon_bckgrnd_color = '#449d48' + } else if(notificationColor === 3){ + icon_bckgrnd_color = '#ffecb5' } this.notify = $.notify({ // icon: 'glyphicon glyphicon-warning-sign', diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 4e994e178197..70002a7abc41 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -61,7 +61,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { kbsList: Array; kbsListCount: number = 0; refreshKbsList: boolean = true; - numberPage: number = 0; + // numberPage: number = 0; kbid_selected: any; @@ -407,8 +407,13 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { onLoadPage(searchParams){ //console.log('onLoadNextPage:',this.kbsList); - this.numberPage = Math.floor(this.kbsList.length/KB_DEFAULT_PARAMS.LIMIT); - let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT+"&page="+this.numberPage; + // + let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT + if(searchParams.page){ + params +="&page="+searchParams.page; + } else { + +"&page=0"; + } if(searchParams.status){ params +="&status="+searchParams.status; } @@ -430,7 +435,8 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { onLoadByFilter(searchParams){ //console.log('onLoadByFilter:',searchParams); - this.numberPage = 0; + // this.numberPage = 0; + searchParams.page = 0; this.kbsList = []; this.onLoadPage(searchParams); } @@ -483,20 +489,30 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.onCloseBaseModal(); let error = this.msgErrorAddUpdateKb; this.kbService.addKb(body).subscribe((resp: any) => { + this.logger.log("onAddKb:", resp); let kb = resp.value; - this.logger.log("onAddKb:", kb); - if(kb.lastErrorObject && kb.lastErrorObject.updatedExisting === true){ + if(resp.lastErrorObject && resp.lastErrorObject.updatedExisting === true){ + //console.log("updatedExisting true:"); const index = this.kbsList.findIndex(item => item._id === kb._id); if (index !== -1) { this.kbsList[index] = kb; - this.notify.showWidgetStyleUpdateNotification(this.msgSuccesUpdateKb, 2, 'done'); + this.notify.showWidgetStyleUpdateNotification(this.msgSuccesUpdateKb, 3, 'warning'); } } else { - this.kbsList.push(kb); + //this.kbsList.push(kb); + this.kbsList.unshift(kb); this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); } this.updateStatusOfKb(kb._id, 0); this.refreshKbsList = !this.refreshKbsList; + + let searchParams = { + "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, + "direction": KB_DEFAULT_PARAMS.DIRECTION, + "status": '', + "search": '', + } + this.onLoadByFilter(searchParams); // this.logger.log("kbsList:",that.kbsList); // that.onRunIndexing(kb); setTimeout(() => { @@ -589,7 +605,8 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } private removeKb(kb_id){ - this.kbs = this.kbs.filter(item => item._id !== kb_id); + //this.kbs = this.kbs.filter(item => item._id !== kb_id); + this.kbsList = this.kbsList.filter(item => item._id !== kb_id); // this.logger.log('AGGIORNO kbsList:', this.kbsList); this.refreshKbsList = !this.refreshKbsList; } diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 3712cc60fec0..ab2fa86877d7 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,4 +1,4 @@ -
+
@@ -34,23 +34,29 @@
-
+
- +
- - - + + - + - - - - - + + + - =20with=20the=20me?= =?UTF-8?q?ssage=20"No=20match=20for=20the=20specified=20parameters"=20if?= =?UTF-8?q?=20the=20search=20returns=20no=20results=20=E2=9C=85=20bug=20fi?= =?UTF-8?q?x:=20show=20welcome=20message,=20only=20if=20table=20is=20empty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add-content-menu.component.ts | 10 +++++----- .../knowledge-base-table.component.html | 16 ++++++++++++--- .../knowledge-base-table.component.ts | 8 ++++---- .../modal-page-url.component.html | 2 +- ...odal-preview-knowledge-base.component.html | 2 +- .../modal-site-map.component.html | 2 +- .../modal-site-map.component.ts | 2 +- .../modal-text-file.component.html | 2 +- .../modal-urls-knowledge-base.component.html | 2 +- src/assets/i18n/ar.json | 12 ++++++----- src/assets/i18n/az.json | 10 ++++++---- src/assets/i18n/de.json | 12 ++++++----- src/assets/i18n/en.json | 10 ++++++---- src/assets/i18n/es.json | 20 ++++++++++--------- src/assets/i18n/fr.json | 12 ++++++----- src/assets/i18n/it.json | 8 +++++--- src/assets/i18n/kk.json | 10 ++++++---- src/assets/i18n/pt.json | 10 ++++++---- src/assets/i18n/ru.json | 10 ++++++---- src/assets/i18n/sr.json | 12 ++++++----- src/assets/i18n/sv.json | 12 ++++++----- src/assets/i18n/tr.json | 20 ++++++++++--------- src/assets/i18n/uk.json | 10 ++++++---- src/assets/i18n/uz.json | 10 ++++++---- 24 files changed, 132 insertions(+), 92 deletions(-) diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index ca57c8445f63..a50ceca3a2a8 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -38,11 +38,11 @@ export class AddContentMenuComponent implements OnInit { this.items.push(item); }); - // this.translate.get('KbPage.AddKbSitemap') - // .subscribe((text: any) => { - // let item = {"label": text, "type":"site-map"}; - // this.items.push(item); - // }); + this.translate.get('KbPage.AddKbSitemap') + .subscribe((text: any) => { + let item = {"label": text, "type":"site-map"}; + this.items.push(item); + }); //this.items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 3ff69a86e054..b96d2905ce52 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,4 +1,4 @@ -
+
', this.kbsListCount, this.kbsList.length, changes); - + if(this.kbsList.length>0){ + this.SHOW_TABLE = true; + } if(changes.kbsList?.currentValue?.length === changes.kbsList?.previousValue?.length){ // non è cambiato nulla ho solo rodinato la tab } else { @@ -109,7 +110,6 @@ export class KnowledgeBaseTableComponent implements OnInit { if(changes.refresh){ this.isLoading = false; } - if(this.kbsList?.length == 0){ this.SHOW_MORE_BTN = false; } diff --git a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.html b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.html index 18f7b1206929..9db1debc694e 100644 --- a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.html +++ b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.html @@ -44,7 +44,7 @@

{{ "Cancel" | translate }}

diff --git a/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.html index 2697aff81251..2b46a7ea5d2b 100644 --- a/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.html @@ -81,7 +81,7 @@

{{ "Cancel" | translate }}

diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html index a5a2b32cd8bd..43352f165b89 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html @@ -101,7 +101,7 @@

{{ "Cancel" | translate }}

diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts index 32acdf40a2c8..437206a01c17 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts @@ -35,7 +35,7 @@ export class ModalSiteMapComponent implements OnInit { const namePattern = /^[^&<>]{3,}$/; return this.formBuilder.group({ url: ['', [Validators.required, Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?')]], - name: ['', [Validators.required, Validators.pattern(namePattern)]] + // name: ['', [Validators.required, Validators.pattern(namePattern)]] }) } diff --git a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.html b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.html index c86ff1815630..8bae2250b50e 100644 --- a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.html +++ b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.html @@ -48,7 +48,7 @@

{{ "Cancel" | translate }} diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html index c041474fb8c8..c458dc243cf8 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -44,7 +44,7 @@

{{ "Cancel" | translate }} diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index a00c4173e5ce..2df1de14ea70 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "قائمة عناوين URL", "placeholderUrls": "أدخل عناوين URL", "infoUrls": "عنوان URL واحد لكل سطر.", - "NoKbAdded": "لا توجد مصادر بيانات", - "NoKbAddedText": "أضف مصدر البيانات إلى مساعدك لبناء قاعدة معرفية.", - "Add": "إضافة مصادر البيانات", - "AddKbURL": "عناوين URL متعددة", - "AddKbText": "نص بسيط", + "NoKbAdded": "لم تقم بإضافة أي مصادر بيانات", + "NoKbMatchParams": "لا يوجد تطابق للمعلمات المحددة", + "NoKbAddedText": "أضف مصادر البيانات إلى مساعدك لبناء قاعدة معرفية.", + "Add": "إضافة مصدر البيانات", + "Import": "يستورد", + "AddKbURL": "عناوين URL", + "AddKbText": "نص عادي", "AddKbSitemap": "خريطة الموقع", "LoadMore": "تحميل المزيد", "Loading": "تحميل", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 3f74b857e5ec..b900405e9b28 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "URL-lərin siyahısı", "placeholderUrls": "URL-ləri daxil edin", "infoUrls": "Hər sətir üçün bir url.", - "NoKbAdded": "Heç bir məlumat mənbəyi yoxdur", - "NoKbAddedText": "Bilik bazası yaratmaq üçün köməkçinizə məlumat mənbəyi əlavə edin.", - "Add": "Məlumat mənbələri əlavə edin", - "AddKbURL": "Birdən çox URL", + "NoKbAdded": "Siz heç bir məlumat mənbəyi əlavə etməmisiniz", + "NoKbMatchParams": "Göstərilən parametrlər üçün uyğunluq yoxdur", + "NoKbAddedText": "Bilik bazası yaratmaq üçün köməkçinizə məlumat mənbələri əlavə edin.", + "Add": "Məlumat mənbəyi əlavə edin", + "Import": "İdxal", + "AddKbURL": "URL-lər", "AddKbText": "Sadə mətn", "AddKbSitemap": "Saytın xəritəsi", "LoadMore": "daha çox yükləyin", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 5c4c323c6432..d694ad7e6644 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "Liste der URLs", "placeholderUrls": "Geben Sie URLs ein", "infoUrls": "Eine URL pro Zeile.", - "NoKbAdded": "Es sind keine Datenquellen vorhanden", - "NoKbAddedText": "Fügen Sie Ihrem Assistenten eine Datenquelle hinzu, um eine Wissensdatenbank aufzubauen.", - "Add": "Datenquellen hinzufügen", - "AddKbURL": "Mehrere URLs", - "AddKbText": "Einfacher Text", + "NoKbAdded": "Sie haben keine Datenquellen hinzugefügt", + "NoKbMatchParams": "Keine Übereinstimmung für die angegebenen Parameter", + "NoKbAddedText": "Fügen Sie Ihrem Assistenten Datenquellen hinzu, um eine Wissensdatenbank aufzubauen.", + "Add": "Datenquelle hinzufügen", + "Import": "Importieren", + "AddKbURL": "URLs", + "AddKbText": "Klartext", "AddKbSitemap": "Seitenverzeichnis", "LoadMore": "Mehr laden", "Loading": "Wird geladen", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 73a81c31fd36..ee570b9508a9 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "List of URLs", "placeholderUrls": "Enter URLs", "infoUrls": "One url per line.", - "NoKbAdded": "No data sources exist", - "NoKbAddedText": "Add data-sources into your assistant to build a 'knowledge base'.", + "NoKbAdded": "You haven't added any data sources", + "NoKbMatchParams": "No match for the specified parameters", + "NoKbAddedText": "Add data-sources into your assistant to build a knowledge base.", "Add": "Add data-source", - "AddKbURL": "Multiple URLs", - "AddKbText": "Simple text", + "Import": "Import", + "AddKbURL": "URLs", + "AddKbText": "Plain text", "AddKbSitemap": "Sitemap", "LoadMore": "load more", "Loading": "loading", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 583bad253f2c..7dfd0d6a8d2e 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1645,15 +1645,17 @@ "titleTextareaUrls": "Lista de URL", "placeholderUrls": "Ingrese las URL", "infoUrls": "Una URL por línea.", - "NoKbAdded": "No existen fuentes de datos", - "NoKbAddedText": "Agregue una fuente de datos a su asistente para crear una base de conocimientos.", - "Add": "Agregar fuentes de datos", - "AddKbURL": "Múltiples URL", - "AddKbText": "texto sencillo", - "AddKbSitemap": "Mapa del sitio", - "LoadMore": "carga más", - "Loading": "cargando", - "YouCanAddKBUrlsLimit": "Puede agregar un máximo de 300 URL" + "NoKbAdded": "Sie haben keine Datenquellen hinzugefügt", + "NoKbMatchParams": "Keine Übereinstimmung für die angegebenen Parameter", + "NoKbAddedText": "Fügen Sie Ihrem Assistenten Datenquellen hinzu, um eine Wissensdatenbank aufzubauen.", + "Add": "Agregar fuente de datos", + "Import": "Importar", + "AddKbURL": "URLs", + "AddKbText": "Klartext", + "AddKbSitemap": "Seitenverzeichnis", + "LoadMore": "Mehr laden", + "Loading": "Wird geladen", + "YouCanAddKBUrlsLimit": "Sie können maximal 300 URLs hinzufügen" }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", "Sunday": "Domingo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index a29cfaa1d3b0..1f69e2cee834 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "Liste des URL", "placeholderUrls": "Saisissez les URL", "infoUrls": "Une URL par ligne.", - "NoKbAdded": "Aucune source de données n'existe", - "NoKbAddedText": "Ajoutez une source de données dans votre assistant pour créer une base de connaissances.", - "Add": "Ajouter des sources de données", - "AddKbURL": "Plusieurs URL", - "AddKbText": "Texte simple", + "NoKbAdded": "Vous n'avez ajouté aucune source de données", + "NoKbMatchParams": "Aucune correspondance pour les paramètres spécifiés", + "NoKbAddedText": "Ajoutez des sources de données dans votre assistant pour créer une base de connaissances.", + "Add": "Ajouter une source de données", + "Import": "Importer", + "AddKbURL": "URL", + "AddKbText": "Texte brut", "AddKbSitemap": "Plan du site", "LoadMore": "charger plus", "Loading": "chargement", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 5378b4487d3c..bd3845f0023f 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "Elenco degli URL", "placeholderUrls": "Inserisci gli URL", "infoUrls": "Un URL per riga.", - "NoKbAdded": "Non esistono origini dati", - "NoKbAddedText": "Aggiungi l'origine dati al tuo assistente per creare una knowledge base.", + "NoKbAdded": "Non hai aggiunto alcun dato", + "NoKbMatchParams": "Nessuna corrispondenza per i parametri specificati", + "NoKbAddedText": "Aggiungi dei dati al tuo assistente per creare una Knowledge Base.", "Add": "Aggiungi dati", - "AddKbURL": "URL multipli", + "Import": "Importa", + "AddKbURL": "URL(s)", "AddKbText": "Testo semplice", "AddKbSitemap": "Mappa del sito", "LoadMore": "carica di più", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index a7021f8c7ed4..db141550f137 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "URL мекенжайларының тізімі", "placeholderUrls": "URL мекенжайларын енгізіңіз", "infoUrls": "Әр жолға бір url.", - "NoKbAdded": "Деректер көздері жоқ", - "NoKbAddedText": "Білім базасын құру үшін көмекшіге деректер көзін қосыңыз.", - "Add": "Деректер көздерін қосыңыз", - "AddKbURL": "Бірнеше URL мекенжайлары", + "NoKbAdded": "Ешқандай деректер көздерін қосқан жоқсыз", + "NoKbMatchParams": "Көрсетілген параметрлерге сәйкестік жоқ", + "NoKbAddedText": "Білім базасын құру үшін көмекшіге деректер көздерін қосыңыз.", + "Add": "Деректер көзін қосыңыз", + "Import": "Импорттау", + "AddKbURL": "URL мекенжайлары", "AddKbText": "Қарапайым мәтін", "AddKbSitemap": "Сайт картасы", "LoadMore": "көбірек жүктеңіз", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index f1bb67acdb65..8ca398180269 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "Lista de URLs", "placeholderUrls": "Insira URLs", "infoUrls": "Um URL por linha.", - "NoKbAdded": "Não existem fontes de dados", - "NoKbAddedText": "Adicione fonte de dados ao seu assistente para construir uma base de conhecimento.", - "Add": "Adicionar fontes de dados", - "AddKbURL": "Vários URLs", + "NoKbAdded": "Você não adicionou nenhuma fonte de dados", + "NoKbMatchParams": "Nenhuma correspondência para os parâmetros especificados", + "NoKbAddedText": "Adicione fontes de dados ao seu assistente para construir uma base de conhecimento.", + "Add": "Adicionar fonte de dados", + "Import": "Importar", + "AddKbURL": "URLs", "AddKbText": "Texto simples", "AddKbSitemap": "Mapa do site", "LoadMore": "Carregue mais", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index ae93e176b849..f4d1d62cda79 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "Список URL-адресов", "placeholderUrls": "Введите URL-адреса", "infoUrls": "Один URL в каждой строке.", - "NoKbAdded": "Источники данных отсутствуют", - "NoKbAddedText": "Добавьте источник данных в свой помощник, чтобы создать базу знаний.", - "Add": "Добавить источники данных", - "AddKbURL": "Несколько URL-адресов", + "NoKbAdded": "Вы не добавили ни одного источника данных", + "NoKbMatchParams": "Нет соответствия указанным параметрам", + "NoKbAddedText": "Добавьте источники данных в своего помощника, чтобы создать базу знаний.", + "Add": "Добавить источник данных", + "Import": "Импортировать", + "AddKbURL": "URL-адреса", "AddKbText": "Простой текст", "AddKbSitemap": "Карта сайта", "LoadMore": "Загрузи больше", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index fb01e630c353..461e6409dc0d 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "Листа УРЛ адреса", "placeholderUrls": "Унесите УРЛ адресе", "infoUrls": "Један УРЛ по реду.", - "NoKbAdded": "Не постоје извори података", - "NoKbAddedText": "Додајте извор података свом помоћнику да бисте изградили базу знања.", - "Add": "Додајте изворе података", - "AddKbURL": "Више УРЛ адреса", - "AddKbText": "Једноставан текст", + "NoKbAdded": "Нисте додали ниједан извор података", + "NoKbMatchParams": "Нема подударања за наведене параметре", + "NoKbAddedText": "Додајте изворе података свом помоћнику да бисте изградили базу знања.", + "Add": "Додајте извор података", + "Import": "Увоз", + "AddKbURL": "УРЛ адресе", + "AddKbText": "Обичан текст", "AddKbSitemap": "Мапа сајта", "LoadMore": "Учитај више", "Loading": "лоадинг", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index f85d84e38455..d40aa4957d0e 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1645,11 +1645,13 @@ "titleTextareaUrls": "Lista över webbadresser", "placeholderUrls": "Ange webbadresser", "infoUrls": "En webbadress per rad.", - "NoKbAdded": "Det finns inga datakällor", - "NoKbAddedText": "Lägg till datakälla i din assistent för att bygga en kunskapsbas.", - "Add": "Lägg till datakällor", - "AddKbURL": "Flera webbadresser", - "AddKbText": "Enkel text", + "NoKbAdded": "Du har inte lagt till några datakällor", + "NoKbMatchParams": "Ingen matchning för de angivna parametrarna", + "NoKbAddedText": "Lägg till datakällor i din assistent för att bygga en kunskapsbas.", + "Add": "Lägg till datakälla", + "Import": "Importera", + "AddKbURL": "webbadresser", + "AddKbText": "Oformatterad text", "AddKbSitemap": "Webbplatskarta", "LoadMore": "ladda mer", "Loading": "läser in", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 5b357694bfb2..1250ec6d83cb 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1645,15 +1645,17 @@ "titleTextareaUrls": "URL'lerin listesi", "placeholderUrls": "URL'leri girin", "infoUrls": "Satır başına bir URL.", - "NoKbAdded": "Hiçbir veri kaynağı mevcut değil", - "NoKbAddedText": "Bir bilgi tabanı oluşturmak için asistanınıza veri kaynağı ekleyin.", - "Add": "Veri kaynakları ekleyin", - "AddKbURL": "Birden çok URL", - "AddKbText": "Basit metin", - "AddKbSitemap": "Site haritası", - "LoadMore": "daha fazla yükle", - "Loading": "Yükleniyor", - "YouCanAddKBUrlsLimit": "Maksimum 300 URL ekleyebilirsiniz" + "NoKbAdded": "Du har inte lagt till några datakällor", + "NoKbMatchParams": "Ingen matchning för de angivna parametrarna", + "NoKbAddedText": "Lägg till datakällor i din assistent för att bygga en kunskapsbas.", + "Add": "Veri kaynağı ekle", + "Import": "İçe aktarmak", + "AddKbURL": "webbadresser", + "AddKbText": "Oformatterad text", + "AddKbSitemap": "Webbplatskarta", + "LoadMore": "ladda mer", + "Loading": "läser in", + "YouCanAddKBUrlsLimit": "Du kan lägga till högst 300 webbadresser" }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", "Sunday": "Pazar", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 016f47940cb8..be3eb4eb7710 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1645,10 +1645,12 @@ "titleTextareaUrls": "Список URL-адрес", "placeholderUrls": "Введіть URL-адреси", "infoUrls": "Одна URL-адреса на рядок.", - "NoKbAdded": "Джерел даних немає", - "NoKbAddedText": "Додайте джерело даних у свій помічник, щоб створити базу знань.", - "Add": "Додайте джерела даних", - "AddKbURL": "Кілька URL-адрес", + "NoKbAdded": "Ви не додали жодного джерела даних", + "NoKbMatchParams": "Немає відповідності за вказаними параметрами", + "NoKbAddedText": "Додайте джерела даних у свій помічник, щоб створити базу знань.", + "Add": "Додайте джерело даних", + "Import": "Імпорт", + "AddKbURL": "URL-адреси", "AddKbText": "Простий текст", "AddKbSitemap": "Карта сайту", "LoadMore": "завантажити ще", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index e89b485a813b..233fe9e50e7b 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1644,10 +1644,12 @@ "titleTextareaUrls": "URL manzillar ro'yxati", "placeholderUrls": "URL manzillarini kiriting", "infoUrls": "Har bir satr uchun bitta url.", - "NoKbAdded": "Hech qanday ma'lumot manbalari mavjud emas", - "NoKbAddedText": "Bilimlar bazasini yaratish uchun yordamchingizga maʼlumotlar manbasini qoʻshing.", - "Add": "Ma'lumotlar manbalarini qo'shing", - "AddKbURL": "Bir nechta URL manzillar", + "NoKbAdded": "Siz hech qanday maʼlumot manbasini qoʻshmagansiz", + "NoKbMatchParams": "Belgilangan parametrlarga mos kelmadi", + "NoKbAddedText": "Bilimlar bazasini yaratish uchun yordamchingizga maʼlumotlar manbalarini qoʻshing.", + "Add": "Ma'lumotlar manbasini qo'shing", + "Import": "Import", + "AddKbURL": "URL manzillari", "AddKbText": "Oddiy matn", "AddKbSitemap": "Sayt xaritasi", "LoadMore": "ko'proq yuklang", From a782a4fff67dcc175094725ecc39c91b21914b80 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Tue, 5 Mar 2024 16:26:37 +0100 Subject: [PATCH 19/35] site-map step2 --- .../knowledge-bases.component.html | 2 +- .../knowledge-bases/knowledge-bases.component.ts | 16 +++++++++++++++- .../add-content-menu.component.ts | 10 +++++----- .../modal-site-map/modal-site-map.component.html | 2 +- .../modal-site-map/modal-site-map.component.ts | 6 +++--- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index 7f9c7e07d429..0b6b9a60ef44 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -73,7 +73,7 @@ diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index ecd20ed49c32..7041797682c0 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -490,6 +490,20 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // }) // } + onSendSitemap(body){ + this.onCloseBaseModal(); + let error = this.msgErrorAddUpdateKb; + this.kbService.addKb(body).subscribe((resp: any) => { + this.logger.log("onSendSitemap:", resp); + let kb = resp.value; + }, (err) => { + this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR send sitemap: ", err); + this.onOpenErrorModal(error); + }, () => { + this.logger.log("[KNOWLEDGE-BASES-COMP] send sitemap *COMPLETED*"); + }) + } + /** * onAddKb */ @@ -544,7 +558,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { onAddMultiKb(body) { this.onCloseBaseModal(); - console.log("onAddMultiKb"); + // console.log("onAddMultiKb"); let error = this.msgErrorAddUpdateKb; this.kbService.addMultiKb(body).subscribe((kbs: any) => { this.logger.log("onAddMultiKb:", kbs); diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index a50ceca3a2a8..ca57c8445f63 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -38,11 +38,11 @@ export class AddContentMenuComponent implements OnInit { this.items.push(item); }); - this.translate.get('KbPage.AddKbSitemap') - .subscribe((text: any) => { - let item = {"label": text, "type":"site-map"}; - this.items.push(item); - }); + // this.translate.get('KbPage.AddKbSitemap') + // .subscribe((text: any) => { + // let item = {"label": text, "type":"site-map"}; + // this.items.push(item); + // }); //this.items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html index 43352f165b89..07b754ea45d7 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html @@ -100,7 +100,7 @@

- diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts index 437206a01c17..08bb84761b0f 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts @@ -8,7 +8,7 @@ import { KB, KbSettings } from 'app/models/kbsettings-model'; styleUrls: ['./modal-site-map.component.scss'] }) export class ModalSiteMapComponent implements OnInit { - @Output() saveKnowledgeBase = new EventEmitter(); + @Output() sendSitemap = new EventEmitter(); @Output() closeBaseModal = new EventEmitter(); kbForm: FormGroup; @@ -51,13 +51,13 @@ export class ModalSiteMapComponent implements OnInit { this.closeBaseModal.emit(); } - onSaveKnowledgeBase(){ + onSendSitemap(){ let body = { 'name': this.kb.name, 'source': this.kb.url, 'type': 'url' } - this.saveKnowledgeBase.emit(body); + this.sendSitemap.emit(body); } } From 833bf0480bcb0664108228351918958e7b5799cf Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 6 Mar 2024 12:56:51 +0100 Subject: [PATCH 20/35] =?UTF-8?q?=E2=9C=85=20=20Test=20=20"add=20sitemap"?= =?UTF-8?q?=20url=20service=20=E2=9C=85=20Set=20a=20maximum=20limit=20of?= =?UTF-8?q?=20URLs=20that=20can=20be=20indexed=20(max=2020)=20=E2=9C=85=20?= =?UTF-8?q?Check=20that=20there=20are=20no=20empty=20lines=20in=20the=20UR?= =?UTF-8?q?L=20upload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge-bases.component.html | 2 + .../knowledge-bases.component.ts | 33 +++++++---- .../add-content-menu.component.ts | 10 ++-- .../knowledge-base-table.component.ts | 7 ++- .../modal-site-map.component.html | 46 ++++++--------- .../modal-site-map.component.scss | 33 ++++++++--- .../modal-site-map.component.ts | 57 +++++++++++++++++-- .../modal-urls-knowledge-base.component.scss | 10 +++- src/app/services/knowledge-base.service.ts | 12 ++++ src/app/utils/util.ts | 2 + src/assets/i18n/ar.json | 10 +++- src/assets/i18n/az.json | 10 +++- src/assets/i18n/de.json | 10 +++- src/assets/i18n/en.json | 11 +++- src/assets/i18n/es.json | 10 +++- src/assets/i18n/fr.json | 10 +++- src/assets/i18n/it.json | 10 +++- src/assets/i18n/kk.json | 10 +++- src/assets/i18n/pt.json | 10 +++- src/assets/i18n/ru.json | 9 ++- src/assets/i18n/sr.json | 10 +++- src/assets/i18n/sv.json | 10 +++- src/assets/i18n/tr.json | 10 +++- src/assets/i18n/uk.json | 10 +++- src/assets/i18n/uz.json | 10 +++- 25 files changed, 286 insertions(+), 76 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index 0b6b9a60ef44..7e453edf7414 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -73,7 +73,9 @@ diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 7041797682c0..3159f53ed672 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -62,7 +62,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { kbsList: Array; kbsListCount: number = 0; refreshKbsList: boolean = true; - // numberPage: number = 0; + numberPage: number = 0; kbid_selected: any; @@ -86,6 +86,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { customerSatisfactionBotsCount: number; myChatbotOtherCount: number; increaseSalesBotsCount: number; + listSitesOfSitemap: any = []; private unsubscribe$: Subject = new Subject(); constructor( @@ -409,11 +410,14 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { onLoadPage(searchParams){ console.log('onLoadNextPage:',searchParams); let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT - if(searchParams?.page){ - params +="&page="+searchParams.page; - } else { - +"&page=0"; - } + //if(searchParams?.page){ + let limitPage = Math.floor(this.kbsListCount/KB_DEFAULT_PARAMS.LIMIT); + this.numberPage++; + if(this.numberPage>limitPage)this.numberPage = limitPage; + params +="&page="+this.numberPage; + // } else { + // +"&page=0"; + // } if(searchParams?.status){ params +="&status="+searchParams.status; } @@ -434,8 +438,9 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } onLoadByFilter(searchParams){ - //console.log('onLoadByFilter:',searchParams); - searchParams.page = 0; + // console.log('onLoadByFilter:',searchParams); + // searchParams.page = 0; + this.numberPage = -1; this.kbsList = []; this.onLoadPage(searchParams); } @@ -463,6 +468,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // this.SHOW_TABLE = false; // } //this.showSpinner = false; + // this.refreshKbsList = !this.refreshKbsList; }, (error) => { @@ -491,11 +497,13 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } onSendSitemap(body){ - this.onCloseBaseModal(); + // this.onCloseBaseModal(); let error = this.msgErrorAddUpdateKb; - this.kbService.addKb(body).subscribe((resp: any) => { + this.kbService.addSitemap(body).subscribe((resp: any) => { this.logger.log("onSendSitemap:", resp); - let kb = resp.value; + // let error = resp.error; + // let url = resp.url; + this.listSitesOfSitemap = resp.sites; }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR send sitemap: ", err); this.onOpenErrorModal(error); @@ -716,7 +724,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { if(response.status_code == -1 || response.status_code == 0 || response.status_code == 2){ // this.logger.log('riprova tra 10 secondi...'); this.updateStatusOfKb(kb._id, response.status_code); - timer(10000).subscribe(() => { + timer(20000).subscribe(() => { this.checkStatusWithRetry(kb); }); } else { // status == 3 || status == 4 @@ -992,6 +1000,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // ************** CLOSE ALL MODAL **************** // onCloseBaseModal(){ + this.listSitesOfSitemap = []; this.baseModalDelete = false; this.baseModalPreview = false; this.baseModalError = false; diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index ca57c8445f63..a50ceca3a2a8 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -38,11 +38,11 @@ export class AddContentMenuComponent implements OnInit { this.items.push(item); }); - // this.translate.get('KbPage.AddKbSitemap') - // .subscribe((text: any) => { - // let item = {"label": text, "type":"site-map"}; - // this.items.push(item); - // }); + this.translate.get('KbPage.AddKbSitemap') + .subscribe((text: any) => { + let item = {"label": text, "type":"site-map"}; + this.items.push(item); + }); //this.items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index af44418ff9cf..57760f6bc56a 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -38,6 +38,7 @@ export class KnowledgeBaseTableComponent implements OnInit { SHOW_MORE_BTN: boolean = true; SHOW_TABLE: boolean = false; searchParams: any; + numberPage: number = 0; // kbsListCount: number = 0; constructor( @@ -75,7 +76,9 @@ export class KnowledgeBaseTableComponent implements OnInit { loadMoreData() { this.isLoading = true; - this.searchParams.page = Math.floor(this.kbsList.length/KB_DEFAULT_PARAMS.LIMIT); + this.numberPage++; + this.searchParams.page = this.numberPage;//Math.floor(this.kbsList.length/KB_DEFAULT_PARAMS.LIMIT); + this.loadPage.emit(this.searchParams); } @@ -200,7 +203,7 @@ export class KnowledgeBaseTableComponent implements OnInit { } onOpenAddKnowledgeBaseModal(type){ - console.log('onOpenAddKnowledgeBaseModal', type); + // console.log('onOpenAddKnowledgeBaseModal', type); this.openAddKnowledgeBaseModal.emit(type); } diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html index 07b754ea45d7..daa56b23234f 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html @@ -8,7 +8,7 @@

- {{ 'KbPage.Add' | translate }} + {{ 'KbPage.TitleSitemap' | translate }}

@@ -17,24 +17,15 @@

help_outline
-

{{ 'KbPage.AddKbInfoFirstText' | translate }}

-

{{ 'KbPage.AddKbInfoSecondText' | translate }}

-

- - - +

{{ 'KbPage.InfoSitemap' | translate }}

- - {{ 'KbPage.Url' | translate }} + {{ 'KbPage.LabelInputSitemap' | translate }}
@@ -43,10 +34,10 @@

-
@@ -67,7 +58,7 @@

- {{ 'KbPage.titleUrls' | translate }} + {{ 'KbPage.TitleSitemapList' | translate }}

@@ -76,23 +67,20 @@

help_outline
- -

- {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }} + {{ 'KbPage.InfoSitemapList' | translate }} {{KB_LIMIT_CONTENT}}
-
{{ 'KbPage.titleTextareaUrls' | translate }} - - {{ 'KbPage.infoUrls' | translate }} + {{countSitemap}} {{ 'KbPage.LabelSitemapList' | translate }} + {{ 'KbPage.InfoSitemapList' | translate }} {{KB_LIMIT_CONTENT}}
-
@@ -100,8 +88,8 @@

- diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss index 7267bf43339e..ea87749f04b2 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss @@ -123,10 +123,6 @@ margin-bottom: 14px; } - .input-label { - font-weight: 400; - // letter-spacing: 0.5px; - } .custom-input { width: 100%; @@ -147,12 +143,18 @@ } .custom-textarea { width: 100%; + overflow: scroll auto; + scrollbar-width: none; + min-height: 150px; border-radius: 6px; border: 2px solid #c6cdd4; - padding: 0px 15px; + padding: 10px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; + line-height: inherit; + white-space: pre; + resize: block; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; @@ -209,4 +211,19 @@ .btn { text-transform: none; -} \ No newline at end of file +} + + + + +.input-label { + font-weight: 400; + font-size: 12px; + font-weight: normal; + margin-top: 6px; + padding-bottom: 0; +} + +.input-label-error { + color: #c62445; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts index 08bb84761b0f..71a7a0a4ca6f 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts @@ -1,6 +1,7 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, SimpleChanges, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { KB, KbSettings } from 'app/models/kbsettings-model'; +import { KB_LIMIT_CONTENT } from 'app/utils/util'; @Component({ selector: 'modal-site-map', @@ -8,12 +9,19 @@ import { KB, KbSettings } from 'app/models/kbsettings-model'; styleUrls: ['./modal-site-map.component.scss'] }) export class ModalSiteMapComponent implements OnInit { + + @Input() listSitesOfSitemap: any[]; @Output() sendSitemap = new EventEmitter(); + @Output() saveKnowledgeBase = new EventEmitter(); @Output() closeBaseModal = new EventEmitter(); + KB_LIMIT_CONTENT = KB_LIMIT_CONTENT; kbForm: FormGroup; buttonDisabled: boolean = true; isSitemapLoaded: boolean = false; + listOfUrls: string; + countSitemap: number; + errorLimit: boolean = false; kb: KB = { _id: null, @@ -31,6 +39,20 @@ export class ModalSiteMapComponent implements OnInit { this.kbForm = this.createConditionGroup(); } + ngOnChanges(changes: SimpleChanges){ + // console.log('ModalSiteMapComponent changes: ', changes); + + if(this.listSitesOfSitemap.length > 0){ + this.listOfUrls = this.listSitesOfSitemap.join('\n'); + // console.log('ModalSiteMapComponent listOfUrls: ', this.listOfUrls); + this.countSitemap = this.listSitesOfSitemap.length; + this.isSitemapLoaded = true; + } else { + this.isSitemapLoaded = false; + } + } + + createConditionGroup(): FormGroup { const namePattern = /^[^&<>]{3,}$/; return this.formBuilder.group({ @@ -47,17 +69,44 @@ export class ModalSiteMapComponent implements OnInit { } } + + onChangeList(event):void { + // this.listSitesOfSitemap = this.listOfUrls.split("\n"); + this.listSitesOfSitemap = this.listOfUrls.split("\n").filter(function(row) { + return row.trim() !== ''; + }); + this.countSitemap = this.listSitesOfSitemap.length; + } + onCloseBaseModal() { + this.listSitesOfSitemap = []; + this.listOfUrls = ""; + this.countSitemap = 0; + this.isSitemapLoaded = false; this.closeBaseModal.emit(); } onSendSitemap(){ let body = { - 'name': this.kb.name, - 'source': this.kb.url, - 'type': 'url' + 'sitemap': this.kb.url } this.sendSitemap.emit(body); } + onSaveKnowledgeBase(){ + if(this.listSitesOfSitemap.length > this.KB_LIMIT_CONTENT){ + this.errorLimit = true; + } else { + this.errorLimit = false; + const arrayURLS = this.listOfUrls.split("\n").filter(function(row) { + return row.trim() !== ''; + }); + let body = { + 'list': arrayURLS + } + this.saveKnowledgeBase.emit(body); + } + + } + } diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss index b05bda4fd1c9..128f7e423ecd 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss @@ -148,18 +148,25 @@ } .custom-textarea { width: 100%; + overflow: scroll auto; + scrollbar-width: none; + min-height: 300px; border-radius: 6px; border: 2px solid #c6cdd4; padding: 10px 15px; color: #22272d; // line-height: 35px; // font-weight: 400; + line-height: inherit; + white-space: pre; + resize: block; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; transition: border 0.3s; } } + } @@ -210,4 +217,5 @@ .btn { text-transform: none; -} \ No newline at end of file +} + diff --git a/src/app/services/knowledge-base.service.ts b/src/app/services/knowledge-base.service.ts index b40f132d8a83..287d2f43a4cf 100644 --- a/src/app/services/knowledge-base.service.ts +++ b/src/app/services/knowledge-base.service.ts @@ -148,6 +148,18 @@ export class KnowledgeBaseService { return this.httpClient.get(url, httpOptions); } + + addSitemap(body: any) { + const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + 'Authorization': this.TOKEN + }) + } + const url = this.SERVER_BASE_PATH + this.project_id + "/kb/sitemap"; + this.logger.log("[KNOWLEDGE BASE SERVICE] - add new kb URL ", url); + return this.httpClient.post(url, JSON.stringify(body), httpOptions); + } addKb(body: any) { const httpOptions = { diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index fae4e8145a45..52c060cd5cc7 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -342,6 +342,8 @@ export enum KB_DEFAULT_PARAMS { SORT_FIELD = 'updatedAt' } +export const KB_LIMIT_CONTENT = 20; + // Growth export const featuresPlanA = [ 'CRM', diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 2df1de14ea70..5099f1741ca1 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "خريطة الموقع", "LoadMore": "تحميل المزيد", "Loading": "تحميل", - "YouCanAddKBUrlsLimit": "يمكنك إضافة 300 عنوان URL كحد أقصى" + "YouCanAddKBUrlsLimit": "يجب أن تكون عناوين URL أقل من ", + "TitleSitemap": "استيراد من خريطة الموقع", + "InfoSitemap": "قم باستيراد عنوان URL لخريطة موقع الويب الخاص بموقعك على الويب لجلب عناوين URL لصفحات موقع الويب الخاص بك وتنظيمها تلقائيًا.", + "LabelInputSitemap": "عنوان URL لخريطة الموقع", + "PlaceholderInputSitemap": "أدخل عنوان URL لخريطة الموقع", + "TitleSitemapList": "مراجعة", + "InfoSitemapList": "يجب أن تكون عناوين URL أقل من أو تساوي ", + "LabelSitemapList": " تمت إضافة عنوان URL.", + "PlaceholderInputSitemapList": "أدخل عناوين URL" }, "AutomationsDemoPageDescription":"من خلال أتمتة واجهات برمجة التطبيقات لدينا، يمكنك إدارة رسائل البث الجماعية على Whatsapp باستخدام أتمتة المصمم جنبًا إلى جنب مع سهولة واجهات برمجة التطبيقات لدينا، وإرسال رسائل إلى جميع جهات الاتصال الخاصة بإدارة علاقات العملاء (CRM) المفضلة لديك، وتلقي حالة الرسائل المرسلة (المستلمة، المقروءة، وما إلى ذلك) و أكثر بكثير!", "Sunday": "الأحد", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index b900405e9b28..dde08ee279b7 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Saytın xəritəsi", "LoadMore": "daha çox yükləyin", "Loading": "yüklənir", - "YouCanAddKBUrlsLimit": "Siz maksimum 300 URL əlavə edə bilərsiniz" + "YouCanAddKBUrlsLimit": "URL-lər bundan az olmalıdır ", + "TitleSitemap": "Sayt xəritəsindən idxal edin", + "InfoSitemap": "Veb saytınızın səhifələrinin URL-lərini avtomatik əldə etmək və təşkil etmək üçün veb saytınızın sayt xəritəsi URL-ni idxal edin.", + "LabelInputSitemap": "Sayt xəritəsi URL", + "PlaceholderInputSitemap": "Sayt xəritəsi URL daxil edin", + "TitleSitemapList": "Baxış-icmal", + "InfoSitemapList": "URL-lər bundan az və ya bərabər olmalıdır ", + "LabelSitemapList": " URL əlavə edildi.", + "PlaceholderInputSitemapList": "URL-ləri daxil edin" }, "AutomationsDemoPageDescription":"Bizim “API avtomatlaşdırmalarımız” ilə siz API-lərimizin asanlığı ilə birləşdirilən dizayner avtomatlaşdırmalarından istifadə edərək Whatsapp-da kütləvi yayım mesajlarını idarə edə, sevimli CRM-nin bütün kontaktlarına mesaj göndərə, göndərilən mesajların statusunu (qəbul edildi, oxundu və s.) ala bilərsiniz. ) və daha çox!", "Sunday": "bazar günü", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index d694ad7e6644..469fd6c607c9 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Seitenverzeichnis", "LoadMore": "Mehr laden", "Loading": "Wird geladen", - "YouCanAddKBUrlsLimit": "Sie können maximal 300 URLs hinzufügen" + "YouCanAddKBUrlsLimit": "URLs müssen kleiner als sein ", + "TitleSitemap": "Aus Sitemap importieren", + "InfoSitemap": "Importieren Sie die Sitemap-URL Ihrer Website, um die URLs der Seiten Ihrer Website automatisch abzurufen und zu organisieren.", + "LabelInputSitemap": "Sitemap-URL", + "PlaceholderInputSitemap": "Geben Sie die Sitemap-URL ein", + "TitleSitemapList": "Rezension", + "InfoSitemapList": "URLs müssen kleiner oder gleich sein ", + "LabelSitemapList": " URL hinzugefügt.", + "PlaceholderInputSitemapList": "Geben Sie URLs ein" }, "AutomationsDemoPageDescription":"Mit unseren „APIs-Automatisierungen“ können Sie Massennachrichten auf WhatsApp verwalten, indem Sie die Automatisierungen des Designers in Kombination mit der Benutzerfreundlichkeit unserer APIs nutzen, Nachrichten an alle Kontakte Ihres bevorzugten CRM senden, den Status gesendeter Nachrichten (empfangen, gelesen usw.) erhalten. ) und vieles mehr!", "Sunday": "Sonntag", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ee570b9508a9..285b09ba6ea5 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1655,7 +1655,16 @@ "AddKbSitemap": "Sitemap", "LoadMore": "load more", "Loading": "loading", - "YouCanAddKBUrlsLimit":"You can add a maximum of 300 URLs" + "YouCanAddKBUrlsLimit":"URLs must be less than ", + "TitleSitemap": "Import from sitemap", + "InfoSitemap": "Import your website's sitemap URL to automatically fetch and organize the URLs of your website's pages.", + "LabelInputSitemap": "Sitemap URL", + "PlaceholderInputSitemap": "Enter sitemap URL", + "TitleSitemapList": "Review & confirm URLs", + "InfoSitemapList": "URLs must be less than or equal to ", + "LabelSitemapList": " URL added.", + "PlaceholderInputSitemapList": "Enter URLs" + }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", "Sunday": "Sunday", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 7dfd0d6a8d2e..cb0a707205df 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Seitenverzeichnis", "LoadMore": "Mehr laden", "Loading": "Wird geladen", - "YouCanAddKBUrlsLimit": "Sie können maximal 300 URLs hinzufügen" + "YouCanAddKBUrlsLimit": "Las URL deben ser menores que ", + "TitleSitemap": "Importar desde el mapa del sitio", + "InfoSitemap": "Importe la URL del mapa del sitio de su sitio web para buscar y organizar automáticamente las URL de las páginas de su sitio web.", + "LabelInputSitemap": "URL del mapa del sitio", + "PlaceholderInputSitemap": "Ingrese la URL del mapa del sitio", + "TitleSitemapList": "Revisar", + "InfoSitemapList": "Las URL deben ser menores o iguales que ", + "LabelSitemapList": " URL agregada.", + "PlaceholderInputSitemapList": "Ingrese las URL" }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", "Sunday": "Domingo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 1f69e2cee834..b2ca564d0776 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Plan du site", "LoadMore": "charger plus", "Loading": "chargement", - "YouCanAddKBUrlsLimit": "Vous pouvez ajouter un maximum de 300 URL" + "YouCanAddKBUrlsLimit": "Les URL doivent être inférieures à ", + "TitleSitemap": "Importer à partir du plan du site", + "InfoSitemap": "Importez l'URL du plan du site de votre site Web pour récupérer et organiser automatiquement les URL des pages de votre site Web.", + "LabelInputSitemap": "URL du plan du site", + "PlaceholderInputSitemap": "Saisissez l'URL du plan du site", + "TitleSitemapList": "Revoir", + "InfoSitemapList": "Les URL doivent être inférieures ou égales à ", + "LabelSitemapList": " URL ajoutée.", + "PlaceholderInputSitemapList": "Saisissez les URL" }, "AutomationsDemoPageDescription":"Avec nos “Automatisations API” vous pouvez gérer les messages diffusés en masse sur Whatsapp grâce aux automatisations du concepteur combinées à la simplicité de nos API, envoyer des messages à tous les contacts de votre CRM préféré, recevoir le statut des messages envoyés (reçus, lus, etc. ) et beaucoup plus!", "Sunday": "Dimanche", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index bd3845f0023f..4c508ea05740 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Mappa del sito", "LoadMore": "carica di più", "Loading": "caricamento", - "YouCanAddKBUrlsLimit": "Puoi aggiungere un massimo di 300 URL" + "YouCanAddKBUrlsLimit": "Gli URL devono essere inferiori a ", + "TitleSitemap": "Importa dalla sitemap", + "InfoSitemap": "Importa l'URL della sitemap del tuo sito web per recuperare e organizzare automaticamente gli URL delle pagine del tuo sito web.", + "LabelInputSitemap": "URL della sitemap", + "PlaceholderInputSitemap": "Inserisci l'URL della sitemap", + "TitleSitemapList": "Controlla e conferma gli URL", + "InfoSitemapList": "Gli URL devono essere inferiori o uguali a ", + "LabelSitemapList": " URL aggiunto.", + "PlaceholderInputSitemapList": "Inserisci gli URL" }, "AutomationsDemoPageDescription": "Con le nostre “APIs automations” puoi gestire messaggi broadcast massivi su Whatsapp utilizzando le automazioni del designer uniti alla facilità delle nostre API, inviare messaggi a tutti i contatti del tuo CRM preferito, ricevere lo stato dei messaggi inviati (ricevuto, letto etc.) e molto altro ancora!", "Sunday": "Domenica", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index db141550f137..2bbad748d72e 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Сайт картасы", "LoadMore": "көбірек жүктеңіз", "Loading": "жүктеу", - "YouCanAddKBUrlsLimit": "Ең көбі 300 URL қосуға болады" + "YouCanAddKBUrlsLimit": "URL мекенжайлары мынадан аз болуы керек ", + "TitleSitemap": "Сайт картасынан импорттау", + "InfoSitemap": "Веб-сайт беттерінің URL мекенжайларын автоматты түрде алу және ұйымдастыру үшін веб-сайтыңыздың сайт картасының URL мекенжайын импорттаңыз.", + "LabelInputSitemap": "Сайт картасының URL мекенжайы", + "PlaceholderInputSitemap": "Сайт картасының URL мекенжайын енгізіңіз", + "TitleSitemapList": "Қарау", + "InfoSitemapList": "URL мекенжайлары одан кіші немесе тең болуы керек ", + "LabelSitemapList": " URL қосылды.", + "PlaceholderInputSitemapList": "URL мекенжайларын енгізіңіз" }, "AutomationsDemoPageDescription":"Біздің «API автоматикасының» көмегімен сіз WhatsApp желісіндегі жаппай хабарларды біздің API интерфейстеріміздің қарапайымдылығымен біріктірілген дизайнерлік автоматтандыруды пайдаланып басқара аласыз, сүйікті CRM-тің барлық контактілеріне хабарламалар жібере аласыз, жіберілген хабарламалардың күйін ала аласыз (қабылданған, оқылған және т. ) және тағы басқалар!", "Sunday": "Жексенбі", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 8ca398180269..2246090fd0a8 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Mapa do site", "LoadMore": "Carregue mais", "Loading": "carregando", - "YouCanAddKBUrlsLimit": "Você pode adicionar no máximo 300 URLs" + "YouCanAddKBUrlsLimit": "Os URLs devem ser menores que ", + "TitleSitemap": "Importar do mapa do site", + "InfoSitemap": "Importe o URL do mapa do site do seu site para buscar e organizar automaticamente os URLs das páginas do seu site.", + "LabelInputSitemap": "URL do mapa do site", + "PlaceholderInputSitemap": "Insira o URL do mapa do site", + "TitleSitemapList": "Análise", + "InfoSitemapList": "Os URLs devem ser menores ou iguais a ", + "LabelSitemapList": " URL adicionado.", + "PlaceholderInputSitemapList": "Insira URLs" }, "AutomationsDemoPageDescription":"Com nossas “automações de APIs” você pode gerenciar mensagens de difusão em massa no Whatsapp utilizando as automações do designer aliadas à facilidade de nossas APIs, enviar mensagens para todos os contatos do seu CRM favorito, receber o status das mensagens enviadas (recebidas, lidas, etc. ) e muito mais!", "Sunday": "Domingo", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index f4d1d62cda79..2601def628c4 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1655,7 +1655,14 @@ "AddKbSitemap": "Карта сайта", "LoadMore": "Загрузи больше", "Loading": "загрузка", - "YouCanAddKBUrlsLimit": "Вы можете добавить максимум 300 URL-адресов." + "TitleSitemap": "Импорт из карты сайта", + "InfoSitemap": "Импортируйте URL-адрес карты сайта вашего веб-сайта, чтобы автоматически получать и систематизировать URL-адреса страниц вашего веб-сайта.", + "LabelInputSitemap": "URL-адрес карты сайта", + "PlaceholderInputSitemap": "Введите URL-адрес карты сайта", + "TitleSitemapList": "Обзор", + "InfoSitemapList": "URL-адреса должны быть меньше или равны ", + "LabelSitemapList": " URL добавлен.", + "PlaceholderInputSitemapList": "Введите URL-адреса" }, "AutomationsDemoPageDescription":"С помощью нашей «автоматизации API» вы можете управлять массовыми рассылками сообщений в Whatsapp, используя дизайнерскую автоматизацию в сочетании с простотой наших API, отправлять сообщения всем контактам вашей любимой CRM, получать статус отправленных сообщений (получено, прочитано и т. д.). ) и многое другое!", "Sunday": "Воскресенье", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index 461e6409dc0d..76c289a47b7e 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Мапа сајта", "LoadMore": "Учитај више", "Loading": "лоадинг", - "YouCanAddKBUrlsLimit": "Можете додати највише 300 УРЛ адреса" + "YouCanAddKBUrlsLimit": "УРЛ-ови морају бити мањи од ", + "TitleSitemap": "Увези из мапе сајта", + "InfoSitemap": "Увезите УРЛ мапе сајта своје веб локације да бисте аутоматски преузели и организовали УРЛ-ове страница вашег веб-сајта.", + "LabelInputSitemap": "УРЛ мапе сајта", + "PlaceholderInputSitemap": "Унесите УРЛ мапе сајта", + "TitleSitemapList": "Преглед", + "InfoSitemapList": "УРЛ-ови морају бити мањи или једнаки ", + "LabelSitemapList": " УРЛ је додат.", + "PlaceholderInputSitemapList": "Унесите УРЛ адресе" }, "AutomationsDemoPageDescription":"Са нашим „АПИ аутоматизацијама“ можете управљати масовним емитовањем порука на Вхатсапп-у користећи аутоматизацију дизајнера у комбинацији са лакоћом наших АПИ-ја, слати поруке свим контактима вашег омиљеног ЦРМ-а, примати статус послатих порука (примљено, прочитано, итд. ) и још много тога!", "Sunday": "недеља", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index d40aa4957d0e..765c35cead4d 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Webbplatskarta", "LoadMore": "ladda mer", "Loading": "läser in", - "YouCanAddKBUrlsLimit": "Du kan lägga till högst 300 webbadresser" + "YouCanAddKBUrlsLimit": "Webbadresser måste vara mindre än ", + "TitleSitemap": "Importera från webbplatskarta", + "InfoSitemap": "Importera webbplatsens webbadress för webbplatskarta för att automatiskt hämta och organisera webbadresserna till webbplatsens sidor.", + "LabelInputSitemap": "Webbplatskartans URL", + "PlaceholderInputSitemap": "Ange webbplatskartans URL", + "TitleSitemapList": "Recension", + "InfoSitemapList": "Webbadresser måste vara mindre än eller lika med ", + "LabelSitemapList": " URL har lagts till.", + "PlaceholderInputSitemapList": "Ange webbadresser" }, "AutomationsDemoPageDescription":"Med våra “API-automatiseringar” kan du hantera massutsändningsmeddelanden på Whatsapp med hjälp av designerns automatiseringar kombinerat med enkelheten hos våra API: er, skicka meddelanden till alla kontakter i din favorit-CRM, ta emot status för skickade meddelanden (mottagna, lästa, etc. ) och mycket mer!", "Sunday": "söndag", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 1250ec6d83cb..e12663dbf9b3 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Webbplatskarta", "LoadMore": "ladda mer", "Loading": "läser in", - "YouCanAddKBUrlsLimit": "Du kan lägga till högst 300 webbadresser" + "YouCanAddKBUrlsLimit": "URL'ler şu değerden küçük olmalıdır: ", + "TitleSitemap": "Site haritasından içe aktar", + "InfoSitemap": "Web sitenizin sayfalarının URL'lerini otomatik olarak getirip düzenlemek için web sitenizin site haritası URL'sini içe aktarın.", + "LabelInputSitemap": "Site Haritası URL'si", + "PlaceholderInputSitemap": "Site haritası URL'sini girin", + "TitleSitemapList": "Gözden geçirmek", + "InfoSitemapList": "URL'ler şu değerden küçük veya ona eşit olmalıdır: ", + "LabelSitemapList": " URL eklendi.", + "PlaceholderInputSitemapList": "URL'leri girin" }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", "Sunday": "Pazar", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index be3eb4eb7710..da5c1b0658b8 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1655,7 +1655,15 @@ "AddKbSitemap": "Карта сайту", "LoadMore": "завантажити ще", "Loading": "завантаження", - "YouCanAddKBUrlsLimit": "Ви можете додати максимум 300 URL-адрес" + "YouCanAddKBUrlsLimit": "URL-адреси мають бути менше ніж ", + "TitleSitemap": "Імпорт із карти сайту", + "InfoSitemap": "Імпортуйте URL-адресу карти сайту для автоматичного отримання й упорядкування URL-адрес сторінок вашого веб-сайту.", + "LabelInputSitemap": "URL карти сайту", + "PlaceholderInputSitemap": "Введіть URL карти сайту", + "TitleSitemapList": "огляд", + "InfoSitemapList": "URL-адреси мають бути меншими або дорівнювати ", + "LabelSitemapList": " URL додано.", + "PlaceholderInputSitemapList": "Введіть URL-адреси" }, "AutomationsDemoPageDescription":"Завдяки нашій «автоматизації API» ви можете керувати масовими широкомовними повідомленнями в Whatsapp за допомогою автоматизації дизайнера в поєднанні з простотою наших API, надсилати повідомлення всім контактам вашої улюбленої CRM, отримувати статус надісланих повідомлень (отримано, прочитано тощо). ) і багато іншого!", "Sunday": "неділя", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 233fe9e50e7b..e6e271bcafdd 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1654,7 +1654,15 @@ "AddKbSitemap": "Sayt xaritasi", "LoadMore": "ko'proq yuklang", "Loading": "yuklash", - "YouCanAddKBUrlsLimit": "Siz maksimal 300 ta URL qo'shishingiz mumkin" + "YouCanAddKBUrlsLimit": "URL manzillar dan kichik boʻlishi kerak ", + "TitleSitemap": "Sayt xaritasidan import qilish", + "InfoSitemap": "Veb-saytingiz sahifalarining URL manzillarini avtomatik ravishda olish va tartibga solish uchun veb-saytingizning sayt xaritasi URL-manzilini import qiling.", + "LabelInputSitemap": "Sayt xaritasi URL", + "PlaceholderInputSitemap": "Sayt xaritasi URL manzilini kiriting", + "TitleSitemapList": "Ko‘rib chiqish", + "InfoSitemapList": "URL manzillar bundan kichik yoki teng boʻlishi kerak ", + "LabelSitemapList": " URL qo'shildi.", + "PlaceholderInputSitemapList": "URL manzillarini kiriting" }, "AutomationsDemoPageDescription":"Bizning “API avtomatizatsiyamiz” yordamida siz Whatsapp-da ommaviy translyatsiya xabarlarini bizning API-larimiz qulayligi bilan birlashtirilgan dizayner avtomatizatsiyasidan foydalangan holda boshqarishingiz, sevimli CRM-ning barcha kontaktlariga xabarlar yuborishingiz, yuborilgan xabarlar holatini (qabul qilingan, o'qilgan va hokazo) olishingiz mumkin. ) va yana ko'p narsalar!", "Sunday": "yakshanba", From e2f8d8a5c41c3d9cd1d67ec0eeaa876cd8cd4d78 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 6 Mar 2024 15:54:45 +0100 Subject: [PATCH 21/35] =?UTF-8?q?=E2=9C=85=20deleted=20the=20status=20chec?= =?UTF-8?q?k=20when=20loading=20content=20=E2=9C=85=20added=20check=20stat?= =?UTF-8?q?us=20button=20on=20each=20row=20of=20kb=20table=20of=20contents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge-bases.component.html | 1 + .../knowledge-bases.component.ts | 63 +++++++++++++------ .../knowledge-base-table.component.html | 5 ++ .../knowledge-base-table.component.ts | 8 ++- 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index 7e453edf7414..e26c75e78d2d 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -48,6 +48,7 @@ (openBaseModalDelete)="onOpenBaseModalDelete($event)" (openBaseModalPreview)="onOpenBaseModalPreview()" (openAddKnowledgeBaseModal)="openAddKnowledgeBaseModal($event)" + (checkStatus)="onCheckStatus($event)" (runIndexing)="onRunIndexing($event)" (loadPage)="onLoadPage($event)" (loadByFilter)="onLoadByFilter($event)" diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 3159f53ed672..39410c5cde4b 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -545,13 +545,12 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } // this.onLoadByFilter(searchParams); } - //this.updateStatusOfKb(kb._id, 0); + // this.updateStatusOfKb(kb._id, 0); // this.onLoadByFilter(searchParams); - // this.logger.log("kbsList:",that.kbsList); // that.onRunIndexing(kb); - setTimeout(() => { - this.checkStatusWithRetry(kb); - }, 2000); + // setTimeout(() => { + // this.checkStatusWithRetry(kb); + // }, 2000); //that.onCloseBaseModal(); }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR add new kb: ", err); @@ -573,11 +572,11 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); kbs.forEach(kb => { this.kbsList.unshift(kb); - if(kb.status == -1 || kb.status == 0 || kb.status == 2) { - setTimeout(() => { - this.checkStatusWithRetry(kb); - }, 2000); - } + // if(kb.status == -1 || kb.status == 0 || kb.status == 2) { + // setTimeout(() => { + // this.checkStatusWithRetry(kb); + // }, 2000); + // } }); this.kbsListCount = this.kbsListCount+kbs.length; this.refreshKbsList = !this.refreshKbsList; @@ -684,9 +683,9 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // this.removeKb(kb._id); this.updateStatusOfKb(kbNew._id, 0); this.refreshKbsList = !this.refreshKbsList; - setTimeout(() => { - this.checkStatusWithRetry(kbNew); - }, 2000); + // setTimeout(() => { + // this.checkStatusWithRetry(kbNew); + // }, 2000); }, (err) => { this.logger.error("[KNOWLEDGE BASES COMP] ERROR add new kb: ", err); this.onOpenErrorModal(error); @@ -714,6 +713,9 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { "namespace": this.id_project, "id": kb._id } + var status_msg = "Indicizzazione terminata con successo!"; + var status_code = 2; + var status_label = "done" this.openaiService.checkScrapingStatus(data).subscribe((response: any) => { // this.logger.log('Risposta ricevuta:', response); // if(response.status_code && response.status_code == -1){ @@ -721,20 +723,36 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // // this.onRunIndexing(kb); // this.checkStatusWithRetry(kb); // } + + if(response.status_code == -1 || response.status_code == 0 || response.status_code == 2){ // this.logger.log('riprova tra 10 secondi...'); this.updateStatusOfKb(kb._id, response.status_code); - timer(20000).subscribe(() => { - this.checkStatusWithRetry(kb); - }); - } else { // status == 3 || status == 4 + // timer(20000).subscribe(() => { + // this.checkStatusWithRetry(kb); + // }); + + status_msg = "Indicizzazione in corso stato: "+response.status_code; + status_code = 3; + status_label = "warning"; + } else if(response.status_code == 4 ){ // status == 3 || status == 4 // this.logger.log('Risposta corretta:', response.status_code); - this.updateStatusOfKb(kb._id, response.status_code); + status_code = 4; + status_label = "dangerous"; + status_msg = "Errore nell'indicizzazione "+response.status_code; + } else { + //status_msg = "Indicizzazione in corso stato: "+response.status_code; } + this.updateStatusOfKb(kb._id, response.status_code); + this.notify.showWidgetStyleUpdateNotification(status_msg, status_code, status_label); }, error => { this.logger.error('Error: ', error); this.updateStatusOfKb(kb._id, -2); + status_code = 4; + status_label = "dangerous"; + status_msg = "Errore: "+error.message; + this.notify.showWidgetStyleUpdateNotification(status_msg, status_code, status_label); }); } @@ -756,6 +774,13 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } + /** + * onCheckStatus + */ + onCheckStatus(kb){ + this.checkStatusWithRetry(kb); + } + /** * runIndexing */ @@ -774,7 +799,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.notify.showWidgetStyleUpdateNotification(this.msgErrorIndexingKb, 4, 'report_problem'); } else { this.notify.showWidgetStyleUpdateNotification(this.msgSuccesIndexingKb, 2, 'done'); - this.checkStatusWithRetry(kb); + // this.checkStatusWithRetry(kb); } }, (error) => { this.logger.error("error start scraping response: ", error); diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index b96d2905ce52..77dfacbcdc89 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -147,6 +147,11 @@ close {{'KbPage.DeleteKb' | translate}} + + diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 57760f6bc56a..7ddc14b9426e 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -22,10 +22,11 @@ export class KnowledgeBaseTableComponent implements OnInit { @Output() openBaseModalDelete = new EventEmitter(); @Output() openBaseModalPreview = new EventEmitter(); @Output() openAddKnowledgeBaseModal = new EventEmitter(); - + @Output() checkStatus = new EventEmitter(); @Output() runIndexing = new EventEmitter(); @Output() loadPage = new EventEmitter(); @Output() loadByFilter = new EventEmitter(); + timeoutId: any; // kbsListfilterTypeFilter: KB[] = []; @@ -207,6 +208,11 @@ export class KnowledgeBaseTableComponent implements OnInit { this.openAddKnowledgeBaseModal.emit(type); } + onCheckStatus(kb){ + // console.log('onCheckStatus:: ', kb); + this.checkStatus.emit(kb); + } + } From ab41b5d5e62c69c6e9b99ed6816a5e3b04a0fd36 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 6 Mar 2024 18:00:52 +0100 Subject: [PATCH 22/35] changed default state to 3; added translation labels --- src/app/knowledge-bases/knowledge-bases.component.ts | 12 ++++-------- src/assets/i18n/ar.json | 5 +++-- src/assets/i18n/az.json | 5 +++-- src/assets/i18n/de.json | 5 +++-- src/assets/i18n/en.json | 4 ++-- src/assets/i18n/es.json | 5 +++-- src/assets/i18n/fr.json | 5 +++-- src/assets/i18n/it.json | 5 +++-- src/assets/i18n/kk.json | 5 +++-- src/assets/i18n/pt.json | 5 +++-- src/assets/i18n/ru.json | 5 +++-- src/assets/i18n/sr.json | 5 +++-- src/assets/i18n/sv.json | 5 +++-- src/assets/i18n/tr.json | 5 +++-- src/assets/i18n/uk.json | 5 +++-- src/assets/i18n/uz.json | 5 +++-- 16 files changed, 48 insertions(+), 38 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 39410c5cde4b..fad22a3f5e12 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -460,7 +460,9 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } else { this.kbsList.push(kb); } + this.updateStatusOfKb(kb._id, 3); }); + // if(this.kbsList.length>0){ // this.SHOW_TABLE = true; // this.checkAllStatuses(); @@ -536,7 +538,6 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbsList.unshift(kb); this.kbsListCount = this.kbsListCount+1; this.refreshKbsList = !this.refreshKbsList; - // let searchParams = { // "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, // "direction": KB_DEFAULT_PARAMS.DIRECTION, @@ -545,6 +546,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } // this.onLoadByFilter(searchParams); } + this.updateStatusOfKb(kb._id, 3); // this.updateStatusOfKb(kb._id, 0); // this.onLoadByFilter(searchParams); // that.onRunIndexing(kb); @@ -577,6 +579,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // this.checkStatusWithRetry(kb); // }, 2000); // } + this.updateStatusOfKb(kb._id, 3); }); this.kbsListCount = this.kbsListCount+kbs.length; this.refreshKbsList = !this.refreshKbsList; @@ -614,7 +617,6 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.removeKb(kb._id); this.kbsListCount = this.kbsListCount-1; this.refreshKbsList = !this.refreshKbsList; - // let searchParams = { // "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, // "direction": KB_DEFAULT_PARAMS.DIRECTION, @@ -965,10 +967,6 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // this.newKb = { name: '', url: '' } } - - - - closeSecretsModal() { this.secretsModal = 'none'; } @@ -977,7 +975,6 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.missingGptkeyModal = 'none'; } - closeDeleteKnowledgeBaseModal() { this.deleteKnowledgeBaseModal = 'none'; this.baseModalDelete = false; @@ -1022,7 +1019,6 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } - // ************** CLOSE ALL MODAL **************** // onCloseBaseModal(){ this.listSitesOfSitemap = []; diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 5099f1741ca1..c6ce7a3f980a 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "أسرار", "Enter": "يدخل", - "RunIndexing": "تشغيل الفهرسة", + "RunIndexing": "إعادة التدريب", + "RunCheckStatus": "تحقق من حالة", + "DeleteKb": "يمسح", "CreationDate": "تاريخ الإنشاء", "KbCounterFooter": "{{ counter }} تمت إضافة 3 قواعد معرفية", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "اكتب عنوان URL لقاعدة المعرفة", "TypeKbKeyPlaceholder": "اكتب مفتاح GPT الخاص بك", "AskQuestionPlaceholder": "طرح سؤال", - "DeleteKb": "حذف قاعدة المعرفة", "DeleteKbInfoFirstText": "لن تتمكن بعد الآن من استخدام الذكاء الاصطناعي في قاعدة المعرفة هذه", "SureToDelete": "هل أنت متأكد أنك تريد حذف قاعدة المعرفة {{ name }}؟", "GptKeyInfo": "أدخل مفتاح GPT الخاص بك لاستخدام قواعد المعرفة الخاصة بك", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index dde08ee279b7..130457fb210c 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Sirlər", "Enter": "Daxil edin", - "RunIndexing": "İndeksləşdirməni işə salın", + "RunIndexing": "Yenidən məşq edin", + "RunCheckStatus": "Vəziyyəti yoxlayın", + "DeleteKb": "Sil", "CreationDate": "Yaradılma tarixi", "KbCounterFooter": "{{ counter }} 3 Bilik bazası əlavə edildi", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Bilik Bazasının URL-ni yazın", "TypeKbKeyPlaceholder": "GPT açarınızı yazın", "AskQuestionPlaceholder": "Sual ver", - "DeleteKb": "Bilik bazasını silin", "DeleteKbInfoFirstText": "Artıq bu bilik bazasında süni intellektdən istifadə edə bilməyəcəksiniz", "SureToDelete": "Bilik Bazasını silmək istədiyinizə əminsiniz {{ name }}?", "GptKeyInfo": "Bilik Bazalarınızdan istifadə etmək üçün GPT Açarınızı daxil edin", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 469fd6c607c9..83f04719949d 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1578,7 +1578,9 @@ "KbPage": { "Secrets": "Geheimnisse", "Enter": "Eingeben", - "RunIndexing": "Führen Sie die Indizierung aus", + "RunIndexing": "Umschulen", + "RunCheckStatus": "Status überprüfen", + "DeleteKb": "Löschen", "CreationDate": "Erstellungsdatum", "KbCounterFooter": "{{ counter }} von 3 Wissensdatenbanken hinzugefügt", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1598,7 +1600,6 @@ "TypeKbUrlPlaceholder": "Geben Sie die URL der Wissensdatenbank ein", "TypeKbKeyPlaceholder": "Geben Sie Ihren GPT-Schlüssel ein", "AskQuestionPlaceholder": "Stelle eine Frage", - "DeleteKb": "Wissensdatenbank löschen", "DeleteKbInfoFirstText": "Sie können KI auf dieser Wissensdatenbank nicht mehr verwenden", "SureToDelete": "Sind Sie sicher, dass Sie die Wissensdatenbank löschen möchten? {{ name }}?", "GptKeyInfo": "Geben Sie Ihren GPT-Schlüssel ein, um Ihre Wissensdatenbanken zu nutzen", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 285b09ba6ea5..3533aa41d7cd 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1578,6 +1578,8 @@ "Secrets": "Secrets", "Enter": "Enter", "RunIndexing": "Re-train", + "RunCheckStatus": "Check status", + "DeleteKb": "Delete", "CreationDate": "Creation date", "KbCounterFooter": "{{counter}} of 3 Knowledge Bases added", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Type Knowledge Base URL", "TypeKbKeyPlaceholder": "Type your GPT-Key", "AskQuestionPlaceholder": "Ask a question", - "DeleteKb": "Delete KB", "DeleteKbInfoFirstText": "You will no longer be able to use AI on this knowledge base", "SureToDelete": "Are you sure you want to delete the Knowledge Base {{ name }} ?", "GptKeyInfo": "Enter your GPT-Key to use your Knowledge Bases", @@ -1664,7 +1665,6 @@ "InfoSitemapList": "URLs must be less than or equal to ", "LabelSitemapList": " URL added.", "PlaceholderInputSitemapList": "Enter URLs" - }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", "Sunday": "Sunday", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index cb0a707205df..222232da2e29 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Misterios", "Enter": "Ingresar", - "RunIndexing": "Ejecutar indexación", + "RunIndexing": "Volver a entrenar", + "RunCheckStatus": "Comprobar estado", + "DeleteKb": "Borrar", "CreationDate": "Fecha de creación", "KbCounterFooter": "{{ counter }} de 3 Bases de Conocimiento añadidas", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Escriba la URL de la base de conocimientos", "TypeKbKeyPlaceholder": "Escriba su clave GPT", "AskQuestionPlaceholder": "Hacer una pregunta", - "DeleteKb": "Eliminar base de conocimientos", "DeleteKbInfoFirstText": "Ya no podrás utilizar la IA en esta base de conocimientos", "SureToDelete": "¿Estás seguro de que deseas eliminar la base de conocimientos {{ name }}?", "GptKeyInfo": "Ingrese su clave GPT para usar sus bases de conocimientos", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index b2ca564d0776..fbfb8a51f632 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Secrets", "Enter": "Entrer", - "RunIndexing": "Exécuter l'indexation", + "RunIndexing": "Recycler", + "RunCheckStatus": "Vérifier l'état", + "DeleteKb": "Supprimer", "CreationDate": "Date de création", "KbCounterFooter": "{{ counter }} sur 3 bases de connaissances ajoutées", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Saisissez l'URL de la base de connaissances", "TypeKbKeyPlaceholder": "Tapez votre clé GPT", "AskQuestionPlaceholder": "poser une question", - "DeleteKb": "Supprimer la base de connaissances", "DeleteKbInfoFirstText": "Vous ne pourrez plus utiliser l'IA sur cette base de connaissances", "SureToDelete": "Êtes-vous sûr de vouloir supprimer la base de connaissances {{ name }}?", "GptKeyInfo": "Entrez votre clé GPT pour utiliser vos bases de connaissances", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 4c508ea05740..31163c804c93 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1578,7 +1578,9 @@ "KbPage": { "Secrets": "Secrets", "Enter": "Invia", - "RunIndexing": "Riaddestrare", + "RunIndexing": "Addestra", + "RunCheckStatus": "Verifica lo stato", + "DeleteKb": "Elimina", "CreationDate": "Data creazione", "KbCounterFooter": "{{ counter }} di 3 Knowledge Base aggiunte", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1598,7 +1600,6 @@ "TypeKbUrlPlaceholder": "Digita l'URL della Knowledge Base", "TypeKbKeyPlaceholder": "Digita la tua GPT Key", "AskQuestionPlaceholder": "Fai una domanda", - "DeleteKb": "Elimina Knowledge Base", "DeleteKbInfoFirstText": "Non sarai più in grado di utilizzare l'AI su questa Knowledge Base", "SureToDelete": "Sei sicuro di voler eliminare la Knowledge Base {{ name }}?", "GptKeyInfo": "Inserisci la tua GPT Key per poter utilizzare le tue Knowledge Base", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index 2bbad748d72e..a9ef4c362fa1 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Құпиялар", "Enter": "Енгізіңіз", - "RunIndexing": "Индекстеуді іске қосыңыз", + "RunIndexing": "Қайта жаттықтыру", + "RunCheckStatus": "Күйін тексеру", + "DeleteKb": "Жою", "CreationDate": "Жасалу күні", "KbCounterFooter": "{{ counter }} 3 білім қоры қосылды", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Білім қорының URL мекенжайын теріңіз", "TypeKbKeyPlaceholder": "GPT кілтін теріңіз", "AskQuestionPlaceholder": "Сұрақ қою", - "DeleteKb": "Білім қорын жою", "DeleteKbInfoFirstText": "Сіз бұдан былай бұл білім базасында AI пайдалана алмайсыз", "SureToDelete": "Білім қорын жойғыңыз келетініне сенімдісіз бе {{ name }}?", "GptKeyInfo": "Білім қорын пайдалану үшін GPT кілтін енгізіңіз", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 2246090fd0a8..8be3dc47e1a3 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Segredos", "Enter": "Digitar", - "RunIndexing": "Executar indexação", + "RunIndexing": "Retreinar", + "RunCheckStatus": "Verifique o status", + "DeleteKb": "Excluir", "CreationDate": "Data de criação", "KbCounterFooter": "{{ counter }} de 3 bases de conhecimento adicionadas", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Digite o URL da base de conhecimento", "TypeKbKeyPlaceholder": "Digite sua chave GPT", "AskQuestionPlaceholder": "Faça uma pergunta", - "DeleteKb": "Excluir base de conhecimento", "DeleteKbInfoFirstText": "Você não poderá mais usar IA nesta base de conhecimento", "SureToDelete": "Tem certeza de que deseja excluir a Base de Conhecimento {{ name }}?", "GptKeyInfo": "Insira sua chave GPT para usar suas bases de conhecimento", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 2601def628c4..7d02a44b8f64 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Секреты", "Enter": "Входить", - "RunIndexing": "Запустить индексирование", + "RunIndexing": "Переобучение", + "RunCheckStatus": "Проверить состояние", + "DeleteKb": "Удалить", "CreationDate": "Дата создания", "KbCounterFooter": "{{ counter }} добавлено из 3 баз знаний", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Введите URL-адрес базы знаний", "TypeKbKeyPlaceholder": "Введите ключ GPT", "AskQuestionPlaceholder": "Задайте вопрос", - "DeleteKb": "Удалить базу знаний", "DeleteKbInfoFirstText": "Вы больше не сможете использовать ИИ в этой базе знаний.", "SureToDelete": "Вы уверены, что хотите удалить Базу знаний {{ name }}?", "GptKeyInfo": "Введите свой ключ GPT, чтобы использовать свои базы знаний.", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index 76c289a47b7e..d7281b79ea06 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Тајне", "Enter": "Ентер", - "RunIndexing": "Покрени индексирање", + "RunIndexing": "Поново обучите", + "RunCheckStatus": "Проверите статус", + "DeleteKb": "Избриши", "CreationDate": "Датум израде", "KbCounterFooter": "{{ counter }} од 3 додане базе знања", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Унесите УРЛ базе знања", "TypeKbKeyPlaceholder": "Унесите свој ГПТ кључ", "AskQuestionPlaceholder": "Поставите питање", - "DeleteKb": "Избришите базу знања", "DeleteKbInfoFirstText": "Више нећете моћи да користите АИ на овој бази знања", "SureToDelete": "Да ли сте сигурни да желите да избришете Базу знања {{ name }}?", "GptKeyInfo": "Унесите свој ГПТ кључ да бисте користили своје базе знања", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 765c35cead4d..c3f9bd27209c 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Hemligheter", "Enter": "Stiga på", - "RunIndexing": "Kör indexering", + "RunIndexing": "Träna om", + "RunCheckStatus": "Kolla statusen", + "DeleteKb": "Radera", "CreationDate": "Skapelsedagen", "KbCounterFooter": "{{ counter }} av 3 kunskapsbaser tillagda", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Skriv Knowledge Base URL", "TypeKbKeyPlaceholder": "Skriv din GPT-nyckel", "AskQuestionPlaceholder": "Ställa en fråga", - "DeleteKb": "Ta bort kunskapsbas", "DeleteKbInfoFirstText": "Du kommer inte längre att kunna använda AI på denna kunskapsbas", "SureToDelete": "Är du säker på att du vill ta bort kunskapsbasen {{ name }}?", "GptKeyInfo": "Ange din GPT-nyckel för att använda dina kunskapsbaser", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index e12663dbf9b3..2250cd740533 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Sırlar", "Enter": "Girmek", - "RunIndexing": "Dizin Oluşturmayı Çalıştır", + "RunIndexing": "Yeniden eğitin", + "RunCheckStatus": "Durumu kontrol et", + "DeleteKb": "Silmek", "CreationDate": "Oluşturulma tarihi", "KbCounterFooter": "{{ counter }} / 3 Bilgi Tabanı eklendi", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Bilgi Bankası URL'sini yazın", "TypeKbKeyPlaceholder": "GPT Anahtarınızı yazın", "AskQuestionPlaceholder": "Bir soru sor", - "DeleteKb": "Bilgi Bankasını Sil", "DeleteKbInfoFirstText": "Artık bu bilgi tabanında yapay zekayı kullanamayacaksınız", "SureToDelete": "Bilgi Bankasını silmek istediğinizden emin misiniz {{ name }}?", "GptKeyInfo": "Bilgi Tabanlarınızı kullanmak için GPT Anahtarınızı girin", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index da5c1b0658b8..ab315d81ac23 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1577,7 +1577,9 @@ "KbPage": { "Secrets": "Секрети", "Enter": "Введіть", - "RunIndexing": "Запустіть індексацію", + "RunIndexing": "Перетренуватися", + "RunCheckStatus": "Перевірте статус", + "DeleteKb": "Видалити", "CreationDate": "Дата створення", "KbCounterFooter": "{{ counter }} із 3 доданих баз знань", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1597,7 +1599,6 @@ "TypeKbUrlPlaceholder": "Введіть URL-адресу бази знань", "TypeKbKeyPlaceholder": "Введіть ключ GPT", "AskQuestionPlaceholder": "Задайте питання", - "DeleteKb": "Видалити базу знань", "DeleteKbInfoFirstText": "Ви більше не зможете використовувати ШІ в цій базі знань", "SureToDelete": "Ви впевнені, що бажаєте видалити базу знань {{ name }}?", "GptKeyInfo": "Введіть свій ключ GPT, щоб використовувати свої бази знань", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index e6e271bcafdd..9f53e682cb8f 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1576,7 +1576,9 @@ "KbPage": { "Secrets": "Sirlar", "Enter": "Kirish", - "RunIndexing": "Indekslashni ishga tushiring", + "RunIndexing": "Qayta mashq qilish", + "RunCheckStatus": "Holatni tekshirish", + "DeleteKb": "Oʻchirish", "CreationDate": "Yaratilgan sana", "KbCounterFooter": "{{ counter }} 3 ta bilim bazasi qo'shildi", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", @@ -1596,7 +1598,6 @@ "TypeKbNamePlaceholder": "Bilimlar bazasi nomi", "TypeKbKeyPlaceholder": "GPT kalitingizni kiriting", "AskQuestionPlaceholder": "Savol bering", - "DeleteKb": "Ma'lumot bazasini o'chirish", "DeleteKbInfoFirstText": "Siz endi bu bilimlar bazasida AIdan foydalana olmaysiz", "SureToDelete": "Haqiqatan ham Maʼlumot bazasini oʻchirib tashlamoqchimisiz {{ name }}?", "GptKeyInfo": "Ma'lumotlar bazasidan foydalanish uchun GPT kalitingizni kiriting", From 9a6ec283b09a4b52924ba7b53300447abb1b0ed5 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 6 Mar 2024 18:05:53 +0100 Subject: [PATCH 23/35] deleted console.log --- src/app/knowledge-bases/knowledge-bases.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index fad22a3f5e12..0a86c4f550f7 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -408,7 +408,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } onLoadPage(searchParams){ - console.log('onLoadNextPage:',searchParams); + // console.log('onLoadNextPage:',searchParams); let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT //if(searchParams?.page){ let limitPage = Math.floor(this.kbsListCount/KB_DEFAULT_PARAMS.LIMIT); From 1c2bb5714917e3d516c752e98b4fff809ae14041 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Thu, 7 Mar 2024 16:42:47 +0100 Subject: [PATCH 24/35] =?UTF-8?q?=E2=9C=85=20changed=20data-source=20in=20?= =?UTF-8?q?data=20source=20=E2=9C=85=20changed=20import=20URLs=20with=20LI?= =?UTF-8?q?MIT=20urls=20and=20css=20=3D=3D=20sitemap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal-urls-knowledge-base.component.html | 4 +-- .../modal-urls-knowledge-base.component.scss | 26 ++++++++++++------- .../modal-urls-knowledge-base.component.ts | 24 ++++++++++++++--- src/assets/i18n/en.json | 2 +- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html index c458dc243cf8..df023f65aed6 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -21,7 +21,7 @@

- {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }} + {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }} {{KB_LIMIT_CONTENT}}
@@ -44,7 +44,7 @@

{{ "Cancel" | translate }}

diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss index 128f7e423ecd..ea87749f04b2 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss @@ -1,7 +1,6 @@ .modal-header { .modal-title { font-weight: 400; - padding-left: 4px; } .close{ opacity: 0.5; @@ -124,10 +123,6 @@ margin-bottom: 14px; } - .input-label { - font-weight: 400; - // letter-spacing: 0.5px; - } .custom-input { width: 100%; @@ -136,8 +131,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - // line-height: 35px; - // font-weight: 400; + line-height: 35px; + font-weight: 400; margin-bottom: 10px; // letter-spacing: 0.5px; &.invalid { @@ -150,7 +145,7 @@ width: 100%; overflow: scroll auto; scrollbar-width: none; - min-height: 300px; + min-height: 150px; border-radius: 6px; border: 2px solid #c6cdd4; padding: 10px 15px; @@ -166,7 +161,6 @@ transition: border 0.3s; } } - } @@ -219,3 +213,17 @@ text-transform: none; } + + + +.input-label { + font-weight: 400; + font-size: 12px; + font-weight: normal; + margin-top: 6px; + padding-bottom: 0; +} + +.input-label-error { + color: #c62445; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts index a3f628e3457f..c8058c21fef1 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts @@ -1,5 +1,6 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, SimpleChanges } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { KB_LIMIT_CONTENT } from 'app/utils/util'; @Component({ selector: 'modal-urls-knowledge-base', @@ -11,11 +12,12 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { @Output() saveKnowledgeBase = new EventEmitter(); @Output() closeBaseModal = new EventEmitter(); + KB_LIMIT_CONTENT = KB_LIMIT_CONTENT; kbForm: FormGroup; buttonDisabled: boolean = true; - list = []; content: string; + countSitemap: number; // kb: KB = { // _id: null, @@ -32,6 +34,14 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { this.kbForm = this.createConditionGroup(); } + ngOnChanges(changes: SimpleChanges){ + // console.log('ModalSiteMapComponent changes: ', changes); + // if(this.listSitesOfSitemap.length > 0){ + // this.listOfUrls = this.listSitesOfSitemap.join('\n'); + // this.countSitemap = this.listSitesOfSitemap.length; + // } + } + createConditionGroup(): FormGroup { // const contentPattern = /^[^&<>]{3,}$/; // const namePattern = /^[^&<>]{3,}$/; @@ -48,10 +58,17 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { } else { this.buttonDisabled = true; } + let listSitesOfSitemap = this.content.split("\n").filter(function(row) { + return row.trim() !== ''; + }); + this.countSitemap = listSitesOfSitemap.length; } onSaveKnowledgeBase(){ - const arrayURLS = this.content.split('\n'); + //const arrayURLS = this.content.split('\n'); + const arrayURLS = this.content.split("\n").filter(function(row) { + return row.trim() !== ''; + }); let body = { 'list': arrayURLS } @@ -59,6 +76,7 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { } onCloseBaseModal() { + this.countSitemap = 0; this.closeBaseModal.emit(); } } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 3533aa41d7cd..85a83130d306 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1649,7 +1649,7 @@ "NoKbAdded": "You haven't added any data sources", "NoKbMatchParams": "No match for the specified parameters", "NoKbAddedText": "Add data-sources into your assistant to build a knowledge base.", - "Add": "Add data-source", + "Add": "Add data source", "Import": "Import", "AddKbURL": "URLs", "AddKbText": "Plain text", From 1be771fbc127dce307f3966caf44b2860dbab941 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Thu, 7 Mar 2024 16:53:01 +0100 Subject: [PATCH 25/35] =?UTF-8?q?=E2=9C=85=20next=20button=20disabled=20af?= =?UTF-8?q?ter=20entering=20URL=20sitemap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modals/modal-site-map/modal-site-map.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts index 71a7a0a4ca6f..1cffd43cf48b 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts @@ -41,13 +41,14 @@ export class ModalSiteMapComponent implements OnInit { ngOnChanges(changes: SimpleChanges){ // console.log('ModalSiteMapComponent changes: ', changes); - if(this.listSitesOfSitemap.length > 0){ + this.buttonDisabled = false; this.listOfUrls = this.listSitesOfSitemap.join('\n'); // console.log('ModalSiteMapComponent listOfUrls: ', this.listOfUrls); this.countSitemap = this.listSitesOfSitemap.length; this.isSitemapLoaded = true; } else { + this.buttonDisabled = true; this.isSitemapLoaded = false; } } @@ -83,6 +84,7 @@ export class ModalSiteMapComponent implements OnInit { this.listOfUrls = ""; this.countSitemap = 0; this.isSitemapLoaded = false; + this.buttonDisabled = false; this.closeBaseModal.emit(); } @@ -90,6 +92,7 @@ export class ModalSiteMapComponent implements OnInit { let body = { 'sitemap': this.kb.url } + this.buttonDisabled = true; this.sendSitemap.emit(body); } From 152dabeca7507c62ed0a1ea70afce132df09646e Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Fri, 8 Mar 2024 13:14:48 +0100 Subject: [PATCH 26/35] =?UTF-8?q?=E2=9C=85=20changed=20limit=20data=20sour?= =?UTF-8?q?ce=20(300)=20=E2=9C=85=20bug=20fix=20urls=20limit=20data-source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal-urls-knowledge-base.component.html | 11 +++++---- .../modal-urls-knowledge-base.component.ts | 24 ++++++++++++++----- src/app/utils/util.ts | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html index df023f65aed6..fb50e85ef637 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -21,7 +21,6 @@

- {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }} {{KB_LIMIT_CONTENT}}
@@ -30,10 +29,14 @@

{{ 'KbPage.titleTextareaUrls' | translate }} - {{ 'KbPage.infoUrls' | translate }} + + + {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }} {{KB_LIMIT_CONTENT}} + + {{ 'KbPage.InfoSitemapList' | translate }} {{KB_LIMIT_CONTENT}}

diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts index c8058c21fef1..7ad1decb56f3 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts @@ -18,7 +18,7 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { list = []; content: string; countSitemap: number; - + errorLimit: boolean = false; // kb: KB = { // _id: null, // type: '', @@ -53,14 +53,26 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { onChangeInput(event): void { - if (this.kbForm.valid) { - this.buttonDisabled = false; - } else { - this.buttonDisabled = true; - } + // if (this.kbForm.valid) { + // this.buttonDisabled = false; + // } else { + // this.buttonDisabled = true; + // } + let listSitesOfSitemap = this.content.split("\n").filter(function(row) { return row.trim() !== ''; }); + + var lines = this.content.split('\n'); + + if (lines.length > KB_LIMIT_CONTENT) { + this.errorLimit = true; + this.buttonDisabled = true; + // content = lines.slice(0, KB_LIMIT_CONTENT).join('\n'); + } else { + this.errorLimit = false; + this.buttonDisabled = false; + } this.countSitemap = listSitesOfSitemap.length; } diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index 52c060cd5cc7..e9aa2930a341 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -342,7 +342,7 @@ export enum KB_DEFAULT_PARAMS { SORT_FIELD = 'updatedAt' } -export const KB_LIMIT_CONTENT = 20; +export const KB_LIMIT_CONTENT = 300; // Growth export const featuresPlanA = [ From aa4c53d3ca222b3209df0bfe7d2c46f8be1a45f6 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Fri, 8 Mar 2024 14:55:15 +0100 Subject: [PATCH 27/35] fixed check limit listo of urls --- .../modal-site-map.component.html | 2 +- .../modal-site-map.component.ts | 9 ++++ .../modal-urls-knowledge-base.component.html | 10 ++-- .../modal-urls-knowledge-base.component.ts | 53 ++++++------------- 4 files changed, 31 insertions(+), 43 deletions(-) diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html index daa56b23234f..86f8335bf58f 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html @@ -73,7 +73,7 @@

{{ 'KbPage.titleTextareaUrls' | translate }} - @@ -38,7 +38,7 @@

{{ 'KbPage.InfoSitemapList' | translate }} {{KB_LIMIT_CONTENT}}

- +
diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts index 7ad1decb56f3..dadd1ea2e1c7 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Output, EventEmitter, SimpleChanges } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +// import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { KB_LIMIT_CONTENT } from 'app/utils/util'; @Component({ @@ -13,27 +13,20 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { @Output() closeBaseModal = new EventEmitter(); KB_LIMIT_CONTENT = KB_LIMIT_CONTENT; - kbForm: FormGroup; buttonDisabled: boolean = true; - list = []; - content: string; + + listOfUrls: string; countSitemap: number; errorLimit: boolean = false; - // kb: KB = { - // _id: null, - // type: '', - // name: '', - // url: '', - // content: '' - // } - constructor( - private formBuilder: FormBuilder - ) { } + constructor() { } + + /** */ ngOnInit(): void { - this.kbForm = this.createConditionGroup(); + // this.kbForm = this.createConditionGroup(); } + /** */ ngOnChanges(changes: SimpleChanges){ // console.log('ModalSiteMapComponent changes: ', changes); // if(this.listSitesOfSitemap.length > 0){ @@ -42,33 +35,17 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { // } } - createConditionGroup(): FormGroup { - // const contentPattern = /^[^&<>]{3,}$/; - // const namePattern = /^[^&<>]{3,}$/; - return this.formBuilder.group({ - content: ['', [Validators.required]], - // name: ['', [Validators.required, Validators.pattern(namePattern)]] - }) - } - - + /** */ onChangeInput(event): void { - // if (this.kbForm.valid) { - // this.buttonDisabled = false; - // } else { - // this.buttonDisabled = true; - // } - - let listSitesOfSitemap = this.content.split("\n").filter(function(row) { + let listSitesOfSitemap = this.listOfUrls.split("\n").filter(function(row) { return row.trim() !== ''; }); - - var lines = this.content.split('\n'); - + var lines = this.listOfUrls.split('\n'); if (lines.length > KB_LIMIT_CONTENT) { this.errorLimit = true; this.buttonDisabled = true; - // content = lines.slice(0, KB_LIMIT_CONTENT).join('\n'); + this.listOfUrls = lines.slice(0, KB_LIMIT_CONTENT).join('\n'); + // console.log("onChangeInput: ",this.listOfUrls); } else { this.errorLimit = false; this.buttonDisabled = false; @@ -76,9 +53,10 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { this.countSitemap = listSitesOfSitemap.length; } + /** */ onSaveKnowledgeBase(){ //const arrayURLS = this.content.split('\n'); - const arrayURLS = this.content.split("\n").filter(function(row) { + const arrayURLS = this.listOfUrls.split("\n").filter(function(row) { return row.trim() !== ''; }); let body = { @@ -87,6 +65,7 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { this.saveKnowledgeBase.emit(body); } + /** */ onCloseBaseModal() { this.countSitemap = 0; this.closeBaseModal.emit(); From df557ab67d54fd85ecfdf9418e14e66a327d8876 Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Tue, 12 Mar 2024 18:38:44 +0100 Subject: [PATCH 28/35] change status management --- .../knowledge-bases.component.ts | 81 +++++++++---- .../knowledge-base-table.component.html | 46 ++++++-- .../knowledge-base-table.component.scss | 35 +++++- .../knowledge-base-table.component.ts | 11 +- src/app/services/openai.service.ts | 2 +- src/assets/i18n/ar.json | 1 + src/assets/i18n/az.json | 1 + src/assets/i18n/de.json | 1 + src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 1 + src/assets/i18n/fr.json | 1 + src/assets/i18n/it.json | 1 + src/assets/i18n/kk.json | 1 + src/assets/i18n/pt.json | 1 + src/assets/i18n/ru.json | 1 + src/assets/i18n/sr.json | 1 + src/assets/i18n/sv.json | 1 + src/assets/i18n/tr.json | 1 + src/assets/i18n/uk.json | 1 + src/assets/i18n/uz.json | 1 + src/environments/environment.ts | 109 +++++++++++++----- 21 files changed, 227 insertions(+), 72 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 0a86c4f550f7..d9407eac5f66 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -460,7 +460,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } else { this.kbsList.push(kb); } - this.updateStatusOfKb(kb._id, 3); + //--> this.updateStatusOfKb(kb._id, 3); }); // if(this.kbsList.length>0){ @@ -546,7 +546,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } // this.onLoadByFilter(searchParams); } - this.updateStatusOfKb(kb._id, 3); + this.updateStatusOfKb(kb._id, -1); // this.updateStatusOfKb(kb._id, 0); // this.onLoadByFilter(searchParams); // that.onRunIndexing(kb); @@ -572,15 +572,19 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbService.addMultiKb(body).subscribe((kbs: any) => { this.logger.log("onAddMultiKb:", kbs); this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); - kbs.forEach(kb => { - this.kbsList.unshift(kb); - // if(kb.status == -1 || kb.status == 0 || kb.status == 2) { - // setTimeout(() => { - // this.checkStatusWithRetry(kb); - // }, 2000); - // } - this.updateStatusOfKb(kb._id, 3); - }); + + let paramsDefault = "?limit="+KB_DEFAULT_PARAMS.LIMIT+"&page="+KB_DEFAULT_PARAMS.NUMBER_PAGE+"&sortField="+KB_DEFAULT_PARAMS.SORT_FIELD+"&direction="+KB_DEFAULT_PARAMS.DIRECTION; + this.getListOfKb(paramsDefault); + // kbs.forEach(kb => { + // //this.kbsList.unshift(kb); + // // if(kb.status == -1 || kb.status == 0 || kb.status == 2) { + // // setTimeout(() => { + // // this.checkStatusWithRetry(kb); + // // }, 2000); + // // } + // // this.updateStatusOfKb(kb._id, 3); + // //this.updateStatusOfKb(kb._id, -1); + // }); this.kbsListCount = this.kbsListCount+kbs.length; this.refreshKbsList = !this.refreshKbsList; }, (err) => { @@ -608,7 +612,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { //this.logger.log('onDeleteKb:: ', response); kb.deleting = false; if(!response || (response.success && response.success === false)){ - this.updateStatusOfKb(kb._id, 0); + // this.updateStatusOfKb(kb._id, 0); this.onOpenErrorModal(error); } else { this.notify.showWidgetStyleUpdateNotification(this.msgSuccesDeleteKb, 2, 'done'); @@ -683,7 +687,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbsList[index] = kbNew; } // this.removeKb(kb._id); - this.updateStatusOfKb(kbNew._id, 0); + //-->this.updateStatusOfKb(kbNew._id, 0); this.refreshKbsList = !this.refreshKbsList; // setTimeout(() => { // this.checkStatusWithRetry(kbNew); @@ -715,45 +719,78 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { "namespace": this.id_project, "id": kb._id } - var status_msg = "Indicizzazione terminata con successo!"; + var status_msg = "Indexing completed successfully!"; var status_code = 2; var status_label = "done" this.openaiService.checkScrapingStatus(data).subscribe((response: any) => { + // this.logger.log('Risposta ricevuta:', response); // if(response.status_code && response.status_code == -1){ // // this.logger.log('risorsa non indicizzata'); // // this.onRunIndexing(kb); // this.checkStatusWithRetry(kb); // } + + + let resource_status: Number; + if (response.status) { + resource_status = response.status; + } else { + resource_status = response.status_code + } + + if (response.status == -1) { + status_msg = "Indexing not yet started"; + status_code = 3; + status_label = "warning"; + } else if (response.status == 100 || response.status == 200) { + status_msg = "Indexing in progress"; + status_code = 3; + status_label = "warning"; + } else if (response.status = 300) { + // default message already seat + } else if (response.status == 400) { + status_code = 4; + status_label = "dangerous"; + status_msg = "The resource could not be indexed"; + } else { + this.logger.log("Unrecognized status") + } - + /** + * OLD STATUSES - START + */ if(response.status_code == -1 || response.status_code == 0 || response.status_code == 2){ // this.logger.log('riprova tra 10 secondi...'); - this.updateStatusOfKb(kb._id, response.status_code); + // this.updateStatusOfKb(kb._id, response.status_code); // timer(20000).subscribe(() => { // this.checkStatusWithRetry(kb); // }); - status_msg = "Indicizzazione in corso stato: "+response.status_code; + status_msg = "Indexing in progress: "+response.status_code; status_code = 3; status_label = "warning"; } else if(response.status_code == 4 ){ // status == 3 || status == 4 // this.logger.log('Risposta corretta:', response.status_code); status_code = 4; status_label = "dangerous"; - status_msg = "Errore nell'indicizzazione "+response.status_code; + status_msg = "The resource could not be indexed "+response.status_code; } else { //status_msg = "Indicizzazione in corso stato: "+response.status_code; } - this.updateStatusOfKb(kb._id, response.status_code); + /** + * OLD STATUSES - END + */ + + this.updateStatusOfKb(kb._id, resource_status); this.notify.showWidgetStyleUpdateNotification(status_msg, status_code, status_label); }, error => { this.logger.error('Error: ', error); - this.updateStatusOfKb(kb._id, -2); + //-->this.updateStatusOfKb(kb._id, -2); status_code = 4; status_label = "dangerous"; - status_msg = "Errore: "+error.message; + status_msg = "Error: "+error.message; this.notify.showWidgetStyleUpdateNotification(status_msg, status_code, status_label); }); } @@ -794,7 +831,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { "content": kb.content?kb.content:'', "namespace": this.id_project } - this.updateStatusOfKb(kb._id, 0); + this.updateStatusOfKb(kb._id, 100); this.openaiService.startScraping(data).subscribe((response: any) => { this.logger.log("start scraping response: ", response); if (response.error) { diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 77dfacbcdc89..13b63b90f339 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -54,22 +54,45 @@ dropdownPosition='bottom' (ngModelChange)="onLoadByFilter($event, 'type')"> {{ 'KbPage.StatusAll' | translate }} - {{ 'KbPage.StatusNotStarted' | translate }} + + + + {{ 'KbPage.StatusNotStarted' | translate }} + {{ 'KbPage.StatusQueued' | translate }} + {{ 'KbPage.StatusStarted' | translate }} + {{ 'KbPage.StatusFinished' | translate }} + {{ 'KbPage.StatusError' | translate }} - -
+ +
+
+
+ +
+
{{ kbsListCount }} total resources
+
+
+ +
+

{{ 'KbPage.Type' | translate }}{{ 'KbPage.Status' | translate }} - {{'KbPage.CreatedAt' | translate }} + + {{ 'KbPage.Type' | translate }} + + {{ 'KbPage.Status' | translate }} + + {{'KbPage.UpdatedAt' | translate }} expand_more expand_less - {{'Name' | translate }} + + {{'Name' | translate }} expand_more expand_less +
+ description link lan + schedule cached @@ -77,16 +83,16 @@ error + {{ kb.createdAt | amTimeAgo }} +
{{ kb.name }}
{{getSubtitle(kb)}}
 +
- - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index 919bd04083bf..e6c0472d41b1 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -1,6 +1,4 @@ -td { - cursor: pointer; -} + select.select-status { height: 30px; @@ -123,7 +121,8 @@ table { } .ellipsis-text { - max-width: 400px; + max-width: calc(100% - 350px); + max-width: 500px; width: 100%; white-space: nowrap; overflow: hidden; @@ -139,4 +138,47 @@ table { text-align: center; margin: 50px auto 20px; display: block; -} \ No newline at end of file +} + + +th { + display: table-cell; +} + +td { + cursor: pointer; + max-width: 100%; + // display: inline-grid; +} + + + +.column-th-span { + justify-content: space-between; + align-items: center; + width: 100%; + cursor: pointer; + .th-label { + display: inline-block; + opacity: 0; + transition: opacity 0.5s ease-in-out; + } + &:hover { + .th-label { + display: inline-block;; + opacity: 1; + } + } +} + +.column-th-span span { + display: inline-block; + font-size: 14px; + font-weight: 500; + margin: auto 4px; + color: #353f45; + vertical-align: middle; +} + + + diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 358580bf48f8..5c048e210d2f 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -44,6 +44,7 @@ export class KnowledgeBaseTableComponent implements OnInit { this.filterType = ''; this.filterText = ''; this.searchParams = { + "page":0, "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, "direction": KB_DEFAULT_PARAMS.DIRECTION, "status": '', @@ -70,6 +71,8 @@ export class KnowledgeBaseTableComponent implements OnInit { loadMoreData() { this.isLoading = true; + + this.searchParams.page = Math.floor(this.kbsList.length/KB_DEFAULT_PARAMS.LIMIT); this.loadPage.emit(this.searchParams); } @@ -80,12 +83,14 @@ export class KnowledgeBaseTableComponent implements OnInit { ngOnChanges(changes: SimpleChanges){ console.log('ngOnChanges!!!****** ', changes, changes.kbsListCount, this.kbsList.length); - if(changes.kbsListCount && changes.kbsListCount.currentValue) { - if(changes.kbsListCount.currentValue <= this.kbsList.length){ - this.SHOW_MORE_BTN = false; - } else { - this.SHOW_MORE_BTN = true; - } + // if(changes.kbsListCount && changes.kbsListCount.currentValue) { + if(changes.kbsListCount && changes.kbsListCount.currentValue){ + this.kbsListCount = changes.kbsListCount.currentValue; + } + if(this.kbsListCount <= this.kbsList.length){ + this.SHOW_MORE_BTN = false; + } else { + this.SHOW_MORE_BTN = true; } if(changes.refresh){ this.isLoading = false; @@ -106,8 +111,8 @@ export class KnowledgeBaseTableComponent implements OnInit { onOrderBy(type){ this.searchParams.sortField = type; - this.searchParams.direction = this.directionDesc; this.directionDesc = this.directionDesc*-1; + this.searchParams.direction = this.directionDesc; this.isLoading = true; this.loadByFilter.next(this.searchParams); } diff --git a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html index 592f7801d727..3bf3f654712a 100644 --- a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html @@ -27,16 +27,16 @@

{{ 'Name' | translate }} - +
{{ 'KbPage.Url' | translate }} - +
{{ 'KbPage.FileText' | translate }} - +
diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index 6eb7e177ba9a..4b696a49b1cc 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -339,7 +339,7 @@ export enum KB_DEFAULT_PARAMS { LIMIT = 4, NUMBER_PAGE = 0, DIRECTION = -1, - SORT_FIELD = 'createdAt' + SORT_FIELD = 'updatedAt' } // Growth diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 6043d17b88af..7a23e415db3e 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1619,6 +1619,7 @@ "Type": "Tipo", "Status": "Stato", "CreatedAt": "Creato il", + "UpdatedAt": "Aggiornato il", "KBDetail": "Dettagli della Knowledge Base", "Url": "URL", "FileText": "File di testo", From 9a948f4ca7ef3bf7ae89b3c65d8682bb74017558 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Mon, 26 Feb 2024 17:58:41 +0100 Subject: [PATCH 04/35] chaged label and limit paginator --- src/app/utils/util.ts | 2 +- src/assets/i18n/en.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index 4b696a49b1cc..fae4e8145a45 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -336,7 +336,7 @@ export enum KB_MAX_NUM { export enum KB_DEFAULT_PARAMS { - LIMIT = 4, + LIMIT = 20, NUMBER_PAGE = 0, DIRECTION = -1, SORT_FIELD = 'updatedAt' diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 18220335d18a..39159cdc4588 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1617,7 +1617,8 @@ "StateFilter": "Filter by State", "Type": "Type", "Status": "Status", - "CreatedAt": "Created At", + "CreatedAt": "Created at", + "UpdatedAt": "Updated at", "KBDetail": "Knowledge Base Detail", "Url": "URL", "FileText": "File Text", From 0f0322bcdfb4a50a6dcd4f8f1bc45c63a6863812 Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Mon, 26 Feb 2024 18:01:06 +0100 Subject: [PATCH 05/35] update --- .../customerio-integration.component.ts | 1 - src/environments/environment.ts | 109 +++++------------- 2 files changed, 31 insertions(+), 79 deletions(-) diff --git a/src/app/integrations/list/customerio-integration/customerio-integration.component.ts b/src/app/integrations/list/customerio-integration/customerio-integration.component.ts index b9a64fdfe3a7..f77c2e790838 100644 --- a/src/app/integrations/list/customerio-integration/customerio-integration.component.ts +++ b/src/app/integrations/list/customerio-integration/customerio-integration.component.ts @@ -62,7 +62,6 @@ export class CustomerioIntegrationComponent implements OnInit { checkKey() { return new Promise((resolve) => { let url = "https://track.customer.io/api/v1/accounts/region"; - console.log("apikey: ", this.integration.value.apikey); let apikey = 'Basic ' + this.integration.value.apikey; this.integrationService.checkIntegrationKeyValidity(url, apikey).subscribe((resp: any) => { this.isVerified = true; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 93461f7c798d..e925cd501405 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,83 +1,36 @@ - -// export const environment = { -// production: true, -// t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', -// VERSION: require('../../package.json').version, -// widgetUrl: 'https://widget.tiledesk.com/v3/launch.js', -// botcredendialsURL:'CHANGEIT', -// remoteConfig: true, -// SERVER_BASE_URL:'https://tiledesk-server-pre.herokuapp.com/', -// CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat/', -// testsiteBaseUrl: 'https://widget-pre.tiledesk.com/v2/assets/test_widget_page/index.html', -// wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', -// chatEngine: 'mqtt', -// firebaseAuth: false, -// uploadEngine: 'native', -// baseImageUrl: 'CHANGEIT', -// pushEngine: 'none', -// logLevel: 'Info', -// templatesUrl: 'CHANGEIT', -// appsUrl: 'CHANGEIT', -// promoBannerUrl: 'CHANGEIT', -// chatStoragePrefix: "CHANGEIT", -// firebase: { -// apiKey: 'CHANGEIT', -// authDomain: 'CHANGEIT', -// databaseURL: 'CHANGEIT', -// projectId: 'CHANGEIT', -// storageBucket: 'CHANGEIT', -// messagingSenderId: 'CHANGEIT', -// appId: 'CHANGEIT', -// vapidKey: 'CHANGEIT' -// } -// }; - export const environment = { production: false, - remoteConfig: false, - t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-IPS:T-ETK:T-RAS:T-PPB:T-PET:T-MTS:T-TIL:T-DGF:T-NAT:T-HPB:F-TOW:T-KNB:T-BAN:T-AST:T-MON:T-CNT:T-AUT:T-WUN:T-INT:T', + remoteConfig: true, + remoteConfigUrl: './dashboard-config.json', VERSION: require('../../package.json').version, - botcredendialsURL: 'https://tiledesk-df-connector-pre.herokuapp.com/botcredendials/', //'https://dialogflow-proxy-tiledesk.herokuapp.com/botcredendials/', - rasaBotCredentialsURL: "https://tiledesk-server-pre.herokuapp.com/modules/rasa/botcredendials/", // "https://tiledesk-rasa-connector-pre.herokuapp.com/botcredendials/", - WIDGET_BASE_URL: 'https://widget-pre.tiledesk.com/v5/', - SERVER_BASE_URL: 'https://tiledesk-server-pre.herokuapp.com/', - CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat-ionic5/', // '/chat-ionic5/', //'https://support-pre.tiledesk.com/chat-ionic5/' // https://support-pre.tiledesk.com/chat-ionic5-notifcation-item// - wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', - reCaptchaSiteKey:"6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5", - globalRemoteJSSrc: "https://support-pre.tiledesk.com/script/custom_script.js, https://support-pre.tiledesk.com/script/dnpc.js", //https://www.google.com/recaptcha/api.js?render=6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5, + t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', + botcredendialsURL: 'CHANGEIT', + WIDGET_BASE_URL: 'http://localhost:4200/', + SERVER_BASE_URL: 'http://localhost:3000/', + CHAT_BASE_URL: 'http://localhost:8080/', + wsUrl: 'ws://localhost:3000/', + chatEngine: 'mqtt', firebaseAuth: false, - uploadEngine: 'firebase', - baseImageUrl: 'https://tiledesk-server-pre.herokuapp.com/', - pushEngine: 'firebase', - chatEngine: 'firebase', - logLevel: 'info', - communityTemplatesUrl: 'https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/community', - templatesUrl: "https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/templates", // "https://chatbot-templates.herokuapp.com/chatbots/public/templates/", - appsUrl: "https://cd3ff4b5-5a06-44e3-aff2-3ce2ff1b848b-00-3eppvhwsi6nym.janeway.replit.dev/", // "https://tiledesk-apps-server.giovannitroisi3.repl.co/",// "https://tiledesk-apps.herokuapp.com/", - cdsBaseUrl: '/cds/', - whatsappApiUrl: "https://tiledesk-whatsapp-connector-dev.glitch.me/", //"https://tiledesk-whatsapp-connector-c4ce07638b45.herokuapp.com/", //"https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/", // "https://tiledesk-whatsapp-app-pre.giovannitroisi3.repl.co", - // promoBannerUrl: "https://dashbordpromobanner.nicolan74.repl.co/get/dashboard_promo.json", - chatStoragePrefix: "chat_sv5", - tiledeskPhoneNumber: "393201352964", - ticketingEmail: "tickets.tiledesk.com", + uploadEngine: 'native', + baseImageUrl: 'CHANGEIT', + pushEngine: 'none', + logLevel: 'Info', + communityTemplatesUrl: 'CHANGEIT', + templatesUrl: 'CHANGEIT', + appsUrl: 'CHANGEIT', + cdsBaseUrl: 'CHANGEIT', + promoBannerUrl: 'CHANGEIT', + whatsappApiUrl: "CHANGEIT", + ticketingEmail: "CHANGEIT", + tiledeskPhoneNumber: "CHANGEIT", firebase: { - apiKey: "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4", - authDomain: "chat21-pre-01.firebaseapp.com", - databaseURL: "https://chat21-pre-01.firebaseio.com", - projectId: "chat21-pre-01", - storageBucket: "chat21-pre-01.appspot.com", - messagingSenderId: "269505353043", - appId: "1:269505353043:web:b82af070572669e3707da6", - vapidKey: "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c" - }, -}; - - - - - - - - - - + apiKey: 'CHANGEIT', + authDomain: 'CHANGEIT', + databaseURL: 'CHANGEIT', + projectId: 'CHANGEIT', + storageBucket: 'CHANGEIT', + messagingSenderId: 'CHANGEIT', + appId: 'CHANGEIT', + vapidKey: 'CHANGEIT' + } +}; \ No newline at end of file From 8455b6c728ab62de5120e7c34bf8bbc1bdbfd2b3 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Tue, 27 Feb 2024 14:58:39 +0100 Subject: [PATCH 06/35] bug fix: labels, paginator, update kb --- .../knowledge-bases.component.html | 1 + .../knowledge-bases.component.scss | 1 + .../knowledge-bases.component.ts | 73 ++++++++++++++++++- .../knowledge-base-table.component.html | 37 ++++++---- .../knowledge-base-table.component.scss | 41 +++++++++-- .../knowledge-base-table.component.ts | 2 +- ...modal-delete-knowledge-base.component.scss | 8 +- ...modal-detail-knowledge-base.component.html | 22 ++++-- ...modal-detail-knowledge-base.component.scss | 25 +++++-- .../modal-detail-knowledge-base.component.ts | 18 ++++- .../modal-page-url.component.scss | 8 +- .../modal-text-file.component.scss | 10 +-- src/assets/i18n/ar.json | 3 +- src/assets/i18n/az.json | 3 +- src/assets/i18n/de.json | 3 +- src/assets/i18n/en.json | 4 +- src/assets/i18n/es.json | 3 +- src/assets/i18n/fr.json | 3 +- src/assets/i18n/it.json | 4 +- src/assets/i18n/kk.json | 3 +- src/assets/i18n/pt.json | 3 +- src/assets/i18n/ru.json | 3 +- src/assets/i18n/sr.json | 3 +- src/assets/i18n/sv.json | 3 +- src/assets/i18n/tr.json | 3 +- src/assets/i18n/uk.json | 3 +- src/assets/i18n/uz.json | 3 +- 27 files changed, 226 insertions(+), 67 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index a99a9956f07f..9067f8bee4e5 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -90,6 +90,7 @@ diff --git a/src/app/knowledge-bases/knowledge-bases.component.scss b/src/app/knowledge-bases/knowledge-bases.component.scss index f11e39f0ab98..cb81863b8307 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.scss +++ b/src/app/knowledge-bases/knowledge-bases.component.scss @@ -440,6 +440,7 @@ table { vertical-align: middle; line-height: 24px; font-size: medium; + text-transform: none; } .icon-big-button { diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 70002a7abc41..745f6b45d0c9 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -452,7 +452,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { resp.kbs.forEach(kb => { this.kbsList.push(kb); }); - console.log('[KNOWLEDGE BASES COMP] get kbList: ', this.kbs, this.kbsList); + this.logger.log('[KNOWLEDGE BASES COMP] get kbList: ', this.kbs, this.kbsList); // this.checkAllStatuses(); this.refreshKbsList = !this.refreshKbsList; //this.showSpinner = false; @@ -561,6 +561,75 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { //this.trackUserActioOnKB('Deleted Knowledge Base', gptkey) }) } + + + /** */ + onUpdateKb(kb) { + this.logger.log('onUpdateKb: ', kb); + this.onCloseBaseModal(); + let error = "update fallito" + let dataDelete = { + "id": kb._id, + "namespace": kb.id_project + } + let dataAdd = { + 'name': kb.name, + 'source': kb.source, + 'content': '', + 'type': 'url' + }; + if(kb.type === 'text'){ + dataAdd.source = kb.name; + dataAdd.content = kb.content, + dataAdd.type = 'text' + } + this.logger.log('dataAdd: ', dataAdd); + kb.deleting = true; + this.kbService.deleteKb(dataDelete).subscribe((response:any) => { + kb.deleting = false; + if(!response || (response.success && response.success === false)){ + this.onOpenErrorModal(error); + } else { + this.kbService.addKb(dataAdd).subscribe((resp: any) => { + let kbNew = resp.value; + if(resp.lastErrorObject && resp.lastErrorObject.updatedExisting === true){ + const index = this.kbsList.findIndex(item => item._id === kbNew._id); + if (index !== -1) { + this.kbsList[index] = kbNew; + this.notify.showWidgetStyleUpdateNotification(this.msgSuccesUpdateKb, 3, 'warning'); + } + } else { + // this.kbsList.push(kb); + // this.kbsList.unshift(kbNew); + this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); + } + + const index = this.kbsList.findIndex(item => item.id === kb._id); + if (index > -1) { + this.kbsList[index] = kbNew; + } + // this.removeKb(kb._id); + this.updateStatusOfKb(kbNew._id, 0); + this.refreshKbsList = !this.refreshKbsList; + setTimeout(() => { + this.checkStatusWithRetry(kbNew); + }, 2000); + }, (err) => { + this.logger.error("[KNOWLEDGE BASES COMP] ERROR add new kb: ", err); + this.onOpenErrorModal(error); + }, () => { + this.logger.log("[KNOWLEDGE BASES COMP] add new kb *COMPLETED*"); + }) + } + }, (err) => { + this.logger.error("[KNOWLEDGE BASES COMP] ERROR delete kb: ", err); + kb.deleting = false; + this.onOpenErrorModal(error); + }, () => { + this.logger.log("[KNOWLEDGE BASES COMP] delete kb *COMPLETE*"); + kb.deleting = false; + }) + } // ---------------- END SERVICE FUNCTIONS --------------- // @@ -726,7 +795,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { * */ checkAllStatuses() { - console.log('[KNOWLEDGE BASES COMP] checkAllStatuses: ', this.kbsList); + this.logger.log('[KNOWLEDGE BASES COMP] checkAllStatuses: ', this.kbsList); this.kbsList.forEach(kb => { //if(kb.status == -1){ // this.onRunIndexing(kb); diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index ab2fa86877d7..49413878ad09 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -17,8 +17,9 @@
@@ -36,6 +37,11 @@
+
+ +
@@ -52,16 +58,18 @@ expand_less - @@ -87,12 +95,12 @@ {{ kb.createdAt | amTimeAgo }} - - +
- {{'Name' | translate }} - expand_more - expand_less +
+ {{'Name' | translate }} + expand_more + expand_less +
- + +
-
{{ kb.name }}
-
{{getSubtitle(kb)}}
+ 		+
{{ kb.name }}
+
{{getSubtitle(kb)}}
 +
-
-
Loading...
- + +
Loading
+
diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index e6c0472d41b1..d4724f044511 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -121,22 +121,39 @@ table { } .ellipsis-text { - max-width: calc(100% - 350px); - max-width: 500px; - width: 100%; + // max-width: calc(100% - 350px); + // max-width: 500px; + // width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + width: 100%; + max-width: 100%; + display: table-column-group; + line-height: normal; } .loading-indicator { text-align: center; - margin: 50px auto 20px; + margin: 20px auto 10px; display: block; + width: fit-content; + font-weight: normal; + font-family: monospace; + font-size: 12px; + line-height: 24px; + clip-path: inset(0 3ch 0 0); + animation: l4 1s steps(4) infinite; } + +.loading-indicator::after { + content:"..." +} +@keyframes l4 {to{clip-path: inset(0 -1ch 0 0)}} + .btn-more { text-align: center; - margin: 50px auto 20px; + margin: 20px auto 10px; display: block; } @@ -147,8 +164,6 @@ th { td { cursor: pointer; - max-width: 100%; - // display: inline-grid; } @@ -180,5 +195,17 @@ td { vertical-align: middle; } +.btn-actions { + width: 40px; + position: absolute; + right: 0; + margin-top: -5px; +} +.btn-preview { + display: flex; + flex-direction: row; + justify-content: flex-end; + margin-bottom: -40px; +} diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 5c048e210d2f..e9eb409e2be0 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -82,7 +82,7 @@ export class KnowledgeBaseTableComponent implements OnInit { // } ngOnChanges(changes: SimpleChanges){ - console.log('ngOnChanges!!!****** ', changes, changes.kbsListCount, this.kbsList.length); + // console.log('ngOnChanges!!!****** ', changes, changes.kbsListCount, this.kbsList.length); // if(changes.kbsListCount && changes.kbsListCount.currentValue) { if(changes.kbsListCount && changes.kbsListCount.currentValue){ this.kbsListCount = changes.kbsListCount.currentValue; diff --git a/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss index 4f042fc46091..2fa51e023f78 100644 --- a/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss @@ -135,8 +135,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; margin-bottom: 10px; // letter-spacing: 0.5px; &.invalid { @@ -151,8 +151,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; diff --git a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html index 3bf3f654712a..cf189efe67f8 100644 --- a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.html @@ -27,16 +27,24 @@

{{ 'Name' | translate }} - +
{{ 'KbPage.Url' | translate }} - + + + open_in_new + + + +
{{ 'KbPage.FileText' | translate }} - +
@@ -45,10 +53,10 @@

- - +
diff --git a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss index 4f042fc46091..00e879da2ebb 100644 --- a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss @@ -135,8 +135,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; margin-bottom: 10px; // letter-spacing: 0.5px; &.invalid { @@ -149,10 +149,10 @@ width: 100%; border-radius: 6px; border: 2px solid #c6cdd4; - padding: 0px 15px; + padding: 10px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; @@ -205,4 +205,19 @@ p { margin-bottom: 0px; } +} + +.link-page{ + font-size: 12px; + padding: 0 5px; + font-weight: normal; + + vertical-align: middle; + display: inline-flex; + span { + font-size: 14px; + margin-top: 0px; + display: inline-block; + padding-top: 0px; + } } \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.ts index d77ce04d7250..b698bdb6ed06 100644 --- a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.ts +++ b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.ts @@ -8,15 +8,31 @@ import { KB } from 'app/models/kbsettings-model'; }) export class ModalDetailKnowledgeBaseComponent implements OnInit { @Input() kb: KB; - @Output() deleteKnowledgeBase = new EventEmitter(); @Output() closeBaseModal = new EventEmitter(); + @Output() updateKnowledgeBase = new EventEmitter(); + + name: string; + source: string; + content: string; + constructor() { } ngOnInit(): void { + this.name = this.kb.name; + this.source = this.kb.source; + this.content = this.kb.content; } onCloseBaseModal() { this.closeBaseModal.emit(); } + onUpdateKnowledgeBase(){ + this.kb.name = this.name; + this.kb.source = this.source; + this.kb.content = this.content; + //console.log('onUpdateKnowledgeBase: ', this.kb); + this.updateKnowledgeBase.emit(this.kb); + } + } diff --git a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss index 4f042fc46091..2fa51e023f78 100644 --- a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss +++ b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss @@ -135,8 +135,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; margin-bottom: 10px; // letter-spacing: 0.5px; &.invalid { @@ -151,8 +151,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; diff --git a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss index 4f042fc46091..a4cea2930818 100644 --- a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss +++ b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss @@ -135,8 +135,8 @@ border: 2px solid #c6cdd4; padding: 0px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; margin-bottom: 10px; // letter-spacing: 0.5px; &.invalid { @@ -149,10 +149,10 @@ width: 100%; border-radius: 6px; border: 2px solid #c6cdd4; - padding: 0px 15px; + padding: 10px 15px; color: #22272d; - line-height: 35px; - font-weight: 400; + // line-height: 35px; + // font-weight: 400; &.invalid { border: 2px solid red !important; outline: 0px solid red !important; diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 3111214c22eb..5374f2d3092e 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1618,6 +1618,7 @@ "Type": "يكتب", "Status": "حالة", "CreatedAt": "أنشئت في", + "UpdatedAt": "تم التحديث في", "KBDetail": "تفاصيل قاعدة المعرفة", "Url": "عنوان URL", "FileText": "نص الملف", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "تم حذف قاعدة المعرفة بنجاح", "msgErrorDeleteKb": "لا يمكن حذف قاعدة المعارف", "msgErrorIndexingKb": "فشلت الفهرسة", - "msgSuccesIndexingKb": "تمت الفهرسة بنجاح", + "msgSuccesIndexingKb": "تم إطلاق إعادة التدريب على المحتوى بنجاح", "msgErrorAddUpdateKb": "لا يمكن إضافة قاعدة المعارف أو تحريرها" }, "AutomationsDemoPageDescription":"من خلال أتمتة واجهات برمجة التطبيقات لدينا، يمكنك إدارة رسائل البث الجماعية على Whatsapp باستخدام أتمتة المصمم جنبًا إلى جنب مع سهولة واجهات برمجة التطبيقات لدينا، وإرسال رسائل إلى جميع جهات الاتصال الخاصة بإدارة علاقات العملاء (CRM) المفضلة لديك، وتلقي حالة الرسائل المرسلة (المستلمة، المقروءة، وما إلى ذلك) و أكثر بكثير!", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 5692410a0a85..a4b6bae7f039 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1618,6 +1618,7 @@ "Type": "Növ", "Status": "Vəziyyət", "CreatedAt": "Yaradıldı", + "UpdatedAt": "Yenilənib", "KBDetail": "Bilik Bazasının Təfərrüatı", "Url": "URL", "FileText": "Fayl Mətni", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Bilik bazası uğurla silindi", "msgErrorDeleteKb": "Bilik Bazasını silmək mümkün olmadı", "msgErrorIndexingKb": "İndeksləmə uğursuz oldu", - "msgSuccesIndexingKb": "İndeksləmə uğurla tamamlandı", + "msgSuccesIndexingKb": "Uğurla işə salınan məzmunu yenidən hazırlayın", "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı" }, "AutomationsDemoPageDescription":"Bizim “API avtomatlaşdırmalarımız” ilə siz API-lərimizin asanlığı ilə birləşdirilən dizayner avtomatlaşdırmalarından istifadə edərək Whatsapp-da kütləvi yayım mesajlarını idarə edə, sevimli CRM-nin bütün kontaktlarına mesaj göndərə, göndərilən mesajların statusunu (qəbul edildi, oxundu və s.) ala bilərsiniz. ) və daha çox!", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 9a40a11fe76f..6d76a941e5d4 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1618,6 +1618,7 @@ "Type": "Typ", "Status": "Status", "CreatedAt": "Hergestellt in", + "UpdatedAt": "Aktualisiert am", "KBDetail": "Details zur Wissensdatenbank", "Url": "URL", "FileText": "Dateitext", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Wissensdatenbank erfolgreich gelöscht", "msgErrorDeleteKb": "Die Wissensdatenbank konnte nicht gelöscht werden", "msgErrorIndexingKb": "Die Indizierung ist fehlgeschlagen", - "msgSuccesIndexingKb": "Die Indizierung wurde erfolgreich abgeschlossen", + "msgSuccesIndexingKb": "Neuschulung für erfolgreich eingeführte Inhalte", "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden" }, "AutomationsDemoPageDescription":"Mit unseren „APIs-Automatisierungen“ können Sie Massennachrichten auf WhatsApp verwalten, indem Sie die Automatisierungen des Designers in Kombination mit der Benutzerfreundlichkeit unserer APIs nutzen, Nachrichten an alle Kontakte Ihres bevorzugten CRM senden, den Status gesendeter Nachrichten (empfangen, gelesen usw.) erhalten. ) und vieles mehr!", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 39159cdc4588..e1ca6789caac 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1579,7 +1579,7 @@ "Add": "Add Knowledge Base", "Enter": "Enter", "NoKbAdded": "You have not added any Knowledge Base yet", - "RunIndexing": "Run Indexing", + "RunIndexing": "Re-train", "CreationDate": "Creation date", "KbCounterFooter": "{{counter}} of 3 Knowledge Bases added", "AddKbURL": "Add your page URL", @@ -1641,7 +1641,7 @@ "msgSuccesDeleteKb": "Knowledge Base successfully deleted", "msgErrorDeleteKb": "The Knowledge Base could not be deleted", "msgErrorIndexingKb": "Indexing failed", - "msgSuccesIndexingKb": "Indexing completed successfully", + "msgSuccesIndexingKb": "Re-train on content launched successfully", "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited" }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 9c3cc9f06a84..d23a42d9962d 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1618,6 +1618,7 @@ "Type": "Tipo", "Status": "Estado", "CreatedAt": "Creado en", + "UpdatedAt": "Actualizado en", "KBDetail": "Detalle de la base de conocimientos", "Url": "URL", "FileText": "Texto de archivo", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Base de conocimientos eliminada con éxito", "msgErrorDeleteKb": "No se pudo eliminar la base de conocimientos", "msgErrorIndexingKb": "Falló la indexación", - "msgSuccesIndexingKb": "La indexación se completó correctamente", + "msgSuccesIndexingKb": "Vuelva a capacitarse sobre el contenido lanzado exitosamente", "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar." }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index f6faabcf7720..e38a4a509ca3 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1618,6 +1618,7 @@ "Type": "Taper", "Status": "Statut", "CreatedAt": "Créé à", + "UpdatedAt": "Mis à jour à", "KBDetail": "Détail de la base de connaissances", "Url": "URL", "FileText": "Texte du fichier", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Base de connaissances supprimée avec succès", "msgErrorDeleteKb": "La base de connaissances n'a pas pu être supprimée", "msgErrorIndexingKb": "Échec de l'indexation", - "msgSuccesIndexingKb": "Indexation terminée avec succès", + "msgSuccesIndexingKb": "Recycler sur le contenu lancé avec succès", "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée" }, "AutomationsDemoPageDescription":"Avec nos “Automatisations API” vous pouvez gérer les messages diffusés en masse sur Whatsapp grâce aux automatisations du concepteur combinées à la simplicité de nos API, envoyer des messages à tous les contacts de votre CRM préféré, recevoir le statut des messages envoyés (reçus, lus, etc. ) et beaucoup plus!", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 7a23e415db3e..ec89ea9e1180 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1580,7 +1580,7 @@ "Add": "Aggiungi", "Enter": "Invia", "NoKbAdded": "Non hai ancora aggiunto nessuna Knowledge Base", - "RunIndexing": "Indicizza", + "RunIndexing": "Riaddestrare", "CreationDate": "Data creazione", "KbCounterFooter": "{{ counter }} di 3 Knowledge Base aggiunte", "AddKbURL": "Aggiungi l'URL della tua pagina", @@ -1641,7 +1641,7 @@ "msgSuccesDeleteKb": "Knowledge Base eliminata con successo", "msgErrorDeleteKb": "Impossibile eliminare la Knowledge Base", "msgErrorIndexingKb": "Indicizzazione non riuscita", - "msgSuccesIndexingKb": "Indicizzazione completata con successo", + "msgSuccesIndexingKb": "Riqualificazione sui contenuti avviata correttamente", "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base" }, "AutomationsDemoPageDescription": "Con le nostre “APIs automations” puoi gestire messaggi broadcast massivi su Whatsapp utilizzando le automazioni del designer uniti alla facilità delle nostre API, inviare messaggi a tutti i contatti del tuo CRM preferito, ricevere lo stato dei messaggi inviati (ricevuto, letto etc.) e molto altro ancora!", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index fa65b5699264..d985cf2d190c 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1618,6 +1618,7 @@ "Type": "Түр", "Status": "Күй", "CreatedAt": "Құрылған", + "UpdatedAt": "Жаңартылған", "KBDetail": "Білім қорының мәліметтері", "Url": "URL", "FileText": "Файл мәтіні", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Білім қоры сәтті жойылды", "msgErrorDeleteKb": "Білім қорын жою мүмкін болмады", "msgErrorIndexingKb": "Индекстеу сәтсіз аяқталды", - "msgSuccesIndexingKb": "Индекстеу сәтті аяқталды", + "msgSuccesIndexingKb": "Сәтті іске қосылған мазмұнды қайта оқытыңыз", "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады" }, "AutomationsDemoPageDescription":"Біздің «API автоматикасының» көмегімен сіз WhatsApp желісіндегі жаппай хабарларды біздің API интерфейстеріміздің қарапайымдылығымен біріктірілген дизайнерлік автоматтандыруды пайдаланып басқара аласыз, сүйікті CRM-тің барлық контактілеріне хабарламалар жібере аласыз, жіберілген хабарламалардың күйін ала аласыз (қабылданған, оқылған және т. ) және тағы басқалар!", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 340a8fd87cd3..8e830a780d0b 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1618,6 +1618,7 @@ "Type": "Tipo", "Status": "Status", "CreatedAt": "Criado em", + "UpdatedAt": "Atualizado em", "KBDetail": "Detalhe da base de conhecimento", "Url": "URL", "FileText": "Texto do arquivo", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Base de conhecimento excluída com sucesso", "msgErrorDeleteKb": "A Base de Conhecimento não pôde ser excluída", "msgErrorIndexingKb": "Falha na indexação", - "msgSuccesIndexingKb": "Indexação concluída com sucesso", + "msgSuccesIndexingKb": "Treine novamente no conteúdo lançado com sucesso", "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada" }, "AutomationsDemoPageDescription":"Com nossas “automações de APIs” você pode gerenciar mensagens de difusão em massa no Whatsapp utilizando as automações do designer aliadas à facilidade de nossas APIs, enviar mensagens para todos os contatos do seu CRM favorito, receber o status das mensagens enviadas (recebidas, lidas, etc. ) e muito mais!", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 826ee68eb149..843afa88b2cd 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1618,6 +1618,7 @@ "Type": "Тип", "Status": "Положение дел", "CreatedAt": "Создан в", + "UpdatedAt": "Обновлено в", "KBDetail": "Подробности базы знаний", "Url": "URL-адрес", "FileText": "Текст файла", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "База знаний успешно удалена", "msgErrorDeleteKb": "Базу знаний не удалось удалить.", "msgErrorIndexingKb": "Индексирование не удалось", - "msgSuccesIndexingKb": "Индексирование успешно завершено", + "msgSuccesIndexingKb": "Повторное обучение успешно запущенному контенту", "msgErrorAddUpdateKb": "Базу знаний не удалось добавить или отредактировать." }, "AutomationsDemoPageDescription":"С помощью нашей «автоматизации API» вы можете управлять массовыми рассылками сообщений в Whatsapp, используя дизайнерскую автоматизацию в сочетании с простотой наших API, отправлять сообщения всем контактам вашей любимой CRM, получать статус отправленных сообщений (получено, прочитано и т. д.). ) и многое другое!", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index bcf71296a129..1420a7499d79 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1618,6 +1618,7 @@ "Type": "Тип", "Status": "Статус", "CreatedAt": "Креирано", + "UpdatedAt": "Ажурирано у", "KBDetail": "Детаљи базе знања", "Url": "УРЛ", "FileText": "Филе Тект", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "База знања је успешно избрисана", "msgErrorDeleteKb": "Није могуће избрисати базу знања", "msgErrorIndexingKb": "Индексирање није успело", - "msgSuccesIndexingKb": "Индексирање је успешно завршено", + "msgSuccesIndexingKb": "Поново обука за садржај који је успешно покренут", "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди" }, "AutomationsDemoPageDescription":"Са нашим „АПИ аутоматизацијама“ можете управљати масовним емитовањем порука на Вхатсапп-у користећи аутоматизацију дизајнера у комбинацији са лакоћом наших АПИ-ја, слати поруке свим контактима вашег омиљеног ЦРМ-а, примати статус послатих порука (примљено, прочитано, итд. ) и још много тога!", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 4c314dfedf9a..728363703c17 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1618,6 +1618,7 @@ "Type": "Typ", "Status": "Status", "CreatedAt": "Skapad vid", + "UpdatedAt": "Uppdaterad kl", "KBDetail": "Knowledge Base Detail", "Url": "URL", "FileText": "Arkivtext", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Knowledge Base har raderats", "msgErrorDeleteKb": "Kunskapsbasen kunde inte raderas", "msgErrorIndexingKb": "Indexering misslyckades", - "msgSuccesIndexingKb": "Indexeringen slutfördes", + "msgSuccesIndexingKb": "Utbilda om innehåll som har lanserats framgångsrikt", "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras" }, "AutomationsDemoPageDescription":"Med våra “API-automatiseringar” kan du hantera massutsändningsmeddelanden på Whatsapp med hjälp av designerns automatiseringar kombinerat med enkelheten hos våra API: er, skicka meddelanden till alla kontakter i din favorit-CRM, ta emot status för skickade meddelanden (mottagna, lästa, etc. ) och mycket mer!", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 0fb1654783b1..4c4ef454e14f 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1618,6 +1618,7 @@ "Type": "Tip", "Status": "Durum", "CreatedAt": "Oluşturulma Tarihi", + "UpdatedAt": "Güncelleme tarihi:", "KBDetail": "Bilgi Bankası Detayı", "Url": "URL'si", "FileText": "Dosya Metni", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Bilgi Bankası başarıyla silindi", "msgErrorDeleteKb": "Bilgi Bankası silinemedi", "msgErrorIndexingKb": "Dizine ekleme başarısız oldu", - "msgSuccesIndexingKb": "Dizine ekleme başarıyla tamamlandı", + "msgSuccesIndexingKb": "Başarıyla başlatılan içerikle ilgili yeniden eğitim", "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi" }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index cdbca8246ba2..75c9adf68270 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1618,6 +1618,7 @@ "Type": "Тип", "Status": "Статус", "CreatedAt": "Створено Ат", + "UpdatedAt": "Оновлено о", "KBDetail": "Деталі бази знань", "Url": "URL", "FileText": "Текст файлу", @@ -1640,7 +1641,7 @@ "msgSuccesDeleteKb": "Базу знань успішно видалено", "msgErrorDeleteKb": "Не вдалося видалити базу знань", "msgErrorIndexingKb": "Помилка індексації", - "msgSuccesIndexingKb": "Індексування успішно завершено", + "msgSuccesIndexingKb": "Повторне навчання вмісту успішно запущено", "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань" }, "AutomationsDemoPageDescription":"Завдяки нашій «автоматизації API» ви можете керувати масовими широкомовними повідомленнями в Whatsapp за допомогою автоматизації дизайнера в поєднанні з простотою наших API, надсилати повідомлення всім контактам вашої улюбленої CRM, отримувати статус надісланих повідомлень (отримано, прочитано тощо). ) і багато іншого!", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 0955f0a85270..5a5744743624 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1617,6 +1617,7 @@ "Type": "Turi", "Status": "Holat", "CreatedAt": "Yaratilgan", + "UpdatedAt": "Yangilangan", "KBDetail": "Bilimlar bazasi tafsilotlari", "Url": "URL", "FileText": "Fayl matni", @@ -1639,7 +1640,7 @@ "msgSuccesDeleteKb": "Ma'lumotlar bazasi muvaffaqiyatli o'chirildi", "msgErrorDeleteKb": "Bilimlar bazasini oʻchirib boʻlmadi", "msgErrorIndexingKb": "Indekslash amalga oshmadi", - "msgSuccesIndexingKb": "Indekslash muvaffaqiyatli yakunlandi", + "msgSuccesIndexingKb": "Muvaffaqiyatli ishga tushirilgan kontentni qayta o'qitish", "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi" }, "AutomationsDemoPageDescription":"Bizning “API avtomatizatsiyamiz” yordamida siz Whatsapp-da ommaviy translyatsiya xabarlarini bizning API-larimiz qulayligi bilan birlashtirilgan dizayner avtomatizatsiyasidan foydalangan holda boshqarishingiz, sevimli CRM-ning barcha kontaktlariga xabarlar yuborishingiz, yuborilgan xabarlar holatini (qabul qilingan, o'qilgan va hokazo) olishingiz mumkin. ) va yana ko'p narsalar!", From 2ae99048f199f80efae8e53268f84e89f21c010c Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Tue, 27 Feb 2024 15:39:25 +0100 Subject: [PATCH 07/35] bug fix label no content and table empty --- src/app/knowledge-bases/knowledge-bases.component.ts | 2 +- .../knowledge-base-table/knowledge-base-table.component.html | 4 +++- src/assets/i18n/ar.json | 3 ++- src/assets/i18n/az.json | 3 ++- src/assets/i18n/de.json | 3 ++- src/assets/i18n/en.json | 3 ++- src/assets/i18n/es.json | 3 ++- src/assets/i18n/fr.json | 3 ++- src/assets/i18n/it.json | 3 ++- src/assets/i18n/kk.json | 3 ++- src/assets/i18n/pt.json | 3 ++- src/assets/i18n/ru.json | 3 ++- src/assets/i18n/sr.json | 3 ++- src/assets/i18n/sv.json | 3 ++- src/assets/i18n/tr.json | 3 ++- src/assets/i18n/uk.json | 3 ++- src/assets/i18n/uz.json | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 745f6b45d0c9..4d0618b00599 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -512,7 +512,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { "status": '', "search": '', } - this.onLoadByFilter(searchParams); + // this.onLoadByFilter(searchParams); // this.logger.log("kbsList:",that.kbsList); // that.onRunIndexing(kb); setTimeout(() => { diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 49413878ad09..e5d3a104b872 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -75,8 +75,10 @@

{{'KbPage.noContent' | translate}}
description link diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 5374f2d3092e..6948cee0d466 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "لا يمكن حذف قاعدة المعارف", "msgErrorIndexingKb": "فشلت الفهرسة", "msgSuccesIndexingKb": "تم إطلاق إعادة التدريب على المحتوى بنجاح", - "msgErrorAddUpdateKb": "لا يمكن إضافة قاعدة المعارف أو تحريرها" + "msgErrorAddUpdateKb": "لا يمكن إضافة قاعدة المعارف أو تحريرها", + "noContent": "لا يوجد محتوى" }, "AutomationsDemoPageDescription":"من خلال أتمتة واجهات برمجة التطبيقات لدينا، يمكنك إدارة رسائل البث الجماعية على Whatsapp باستخدام أتمتة المصمم جنبًا إلى جنب مع سهولة واجهات برمجة التطبيقات لدينا، وإرسال رسائل إلى جميع جهات الاتصال الخاصة بإدارة علاقات العملاء (CRM) المفضلة لديك، وتلقي حالة الرسائل المرسلة (المستلمة، المقروءة، وما إلى ذلك) و أكثر بكثير!", "Sunday": "الأحد", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index a4b6bae7f039..2612e72bdd24 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Bilik Bazasını silmək mümkün olmadı", "msgErrorIndexingKb": "İndeksləmə uğursuz oldu", "msgSuccesIndexingKb": "Uğurla işə salınan məzmunu yenidən hazırlayın", - "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı" + "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı", + "noContent": "məzmun yoxdur" }, "AutomationsDemoPageDescription":"Bizim “API avtomatlaşdırmalarımız” ilə siz API-lərimizin asanlığı ilə birləşdirilən dizayner avtomatlaşdırmalarından istifadə edərək Whatsapp-da kütləvi yayım mesajlarını idarə edə, sevimli CRM-nin bütün kontaktlarına mesaj göndərə, göndərilən mesajların statusunu (qəbul edildi, oxundu və s.) ala bilərsiniz. ) və daha çox!", "Sunday": "bazar günü", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 6d76a941e5d4..320c8756c550 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Die Wissensdatenbank konnte nicht gelöscht werden", "msgErrorIndexingKb": "Die Indizierung ist fehlgeschlagen", "msgSuccesIndexingKb": "Neuschulung für erfolgreich eingeführte Inhalte", - "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden" + "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden", + "noContent": "kein Inhalt" }, "AutomationsDemoPageDescription":"Mit unseren „APIs-Automatisierungen“ können Sie Massennachrichten auf WhatsApp verwalten, indem Sie die Automatisierungen des Designers in Kombination mit der Benutzerfreundlichkeit unserer APIs nutzen, Nachrichten an alle Kontakte Ihres bevorzugten CRM senden, den Status gesendeter Nachrichten (empfangen, gelesen usw.) erhalten. ) und vieles mehr!", "Sunday": "Sonntag", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index e1ca6789caac..9adfe5d0ff06 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "The Knowledge Base could not be deleted", "msgErrorIndexingKb": "Indexing failed", "msgSuccesIndexingKb": "Re-train on content launched successfully", - "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited" + "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited", + "noContent": "no content" }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", "Sunday": "Sunday", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index d23a42d9962d..337fdd6e06f6 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "No se pudo eliminar la base de conocimientos", "msgErrorIndexingKb": "Falló la indexación", "msgSuccesIndexingKb": "Vuelva a capacitarse sobre el contenido lanzado exitosamente", - "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar." + "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar.", + "noContent": "sin contenido" }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", "Sunday": "Domingo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index e38a4a509ca3..6e30940bc902 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "La base de connaissances n'a pas pu être supprimée", "msgErrorIndexingKb": "Échec de l'indexation", "msgSuccesIndexingKb": "Recycler sur le contenu lancé avec succès", - "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée" + "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée", + "noContent": "Pas de contenu" }, "AutomationsDemoPageDescription":"Avec nos “Automatisations API” vous pouvez gérer les messages diffusés en masse sur Whatsapp grâce aux automatisations du concepteur combinées à la simplicité de nos API, envoyer des messages à tous les contacts de votre CRM préféré, recevoir le statut des messages envoyés (reçus, lus, etc. ) et beaucoup plus!", "Sunday": "Dimanche", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index ec89ea9e1180..2fb273bece50 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Impossibile eliminare la Knowledge Base", "msgErrorIndexingKb": "Indicizzazione non riuscita", "msgSuccesIndexingKb": "Riqualificazione sui contenuti avviata correttamente", - "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base" + "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base", + "noContent": "nessun contenuto" }, "AutomationsDemoPageDescription": "Con le nostre “APIs automations” puoi gestire messaggi broadcast massivi su Whatsapp utilizzando le automazioni del designer uniti alla facilità delle nostre API, inviare messaggi a tutti i contatti del tuo CRM preferito, ricevere lo stato dei messaggi inviati (ricevuto, letto etc.) e molto altro ancora!", "Sunday": "Domenica", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index d985cf2d190c..84ff9a9257e6 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Білім қорын жою мүмкін болмады", "msgErrorIndexingKb": "Индекстеу сәтсіз аяқталды", "msgSuccesIndexingKb": "Сәтті іске қосылған мазмұнды қайта оқытыңыз", - "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады" + "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады", + "noContent": "мазмұны жоқ" }, "AutomationsDemoPageDescription":"Біздің «API автоматикасының» көмегімен сіз WhatsApp желісіндегі жаппай хабарларды біздің API интерфейстеріміздің қарапайымдылығымен біріктірілген дизайнерлік автоматтандыруды пайдаланып басқара аласыз, сүйікті CRM-тің барлық контактілеріне хабарламалар жібере аласыз, жіберілген хабарламалардың күйін ала аласыз (қабылданған, оқылған және т. ) және тағы басқалар!", "Sunday": "Жексенбі", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 8e830a780d0b..4f9907261c97 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "A Base de Conhecimento não pôde ser excluída", "msgErrorIndexingKb": "Falha na indexação", "msgSuccesIndexingKb": "Treine novamente no conteúdo lançado com sucesso", - "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada" + "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada", + "noContent": "sem conteúdo" }, "AutomationsDemoPageDescription":"Com nossas “automações de APIs” você pode gerenciar mensagens de difusão em massa no Whatsapp utilizando as automações do designer aliadas à facilidade de nossas APIs, enviar mensagens para todos os contatos do seu CRM favorito, receber o status das mensagens enviadas (recebidas, lidas, etc. ) e muito mais!", "Sunday": "Domingo", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 843afa88b2cd..35edfe367d50 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Базу знаний не удалось удалить.", "msgErrorIndexingKb": "Индексирование не удалось", "msgSuccesIndexingKb": "Повторное обучение успешно запущенному контенту", - "msgErrorAddUpdateKb": "Базу знаний не удалось добавить или отредактировать." + "msgErrorAddUpdateKb": "Базу знаний не удалось добавить или отредактировать.", + "noContent": "без содержания" }, "AutomationsDemoPageDescription":"С помощью нашей «автоматизации API» вы можете управлять массовыми рассылками сообщений в Whatsapp, используя дизайнерскую автоматизацию в сочетании с простотой наших API, отправлять сообщения всем контактам вашей любимой CRM, получать статус отправленных сообщений (получено, прочитано и т. д.). ) и многое другое!", "Sunday": "Воскресенье", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index 1420a7499d79..0d5e54c69782 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Није могуће избрисати базу знања", "msgErrorIndexingKb": "Индексирање није успело", "msgSuccesIndexingKb": "Поново обука за садржај који је успешно покренут", - "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди" + "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди", + "noContent": "без садржаја" }, "AutomationsDemoPageDescription":"Са нашим „АПИ аутоматизацијама“ можете управљати масовним емитовањем порука на Вхатсапп-у користећи аутоматизацију дизајнера у комбинацији са лакоћом наших АПИ-ја, слати поруке свим контактима вашег омиљеног ЦРМ-а, примати статус послатих порука (примљено, прочитано, итд. ) и још много тога!", "Sunday": "недеља", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 728363703c17..e2c890fd5f01 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Kunskapsbasen kunde inte raderas", "msgErrorIndexingKb": "Indexering misslyckades", "msgSuccesIndexingKb": "Utbilda om innehåll som har lanserats framgångsrikt", - "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras" + "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras", + "noContent": "inget innehåll" }, "AutomationsDemoPageDescription":"Med våra “API-automatiseringar” kan du hantera massutsändningsmeddelanden på Whatsapp med hjälp av designerns automatiseringar kombinerat med enkelheten hos våra API: er, skicka meddelanden till alla kontakter i din favorit-CRM, ta emot status för skickade meddelanden (mottagna, lästa, etc. ) och mycket mer!", "Sunday": "söndag", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 4c4ef454e14f..b5f77a050123 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Bilgi Bankası silinemedi", "msgErrorIndexingKb": "Dizine ekleme başarısız oldu", "msgSuccesIndexingKb": "Başarıyla başlatılan içerikle ilgili yeniden eğitim", - "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi" + "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi", + "noContent": "içerik yok" }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", "Sunday": "Pazar", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 75c9adf68270..54f719cea8ba 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1642,7 +1642,8 @@ "msgErrorDeleteKb": "Не вдалося видалити базу знань", "msgErrorIndexingKb": "Помилка індексації", "msgSuccesIndexingKb": "Повторне навчання вмісту успішно запущено", - "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань" + "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань", + "noContent": "немає вмісту" }, "AutomationsDemoPageDescription":"Завдяки нашій «автоматизації API» ви можете керувати масовими широкомовними повідомленнями в Whatsapp за допомогою автоматизації дизайнера в поєднанні з простотою наших API, надсилати повідомлення всім контактам вашої улюбленої CRM, отримувати статус надісланих повідомлень (отримано, прочитано тощо). ) і багато іншого!", "Sunday": "неділя", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 5a5744743624..5d631d95a57f 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1641,7 +1641,8 @@ "msgErrorDeleteKb": "Bilimlar bazasini oʻchirib boʻlmadi", "msgErrorIndexingKb": "Indekslash amalga oshmadi", "msgSuccesIndexingKb": "Muvaffaqiyatli ishga tushirilgan kontentni qayta o'qitish", - "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi" + "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi", + "noContent": "tarkib yo'q" }, "AutomationsDemoPageDescription":"Bizning “API avtomatizatsiyamiz” yordamida siz Whatsapp-da ommaviy translyatsiya xabarlarini bizning API-larimiz qulayligi bilan birlashtirilgan dizayner avtomatizatsiyasidan foydalangan holda boshqarishingiz, sevimli CRM-ning barcha kontaktlariga xabarlar yuborishingiz, yuborilgan xabarlar holatini (qabul qilingan, o'qilgan va hokazo) olishingiz mumkin. ) va yana ko'p narsalar!", "Sunday": "yakshanba", From fc7294727c16f4ac7aad8704e2be0a080dcb23e1 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 28 Feb 2024 10:53:06 +0100 Subject: [PATCH 08/35] set kb tab empty, added urls step1 --- src/app/app.module.ts | 4 +- .../knowledge-bases.component.html | 11 +- .../knowledge-bases.component.ts | 60 ++++- .../knowledge-base-table.component.html | 59 +++-- .../knowledge-base-table.component.scss | 39 ++++ .../knowledge-base-table.component.ts | 8 +- .../modal-urls-knowledge-base.component.html | 59 +++++ .../modal-urls-knowledge-base.component.scss | 208 ++++++++++++++++++ ...odal-urls-knowledge-base.component.spec.ts | 23 ++ .../modal-urls-knowledge-base.component.ts | 67 ++++++ src/app/services/knowledge-base.service.ts | 14 ++ 11 files changed, 530 insertions(+), 22 deletions(-) create mode 100644 src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html create mode 100644 src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss create mode 100644 src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.spec.ts create mode 100644 src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a48dd0958c82..4aabfde82012 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -393,6 +393,7 @@ import { ModalDetailKnowledgeBaseComponent } from './knowledge-bases/modals/moda import { KnowledgeBaseTableComponent } from './knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component'; import { ModalErrorComponent } from './knowledge-bases/modals/modal-error/modal-error.component'; import { KnowledgeBasesPreviousComponent } from './knowledge-bases-previous/knowledge-bases-previous.component'; +import { ModalUrlsKnowledgeBaseComponent } from './knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component'; @@ -696,7 +697,8 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic ModalDetailKnowledgeBaseComponent, KnowledgeBaseTableComponent, ModalErrorComponent, - KnowledgeBasesPreviousComponent + KnowledgeBasesPreviousComponent, + ModalUrlsKnowledgeBaseComponent ], imports: [ TooltipModule.forRoot(CutomTooltipOptions as TooltipOptions), diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index 9067f8bee4e5..248c9a7d83ee 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -27,7 +27,7 @@
-
+
+ diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 4d0618b00599..bf56ead5b0a5 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -453,7 +453,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbsList.push(kb); }); this.logger.log('[KNOWLEDGE BASES COMP] get kbList: ', this.kbs, this.kbsList); - // this.checkAllStatuses(); + this.checkAllStatuses(); this.refreshKbsList = !this.refreshKbsList; //this.showSpinner = false; }, (error) => { @@ -528,6 +528,53 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { }) } + + + onAddMultiKb(body) { + // this.onCloseBaseModal(); + console.log("onAddMultiKb"); + let error = this.msgErrorAddUpdateKb; + this.kbService.addMultiKb(body).subscribe((resp: any) => { + this.logger.log("onAddMultiKb:", resp); + // let kb = resp.value; + if(resp.lastErrorObject && resp.lastErrorObject.updatedExisting === true){ + //console.log("updatedExisting true:"); + // const index = this.kbsList.findIndex(item => item._id === kb._id); + // if (index !== -1) { + // this.kbsList[index] = kb; + // this.notify.showWidgetStyleUpdateNotification(this.msgSuccesUpdateKb, 3, 'warning'); + // } + } else { + //this.kbsList.push(kb); + // this.kbsList.unshift(kb); + // this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); + } + // this.updateStatusOfKb(kb._id, 0); + // this.refreshKbsList = !this.refreshKbsList; + + // let searchParams = { + // "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, + // "direction": KB_DEFAULT_PARAMS.DIRECTION, + // "status": '', + // "search": '', + // } + // this.onLoadByFilter(searchParams); + // this.logger.log("kbsList:",that.kbsList); + // that.onRunIndexing(kb); + // setTimeout(() => { + // this.checkStatusWithRetry(kb); + // }, 2000); + //that.onCloseBaseModal(); + }, (err) => { + this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR add new kb: ", err); + this.onOpenErrorModal(error); + }, () => { + this.logger.log("[KNOWLEDGE-BASES-COMP] add new kb *COMPLETED*"); + //this.trackUserActioOnKB('Added Knowledge Base', gptkey) + }) + } + + /** * onDeleteKb */ @@ -643,11 +690,12 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } this.openaiService.checkScrapingStatus(data).subscribe((response: any) => { // this.logger.log('Risposta ricevuta:', response); - if(response.status_code && response.status_code == -1){ - // this.logger.log('risorsa non indicizzata'); - // this.onRunIndexing(kb); - // this.checkStatusWithRetry(kb); - } else if(response.status_code == -1 || response.status_code == 0 || response.status_code == 2){ + // if(response.status_code && response.status_code == -1){ + // // this.logger.log('risorsa non indicizzata'); + // // this.onRunIndexing(kb); + // this.checkStatusWithRetry(kb); + // } + if(response.status_code == -1 || response.status_code == 0 || response.status_code == 2){ // this.logger.log('riprova tra 10 secondi...'); this.updateStatusOfKb(kb._id, response.status_code); timer(10000).subscribe(() => { diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index e5d3a104b872..cd946eebd42c 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,7 +1,50 @@ -
+
+ +
+ +
+
+ +

No data sources exist

+

Add data sources to your assistant to build a knowledge base of material. Learn more

+ + + + + + + + + + +
+
+
+
-
+ +
+ +
-
-
- - - - +
@@ -65,19 +105,12 @@ -
{{'KbPage.noContent' | translate}}
description diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index d4724f044511..24c0008c4d4d 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -209,3 +209,42 @@ td { margin-bottom: -40px; } + + +.lock-container { + width: 100%; + background-color: transparent; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + img { + width: 300px; + height: auto; + margin: 50px 0px; + } + p.upgrade-title { + font-size: 28px; + font-weight: 500; + margin-bottom: 20px; + } + p.upgrade-subtitle { + font-size: 16px; + margin-bottom: 30px; + max-width: 800px; + text-align: center; + } +} + + +.custom-upgrade-primary-button { + color: white; + min-width: 80px; + background: linear-gradient(45deg, #3167e2, #3167e2, #a736ff); + border: none; + border-radius: 6px; + height: 30px; + font-weight: 500; + padding: 0px 8px; + opacity: 0.8; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index e9eb409e2be0..8cde7965ca4f 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -21,6 +21,8 @@ export class KnowledgeBaseTableComponent implements OnInit { @Output() openBaseModalDetail = new EventEmitter(); @Output() openBaseModalDelete = new EventEmitter(); @Output() openBaseModalPreview = new EventEmitter(); + @Output() openAddKnowledgeBaseModal = new EventEmitter(); + @Output() runIndexing = new EventEmitter(); @Output() loadPage = new EventEmitter(); @Output() loadByFilter = new EventEmitter(); @@ -82,7 +84,7 @@ export class KnowledgeBaseTableComponent implements OnInit { // } ngOnChanges(changes: SimpleChanges){ - // console.log('ngOnChanges!!!****** ', changes, changes.kbsListCount, this.kbsList.length); + console.log('ngOnChanges!!!****** ', changes); // if(changes.kbsListCount && changes.kbsListCount.currentValue) { if(changes.kbsListCount && changes.kbsListCount.currentValue){ this.kbsListCount = changes.kbsListCount.currentValue; @@ -179,6 +181,10 @@ export class KnowledgeBaseTableComponent implements OnInit { } return subtitle; } + + onOpenAddKnowledgeBaseModal(type){ + this.openAddKnowledgeBaseModal.emit(type); + } } diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html new file mode 100644 index 000000000000..bb24a70442ee --- /dev/null +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -0,0 +1,59 @@ + + + + + + + + + diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss new file mode 100644 index 000000000000..a4cea2930818 --- /dev/null +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss @@ -0,0 +1,208 @@ +.modal-header { + .modal-title { + font-weight: 400; + } + .close{ + opacity: 0.5; + } + .close:hover{ + opacity: 1; + } +} + +.modal-body { + display: inline-block; + width: 100%; +} + +.modal-state { + width: 40%; + text-align: right; + float: right; +} + +.fake-input { + height: 37px; + border-radius: 6px; + border: solid 2px #c6cdd4; + display: flex; + align-items: center; + padding: 12px; + cursor: text; + .fake-input-inner { + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + } + input { + height: 32px; + width: 100%; + border: transparent; + } + .input-bold { + font-weight: 400; + } + .enter-button { + display: none; + transition: background-color 0.15s ease 0s, color 0.15s ease 0s; + cursor: pointer; + animation: 0.15s ease 0s 1 normal none running fadein, 0.15s ease 0s 1 normal none running moveinleft; + box-sizing: border-box; + min-width: 22px; + height: 22.4px; + margin-top: -4px; + margin-bottom: -4px; + padding-right: 8px; + padding-left: 8px; + font-weight: 600; + font-size: 12px; + line-height: 24px; + text-align: center; + border-radius: 5px; + // color: #61778c; + color: rgb(98, 119, 140); + background: linear-gradient(rgba(239, 245, 246, 0.64) 0%, rgb(238, 244, 246) 100%), rgb(255, 255, 255); + box-shadow: rgb(212, 217, 230) 0px 1px 0px; + } + @keyframes fadein { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } + @keyframes moveinleft { + 0% { + transform: translate(16px); + } + + 100% { + transform: translate(0px); + } + } +} + +::ng-deep .custom-spinner { + .sk-fading-circle { + width: 20px; + height: 20px; + margin: 0px; + } + .sk-fading-circle .sk-circle:before { + background-color: rgb(98, 119, 140) !important; + } +} + +.answer { + min-height: 37px; + max-height: auto; + border-radius: 6px; + border: solid 2px #c6cdd4; + padding: 6px 12px 20px; + cursor: text; + overflow: hidden; + transition: max-height 0.5s ease-out; + .answer-title { + margin-bottom: 0px; + font-size: 12px; + font-weight: 600; + color: rgb(98, 119, 140) !important; + } +} + +.form-container { + margin-top: 12px; + margin-bottom: 12px; + display: inline-block; + width: 100%; + .input-container { + margin-bottom: 14px; + } + + .input-label { + font-weight: 400; + // letter-spacing: 0.5px; + } + + .custom-input { + width: 100%; + height: 37px; + border-radius: 6px; + border: 2px solid #c6cdd4; + padding: 0px 15px; + color: #22272d; + // line-height: 35px; + // font-weight: 400; + margin-bottom: 10px; + // letter-spacing: 0.5px; + &.invalid { + border: 2px solid red !important; + outline: 0px solid red !important; + transition: border 0.3s; + } + } + .custom-textarea { + width: 100%; + border-radius: 6px; + border: 2px solid #c6cdd4; + padding: 10px 15px; + color: #22272d; + // line-height: 35px; + // font-weight: 400; + &.invalid { + border: 2px solid red !important; + outline: 0px solid red !important; + transition: border 0.3s; + } + } +} + + +.kb-container { + width: fit-content; + display: flex; + flex-direction: row; + align-items: center; + border: solid 1px #c2c2c2; + border-radius: 12px; + padding: 2px 10px; + background: linear-gradient(rgba(239, 245, 246, 0.64) 0%, rgb(238, 244, 246) 100%), rgb(255, 255, 255); + box-shadow: rgb(212, 217, 230) 0px 1px 0px; + + p { + font-size: 12px; + margin-bottom: 0px; + color: rgb(98, 119, 140); + } + + .material-icons-round { + font-size: 20px; + margin-right: 8px; + color: rgb(98, 119, 140); + } +} + +.selectEngine { + ::ng-deep .ng-select-container { + border: 2px solid #c6cdd4; + } +} + +.info-container { + display: flex; + flex-direction: row; + padding: 12px 15px; + border-radius: 4px; + background-color: #d7ebfa6e; + .info-icon { + margin-right: 8px; + font-size: 20px; + } + p { + margin-bottom: 0px; + } +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.spec.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.spec.ts new file mode 100644 index 000000000000..07a1372f0b1f --- /dev/null +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ModalUrlsKnowledgeBaseComponent } from './modal-urls-knowledge-base.component'; + +describe('ModalUrlsKnowledgeBaseComponent', () => { + let component: ModalUrlsKnowledgeBaseComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ModalUrlsKnowledgeBaseComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ModalUrlsKnowledgeBaseComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts new file mode 100644 index 000000000000..aa8157a02862 --- /dev/null +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts @@ -0,0 +1,67 @@ +import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { KB, KbSettings } from 'app/models/kbsettings-model'; + +@Component({ + selector: 'modal-urls-knowledge-base', + templateUrl: './modal-urls-knowledge-base.component.html', + styleUrls: ['./modal-urls-knowledge-base.component.scss'] +}) +export class ModalUrlsKnowledgeBaseComponent implements OnInit { + + @Output() saveKnowledgeBase = new EventEmitter(); + @Output() closeBaseModal = new EventEmitter(); + + kbForm: FormGroup; + buttonDisabled: boolean = false; + + list = []; + content: string; + + kb: KB = { + _id: null, + type: '', + name: '', + url: '', + content: '' + } + constructor( + private formBuilder: FormBuilder + ) { } + + ngOnInit(): void { + this.kbForm = this.createConditionGroup(); + } + + createConditionGroup(): FormGroup { + const contentPattern = /^[^&<>]{3,}$/; + const namePattern = /^[^&<>]{3,}$/; + return this.formBuilder.group({ + content: ['', [Validators.required]], + name: ['', [Validators.required, Validators.pattern(namePattern)]] + }) + } + + + onChangeInput(event): void { + // if (this.kbForm.valid) { + // this.buttonDisabled = false; + // } else { + // this.buttonDisabled = true; + // } + } + + onSaveKnowledgeBase(){ + console.log('onSaveKnowledgeBase: ',this.content); + const arrayURLS = this.content.split('\n'); + let body = { + 'list': arrayURLS + } + console.log(body); + this.saveKnowledgeBase.emit(body); + } + + onCloseBaseModal() { + this.closeBaseModal.emit(); + } +} diff --git a/src/app/services/knowledge-base.service.ts b/src/app/services/knowledge-base.service.ts index 186a01f08d47..b40f132d8a83 100644 --- a/src/app/services/knowledge-base.service.ts +++ b/src/app/services/knowledge-base.service.ts @@ -161,6 +161,20 @@ export class KnowledgeBaseService { return this.httpClient.post(url, JSON.stringify(body), httpOptions); } + addMultiKb(body: any) { + const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + 'Authorization': this.TOKEN + }) + } + const url = this.SERVER_BASE_PATH + this.project_id + "/kb/multi"; + this.logger.log("[KNOWLEDGE BASE SERVICE] - add new kb URL ", url); + return this.httpClient.post(url, JSON.stringify(body), httpOptions); + } + + + deleteKb(data: any){ const httpOptions = { headers: new HttpHeaders({ From 5ec888f619c912103ec490424bca2e4711a424c7 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Wed, 28 Feb 2024 17:29:30 +0100 Subject: [PATCH 09/35] bug fix paginator infinite scroll on add/delete content --- .../knowledge-bases.component.ts | 52 ++++++++++++------- .../knowledge-base-table.component.html | 4 +- .../knowledge-base-table.component.ts | 28 +++++++--- 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index bf56ead5b0a5..329994ea485d 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -406,26 +406,25 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // } onLoadPage(searchParams){ - //console.log('onLoadNextPage:',this.kbsList); - // + console.log('onLoadNextPage:',searchParams); let params = "?limit="+KB_DEFAULT_PARAMS.LIMIT - if(searchParams.page){ + if(searchParams?.page){ params +="&page="+searchParams.page; } else { +"&page=0"; } - if(searchParams.status){ + if(searchParams?.status){ params +="&status="+searchParams.status; } - if(searchParams.search){ + if(searchParams?.search){ params +="&search="+searchParams.search; } - if(searchParams.sortField){ + if(searchParams?.sortField){ params +="&sortField="+searchParams.sortField; } else { params +="&sortField="+KB_DEFAULT_PARAMS.SORT_FIELD; } - if(searchParams.direction){ + if(searchParams?.direction){ params +="&direction="+searchParams.direction; } else { params +="&direction="+KB_DEFAULT_PARAMS.DIRECTION; @@ -449,6 +448,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.logger.log("[KNOWLEDGE BASES COMP] get kbList: ", resp); this.kbs = resp; this.kbsListCount = resp.count; + resp.kbs.forEach(kb => { this.kbsList.push(kb); }); @@ -500,24 +500,28 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } } else { //this.kbsList.push(kb); - this.kbsList.unshift(kb); this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); - } - this.updateStatusOfKb(kb._id, 0); - this.refreshKbsList = !this.refreshKbsList; + this.kbsListCount++; + this.kbsList.unshift(kb); + this.refreshKbsList = !this.refreshKbsList; - let searchParams = { - "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, - "direction": KB_DEFAULT_PARAMS.DIRECTION, - "status": '', - "search": '', + let searchParams = { + "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, + "direction": KB_DEFAULT_PARAMS.DIRECTION, + "status": '', + "search": '', + } + this.onLoadByFilter(searchParams); } + //this.updateStatusOfKb(kb._id, 0); + + // this.onLoadByFilter(searchParams); // this.logger.log("kbsList:",that.kbsList); // that.onRunIndexing(kb); - setTimeout(() => { - this.checkStatusWithRetry(kb); - }, 2000); + // setTimeout(() => { + // this.checkStatusWithRetry(kb); + // }, 2000); //that.onCloseBaseModal(); }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR add new kb: ", err); @@ -597,6 +601,16 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // let error = response.error?response.error:"Errore generico"; // this.onOpenErrorModal(error); this.removeKb(kb._id); + this.kbsListCount--; + this.refreshKbsList = !this.refreshKbsList; + + let searchParams = { + "sortField": KB_DEFAULT_PARAMS.SORT_FIELD, + "direction": KB_DEFAULT_PARAMS.DIRECTION, + "status": '', + "search": '', + } + this.onLoadByFilter(searchParams); } }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR delete kb: ", err); diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index cd946eebd42c..a436531f247d 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,4 +1,4 @@ -
+
', this.kbsListCount, this.kbsList.length,changes); + + if(changes.kbsList?.currentValue?.length === changes.kbsList?.previousValue?.length){ + // non è cambiato nulla ho solo rodinato la tab } else { + // if(changes.kbsListCount && changes.kbsListCount.currentValue){ + // this.kbsListCount = changes.kbsListCount.currentValue; + // } else if(changes.kbsList && changes.kbsList.currentValue){ + // this.kbsListCount = changes.kbsList.currentValue.length; + // } + } + if(this.kbsListCount > this.kbsList.length){ this.SHOW_MORE_BTN = true; + } else { + this.SHOW_MORE_BTN = false; } if(changes.refresh){ this.isLoading = false; } + if(this.kbsListCount>0){ + this.SHOW_TABLE = true; + } + console.log('ngOnChanges end -------> ', this.kbsListCount, this.kbsList.length); } ngAfterViewInit() { From 74598f5db7f125ab94dc8a9b5102adae52e86554 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Thu, 29 Feb 2024 10:48:51 +0100 Subject: [PATCH 10/35] added upload list of urls --- .../knowledge-bases.component.html | 6 +- .../knowledge-bases.component.ts | 103 ++++++++---------- .../knowledge-base-table.component.ts | 11 +- .../modal-urls-knowledge-base.component.html | 19 ++-- .../modal-urls-knowledge-base.component.scss | 1 + .../modal-urls-knowledge-base.component.ts | 35 +++--- src/app/utils/util.ts | 2 +- src/assets/i18n/ar.json | 7 +- src/assets/i18n/az.json | 7 +- src/assets/i18n/de.json | 7 +- src/assets/i18n/en.json | 7 +- src/assets/i18n/es.json | 7 +- src/assets/i18n/fr.json | 7 +- src/assets/i18n/it.json | 7 +- src/assets/i18n/kk.json | 7 +- src/assets/i18n/pt.json | 7 +- src/assets/i18n/ru.json | 7 +- src/assets/i18n/sr.json | 7 +- src/assets/i18n/sv.json | 7 +- src/assets/i18n/tr.json | 7 +- src/assets/i18n/uk.json | 7 +- src/assets/i18n/uz.json | 7 +- 22 files changed, 178 insertions(+), 104 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index 248c9a7d83ee..e5fcc067d053 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -27,7 +27,7 @@
-
+
- + ', this.kbsListCount, this.kbsList.length,changes); + console.log('ngOnChanges start ------> ', this.kbsListCount, this.kbsList.length, changes); if(changes.kbsList?.currentValue?.length === changes.kbsList?.previousValue?.length){ // non è cambiato nulla ho solo rodinato la tab @@ -105,9 +105,18 @@ export class KnowledgeBaseTableComponent implements OnInit { if(changes.refresh){ this.isLoading = false; } + if(this.kbsListCount>0){ this.SHOW_TABLE = true; + } else { + this.SHOW_TABLE = false; + this.SHOW_MORE_BTN = false; } + + if(this.kbsList?.length == 0){ + this.SHOW_MORE_BTN = false; + } + console.log('ngOnChanges end -------> ', this.kbsListCount, this.kbsList.length); } diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html index bb24a70442ee..195086a25385 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -10,7 +10,7 @@

- {{ 'Import from URL(s)'' }} + {{ 'KbPage.titleUrls' | translate }}

@@ -19,21 +19,20 @@

help_outline
-

{{ 'KbPage.AddKbInfoTextContent' | translate }}

- -

+ +

- {{ 'URL(s)'' }} - - - {{ 'un url per linea' }} + {{ 'KbPage.infoUrls' | translate }}
diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss index a4cea2930818..6210fc174e83 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss @@ -1,6 +1,7 @@ .modal-header { .modal-title { font-weight: 400; + padding-left: 4px; } .close{ opacity: 0.5; diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts index aa8157a02862..a3f628e3457f 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { KB, KbSettings } from 'app/models/kbsettings-model'; @Component({ selector: 'modal-urls-knowledge-base', @@ -13,18 +12,18 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { @Output() closeBaseModal = new EventEmitter(); kbForm: FormGroup; - buttonDisabled: boolean = false; + buttonDisabled: boolean = true; list = []; content: string; - kb: KB = { - _id: null, - type: '', - name: '', - url: '', - content: '' - } + // kb: KB = { + // _id: null, + // type: '', + // name: '', + // url: '', + // content: '' + // } constructor( private formBuilder: FormBuilder ) { } @@ -34,30 +33,28 @@ export class ModalUrlsKnowledgeBaseComponent implements OnInit { } createConditionGroup(): FormGroup { - const contentPattern = /^[^&<>]{3,}$/; - const namePattern = /^[^&<>]{3,}$/; + // const contentPattern = /^[^&<>]{3,}$/; + // const namePattern = /^[^&<>]{3,}$/; return this.formBuilder.group({ content: ['', [Validators.required]], - name: ['', [Validators.required, Validators.pattern(namePattern)]] + // name: ['', [Validators.required, Validators.pattern(namePattern)]] }) } onChangeInput(event): void { - // if (this.kbForm.valid) { - // this.buttonDisabled = false; - // } else { - // this.buttonDisabled = true; - // } + if (this.kbForm.valid) { + this.buttonDisabled = false; + } else { + this.buttonDisabled = true; + } } onSaveKnowledgeBase(){ - console.log('onSaveKnowledgeBase: ',this.content); const arrayURLS = this.content.split('\n'); let body = { 'list': arrayURLS } - console.log(body); this.saveKnowledgeBase.emit(body); } diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index fae4e8145a45..a60e4a663909 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -336,7 +336,7 @@ export enum KB_MAX_NUM { export enum KB_DEFAULT_PARAMS { - LIMIT = 20, + LIMIT = 2, NUMBER_PAGE = 0, DIRECTION = -1, SORT_FIELD = 'updatedAt' diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 6948cee0d466..1a2a98540f02 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "فشلت الفهرسة", "msgSuccesIndexingKb": "تم إطلاق إعادة التدريب على المحتوى بنجاح", "msgErrorAddUpdateKb": "لا يمكن إضافة قاعدة المعارف أو تحريرها", - "noContent": "لا يوجد محتوى" + "noContent": "لا يوجد محتوى", + "titleUrls": "الاستيراد من عناوين URL", + "helpUrls": "قم بإدراج صفحات الويب من عناوين URL العامة في منطقة النص أدناه، مفصولة بإرجاع", + "titleTextareaUrls": "قائمة عناوين URL", + "placeholderUrls": "أدخل عناوين URL", + "infoUrls": "عنوان URL واحد لكل سطر." }, "AutomationsDemoPageDescription":"من خلال أتمتة واجهات برمجة التطبيقات لدينا، يمكنك إدارة رسائل البث الجماعية على Whatsapp باستخدام أتمتة المصمم جنبًا إلى جنب مع سهولة واجهات برمجة التطبيقات لدينا، وإرسال رسائل إلى جميع جهات الاتصال الخاصة بإدارة علاقات العملاء (CRM) المفضلة لديك، وتلقي حالة الرسائل المرسلة (المستلمة، المقروءة، وما إلى ذلك) و أكثر بكثير!", "Sunday": "الأحد", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 2612e72bdd24..ac87badb9575 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "İndeksləmə uğursuz oldu", "msgSuccesIndexingKb": "Uğurla işə salınan məzmunu yenidən hazırlayın", "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı", - "noContent": "məzmun yoxdur" + "noContent": "məzmun yoxdur", + "titleUrls": "URL-lərdən idxal", + "helpUrls": "İctimai URL-lərdən veb səhifələri geri dönüşlə ayrılaraq aşağıdakı mətn sahəsinə daxil edin", + "titleTextareaUrls": "URL-lərin siyahısı", + "placeholderUrls": "URL-ləri daxil edin", + "infoUrls": "Hər sətir üçün bir url." }, "AutomationsDemoPageDescription":"Bizim “API avtomatlaşdırmalarımız” ilə siz API-lərimizin asanlığı ilə birləşdirilən dizayner avtomatlaşdırmalarından istifadə edərək Whatsapp-da kütləvi yayım mesajlarını idarə edə, sevimli CRM-nin bütün kontaktlarına mesaj göndərə, göndərilən mesajların statusunu (qəbul edildi, oxundu və s.) ala bilərsiniz. ) və daha çox!", "Sunday": "bazar günü", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 320c8756c550..3aa9a323b08a 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Die Indizierung ist fehlgeschlagen", "msgSuccesIndexingKb": "Neuschulung für erfolgreich eingeführte Inhalte", "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden", - "noContent": "kein Inhalt" + "noContent": "kein Inhalt", + "titleUrls": "Von URLs importieren", + "helpUrls": "Fügen Sie Webseiten von öffentlichen URLs in den Textbereich unten ein, getrennt durch einen Zeilenumbruch", + "titleTextareaUrls": "Liste der URLs", + "placeholderUrls": "Geben Sie URLs ein", + "infoUrls": "Eine URL pro Zeile." }, "AutomationsDemoPageDescription":"Mit unseren „APIs-Automatisierungen“ können Sie Massennachrichten auf WhatsApp verwalten, indem Sie die Automatisierungen des Designers in Kombination mit der Benutzerfreundlichkeit unserer APIs nutzen, Nachrichten an alle Kontakte Ihres bevorzugten CRM senden, den Status gesendeter Nachrichten (empfangen, gelesen usw.) erhalten. ) und vieles mehr!", "Sunday": "Sonntag", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9adfe5d0ff06..6131db331121 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Indexing failed", "msgSuccesIndexingKb": "Re-train on content launched successfully", "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited", - "noContent": "no content" + "noContent": "no content", + "titleUrls": "Import from URLs", + "helpUrls": "Insert web pages from public URLs into the text area below, separated by a return", + "titleTextareaUrls": "List of URLs", + "placeholderUrls": "Enter URLs", + "infoUrls": "One url per line." }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", "Sunday": "Sunday", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 337fdd6e06f6..baeb27433759 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Falló la indexación", "msgSuccesIndexingKb": "Vuelva a capacitarse sobre el contenido lanzado exitosamente", "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar.", - "noContent": "sin contenido" + "noContent": "sin contenido", + "titleUrls": "Importar desde URL", + "helpUrls": "Inserte páginas web desde URL públicas en el área de texto a continuación, separadas por un retorno", + "titleTextareaUrls": "Lista de URL", + "placeholderUrls": "Ingrese las URL", + "infoUrls": "Una URL por línea." }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", "Sunday": "Domingo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 6e30940bc902..b003965497bd 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Échec de l'indexation", "msgSuccesIndexingKb": "Recycler sur le contenu lancé avec succès", "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée", - "noContent": "Pas de contenu" + "noContent": "Pas de contenu", + "titleUrls": "Importer à partir d'URL", + "helpUrls": "Insérez des pages Web à partir d'URL publiques dans la zone de texte ci-dessous, séparées par un retour", + "titleTextareaUrls": "Liste des URL", + "placeholderUrls": "Saisissez les URL", + "infoUrls": "Une URL par ligne." }, "AutomationsDemoPageDescription":"Avec nos “Automatisations API” vous pouvez gérer les messages diffusés en masse sur Whatsapp grâce aux automatisations du concepteur combinées à la simplicité de nos API, envoyer des messages à tous les contacts de votre CRM préféré, recevoir le statut des messages envoyés (reçus, lus, etc. ) et beaucoup plus!", "Sunday": "Dimanche", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 2fb273bece50..e16f1187991b 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Indicizzazione non riuscita", "msgSuccesIndexingKb": "Riqualificazione sui contenuti avviata correttamente", "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base", - "noContent": "nessun contenuto" + "noContent": "nessun contenuto", + "titleUrls": "Importa da URL", + "helpUrls": "Inserisci le pagine web dagli URL pubblici nell'area di testo sottostante, separate da un ritorno a capo", + "titleTextareaUrls": "Elenco degli URL", + "placeholderUrls": "Inserisci gli URL", + "infoUrls": "Un URL per riga." }, "AutomationsDemoPageDescription": "Con le nostre “APIs automations” puoi gestire messaggi broadcast massivi su Whatsapp utilizzando le automazioni del designer uniti alla facilità delle nostre API, inviare messaggi a tutti i contatti del tuo CRM preferito, ricevere lo stato dei messaggi inviati (ricevuto, letto etc.) e molto altro ancora!", "Sunday": "Domenica", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index 84ff9a9257e6..37019fa151d7 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Индекстеу сәтсіз аяқталды", "msgSuccesIndexingKb": "Сәтті іске қосылған мазмұнды қайта оқытыңыз", "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады", - "noContent": "мазмұны жоқ" + "noContent": "мазмұны жоқ", + "titleUrls": "URL мекенжайларынан импорттау", + "helpUrls": "Жалпы URL мекенжайларынан веб-беттерді қайтару арқылы бөлінген төмендегі мәтін аймағына кірістіріңіз", + "titleTextareaUrls": "URL мекенжайларының тізімі", + "placeholderUrls": "URL мекенжайларын енгізіңіз", + "infoUrls": "Әр жолға бір url." }, "AutomationsDemoPageDescription":"Біздің «API автоматикасының» көмегімен сіз WhatsApp желісіндегі жаппай хабарларды біздің API интерфейстеріміздің қарапайымдылығымен біріктірілген дизайнерлік автоматтандыруды пайдаланып басқара аласыз, сүйікті CRM-тің барлық контактілеріне хабарламалар жібере аласыз, жіберілген хабарламалардың күйін ала аласыз (қабылданған, оқылған және т. ) және тағы басқалар!", "Sunday": "Жексенбі", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 4f9907261c97..f98f8131fd57 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Falha na indexação", "msgSuccesIndexingKb": "Treine novamente no conteúdo lançado com sucesso", "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada", - "noContent": "sem conteúdo" + "noContent": "sem conteúdo", + "titleUrls": "Importar de URLs", + "helpUrls": "Insira páginas da web de URLs públicos na área de texto abaixo, separadas por um retorno", + "titleTextareaUrls": "Lista de URLs", + "placeholderUrls": "Insira URLs", + "infoUrls": "Um URL por linha." }, "AutomationsDemoPageDescription":"Com nossas “automações de APIs” você pode gerenciar mensagens de difusão em massa no Whatsapp utilizando as automações do designer aliadas à facilidade de nossas APIs, enviar mensagens para todos os contatos do seu CRM favorito, receber o status das mensagens enviadas (recebidas, lidas, etc. ) e muito mais!", "Sunday": "Domingo", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 35edfe367d50..2550dde70f0b 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Индексирование не удалось", "msgSuccesIndexingKb": "Повторное обучение успешно запущенному контенту", "msgErrorAddUpdateKb": "Базу знаний не удалось добавить или отредактировать.", - "noContent": "без содержания" + "noContent": "без содержания", + "titleUrls": "Импорт из URL-адресов", + "helpUrls": "Вставьте веб-страницы с общедоступных URL-адресов в текстовую область ниже, разделив их возвратом.", + "titleTextareaUrls": "Список URL-адресов", + "placeholderUrls": "Введите URL-адреса", + "infoUrls": "Один URL в каждой строке." }, "AutomationsDemoPageDescription":"С помощью нашей «автоматизации API» вы можете управлять массовыми рассылками сообщений в Whatsapp, используя дизайнерскую автоматизацию в сочетании с простотой наших API, отправлять сообщения всем контактам вашей любимой CRM, получать статус отправленных сообщений (получено, прочитано и т. д.). ) и многое другое!", "Sunday": "Воскресенье", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index 0d5e54c69782..349a129ac5e7 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Индексирање није успело", "msgSuccesIndexingKb": "Поново обука за садржај који је успешно покренут", "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди", - "noContent": "без садржаја" + "noContent": "без садржаја", + "titleUrls": "Увоз са УРЛ адреса", + "helpUrls": "Уметните веб странице са јавних УРЛ-ова у текстуално подручје испод, раздвојене повратком", + "titleTextareaUrls": "Листа УРЛ адреса", + "placeholderUrls": "Унесите УРЛ адресе", + "infoUrls": "Један УРЛ по реду." }, "AutomationsDemoPageDescription":"Са нашим „АПИ аутоматизацијама“ можете управљати масовним емитовањем порука на Вхатсапп-у користећи аутоматизацију дизајнера у комбинацији са лакоћом наших АПИ-ја, слати поруке свим контактима вашег омиљеног ЦРМ-а, примати статус послатих порука (примљено, прочитано, итд. ) и још много тога!", "Sunday": "недеља", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index e2c890fd5f01..f05e92ffc617 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Indexering misslyckades", "msgSuccesIndexingKb": "Utbilda om innehåll som har lanserats framgångsrikt", "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras", - "noContent": "inget innehåll" + "noContent": "inget innehåll", + "titleUrls": "Importera från webbadresser", + "helpUrls": "Infoga webbsidor från offentliga webbadresser i textområdet nedan, åtskilda av en retur", + "titleTextareaUrls": "Lista över webbadresser", + "placeholderUrls": "Ange webbadresser", + "infoUrls": "En webbadress per rad." }, "AutomationsDemoPageDescription":"Med våra “API-automatiseringar” kan du hantera massutsändningsmeddelanden på Whatsapp med hjälp av designerns automatiseringar kombinerat med enkelheten hos våra API: er, skicka meddelanden till alla kontakter i din favorit-CRM, ta emot status för skickade meddelanden (mottagna, lästa, etc. ) och mycket mer!", "Sunday": "söndag", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index b5f77a050123..8b83748f4951 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Dizine ekleme başarısız oldu", "msgSuccesIndexingKb": "Başarıyla başlatılan içerikle ilgili yeniden eğitim", "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi", - "noContent": "içerik yok" + "noContent": "içerik yok", + "titleUrls": "URL'lerden içe aktar", + "helpUrls": "Genel URL'lerdeki web sayfalarını aşağıdaki metin alanına bir dönüş işaretiyle ayırarak ekleyin", + "titleTextareaUrls": "URL'lerin listesi", + "placeholderUrls": "URL'leri girin", + "infoUrls": "Satır başına bir URL." }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", "Sunday": "Pazar", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 54f719cea8ba..9af13eb4aed6 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1643,7 +1643,12 @@ "msgErrorIndexingKb": "Помилка індексації", "msgSuccesIndexingKb": "Повторне навчання вмісту успішно запущено", "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань", - "noContent": "немає вмісту" + "noContent": "немає вмісту", + "titleUrls": "Імпортувати з URL-адрес", + "helpUrls": "Вставте веб-сторінки з загальнодоступних URL-адрес у текстову область нижче, розділивши їх символом повернення", + "titleTextareaUrls": "Список URL-адрес", + "placeholderUrls": "Введіть URL-адреси", + "infoUrls": "Одна URL-адреса на рядок." }, "AutomationsDemoPageDescription":"Завдяки нашій «автоматизації API» ви можете керувати масовими широкомовними повідомленнями в Whatsapp за допомогою автоматизації дизайнера в поєднанні з простотою наших API, надсилати повідомлення всім контактам вашої улюбленої CRM, отримувати статус надісланих повідомлень (отримано, прочитано тощо). ) і багато іншого!", "Sunday": "неділя", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 5d631d95a57f..461b1d5ac5d2 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1642,7 +1642,12 @@ "msgErrorIndexingKb": "Indekslash amalga oshmadi", "msgSuccesIndexingKb": "Muvaffaqiyatli ishga tushirilgan kontentni qayta o'qitish", "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi", - "noContent": "tarkib yo'q" + "noContent": "tarkib yo'q", + "titleUrls": "URL manzillaridan import qilish", + "helpUrls": "Veb-sahifalarni umumiy URL manzillaridan qaytish bilan ajratilgan holda quyidagi matn maydoniga kiriting", + "titleTextareaUrls": "URL manzillar ro'yxati", + "placeholderUrls": "URL manzillarini kiriting", + "infoUrls": "Har bir satr uchun bitta url." }, "AutomationsDemoPageDescription":"Bizning “API avtomatizatsiyamiz” yordamida siz Whatsapp-da ommaviy translyatsiya xabarlarini bizning API-larimiz qulayligi bilan birlashtirilgan dizayner avtomatizatsiyasidan foydalangan holda boshqarishingiz, sevimli CRM-ning barcha kontaktlariga xabarlar yuborishingiz, yuborilgan xabarlar holatini (qabul qilingan, o'qilgan va hokazo) olishingiz mumkin. ) va yana ko'p narsalar!", "Sunday": "yakshanba", From d2e53a2e5dd3eece946c015e274438c3da8a45ea Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Thu, 29 Feb 2024 12:42:52 +0100 Subject: [PATCH 11/35] updated version to 2.5.13-rc1 updated CHANGELOG --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ced327dd777..2b38afd3fd24 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # tiledesk-dashboard +### 2.5.13-rc1 +- Improves Knowledge Base page +- Adds customer.io integration + ### 2.5.12 - Deploys in production - Fixes the bug: "Settings" sidebar menu item is not active when some settings sidebar menu items are active diff --git a/package-lock.json b/package-lock.json index 961ee2fa0d61..60c8b3580bbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@tiledesk/tiledesk-dashboard", - "version": "2.5.12", + "version": "2.5.13-rc1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 19a371d8494c..4a264d0dfcd7 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tiledesk/tiledesk-dashboard", - "version": "2.5.12", + "version": "2.5.13-rc1", "scripts": { "ng": "ng", "start": "ng serve --aot", From fc227383c1b456fd6ad7b61f7db6c675d503a103 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Thu, 29 Feb 2024 17:11:53 +0100 Subject: [PATCH 12/35] bug fix kb empty; updated css menu add kb; --- src/app/app.module.ts | 4 +- .../knowledge-bases.component.html | 20 +--- .../knowledge-bases.component.scss | 18 ++++ .../knowledge-bases.component.ts | 16 +-- .../add-content-menu.component.html | 17 ++++ .../add-content-menu.component.scss | 99 +++++++++++++++++++ .../add-content-menu.component.spec.ts | 23 +++++ .../add-content-menu.component.ts | 23 +++++ .../knowledge-base-table.component.html | 16 +-- .../knowledge-base-table.component.scss | 2 +- .../knowledge-base-table.component.ts | 19 ++-- 11 files changed, 215 insertions(+), 42 deletions(-) create mode 100644 src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.html create mode 100644 src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss create mode 100644 src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.spec.ts create mode 100644 src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4aabfde82012..b2be2dabd5ea 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -394,6 +394,7 @@ import { KnowledgeBaseTableComponent } from './knowledge-bases/modals/knowledge- import { ModalErrorComponent } from './knowledge-bases/modals/modal-error/modal-error.component'; import { KnowledgeBasesPreviousComponent } from './knowledge-bases-previous/knowledge-bases-previous.component'; import { ModalUrlsKnowledgeBaseComponent } from './knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component'; +import { AddContentMenuComponent } from './knowledge-bases/menu/add-content-menu/add-content-menu.component'; @@ -698,7 +699,8 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic KnowledgeBaseTableComponent, ModalErrorComponent, KnowledgeBasesPreviousComponent, - ModalUrlsKnowledgeBaseComponent + ModalUrlsKnowledgeBaseComponent, + AddContentMenuComponent ], imports: [ TooltipModule.forRoot(CutomTooltipOptions as TooltipOptions), diff --git a/src/app/knowledge-bases/knowledge-bases.component.html b/src/app/knowledge-bases/knowledge-bases.component.html index e5fcc067d053..464b3a4e4538 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.html +++ b/src/app/knowledge-bases/knowledge-bases.component.html @@ -27,27 +27,15 @@
-
+
- - - - + +
diff --git a/src/app/knowledge-bases/knowledge-bases.component.scss b/src/app/knowledge-bases/knowledge-bases.component.scss index cb81863b8307..2da53f80a6eb 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.scss +++ b/src/app/knowledge-bases/knowledge-bases.component.scss @@ -447,4 +447,22 @@ table { padding: 0 14px; font-weight: bold; height: auto; +} + + +// .mat-menu-panel { +// margin-top: 6px !important; +// border-radius: 8px !important; +// background: #FFFFFF!important; +// box-shadow: 0 40px 64px -32px #161a1e1f, 0 32px 40px -32px #161a1e1a, 0 24px 32px -32px #161a1e14, 0 16px 20px -32px #161a1e14, 0 10px 16px -32px #161a1e0f, 0 4px 8px -32px #161a1e0a, 0 1px 1px #161a1e0a, 0 0 0 1px #161a1e0f!important; +// border-radius: 10px!important; +// } + + + + ::ng-deep.mat-elevation-z4{ + background: #FFFFFF; + box-shadow: 0 40px 64px -32px #161a1e1f, 0 32px 40px -32px #161a1e1a, 0 24px 32px -32px #161a1e14, 0 16px 20px -32px #161a1e14, 0 10px 16px -32px #161a1e0f, 0 4px 8px -32px #161a1e0a, 0 1px 1px #161a1e0a, 0 0 0 1px #161a1e0f; + border-radius: 10px; + margin-top: 4px; } \ No newline at end of file diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index e5a2b35a912d..23de7f6ffcdd 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -46,7 +46,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { //analytics - SHOW_TABLE: boolean = false; + // SHOW_TABLE: boolean = false; CURRENT_USER: any; project: Project; project_name: string; @@ -457,12 +457,12 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbsList.push(kb); } }); - if(this.kbsList.length>0){ - this.SHOW_TABLE = true; - this.checkAllStatuses(); - } else { - this.SHOW_TABLE = false; - } + // if(this.kbsList.length>0){ + // this.SHOW_TABLE = true; + // this.checkAllStatuses(); + // } else { + // this.SHOW_TABLE = false; + // } //this.showSpinner = false; this.refreshKbsList = !this.refreshKbsList; @@ -511,7 +511,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } else { //this.kbsList.push(kb); this.notify.showWidgetStyleUpdateNotification(this.msgSuccesAddKb, 2, 'done'); - this.kbsListCount++; + // this.kbsListCount++; this.kbsList.unshift(kb); this.kbsListCount = this.kbsListCount+1; this.refreshKbsList = !this.refreshKbsList; diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.html b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.html new file mode 100644 index 000000000000..c609266f227d --- /dev/null +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.html @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss new file mode 100644 index 000000000000..788800259c01 --- /dev/null +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss @@ -0,0 +1,99 @@ +:host { + --text-color: #{var(--blu)}; + --icon-color-menu: #{var(--gray-light-01)}; + --text-hover-color: #{var(--blu)}; + --icon-hover-color: #{var(--blu)}; + --base-padding: 6px; +} + +#menu_div{ + padding: var(--base-padding) 0px; +} + +.menu-title{ + padding: 10px calc(var(--base-padding)*2); + font-weight: 500; +} + +.menu-box{ + padding: 0px var(--base-padding); +} + +.menu-btns-wpr { + width: 100%; + height: 30px; + border-radius: 6px; + display: flex; + align-items: center; + justify-content: flex-start; + gap: 5px; + padding: 0px 2px; + + &:hover{ + cursor: pointer; + box-shadow: #1321440a 0 12px 24px, #1321440a 0 8px 12px, #13214405 0 4px 4px, #13214403 0 2px 2px, #13214403 0 1px 1px, #11316008 0 0, #1131600f 0 0 0 1px; + span.material-icons-outlined, + img{ + color: var(--text-hover-color); + filter: brightness(0) saturate(100%) invert(35%) sepia(48%) saturate(441%) hue-rotate(183deg) brightness(97%) contrast(88%); + cursor: pointer; + } + .menu-btn-text{ + color: var(--text-hover-color); + } + } + +} + + +.truncate { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 100% +} + +.menu-btn-icon{ + display: flex; + align-items: center; + justify-content: center; + span.material-icons-outlined, + img{ + width: 16px; + font-size: 16px; + color: var(--icon-color-menu); + filter: brightness(0) saturate(100%) invert(96%) sepia(0%) saturate(504%) hue-rotate(151deg) brightness(92%) contrast(88%); + } +} +.menu-btn-text{ + color: var(--text-color); + padding: 0px var(--base-padding); + vertical-align: middle; + font-size: 11px; + font-weight: 400; +} + +.external-link:hover{ + text-decoration: underline; +} + +.custom-divider { + margin-top: 5px; + margin-bottom: 5px; + border-top: 1px solid var(--blu); +} + +.current-user{ + color: var(--icon-color-menu); +} + +::ng-deep .custom-mat-tooltip-in-settings-sidebar { + background-color: #fff !important; + color: #555555 !important; + font-size: 12px !important; + border-radius: 2px !important; + font-family: var(--font-family-poppins) !important; + padding-top:8px!important; + padding-bottom:8px!important; + border: 1px solid #e5effe!important; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.spec.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.spec.ts new file mode 100644 index 000000000000..c86b10e0e383 --- /dev/null +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddContentMenuComponent } from './add-content-menu.component'; + +describe('AddContentMenuComponent', () => { + let component: AddContentMenuComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AddContentMenuComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(AddContentMenuComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts new file mode 100644 index 000000000000..e249398f5dc4 --- /dev/null +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -0,0 +1,23 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; + +@Component({ + selector: 'add-content-menu', + templateUrl: './add-content-menu.component.html', + styleUrls: ['./add-content-menu.component.scss'] +}) +export class AddContentMenuComponent implements OnInit { + @Output() openAddKnowledgeBaseModal = new EventEmitter(); + + items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; + menuTitle: string = ""; + + constructor() { } + + ngOnInit(): void { + } + + onOpenAddKnowledgeBaseModal(event){ + // console.log('onOpenAddKnowledgeBaseModal:', event); + this.openAddKnowledgeBaseModal.emit(event); + } +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index a436531f247d..3a1f5c66faab 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,4 +1,4 @@ -
+
- +

No data sources exist

-

Add data sources to your assistant to build a knowledge base of material. Learn more

+

Incorporate data sources into your assistant for constructing a knowledge repository.

+ -
- +
+ -->
{{ item.label }}
+ + + + +
\ No newline at end of file diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss index 788800259c01..178301166f45 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.scss @@ -1,99 +1,120 @@ -:host { - --text-color: #{var(--blu)}; - --icon-color-menu: #{var(--gray-light-01)}; - --text-hover-color: #{var(--blu)}; - --icon-hover-color: #{var(--blu)}; - --base-padding: 6px; -} +// :host { +// --text-color: #{var(--blu)}; +// --icon-color-menu: #{var(--gray-light-01)}; +// --text-hover-color: #{var(--blu)}; +// --icon-hover-color: #{var(--blu)}; +// --base-padding: 6px; +// } -#menu_div{ - padding: var(--base-padding) 0px; -} +// #menu_div{ +// padding: var(--base-padding) 0px; +// } -.menu-title{ - padding: 10px calc(var(--base-padding)*2); - font-weight: 500; -} +// .menu-title{ +// padding: 10px calc(var(--base-padding)*2); +// font-weight: 500; +// } -.menu-box{ - padding: 0px var(--base-padding); -} +// .menu-box{ +// padding: 0px var(--base-padding); +// } -.menu-btns-wpr { - width: 100%; - height: 30px; - border-radius: 6px; - display: flex; - align-items: center; - justify-content: flex-start; - gap: 5px; - padding: 0px 2px; +// .menu-btns-wpr { +// width: 100%; +// height: 30px; +// border-radius: 6px; +// display: flex; +// align-items: center; +// justify-content: flex-start; +// gap: 5px; +// padding: 0px 2px; - &:hover{ - cursor: pointer; - box-shadow: #1321440a 0 12px 24px, #1321440a 0 8px 12px, #13214405 0 4px 4px, #13214403 0 2px 2px, #13214403 0 1px 1px, #11316008 0 0, #1131600f 0 0 0 1px; - span.material-icons-outlined, - img{ - color: var(--text-hover-color); - filter: brightness(0) saturate(100%) invert(35%) sepia(48%) saturate(441%) hue-rotate(183deg) brightness(97%) contrast(88%); - cursor: pointer; - } - .menu-btn-text{ - color: var(--text-hover-color); - } - } +// &:hover{ +// cursor: pointer; +// box-shadow: #1321440a 0 12px 24px, #1321440a 0 8px 12px, #13214405 0 4px 4px, #13214403 0 2px 2px, #13214403 0 1px 1px, #11316008 0 0, #1131600f 0 0 0 1px; +// span.material-icons-outlined, +// img{ +// color: var(--text-hover-color); +// filter: brightness(0) saturate(100%) invert(35%) sepia(48%) saturate(441%) hue-rotate(183deg) brightness(97%) contrast(88%); +// cursor: pointer; +// } +// .menu-btn-text{ +// color: var(--text-hover-color); +// } +// } -} +// } -.truncate { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 100% -} +// .truncate { +// overflow: hidden; +// white-space: nowrap; +// text-overflow: ellipsis; +// width: 100% +// } -.menu-btn-icon{ - display: flex; - align-items: center; - justify-content: center; - span.material-icons-outlined, - img{ - width: 16px; - font-size: 16px; - color: var(--icon-color-menu); - filter: brightness(0) saturate(100%) invert(96%) sepia(0%) saturate(504%) hue-rotate(151deg) brightness(92%) contrast(88%); - } -} -.menu-btn-text{ - color: var(--text-color); - padding: 0px var(--base-padding); - vertical-align: middle; - font-size: 11px; - font-weight: 400; -} +// .menu-btn-icon{ +// display: flex; +// align-items: center; +// justify-content: center; +// span.material-icons-outlined, +// img{ +// width: 16px; +// font-size: 16px; +// color: var(--icon-color-menu); +// filter: brightness(0) saturate(100%) invert(96%) sepia(0%) saturate(504%) hue-rotate(151deg) brightness(92%) contrast(88%); +// } +// } +// .menu-btn-text{ +// color: var(--text-color); +// padding: 0px var(--base-padding); +// vertical-align: middle; +// font-size: 11px; +// font-weight: 400; +// } -.external-link:hover{ - text-decoration: underline; -} +// .external-link:hover{ +// text-decoration: underline; +// } -.custom-divider { - margin-top: 5px; - margin-bottom: 5px; - border-top: 1px solid var(--blu); -} +// .custom-divider { +// margin-top: 5px; +// margin-bottom: 5px; +// border-top: 1px solid var(--blu); +// } -.current-user{ - color: var(--icon-color-menu); -} +// .current-user{ +// color: var(--icon-color-menu); +// } -::ng-deep .custom-mat-tooltip-in-settings-sidebar { - background-color: #fff !important; - color: #555555 !important; - font-size: 12px !important; - border-radius: 2px !important; - font-family: var(--font-family-poppins) !important; - padding-top:8px!important; - padding-bottom:8px!important; - border: 1px solid #e5effe!important; +// ::ng-deep .custom-mat-tooltip-in-settings-sidebar { +// background-color: #fff !important; +// color: #555555 !important; +// font-size: 12px !important; +// border-radius: 2px !important; +// font-family: var(--font-family-poppins) !important; +// padding-top:8px!important; +// padding-bottom:8px!important; +// border: 1px solid #e5effe!important; +// } + +.menu-btns-wpr { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: 1.42857143; + color: #333; + white-space: nowrap; + cursor: pointer; + font-size: 13px; + padding: 10px 20px; + margin: 0 5px; + border-radius: 2px; + transition: all 150ms linear; + &:hover{ + background-color: #3ea9f5; + color: #FFFFFF; + box-shadow: 0 12px 20px -10px rgba(62, 169, 245, 0.28), 0 4px 20px 0px rgba(0, 0, 0, 0.12), 0 7px 8px -5px rgba(62, 169, 245, 0.2); + } } \ No newline at end of file diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index e249398f5dc4..3f5e6483b725 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'add-content-menu', @@ -8,12 +9,38 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; export class AddContentMenuComponent implements OnInit { @Output() openAddKnowledgeBaseModal = new EventEmitter(); - items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; + + + items = [];//[{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; menuTitle: string = ""; - constructor() { } + constructor( + public translate: TranslateService + ) { } ngOnInit(): void { + + // this.translate.get('KbPage.AddKbURL') + // .subscribe((text: any) => { + // let item = {"label": text, "type":"url-page"}; + // this.items.push(item); + // }); + + this.translate.get('KbPage.AddKbURLs') + .subscribe((text: any) => { + let item = {"label": 'Add URL(s)', "type":"urls"}; + this.items.push(item); + }); + + this.translate.get('KbPage.AddKbText') + .subscribe((text: any) => { + let item = {"label": text, "type":"text-file"}; + this.items.push(item); + }); + + //this.items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; + + } onOpenAddKnowledgeBaseModal(event){ diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index 3a1f5c66faab..c94c5900ab7c 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -8,36 +8,33 @@ -->
- + - + --> - + No data sources exist + Incorporate data sources into your assistant for constructing a knowledge repository. + + + +

+ - + + --> + - - - - +
diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index 092e3cdf36c5..f7606391f123 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -223,16 +223,18 @@ td { height: auto; margin: 50px 0px; } - p.upgrade-title { + .upgrade-title { font-size: 28px; font-weight: 500; margin-bottom: 20px; + display: block; } - p.upgrade-subtitle { + .upgrade-subtitle { font-size: 16px; - margin-bottom: 30px; + margin-bottom: 10px; max-width: 800px; text-align: center; + display: block; } } @@ -248,3 +250,26 @@ td { padding: 0px 8px; opacity: 0.8; } + +.no-bot-msg { + font-size: 18px; + margin-bottom: 0px; + color: #353f45; + font-weight: 400; + font-family: "Poppins"; + margin-top: 25px; + text-align: center; +} + +.btn-size-m { + border-radius: 4px; + font-size: 14px; + height: 34px; + line-height: 18px; + min-width: 64px; + padding: 0 14px; + text-transform: none; +} +.card{ + border: none!important; +} \ No newline at end of file diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index fae4e8145a45..a60e4a663909 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -336,7 +336,7 @@ export enum KB_MAX_NUM { export enum KB_DEFAULT_PARAMS { - LIMIT = 20, + LIMIT = 2, NUMBER_PAGE = 0, DIRECTION = -1, SORT_FIELD = 'updatedAt' From 4a70d5c5a61a3d3198cd2cc4ecf5dde2d098dad0 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Tue, 5 Mar 2024 11:18:10 +0100 Subject: [PATCH 16/35] =?UTF-8?q?=E2=9C=85=20Bottone=20aggiungi=20in=20low?= =?UTF-8?q?ercase=20fisso=20in=20alto=20a=20destra,=20allineata=20dimensio?= =?UTF-8?q?ni=20e=20testo=20alla=20sezione=20chatbot=20=E2=9C=85=20Messagg?= =?UTF-8?q?io=20al=20centro=20senza=20immagine=20(bottone=20replicato=20do?= =?UTF-8?q?po=20il=20testo)=20come=20nella=20sezione=20chatbot=20=E2=9C=85?= =?UTF-8?q?=20Labels=20KW=20come=20voiceflow=20=E2=9C=85=20Allinea=20grafi?= =?UTF-8?q?ca=20men=C3=B9=20al=20resto=20della=20dashboard=20(al=20menu=20?= =?UTF-8?q?seleziona=20progetto)=20=E2=9C=85=20Bottone=20load=20more=20gri?= =?UTF-8?q?gio=20o=20scritta=20cliccabile=20=E2=9C=85=20Eliminare=20aggiun?= =?UTF-8?q?ta=20url=20singolo=20dal=20menu=20(solo=20aggiunta=20multipla)?= =?UTF-8?q?=20=E2=9C=85=20Eliminare=20bordo=20tabella=20=E2=9C=85=20Aggiun?= =?UTF-8?q?gere=20tutte=20le=20voci=20tradotte=20=E2=9C=85=20=20Label=20de?= =?UTF-8?q?i=20bottoni=20in=20text-transform=20:=20none?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../knowledge-bases.component.scss | 6 +++- .../add-content-menu.component.ts | 6 ++-- .../knowledge-base-table.component.html | 36 ++++++------------- .../knowledge-base-table.component.scss | 27 +++++++++----- ...modal-delete-knowledge-base.component.scss | 6 +++- ...modal-detail-knowledge-base.component.scss | 6 +++- .../modal-error/modal-error.component.scss | 3 ++ .../modal-gpt-key.component.scss | 3 ++ .../modal-page-url.component.scss | 6 +++- ...odal-preview-knowledge-base.component.scss | 6 +++- .../modal-site-map.component.scss | 6 +++- .../modal-text-file.component.scss | 6 +++- .../modal-urls-knowledge-base.component.html | 1 + .../modal-urls-knowledge-base.component.scss | 6 +++- src/app/utils/util.ts | 2 +- src/assets/i18n/ar.json | 15 +++++--- src/assets/i18n/az.json | 17 +++++---- src/assets/i18n/de.json | 17 +++++---- src/assets/i18n/en.json | 19 ++++++---- src/assets/i18n/es.json | 17 +++++---- src/assets/i18n/fr.json | 17 +++++---- src/assets/i18n/it.json | 17 +++++---- src/assets/i18n/kk.json | 17 +++++---- src/assets/i18n/pt.json | 17 +++++---- src/assets/i18n/ru.json | 15 +++++--- src/assets/i18n/sr.json | 17 +++++---- src/assets/i18n/sv.json | 17 +++++---- src/assets/i18n/tr.json | 17 +++++---- src/assets/i18n/uk.json | 17 +++++---- src/assets/i18n/uz.json | 17 +++++---- 30 files changed, 245 insertions(+), 134 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.scss b/src/app/knowledge-bases/knowledge-bases.component.scss index 46a492422b75..bea8ccc5b6cd 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.scss +++ b/src/app/knowledge-bases/knowledge-bases.component.scss @@ -466,4 +466,8 @@ table { box-shadow: 0 40px 64px -32px #161a1e1f, 0 32px 40px -32px #161a1e1a, 0 24px 32px -32px #161a1e14, 0 16px 20px -32px #161a1e14, 0 10px 16px -32px #161a1e0f, 0 4px 8px -32px #161a1e0a, 0 1px 1px #161a1e0a, 0 0 0 1px #161a1e0f; border-radius: 10px; margin-top: 4px; -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index 3f5e6483b725..57ae114b4f7d 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -25,10 +25,10 @@ export class AddContentMenuComponent implements OnInit { // let item = {"label": text, "type":"url-page"}; // this.items.push(item); // }); - - this.translate.get('KbPage.AddKbURLs') + this.translate.getBrowserLang(); + this.translate.get('KbPage.AddKbURL') .subscribe((text: any) => { - let item = {"label": 'Add URL(s)', "type":"urls"}; + let item = {"label": text, "type":"urls"}; this.items.push(item); }); diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html index c94c5900ab7c..3ff69a86e054 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.html @@ -1,41 +1,27 @@
-
- + + -->
- - +

- - No data sources exist - Incorporate data sources into your assistant for constructing a knowledge repository. + {{'KbPage.NoKbAdded' | translate }} + {{'KbPage.NoKbAddedText' | translate }}

- -
@@ -149,7 +135,7 @@
@@ -158,9 +144,9 @@

- -
Loading
- + +
{{'KbPage.Loading' | translate}}
+
{{'KbPage.LoadMore' | translate}}
diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index f7606391f123..4a09f4b79818 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -1,5 +1,3 @@ - - select.select-status { height: 30px; background: #fff; @@ -139,10 +137,10 @@ table { display: block; width: fit-content; font-weight: normal; - font-family: monospace; + // font-family: monospace; font-size: 12px; line-height: 24px; - clip-path: inset(0 3ch 0 0); + clip-path: inset(0 1ch 0 0); animation: l4 1s steps(4) infinite; } @@ -155,6 +153,14 @@ table { text-align: center; margin: 20px auto 10px; display: block; + width: fit-content; + font-weight: normal; + font-size: 12px; + line-height: 24px; + cursor: pointer; + border-radius: 4px; + padding: 2px 12px; + min-width: auto; } @@ -256,7 +262,7 @@ td { margin-bottom: 0px; color: #353f45; font-weight: 400; - font-family: "Poppins"; + // font-family: "Poppins"; margin-top: 25px; text-align: center; } @@ -269,7 +275,12 @@ td { min-width: 64px; padding: 0 14px; text-transform: none; -} -.card{ +} + +.card { border: none!important; -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss index 2fa51e023f78..c6a121d23648 100644 --- a/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component.scss @@ -205,4 +205,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss index 00e879da2ebb..c08a0bfdf1b8 100644 --- a/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component.scss @@ -220,4 +220,8 @@ display: inline-block; padding-top: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-error/modal-error.component.scss b/src/app/knowledge-bases/modals/modal-error/modal-error.component.scss index e69de29bb2d1..dd6f8d71db1a 100644 --- a/src/app/knowledge-bases/modals/modal-error/modal-error.component.scss +++ b/src/app/knowledge-bases/modals/modal-error/modal-error.component.scss @@ -0,0 +1,3 @@ +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component.scss b/src/app/knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component.scss index e69de29bb2d1..dd6f8d71db1a 100644 --- a/src/app/knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component.scss +++ b/src/app/knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component.scss @@ -0,0 +1,3 @@ +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss index 2fa51e023f78..c6a121d23648 100644 --- a/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss +++ b/src/app/knowledge-bases/modals/modal-page-url/modal-page-url.component.scss @@ -205,4 +205,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.scss index 4f042fc46091..7267bf43339e 100644 --- a/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component.scss @@ -205,4 +205,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss index 4f042fc46091..7267bf43339e 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.scss @@ -205,4 +205,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss index a4cea2930818..7d4a06a150d4 100644 --- a/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss +++ b/src/app/knowledge-bases/modals/modal-text-file/modal-text-file.component.scss @@ -205,4 +205,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html index 195086a25385..c041474fb8c8 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.html @@ -21,6 +21,7 @@

+ {{ 'KbPage.YouCanAddKBUrlsLimit' | translate }}

diff --git a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss index 6210fc174e83..b05bda4fd1c9 100644 --- a/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss +++ b/src/app/knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component.scss @@ -206,4 +206,8 @@ p { margin-bottom: 0px; } -} \ No newline at end of file +} + +.btn { + text-transform: none; +} \ No newline at end of file diff --git a/src/app/utils/util.ts b/src/app/utils/util.ts index a60e4a663909..fae4e8145a45 100755 --- a/src/app/utils/util.ts +++ b/src/app/utils/util.ts @@ -336,7 +336,7 @@ export enum KB_MAX_NUM { export enum KB_DEFAULT_PARAMS { - LIMIT = 2, + LIMIT = 20, NUMBER_PAGE = 0, DIRECTION = -1, SORT_FIELD = 'updatedAt' diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index 08a4bbb1ce98..a00c4173e5ce 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "أسرار", - "Add": "يضيف", "Enter": "يدخل", - "NoKbAdded": "لم تقم بإضافة أي قاعدة معارف حتى الآن", "RunIndexing": "تشغيل الفهرسة", "CreationDate": "تاريخ الإنشاء", "KbCounterFooter": "{{ counter }} تمت إضافة 3 قواعد معرفية", - "AddKbURL": "أضف عنوان URL لصفحتك", - "AddKbText": "إضافة ملف نصي", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Knowledge Base limit reached for {{plan_name}}", @@ -1648,7 +1644,16 @@ "helpUrls": "قم بإدراج صفحات الويب من عناوين URL العامة في منطقة النص أدناه، مفصولة بإرجاع", "titleTextareaUrls": "قائمة عناوين URL", "placeholderUrls": "أدخل عناوين URL", - "infoUrls": "عنوان URL واحد لكل سطر." + "infoUrls": "عنوان URL واحد لكل سطر.", + "NoKbAdded": "لا توجد مصادر بيانات", + "NoKbAddedText": "أضف مصدر البيانات إلى مساعدك لبناء قاعدة معرفية.", + "Add": "إضافة مصادر البيانات", + "AddKbURL": "عناوين URL متعددة", + "AddKbText": "نص بسيط", + "AddKbSitemap": "خريطة الموقع", + "LoadMore": "تحميل المزيد", + "Loading": "تحميل", + "YouCanAddKBUrlsLimit": "يمكنك إضافة 300 عنوان URL كحد أقصى" }, "AutomationsDemoPageDescription":"من خلال أتمتة واجهات برمجة التطبيقات لدينا، يمكنك إدارة رسائل البث الجماعية على Whatsapp باستخدام أتمتة المصمم جنبًا إلى جنب مع سهولة واجهات برمجة التطبيقات لدينا، وإرسال رسائل إلى جميع جهات الاتصال الخاصة بإدارة علاقات العملاء (CRM) المفضلة لديك، وتلقي حالة الرسائل المرسلة (المستلمة، المقروءة، وما إلى ذلك) و أكثر بكثير!", "Sunday": "الأحد", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 354f13f82382..3f74b857e5ec 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Sirlər", - "Add": "Əlavə et", "Enter": "Daxil edin", - "NoKbAdded": "Siz hələ heç bir Bilik Bazasını əlavə etməmisiniz", "RunIndexing": "İndeksləşdirməni işə salın", "CreationDate": "Yaradılma tarixi", "KbCounterFooter": "{{ counter }} 3 Bilik bazası əlavə edildi", - "AddKbURL": "Səhifə URL əlavə edin", - "AddKbText": "Mətn faylı əlavə edin", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "{{plan_name}} üçün Bilik Bazaları limitinə çatdı", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı", "noContent": "məzmun yoxdur", "titleUrls": "URL-lərdən idxal", - "helpUrls": "İctimai URL-lərdən veb səhifələri geri dönüşlə ayrılaraq aşağıdakı mətn sahəsinə daxil edin", + "helpUrls": "İctimai URL-lərdən veb səhifələri geri dönüşlə ayrılaraq aşağıdakı mətn sahəsinə daxil edin.", "titleTextareaUrls": "URL-lərin siyahısı", "placeholderUrls": "URL-ləri daxil edin", - "infoUrls": "Hər sətir üçün bir url." + "infoUrls": "Hər sətir üçün bir url.", + "NoKbAdded": "Heç bir məlumat mənbəyi yoxdur", + "NoKbAddedText": "Bilik bazası yaratmaq üçün köməkçinizə məlumat mənbəyi əlavə edin.", + "Add": "Məlumat mənbələri əlavə edin", + "AddKbURL": "Birdən çox URL", + "AddKbText": "Sadə mətn", + "AddKbSitemap": "Saytın xəritəsi", + "LoadMore": "daha çox yükləyin", + "Loading": "yüklənir", + "YouCanAddKBUrlsLimit": "Siz maksimum 300 URL əlavə edə bilərsiniz" }, "AutomationsDemoPageDescription":"Bizim “API avtomatlaşdırmalarımız” ilə siz API-lərimizin asanlığı ilə birləşdirilən dizayner avtomatlaşdırmalarından istifadə edərək Whatsapp-da kütləvi yayım mesajlarını idarə edə, sevimli CRM-nin bütün kontaktlarına mesaj göndərə, göndərilən mesajların statusunu (qəbul edildi, oxundu və s.) ala bilərsiniz. ) və daha çox!", "Sunday": "bazar günü", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 0b676bc42ede..5c4c323c6432 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1577,14 +1577,10 @@ }, "KbPage": { "Secrets": "Geheimnisse", - "Add": "Hinzufügen", "Enter": "Eingeben", - "NoKbAdded": "Sie haben noch keine Wissensdatenbank hinzugefügt", "RunIndexing": "Führen Sie die Indizierung aus", "CreationDate": "Erstellungsdatum", "KbCounterFooter": "{{ counter }} von 3 Wissensdatenbanken hinzugefügt", - "AddKbURL": "Fügen Sie Ihre Seiten-URL hinzu", - "AddKbText": "Textdatei hinzufügen", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Das Wissensdatenbanklimit für {{plan_name}} wurde erreicht.", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden", "noContent": "kein Inhalt", "titleUrls": "Von URLs importieren", - "helpUrls": "Fügen Sie Webseiten von öffentlichen URLs in den Textbereich unten ein, getrennt durch einen Zeilenumbruch", + "helpUrls": "Fügen Sie Webseiten von öffentlichen URLs in den Textbereich unten ein, getrennt durch einen Zeilenumbruch.", "titleTextareaUrls": "Liste der URLs", "placeholderUrls": "Geben Sie URLs ein", - "infoUrls": "Eine URL pro Zeile." + "infoUrls": "Eine URL pro Zeile.", + "NoKbAdded": "Es sind keine Datenquellen vorhanden", + "NoKbAddedText": "Fügen Sie Ihrem Assistenten eine Datenquelle hinzu, um eine Wissensdatenbank aufzubauen.", + "Add": "Datenquellen hinzufügen", + "AddKbURL": "Mehrere URLs", + "AddKbText": "Einfacher Text", + "AddKbSitemap": "Seitenverzeichnis", + "LoadMore": "Mehr laden", + "Loading": "Wird geladen", + "YouCanAddKBUrlsLimit": "Sie können maximal 300 URLs hinzufügen" }, "AutomationsDemoPageDescription":"Mit unseren „APIs-Automatisierungen“ können Sie Massennachrichten auf WhatsApp verwalten, indem Sie die Automatisierungen des Designers in Kombination mit der Benutzerfreundlichkeit unserer APIs nutzen, Nachrichten an alle Kontakte Ihres bevorzugten CRM senden, den Status gesendeter Nachrichten (empfangen, gelesen usw.) erhalten. ) und vieles mehr!", "Sunday": "Sonntag", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c532c1303e5f..73a81c31fd36 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Secrets", - "Add": "Add Knowledge Base", "Enter": "Enter", - "NoKbAdded": "You have not added any Knowledge Base yet", "RunIndexing": "Re-train", "CreationDate": "Creation date", "KbCounterFooter": "{{counter}} of 3 Knowledge Bases added", - "AddKbURL": "Add your page URL", - "AddKbText": "Add Text File", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Knowledge Bases limit reached for {{plan_name}}", @@ -1601,7 +1597,7 @@ "TypeKbUrlPlaceholder": "Type Knowledge Base URL", "TypeKbKeyPlaceholder": "Type your GPT-Key", "AskQuestionPlaceholder": "Ask a question", - "DeleteKb": "Delete Knowledge Base", + "DeleteKb": "Delete KB", "DeleteKbInfoFirstText": "You will no longer be able to use AI on this knowledge base", "SureToDelete": "Are you sure you want to delete the Knowledge Base {{ name }} ?", "GptKeyInfo": "Enter your GPT-Key to use your Knowledge Bases", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited", "noContent": "no content", "titleUrls": "Import from URLs", - "helpUrls": "Insert web pages from public URLs into the text area below, separated by a return", + "helpUrls": "Insert web pages from public URLs into the text area below, separated by a return.", "titleTextareaUrls": "List of URLs", "placeholderUrls": "Enter URLs", - "infoUrls": "One url per line." + "infoUrls": "One url per line.", + "NoKbAdded": "No data sources exist", + "NoKbAddedText": "Add data-sources into your assistant to build a 'knowledge base'.", + "Add": "Add data-source", + "AddKbURL": "Multiple URLs", + "AddKbText": "Simple text", + "AddKbSitemap": "Sitemap", + "LoadMore": "load more", + "Loading": "loading", + "YouCanAddKBUrlsLimit":"You can add a maximum of 300 URLs" }, "AutomationsDemoPageDescription": "With our “APIs automations” you can manage mass broadcast messages on Whatsapp using the designer's automations combined with the ease of our APIs, send messages to all the contacts of your favorite CRM, receive the status of sent messages (received, read, etc.) and much more!", "Sunday": "Sunday", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 7d3b4bb5a576..583bad253f2c 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Misterios", - "Add": "Agregar", "Enter": "Ingresar", - "NoKbAdded": "Aún no has agregado ninguna base de conocimientos", "RunIndexing": "Ejecutar indexación", "CreationDate": "Fecha de creación", "KbCounterFooter": "{{ counter }} de 3 Bases de Conocimiento añadidas", - "AddKbURL": "Añade la URL de tu página", - "AddKbText": "Agregar archivo de texto", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Límite de bases de conocimientos alcanzado para {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar.", "noContent": "sin contenido", "titleUrls": "Importar desde URL", - "helpUrls": "Inserte páginas web desde URL públicas en el área de texto a continuación, separadas por un retorno", + "helpUrls": "Inserte páginas web desde URL públicas en el área de texto a continuación, separadas por un retorno.", "titleTextareaUrls": "Lista de URL", "placeholderUrls": "Ingrese las URL", - "infoUrls": "Una URL por línea." + "infoUrls": "Una URL por línea.", + "NoKbAdded": "No existen fuentes de datos", + "NoKbAddedText": "Agregue una fuente de datos a su asistente para crear una base de conocimientos.", + "Add": "Agregar fuentes de datos", + "AddKbURL": "Múltiples URL", + "AddKbText": "texto sencillo", + "AddKbSitemap": "Mapa del sitio", + "LoadMore": "carga más", + "Loading": "cargando", + "YouCanAddKBUrlsLimit": "Puede agregar un máximo de 300 URL" }, "AutomationsDemoPageDescription":"Con nuestras “automatizaciones APIs” podrás gestionar mensajes de difusión masiva en Whatsapp utilizando las automatizaciones del diseñador combinadas con la facilidad de nuestras APIs, enviar mensajes a todos los contactos de tu CRM favorito, recibir el estado de los mensajes enviados (recibidos, leídos, etc.) ) ¡y mucho más!", "Sunday": "Domingo", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index e4049ffc753e..a29cfaa1d3b0 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Secrets", - "Add": "Ajouter", "Enter": "Entrer", - "NoKbAdded": "Vous n'avez pas encore ajouté de base de connaissances", "RunIndexing": "Exécuter l'indexation", "CreationDate": "Date de création", "KbCounterFooter": "{{ counter }} sur 3 bases de connaissances ajoutées", - "AddKbURL": "Ajoutez l'URL de votre page", - "AddKbText": "Ajouter un fichier texte", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Limite des bases de connaissances atteinte pour {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée", "noContent": "Pas de contenu", "titleUrls": "Importer à partir d'URL", - "helpUrls": "Insérez des pages Web à partir d'URL publiques dans la zone de texte ci-dessous, séparées par un retour", + "helpUrls": "Insérez des pages Web à partir d'URL publiques dans la zone de texte ci-dessous, séparées par un retour.", "titleTextareaUrls": "Liste des URL", "placeholderUrls": "Saisissez les URL", - "infoUrls": "Une URL par ligne." + "infoUrls": "Une URL par ligne.", + "NoKbAdded": "Aucune source de données n'existe", + "NoKbAddedText": "Ajoutez une source de données dans votre assistant pour créer une base de connaissances.", + "Add": "Ajouter des sources de données", + "AddKbURL": "Plusieurs URL", + "AddKbText": "Texte simple", + "AddKbSitemap": "Plan du site", + "LoadMore": "charger plus", + "Loading": "chargement", + "YouCanAddKBUrlsLimit": "Vous pouvez ajouter un maximum de 300 URL" }, "AutomationsDemoPageDescription":"Avec nos “Automatisations API” vous pouvez gérer les messages diffusés en masse sur Whatsapp grâce aux automatisations du concepteur combinées à la simplicité de nos API, envoyer des messages à tous les contacts de votre CRM préféré, recevoir le statut des messages envoyés (reçus, lus, etc. ) et beaucoup plus!", "Sunday": "Dimanche", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index bab3419d9b3f..5378b4487d3c 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1577,14 +1577,10 @@ }, "KbPage": { "Secrets": "Secrets", - "Add": "Aggiungi", "Enter": "Invia", - "NoKbAdded": "Non hai ancora aggiunto nessuna Knowledge Base", "RunIndexing": "Riaddestrare", "CreationDate": "Data creazione", "KbCounterFooter": "{{ counter }} di 3 Knowledge Base aggiunte", - "AddKbURL": "Aggiungi l'URL della tua pagina", - "AddKbText": "Aggiungi file di testo", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Limite di Knowledge Bases raggiunto per lo {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base", "noContent": "nessun contenuto", "titleUrls": "Importa da URL", - "helpUrls": "Inserisci le pagine web dagli URL pubblici nell'area di testo sottostante, separate da un ritorno a capo", + "helpUrls": "Inserisci le pagine web dagli URL pubblici nell'area di testo sottostante, separate da un ritorno a capo.", "titleTextareaUrls": "Elenco degli URL", "placeholderUrls": "Inserisci gli URL", - "infoUrls": "Un URL per riga." + "infoUrls": "Un URL per riga.", + "NoKbAdded": "Non esistono origini dati", + "NoKbAddedText": "Aggiungi l'origine dati al tuo assistente per creare una knowledge base.", + "Add": "Aggiungi dati", + "AddKbURL": "URL multipli", + "AddKbText": "Testo semplice", + "AddKbSitemap": "Mappa del sito", + "LoadMore": "carica di più", + "Loading": "caricamento", + "YouCanAddKBUrlsLimit": "Puoi aggiungere un massimo di 300 URL" }, "AutomationsDemoPageDescription": "Con le nostre “APIs automations” puoi gestire messaggi broadcast massivi su Whatsapp utilizzando le automazioni del designer uniti alla facilità delle nostre API, inviare messaggi a tutti i contatti del tuo CRM preferito, ricevere lo stato dei messaggi inviati (ricevuto, letto etc.) e molto altro ancora!", "Sunday": "Domenica", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index b3ce54005689..a7021f8c7ed4 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Құпиялар", - "Add": "қосу", "Enter": "Енгізіңіз", - "NoKbAdded": "Сіз әлі ешқандай білім қорын қосқан жоқсыз", "RunIndexing": "Индекстеуді іске қосыңыз", "CreationDate": "Жасалу күні", "KbCounterFooter": "{{ counter }} 3 білім қоры қосылды", - "AddKbURL": "Беттің URL мекенжайын қосыңыз", - "AddKbText": "Мәтіндік файлды қосу", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "{{plan_name}} бойынша білім қорының шегіне жетті", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады", "noContent": "мазмұны жоқ", "titleUrls": "URL мекенжайларынан импорттау", - "helpUrls": "Жалпы URL мекенжайларынан веб-беттерді қайтару арқылы бөлінген төмендегі мәтін аймағына кірістіріңіз", + "helpUrls": "Жалпы URL мекенжайларынан веб-беттерді қайтару арқылы бөлінген төмендегі мәтін аймағына кірістіріңіз.", "titleTextareaUrls": "URL мекенжайларының тізімі", "placeholderUrls": "URL мекенжайларын енгізіңіз", - "infoUrls": "Әр жолға бір url." + "infoUrls": "Әр жолға бір url.", + "NoKbAdded": "Деректер көздері жоқ", + "NoKbAddedText": "Білім базасын құру үшін көмекшіге деректер көзін қосыңыз.", + "Add": "Деректер көздерін қосыңыз", + "AddKbURL": "Бірнеше URL мекенжайлары", + "AddKbText": "Қарапайым мәтін", + "AddKbSitemap": "Сайт картасы", + "LoadMore": "көбірек жүктеңіз", + "Loading": "жүктеу", + "YouCanAddKBUrlsLimit": "Ең көбі 300 URL қосуға болады" }, "AutomationsDemoPageDescription":"Біздің «API автоматикасының» көмегімен сіз WhatsApp желісіндегі жаппай хабарларды біздің API интерфейстеріміздің қарапайымдылығымен біріктірілген дизайнерлік автоматтандыруды пайдаланып басқара аласыз, сүйікті CRM-тің барлық контактілеріне хабарламалар жібере аласыз, жіберілген хабарламалардың күйін ала аласыз (қабылданған, оқылған және т. ) және тағы басқалар!", "Sunday": "Жексенбі", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 2c2fb5b4a6ec..f1bb67acdb65 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Segredos", - "Add": "Adicionar", "Enter": "Digitar", - "NoKbAdded": "Você ainda não adicionou nenhuma base de conhecimento", "RunIndexing": "Executar indexação", "CreationDate": "Data de criação", "KbCounterFooter": "{{ counter }} de 3 bases de conhecimento adicionadas", - "AddKbURL": "Adicione o URL da sua página", - "AddKbText": "Adicionar arquivo de texto", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Limite da Base de Conhecimento atingido para {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada", "noContent": "sem conteúdo", "titleUrls": "Importar de URLs", - "helpUrls": "Insira páginas da web de URLs públicos na área de texto abaixo, separadas por um retorno", + "helpUrls": "Insira páginas da web de URLs públicos na área de texto abaixo, separadas por um retorno.", "titleTextareaUrls": "Lista de URLs", "placeholderUrls": "Insira URLs", - "infoUrls": "Um URL por linha." + "infoUrls": "Um URL por linha.", + "NoKbAdded": "Não existem fontes de dados", + "NoKbAddedText": "Adicione fonte de dados ao seu assistente para construir uma base de conhecimento.", + "Add": "Adicionar fontes de dados", + "AddKbURL": "Vários URLs", + "AddKbText": "Texto simples", + "AddKbSitemap": "Mapa do site", + "LoadMore": "Carregue mais", + "Loading": "carregando", + "YouCanAddKBUrlsLimit": "Você pode adicionar no máximo 300 URLs" }, "AutomationsDemoPageDescription":"Com nossas “automações de APIs” você pode gerenciar mensagens de difusão em massa no Whatsapp utilizando as automações do designer aliadas à facilidade de nossas APIs, enviar mensagens para todos os contatos do seu CRM favorito, receber o status das mensagens enviadas (recebidas, lidas, etc. ) e muito mais!", "Sunday": "Domingo", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 355822d43a2c..ae93e176b849 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Секреты", - "Add": "Добавлять", "Enter": "Входить", - "NoKbAdded": "Вы еще не добавили ни одной базы знаний", "RunIndexing": "Запустить индексирование", "CreationDate": "Дата создания", "KbCounterFooter": "{{ counter }} добавлено из 3 баз знаний", - "AddKbURL": "Добавьте URL своей страницы", - "AddKbText": "Добавить текстовый файл", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Достигнут лимит баз знаний для {{plan_name}}", @@ -1648,7 +1644,16 @@ "helpUrls": "Вставьте веб-страницы с общедоступных URL-адресов в текстовую область ниже, разделив их возвратом.", "titleTextareaUrls": "Список URL-адресов", "placeholderUrls": "Введите URL-адреса", - "infoUrls": "Один URL в каждой строке." + "infoUrls": "Один URL в каждой строке.", + "NoKbAdded": "Источники данных отсутствуют", + "NoKbAddedText": "Добавьте источник данных в свой помощник, чтобы создать базу знаний.", + "Add": "Добавить источники данных", + "AddKbURL": "Несколько URL-адресов", + "AddKbText": "Простой текст", + "AddKbSitemap": "Карта сайта", + "LoadMore": "Загрузи больше", + "Loading": "загрузка", + "YouCanAddKBUrlsLimit": "Вы можете добавить максимум 300 URL-адресов." }, "AutomationsDemoPageDescription":"С помощью нашей «автоматизации API» вы можете управлять массовыми рассылками сообщений в Whatsapp, используя дизайнерскую автоматизацию в сочетании с простотой наших API, отправлять сообщения всем контактам вашей любимой CRM, получать статус отправленных сообщений (получено, прочитано и т. д.). ) и многое другое!", "Sunday": "Воскресенье", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index b8e73c784311..fb01e630c353 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Тајне", - "Add": "Додати", "Enter": "Ентер", - "NoKbAdded": "Још увек нисте додали ниједну базу знања", "RunIndexing": "Покрени индексирање", "CreationDate": "Датум израде", "KbCounterFooter": "{{ counter }} од 3 додане базе знања", - "AddKbURL": "Додајте УРЛ своје странице", - "AddKbText": "Додајте текстуалну датотеку", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Достигнуто је ограничење базе знања за {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди", "noContent": "без садржаја", "titleUrls": "Увоз са УРЛ адреса", - "helpUrls": "Уметните веб странице са јавних УРЛ-ова у текстуално подручје испод, раздвојене повратком", + "helpUrls": "Уметните веб странице са јавних УРЛ-ова у текстуално подручје испод, раздвојене повратком.", "titleTextareaUrls": "Листа УРЛ адреса", "placeholderUrls": "Унесите УРЛ адресе", - "infoUrls": "Један УРЛ по реду." + "infoUrls": "Један УРЛ по реду.", + "NoKbAdded": "Не постоје извори података", + "NoKbAddedText": "Додајте извор података свом помоћнику да бисте изградили базу знања.", + "Add": "Додајте изворе података", + "AddKbURL": "Више УРЛ адреса", + "AddKbText": "Једноставан текст", + "AddKbSitemap": "Мапа сајта", + "LoadMore": "Учитај више", + "Loading": "лоадинг", + "YouCanAddKBUrlsLimit": "Можете додати највише 300 УРЛ адреса" }, "AutomationsDemoPageDescription":"Са нашим „АПИ аутоматизацијама“ можете управљати масовним емитовањем порука на Вхатсапп-у користећи аутоматизацију дизајнера у комбинацији са лакоћом наших АПИ-ја, слати поруке свим контактима вашег омиљеног ЦРМ-а, примати статус послатих порука (примљено, прочитано, итд. ) и још много тога!", "Sunday": "недеља", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 639a1b4ea695..f85d84e38455 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Hemligheter", - "Add": "Lägg till", "Enter": "Stiga på", - "NoKbAdded": "Du har inte lagt till någon kunskapsbas än", "RunIndexing": "Kör indexering", "CreationDate": "Skapelsedagen", "KbCounterFooter": "{{ counter }} av 3 kunskapsbaser tillagda", - "AddKbURL": "Lägg till din webbadress", - "AddKbText": "Lägg till textfil", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Kunskapsbasens gräns nådd för {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras", "noContent": "inget innehåll", "titleUrls": "Importera från webbadresser", - "helpUrls": "Infoga webbsidor från offentliga webbadresser i textområdet nedan, åtskilda av en retur", + "helpUrls": "Infoga webbsidor från offentliga webbadresser i textområdet nedan, åtskilda av en retur.", "titleTextareaUrls": "Lista över webbadresser", "placeholderUrls": "Ange webbadresser", - "infoUrls": "En webbadress per rad." + "infoUrls": "En webbadress per rad.", + "NoKbAdded": "Det finns inga datakällor", + "NoKbAddedText": "Lägg till datakälla i din assistent för att bygga en kunskapsbas.", + "Add": "Lägg till datakällor", + "AddKbURL": "Flera webbadresser", + "AddKbText": "Enkel text", + "AddKbSitemap": "Webbplatskarta", + "LoadMore": "ladda mer", + "Loading": "läser in", + "YouCanAddKBUrlsLimit": "Du kan lägga till högst 300 webbadresser" }, "AutomationsDemoPageDescription":"Med våra “API-automatiseringar” kan du hantera massutsändningsmeddelanden på Whatsapp med hjälp av designerns automatiseringar kombinerat med enkelheten hos våra API: er, skicka meddelanden till alla kontakter i din favorit-CRM, ta emot status för skickade meddelanden (mottagna, lästa, etc. ) och mycket mer!", "Sunday": "söndag", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 56c2fe97cac9..5b357694bfb2 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Sırlar", - "Add": "Eklemek", "Enter": "Girmek", - "NoKbAdded": "Henüz herhangi bir Bilgi Tabanı eklemediniz", "RunIndexing": "Dizin Oluşturmayı Çalıştır", "CreationDate": "Oluşturulma tarihi", "KbCounterFooter": "{{ counter }} / 3 Bilgi Tabanı eklendi", - "AddKbURL": "Sayfa URL'nizi ekleyin", - "AddKbText": "Metin Dosyası Ekle", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "{{plan_name}} için Bilgi Tabanı sınırına ulaşıldı", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi", "noContent": "içerik yok", "titleUrls": "URL'lerden içe aktar", - "helpUrls": "Genel URL'lerdeki web sayfalarını aşağıdaki metin alanına bir dönüş işaretiyle ayırarak ekleyin", + "helpUrls": "Genel URL'lerdeki web sayfalarını aşağıdaki metin alanına bir dönüş işaretiyle ayırarak ekleyin.", "titleTextareaUrls": "URL'lerin listesi", "placeholderUrls": "URL'leri girin", - "infoUrls": "Satır başına bir URL." + "infoUrls": "Satır başına bir URL.", + "NoKbAdded": "Hiçbir veri kaynağı mevcut değil", + "NoKbAddedText": "Bir bilgi tabanı oluşturmak için asistanınıza veri kaynağı ekleyin.", + "Add": "Veri kaynakları ekleyin", + "AddKbURL": "Birden çok URL", + "AddKbText": "Basit metin", + "AddKbSitemap": "Site haritası", + "LoadMore": "daha fazla yükle", + "Loading": "Yükleniyor", + "YouCanAddKBUrlsLimit": "Maksimum 300 URL ekleyebilirsiniz" }, "AutomationsDemoPageDescription":"“API otomasyonlarımız” ile, API'lerimizin kolaylığıyla birlikte tasarımcının otomasyonlarını kullanarak Whatsapp'taki toplu yayın mesajlarını yönetebilir, favori CRM'nizdeki tüm kişilere mesaj gönderebilir, gönderilen mesajların durumunu (alındı, okundu vb.) alabilirsiniz. ) ve daha fazlası!", "Sunday": "Pazar", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 91fd53401610..016f47940cb8 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1576,14 +1576,10 @@ }, "KbPage": { "Secrets": "Секрети", - "Add": "додати", "Enter": "Введіть", - "NoKbAdded": "Ви ще не додали жодної бази знань", "RunIndexing": "Запустіть індексацію", "CreationDate": "Дата створення", "KbCounterFooter": "{{ counter }} із 3 доданих баз знань", - "AddKbURL": "Додайте URL-адресу сторінки", - "AddKbText": "Додати текстовий файл", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "Досягнуто ліміту баз знань для {{plan_name}}", @@ -1645,10 +1641,19 @@ "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань", "noContent": "немає вмісту", "titleUrls": "Імпортувати з URL-адрес", - "helpUrls": "Вставте веб-сторінки з загальнодоступних URL-адрес у текстову область нижче, розділивши їх символом повернення", + "helpUrls": "Вставте веб-сторінки з загальнодоступних URL-адрес у текстову область нижче, розділивши їх символом повернення.", "titleTextareaUrls": "Список URL-адрес", "placeholderUrls": "Введіть URL-адреси", - "infoUrls": "Одна URL-адреса на рядок." + "infoUrls": "Одна URL-адреса на рядок.", + "NoKbAdded": "Джерел даних немає", + "NoKbAddedText": "Додайте джерело даних у свій помічник, щоб створити базу знань.", + "Add": "Додайте джерела даних", + "AddKbURL": "Кілька URL-адрес", + "AddKbText": "Простий текст", + "AddKbSitemap": "Карта сайту", + "LoadMore": "завантажити ще", + "Loading": "завантаження", + "YouCanAddKBUrlsLimit": "Ви можете додати максимум 300 URL-адрес" }, "AutomationsDemoPageDescription":"Завдяки нашій «автоматизації API» ви можете керувати масовими широкомовними повідомленнями в Whatsapp за допомогою автоматизації дизайнера в поєднанні з простотою наших API, надсилати повідомлення всім контактам вашої улюбленої CRM, отримувати статус надісланих повідомлень (отримано, прочитано тощо). ) і багато іншого!", "Sunday": "неділя", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 45a0ea26b383..e89b485a813b 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1575,14 +1575,10 @@ }, "KbPage": { "Secrets": "Sirlar", - "Add": "Qo'shish", "Enter": "Kirish", - "NoKbAdded": "Siz hali biror maʼlumot bazasini qoʻshmagansiz", "RunIndexing": "Indekslashni ishga tushiring", "CreationDate": "Yaratilgan sana", "KbCounterFooter": "{{ counter }} 3 ta bilim bazasi qo'shildi", - "AddKbURL": "Sahifa URL manzilini qo'shing", - "AddKbText": "Matn faylini qo'shish", "KbCounterFooter1": "Added {{counter}} Knowledge Bases", "KbCounterFooter2": "of {{allowed_kb_num}} available for {{plan_name}}", "KBLimitReached": "{{plan_name}} uchun maʼlumotlar bazasi chegarasiga yetdi", @@ -1644,10 +1640,19 @@ "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi", "noContent": "tarkib yo'q", "titleUrls": "URL manzillaridan import qilish", - "helpUrls": "Veb-sahifalarni umumiy URL manzillaridan qaytish bilan ajratilgan holda quyidagi matn maydoniga kiriting", + "helpUrls": "Veb-sahifalarni umumiy URL manzillaridan qaytish bilan ajratilgan holda quyidagi matn maydoniga kiriting.", "titleTextareaUrls": "URL manzillar ro'yxati", "placeholderUrls": "URL manzillarini kiriting", - "infoUrls": "Har bir satr uchun bitta url." + "infoUrls": "Har bir satr uchun bitta url.", + "NoKbAdded": "Hech qanday ma'lumot manbalari mavjud emas", + "NoKbAddedText": "Bilimlar bazasini yaratish uchun yordamchingizga maʼlumotlar manbasini qoʻshing.", + "Add": "Ma'lumotlar manbalarini qo'shing", + "AddKbURL": "Bir nechta URL manzillar", + "AddKbText": "Oddiy matn", + "AddKbSitemap": "Sayt xaritasi", + "LoadMore": "ko'proq yuklang", + "Loading": "yuklash", + "YouCanAddKBUrlsLimit": "Siz maksimal 300 ta URL qo'shishingiz mumkin" }, "AutomationsDemoPageDescription":"Bizning “API avtomatizatsiyamiz” yordamida siz Whatsapp-da ommaviy translyatsiya xabarlarini bizning API-larimiz qulayligi bilan birlashtirilgan dizayner avtomatizatsiyasidan foydalangan holda boshqarishingiz, sevimli CRM-ning barcha kontaktlariga xabarlar yuborishingiz, yuborilgan xabarlar holatini (qabul qilingan, o'qilgan va hokazo) olishingiz mumkin. ) va yana ko'p narsalar!", "Sunday": "yakshanba", From 6980bb4cac03dce6a79b7f4e23ede8dd377cc3a1 Mon Sep 17 00:00:00 2001 From: Dario De Pascalis Date: Tue, 5 Mar 2024 12:04:28 +0100 Subject: [PATCH 17/35] site-map integration step 1 --- .../add-content-menu.component.ts | 6 + .../knowledge-base-table.component.ts | 2 +- .../modal-site-map.component.html | 132 ++++++++++++++---- .../modal-site-map.component.ts | 63 ++------- 4 files changed, 117 insertions(+), 86 deletions(-) diff --git a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts index 57ae114b4f7d..ca57c8445f63 100644 --- a/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts +++ b/src/app/knowledge-bases/menu/add-content-menu/add-content-menu.component.ts @@ -38,6 +38,12 @@ export class AddContentMenuComponent implements OnInit { this.items.push(item); }); + // this.translate.get('KbPage.AddKbSitemap') + // .subscribe((text: any) => { + // let item = {"label": text, "type":"site-map"}; + // this.items.push(item); + // }); + //this.items = [{"label": "Single URL", "type":"url-page"},{"label": "URL(s)", "type":"urls"}, {"label": "Plain Text", "type":"text-file"}]; diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 9a034cc014ee..ced16d248d2e 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -200,7 +200,7 @@ export class KnowledgeBaseTableComponent implements OnInit { } onOpenAddKnowledgeBaseModal(type){ - // console.log('onOpenAddKnowledgeBaseModal', type); + console.log('onOpenAddKnowledgeBaseModal', type); this.openAddKnowledgeBaseModal.emit(type); } diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html index 14ec332e2ebe..a5a2b32cd8bd 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.html @@ -1,38 +1,110 @@ +
@@ -116,11 +139,16 @@
- - schedule + + + done + done_all + cached + done_all + error @@ -160,9 +188,9 @@
-
{{'KbPage.Loading' | translate}}
-
{{'KbPage.LoadMore' | translate}}
+
{{'KbPage.Loading' | translate}}
+
{{'KbPage.LoadMore' | translate}}
\ No newline at end of file diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss index 4a09f4b79818..011ce9215d0f 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.scss @@ -22,6 +22,27 @@ select.select-status { } } +.preview-count { + display: flex; + width: calc(100% - 23px); + justify-content: space-between; + align-items: center; + padding: 8px 20px; + border-radius: 8px; + margin: 10px 16px 10px 10px; + box-shadow: 0px 0px 4px #c7c7c7; + + .preview-count-left { + display: flex; + align-items: baseline; + } +} + +.contents-count { + color: #8d8d8d; + margin-left: 16px; +} + .custom-input { background-color:#fff; color:#333333; @@ -48,6 +69,7 @@ table { margin: 0; font-size: 11px; line-height: 11px; + color: #b2b2b2; } .mat-elevation-z8{ @@ -99,14 +121,20 @@ th.mat-header-cell:last-of-type, td.mat-cell:last-of-type, td.mat-footer-cell:la padding-right: 0px; } +// .material-icons-outlined { +// color: #647491; +// } .material-icons-outlined { - color: #647491; + color: #adadad; } .material-icons-outlined.status-error{ color: #e50b0b; } +// .material-icons-outlined.status-done { +// color: green; +// } .material-icons-outlined.status-done { - color: green; + color: #00a8ff; } .material-icons-outlined.status-void{ color: gray; @@ -212,7 +240,7 @@ td { display: flex; flex-direction: row; justify-content: flex-end; - margin-bottom: -40px; + // margin-bottom: -40px; } @@ -279,6 +307,7 @@ td { .card { border: none!important; + padding: 0px 15px 20px; } .btn { diff --git a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts index 7ddc14b9426e..ffda89167135 100644 --- a/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts +++ b/src/app/knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component.ts @@ -142,15 +142,14 @@ export class KnowledgeBaseTableComponent implements OnInit { } onLoadByFilter(filterValue: string, column: string) { - let status = ''; - let search = ''; + // let status = ''; + // let search = ''; if( column == 'type'){ - status = filterValue; + this.searchParams.status = filterValue; } else if(column == 'name'){ - search = filterValue; + this.searchParams.search = filterValue; } - this.searchParams.status = status; - this.searchParams.search = search; + console.log("this.searchParams ", this.searchParams); if (this.timeoutId) { clearTimeout(this.timeoutId); } diff --git a/src/app/services/openai.service.ts b/src/app/services/openai.service.ts index a93019a40040..7c943954450d 100644 --- a/src/app/services/openai.service.ts +++ b/src/app/services/openai.service.ts @@ -152,7 +152,7 @@ export class OpenaiService { } //const url = this.GPT_API_URL + "/scrape/status"; //const url = this.SERVER_BASE_PATH + this.project_id + "/kbsettings/checkstatus"; - const url = this.SERVER_BASE_PATH + this.project_id + "/kb/scrape/status"; + const url = this.SERVER_BASE_PATH + this.project_id + "/kb/scrape/status?returnObject=true"; this.logger.debug('[OPENAI.SERVICE] - check scraping URL: ', url); return this.httpClient.post(url, JSON.stringify(data), httpOptions); } diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index c6ce7a3f980a..cf4dfee244f4 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "انتبه، الحد الأقصى لعدد الأحرف المسموح به لكل محتوى نصي هو 32768.", "StatusAll": "الجميع", "StatusNotStarted": "لم يبدأ", + "StatusQueued": "في قائمة الانتظار", "StatusStarted": "بدأت", "StatusFinished": "انتهى", "StatusError": "خطأ", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 130457fb210c..646a7d043548 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Diqqət, hər mətn məzmunu üçün icazə verilən simvolların maksimum sayı 32768-dir.", "StatusAll": "Hamısı", "StatusNotStarted": "Başlanmayıb", + "StatusQueued": "Növbədə", "StatusStarted": "başladı", "StatusFinished": "Bitdi", "StatusError": "Xəta", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 83f04719949d..eac72d9803da 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Achtung, die maximal zulässige Zeichenanzahl für jeden Textinhalt beträgt 32768.", "StatusAll": "Alle", "StatusNotStarted": "Nicht angefangen", + "StatusQueued": "In Warteschlange", "StatusStarted": "Gestartet", "StatusFinished": "Fertig", "StatusError": "Fehler", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 85a83130d306..b0138e70dbe1 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Attention, the maximum number of characters allowed for each text content is 32768", "StatusAll": "All", "StatusNotStarted": "Not started", + "StatusQueued": "Queued", "StatusStarted": "Started", "StatusFinished": "Finished", "StatusError": "Error", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 222232da2e29..26411311b5eb 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Atención, el número máximo de caracteres permitidos para cada contenido de texto es 32768.", "StatusAll": "Todo", "StatusNotStarted": "No empezado", + "StatusQueued": "Puesto en cola", "StatusStarted": "Comenzó", "StatusFinished": "Finalizado", "StatusError": "Error", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index fbfb8a51f632..b3eb0c51a8c9 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Attention, le nombre maximum de caractères autorisés pour chaque contenu textuel est de 32768.", "StatusAll": "Tous", "StatusNotStarted": "Pas commencé", + "StatusQueued": "En file d'attente", "StatusStarted": "Commencé", "StatusFinished": "Fini", "StatusError": "Erreur", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 31163c804c93..999508eafc30 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Attenzione, il numero massimo di caratteri consentiti per ciascun contenuto testuale è 32768.", "StatusAll": "Tutto", "StatusNotStarted": "Non iniziato", + "StatusQueued": "In coda", "StatusStarted": "Iniziato", "StatusFinished": "Finito", "StatusError": "Errore", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index a9ef4c362fa1..87132b7f3f07 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Назар аударыңыз, әрбір мәтін мазмұны үшін рұқсат етілген таңбалардың ең көп саны 32768.", "StatusAll": "Барлық", "StatusNotStarted": "Басталған жоқ", + "StatusQueued": "Кезекте", "StatusStarted": "Басталды", "StatusFinished": "Аяқталды", "StatusError": "Қате", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 8be3dc47e1a3..84e786ecd322 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Atenção, o número máximo de caracteres permitidos para cada conteúdo de texto é 32768.", "StatusAll": "Todos", "StatusNotStarted": "Não foi iniciado", + "StatusQueued": "Enfileiradas", "StatusStarted": "Iniciado", "StatusFinished": "Finalizado", "StatusError": "Erro", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 7d02a44b8f64..50e6da216200 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Внимание, максимальное количество символов, разрешенное для каждого текстового содержимого, составляет 32768.", "StatusAll": "Все", "StatusNotStarted": "Не начался", + "StatusQueued": "В очереди", "StatusStarted": "Начал", "StatusFinished": "Законченный", "StatusError": "Ошибка", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index d7281b79ea06..a0b4386dc7ed 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Пажња, максимални дозвољени број знакова за сваки текстуални садржај је 32768.", "StatusAll": "Све", "StatusNotStarted": "Није почео", + "StatusQueued": "У реду чекања", "StatusStarted": "Почело", "StatusFinished": "Готов", "StatusError": "Грешка", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index c3f9bd27209c..70e1d4ca2fd7 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Observera, det maximala antalet tillåtna tecken för varje textinnehåll är 32768.", "StatusAll": "Allt", "StatusNotStarted": "Ej påbörjad", + "StatusQueued": "I kö", "StatusStarted": "Satte igång", "StatusFinished": "Färdiga", "StatusError": "Fel", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index 2250cd740533..d7e802434897 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Dikkat, her metin içeriği için izin verilen maksimum karakter sayısı 32768'dir.", "StatusAll": "Tüm", "StatusNotStarted": "Başlatılmadı", + "StatusQueued": "Sıraya alındı", "StatusStarted": "Başlatıldı", "StatusFinished": "Bitti", "StatusError": "Hata", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index ab315d81ac23..19ab076d5cf9 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1630,6 +1630,7 @@ "AddKbInfoTextContentMsg1": "Увага, максимальна кількість символів, дозволена для кожного текстового вмісту, становить 32768.", "StatusAll": "все", "StatusNotStarted": "Не розпочато", + "StatusQueued": "У черзі", "StatusStarted": "розпочато", "StatusFinished": "Готово", "StatusError": "Помилка", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 9f53e682cb8f..3f7ba260632f 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1629,6 +1629,7 @@ "AddKbInfoTextContentMsg1": "Diqqat, har bir matn mazmuni uchun ruxsat etilgan belgilarning maksimal soni 32768 ni tashkil qiladi.", "StatusAll": "Hammasi", "StatusNotStarted": "Boshlanmagan", + "StatusQueued": "Navbatda", "StatusStarted": "Boshlandi", "StatusFinished": "Tugallandi", "StatusError": "Xato", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e925cd501405..75bdec522636 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,36 +1,83 @@ + +// export const environment = { +// production: true, +// t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', +// VERSION: require('../../package.json').version, +// widgetUrl: 'https://widget.tiledesk.com/v3/launch.js', +// botcredendialsURL:'CHANGEIT', +// remoteConfig: true, +// SERVER_BASE_URL:'https://tiledesk-server-pre.herokuapp.com/', +// CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat/', +// testsiteBaseUrl: 'https://widget-pre.tiledesk.com/v2/assets/test_widget_page/index.html', +// wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', +// chatEngine: 'mqtt', +// firebaseAuth: false, +// uploadEngine: 'native', +// baseImageUrl: 'CHANGEIT', +// pushEngine: 'none', +// logLevel: 'Info', +// templatesUrl: 'CHANGEIT', +// appsUrl: 'CHANGEIT', +// promoBannerUrl: 'CHANGEIT', +// chatStoragePrefix: "CHANGEIT", +// firebase: { +// apiKey: 'CHANGEIT', +// authDomain: 'CHANGEIT', +// databaseURL: 'CHANGEIT', +// projectId: 'CHANGEIT', +// storageBucket: 'CHANGEIT', +// messagingSenderId: 'CHANGEIT', +// appId: 'CHANGEIT', +// vapidKey: 'CHANGEIT' +// } +// }; + export const environment = { production: false, - remoteConfig: true, - remoteConfigUrl: './dashboard-config.json', + remoteConfig: false, + t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-IPS:T-ETK:T-RAS:T-PPB:T-PET:T-MTS:T-TIL:T-DGF:T-NAT:T-HPB:F-TOW:T-KNB:T-BAN:T-AST:T-MON:T-CNT:T-AUT:T-WUN:T-INT:T-DPA:T', VERSION: require('../../package.json').version, - t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', - botcredendialsURL: 'CHANGEIT', - WIDGET_BASE_URL: 'http://localhost:4200/', - SERVER_BASE_URL: 'http://localhost:3000/', - CHAT_BASE_URL: 'http://localhost:8080/', - wsUrl: 'ws://localhost:3000/', - chatEngine: 'mqtt', + botcredendialsURL: 'https://tiledesk-df-connector-pre.herokuapp.com/botcredendials/', //'https://dialogflow-proxy-tiledesk.herokuapp.com/botcredendials/', + rasaBotCredentialsURL: "https://tiledesk-server-pre.herokuapp.com/modules/rasa/botcredendials/", // "https://tiledesk-rasa-connector-pre.herokuapp.com/botcredendials/", + WIDGET_BASE_URL: 'https://widget-pre.tiledesk.com/v5/', + SERVER_BASE_URL: 'https://tiledesk-server-pre.herokuapp.com/', + CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat-ionic5/', // '/chat-ionic5/', //'https://support-pre.tiledesk.com/chat-ionic5/' // https://support-pre.tiledesk.com/chat-ionic5-notifcation-item// + wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', + reCaptchaSiteKey:"6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5", + globalRemoteJSSrc: "https://support-pre.tiledesk.com/script/custom_script.js, https://support-pre.tiledesk.com/script/dnpc.js", //https://www.google.com/recaptcha/api.js?render=6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5, firebaseAuth: false, - uploadEngine: 'native', - baseImageUrl: 'CHANGEIT', - pushEngine: 'none', - logLevel: 'Info', - communityTemplatesUrl: 'CHANGEIT', - templatesUrl: 'CHANGEIT', - appsUrl: 'CHANGEIT', - cdsBaseUrl: 'CHANGEIT', - promoBannerUrl: 'CHANGEIT', - whatsappApiUrl: "CHANGEIT", - ticketingEmail: "CHANGEIT", - tiledeskPhoneNumber: "CHANGEIT", + uploadEngine: 'firebase', + baseImageUrl: 'https://tiledesk-server-pre.herokuapp.com/', + pushEngine: 'firebase', + chatEngine: 'firebase', + logLevel: 'info', + communityTemplatesUrl: 'https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/community', + templatesUrl: "https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/templates", // "https://chatbot-templates.herokuapp.com/chatbots/public/templates/", + appsUrl: "https://cd3ff4b5-5a06-44e3-aff2-3ce2ff1b848b-00-3eppvhwsi6nym.janeway.replit.dev/", // "https://tiledesk-apps-server.giovannitroisi3.repl.co/",// "https://tiledesk-apps.herokuapp.com/", + cdsBaseUrl: '/cds/', + whatsappApiUrl: "https://tiledesk-whatsapp-connector-dev.glitch.me/", //"https://tiledesk-whatsapp-connector-c4ce07638b45.herokuapp.com/", //"https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/", // "https://tiledesk-whatsapp-app-pre.giovannitroisi3.repl.co", + // promoBannerUrl: "https://dashbordpromobanner.nicolan74.repl.co/get/dashboard_promo.json", + chatStoragePrefix: "chat_sv5", + tiledeskPhoneNumber: "393201352964", + ticketingEmail: "tickets.tiledesk.com", firebase: { - apiKey: 'CHANGEIT', - authDomain: 'CHANGEIT', - databaseURL: 'CHANGEIT', - projectId: 'CHANGEIT', - storageBucket: 'CHANGEIT', - messagingSenderId: 'CHANGEIT', - appId: 'CHANGEIT', - vapidKey: 'CHANGEIT' - } -}; \ No newline at end of file + apiKey: "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4", + authDomain: "chat21-pre-01.firebaseapp.com", + databaseURL: "https://chat21-pre-01.firebaseio.com", + projectId: "chat21-pre-01", + storageBucket: "chat21-pre-01.appspot.com", + messagingSenderId: "269505353043", + appId: "1:269505353043:web:b82af070572669e3707da6", + vapidKey: "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c" + }, +}; + + + + + + + + + + From d897ce197a6ab2b24354d800a00ee681d1164d96 Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Tue, 12 Mar 2024 18:45:15 +0100 Subject: [PATCH 29/35] restore environment --- src/environments/environment.ts | 109 +++++++++----------------------- 1 file changed, 31 insertions(+), 78 deletions(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 75bdec522636..e925cd501405 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,83 +1,36 @@ - -// export const environment = { -// production: true, -// t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', -// VERSION: require('../../package.json').version, -// widgetUrl: 'https://widget.tiledesk.com/v3/launch.js', -// botcredendialsURL:'CHANGEIT', -// remoteConfig: true, -// SERVER_BASE_URL:'https://tiledesk-server-pre.herokuapp.com/', -// CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat/', -// testsiteBaseUrl: 'https://widget-pre.tiledesk.com/v2/assets/test_widget_page/index.html', -// wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', -// chatEngine: 'mqtt', -// firebaseAuth: false, -// uploadEngine: 'native', -// baseImageUrl: 'CHANGEIT', -// pushEngine: 'none', -// logLevel: 'Info', -// templatesUrl: 'CHANGEIT', -// appsUrl: 'CHANGEIT', -// promoBannerUrl: 'CHANGEIT', -// chatStoragePrefix: "CHANGEIT", -// firebase: { -// apiKey: 'CHANGEIT', -// authDomain: 'CHANGEIT', -// databaseURL: 'CHANGEIT', -// projectId: 'CHANGEIT', -// storageBucket: 'CHANGEIT', -// messagingSenderId: 'CHANGEIT', -// appId: 'CHANGEIT', -// vapidKey: 'CHANGEIT' -// } -// }; - export const environment = { production: false, - remoteConfig: false, - t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-IPS:T-ETK:T-RAS:T-PPB:T-PET:T-MTS:T-TIL:T-DGF:T-NAT:T-HPB:F-TOW:T-KNB:T-BAN:T-AST:T-MON:T-CNT:T-AUT:T-WUN:T-INT:T-DPA:T', + remoteConfig: true, + remoteConfigUrl: './dashboard-config.json', VERSION: require('../../package.json').version, - botcredendialsURL: 'https://tiledesk-df-connector-pre.herokuapp.com/botcredendials/', //'https://dialogflow-proxy-tiledesk.herokuapp.com/botcredendials/', - rasaBotCredentialsURL: "https://tiledesk-server-pre.herokuapp.com/modules/rasa/botcredendials/", // "https://tiledesk-rasa-connector-pre.herokuapp.com/botcredendials/", - WIDGET_BASE_URL: 'https://widget-pre.tiledesk.com/v5/', - SERVER_BASE_URL: 'https://tiledesk-server-pre.herokuapp.com/', - CHAT_BASE_URL: 'https://support-pre.tiledesk.com/chat-ionic5/', // '/chat-ionic5/', //'https://support-pre.tiledesk.com/chat-ionic5/' // https://support-pre.tiledesk.com/chat-ionic5-notifcation-item// - wsUrl: 'wss://tiledesk-server-pre.herokuapp.com/', - reCaptchaSiteKey:"6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5", - globalRemoteJSSrc: "https://support-pre.tiledesk.com/script/custom_script.js, https://support-pre.tiledesk.com/script/dnpc.js", //https://www.google.com/recaptcha/api.js?render=6Lf1khcpAAAAABMNHJfnJm43vVTxFzXM7ADqDAp5, + t2y12PruGU9wUtEGzBJfolMIgK: 'PAY:T-ANA:T-ACT:T-TRI:T-GRO:T-DEP:T-OPH:T-MTL:T-DGF:T-NAT:T-CAR:T-V1L:T-PSA:T-MTT:T-SUP:T-LBS:T-APP:T-DEV:T-NOT:T-RAS:T', + botcredendialsURL: 'CHANGEIT', + WIDGET_BASE_URL: 'http://localhost:4200/', + SERVER_BASE_URL: 'http://localhost:3000/', + CHAT_BASE_URL: 'http://localhost:8080/', + wsUrl: 'ws://localhost:3000/', + chatEngine: 'mqtt', firebaseAuth: false, - uploadEngine: 'firebase', - baseImageUrl: 'https://tiledesk-server-pre.herokuapp.com/', - pushEngine: 'firebase', - chatEngine: 'firebase', - logLevel: 'info', - communityTemplatesUrl: 'https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/community', - templatesUrl: "https://chatbot-templates-v2-pre.herokuapp.com/chatbots/public/templates", // "https://chatbot-templates.herokuapp.com/chatbots/public/templates/", - appsUrl: "https://cd3ff4b5-5a06-44e3-aff2-3ce2ff1b848b-00-3eppvhwsi6nym.janeway.replit.dev/", // "https://tiledesk-apps-server.giovannitroisi3.repl.co/",// "https://tiledesk-apps.herokuapp.com/", - cdsBaseUrl: '/cds/', - whatsappApiUrl: "https://tiledesk-whatsapp-connector-dev.glitch.me/", //"https://tiledesk-whatsapp-connector-c4ce07638b45.herokuapp.com/", //"https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/", // "https://tiledesk-whatsapp-app-pre.giovannitroisi3.repl.co", - // promoBannerUrl: "https://dashbordpromobanner.nicolan74.repl.co/get/dashboard_promo.json", - chatStoragePrefix: "chat_sv5", - tiledeskPhoneNumber: "393201352964", - ticketingEmail: "tickets.tiledesk.com", + uploadEngine: 'native', + baseImageUrl: 'CHANGEIT', + pushEngine: 'none', + logLevel: 'Info', + communityTemplatesUrl: 'CHANGEIT', + templatesUrl: 'CHANGEIT', + appsUrl: 'CHANGEIT', + cdsBaseUrl: 'CHANGEIT', + promoBannerUrl: 'CHANGEIT', + whatsappApiUrl: "CHANGEIT", + ticketingEmail: "CHANGEIT", + tiledeskPhoneNumber: "CHANGEIT", firebase: { - apiKey: "AIzaSyCoWXHNvP1-qOllCpTshhC6VjPXeRTK0T4", - authDomain: "chat21-pre-01.firebaseapp.com", - databaseURL: "https://chat21-pre-01.firebaseio.com", - projectId: "chat21-pre-01", - storageBucket: "chat21-pre-01.appspot.com", - messagingSenderId: "269505353043", - appId: "1:269505353043:web:b82af070572669e3707da6", - vapidKey: "BOsgS2ADwspKdWAmiFDZXEYqY1HSYADVfJT3j67wsySh3NxaViJqoabPJH8WM02wb5r8cQIm5TgM0UK047Z1D1c" - }, -}; - - - - - - - - - - + apiKey: 'CHANGEIT', + authDomain: 'CHANGEIT', + databaseURL: 'CHANGEIT', + projectId: 'CHANGEIT', + storageBucket: 'CHANGEIT', + messagingSenderId: 'CHANGEIT', + appId: 'CHANGEIT', + vapidKey: 'CHANGEIT' + } +}; \ No newline at end of file From 744dcb4f36f5a48ace0879f99f9bf45a5c3b2274 Mon Sep 17 00:00:00 2001 From: Nicola Lanzilotto Date: Wed, 13 Mar 2024 13:46:54 +0100 Subject: [PATCH 30/35] Updates version --- CHANGELOG.md | 6 ++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918b064a94cc..fa4fc04d133f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # tiledesk-dashboard +### 2.6.0 +- Deploys in production +- Improves Knowledge Bases +- Adds the ability to create Knowledge Bases by adding a sitemap +- Adds the customer.io integration + ### 2.5.20 - Deploys in production - Refactors the teammates table diff --git a/package-lock.json b/package-lock.json index 8a380e7b2c9a..21eec17cbc81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@tiledesk/tiledesk-dashboard", - "version": "2.5.20", + "version": "2.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bd9e86bdad82..f398a84cd5bf 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tiledesk/tiledesk-dashboard", - "version": "2.5.20", + "version": "2.6.0", "scripts": { "ng": "ng", "start": "ng serve --aot", From dcca945449d46d1d319849dad271ea1bbd7f2a56 Mon Sep 17 00:00:00 2001 From: Nicola Lanzilotto Date: Wed, 13 Mar 2024 19:07:19 +0100 Subject: [PATCH 31/35] Improves chatbot images --- src/assets/css/cards-table.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/assets/css/cards-table.scss b/src/assets/css/cards-table.scss index 971266de6ab8..463387e9d1c4 100755 --- a/src/assets/css/cards-table.scss +++ b/src/assets/css/cards-table.scss @@ -125,6 +125,13 @@ // border: 1px solid #eee; } +.cl-card-img-wpr >img { + vertical-align: middle; + width: 64px; + height: 64px; + object-fit: cover; +} + .cl-card-img-wpr>.photo-profile-container>.avatar-no-profile-photo { vertical-align: middle; width: 64px; From b6649341839ce455bda731ebac2c7ac8c7815903 Mon Sep 17 00:00:00 2001 From: Nicola Lanzilotto Date: Fri, 15 Mar 2024 11:14:21 +0100 Subject: [PATCH 32/35] Fixes the bug: app cards are not all the same height --- CHANGELOG.md | 2 ++ src/assets/css/demo.scss | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa4fc04d133f..433758cf4b7b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # tiledesk-dashboard + ### 2.6.0 - Deploys in production - Improves Knowledge Bases - Adds the ability to create Knowledge Bases by adding a sitemap - Adds the customer.io integration +- Fixes the bug: app cards are not all the same height ### 2.5.20 - Deploys in production diff --git a/src/assets/css/demo.scss b/src/assets/css/demo.scss index 54ed21525352..729f2d17b7de 100755 --- a/src/assets/css/demo.scss +++ b/src/assets/css/demo.scss @@ -1763,9 +1763,9 @@ appdashboard-app-store>div>div>div>div>div>div.card-content>div.available-from-b margin-top: -25px; } -appdashboard-app-store>div>div>div>div>div>div.card-content>.app-store-card-no-badge { - height: 48px !important; -} +// appdashboard-app-store>div>div>div>div>div>div.card-content>.app-store-card-no-badge { +// height: 48px !important; +// } appdashboard-app-store>div>div>div>div>.card-app-store { height: 269px; From c3ad2857149ee510b9cf5a4fcfadc6df59f3a554 Mon Sep 17 00:00:00 2001 From: Nicola Lanzilotto Date: Fri, 15 Mar 2024 15:04:54 +0100 Subject: [PATCH 33/35] App store minor improvements --- src/app/app-store/app-store.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-store/app-store.component.html b/src/app/app-store/app-store.component.html index f2533823b3ce..d1ce91e2f514 100644 --- a/src/app/app-store/app-store.component.html +++ b/src/app/app-store/app-store.component.html @@ -520,7 +520,7 @@

-
+
External
From d3d70d957d552faaa0e9c17369c5e80a5c3f08d9 Mon Sep 17 00:00:00 2001 From: Nicola Lanzilotto Date: Mon, 18 Mar 2024 15:50:17 +0100 Subject: [PATCH 34/35] Adds the ability to sort chatbot by name --- CHANGELOG.md | 4 ++++ .../bots/bots-list/bots-list.component.html | 6 +++++ src/app/bots/bots-list/bots-list.component.ts | 22 ++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 433758cf4b7b..f5daf2f11998 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Adds the customer.io integration - Fixes the bug: app cards are not all the same height +### 2.5.21 +- Deploys in production +- Adds the ability to sort chatbot by name + ### 2.5.20 - Deploys in production - Refactors the teammates table diff --git a/src/app/bots/bots-list/bots-list.component.html b/src/app/bots/bots-list/bots-list.component.html index cdb244087d50..142275a6bee9 100755 --- a/src/app/bots/bots-list/bots-list.component.html +++ b/src/app/bots/bots-list/bots-list.component.html @@ -76,6 +76,7 @@ Last updates Creation date + Name @@ -90,6 +91,11 @@ Creation date +
  • + + Name + +
    • diff --git a/src/app/bots/bots-list/bots-list.component.ts b/src/app/bots/bots-list/bots-list.component.ts index f8d879a96af6..baf619506570 100755 --- a/src/app/bots/bots-list/bots-list.component.ts +++ b/src/app/bots/bots-list/bots-list.component.ts @@ -134,6 +134,7 @@ export class BotListComponent extends PricingBaseComponent implements OnInit, On orderBylastUpdated: boolean = true; orderByCreationDate: boolean = false; + orderByChatbotName: boolean = false; pageName: string; // editBotName: boolean = false; @@ -536,12 +537,18 @@ export class BotListComponent extends PricingBaseComponent implements OnInit, On if (sortfor === 'lastUpdates') { this.orderBylastUpdated = true; this.orderByCreationDate = false; + this.orderByChatbotName = false; this.getFaqKbByProjectId() } else if (sortfor === 'creationDate') { this.orderBylastUpdated = false; this.orderByCreationDate = true; + this.orderByChatbotName = false; + this.getFaqKbByProjectId() + } else if (sortfor === 'botname') { + this.orderBylastUpdated = false; + this.orderByCreationDate = false; + this.orderByChatbotName = true; this.getFaqKbByProjectId() - } } @@ -587,6 +594,19 @@ export class BotListComponent extends PricingBaseComponent implements OnInit, On }); } + if (this.orderByChatbotName) { + this.logger.log('[BOTS-LIST] - orderByChatbotName Here yes'); + this.faqkbList.sort(function compare(a: Chatbot, b: Chatbot) { + if (a['name'].toLowerCase() < b['name'].toLowerCase()) { + return -1; + } + if (a['name'].toLowerCase() > b['name'].toLowerCase()) { + return 1; + } + return 0; + }); + } + this.faqkbList.forEach(bot => { this.logger.log('[BOTS-LIST] getFaqKbByProjectId bot ', bot) if (bot && bot.url) { From 968670d2111bb0bc4a719ac030bc2ea606a99c4f Mon Sep 17 00:00:00 2001 From: Giovanni Troisi Date: Wed, 20 Mar 2024 13:02:59 +0100 Subject: [PATCH 35/35] replaced error modals with swal deleted form control from sitemap urls updated translations --- .../knowledge-bases.component.scss | 7 +- .../knowledge-bases.component.ts | 203 ++++++++++++++++-- .../modal-site-map.component.ts | 3 +- src/assets/css/demo.scss | 9 + src/assets/i18n/ar.json | 1 + src/assets/i18n/az.json | 1 + src/assets/i18n/de.json | 1 + src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 1 + src/assets/i18n/fr.json | 1 + src/assets/i18n/it.json | 1 + src/assets/i18n/kk.json | 1 + src/assets/i18n/pt.json | 1 + src/assets/i18n/ru.json | 1 + src/assets/i18n/sr.json | 1 + src/assets/i18n/sv.json | 1 + src/assets/i18n/tr.json | 1 + src/assets/i18n/uk.json | 1 + src/assets/i18n/uz.json | 1 + 19 files changed, 222 insertions(+), 15 deletions(-) diff --git a/src/app/knowledge-bases/knowledge-bases.component.scss b/src/app/knowledge-bases/knowledge-bases.component.scss index bea8ccc5b6cd..7fbc028ecac3 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.scss +++ b/src/app/knowledge-bases/knowledge-bases.component.scss @@ -470,4 +470,9 @@ table { .btn { text-transform: none; -} \ No newline at end of file +} + +.title-class { + color: black; + font-weight: 500; +} \ No newline at end of file diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index d9407eac5f66..55181e0ea1ff 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, isDevMode } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from 'app/core/auth.service'; import { NotifyService } from 'app/core/notify.service'; import { KB, KbSettings } from 'app/models/kbsettings-model'; @@ -15,6 +15,8 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { FaqKbService } from 'app/services/faq-kb.service'; import { KB_DEFAULT_PARAMS } from 'app/utils/util'; +import { AppConfigService } from 'app/services/app-config.service'; +const swal = require('sweetalert'); //import { Router } from '@angular/router'; @@ -77,7 +79,8 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { msgErrorIndexingKb: string; // = 'Indicizzazione non riuscita'; msgSuccesIndexingKb: string; // = 'Indicizzazione terminata con successo'; msgErrorAddUpdateKb: string; // = 'Non è stato possibile aggiungere o modificare il kb'; - + msgErrorAddUpdateKbLimit: string // = "Non è possibile superare il numero di risorse previste nel piano corrente"; + warningTitle: string; allTemplatesCount: number; allCommunityTemplatesCount: number; @@ -88,6 +91,8 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { increaseSalesBotsCount: number; listSitesOfSitemap: any = []; + payIsVisible: boolean = false; + private unsubscribe$: Subject = new Subject(); constructor( private auth: AuthService, @@ -96,11 +101,13 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { private openaiService: OpenaiService, private kbService: KnowledgeBaseService, private projectService: ProjectService, + private router: Router, public route: ActivatedRoute, //private router: Router, private notify: NotifyService, private translate: TranslateService, private faqKbService: FaqKbService, + public appConfigService: AppConfigService, ) { } ngOnInit(): void { @@ -120,6 +127,7 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.getTemplates(); this.getCommunityTemplates() this.getFaqKbByProjectId(); + this.getOSCODE(); } @@ -272,6 +280,27 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { } + getOSCODE() { + + let public_Key = this.appConfigService.getConfig().t2y12PruGU9wUtEGzBJfolMIgK; + + let keys = public_Key.split("-"); + + keys.forEach(key => { + if (key.includes("PAY")) { + let pay = key.split(":"); + // this.logger.log('PUBLIC-KEY (Navbar) - pay key&value', pay); + if (pay[1] === "F") { + this.payIsVisible = false; + console.log("payIsVisible: ", this.payIsVisible) + } else { + this.payIsVisible = true; + console.log("payIsVisible: ", this.payIsVisible) + } + } + }) + } + // loadKbSettings(){ @@ -299,6 +328,18 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.msgSuccesIndexingKb = KbPage['msgSuccesIndexingKb']; this.msgErrorAddUpdateKb = KbPage['msgErrorAddUpdateKb']; }); + + this.translate.get('Warning') + .subscribe((text: string) => { + // this.deleteContact_msg = text; + // this.logger.log('+ + + BotsPage translation: ', text) + this.warningTitle = text; + }); + } + + getTranslatedStringKbLimitReached(max_num) { + this.translate.get('KbPage.msgErrorAddUpdateKbLimit', { max_number: max_num }) + .subscribe((text: string) => { this.msgErrorAddUpdateKbLimit = text; }); } @@ -503,12 +544,34 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { let error = this.msgErrorAddUpdateKb; this.kbService.addSitemap(body).subscribe((resp: any) => { this.logger.log("onSendSitemap:", resp); - // let error = resp.error; - // let url = resp.url; - this.listSitesOfSitemap = resp.sites; + console.log("onSendSitemap:", resp); + if (resp.errors && resp.errors[0]) { + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + } else { + this.listSitesOfSitemap = resp.sites; + } + }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR send sitemap: ", err); - this.onOpenErrorModal(error); + + //this.onOpenErrorModal(error); + + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + }, () => { this.logger.log("[KNOWLEDGE-BASES-COMP] send sitemap *COMPLETED*"); }) @@ -556,7 +619,37 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { //that.onCloseBaseModal(); }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR add new kb: ", err); - this.onOpenErrorModal(error); + // this.onOpenErrorModal(error); + if (err.error && err.error.plan_limit) { + this.getTranslatedStringKbLimitReached(err.error.plan_limit); + error = this.msgErrorAddUpdateKbLimit + } + + if (this.payIsVisible === true) { + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: ["Cancel", "Upgrade Plan"], + dangerMode: false + }).then((willUpgradePlan: any) => { + + if (willUpgradePlan) { + this.router.navigate(['project/' + this.id_project + '/pricing']); + } + }) + } else { + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + } + }, () => { this.logger.log("[KNOWLEDGE-BASES-COMP] add new kb *COMPLETED*"); //this.trackUserActioOnKB('Added Knowledge Base', gptkey) @@ -589,7 +682,40 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.refreshKbsList = !this.refreshKbsList; }, (err) => { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR add new kb: ", err); - this.onOpenErrorModal(error); + + //this.onOpenErrorModal(error); + if (err.error && err.error.plan_limit) { + this.getTranslatedStringKbLimitReached(err.error.plan_limit); + error = this.msgErrorAddUpdateKbLimit + } + + if (this.payIsVisible === true) { + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: ["Cancel", "Upgrade Plan"], + dangerMode: false + }).then((willUpgradePlan: any) => { + + if (willUpgradePlan) { + this.router.navigate(['project/' + this.id_project + '/pricing']); + } + }) + } else { + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + } + + + }, () => { this.logger.log("[KNOWLEDGE-BASES-COMP] add new kb *COMPLETED*"); //this.trackUserActioOnKB('Added Knowledge Base', gptkey) @@ -613,7 +739,18 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { kb.deleting = false; if(!response || (response.success && response.success === false)){ // this.updateStatusOfKb(kb._id, 0); - this.onOpenErrorModal(error); + + // this.onOpenErrorModal(error); + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + + } else { this.notify.showWidgetStyleUpdateNotification(this.msgSuccesDeleteKb, 2, 'done'); // let error = response.error?response.error:"Errore generico"; @@ -633,7 +770,17 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.logger.error("[KNOWLEDGE-BASES-COMP] ERROR delete kb: ", err); kb.deleting = false; //this.kbid_selected.deleting = false; - this.onOpenErrorModal(error); + + // this.onOpenErrorModal(error); + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + }, () => { this.logger.log("[KNOWLEDGE-BASES-COMP] delete kb *COMPLETE*"); //this.trackUserActioOnKB('Deleted Knowledge Base', gptkey) @@ -666,7 +813,17 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { this.kbService.deleteKb(dataDelete).subscribe((response:any) => { kb.deleting = false; if(!response || (response.success && response.success === false)){ - this.onOpenErrorModal(error); + + // this.onOpenErrorModal(error); + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + } else { this.kbService.addKb(dataAdd).subscribe((resp: any) => { let kbNew = resp.value; @@ -694,7 +851,17 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { // }, 2000); }, (err) => { this.logger.error("[KNOWLEDGE BASES COMP] ERROR add new kb: ", err); - this.onOpenErrorModal(error); + + //this.onOpenErrorModal(error); + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + }, () => { this.logger.log("[KNOWLEDGE BASES COMP] add new kb *COMPLETED*"); }) @@ -702,7 +869,17 @@ export class KnowledgeBasesComponent implements OnInit, OnDestroy { }, (err) => { this.logger.error("[KNOWLEDGE BASES COMP] ERROR delete kb: ", err); kb.deleting = false; - this.onOpenErrorModal(error); + + // this.onOpenErrorModal(error); + swal({ + title: this.warningTitle, + text: error, + icon: "warning", + className: "custom-swal", + buttons: [null, "Cancel"], + dangerMode: false + }) + }, () => { this.logger.log("[KNOWLEDGE BASES COMP] delete kb *COMPLETE*"); kb.deleting = false; diff --git a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts index 759ab8d4d38c..6949f502e96c 100644 --- a/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts +++ b/src/app/knowledge-bases/modals/modal-site-map/modal-site-map.component.ts @@ -57,7 +57,8 @@ export class ModalSiteMapComponent implements OnInit { createConditionGroup(): FormGroup { const namePattern = /^[^&<>]{3,}$/; return this.formBuilder.group({ - url: ['', [Validators.required, Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?')]], + //url: ['', [Validators.required, Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?')]], + url: ['', [Validators.required]], // name: ['', [Validators.required, Validators.pattern(namePattern)]] }) } diff --git a/src/assets/css/demo.scss b/src/assets/css/demo.scss index ff88799e620f..b39010637217 100755 --- a/src/assets/css/demo.scss +++ b/src/assets/css/demo.scss @@ -999,6 +999,15 @@ my-app .main-panel .main-content .card { font-size: 18px; } +.custom-swal>.swal-title { + color: black; + font-weight: 500; +} + +.custom-swal>.swal-text { + text-align: center; +} + .swal-size-sm { width: 260px !important; background-color: var(--card-background-color); diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json index cf4dfee244f4..f6df64a67375 100644 --- a/src/assets/i18n/ar.json +++ b/src/assets/i18n/ar.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "فشلت الفهرسة", "msgSuccesIndexingKb": "تم إطلاق إعادة التدريب على المحتوى بنجاح", "msgErrorAddUpdateKb": "لا يمكن إضافة قاعدة المعارف أو تحريرها", + "msgErrorAddUpdateKbLimit": "لا يمكن تجاوز عدد الموارد المسموح بها في خطتك", "noContent": "لا يوجد محتوى", "titleUrls": "الاستيراد من عناوين URL", "helpUrls": "قم بإدراج صفحات الويب من عناوين URL العامة في منطقة النص أدناه، مفصولة بإرجاع", diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json index 646a7d043548..343ebdd3230d 100644 --- a/src/assets/i18n/az.json +++ b/src/assets/i18n/az.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "İndeksləmə uğursuz oldu", "msgSuccesIndexingKb": "Uğurla işə salınan məzmunu yenidən hazırlayın", "msgErrorAddUpdateKb": "Bilik Bazasını əlavə etmək və ya redaktə etmək mümkün olmadı", + "msgErrorAddUpdateKbLimit": "Planınızda icazə verilən resursların sayını aşmaq mümkün deyil", "noContent": "məzmun yoxdur", "titleUrls": "URL-lərdən idxal", "helpUrls": "İctimai URL-lərdən veb səhifələri geri dönüşlə ayrılaraq aşağıdakı mətn sahəsinə daxil edin.", diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index eac72d9803da..01617de6cbcf 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Die Indizierung ist fehlgeschlagen", "msgSuccesIndexingKb": "Neuschulung für erfolgreich eingeführte Inhalte", "msgErrorAddUpdateKb": "Die Wissensdatenbank konnte nicht hinzugefügt oder bearbeitet werden", + "msgErrorAddUpdateKbLimit": "Es ist nicht möglich, die in Ihrem Plan zulässige Anzahl an Ressourcen zu überschreiten", "noContent": "kein Inhalt", "titleUrls": "Von URLs importieren", "helpUrls": "Fügen Sie Webseiten von öffentlichen URLs in den Textbereich unten ein, getrennt durch einen Zeilenumbruch.", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b0138e70dbe1..75c8641774c5 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Indexing failed", "msgSuccesIndexingKb": "Re-train on content launched successfully", "msgErrorAddUpdateKb": "The Knowledge Base could not be added or edited", + "msgErrorAddUpdateKbLimit": "It is not possible to exceed the number of {{ max_number}} resources allowed in your plan", "noContent": "no content", "titleUrls": "Import from URLs", "helpUrls": "Insert web pages from public URLs into the text area below, separated by a return.", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 26411311b5eb..1c110cf7a4e4 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Falló la indexación", "msgSuccesIndexingKb": "Vuelva a capacitarse sobre el contenido lanzado exitosamente", "msgErrorAddUpdateKb": "La base de conocimientos no se pudo agregar ni editar.", + "msgErrorAddUpdateKbLimit": "No es posible exceder la cantidad de {{ max_number}} recursos permitidos en su plan", "noContent": "sin contenido", "titleUrls": "Importar desde URL", "helpUrls": "Inserte páginas web desde URL públicas en el área de texto a continuación, separadas por un retorno.", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index b3eb0c51a8c9..29f75513bec6 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Échec de l'indexation", "msgSuccesIndexingKb": "Recycler sur le contenu lancé avec succès", "msgErrorAddUpdateKb": "La base de connaissances n'a pas pu être ajoutée ou modifiée", + "msgErrorAddUpdateKbLimit": "Il n'est pas possible de dépasser le nombre de ressources autorisées dans votre forfait", "noContent": "Pas de contenu", "titleUrls": "Importer à partir d'URL", "helpUrls": "Insérez des pages Web à partir d'URL publiques dans la zone de texte ci-dessous, séparées par un retour.", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index 999508eafc30..4f6b1b9a58f0 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Indicizzazione non riuscita", "msgSuccesIndexingKb": "Riqualificazione sui contenuti avviata correttamente", "msgErrorAddUpdateKb": "Impossibile aggiungere o modificare la Knowledge Base", + "msgErrorAddUpdateKbLimit": "Non è possibile superare il numero di {{ max_number}} risorse previste dal tuo piano attuale", "noContent": "nessun contenuto", "titleUrls": "Importa da URL", "helpUrls": "Inserisci le pagine web dagli URL pubblici nell'area di testo sottostante, separate da un ritorno a capo.", diff --git a/src/assets/i18n/kk.json b/src/assets/i18n/kk.json index 87132b7f3f07..b85f59bf315d 100644 --- a/src/assets/i18n/kk.json +++ b/src/assets/i18n/kk.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Индекстеу сәтсіз аяқталды", "msgSuccesIndexingKb": "Сәтті іске қосылған мазмұнды қайта оқытыңыз", "msgErrorAddUpdateKb": "Білім қорын қосу немесе өңдеу мүмкін болмады", + "msgErrorAddUpdateKbLimit": "Жоспарыңызда рұқсат етілген ресурстардың санынан асып кету мүмкін емес", "noContent": "мазмұны жоқ", "titleUrls": "URL мекенжайларынан импорттау", "helpUrls": "Жалпы URL мекенжайларынан веб-беттерді қайтару арқылы бөлінген төмендегі мәтін аймағына кірістіріңіз.", diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json index 84e786ecd322..1951bb83d0bc 100644 --- a/src/assets/i18n/pt.json +++ b/src/assets/i18n/pt.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Falha na indexação", "msgSuccesIndexingKb": "Treine novamente no conteúdo lançado com sucesso", "msgErrorAddUpdateKb": "A base de conhecimento não pôde ser adicionada ou editada", + "msgErrorAddUpdateKbLimit": "Não é possível ultrapassar o número de recursos permitidos no seu plano", "noContent": "sem conteúdo", "titleUrls": "Importar de URLs", "helpUrls": "Insira páginas da web de URLs públicos na área de texto abaixo, separadas por um retorno.", diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json index 50e6da216200..4f5da4e5cd1f 100644 --- a/src/assets/i18n/ru.json +++ b/src/assets/i18n/ru.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Индексирование не удалось", "msgSuccesIndexingKb": "Повторное обучение успешно запущенному контенту", "msgErrorAddUpdateKb": "Базу знаний не удалось добавить или отредактировать.", + "msgErrorAddUpdateKbLimit": "Невозможно превысить количество ресурсов, разрешенное в вашем плане.", "noContent": "без содержания", "titleUrls": "Импорт из URL-адресов", "helpUrls": "Вставьте веб-страницы с общедоступных URL-адресов в текстовую область ниже, разделив их возвратом.", diff --git a/src/assets/i18n/sr.json b/src/assets/i18n/sr.json index a0b4386dc7ed..be3078a40929 100644 --- a/src/assets/i18n/sr.json +++ b/src/assets/i18n/sr.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Индексирање није успело", "msgSuccesIndexingKb": "Поново обука за садржај који је успешно покренут", "msgErrorAddUpdateKb": "База знања није могла да се дода или уреди", + "msgErrorAddUpdateKbLimit": "Није могуће прекорачити број ресурса дозвољених у вашем плану", "noContent": "без садржаја", "titleUrls": "Увоз са УРЛ адреса", "helpUrls": "Уметните веб странице са јавних УРЛ-ова у текстуално подручје испод, раздвојене повратком.", diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json index 70e1d4ca2fd7..fcab42e49282 100644 --- a/src/assets/i18n/sv.json +++ b/src/assets/i18n/sv.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Indexering misslyckades", "msgSuccesIndexingKb": "Utbilda om innehåll som har lanserats framgångsrikt", "msgErrorAddUpdateKb": "Kunskapsbasen kunde inte läggas till eller redigeras", + "msgErrorAddUpdateKbLimit": "Det är inte möjligt att överskrida antalet tillåtna resurser i din plan", "noContent": "inget innehåll", "titleUrls": "Importera från webbadresser", "helpUrls": "Infoga webbsidor från offentliga webbadresser i textområdet nedan, åtskilda av en retur.", diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json index d7e802434897..1aaaeffe4866 100644 --- a/src/assets/i18n/tr.json +++ b/src/assets/i18n/tr.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Dizine ekleme başarısız oldu", "msgSuccesIndexingKb": "Başarıyla başlatılan içerikle ilgili yeniden eğitim", "msgErrorAddUpdateKb": "Bilgi Bankası eklenemedi veya düzenlenemedi", + "msgErrorAddUpdateKbLimit": "Planınızda izin verilen kaynak sayısını aşmanız mümkün değildir", "noContent": "içerik yok", "titleUrls": "URL'lerden içe aktar", "helpUrls": "Genel URL'lerdeki web sayfalarını aşağıdaki metin alanına bir dönüş işaretiyle ayırarak ekleyin.", diff --git a/src/assets/i18n/uk.json b/src/assets/i18n/uk.json index 19ab076d5cf9..cdac77d50526 100644 --- a/src/assets/i18n/uk.json +++ b/src/assets/i18n/uk.json @@ -1641,6 +1641,7 @@ "msgErrorIndexingKb": "Помилка індексації", "msgSuccesIndexingKb": "Повторне навчання вмісту успішно запущено", "msgErrorAddUpdateKb": "Не вдалося додати або відредагувати базу знань", + "msgErrorAddUpdateKbLimit": "Неможливо перевищити кількість ресурсів, дозволену у вашому плані", "noContent": "немає вмісту", "titleUrls": "Імпортувати з URL-адрес", "helpUrls": "Вставте веб-сторінки з загальнодоступних URL-адрес у текстову область нижче, розділивши їх символом повернення.", diff --git a/src/assets/i18n/uz.json b/src/assets/i18n/uz.json index 3f7ba260632f..bd6ba6e7c1f7 100644 --- a/src/assets/i18n/uz.json +++ b/src/assets/i18n/uz.json @@ -1640,6 +1640,7 @@ "msgErrorIndexingKb": "Indekslash amalga oshmadi", "msgSuccesIndexingKb": "Muvaffaqiyatli ishga tushirilgan kontentni qayta o'qitish", "msgErrorAddUpdateKb": "Bilimlar bazasini qo‘shib bo‘lmadi yoki tahrirlab bo‘lmadi", + "msgErrorAddUpdateKbLimit": "Rejangizda ruxsat etilgan resurslar sonidan oshib ketish mumkin emas", "noContent": "tarkib yo'q", "titleUrls": "URL manzillaridan import qilish", "helpUrls": "Veb-sahifalarni umumiy URL manzillaridan qaytish bilan ajratilgan holda quyidagi matn maydoniga kiriting.",