diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5e59693cb5ef..f762b40eeb18 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -66,7 +66,7 @@ import { UrlService } from './services/shared/url.service'; // BOTS & FAQ import { FaqKbService } from './services/faq-kb.service'; -import { BotListComponent } from './bots/bots-list/bots-list.component'; +// import { BotListComponent } from './bots/bots-list/bots-list.component'; // // now lazy import { BotTypeSelectComponent } from './bots/bot-create/bot-type-select/bot-type-select.component'; import { BotCreateComponent } from './bots/bot-create/bot-create.component'; import { FaqEditAddComponent } from './bots/faq-edit-add/faq-edit-add.component'; @@ -257,7 +257,7 @@ import { TilebotSelectTypeComponent } from './bots/tilebot-select-type/tilebot-s import { TilebotSidebarComponent } from './bots/tilebot-sidebar/tilebot-sidebar.component'; import { TilebotComponent } from './bots/tilebot/tilebot.component'; import { RasaBotComponent } from './bots/rasa-bot/rasa-bot.component'; -import { TemplatesComponent } from './bots/templates/templates.component'; +// import { TemplatesComponent } from './bots/templates/templates.component'; // now lazy // import { EmailTicketingComponent } from './email-ticketing/email-ticketing.component'; // now lazy @@ -319,7 +319,7 @@ import { SidebarClaimsComponent } from './create-project-wizard/onboarding/sideb import { NetworkOfflineComponent } from './network-offline/network-offline.component'; import { HomePromoBannerComponent } from './home-promo-banner/home-promo-banner.component'; import { TemplateDetailComponent } from './bots/templates/template-detail/template-detail.component'; -import { BotsSidebarComponent } from './bots/bots-list/bots-sidebar/bots-sidebar.component'; +// import { BotsSidebarComponent } from './bots/bots-list/bots-sidebar/bots-sidebar.component'; // now lazy import { GetStartChatbotForkComponent } from './create-project-wizard/get-start-chatbot-fork/get-start-chatbot-fork.component'; import { InstallTemplateComponent } from './create-project-wizard/install-template/install-template.component'; // import { ChatbotDesignStudioModule } from './chatbot-design-studio/chatbot-design-studio.module'; // now lazy @@ -350,7 +350,6 @@ import { CreateProjectGsComponent } from './create-project-wizard/create-project import { OpenaiService } from './services/openai.service'; -// import { KnowledgeBasesComponent } from './knowledge-bases/knowledge-bases.component'; import { HomeKbModalComponent } from './home-components/home-kb/home-kb-modal/home-kb-modal.component'; import { HomeCreateChatbotModalComponent } from './home-components/home-create-chatbot/home-create-chatbot-modal/home-create-chatbot-modal.component'; import { HomeInviteTeammateModalComponent } from './home-components/home-create-teammate/home-invite-teammate-modal/home-invite-teammate-modal.component'; @@ -358,7 +357,7 @@ import { HomeInviteTeammateErrorModalComponent } from './home-components/home-cr import { HomeGoToChatComponent } from './home-components/home-go-to-chat/home-go-to-chat.component'; import { ChatbotModalComponent } from './bots/bots-list/chatbot-modal/chatbot-modal.component'; import { ChatbotAlertComponent } from './bots/bots-list/chatbot-alert/chatbot-alert.component'; -import { KnowledgeBasesComponent } from './knowledge-bases/knowledge-bases.component'; +// import { KnowledgeBasesComponent } from './knowledge-bases/knowledge-bases.component'; // now lazy import { CnpTemplatesComponent } from './create-new-project/cnp-templates/cnp-templates.component'; import { OnboardingWelcomeComponent } from './create-new-project/onboarding-welcome/onboarding-welcome.component'; import { HomeNewsFeedModalComponent } from './home-components/home-news-feed/home-news-feed-modal/home-news-feed-modal.component'; @@ -382,18 +381,18 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatTableModule } from '@angular/material/table'; import { MatPaginatorModule } from '@angular/material/paginator'; import { MatSortModule } from '@angular/material/sort'; -import { ModalPageUrlComponent } from './knowledge-bases/modals/modal-page-url/modal-page-url.component'; -import { ModalSiteMapComponent } from './knowledge-bases/modals/modal-site-map/modal-site-map.component'; -import { ModalTextFileComponent } from './knowledge-bases/modals/modal-text-file/modal-text-file.component'; -import { ModalGptKeyComponent } from './knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component'; -import { ModalDeleteKnowledgeBaseComponent } from './knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component'; -import { ModalPreviewKnowledgeBaseComponent } from './knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component'; -import { ModalDetailKnowledgeBaseComponent } from './knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component'; -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 { ModalPageUrlComponent } from './knowledge-bases/modals/modal-page-url/modal-page-url.component'; // now lazy +// import { ModalSiteMapComponent } from './knowledge-bases/modals/modal-site-map/modal-site-map.component'; // now lazy +// import { ModalTextFileComponent } from './knowledge-bases/modals/modal-text-file/modal-text-file.component'; // now lazy +// import { ModalGptKeyComponent } from './knowledge-bases/modals/modal-gpt-key/modal-gpt-key.component'; // now lazy +// import { ModalDeleteKnowledgeBaseComponent } from './knowledge-bases/modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component'; // now lazy +// import { ModalPreviewKnowledgeBaseComponent } from './knowledge-bases/modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component'; // now lazy +// import { ModalDetailKnowledgeBaseComponent } from './knowledge-bases/modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component'; // now lazy +// import { KnowledgeBaseTableComponent } from './knowledge-bases/modals/knowledge-base-table/knowledge-base-table.component'; // now lazy +// import { ModalErrorComponent } from './knowledge-bases/modals/modal-error/modal-error.component'; // now lazy // import { KnowledgeBasesPreviousComponent } from './knowledge-bases-previous/knowledge-bases-previous.component'; // now lazy -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'; +// import { ModalUrlsKnowledgeBaseComponent } from './knowledge-bases/modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component'; // now lazy +// import { AddContentMenuComponent } from './knowledge-bases/menu/add-content-menu/add-content-menu.component'; // now lazy import { UserModalComponent } from './users/user-modal/user-modal.component'; import { MessagesStatsModalComponent } from './components/modals/messages-stats-modal/messages-stats-modal.component'; import { WsChatbotService } from './services/websocket/ws-chatbot.service'; @@ -490,7 +489,7 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic FaqComponent, // ProjectsComponent, // now lazy // UsersComponent, // now lazy - BotListComponent, + // BotListComponent, // now lazy BotCreateComponent, FaqEditAddComponent, // DepartmentEditAddComponent, // now lazy @@ -629,9 +628,9 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic SidebarClaimsComponent, NetworkOfflineComponent, HomePromoBannerComponent, - TemplatesComponent, + // TemplatesComponent, // now lazy TemplateDetailComponent, - BotsSidebarComponent, + // BotsSidebarComponent, // now lazy GetStartChatbotForkComponent, InstallTemplateComponent, CreateChatbotComponent, @@ -656,7 +655,7 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic ContactCustomPropertiesComponent, // ContactInfoComponent, ContactInfoComponent CreateProjectGsComponent, // now lazy - KnowledgeBasesComponent, + // KnowledgeBasesComponent, // now lazy // HomeConvsGraphComponent, // now lazy // HomeWhatsappAccountComponent, // now lazy // HomeCreateChatbotComponent, // now lazy @@ -692,18 +691,18 @@ const appInitializerFn = (appConfig: AppConfigService, brandService: BrandServic // BrevoIntegrationComponent, // now lazy // GsheetsIntegrationComponent, // now lazy // IntegrationHeaderComponent, // now lazy - ModalPageUrlComponent, - ModalSiteMapComponent, - ModalTextFileComponent, - ModalGptKeyComponent, - ModalDeleteKnowledgeBaseComponent, - ModalPreviewKnowledgeBaseComponent, - ModalDetailKnowledgeBaseComponent, - KnowledgeBaseTableComponent, - ModalErrorComponent, + // ModalPageUrlComponent, // now lazy + // ModalSiteMapComponent, // now lazy + // ModalTextFileComponent, // now lazy + // ModalGptKeyComponent, // now lazy + // ModalDeleteKnowledgeBaseComponent, // now lazy + // ModalPreviewKnowledgeBaseComponent, // now lazy + // ModalDetailKnowledgeBaseComponent, // now lazy + // KnowledgeBaseTableComponent, // now lazy + // ModalErrorComponent, // now lazy // KnowledgeBasesPreviousComponent, // now lazy - ModalUrlsKnowledgeBaseComponent, - AddContentMenuComponent, + // ModalUrlsKnowledgeBaseComponent, // now lazy + // AddContentMenuComponent, // now lazy UserModalComponent, MessagesStatsModalComponent, KnowledgeBasesAlertComponent diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 120eeb0a940a..87acb380e03a 100755 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -35,14 +35,14 @@ import { EventsComponent } from './events/events.component'; // import { UsersComponent } from './users/users.component'; // now lazy // BOTS & FAQ -import { BotListComponent } from './bots/bots-list/bots-list.component'; +// import { BotListComponent } from './bots/bots-list/bots-list.component'; // now lazy import { BotTypeSelectComponent } from './bots/bot-create/bot-type-select/bot-type-select.component'; import { BotCreateComponent } from './bots/bot-create/bot-create.component'; import { FaqComponent } from './bots/faq/faq.component'; import { FaqEditAddComponent } from './bots/faq-edit-add/faq-edit-add.component'; import { FaqTestComponent } from './bots/faq-test/faq-test.component'; -import { TemplatesComponent } from './bots/templates/templates.component'; +// import { TemplatesComponent } from './bots/templates/templates.component'; // now lazy // import { ProjectEditAddComponent } from './project-edit-add/project-edit-add.component'; // now lazy // import { RequestsListHistoryComponent } from './requests-list-history/requests-list-history.component'; @@ -146,7 +146,7 @@ import { CommunityTemplateDtlsComponent } from './bots/templates/community-templ // import { EmailTicketingStaticComponent } from './static-pages/email-ticketing-static/email-ticketing-static.component'; // now lazy import { ActivateAppsumoProductComponent } from './create-project-wizard/activate-appsumo-product/activate-appsumo-product.component'; import { CreateProjectGsComponent } from './create-project-wizard/create-project-gs/create-project-gs.component'; -import { KnowledgeBasesComponent } from './knowledge-bases/knowledge-bases.component'; +// import { KnowledgeBasesComponent } from './knowledge-bases/knowledge-bases.component'; // now lazy import { CnpIsMobileComponent } from './create-new-project/cnp-is-mobile/cnp-is-mobile.component'; import { CnpTemplatesComponent } from './create-new-project/cnp-templates/cnp-templates.component'; import { OnboardingWelcomeComponent } from './create-new-project/onboarding-welcome/onboarding-welcome.component'; @@ -584,6 +584,12 @@ const routes: Routes = [ }, // { path: 'project/:projectid/widget/translations', component: WidgetMultilanguageComponent, canActivate: [AuthGuard] }, + // Widget Multilanguage called from widget setup + { + path: 'project/:projectid/widget/translations/:calledby', + loadChildren: () => import('app/widget_components/widget-multilanguage/widget-multilanguage.module').then(m => m.WidgetMultilanguageModule), + canActivate: [AuthGuard], + }, // Widget installation { @@ -877,11 +883,78 @@ const routes: Routes = [ }, // { path: 'project/:projectid/knowledge-bases-pre/:calledby', component: KnowledgeBasesPreviousComponent, canActivate: [AuthGuard] }, // now lazy + // KNOWLEDGE BASES (new) + { + path: 'project/:projectid/knowledge-bases', + loadChildren: () => import('app/knowledge-bases/knowledge-bases.module').then(m => m.KnowledgeBasesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/knowledge-bases', component: KnowledgeBasesComponent, canActivate: [AuthGuard] }, // now lazy + { + path: 'project/:projectid/knowledge-bases/:calledby', + loadChildren: () => import('app/knowledge-bases/knowledge-bases.module').then(m => m.KnowledgeBasesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/knowledge-bases/:calledby', component: KnowledgeBasesComponent, canActivate: [AuthGuard] }, // now lazy // when called from home + // Chatbots + { + path: 'project/:projectid/bots', + loadChildren: () => import('app/bots/bots-list/bots-list.module').then(m => m.BotsListModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots', component: BotListComponent, canActivate: [AuthGuard] }, // now lazy + { + path: 'project/:projectid/bots/my-chatbots/all', + loadChildren: () => import('app/bots/bots-list/bots-list.module').then(m => m.BotsListModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/my-chatbots/all', component: BotListComponent, canActivate: [AuthGuard] }, // now lazy + { + path: 'project/:projectid/bots/my-chatbots/customer-satisfaction', + loadChildren: () => import('app/bots/bots-list/bots-list.module').then(m => m.BotsListModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/my-chatbots/customer-satisfaction', component: BotListComponent, canActivate: [AuthGuard] }, // now lazy + + { + path: 'project/:projectid/bots/my-chatbots/increase-sales', + loadChildren: () => import('app/bots/bots-list/bots-list.module').then(m => m.BotsListModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/my-chatbots/increase-sales', component: BotListComponent, canActivate: [AuthGuard] }, // now lazy + // Templates + { + path: 'project/:projectid/bots/templates/all', + loadChildren: () => import('app/bots/templates/templates.module').then(m => m.TemplatesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/templates/all', component: TemplatesComponent, canActivate: [AuthGuard] }, // now lazy + + { + path: 'project/:projectid/bots/templates/customer-satisfaction', + loadChildren: () => import('app/bots/templates/templates.module').then(m => m.TemplatesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/templates/customer-satisfaction', component: TemplatesComponent, canActivate: [AuthGuard] }, // now lazy + + { + path: 'project/:projectid/bots/templates/increase-sales', + loadChildren: () => import('app/bots/templates/templates.module').then(m => m.TemplatesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/templates/increase-sales', component: TemplatesComponent, canActivate: [AuthGuard] }, // now lazy + + { + path: 'project/:projectid/bots/templates/community', + loadChildren: () => import('app/bots/templates/templates.module').then(m => m.TemplatesModule), + canActivate: [AuthGuard], + }, + // { path: 'project/:projectid/bots/templates/community', component: TemplatesComponent, canActivate: [AuthGuard] }, // now lazy @@ -986,20 +1059,14 @@ const routes: Routes = [ // FAQKB (i.e. BOT) /* path /faqkb commented and duplicated RENAMED IN /bots */ // { path: 'project/:projectid/faqkb', component: FaqKbComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots', component: BotListComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/my-chatbots/all', component: BotListComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/my-chatbots/customer-satisfaction', component: BotListComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/my-chatbots/increase-sales', component: BotListComponent, canActivate: [AuthGuard] }, + { path: 'project/:projectid/bots/bot-select-type', component: BotTypeSelectComponent, canActivate: [AuthGuard] }, // { path: 'project/:projectid/bots/createfaqkb', component: BotCreateComponent, canActivate: [AuthGuard] }, // replaced by the bottom path { path: 'project/:projectid/bots/create/:type', component: BotCreateComponent, canActivate: [AuthGuard] }, { path: 'project/:projectid/chatbot/create', component: CreateChatbotComponent, canActivate: [AuthGuard] }, //Multilanguage bot from scratch - { path: 'project/:projectid/bots/templates/all', component: TemplatesComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/templates/customer-satisfaction', component: TemplatesComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/templates/increase-sales', component: TemplatesComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/bots/templates/community', component: TemplatesComponent, canActivate: [AuthGuard] }, + // rasa bot @@ -1101,9 +1168,7 @@ const routes: Routes = [ - // KNOWLEDGE BASES - { path: 'project/:projectid/knowledge-bases', component: KnowledgeBasesComponent, canActivate: [AuthGuard] }, - { path: 'project/:projectid/knowledge-bases/:calledby', component: KnowledgeBasesComponent, canActivate: [AuthGuard] }, // when called from home + diff --git a/src/app/automations/automations.component.html b/src/app/automations/automations.component.html index 3e3e6cccbf4d..576303f1cf62 100644 --- a/src/app/automations/automations.component.html +++ b/src/app/automations/automations.component.html @@ -9,6 +9,12 @@
+ +
+ {{ 'AutomationsLog' | translate }} +
+
diff --git a/src/app/bots/bots-list/bots-list.module.ts b/src/app/bots/bots-list/bots-list.module.ts new file mode 100644 index 000000000000..cad30acd9493 --- /dev/null +++ b/src/app/bots/bots-list/bots-list.module.ts @@ -0,0 +1,37 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { BotListComponent } from './bots-list.component'; +import { RouterModule, Routes } from '@angular/router'; +import { BotsSidebarModule } from './bots-sidebar/bots-sidebar.module'; +import { SharedModule } from 'app/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MomentModule } from 'ngx-moment'; +import { MatButtonModule } from '@angular/material/button'; +import { FormsModule } from '@angular/forms'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTooltipModule } from '@angular/material/tooltip'; + +const routes: Routes = [ + { path: "", component: BotListComponent}, +]; + +@NgModule({ + declarations: [ + BotListComponent + ], + imports: [ + RouterModule.forChild(routes), + CommonModule, + BotsSidebarModule, + SharedModule, + TranslateModule, + MatIconModule, + MomentModule, + MatButtonModule, + MatMenuModule, + FormsModule, + MatTooltipModule + ] +}) +export class BotsListModule { } diff --git a/src/app/bots/bots-list/bots-sidebar/bots-sidebar.module.ts b/src/app/bots/bots-list/bots-sidebar/bots-sidebar.module.ts new file mode 100644 index 000000000000..6984f694ebb2 --- /dev/null +++ b/src/app/bots/bots-list/bots-sidebar/bots-sidebar.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { BotsSidebarComponent } from './bots-sidebar.component'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatTooltipModule } from '@angular/material/tooltip'; + + + +@NgModule({ + declarations: [ + BotsSidebarComponent + ], + imports: [ + CommonModule, + FormsModule, + TranslateModule, + MatTooltipModule, + ], exports: [ + BotsSidebarComponent, + ] +}) +export class BotsSidebarModule { } diff --git a/src/app/bots/templates/templates.module.ts b/src/app/bots/templates/templates.module.ts new file mode 100644 index 000000000000..1d65fbd21752 --- /dev/null +++ b/src/app/bots/templates/templates.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TemplatesComponent } from './templates.component'; +import { SharedModule } from 'app/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; +import { BotsSidebarModule } from '../bots-list/bots-sidebar/bots-sidebar.module'; +import { FormsModule } from '@angular/forms'; +import { RouterModule, Routes } from '@angular/router'; +import { MomentModule } from 'ngx-moment'; +import { MatTooltipModule } from '@angular/material/tooltip'; + +const routes: Routes = [ + { path: "", component: TemplatesComponent}, +]; + +@NgModule({ + declarations: [ + TemplatesComponent + ], + imports: [ + RouterModule.forChild(routes), + CommonModule, + SharedModule, + TranslateModule, + BotsSidebarModule, + FormsModule, + MomentModule, + MatTooltipModule + ] +}) +export class TemplatesModule { } diff --git a/src/app/canned-responses/canned-responses-list.component.html b/src/app/canned-responses/canned-responses-list.component.html index efcddd4275e6..cb8acd3def1b 100755 --- a/src/app/canned-responses/canned-responses-list.component.html +++ b/src/app/canned-responses/canned-responses-list.component.html @@ -11,6 +11,13 @@ -->
+ +
+ {{'CannedResponses.CannedResponses' | translate}} +
+ +
diff --git a/src/app/components/settings-sidebar/settings-sidebar.component.html b/src/app/components/settings-sidebar/settings-sidebar.component.html index 045bbec454b9..0aa87af930ce 100755 --- a/src/app/components/settings-sidebar/settings-sidebar.component.html +++ b/src/app/components/settings-sidebar/settings-sidebar.component.html @@ -42,12 +42,12 @@
  • - + code

    {{'Installation' | translate}} @@ -56,11 +56,31 @@

    • + + + + +
  • + + language +

    + {{'Translations' | translate}} +

    +     +
    • + + -
  • - + -

  • - {{'userEmail' | translate}} + {{'EmailTicketing' | translate}}

    • @@ -215,7 +235,7 @@ hdr_auto

    - {{ 'Automations Log' | translate }} + {{ 'AutomationsLog' | translate }}

    diff --git a/src/app/components/settings-sidebar/settings-sidebar.component.ts b/src/app/components/settings-sidebar/settings-sidebar.component.ts index 61d27c7072f6..749fe207a454 100755 --- a/src/app/components/settings-sidebar/settings-sidebar.component.ts +++ b/src/app/components/settings-sidebar/settings-sidebar.component.ts @@ -41,9 +41,13 @@ export class SettingsSidebarComponent implements OnInit { EMAIL_TICKETING_ROUTE_IS_ACTIVE: boolean; CANNED_RESPONSES_ROUTE_IS_ACTIVE: boolean; DEPTS_ROUTE_IS_ACTIVE: boolean; + EDIT_DEPT_ROUTE_IS_ACTIVE: boolean; + ADD_DEPT_ROUTE_IS_ACTIVE: boolean; TRIGGER_ROUTE_IS_ACTIVE: boolean; TEAMMATES_ROUTE_IS_ACTIVE: boolean; GROUPS_ROUTE_IS_ACTIVE: boolean; + EDIT_GROUP_ROUTE_IS_ACTIVE: boolean; + ADD_GROUP_ROUTE_IS_ACTIVE: boolean; WIDGET_SETUP_ROUTE_IS_ACTIVE: boolean; WIDGET_INSTALLATION_ROUTE_IS_ACTIVE: boolean; CHATBOT_ROUTE_IS_ACTIVE: boolean; @@ -52,6 +56,7 @@ export class SettingsSidebarComponent implements OnInit { KNOWLEDGE_BASES_ROUTE_IS_ACTIVE: boolean; AUTOMATIONS_ROUTE_IS_ACTIVE: boolean; INTEGRATIONS_ROUTE_IS_ACTIVE: boolean; + TRANSLATIONS_ROUTE_IS_ACTIVE: boolean; public_Key: string; USER_ROLE: any; CHAT_BASE_URL: string; @@ -60,9 +65,13 @@ export class SettingsSidebarComponent implements OnInit { sidebar_settings_height: any; IS_OPEN: boolean = true; routing_and_depts_lbl: string; + // widgetAPITestPage: string; + translations: string; teammatates_and_groups_lbl: string; USER_HAS_TOGGLE_SIDEBAR: boolean; ARE_NEW_KB: boolean; + TEST_WIDGET_API_BASE_URL: string; + TESTSITE_BASE_URL: string; private unsubscribe$: Subject = new Subject(); constructor( public appConfigService: AppConfigService, @@ -84,6 +93,8 @@ export class SettingsSidebarComponent implements OnInit { // this.getMainContentHeight(); this.listenSidebarIsOpened(); this.listenToKbVersion() + + this.translateString() } listenToKbVersion() { @@ -162,7 +173,7 @@ export class SettingsSidebarComponent implements OnInit { // @ Not used  getMainContentHeight() { const elemMainContent = document.querySelector('.main-content') - const elemAppdashboardSettingsSidebar = ( document.querySelector('appdashboard-settings-sidebar')) + const elemAppdashboardSettingsSidebar = (document.querySelector('appdashboard-settings-sidebar')) this.logger.log('[SETTINGS-SIDEBAR] elemMainContent ', elemMainContent) this.logger.log('[SETTINGS-SIDEBAR] elemAppdashboardSettingsSidebar ', elemAppdashboardSettingsSidebar) setTimeout(() => { @@ -333,7 +344,7 @@ export class SettingsSidebarComponent implements OnInit { if (!this.public_Key.includes('ETK')) { this.isVisibleETK = false } - + if (!this.public_Key.includes('KNB')) { this.isVisibleKNB = false } @@ -359,6 +370,14 @@ export class SettingsSidebarComponent implements OnInit { this.routing_and_depts_lbl = text; }); } + translateString() { + this.translate.get('Translations') + .subscribe((text: string) => { + this.translations = text; + }); + } + + getTeammatesTraslantion() { this.translate.get('Teammates') @@ -453,9 +472,13 @@ export class SettingsSidebarComponent implements OnInit { goToProjectSettings() { // routerLink="project/{{ project._id }}/project-settings/general" - this.router.navigate([ - 'project/' + this.project._id + '/project-settings/general', - ]) + this.router.navigate(['project/' + this.project._id + '/project-settings/general']) + } + + + + goToMultilanguage() { + this.router.navigate(['project/' + this.project._id + '/widget/translations']) } getCurrentRoute() { @@ -475,10 +498,7 @@ export class SettingsSidebarComponent implements OnInit { ) } else { this.TAG_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - TAG_ROUTE_IS_ACTIVE ', - this.TAG_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - TAG_ROUTE_IS_ACTIVE ', this.TAG_ROUTE_IS_ACTIVE) } @@ -507,142 +527,144 @@ export class SettingsSidebarComponent implements OnInit { if (this.route.indexOf('/departments') !== -1) { this.DEPTS_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - DEPTS_ROUTE_IS_ACTIVE ', - this.DEPTS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - DEPTS_ROUTE_IS_ACTIVE ', this.DEPTS_ROUTE_IS_ACTIVE) } else { this.DEPTS_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - DEPTS_ROUTE_IS_ACTIVE ', - this.DEPTS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - DEPTS_ROUTE_IS_ACTIVE ', this.DEPTS_ROUTE_IS_ACTIVE) + } + + if (this.route.indexOf('/department/edit') !== -1) { + this.EDIT_DEPT_ROUTE_IS_ACTIVE = true + this.logger.log('[SETTING-SIDEBAR] - EDIT_DEPT_ROUTE_IS_ACTIVE ', this.EDIT_DEPT_ROUTE_IS_ACTIVE) + } else { + this.EDIT_DEPT_ROUTE_IS_ACTIVE = false + this.logger.log('[SETTING-SIDEBAR] - EDIT_DEPT_ROUTE_IS_ACTIVE ', this.EDIT_DEPT_ROUTE_IS_ACTIVE) + } + + if (this.route.indexOf('/department/create') !== -1) { + this.ADD_DEPT_ROUTE_IS_ACTIVE = true + this.logger.log('[SETTING-SIDEBAR] - ADD_DEPT_ROUTE_IS_ACTIVE ', this.ADD_DEPT_ROUTE_IS_ACTIVE) + } else { + this.ADD_DEPT_ROUTE_IS_ACTIVE = false + this.logger.log('[SETTING-SIDEBAR] - ADD_DEPT_ROUTE_IS_ACTIVE ', this.ADD_DEPT_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/trigger') !== -1) { this.TRIGGER_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - TRIGGER_ROUTE_IS_ACTIVE ', - this.TRIGGER_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - TRIGGER_ROUTE_IS_ACTIVE ', this.TRIGGER_ROUTE_IS_ACTIVE) } else { this.TRIGGER_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - TRIGGER_ROUTE_IS_ACTIVE ', - this.TRIGGER_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - TRIGGER_ROUTE_IS_ACTIVE ', this.TRIGGER_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/users') !== -1) { this.TEAMMATES_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - TEAMMATES_ROUTE_IS_ACTIVE ', - this.TEAMMATES_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - TEAMMATES_ROUTE_IS_ACTIVE ', this.TEAMMATES_ROUTE_IS_ACTIVE) } else { this.TEAMMATES_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - TEAMMATES_ROUTE_IS_ACTIVE ', - this.TEAMMATES_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - TEAMMATES_ROUTE_IS_ACTIVE ', this.TEAMMATES_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/groups') !== -1) { this.GROUPS_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - GROUPS_ROUTE_IS_ACTIVE ', - this.GROUPS_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - GROUPS_ROUTE_IS_ACTIVE ',this.GROUPS_ROUTE_IS_ACTIVE) } else { this.GROUPS_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - GROUPS_ROUTE_IS_ACTIVE ', - this.GROUPS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - GROUPS_ROUTE_IS_ACTIVE ',this.GROUPS_ROUTE_IS_ACTIVE) + } + + if (this.route.indexOf('/group/edit') !== -1) { + this.EDIT_GROUP_ROUTE_IS_ACTIVE = true + this.logger.log( '[SETTING-SIDEBAR] - EDIT_GROUP_ROUTE_IS_ACTIVE ', this.EDIT_GROUP_ROUTE_IS_ACTIVE ) + } else { + this.EDIT_GROUP_ROUTE_IS_ACTIVE = false + this.logger.log( '[SETTING-SIDEBAR] - EDIT_GROUP_ROUTE_IS_ACTIVE ', this.EDIT_GROUP_ROUTE_IS_ACTIVE ) } + if (this.route.indexOf('/group/create') !== -1) { + this.ADD_GROUP_ROUTE_IS_ACTIVE = true + this.logger.log( '[SETTING-SIDEBAR] - ADD_GROUP_ROUTE_IS_ACTIVE ', this.ADD_GROUP_ROUTE_IS_ACTIVE ) + } else { + this.ADD_GROUP_ROUTE_IS_ACTIVE = false + this.logger.log( '[SETTING-SIDEBAR] - ADD_GROUP_ROUTE_IS_ACTIVE ', this.ADD_GROUP_ROUTE_IS_ACTIVE ) + } + + + if (this.route.indexOf('/widget-set-up') !== -1) { this.WIDGET_SETUP_ROUTE_IS_ACTIVE = true - this.logger.log( '[SETTING-SIDEBAR] - WIDGET_SETUP_ROUTE_IS_ACTIVE ', this.WIDGET_SETUP_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - WIDGET_SETUP_ROUTE_IS_ACTIVE ', this.WIDGET_SETUP_ROUTE_IS_ACTIVE) } else { this.WIDGET_SETUP_ROUTE_IS_ACTIVE = false - this.logger.log( '[SETTING-SIDEBAR] - WIDGET_SETUP_ROUTE_IS_ACTIVE ', this.WIDGET_SETUP_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - WIDGET_SETUP_ROUTE_IS_ACTIVE ', this.WIDGET_SETUP_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/installation') !== -1) { this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE = true - this.logger.log('[SETTING-SIDEBAR] - WIDGET_INSTALLATION_ROUTE_IS_ACTIVE ', this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE, + this.logger.log('[SETTING-SIDEBAR] - WIDGET_INSTALLATION_ROUTE_IS_ACTIVE ', this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE, ) } else { this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE = false - this.logger.log('[SETTING-SIDEBAR] - WIDGET_INSTALLATION_ROUTE_IS_ACTIVE ', this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE, + this.logger.log('[SETTING-SIDEBAR] - WIDGET_INSTALLATION_ROUTE_IS_ACTIVE ', this.WIDGET_INSTALLATION_ROUTE_IS_ACTIVE, ) } - + if (this.route.indexOf('/bots') !== -1) { this.CHATBOT_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - CHATBOT_ROUTE_IS_ACTIVE ', - this.CHATBOT_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - CHATBOT_ROUTE_IS_ACTIVE ',this.CHATBOT_ROUTE_IS_ACTIVE ) } else { this.CHATBOT_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - CHATBOT_ROUTE_IS_ACTIVE ', - this.CHATBOT_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - CHATBOT_ROUTE_IS_ACTIVE ', this.CHATBOT_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/hours') !== -1) { this.OPERATING_HOURS_ROUTE_IS_ACTIVE = true - this.logger.log('[SETTING-SIDEBAR] - OPERATING_HOURS_ROUTE_IS_ACTIVE ',this.OPERATING_HOURS_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - OPERATING_HOURS_ROUTE_IS_ACTIVE ', this.OPERATING_HOURS_ROUTE_IS_ACTIVE) } else { this.OPERATING_HOURS_ROUTE_IS_ACTIVE = false - this.logger.log('[SETTING-SIDEBAR] - OPERATING_HOURS_ROUTE_IS_ACTIVE ',this.OPERATING_HOURS_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - OPERATING_HOURS_ROUTE_IS_ACTIVE ', this.OPERATING_HOURS_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/knowledge-bases') !== -1) { this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE = true - this.logger.log('[SETTING-SIDEBAR] - KNOWLEDGE_BASES_ROUTE_IS_ACTIVE ',this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - KNOWLEDGE_BASES_ROUTE_IS_ACTIVE ', this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE) } else { this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE = false - this.logger.log('[SETTING-SIDEBAR] - KNOWLEDGE_BASES_ROUTE_IS_ACTIVE ',this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - KNOWLEDGE_BASES_ROUTE_IS_ACTIVE ', this.KNOWLEDGE_BASES_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/automations') !== -1) { this.AUTOMATIONS_ROUTE_IS_ACTIVE = true - this.logger.log('[SETTING-SIDEBAR] - AUTOMATIONS_ROUTE_IS_ACTIVE ',this.AUTOMATIONS_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - AUTOMATIONS_ROUTE_IS_ACTIVE ', this.AUTOMATIONS_ROUTE_IS_ACTIVE) } else { this.AUTOMATIONS_ROUTE_IS_ACTIVE = false - this.logger.log('[SETTING-SIDEBAR] - AUTOMATIONS_ROUTE_IS_ACTIVE ',this.AUTOMATIONS_ROUTE_IS_ACTIVE) + this.logger.log('[SETTING-SIDEBAR] - AUTOMATIONS_ROUTE_IS_ACTIVE ', this.AUTOMATIONS_ROUTE_IS_ACTIVE) } if (this.route.indexOf('/project-settings/') !== -1) { this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE = true - this.logger.log( - '[SETTING-SIDEBAR] - PROJECT_SETTINGS_ROUTE_IS_ACTIVE ', - this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - PROJECT_SETTINGS_ROUTE_IS_ACTIVE ', this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE ) } else { this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE = false - this.logger.log( - '[SETTING-SIDEBAR] - PROJECT_SETTINGS_ROUTE_IS_ACTIVE ', - this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE, - ) + this.logger.log( '[SETTING-SIDEBAR] - PROJECT_SETTINGS_ROUTE_IS_ACTIVE ', this.PROJECT_SETTINGS_ROUTE_IS_ACTIVE ) } if (this.route.indexOf('/integrations') !== -1) { this.INTEGRATIONS_ROUTE_IS_ACTIVE = true - this.logger.log('[SETTING-SIDEBAR] - INTEGRATIONS_ROUTE_IS_ACTIVE ', this.INTEGRATIONS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - INTEGRATIONS_ROUTE_IS_ACTIVE ', this.INTEGRATIONS_ROUTE_IS_ACTIVE) } else { this.INTEGRATIONS_ROUTE_IS_ACTIVE = false - this.logger.log( '[SETTING-SIDEBAR] - INTEGRATIONS_ROUTE_IS_ACTIVE ', this.INTEGRATIONS_ROUTE_IS_ACTIVE, - ) + this.logger.log('[SETTING-SIDEBAR] - INTEGRATIONS_ROUTE_IS_ACTIVE ', this.INTEGRATIONS_ROUTE_IS_ACTIVE) + } + + if (this.route.indexOf('/widget/translations') !== -1) { + this.TRANSLATIONS_ROUTE_IS_ACTIVE = true + this.logger.log('[SETTING-SIDEBAR] - TRANSLATIONS_ROUTE_IS_ACTIVE ', this.TRANSLATIONS_ROUTE_IS_ACTIVE) + } else { + this.TRANSLATIONS_ROUTE_IS_ACTIVE = false + this.logger.log('[SETTING-SIDEBAR] - TRANSLATIONS_ROUTE_IS_ACTIVE ', this.TRANSLATIONS_ROUTE_IS_ACTIVE) } diff --git a/src/app/department-edit-add/department-edit-add.component.html b/src/app/department-edit-add/department-edit-add.component.html index ad407f610832..5a089e9085c8 100755 --- a/src/app/department-edit-add/department-edit-add.component.html +++ b/src/app/department-edit-add/department-edit-add.component.html @@ -1,18 +1,13 @@ - -
    - - keyboard_arrow_left - - - {{ "DeptsAddEditPage.AddDept" | translate}} - - - - {{ "DeptsAddEditPage.EditDept" | translate}} - -
    + + + + + settings + {{ 'Settings' | translate }} +
    -
    - -
    -
    -
    - -
    - - - - - -
    -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    -
    - - - - -
    -
    -
    -

    - - - {{ "RoutingPage.SettingUpTileDeskRoutingRules_2" | translate }} -

    -
    -
    + +
    + + keyboard_arrow_left + + + {{ "DeptsAddEditPage.AddDept" | translate}} + + + + {{ "DeptsAddEditPage.EditDept" | translate}} + + +
    -
    -
    -
    - info - - - {{ "RoutingPage.TheFollowingRules" | translate }} -
    -
    -
    -
    +
    +
    + +
    -
    -
    - -
    -
    -

    - - {{ "DeptsAddEditPage.ActivateBOT" | translate }} - -

    -
    -
    +
    +
    +
    + +
    - -
    - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    + + + + - - {{ "DeptsAddEditPage.SelectABotThatWill" | translate }} - +
    +
    + +
    +
    -
    -
    - - -
    - - - - - - {{ "DeptsAddEditPage.SelectAnExistingOne" | translate }} - - - - {{ "DeptsAddEditPage.orCreateABot" | translate }} - - - - + + + +
    + +
    + +
    -
    + - -
    -
    -

    - + + + + +
    +
    +
    +

    - {{ "RoutingPage.RoutingRules" | translate }} - -

    + + {{ "RoutingPage.SettingUpTileDeskRoutingRules_2" | translate }} +

    +
    -
    -
    +
    +
    +
    + info + + + {{ "RoutingPage.TheFollowingRules" | translate }} +
    +
    -
    + - - - - -
    -
    -
    -
    - - {{ "DeptsAddEditPage.SetRoutingRules" | translate }} - +
    +
    - -
    - - Assigned: - - - {{ "QuickTipsAssigned" | translate }} + + + +
    +
    +

    + + {{ "DeptsAddEditPage.ActivateBOT" | translate }} +

    +
    + +
    + + +
    + +
    -
    - - Pooled: - - - {{ "QuickTipsPooled_1" | translate }} - {{ "QuickTipsPooled_2" | translate }} +
    + +
    +
    +
    +
    + + + + + +
    +
    +
    + + + {{ "DeptsAddEditPage.SelectABotThatWill" | translate }}
    -
    - - - - -
    - -
    -
    -
    +
    -
    -
    + +
    +
    +
    - -
    -
    -
    - -
    -
    - - - - - - - -
    -
    + + + +
    +
    + + + + + + + +
    +
    + + + + + +
    +
    - -
    -
    - - - - - - - - + + +
    +
    +
    -
    -
    -
    - - - -
    -
    -
    - + + + + + +
    +
    +
    + -
    -
    -

    - - {{ "QuickTips" | translate }} - -

    -
    -
    -
    -
    -
    - -

    - Assigned -

    -

    - {{ "QuickTipsAssigned" | translate }} -

    -

    - Pooled -

    -

    - {{ "QuickTipsPooled_1" | translate }} - {{ "QuickTipsPooled_2" | translate }} -

    -

    - Bot -

    -

    - {{ "QuickTipsBot" | translate }} -

    - -
    +
    +
    +

    + + {{ "QuickTips" | translate }} + +

    +
    +
    +
    +
    +
    -
    -
    - +

    + Assigned +

    +

    + {{ "QuickTipsAssigned" | translate }} +

    +

    + Pooled +

    +

    + {{ "QuickTipsPooled_1" | translate }} + {{ "QuickTipsPooled_2" | translate }} +

    +

    + Bot +

    +

    + {{ "QuickTipsBot" | translate }} +

    +
    +
    +
    + - - - -
    -
    - -
    -
    -
    -

    - - {{ "RequestMsgsPage.Details" | translate }} - -

    -
    -
    -
    -
    -
    + + + +
    +
    -
    -
    + +
    -
    - - - - - - DD - - +
    +
    +

    + + {{ "RequestMsgsPage.Details" | translate }} + +

    +
    +
    +
    +
    +
    - - {{ deptName_toUpdate}} - - -
    +
    +
    -
    - - - {{ dept_name_initial }} - - +
    + + + + + + DD + + - - {{ deptName_toUpdate}} - -
    + + {{ deptName_toUpdate}} + + +
    -
    +
    + + + {{ dept_name_initial }} + + -
    + + {{ deptName_toUpdate}} + + +
    - - - -
    - -
    - -

    - - calendar_today - - {{ "Created" | translate }} - - - - - {{ dept_created_at | amTimeAgo }} +

    - ({{ dept_created_at | date: 'd/M/y HH:mm:ss' }}) - - -

    -
    -
    + + + +
    + +
    + +

    + + calendar_today + + {{ "Created" | translate }} + + + + + {{ dept_created_at | amTimeAgo }} - - - -

    + ({{ dept_created_at | date: 'd/M/y HH:mm:ss' }}) + + -
    +

    +
    +
    -

    - - code - - {{ 'DeptsAddEditPage.DeptId' | translate }} - - - - - {{ dept_ID }} - -

    + + + +
    -
    -
    +
    - -
    -
    - -

    - - {{ 'DeptsAddEditPage.DeptBot' | translate }} - -

    +

    + + code + + {{ 'DeptsAddEditPage.DeptId' | translate }} + + + + + {{ dept_ID }} + +

    -
    -
    -
    - -
    - - {{ "BotsPage.NoBot" | translate }} -
    +
    -
    -
    - - - - - - - - - - - - - - - - + + + +
    +
    - - +

    + + {{ 'DeptsAddEditPage.DeptBot' | translate }} +

    + +
    +
    +
    + +
    + + {{ "BotsPage.NoBot" | translate }} + +
    - - - +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + {{ selectedValue }} + +
    - - {{ selectedValue }} -
    -
    -
    - -
    - -
    -
    + + + +
    + +
    + +
    - - - - subject - - - {{'DeptsAddEditPage.Description' | translate}} - + + + subject - - - {{ bot_description }} + + {{ bot_description }} - - + + +
    +
    +
    + + Read all + Read less + +
    -
    -
    - - Read all - Read less - -
    -
    - -
    - -
    -

    - - {{ 'DeptsAddEditPage.DeptAgents' | translate }} - + + + +

    + +
    +

    + + {{ 'DeptsAddEditPage.DeptAgents' | translate }} + - - {{ 'DeptsAddEditPage.AllUsers' | translate }} - + {{ 'DeptsAddEditPage.AllUsers' | translate }} + - - {{ 'DepartmentsPage.Group' | translate }} - - {{ group_name }} + {{ 'DepartmentsPage.Group' | translate }} + + {{ group_name }} - - ({{'Edit' | translate}}) + + ({{'Edit' | translate}}) - + - {{ - 'GroupsPage.tooltipEditGroup' | translate }} - {{ group_name }} - + {{ + 'GroupsPage.tooltipEditGroup' | translate }} + {{ group_name }} + - - - - - -

    - - - - -
    - -
    -
    - - - - - - - - - - - - - - {{agent?.id_user?.firstname}} {{agent?.id_user?.lastname}} + + + +

    + + + + +
    + +
    +
    + + + + + + + + + + + + + + {{agent?.id_user?.firstname}} {{agent?.id_user?.lastname}} + + +
    +
    -
    -
    - - - -
    + + + +
    -
    +
    -
    -

    - - info - {{ 'ThisGroupHasNoMembers' | translate }} -

    -
    +
    +

    + + info + {{ 'ThisGroupHasNoMembers' | translate }} +

    +
    -
    - - - - - - - - - - - - - - {{agent?.firstname}} {{agent?.lastname}} - - +
    + + + + + + + + + + + + + + {{agent?.firstname}} {{agent?.lastname}} + + +
    +
    +
    +
    -
    +
    -
    - +
    -
    - +
    diff --git a/src/app/department-edit-add/department-edit-add.component.scss b/src/app/department-edit-add/department-edit-add.component.scss index cc019749bcc1..88e8045b7c56 100755 --- a/src/app/department-edit-add/department-edit-add.component.scss +++ b/src/app/department-edit-add/department-edit-add.component.scss @@ -655,3 +655,6 @@ select[disabled] { margin-right: 3px; object-fit: cover; } + + + diff --git a/src/app/department-edit-add/department-edit-add.component.ts b/src/app/department-edit-add/department-edit-add.component.ts index 45c569f22e7c..f93301b8bf7a 100755 --- a/src/app/department-edit-add/department-edit-add.component.ts +++ b/src/app/department-edit-add/department-edit-add.component.ts @@ -141,6 +141,7 @@ export class DepartmentEditAddComponent extends PricingBaseComponent implements agentCannotManageAdvancedOptions: string; learnMoreAboutDefaultRoles: string; onlyOwnerCanManageTheAccountPlanMsg: string; + IS_OPEN_SETTINGS_SIDEBAR: boolean; constructor( private router: Router, @@ -242,6 +243,7 @@ export class DepartmentEditAddComponent extends PricingBaseComponent implements ngOnInit() { this.auth.checkRoleForCurrentProject(); this.getProfileImageStorage(); + this.listenSidebarIsOpened(); this.logger.log('[DEPT-EDIT-ADD] selectedDeptId FROM @INPUT: ', this.ws_requestslist_deptIdSelected) @@ -321,9 +323,17 @@ export class DepartmentEditAddComponent extends PricingBaseComponent implements this.getOSCODE(); } + + listenSidebarIsOpened() { + this.auth.settingSidebarIsOpned.subscribe((isopened) => { + this.logger.log('[DEPT-EDIT-ADD] SETTNGS-SIDEBAR isopened (FROM SUBSCRIPTION) ', isopened) + this.IS_OPEN_SETTINGS_SIDEBAR = isopened + }); + } + getOSCODE() { this.public_Key = this.appConfigService.getConfig().t2y12PruGU9wUtEGzBJfolMIgK - this.logger.log('[USERS] getAppConfig - public_Key', this.public_Key) + this.logger.log('[DEPT-EDIT-ADD] getAppConfig - public_Key', this.public_Key) let keys = this.public_Key.split('-') keys.forEach((key) => { diff --git a/src/app/departments/departments.component.html b/src/app/departments/departments.component.html index 5632d8fae6ee..be8115082496 100755 --- a/src/app/departments/departments.component.html +++ b/src/app/departments/departments.component.html @@ -21,6 +21,14 @@
    + +
    + + {{'RoutingAndDepts' | translate}} + +
    +
    diff --git a/src/app/email-ticketing/email-ticketing.component.html b/src/app/email-ticketing/email-ticketing.component.html index 864bfad0b4cf..34417e414cd3 100755 --- a/src/app/email-ticketing/email-ticketing.component.html +++ b/src/app/email-ticketing/email-ticketing.component.html @@ -11,17 +11,22 @@
    +
    + {{'EmailTicketing' | translate}} +
    +
    -
    +
    diff --git a/src/app/group-edit-add/group-edit-add.component.html b/src/app/group-edit-add/group-edit-add.component.html index 2a9a758e59e8..4388c6981ff5 100755 --- a/src/app/group-edit-add/group-edit-add.component.html +++ b/src/app/group-edit-add/group-edit-add.component.html @@ -1,9 +1,15 @@ - -
    - keyboard_arrow_left + + + + settings + {{ 'Settings' | translate }} + + - + +
    -
    - +
    + + keyboard_arrow_left + + + {{ "GroupsAddEditPage.AddGroup" | translate }} + + + + {{ "GroupsAddEditPage.EditGroup" | translate }} + + {{ groupNameToUpdate }} + + + +
    - - -
    -
    -
    -
    - -
    - -
    +
    +
    + +
    + - -
    + + - -
    - +
    +
    +
    +
    + +
    + +
    + + +
    + + +
    + +
    +
    +
    +
    - -
    - -
    - - -
    -
    -
    - + +
    +
    +
    + -
    -
    -

    - - {{ "QuickTips" | translate }} - -

    -
    -
    -
    +
    +
    +

    + + {{ "QuickTips" | translate }} + +

    +
    +
    +
    +
    +
    + +

    + + {{ "GroupsQuickTips1" | translate }} +
    + + {{ "GroupsQuickTips2" | translate }} +

    - -

    - - {{ "GroupsQuickTips1" | translate }} -
    - - {{ "GroupsQuickTips2" | translate }} -

    +
    -
    + + + + + -
    - - - - - + - + + +
    +
    +
    - - -
    -
    -
    + +
    - -
    + + - - + +
    + +
    - -
    - -
    + +
    - -
    + +
    + +
    - -
    - + + + +
    + +
    + - - -
    -
    - -
    - - - - - - - -
    -
    -
    - + + +
    +
    +
    + -
    -
    -

    - - {{ "QuickTips" | translate }} - -

    -
    -
    -
    -
    -
    +
    +
    +

    + + {{ "QuickTips" | translate }} + +

    +
    +
    +
    +
    +
    -

    - - {{ "GroupsAddEditPage.GroupID" | translate }} - -

    -

    - {{ id_group }} -

    +

    -

    - - {{ "GroupsPage.CreationDate" | translate }} - -

    -

    - {{ groupCreatedAt | date: 'd/M/y'}} -

    + {{ "GroupsAddEditPage.GroupID" | translate }} + +

    +

    + {{ id_group }} +

    + +

    + + {{ "GroupsPage.CreationDate" | translate }} + +

    +

    + {{ groupCreatedAt | date: 'd/M/y'}} +

    +
    +
    -
    -
    -
    - +
    + - -
    -
    -
    +
    +
    +
    -
    -

    +
    +

    - {{ "GroupsAddEditPage.Members" | translate }} - - - ({{ count }}) + {{ "GroupsAddEditPage.Members" | translate }} + + + ({{ count }}) - - + + - - - + + -

    - -
    +

    + +
    - -
    + +
    - - - - - + - - - - - - - - - + + + + + + + + - + - + - + - - - - + + + - +

    + + {{ "GroupsAddEditPage.NoMembers" | translate }} +

    + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - -
    - - {{ "GroupsAddEditPage.User" | translate }} - - - - {{ "GroupsAddEditPage.Role" | translate }} - - - - Email - - + + {{ "GroupsAddEditPage.User" | translate }} + + + + {{ "GroupsAddEditPage.Role" | translate }} + + + + Email + + - - - {{ "Actions" | translate }} - - + + + {{ "Actions" | translate }} + +
    +
    -

    - - {{ "GroupsAddEditPage.NoMembers" | translate }} -

    -
    - - - - - - - - - - - - - {{ projectUser?.id_user?.firstname }} - {{ projectUser?.id_user?.lastname }} - - - {{ "GroupsAddEditPage.UserId" | translate }}: {{ - projectUser?.id_user?._id }} - - - {{ projectUser?.role | translate }} - - {{ projectUser?.id_user?.email }} - + + + + + + + + + + + + + {{ projectUser?.id_user?.firstname }} + {{ projectUser?.id_user?.lastname }} + + + {{ "GroupsAddEditPage.UserId" | translate }}: {{ + projectUser?.id_user?._id }} + + + {{ projectUser?.role | translate }} + + {{ projectUser?.id_user?.email }} + - - + + + - - -
    + + + + + + + +
    +
    +
    -
    - + + + + +
    - - - - - +
    @@ -453,16 +482,14 @@

    - - diff --git a/src/app/group-edit-add/group-edit-add.component.ts b/src/app/group-edit-add/group-edit-add.component.ts index f56e369aa1c6..943a08dbca3c 100755 --- a/src/app/group-edit-add/group-edit-add.component.ts +++ b/src/app/group-edit-add/group-edit-add.component.ts @@ -64,6 +64,7 @@ export class GroupEditAddComponent implements OnInit { baseUrl: string; UPLOAD_ENGINE_IS_FIREBASE: boolean; isChromeVerGreaterThan100: boolean; + IS_OPEN_SETTINGS_SIDEBAR: boolean; constructor( private router: Router, private auth: AuthService, @@ -92,6 +93,14 @@ export class GroupEditAddComponent implements OnInit { this.getCurrentProject(); this.getProfileImageStorage(); this.getBrowserVersion(); + this.listenSidebarIsOpened(); + } + + listenSidebarIsOpened() { + this.auth.settingSidebarIsOpned.subscribe((isopened) => { + this.logger.log('[GROUP-EDIT-ADD] SETTNGS-SIDEBAR isopened (FROM SUBSCRIPTION) ', isopened) + this.IS_OPEN_SETTINGS_SIDEBAR = isopened + }); } getBrowserVersion() { diff --git a/src/app/group-edit-add/group-edit-add.module.ts b/src/app/group-edit-add/group-edit-add.module.ts index d28e7799b256..e01ed5cd8b91 100644 --- a/src/app/group-edit-add/group-edit-add.module.ts +++ b/src/app/group-edit-add/group-edit-add.module.ts @@ -5,6 +5,7 @@ import { RouterModule, Routes } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; import { SharedModule } from 'app/shared/shared.module'; +import { SettingsSidebarModule } from 'app/components/settings-sidebar/settings-sidebar.module'; const routes: Routes = [ { path: "", component: GroupEditAddComponent }, @@ -20,6 +21,7 @@ const routes: Routes = [ TranslateModule, FormsModule, SharedModule, + SettingsSidebarModule ] }) export class GroupEditAddModule { } diff --git a/src/app/groups/groups.component.html b/src/app/groups/groups.component.html index 2e6c140b1336..833ae4f8ad53 100755 --- a/src/app/groups/groups.component.html +++ b/src/app/groups/groups.component.html @@ -23,6 +23,10 @@ -->
    +
    + {{ 'UsersAndGroups' | translate }} +
    diff --git a/src/app/hours/hours.component.html b/src/app/hours/hours.component.html index 1c6b22c9d219..633e252b6830 100755 --- a/src/app/hours/hours.component.html +++ b/src/app/hours/hours.component.html @@ -21,6 +21,12 @@
    + +
    + {{ 'Hours' | translate }} +
    +
    diff --git a/src/app/integrations/integrations.component.html b/src/app/integrations/integrations.component.html index af437a511dbe..5e476b15523d 100644 --- a/src/app/integrations/integrations.component.html +++ b/src/app/integrations/integrations.component.html @@ -13,6 +13,13 @@
    + +
    + {{'Integrations' | translate}} +
    + +
    @@ -101,7 +108,7 @@ (onDeleteIntegration)=integrationDeletedEvent($event)> - { this.integrationSelectedName = integration.key; @@ -286,7 +288,8 @@ export class IntegrationsComponent implements OnInit, OnDestroy { this.selectedIntegration = this.initializeIntegration(integration.key); } if (integration && integration.category === INTEGRATIONS_CATEGORIES.CHANNEL) { - this.integrationSelectedName = "external"; + // this.integrationSelectedName = "external"; + this.integrationSelectedType = "external"; this.showInIframe = true; let app = this.availableApps.find(a => a.channel === integration.key); this.renderUrl = app.runURL; diff --git a/src/app/integrations/utils.ts b/src/app/integrations/utils.ts index 894c30e4191e..9fa6c863be49 100644 --- a/src/app/integrations/utils.ts +++ b/src/app/integrations/utils.ts @@ -64,7 +64,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_new.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' }, @@ -85,7 +85,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_new.png", src_logo: "assets/img/int/customerio-logo_new.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' }, diff --git a/src/app/knowledge-bases-previous/knowledge-bases-previous.component.html b/src/app/knowledge-bases-previous/knowledge-bases-previous.component.html index b4a725a83ed1..99025a43682e 100644 --- a/src/app/knowledge-bases-previous/knowledge-bases-previous.component.html +++ b/src/app/knowledge-bases-previous/knowledge-bases-previous.component.html @@ -9,6 +9,11 @@
    + +
    + {{ 'KnowledgeBases' | translate }} +
    diff --git a/src/app/knowledge-bases/knowledge-bases.component.ts b/src/app/knowledge-bases/knowledge-bases.component.ts index 7df86e299989..4b4e3c5999c1 100644 --- a/src/app/knowledge-bases/knowledge-bases.component.ts +++ b/src/app/knowledge-bases/knowledge-bases.component.ts @@ -619,7 +619,7 @@ export class KnowledgeBasesComponent extends PricingBaseComponent implements OnI // this.onCloseBaseModal(); let error = this.msgErrorAddUpdateKb; this.kbService.addSitemap(body).subscribe((resp: any) => { - console.log("onSendSitemap:", resp); + this.logger.log("onSendSitemap:", resp); if (resp.errors && resp.errors[0]) { swal({ title: this.warningTitle, @@ -1271,6 +1271,7 @@ export class KnowledgeBasesComponent extends PricingBaseComponent implements OnI } openAddKnowledgeBaseModal(type?) { + this.logger.log('openAddKnowledgeBaseModal type', type) this.typeKnowledgeBaseModal = type; this.addKnowledgeBaseModal = 'block'; } diff --git a/src/app/knowledge-bases/knowledge-bases.module.ts b/src/app/knowledge-bases/knowledge-bases.module.ts new file mode 100644 index 000000000000..c2ed42bb14d8 --- /dev/null +++ b/src/app/knowledge-bases/knowledge-bases.module.ts @@ -0,0 +1,61 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { KnowledgeBasesComponent } from './knowledge-bases.component'; +import { AddContentMenuComponent } from './menu/add-content-menu/add-content-menu.component'; +import { KnowledgeBaseTableComponent } from './modals/knowledge-base-table/knowledge-base-table.component'; +import { ModalDeleteKnowledgeBaseComponent } from './modals/modal-delete-knowledge-base/modal-delete-knowledge-base.component'; +import { ModalDetailKnowledgeBaseComponent } from './modals/modal-detail-knowledge-base/modal-detail-knowledge-base.component'; +import { ModalErrorComponent } from './modals/modal-error/modal-error.component'; +import { ModalGptKeyComponent } from './modals/modal-gpt-key/modal-gpt-key.component'; +import { ModalPageUrlComponent } from './modals/modal-page-url/modal-page-url.component'; +import { ModalPreviewKnowledgeBaseComponent } from './modals/modal-preview-knowledge-base/modal-preview-knowledge-base.component'; +import { ModalSiteMapComponent } from './modals/modal-site-map/modal-site-map.component'; +import { ModalTextFileComponent } from './modals/modal-text-file/modal-text-file.component'; +import { ModalUrlsKnowledgeBaseComponent } from './modals/modal-urls-knowledge-base/modal-urls-knowledge-base.component'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { SharedModule } from 'app/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterModule, Routes } from '@angular/router'; +import { BotsSidebarModule } from 'app/bots/bots-list/bots-sidebar/bots-sidebar.module'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MomentModule } from 'ngx-moment'; + +const routes: Routes = [ + { path: "", component: KnowledgeBasesComponent}, +]; + +@NgModule({ + declarations: [ + KnowledgeBasesComponent, + AddContentMenuComponent, + KnowledgeBaseTableComponent, + ModalDeleteKnowledgeBaseComponent, + ModalDetailKnowledgeBaseComponent, + ModalErrorComponent, + ModalGptKeyComponent, + ModalPageUrlComponent, + ModalPreviewKnowledgeBaseComponent, + ModalSiteMapComponent, + ModalTextFileComponent, + ModalUrlsKnowledgeBaseComponent, + + ], + imports: [ + RouterModule.forChild(routes), + CommonModule, + FormsModule, + ReactiveFormsModule , + NgSelectModule, + BotsSidebarModule, + SharedModule, + TranslateModule, + MatMenuModule, + MatIconModule, + MatButtonModule, + MomentModule, + ] +}) +export class KnowledgeBasesModule { } diff --git a/src/app/project-edit-add/project-edit-add.component.html b/src/app/project-edit-add/project-edit-add.component.html index 4816010f5265..b69edd924f24 100755 --- a/src/app/project-edit-add/project-edit-add.component.html +++ b/src/app/project-edit-add/project-edit-add.component.html @@ -14,6 +14,12 @@
    + + +
    + {{ 'ProjectSettings' | translate }} +
    @@ -972,7 +978,7 @@

    diff --git a/src/app/project-edit-add/project-edit-add.component.ts b/src/app/project-edit-add/project-edit-add.component.ts index 65434b43c5b1..ced5200df8a4 100755 --- a/src/app/project-edit-add/project-edit-add.component.ts +++ b/src/app/project-edit-add/project-edit-add.component.ts @@ -1998,13 +1998,13 @@ export class ProjectEditAddComponent implements OnInit, OnDestroy { // console.log('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error _body', error._body); const error_body = error - console.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body ', error_body); - console.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body > msg ', error_body.msg); + this.logger.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body ', error_body); + this.logger.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body > msg ', error_body.msg); if (error_body && error_body.msg) { this.credit_card_error_msg = error_body.msg.raw.message; - console.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body > msg > raw ', error_body.msg.raw); - console.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER credit_card_error_msg ', this.credit_card_error_msg); + this.logger.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER error_body > msg > raw ', error_body.msg.raw); + this.logger.error('[PRJCT-EDIT-ADD] - UPDATED CUSTOMER credit_card_error_msg ', this.credit_card_error_msg); this.CARD_HAS_ERROR = true; this.SPINNER_IN_ADD_CARD_MODAL = false this.DISPLAY_ADD_CARD_COMPLETED = false diff --git a/src/app/static-pages/canned-responses-static/canned-responses-static.component.html b/src/app/static-pages/canned-responses-static/canned-responses-static.component.html index 1f290c55beb2..7d63068843b9 100644 --- a/src/app/static-pages/canned-responses-static/canned-responses-static.component.html +++ b/src/app/static-pages/canned-responses-static/canned-responses-static.component.html @@ -17,6 +17,11 @@
    +
    + {{'CannedResponses.CannedResponses' | translate}} +
    +
    diff --git a/src/app/static-pages/departments-static/departments-static.component.html b/src/app/static-pages/departments-static/departments-static.component.html index f9627e4c0643..f0251b5d6a3f 100755 --- a/src/app/static-pages/departments-static/departments-static.component.html +++ b/src/app/static-pages/departments-static/departments-static.component.html @@ -15,6 +15,16 @@
    +
    + + keyboard_arrow_left + + + {{ "DeptsAddEditPage.AddDept" | translate}} +
    +
    diff --git a/src/app/static-pages/departments-static/departments-static.component.ts b/src/app/static-pages/departments-static/departments-static.component.ts index 5a30b6019276..afb6d11c9c81 100755 --- a/src/app/static-pages/departments-static/departments-static.component.ts +++ b/src/app/static-pages/departments-static/departments-static.component.ts @@ -224,6 +224,10 @@ export class DepartmentsStaticComponent extends PricingBaseComponent implements this.location.back(); } + goBackToDeptsList() { + this.router.navigate(['project/' + this.projectId + '/departments']); + } + getTranslationStrings() { this.translateModalOnlyOwnerCanManageProjectAccount() } @@ -242,6 +246,8 @@ export class DepartmentsStaticComponent extends PricingBaseComponent implements this.learnMoreAboutDefaultRoles = translation; }); } + + } diff --git a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.html b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.html index 33b393b8c7bd..f17585b85c14 100644 --- a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.html +++ b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.html @@ -1,13 +1,22 @@ -

    - + + + + settings + + {{ 'Settings' | translate }} +

    +
    + {{'EmailTicketing' | translate}} +
    diff --git a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts index 78921541099b..18f7b5529426 100644 --- a/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts +++ b/src/app/static-pages/email-ticketing-static/email-ticketing-static.component.ts @@ -39,6 +39,7 @@ export class EmailTicketingStaticComponent extends PricingBaseComponent implemen isChromeVerGreaterThan100: boolean; public_Key: any; payIsVisible: boolean; + constructor( private router: Router, diff --git a/src/app/static-pages/groups-static/groups-static.component.html b/src/app/static-pages/groups-static/groups-static.component.html index da0bfde9d3f6..3cd6cd4456a4 100755 --- a/src/app/static-pages/groups-static/groups-static.component.html +++ b/src/app/static-pages/groups-static/groups-static.component.html @@ -16,6 +16,10 @@
    +
    + {{ 'UsersAndGroups' | translate }} +
    diff --git a/src/app/static-pages/hours-static/hours-static.component.html b/src/app/static-pages/hours-static/hours-static.component.html index e1d337e06a3c..527a748f4224 100755 --- a/src/app/static-pages/hours-static/hours-static.component.html +++ b/src/app/static-pages/hours-static/hours-static.component.html @@ -16,6 +16,11 @@
    + +
    + {{ 'Hours' | translate }} +
    diff --git a/src/app/tags/tags.component.html b/src/app/tags/tags.component.html index b267cbc3cfa4..1c517db17474 100755 --- a/src/app/tags/tags.component.html +++ b/src/app/tags/tags.component.html @@ -14,6 +14,11 @@
    +
    + {{'Tags.Tags' | translate}} +
    +
    diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index 46451601f1ad..f7d1144e4124 100755 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -14,7 +14,11 @@
    - + +
    + {{ 'UsersAndGroups' | translate }} +
    diff --git a/src/app/widget-installation/widget-installation.component.html b/src/app/widget-installation/widget-installation.component.html index d69cf3036793..d78b9fda0b65 100755 --- a/src/app/widget-installation/widget-installation.component.html +++ b/src/app/widget-installation/widget-installation.component.html @@ -7,6 +7,12 @@
    + +
    + {{ 'TileDeskChatWidgetInstallation' | translate: tparams }} +
    +
    @@ -15,13 +21,13 @@
    -
    +
    diff --git a/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.html b/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.html index ede5ed3eff7e..02b03f8504b9 100755 --- a/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.html +++ b/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.html @@ -1,225 +1,254 @@ - -
    - + + - Multilanguage -
    + {{ "Translations" | translate }} --> + settings + {{ 'Settings' | translate }} + - + + +
    +
    +
    + + + + + + +
    + +
    -
    -
    -
    -
    +

    -
    -
    -
    -

    +
    +
    +
    +
    +
    -
    - + +
    +
    +
    +

    +
    +
    + +
    + +
    -
    -
    -
    - - - - -
    -
    -
    + + + +
    -

    +
    +
    - - {{ selectedTranslationLabel }} - - - - {{ 'Add' | translate }} - +

    + + + {{ selectedTranslationLabel }} + + + + {{ 'Add' | translate }} + -

    +

    - - - + + - - - + - - + -
    -
    -
    -
    -
    -
    -
    -
    - - - - - -
    - - -
    -
    - - {{ item?.labelName }} -
    - -
    - +
    +
    +
    +
    +
    - -
    - + + +
    + + +
    +
    + + {{ item?.labelName }} + +
    + +
    + +
    +
    +     +
    + + -
    -
    -
    +
    +
    +
    - - + + -
    +
    - -
    - +
    + -
    +
    +
    + +
    - -
    +
    + -
    - + +
    - +
    -
    +
    -
    \ No newline at end of file diff --git a/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.ts b/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.ts index 3cf68b011aa3..41f13442e427 100755 --- a/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.ts +++ b/src/app/widget_components/widget-multilanguage/widget-multilanguage.component.ts @@ -6,6 +6,7 @@ import { NotifyService } from '../../core/notify.service'; import { TranslateService } from '@ngx-translate/core'; import { LoggerService } from '../../services/logger/logger.service'; import { AuthService } from 'app/core/auth.service'; +import { ActivatedRoute } from '@angular/router'; const swal = require('sweetalert'); @Component({ @@ -47,13 +48,16 @@ export class WidgetMultilanguageComponent extends BaseTranslationComponent imple deleteMsg: string; cancelMsg: string; isChromeVerGreaterThan100: boolean; + IS_OPEN_SETTINGS_SIDEBAR: boolean; + callingPage: string; constructor( public location: Location, public widgetService: WidgetService, private notify: NotifyService, private translate: TranslateService, public auth: AuthService, - private logger: LoggerService + private logger: LoggerService, + public route: ActivatedRoute ) { super(); } @@ -65,6 +69,21 @@ export class WidgetMultilanguageComponent extends BaseTranslationComponent imple this.getEnDefaultTranslation(); // this.getLabels(); this.getBrowserVersion() + this.listenSidebarIsOpened(); + this.getRouteParams() + } + + getRouteParams() { + this.route.params.subscribe((params) => { + this.logger.log('[MULTILANGUAGE] - GET ROUTE PARAMS ', params); + if (params.calledby && params.calledby === 'w') { + this.callingPage = 'widgetsetup' + this.logger.log('[MULTILANGUAGE] - GET ROUTE PARAMS callingPage ', this.callingPage); + } else if (!params.calledby) { + this.callingPage = 'settingsb' + this.logger.log('[MULTILANGUAGE] - GET ROUTE PARAMS callingPage ', this.callingPage); + } + }) } getBrowserVersion() { @@ -74,6 +93,13 @@ export class WidgetMultilanguageComponent extends BaseTranslationComponent imple }) } + listenSidebarIsOpened() { + this.auth.settingSidebarIsOpned.subscribe((isopened) => { + this.logger.log('Multilanguage (widget-multilanguage) isopened (FROM SUBSCRIPTION) ', isopened) + this.IS_OPEN_SETTINGS_SIDEBAR = isopened + }) + } + getTranslation() { diff --git a/src/app/widget_components/widget-multilanguage/widget-multilanguage.module.ts b/src/app/widget_components/widget-multilanguage/widget-multilanguage.module.ts index b3728ed01131..27d077394bff 100644 --- a/src/app/widget_components/widget-multilanguage/widget-multilanguage.module.ts +++ b/src/app/widget_components/widget-multilanguage/widget-multilanguage.module.ts @@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { SharedModule } from 'app/shared/shared.module'; import { FormsModule } from '@angular/forms'; import { NgSelectModule } from '@ng-select/ng-select'; +import { SettingsSidebarModule } from 'app/components/settings-sidebar/settings-sidebar.module'; const routes: Routes = [ { path: "", component: WidgetMultilanguageComponent}, @@ -23,6 +24,7 @@ const routes: Routes = [ TranslateModule, SharedModule, FormsModule, + SettingsSidebarModule, NgSelectModule ] }) diff --git a/src/app/widget_components/widget-set-up/widget-set-up.component.html b/src/app/widget_components/widget-set-up/widget-set-up.component.html index 2db4c3102e64..6145d8b9246d 100755 --- a/src/app/widget_components/widget-set-up/widget-set-up.component.html +++ b/src/app/widget_components/widget-set-up/widget-set-up.component.html @@ -21,6 +21,11 @@ -->
    + +
    + {{ 'WidgetSetUp' | translate }} +
    @@ -34,9 +39,9 @@
    -
    + + + + + + + + + + + + + + + + + + + + + +