From 77423279c87e83852670cc6fed80131d74e1d1fb Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 25 Apr 2024 17:00:09 +0300 Subject: [PATCH 01/42] :bug: fix name of undefined --- .../services/data-services/variables.service.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/functions/bot-engine/main/src/lib/services/data-services/variables.service.ts b/libs/functions/bot-engine/main/src/lib/services/data-services/variables.service.ts index 817e993759..6309de2a26 100644 --- a/libs/functions/bot-engine/main/src/lib/services/data-services/variables.service.ts +++ b/libs/functions/bot-engine/main/src/lib/services/data-services/variables.service.ts @@ -30,11 +30,15 @@ export class VariablesDataService extends BotDataService{ public getAllVariables(endUser: EndUser) { // Get channel details and include them in variables - const channelDetails = { - channelName: this._commChannel.name, - botPhoneNumber: this._commChannel['phoneNumber'] || null, - platform: this._commChannel.type - } + let channelDetails; + + if(this._commChannel) { + channelDetails = { + channelName: this._commChannel.name, + botPhoneNumber: this._commChannel['phoneNumber'] || null, + platform: this._commChannel.type + } + } return { ...endUser, @@ -50,6 +54,8 @@ export class VariablesDataService extends BotDataService{ const allVariables = this.getAllVariables(endUser); + if(!allVariables) return ''; + return allVariables[variable]; } } From 047960e96c4cd945cb8e650a800d0f7fd5522228 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 15:46:13 +0300 Subject: [PATCH 02/42] :lipstick: replace editor background image with css gradient --- .../lib/components/editor-frame/editor-frame.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/editor-frame/editor-frame.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/editor-frame/editor-frame.component.scss index 36b4d7b9ab..6af802f24e 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/editor-frame/editor-frame.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/editor-frame/editor-frame.component.scss @@ -18,8 +18,8 @@ min-width: 5000px; min-height: 3750px; - background-image: url(^/assets/bg/dot-bg.jpg); - background-repeat: repeat; + background-image: radial-gradient(circle at 1px 1px, #DADADA 1px, #F6F6F6 0); + background-size: 24px 24px; -webkit-box-shadow: 0px 0px 5px 0px #888; box-shadow: 0px 0px 5px 0px #888; From e9f09068fd47f5c17b4cd19f972ac5447730adb8 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 16:29:21 +0300 Subject: [PATCH 03/42] :lipstick: match intercom size with zoom btns --- apps/conv-learning-manager/src/styles.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/conv-learning-manager/src/styles.scss b/apps/conv-learning-manager/src/styles.scss index bf5b667f40..2575dcbfb2 100644 --- a/apps/conv-learning-manager/src/styles.scss +++ b/apps/conv-learning-manager/src/styles.scss @@ -15,6 +15,12 @@ body { height: 100%; } +// Intercom icon +.intercom-lightweight-app-launcher, .intercom-lightweight-app-launcher-icon { + width: 3.2rem !important; + height: 3.2rem !important; +} + //Block Connectors //endpoint .block_endpoint circle { From 51088a1cd680ecca7051ee78e63ec35fedfaf034 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 16:29:39 +0300 Subject: [PATCH 04/42] :lipstick: move zoom btns to bottom right --- .../pages/story-editor/story-editor.page.html | 12 ++-- .../pages/story-editor/story-editor.page.scss | 59 +++++++++++++++++-- 2 files changed, 58 insertions(+), 13 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html index 8d85dd58fd..ca71be4285 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html @@ -37,15 +37,13 @@ -
- - - -
diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss index 2e2fdb423d..5b1b3af7a7 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss @@ -65,16 +65,18 @@ mat-sidenav { .sub-bar { width: auto; padding: 10px; - background-color: white; - border-bottom: solid #eee 1px; - // box-shadow: 0px 4px 8px slategrey; + background-color: #F6F6F6; } .subbar-btn { - background-color: #ffab2d !important; + background-color: #00112B !important; + border-radius: 2rem; + font-weight: 400; color: white !important; - font-weight: 600; min-width: 100px; + width: 7rem; + height: 3rem; + } @@ -96,8 +98,53 @@ mat-sidenav { .zoom-btn { background-color: white; color: black; + width: 3.2rem; + height: 3.2rem; +} + +.zoom-btn:disabled { + color: grey; +} + +.zoom-section { + display: flex; + flex-direction: column; + gap: 0.9rem; + + position: fixed; + z-index: 2147483003; + padding: 0 !important; + margin: 0 !important; + border: none; + bottom: 150px; + right: 20px; + max-width: 48px; + width: 48px; + max-height: 48px; + height: 48px; + cursor: pointer; } +// .zoom-btn.in { +// position: fixed; +// z-index: 2147483003; +// padding: 0 !important; +// margin: 0 !important; +// border: none; +// bottom: 80px; +// right: 20px; +// max-width: 48px; +// width: 48px; +// max-height: 48px; +// height: 48px; +// border-radius: 50%; +// background: #fff; +// cursor: pointer; +// box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.06), 0 2px 32px 0 rgba(0, 0, 0, 0.16); +// transition: transform 167ms cubic-bezier(0.33, 0.00, 0.00, 1.00); +// box-sizing: content-box; +// } + .wrapper-edit { display: flex; flex-direction: column; @@ -134,7 +181,7 @@ convl-story-editor-frame { .error-count{ color: #707070; - background-color: white; + background-color: #F6F6F6; padding-right: 17em; /* Reg 14 */ font-family: Roboto; From d1f3b6e97f78a0b0b03a10cc348d0c1c6a0067d6 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 29 Apr 2024 16:33:32 +0300 Subject: [PATCH 05/42] feat: add whatsapp upload media handler --- .../whatsapp-upload-media-cron.function.ts | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts new file mode 100644 index 0000000000..e9ce594deb --- /dev/null +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -0,0 +1,73 @@ +import { CloudSchedulerClient } from '@google-cloud/scheduler'; + +import { HandlerTools } from '@iote/cqrs'; +import { FunctionHandler, HttpsContext } from '@ngfi/functions'; + +import { Bot } from '@app/model/convs-mgr/bots'; +import { HttpMethodTypes } from '@app/model/convs-mgr/stories/blocks/main'; + +/** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ +export class WhatsappUploadMediaCronHandler extends FunctionHandler { + private cloudSchedulerClient: CloudSchedulerClient; + private projectId: string; + private locationId = 'europe-west1'; + + constructor(projectId:string = process.env.GCLOUD_PROJECT) { + super(); + this.projectId = projectId; + this.cloudSchedulerClient = new CloudSchedulerClient(); + } + + public async execute(data: any, context: HttpsContext, tools: HandlerTools) { + try { + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Updating whatsapp Media`); + + const endpoint = this.getEndpoint(); + const jobName = this.getJobName(data.bot as Bot); + + const [job, ...jobs] = await this.cloudSchedulerClient.getJob({ + name: jobName, + }); + + console.log({job, jobs}); + + if (job) return; + + const body = JSON.stringify(data.channel); + + const newJob = { + name: jobName, + httpTarget: { + uri: endpoint, + body: Buffer.from(body,'utf-8').toString('base64'), + httpMethod: HttpMethodTypes.POST, + headers: { 'Content-Type': 'application/json' }, + }, + schedule: '0 18 * * *', + }; + + const request = { + parent: `projects/${this.projectId}/locations/${this.locationId}`, + newJob, + }; + + const res = this.cloudSchedulerClient.createJob(request); + console.log({res}); + + } catch (error) { + tools.Logger.error(() => `[WhatsappMediaUpdateCronHandler] - Error in WhatsappMediaUpdateCronHandler: ${error.message}`); + console.error(error.message); + } + } + + private getJobName(bot: Bot): string { + const jobPath = `projects/${this.projectId}/locations/${this.locationId}/jobs/`; + const jobId = `${bot.id}`; + + return jobPath + jobId; + } + + private getEndpoint(): string { + return `https://${this.locationId}-${this.projectId}.cloudfunctions.net/channelWhatsappUploadMedia`; + } +} From f794987e66f044b06e53a03888accdea29839fab Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 29 Apr 2024 16:34:25 +0300 Subject: [PATCH 06/42] feat: export whatapp upload media handler --- .../whatsapp-upload-media-cron.function.ts | 24 +++++++++++++++++++ apps/conv-lm-backend/src/main.ts | 1 + .../bot-engine/whatsapp/src/index.ts | 1 + 3 files changed, 26 insertions(+) create mode 100644 apps/conv-lm-backend/src/app/bot/whatsapp-channel/whatsapp-upload-media-cron.function.ts diff --git a/apps/conv-lm-backend/src/app/bot/whatsapp-channel/whatsapp-upload-media-cron.function.ts b/apps/conv-lm-backend/src/app/bot/whatsapp-channel/whatsapp-upload-media-cron.function.ts new file mode 100644 index 0000000000..2e5a86d8c5 --- /dev/null +++ b/apps/conv-lm-backend/src/app/bot/whatsapp-channel/whatsapp-upload-media-cron.function.ts @@ -0,0 +1,24 @@ +import { RestRegistrar } from "@ngfi/functions"; + +import { WhatsappUploadMediaCronHandler } from "@app/functions/bot-engine/whatsapp"; + +import { ConvLearnFunction } from "../../../conv-learn-func.class"; + + +const handler = new WhatsappUploadMediaCronHandler(); + +/** + * @Description : When an end user sends a message to the chatbot, this function is triggered, + * handles the message and potentially responds to it + * + * It is specifically for Whatsapp @see {PlatformType}, and subscribes to the 'messages' webhook on + * the Meta Developers platform + * + * @see https://developers.facebook.com/docs/whatsapp/cloud-api/guides/set-up-webhooks + * + */ +export const channelWhatsappUploadMediaCron = new ConvLearnFunction('channelWhatsappUploadMediaCron', + new RestRegistrar(), + [], + handler) + .build(); \ No newline at end of file diff --git a/apps/conv-lm-backend/src/main.ts b/apps/conv-lm-backend/src/main.ts index c12cd7caf2..f8e9fe64d3 100644 --- a/apps/conv-lm-backend/src/main.ts +++ b/apps/conv-lm-backend/src/main.ts @@ -10,6 +10,7 @@ export * from './app/bot/whatsapp-channel/whatsapp-upload-media.function'; export * from './app/bot/whatsapp-channel/whatsapp-templates-api.function'; export * from './app/bot/whatsapp-channel/whatsapp-get-templates.function'; export * from './app/bot/whatsapp-channel/whatsapp-upload-media.function'; +export * from './app/bot/whatsapp-channel/whatsapp-upload-media-cron.function'; export * from './app/bot/main/send-outgoing-message.function'; export * from './app/bot/main/talk-to-human.function'; diff --git a/libs/functions/bot-engine/whatsapp/src/index.ts b/libs/functions/bot-engine/whatsapp/src/index.ts index 24e904da9e..86a76ef133 100644 --- a/libs/functions/bot-engine/whatsapp/src/index.ts +++ b/libs/functions/bot-engine/whatsapp/src/index.ts @@ -5,3 +5,4 @@ export * from './lib/whats-app-upload-media.handler'; export * from './lib/models/manage-templates-request.interface'; export * from './lib/whatsapp-get-templates.handler'; export * from './lib/whatsapp-manage-templates.handler'; +export * from './lib/whatsapp-upload-media-cron.function'; \ No newline at end of file From dc7f94ef6ead7b7758ec78c8639466e114648568 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 16:47:05 +0300 Subject: [PATCH 07/42] :lipstick: remove custom intercom icon size --- apps/conv-learning-manager/src/styles.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/conv-learning-manager/src/styles.scss b/apps/conv-learning-manager/src/styles.scss index 2575dcbfb2..bf5b667f40 100644 --- a/apps/conv-learning-manager/src/styles.scss +++ b/apps/conv-learning-manager/src/styles.scss @@ -15,12 +15,6 @@ body { height: 100%; } -// Intercom icon -.intercom-lightweight-app-launcher, .intercom-lightweight-app-launcher-icon { - width: 3.2rem !important; - height: 3.2rem !important; -} - //Block Connectors //endpoint .block_endpoint circle { From afcacf3a1af8cfda4b4f80fbb1c736a4a416450a Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 29 Apr 2024 17:14:09 +0300 Subject: [PATCH 08/42] feat: get projectId from firebase admin --- .../src/lib/whatsapp-upload-media-cron.function.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index e9ce594deb..f279c46cec 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -1,3 +1,4 @@ +import * as admin from 'firebase-admin'; import { CloudSchedulerClient } from '@google-cloud/scheduler'; import { HandlerTools } from '@iote/cqrs'; @@ -12,15 +13,18 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { private projectId: string; private locationId = 'europe-west1'; - constructor(projectId:string = process.env.GCLOUD_PROJECT) { + constructor() { super(); - this.projectId = projectId; this.cloudSchedulerClient = new CloudSchedulerClient(); } public async execute(data: any, context: HttpsContext, tools: HandlerTools) { try { tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Updating whatsapp Media`); + + admin.initializeApp(); + + this.projectId = admin.instanceId().app.options.projectId; const endpoint = this.getEndpoint(); const jobName = this.getJobName(data.bot as Bot); From 4c271b8dc6655bc2c3029a36d647ec7ac384fd2c Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 29 Apr 2024 17:15:04 +0300 Subject: [PATCH 09/42] refactor: clean subscriptions --- .../bots-list-all-courses.component.ts | 17 ++++++++--------- .../bots-list-latest-courses.component.ts | 4 ++-- .../course-module-item.component.ts | 17 +++++++++++------ .../courses-list/courses-list.component.ts | 4 ++-- .../modules-list-header.component.ts | 4 ++-- .../lib/whatsapp-upload-media-cron.function.ts | 3 ++- .../src/lib/providers/file-storage.service.ts | 10 +++++----- .../services/whatsapp-upload-file.service.ts | 10 ++++++++-- 8 files changed, 40 insertions(+), 29 deletions(-) diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts index 69591446dc..12dcc10696 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts @@ -144,20 +144,21 @@ export class BotsListAllCoursesComponent implements OnInit, AfterViewInit, OnDes const published$ = dialogRef.afterClosed(); - published$.pipe(tap((published)=> { - if(published) { + this._sbS.sink = published$.pipe(tap((published)=> { + if (published) { this.isPublishing = false; } - }), + }), switchMap(() => { if(bot.linkedChannel) { this.isUploading = true; - return this._fileStorageService.uploadMediaToPlatform(bot.linkedChannel); + return this._fileStorageService.uploadMediaToPlatform(bot); } else { return of(null); } })).subscribe((result)=> { - this.isUploading = false; + this.isUploading = false; + if(result.success) { this.openSnackBar('Media upload successful', 'OK'); } else { @@ -167,14 +168,13 @@ export class BotsListAllCoursesComponent implements OnInit, AfterViewInit, OnDes }) } - archiveBot(bot: Bot) - { + archiveBot(bot: Bot) { this._dialog.open(ConfirmArchiveModalComponent, { data: { bot } }); } - deleteBot(bot:Bot){ + deleteBot(bot:Bot) { this._dialog.open(ConfirmDeleteModalComponent, { data: { mode: DeleteElementsEnum.BotModule, element: bot, @@ -186,7 +186,6 @@ export class BotsListAllCoursesComponent implements OnInit, AfterViewInit, OnDes this._snackBar.open(message, action); } - ngOnDestroy() { this._sbS.unsubscribe(); } diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-latest-courses/bots-list-latest-courses.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-latest-courses/bots-list-latest-courses.component.ts index ddd4f100c1..20f5221872 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-latest-courses/bots-list-latest-courses.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-latest-courses/bots-list-latest-courses.component.ts @@ -77,7 +77,7 @@ export class BotsListLatestCoursesComponent implements OnInit, OnDestroy const published$ = dialogRef.afterClosed(); - published$.pipe(tap((published)=> { + this._sBs.sink = published$.pipe(tap((published)=> { if(published) { this.isPublishing = false; } @@ -85,7 +85,7 @@ export class BotsListLatestCoursesComponent implements OnInit, OnDestroy switchMap(() => { if(bot.linkedChannel) { this.isUploading = true; - return this._fileStorageService.uploadMediaToPlatform(bot.linkedChannel); + return this._fileStorageService.uploadMediaToPlatform(bot); } else { return of(null); } diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/courses/course-module-item/course-module-item.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/courses/course-module-item/course-module-item.component.ts index 8ad2bcf0c5..8d252d95eb 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/courses/course-module-item/course-module-item.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/courses/course-module-item/course-module-item.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; @@ -23,7 +23,7 @@ import { ConnectToChannelModalComponent } from '../../../modals/connect-to-chann templateUrl: './course-module-item.component.html', styleUrls: ['./course-module-item.component.scss'], }) -export class CourseModuleItemComponent { +export class CourseModuleItemComponent implements OnDestroy { @Input() botModule: BotModule; @Input() story: Story; @@ -87,13 +87,18 @@ export class CourseModuleItemComponent { publishBot(bot:Bot){ this.isPublishing = true; bot.isPublished = true; - this._botsService$.updateBot(bot) + + this._sBs.sink = this._botsService$.updateBot(bot) .subscribe(() => { this.isPublishing = false; }); - if(this.uploadMedia && bot.linkedChannel) { - this._fileStorageService.uploadMediaToPlatform(bot.linkedChannel).subscribe() + if (this.uploadMedia && bot.linkedChannel) { + this._sBs.sink = this._fileStorageService.uploadMediaToPlatform(bot).subscribe() } - } + } + + ngOnDestroy() { + this._sBs.unsubscribe() + } } diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/courses/courses-list/courses-list.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/courses/courses-list/courses-list.component.ts index 0c4248d0fe..c0975ae4c6 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/courses/courses-list/courses-list.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/courses/courses-list/courses-list.component.ts @@ -65,7 +65,7 @@ export class CoursesListComponent implements OnDestroy { const published$ = dialogRef.afterClosed(); - published$.pipe(tap((published)=> { + this._sBs.sink = published$.pipe(tap((published)=> { if(published) { this.isPublishing = false; } @@ -73,7 +73,7 @@ export class CoursesListComponent implements OnDestroy { switchMap(() => { if(bot.linkedChannel) { this.isUploading = true; - return this._fileStorageService.uploadMediaToPlatform(bot.linkedChannel); + return this._fileStorageService.uploadMediaToPlatform(bot); } else { return of(null); } diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/modules/modules-list-header/modules-list-header.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/modules/modules-list-header/modules-list-header.component.ts index cdfb9f1a9b..2ba351e2fc 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/modules/modules-list-header/modules-list-header.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/modules/modules-list-header/modules-list-header.component.ts @@ -131,7 +131,7 @@ export class BotModulesListHeaderComponent implements OnInit, OnDestroy { const published$ = dialogRef.afterClosed(); - published$.pipe(tap((published)=> { + this._sBs.sink = published$.pipe(tap((published)=> { if(published) { this.isPublishing = false; } @@ -139,7 +139,7 @@ export class BotModulesListHeaderComponent implements OnInit, OnDestroy { switchMap(() => { if(bot.linkedChannel) { this.isUploading = true; - return this._fileStorageService.uploadMediaToPlatform(bot.linkedChannel); + return this._fileStorageService.uploadMediaToPlatform(bot); } else { return of(null); } diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index f279c46cec..b31880eb45 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -6,6 +6,7 @@ import { FunctionHandler, HttpsContext } from '@ngfi/functions'; import { Bot } from '@app/model/convs-mgr/bots'; import { HttpMethodTypes } from '@app/model/convs-mgr/stories/blocks/main'; +import { CommunicationChannel } from '@app/model/convs-mgr/conversations/admin/system'; /** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ export class WhatsappUploadMediaCronHandler extends FunctionHandler { @@ -18,7 +19,7 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { this.cloudSchedulerClient = new CloudSchedulerClient(); } - public async execute(data: any, context: HttpsContext, tools: HandlerTools) { + public async execute(data: { channel: CommunicationChannel, bot: Bot }, context: HttpsContext, tools: HandlerTools) { try { tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Updating whatsapp Media`); diff --git a/libs/state/file/store/src/lib/providers/file-storage.service.ts b/libs/state/file/store/src/lib/providers/file-storage.service.ts index 20197e7070..f7201b9794 100644 --- a/libs/state/file/store/src/lib/providers/file-storage.service.ts +++ b/libs/state/file/store/src/lib/providers/file-storage.service.ts @@ -9,6 +9,7 @@ import { WhatsappUploadFileService } from '@app/state/file/whatsapp'; import { CommunicationChannelService } from '@app/state/convs-mgr/channels'; import { FILE_LIMITS } from '../model/platform-file-size-limits'; +import { Bot } from '@app/model/convs-mgr/bots'; @Injectable({ providedIn: 'root' @@ -64,15 +65,14 @@ export class FileStorageService } } - uploadMediaToPlatform(channelId: string) + uploadMediaToPlatform(bot: Bot) { - return this.channelService.getSpecificChannel(channelId).pipe(switchMap((channel)=> { - if(channel) { - return this._whatsappUploadFileService.uploadMedia(channel); + return this.channelService.getSpecificChannel(bot.linkedChannel as string).pipe(switchMap((channel)=> { + if (channel) { + return this._whatsappUploadFileService.uploadMedia(bot, channel); } else { return of(null); } })) } - } diff --git a/libs/state/file/whatsapp/src/lib/services/whatsapp-upload-file.service.ts b/libs/state/file/whatsapp/src/lib/services/whatsapp-upload-file.service.ts index 4762e806b2..5a8ebafccb 100644 --- a/libs/state/file/whatsapp/src/lib/services/whatsapp-upload-file.service.ts +++ b/libs/state/file/whatsapp/src/lib/services/whatsapp-upload-file.service.ts @@ -1,6 +1,7 @@ import { Injectable } from "@angular/core"; import { AngularFireFunctions } from '@angular/fire/compat/functions'; +import { Bot } from "@app/model/convs-mgr/bots"; import { WhatsAppCommunicationChannel } from "@app/model/convs-mgr/conversations/admin/system"; @Injectable({ @@ -11,8 +12,13 @@ export class WhatsappUploadFileService { constructor(private _aFF: AngularFireFunctions) { } - uploadMedia(channel: WhatsAppCommunicationChannel) + uploadMedia(bot:Bot, channel: WhatsAppCommunicationChannel) { - return this._aFF.httpsCallable('channelWhatsappUploadMedia')(channel) + const payload = { + channel, + bot, + } + + return this._aFF.httpsCallable('channelWhatsappUploadMediaCron')(payload) } } \ No newline at end of file From 1ca61a87697bbbbb42473fe31308fb652155c94d Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 17:18:47 +0300 Subject: [PATCH 10/42] :lipstick: add close icon to blocks library --- .../blocks-library/blocks-library.component.html | 5 +++++ .../blocks-library/blocks-library.component.scss | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html index 4194b0fa69..fbc985149c 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html @@ -1,4 +1,9 @@
+
+
+ +
+
diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss index 3e65d217b5..4b167bf2c8 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss @@ -19,6 +19,22 @@ width: 5px; } +.block-library-top-section { + display: flex; + flex-direction: column; + margin-top: 1rem; + margin-bottom: 3rem; + align-items: flex-end; + + .btn-wrapper { + padding: 0.2rem; + cursor: pointer; + right: 5px; + top: 5px; + color: black; + } +} + .search-input { width: 100%; } From 91fb5a84b940323dd606859aaef6daa38575df36 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 17:19:18 +0300 Subject: [PATCH 11/42] :lipstick: change open blocks library icon --- .../editor/src/lib/pages/story-editor/story-editor.page.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html index ca71be4285..235b680bd8 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html @@ -32,8 +32,7 @@ From d9bc36de76d30a2dea21df32a337bbcfaeca16af Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 17:19:49 +0300 Subject: [PATCH 12/42] :lipstick: :wrench: add block library close logic to component --- .../blocks-library/blocks-library.component.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts index 71f457b4c3..d81aeba875 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts @@ -18,6 +18,7 @@ import { import { StoryEditorFrame } from '../../model/story-editor-frame.model'; import { DragDropService } from '../../providers/drag-drop.service'; import { ICONS_AND_TITLES } from '@app/features/convs-mgr/stories/blocks/library/main'; +import { SideScreenToggleService } from '../../providers/side-screen-toggle.service'; /** * Component which holds a library (list) of all blocks that can be created @@ -33,6 +34,7 @@ export class BlocksLibraryComponent implements OnInit, OnDestroy { @Input() frame: StoryEditorFrame; filterInput$$: BehaviorSubject = new BehaviorSubject(''); + isSideScreenOpen:boolean; blockTemplates: StoryBlock[] = [ { id: 'input-message-block', type: StoryBlockTypes.TextMessage, message: 'Message', blockIcon: this.getBlockIcon(StoryBlockTypes.TextMessage), blockCategory: 'messages-block' } as TextMessageBlock, @@ -71,9 +73,13 @@ export class BlocksLibraryComponent implements OnInit, OnDestroy { ]; blockTemplate$: Observable = of(this.blockTemplates); - constructor(private _logger: Logger, private dragService: DragDropService) {} + constructor(private _logger: Logger, private dragService: DragDropService, private sideScreen: SideScreenToggleService,) {} ngOnInit(): void { + this._sbS.sink + = this.sideScreen.sideScreen$ + .subscribe((isOpen) => this.isSideScreenOpen = isOpen); + // WARN in case frame is not yet loaded. This might cause issues on the node loader. if (!this.frame || !this.frame.loaded) this._logger.warn(() => `Blocks library loaded yet frame not yet loaded.`); @@ -99,6 +105,11 @@ export class BlocksLibraryComponent implements OnInit, OnDestroy { this.filterInput$$.next(event.target.value); } + toggleSidenav() { + this.sideScreen.toggleSideScreen(!this.isSideScreenOpen) + // this.onClose() + } + ngOnDestroy() { this._sbS.unsubscribe(); } From 7c991d2d6c862d999b2eb9cdae33740bed09ea6b Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Mon, 29 Apr 2024 17:20:10 +0300 Subject: [PATCH 13/42] :lipstick: change block library icon style --- .../pages/story-editor/story-editor.page.scss | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss index 5b1b3af7a7..cdfe668382 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss @@ -81,14 +81,12 @@ mat-sidenav { .toggle-btn { - background-color: var(--endpoint-color); + background-color: transparent; border: none; transition: transform 0.3s ease; - padding: 8px; border-radius: 5px; - width: 3.5rem; cursor: pointer; - color: var(--endpoint-outline); + color: black; .tooltip { font-size: 1.2rem; @@ -125,26 +123,6 @@ mat-sidenav { cursor: pointer; } -// .zoom-btn.in { -// position: fixed; -// z-index: 2147483003; -// padding: 0 !important; -// margin: 0 !important; -// border: none; -// bottom: 80px; -// right: 20px; -// max-width: 48px; -// width: 48px; -// max-height: 48px; -// height: 48px; -// border-radius: 50%; -// background: #fff; -// cursor: pointer; -// box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.06), 0 2px 32px 0 rgba(0, 0, 0, 0.16); -// transition: transform 167ms cubic-bezier(0.33, 0.00, 0.00, 1.00); -// box-sizing: content-box; -// } - .wrapper-edit { display: flex; flex-direction: column; From 96197dc55fb821ba049d64624228e75a7c20fc59 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Tue, 30 Apr 2024 08:57:38 +0300 Subject: [PATCH 14/42] :lipstick: style open blocks library icon to match design --- .../src/lib/pages/story-editor/story-editor.page.html | 4 ++-- .../src/lib/pages/story-editor/story-editor.page.scss | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html index 235b680bd8..20987ccc03 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html @@ -31,8 +31,8 @@
- diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss index cdfe668382..e373edf97b 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.scss @@ -81,12 +81,14 @@ mat-sidenav { .toggle-btn { - background-color: transparent; + position: fixed; + background-color: white; border: none; transition: transform 0.3s ease; - border-radius: 5px; cursor: pointer; color: black; + margin-left: -1rem; + padding: 0.2rem 0.3rem 0.2rem 0.6rem; .tooltip { font-size: 1.2rem; From b9556e941e82d806625c5fc4819471ed4fcbb666 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Tue, 30 Apr 2024 11:58:02 +0300 Subject: [PATCH 15/42] feat: update whatsapp media cron creator/update handler --- .../whatsapp-upload-media-cron.function.ts | 78 +++++++++++-------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index b31880eb45..aae0c2a114 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -21,58 +21,68 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { public async execute(data: { channel: CommunicationChannel, bot: Bot }, context: HttpsContext, tools: HandlerTools) { try { - tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Updating whatsapp Media`); - - admin.initializeApp(); + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Running`); this.projectId = admin.instanceId().app.options.projectId; + const jobName = this.getJobName(data.bot); - const endpoint = this.getEndpoint(); - const jobName = this.getJobName(data.bot as Bot); + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Checking if cron already exists`); - const [job, ...jobs] = await this.cloudSchedulerClient.getJob({ - name: jobName, - }); + const job = await this.checkIfJobExists(jobName); - console.log({job, jobs}); + if (job) { + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Job ${job.name} already exists. Exiting...`); + return; + } - if (job) return; + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Creating Whatsapp media cron job`); - const body = JSON.stringify(data.channel); - - const newJob = { - name: jobName, - httpTarget: { - uri: endpoint, - body: Buffer.from(body,'utf-8').toString('base64'), - httpMethod: HttpMethodTypes.POST, - headers: { 'Content-Type': 'application/json' }, - }, - schedule: '0 18 * * *', - }; - - const request = { - parent: `projects/${this.projectId}/locations/${this.locationId}`, - newJob, - }; - - const res = this.cloudSchedulerClient.createJob(request); + const res = await this.createCronJob(data.channel, jobName); + + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res[0].name}`); console.log({res}); } catch (error) { tools.Logger.error(() => `[WhatsappMediaUpdateCronHandler] - Error in WhatsappMediaUpdateCronHandler: ${error.message}`); - console.error(error.message); } } + private async checkIfJobExists(jobName: string) { + const [jobs] = await this.cloudSchedulerClient.listJobs({ + parent: `projects/${this.projectId}/locations/${this.locationId}`, + }) + + const job = jobs.find((job) => job.name === jobName); + return job + } + + private async createCronJob(channel: CommunicationChannel, jobName: string) { + const endpoint = `https://${this.locationId}-${this.projectId}.cloudfunctions.net/channelWhatsappUploadMedia`; + const body = JSON.stringify(channel); + + const newJob = { + name: jobName, + httpTarget: { + uri: endpoint, + body: Buffer.from(body,'utf-8').toString('base64'), + httpMethod: HttpMethodTypes.POST, + headers: { 'Content-Type': 'application/json' }, + }, + schedule: '0 18 * * *', + }; + + const request = { + parent: `projects/${this.projectId}/locations/${this.locationId}`, + newJob, + }; + + return this.cloudSchedulerClient.createJob(request); + } + private getJobName(bot: Bot): string { const jobPath = `projects/${this.projectId}/locations/${this.locationId}/jobs/`; const jobId = `${bot.id}`; return jobPath + jobId; } - - private getEndpoint(): string { - return `https://${this.locationId}-${this.projectId}.cloudfunctions.net/channelWhatsappUploadMedia`; - } } From d84a861d644d0b97063087ca24ac7fc5e1686b2c Mon Sep 17 00:00:00 2001 From: Lemmy Date: Tue, 30 Apr 2024 12:35:27 +0300 Subject: [PATCH 16/42] refactor: add types to handler --- .../src/lib/models/gcp-job.interface.ts | 40 +++++++++++++++++++ .../src/lib/models/whatsapp-cron.interface.ts | 7 ++++ .../whatsapp-upload-media-cron.function.ts | 23 ++++++----- 3 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts create mode 100644 libs/functions/bot-engine/whatsapp/src/lib/models/whatsapp-cron.interface.ts diff --git a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts new file mode 100644 index 0000000000..03d58dd959 --- /dev/null +++ b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts @@ -0,0 +1,40 @@ +import { Timestamp } from "@firebase/firestore-types"; + +/** + * A Google Cloud Job which can be scheduled on the Cloud Scheduler to run on a + * recurring mannner. Google cloud scheduler supports recurring jobs as cron. + * + * @see https://googleapis.dev/nodejs/scheduler/latest/google.cloud.scheduler.v1beta1.IJob.html + */ +export interface GcpJob +{ + /** + * The name of the job. + * @important - The name of the job acts as the ID of the job. + * So it needs to be used to e.g. view job details + * and to update/delete the job. + */ + name: string; + description?: string; + + /** Cron expression for the job schedule */ + schedule: string; + + httpTarget: { + uri: string; + httpMethod: HttpMethodTypes; + headers: ({ [k: string]: string }|null); + body: string; + }; +} + +export enum HttpMethodTypes { + HTTP_METHOD_UNSPECIFIED = 0, + POST = 1, + GET = 2, + HEAD = 3, + PUT = 4, + DELETE = 5, + PATCH = 6, + OPTIONS = 7 +} diff --git a/libs/functions/bot-engine/whatsapp/src/lib/models/whatsapp-cron.interface.ts b/libs/functions/bot-engine/whatsapp/src/lib/models/whatsapp-cron.interface.ts new file mode 100644 index 0000000000..d8cbc8fafd --- /dev/null +++ b/libs/functions/bot-engine/whatsapp/src/lib/models/whatsapp-cron.interface.ts @@ -0,0 +1,7 @@ +import { Bot } from '@app/model/convs-mgr/bots'; +import { CommunicationChannel } from '@app/model/convs-mgr/conversations/admin/system'; + +export interface WhatsappCronUpdateData { + channel: CommunicationChannel; + bot: Bot; +} diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index aae0c2a114..5966df6529 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -5,11 +5,13 @@ import { HandlerTools } from '@iote/cqrs'; import { FunctionHandler, HttpsContext } from '@ngfi/functions'; import { Bot } from '@app/model/convs-mgr/bots'; -import { HttpMethodTypes } from '@app/model/convs-mgr/stories/blocks/main'; import { CommunicationChannel } from '@app/model/convs-mgr/conversations/admin/system'; +import { GcpJob, HttpMethodTypes } from './models/gcp-job.interface'; +import { WhatsappCronUpdateData } from './models/whatsapp-cron.interface'; + /** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ -export class WhatsappUploadMediaCronHandler extends FunctionHandler { +export class WhatsappUploadMediaCronHandler extends FunctionHandler { private cloudSchedulerClient: CloudSchedulerClient; private projectId: string; private locationId = 'europe-west1'; @@ -19,7 +21,7 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { this.cloudSchedulerClient = new CloudSchedulerClient(); } - public async execute(data: { channel: CommunicationChannel, bot: Bot }, context: HttpsContext, tools: HandlerTools) { + public async execute(data: WhatsappCronUpdateData, context: HttpsContext, tools: HandlerTools) { try { tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Running`); @@ -35,11 +37,9 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { return; } - tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Creating Whatsapp media cron job`); - - const res = await this.createCronJob(data.channel, jobName); + const [res] = await this.createCronJob(data.channel, jobName); - tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res[0].name}`); + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); console.log({res}); } catch (error) { @@ -60,7 +60,7 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { const endpoint = `https://${this.locationId}-${this.projectId}.cloudfunctions.net/channelWhatsappUploadMedia`; const body = JSON.stringify(channel); - const newJob = { + const newJob: GcpJob = { name: jobName, httpTarget: { uri: endpoint, @@ -68,15 +68,16 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler { httpMethod: HttpMethodTypes.POST, headers: { 'Content-Type': 'application/json' }, }, - schedule: '0 18 * * *', + schedule: '0 18 */30 * *' + }; const request = { parent: `projects/${this.projectId}/locations/${this.locationId}`, - newJob, + job: newJob, }; - return this.cloudSchedulerClient.createJob(request); + return this.cloudSchedulerClient.createJob(request as any); } private getJobName(bot: Bot): string { From af10aec085c99b79b4903d1082c2dcddb4b7a2da Mon Sep 17 00:00:00 2001 From: Lemmy Date: Tue, 30 Apr 2024 12:45:48 +0300 Subject: [PATCH 17/42] feat: run scheduler at currentTIme --- .../whatsapp/src/lib/models/gcp-job.interface.ts | 3 +++ .../src/lib/whatsapp-upload-media-cron.function.ts | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts index 03d58dd959..3374322490 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts @@ -26,6 +26,9 @@ export interface GcpJob headers: ({ [k: string]: string }|null); body: string; }; + + /** In case of a Cloud Scheduler, the time at which to perform the action */ + scheduleTime: Timestamp; } export enum HttpMethodTypes { diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index 5966df6529..78a3730913 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -1,4 +1,5 @@ import * as admin from 'firebase-admin'; +import { Timestamp } from 'firebase-admin/firestore'; import { CloudSchedulerClient } from '@google-cloud/scheduler'; import { HandlerTools } from '@iote/cqrs'; @@ -60,6 +61,8 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler Date: Tue, 30 Apr 2024 15:03:12 +0300 Subject: [PATCH 18/42] feat: add timezone property to payload --- .../whatsapp/src/lib/models/gcp-job.interface.ts | 1 + .../whatsapp/src/lib/whats-app-upload-media.handler.ts | 2 +- .../src/lib/whatsapp-upload-media-cron.function.ts | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts index 3374322490..11d253e397 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts @@ -29,6 +29,7 @@ export interface GcpJob /** In case of a Cloud Scheduler, the time at which to perform the action */ scheduleTime: Timestamp; + timeZone: string; } export enum HttpMethodTypes { diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whats-app-upload-media.handler.ts b/libs/functions/bot-engine/whatsapp/src/lib/whats-app-upload-media.handler.ts index d49794b1ad..594e574485 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whats-app-upload-media.handler.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whats-app-upload-media.handler.ts @@ -180,7 +180,7 @@ export class WhatsAppUploadMediaHandler extends FunctionHandler `[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); - console.log({res}); } catch (error) { tools.Logger.error(() => `[WhatsappMediaUpdateCronHandler] - Error in WhatsappMediaUpdateCronHandler: ${error.message}`); @@ -59,7 +58,8 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler Date: Tue, 30 Apr 2024 15:03:57 +0300 Subject: [PATCH 19/42] feat: unsubscribe to prevent unnecesary calls --- .../bots-list-all-courses/bots-list-all-courses.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts index 12dcc10696..c6f1ae319a 100644 --- a/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts +++ b/libs/features/convs-mgr/stories/home/src/lib/components/bots/bots-list-all-courses/bots-list-all-courses.component.ts @@ -166,6 +166,8 @@ export class BotsListAllCoursesComponent implements OnInit, AfterViewInit, OnDes this.openSnackBar('Media upload failed. Confirm channel details', 'OK'); } }) + + this._sbS.unsubscribe(); } archiveBot(bot: Bot) { From 16f1cd72351e50863ceb0a6e7d548ab4f9f21e88 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 10:01:18 +0300 Subject: [PATCH 20/42] :lipstick: adjust end block padding --- .../src/lib/components/end-anchor/end-anchor.component.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/features/convs-mgr/stories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss b/libs/features/convs-mgr/stories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss index 27955c0f8e..cb01992981 100644 --- a/libs/features/convs-mgr/stories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss +++ b/libs/features/convs-mgr/stories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss @@ -4,6 +4,7 @@ height: 1.5rem; width: 6.5rem; padding: 0.4rem; + padding-left: 1rem; background-color: var(--convs-mgr-button-color); color: white; text-align: center; @@ -11,7 +12,7 @@ z-index: 10; font-size: small; display: flex; - justify-content: space-evenly; + justify-content: space-between; align-items: center; flex-direction: row; } From 131b40b4844bd5f3051f18cf39fffa0b7ae66277 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 11:56:35 +0300 Subject: [PATCH 21/42] :lipstick: style blocks search filter --- .../blocks-library.component.html | 16 +++--- .../blocks-library.component.scss | 51 ++++++++++++++++--- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html index fbc985149c..85680a213e 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html @@ -1,16 +1,20 @@ -
+
-
- - - - +
+
+ + +
+ +
diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss index 4b167bf2c8..1e09e89edb 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss @@ -1,4 +1,9 @@ .nav { + display: flex !important; + flex-direction: column !important; + justify-content: flex-start !important; + gap: 1.5rem; + min-width: 100%; max-height: 100vh; height: 100%; @@ -10,7 +15,7 @@ color: slategray; } -.nav:hover { +.blocks-nav:hover { overflow-y: scroll; scrollbar-gutter: stable both-edges; } @@ -23,7 +28,6 @@ display: flex; flex-direction: column; margin-top: 1rem; - margin-bottom: 3rem; align-items: flex-end; .btn-wrapper { @@ -35,13 +39,46 @@ } } -.search-input { - width: 100%; +.block-filters { + display: flex; + flex-direction: column; + + ::placeholder { + font-weight: 300; + } + + :-ms-input-placeholder { + font-weight: 300; + } + + ::-ms-input-placeholder { + font-weight: 300; + } } -.search, -.search input { - max-width: 100%; +.search { + height: 5px; + width: 90%; + background-color: white; + border-radius: 30px; + display: flex; + align-items: center; + padding: 20px; + + &_tooltip { + color: gray; + font-size: 20px; + font-weight: 300 !important; + } + + &_input { + width: 90%; + height: 30px; + border: none; + outline: none; + font-size: 15px; + padding-left: 6px; + } } .block-list { From a66540d865fe84befe7e4416500ec8ca73e3a68b Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 13:01:08 +0300 Subject: [PATCH 22/42] :lipstick: fix block library color & overflow --- .../blocks-library/blocks-library.component.scss | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss index 1e09e89edb..6b8c519d97 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss @@ -12,10 +12,10 @@ overflow-y: hidden; scrollbar-gutter: stable both-edges; background-color: #F6F6F6; - color: slategray; + color: #101010; } -.blocks-nav:hover { +.nav:hover { overflow-y: scroll; scrollbar-gutter: stable both-edges; } @@ -39,20 +39,27 @@ } } +.header-title { + +} + .block-filters { display: flex; flex-direction: column; ::placeholder { font-weight: 300; + color: #101010; } :-ms-input-placeholder { font-weight: 300; + color: #101010; } ::-ms-input-placeholder { font-weight: 300; + color: #101010; } } @@ -66,7 +73,7 @@ padding: 20px; &_tooltip { - color: gray; + color: #101010; font-size: 20px; font-weight: 300 !important; } @@ -86,6 +93,7 @@ margin-bottom: 0.4rem; font-size: 0.8rem; margin-top: 0px; + font-weight: 400; &:not(.first-title) { margin-top: 1rem; From e448993269589af1e9bcb5d30838c1630cea4977 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 13:01:31 +0300 Subject: [PATCH 23/42] :lipstick: add block library header title --- .../components/blocks-library/blocks-library.component.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html index 85680a213e..4ec834b250 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html @@ -4,6 +4,11 @@
+ +
+ Choose Element +
+
From 35e227241bce6ce41b6c75e0af7fd0e935741920 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 13:03:10 +0300 Subject: [PATCH 24/42] :lipstick: style block icons menu --- .../components/grouped-blocks/grouped-blocks.component.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss index c286583b3c..0026beb4d0 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss @@ -35,8 +35,9 @@ white-space: normal; word-break: normal; height: max-content; - font-weight: 500; - color: slategray; + font-weight: 300; + color: #101010; + padding-top: 0.3rem; margin: 0; } } From 96391fd4c29fc419dea80817658d1228ae34f53f Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 13:05:23 +0300 Subject: [PATCH 25/42] :lipstick: reduce search placeholder font size --- .../blocks-library/blocks-library.component.scss | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss index 6b8c519d97..f0d1bf3fa4 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss @@ -48,16 +48,19 @@ flex-direction: column; ::placeholder { + font-size: small; font-weight: 300; color: #101010; } - + :-ms-input-placeholder { + font-size: small; font-weight: 300; color: #101010; - } - - ::-ms-input-placeholder { + } + + ::-ms-input-placeholder { + font-size: small; font-weight: 300; color: #101010; } From 364cc6975b62f8f0ae0b7007ba898c705756ea08 Mon Sep 17 00:00:00 2001 From: Reagan Charana Date: Thu, 2 May 2024 13:20:40 +0300 Subject: [PATCH 26/42] :lipstick: add white background to block text and icon --- .../grouped-blocks/grouped-blocks.component.scss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss index 0026beb4d0..c386162713 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/grouped-blocks/grouped-blocks.component.scss @@ -3,12 +3,18 @@ grid-template-columns: repeat(3, 1fr); gap: 8px; - .blocks-main { - height: 60px; - border-radius: 5px; - word-wrap: break-word; + .block { + display: flex; + flex-direction: column; + gap: 1rem; background-color: #fff; box-shadow: 0px 10px -14px 14px #fff; + border-radius: 10px; + padding: 1.4rem 0.4rem; + } + + .blocks-main { + word-wrap: break-word; } .svgIcon { @@ -30,7 +36,7 @@ } .block-messages { - font-size: 0.7rem; + font-size: 0.725rem; text-align: center; white-space: normal; word-break: normal; From 883d307f02df7c27590f9490c7c04adc1775e515 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 3 May 2024 18:53:26 +0300 Subject: [PATCH 27/42] feat: generate gcp-scheduler types --- angular.json | 26 ++++++++++++++ libs/model/cloud-scheduler/.eslintrc.json | 36 +++++++++++++++++++ libs/model/cloud-scheduler/README.md | 7 ++++ libs/model/cloud-scheduler/jest.config.ts | 22 ++++++++++++ libs/model/cloud-scheduler/src/index.ts | 1 + .../src/lib/model-cloud-scheduler.module.ts | 7 ++++ libs/model/cloud-scheduler/src/test-setup.ts | 1 + libs/model/cloud-scheduler/tsconfig.json | 28 +++++++++++++++ libs/model/cloud-scheduler/tsconfig.lib.json | 17 +++++++++ libs/model/cloud-scheduler/tsconfig.spec.json | 10 ++++++ tsconfig.base.json | 1 + 11 files changed, 156 insertions(+) create mode 100644 libs/model/cloud-scheduler/.eslintrc.json create mode 100644 libs/model/cloud-scheduler/README.md create mode 100644 libs/model/cloud-scheduler/jest.config.ts create mode 100644 libs/model/cloud-scheduler/src/index.ts create mode 100644 libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts create mode 100644 libs/model/cloud-scheduler/src/test-setup.ts create mode 100644 libs/model/cloud-scheduler/tsconfig.json create mode 100644 libs/model/cloud-scheduler/tsconfig.lib.json create mode 100644 libs/model/cloud-scheduler/tsconfig.spec.json diff --git a/angular.json b/angular.json index a26000e3c1..9458b76c2f 100644 --- a/angular.json +++ b/angular.json @@ -1056,6 +1056,32 @@ }, "tags": [] }, + "model-cloud-scheduler": { + "projectType": "library", + "root": "libs/model/cloud-scheduler", + "sourceRoot": "libs/model/cloud-scheduler/src", + "prefix": "app", + "targets": { + "test": { + "executor": "@nrwl/jest:jest", + "outputs": ["coverage/libs/model/cloud-scheduler"], + "options": { + "jestConfig": "libs/model/cloud-scheduler/jest.config.ts", + "passWithNoTests": true + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": [ + "libs/model/cloud-scheduler/**/*.ts", + "libs/model/cloud-scheduler/**/*.html" + ] + } + } + }, + "tags": [] + }, "model-convs-mgr-bot-modules": { "projectType": "library", "root": "libs/model/convs-mgr/bot-modules", diff --git a/libs/model/cloud-scheduler/.eslintrc.json b/libs/model/cloud-scheduler/.eslintrc.json new file mode 100644 index 0000000000..beecf46056 --- /dev/null +++ b/libs/model/cloud-scheduler/.eslintrc.json @@ -0,0 +1,36 @@ +{ + "extends": ["../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts"], + "extends": [ + "plugin:@nrwl/nx/angular", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "app", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "app", + "style": "kebab-case" + } + ] + } + }, + { + "files": ["*.html"], + "extends": ["plugin:@nrwl/nx/angular-template"], + "rules": {} + } + ] +} diff --git a/libs/model/cloud-scheduler/README.md b/libs/model/cloud-scheduler/README.md new file mode 100644 index 0000000000..cbf36ba95c --- /dev/null +++ b/libs/model/cloud-scheduler/README.md @@ -0,0 +1,7 @@ +# model-cloud-scheduler + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test model-cloud-scheduler` to execute the unit tests. diff --git a/libs/model/cloud-scheduler/jest.config.ts b/libs/model/cloud-scheduler/jest.config.ts new file mode 100644 index 0000000000..f107667f0b --- /dev/null +++ b/libs/model/cloud-scheduler/jest.config.ts @@ -0,0 +1,22 @@ +/* eslint-disable */ +export default { + displayName: 'model-cloud-scheduler', + preset: '../../../jest.preset.js', + setupFilesAfterEnv: ['/src/test-setup.ts'], + globals: { + 'ts-jest': { + tsconfig: '/tsconfig.spec.json', + stringifyContentPathRegex: '\\.(html|svg)$', + }, + }, + coverageDirectory: '../../../coverage/libs/model/cloud-scheduler', + transform: { + '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular', + }, + transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + snapshotSerializers: [ + 'jest-preset-angular/build/serializers/no-ng-attributes', + 'jest-preset-angular/build/serializers/ng-snapshot', + 'jest-preset-angular/build/serializers/html-comment', + ], +}; diff --git a/libs/model/cloud-scheduler/src/index.ts b/libs/model/cloud-scheduler/src/index.ts new file mode 100644 index 0000000000..bf02f74e56 --- /dev/null +++ b/libs/model/cloud-scheduler/src/index.ts @@ -0,0 +1 @@ +export * from './lib/model-cloud-scheduler.module'; diff --git a/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts b/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts new file mode 100644 index 0000000000..ba3e5fab17 --- /dev/null +++ b/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts @@ -0,0 +1,7 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +@NgModule({ + imports: [CommonModule], +}) +export class ModelCloudSchedulerModule {} diff --git a/libs/model/cloud-scheduler/src/test-setup.ts b/libs/model/cloud-scheduler/src/test-setup.ts new file mode 100644 index 0000000000..1100b3e8a6 --- /dev/null +++ b/libs/model/cloud-scheduler/src/test-setup.ts @@ -0,0 +1 @@ +import 'jest-preset-angular/setup-jest'; diff --git a/libs/model/cloud-scheduler/tsconfig.json b/libs/model/cloud-scheduler/tsconfig.json new file mode 100644 index 0000000000..7504c346ea --- /dev/null +++ b/libs/model/cloud-scheduler/tsconfig.json @@ -0,0 +1,28 @@ +{ + "extends": "../../../tsconfig.base.json", + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ], + "compilerOptions": { + "target": "es2020", + "forceConsistentCasingInFileNames": true, + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "strictTemplates": true + } +} diff --git a/libs/model/cloud-scheduler/tsconfig.lib.json b/libs/model/cloud-scheduler/tsconfig.lib.json new file mode 100644 index 0000000000..dd189dc2e4 --- /dev/null +++ b/libs/model/cloud-scheduler/tsconfig.lib.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "declaration": true, + "declarationMap": true, + "inlineSources": true, + "types": [] + }, + "exclude": [ + "src/test-setup.ts", + "**/*.spec.ts", + "jest.config.ts", + "**/*.test.ts" + ], + "include": ["**/*.ts"] +} diff --git a/libs/model/cloud-scheduler/tsconfig.spec.json b/libs/model/cloud-scheduler/tsconfig.spec.json new file mode 100644 index 0000000000..7aa46d88c0 --- /dev/null +++ b/libs/model/cloud-scheduler/tsconfig.spec.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "files": ["src/test-setup.ts"], + "include": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index b08ff09575..deffe08282 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -243,6 +243,7 @@ "@app/model/bot/blocks/default-block": [ "libs/model/bot/blocks/default-block/src/index.ts" ], + "@app/model/cloud-scheduler": ["libs/model/cloud-scheduler/src/index.ts"], "@app/model/convs-mgr/bot-modules": [ "libs/model/convs-mgr/bot-modules/src/index.ts" ], From 05f42ba4f1b64fc6c524cbd98703cb930d556f72 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 3 May 2024 19:02:05 +0300 Subject: [PATCH 28/42] refactor: move gcp-scheduler types to separate module --- .../src/lib/models/gcp-job.interface.ts | 44 ------------------- libs/model/cloud-scheduler/src/index.ts | 3 +- .../src/lib}/gcp-job.interface.ts | 20 ++++----- .../src/lib}/gcp-task.interface.ts | 0 .../src/lib/model-cloud-scheduler.module.ts | 7 --- 5 files changed, 12 insertions(+), 62 deletions(-) delete mode 100644 libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts rename libs/{private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp => model/cloud-scheduler/src/lib}/gcp-job.interface.ts (81%) rename libs/{private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp => model/cloud-scheduler/src/lib}/gcp-task.interface.ts (100%) delete mode 100644 libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts diff --git a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts b/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts deleted file mode 100644 index 11d253e397..0000000000 --- a/libs/functions/bot-engine/whatsapp/src/lib/models/gcp-job.interface.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Timestamp } from "@firebase/firestore-types"; - -/** - * A Google Cloud Job which can be scheduled on the Cloud Scheduler to run on a - * recurring mannner. Google cloud scheduler supports recurring jobs as cron. - * - * @see https://googleapis.dev/nodejs/scheduler/latest/google.cloud.scheduler.v1beta1.IJob.html - */ -export interface GcpJob -{ - /** - * The name of the job. - * @important - The name of the job acts as the ID of the job. - * So it needs to be used to e.g. view job details - * and to update/delete the job. - */ - name: string; - description?: string; - - /** Cron expression for the job schedule */ - schedule: string; - - httpTarget: { - uri: string; - httpMethod: HttpMethodTypes; - headers: ({ [k: string]: string }|null); - body: string; - }; - - /** In case of a Cloud Scheduler, the time at which to perform the action */ - scheduleTime: Timestamp; - timeZone: string; -} - -export enum HttpMethodTypes { - HTTP_METHOD_UNSPECIFIED = 0, - POST = 1, - GET = 2, - HEAD = 3, - PUT = 4, - DELETE = 5, - PATCH = 6, - OPTIONS = 7 -} diff --git a/libs/model/cloud-scheduler/src/index.ts b/libs/model/cloud-scheduler/src/index.ts index bf02f74e56..ed061057f6 100644 --- a/libs/model/cloud-scheduler/src/index.ts +++ b/libs/model/cloud-scheduler/src/index.ts @@ -1 +1,2 @@ -export * from './lib/model-cloud-scheduler.module'; +export * from './lib/gcp-job.interface'; +export * from './lib/gcp-task.interface'; diff --git a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp/gcp-job.interface.ts b/libs/model/cloud-scheduler/src/lib/gcp-job.interface.ts similarity index 81% rename from libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp/gcp-job.interface.ts rename to libs/model/cloud-scheduler/src/lib/gcp-job.interface.ts index 3374322490..867d14f9fa 100644 --- a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp/gcp-job.interface.ts +++ b/libs/model/cloud-scheduler/src/lib/gcp-job.interface.ts @@ -1,17 +1,16 @@ -import { Timestamp } from "@firebase/firestore-types"; +import { Timestamp } from '@firebase/firestore-types'; /** * A Google Cloud Job which can be scheduled on the Cloud Scheduler to run on a * recurring mannner. Google cloud scheduler supports recurring jobs as cron. - * + * * @see https://googleapis.dev/nodejs/scheduler/latest/google.cloud.scheduler.v1beta1.IJob.html */ -export interface GcpJob -{ - /** - * The name of the job. - * @important - The name of the job acts as the ID of the job. - * So it needs to be used to e.g. view job details +export interface GcpJob { + /** + * The name of the job. + * @important - The name of the job acts as the ID of the job. + * So it needs to be used to e.g. view job details * and to update/delete the job. */ name: string; @@ -23,12 +22,13 @@ export interface GcpJob httpTarget: { uri: string; httpMethod: HttpMethodTypes; - headers: ({ [k: string]: string }|null); + headers: { [k: string]: string } | null; body: string; }; /** In case of a Cloud Scheduler, the time at which to perform the action */ scheduleTime: Timestamp; + timeZone?: string; } export enum HttpMethodTypes { @@ -39,5 +39,5 @@ export enum HttpMethodTypes { PUT = 4, DELETE = 5, PATCH = 6, - OPTIONS = 7 + OPTIONS = 7, } diff --git a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp/gcp-task.interface.ts b/libs/model/cloud-scheduler/src/lib/gcp-task.interface.ts similarity index 100% rename from libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/gcp/gcp-task.interface.ts rename to libs/model/cloud-scheduler/src/lib/gcp-task.interface.ts diff --git a/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts b/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts deleted file mode 100644 index ba3e5fab17..0000000000 --- a/libs/model/cloud-scheduler/src/lib/model-cloud-scheduler.module.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -@NgModule({ - imports: [CommonModule], -}) -export class ModelCloudSchedulerModule {} From 13bc8dde6905b794b5b8bdf27d72217dedd23406 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 3 May 2024 19:02:33 +0300 Subject: [PATCH 29/42] refactor: update import path --- .../whatsapp/src/lib/whatsapp-upload-media-cron.function.ts | 4 ++-- .../src/lib/model/services/cloud-scheduler.service.ts | 3 +-- .../scheduler/src/lib/model/services/cloud-task.service.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index c91c68e005..d49f7e9fa7 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -8,7 +8,7 @@ import { FunctionHandler, HttpsContext } from '@ngfi/functions'; import { Bot } from '@app/model/convs-mgr/bots'; import { CommunicationChannel } from '@app/model/convs-mgr/conversations/admin/system'; -import { GcpJob, HttpMethodTypes } from './models/gcp-job.interface'; +import { GcpJob, HttpMethodTypes } from '@app/model/cloud-scheduler'; import { WhatsappCronUpdateData } from './models/whatsapp-cron.interface'; /** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ @@ -71,7 +71,7 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler Date: Fri, 3 May 2024 19:12:45 +0300 Subject: [PATCH 30/42] refactor: save parent path as a property --- .../whatsapp-upload-media-cron.function.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index d49f7e9fa7..71c41ad079 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -12,10 +12,11 @@ import { GcpJob, HttpMethodTypes } from '@app/model/cloud-scheduler'; import { WhatsappCronUpdateData } from './models/whatsapp-cron.interface'; /** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ -export class WhatsappUploadMediaCronHandler extends FunctionHandler { +export class WhatsappUploadMediaCronHandler extends FunctionHandler { private cloudSchedulerClient: CloudSchedulerClient; private projectId: string; private locationId = 'europe-west1'; + private baseCronPath: string; constructor() { super(); @@ -27,6 +28,9 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler `[WhatsappMediaUpdateCronHandler] - Running`); this.projectId = admin.instanceId().app.options.projectId; + + this.baseCronPath = `projects/${this.projectId}/locations/${this.locationId}`; + const jobName = this.getJobName(data.bot); tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Checking if cron already exists`); @@ -39,9 +43,8 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler `[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); + tools.Logger.log(() =>`[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); } catch (error) { tools.Logger.error(() => `[WhatsappMediaUpdateCronHandler] - Error in WhatsappMediaUpdateCronHandler: ${error.message}`); } @@ -49,43 +52,40 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler job.name === jobName); - return job + return job; } private async createCronJob(channel: CommunicationChannel, jobName: string) { const endpoint = `https://${this.locationId}-${this.projectId}.cloudfunctions.net/channelWhatsappUploadMedia`; - - const body = JSON.stringify({data: channel}); + + const body = JSON.stringify({ data: channel }); const currentTime = Timestamp.fromDate(new Date()); - + const newJob: GcpJob = { name: jobName, httpTarget: { uri: endpoint, - body: Buffer.from(body,'utf-8').toString('base64'), + body: Buffer.from(body, 'utf-8').toString('base64'), httpMethod: HttpMethodTypes.POST, headers: { 'Content-Type': 'application/json' }, }, schedule: '0 18 */29 * *', scheduleTime: currentTime, - timeZone: 'Etc/UTC' + timeZone: 'Etc/UTC', }; - const request = { - parent: `projects/${this.projectId}/locations/${this.locationId}`, - job: newJob, - }; + const request = { parent: this.baseCronPath, job: newJob }; return this.cloudSchedulerClient.createJob(request as any); } private getJobName(bot: Bot): string { - const jobPath = `projects/${this.projectId}/locations/${this.locationId}/jobs/`; + const jobPath = `${this.baseCronPath}/jobs/`; const jobId = `${bot.id}`; return jobPath + jobId; From ab3de385f754f8072b2585c04fade249df737170 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 3 May 2024 19:13:26 +0300 Subject: [PATCH 31/42] refactor: update order of imports --- .../whatsapp/src/lib/whatsapp-upload-media-cron.function.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index 71c41ad079..630ed5c15d 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -6,9 +6,9 @@ import { HandlerTools } from '@iote/cqrs'; import { FunctionHandler, HttpsContext } from '@ngfi/functions'; import { Bot } from '@app/model/convs-mgr/bots'; +import { GcpJob, HttpMethodTypes } from '@app/model/cloud-scheduler'; import { CommunicationChannel } from '@app/model/convs-mgr/conversations/admin/system'; -import { GcpJob, HttpMethodTypes } from '@app/model/cloud-scheduler'; import { WhatsappCronUpdateData } from './models/whatsapp-cron.interface'; /** Handler responsible for managing and creating whatspp app media update cron job when a bot is published */ From 4e66b00f08cb943d3c63a6ece4d32d28c812986e Mon Sep 17 00:00:00 2001 From: Lemmy Date: Fri, 3 May 2024 19:25:45 +0300 Subject: [PATCH 32/42] chore(prompted): update caniuse-lite --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0c67f8bf3..ecdee25590 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/googlemaps": "^3.43.3", "@types/unzipper": "^0.10.6", "axios": "^0.27.2", - "caniuse-lite": "^1.0.30001588", + "caniuse-lite": "^1.0.30001615", "chart.js": "^4.2.1", "cronstrue": "^2.47.0", "crypto-js": "^4.1.1", @@ -12409,9 +12409,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001608", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz", - "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==", + "version": "1.0.30001615", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz", + "integrity": "sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index 0bbe0a38db..666df00e47 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@types/googlemaps": "^3.43.3", "@types/unzipper": "^0.10.6", "axios": "^0.27.2", - "caniuse-lite": "^1.0.30001588", + "caniuse-lite": "^1.0.30001615", "chart.js": "^4.2.1", "cronstrue": "^2.47.0", "crypto-js": "^4.1.1", From d5e7aad039aa8d2b078d0bcfbd60de49379cef80 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 6 May 2024 09:22:42 +0300 Subject: [PATCH 33/42] refactor: fix order of import --- libs/state/file/store/src/lib/providers/file-storage.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/state/file/store/src/lib/providers/file-storage.service.ts b/libs/state/file/store/src/lib/providers/file-storage.service.ts index f7201b9794..c68157c75c 100644 --- a/libs/state/file/store/src/lib/providers/file-storage.service.ts +++ b/libs/state/file/store/src/lib/providers/file-storage.service.ts @@ -4,12 +4,12 @@ import { MatDialog } from '@angular/material/dialog'; import { of, switchMap } from 'rxjs'; +import { Bot } from '@app/model/convs-mgr/bots'; import { ErrorPromptModalComponent } from '@app/elements/layout/modals'; import { WhatsappUploadFileService } from '@app/state/file/whatsapp'; import { CommunicationChannelService } from '@app/state/convs-mgr/channels'; import { FILE_LIMITS } from '../model/platform-file-size-limits'; -import { Bot } from '@app/model/convs-mgr/bots'; @Injectable({ providedIn: 'root' From 15f3d04786d01b328119559090eaf5d245a22bc9 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 6 May 2024 11:59:09 +0300 Subject: [PATCH 34/42] refactor: run job after creation --- .../src/lib/whatsapp-upload-media-cron.function.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts index 630ed5c15d..76ed39b4ec 100644 --- a/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts +++ b/libs/functions/bot-engine/whatsapp/src/lib/whatsapp-upload-media-cron.function.ts @@ -42,7 +42,7 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler`[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); } catch (error) { @@ -81,7 +81,10 @@ export class WhatsappUploadMediaCronHandler extends FunctionHandler Date: Mon, 6 May 2024 12:42:54 +0300 Subject: [PATCH 35/42] feat: cleanup breadcrumbs module --- libs/elements/layout/ital-bread-crumb/src/index.ts | 2 +- .../ital-bread-crumb/src/ital-bread-crumb.module.ts | 12 ------------ .../src/lib/ital-bread-crumb.module.ts | 7 ++++++- 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 libs/elements/layout/ital-bread-crumb/src/ital-bread-crumb.module.ts diff --git a/libs/elements/layout/ital-bread-crumb/src/index.ts b/libs/elements/layout/ital-bread-crumb/src/index.ts index b3fc3dfac5..14f13e9f3e 100644 --- a/libs/elements/layout/ital-bread-crumb/src/index.ts +++ b/libs/elements/layout/ital-bread-crumb/src/index.ts @@ -1,4 +1,4 @@ -export * from './ital-bread-crumb.module'; +export * from './lib/ital-bread-crumb.module'; export * from './lib/services/bread-crumb.service'; //resolvers diff --git a/libs/elements/layout/ital-bread-crumb/src/ital-bread-crumb.module.ts b/libs/elements/layout/ital-bread-crumb/src/ital-bread-crumb.module.ts deleted file mode 100644 index 2e75aca33e..0000000000 --- a/libs/elements/layout/ital-bread-crumb/src/ital-bread-crumb.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; - -import { ItalBreadcrumbComponent } from './lib/components/ital-bread-crumb/ital-breadcrumb.component'; - -@NgModule({ - declarations: [ItalBreadcrumbComponent], - imports: [CommonModule, RouterModule], - exports: [ItalBreadcrumbComponent], -}) -export class ItalBreadCrumbModule {} diff --git a/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts b/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts index bd794c406f..b9177fb6fd 100644 --- a/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts +++ b/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts @@ -1,7 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +import { ItalBreadcrumbComponent } from './components/ital-bread-crumb/ital-breadcrumb.component'; @NgModule({ - imports: [CommonModule], + declarations: [ItalBreadcrumbComponent], + imports: [CommonModule, RouterModule], + exports: [ItalBreadcrumbComponent], }) export class ItalBreadCrumbModule {} From 16f8a46dacabfb990f051a877367a0db40f25cbf Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 6 May 2024 12:43:55 +0300 Subject: [PATCH 36/42] feat: create story breadcrumb component --- .../story-breadcrumb/story-breadcrumb.component.html | 1 + .../story-breadcrumb/story-breadcrumb.component.scss | 0 .../story-breadcrumb/story-breadcrumb.component.ts | 8 ++++++++ .../ital-bread-crumb/src/lib/ital-bread-crumb.module.ts | 5 +++-- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.html create mode 100644 libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.scss create mode 100644 libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.ts diff --git a/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.html b/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.html new file mode 100644 index 0000000000..62ea658e4e --- /dev/null +++ b/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.html @@ -0,0 +1 @@ +

story-breadcrumb works!

diff --git a/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.scss b/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.ts b/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.ts new file mode 100644 index 0000000000..2d1ab39e18 --- /dev/null +++ b/libs/elements/layout/ital-bread-crumb/src/lib/components/story-breadcrumb/story-breadcrumb.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-story-breadcrumb', + templateUrl: './story-breadcrumb.component.html', + styleUrls: ['./story-breadcrumb.component.scss'], +}) +export class StoryBreadcrumbComponent {} diff --git a/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts b/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts index b9177fb6fd..d19bac2b42 100644 --- a/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts +++ b/libs/elements/layout/ital-bread-crumb/src/lib/ital-bread-crumb.module.ts @@ -3,10 +3,11 @@ import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { ItalBreadcrumbComponent } from './components/ital-bread-crumb/ital-breadcrumb.component'; +import { StoryBreadcrumbComponent } from './components/story-breadcrumb/story-breadcrumb.component'; @NgModule({ - declarations: [ItalBreadcrumbComponent], + declarations: [ItalBreadcrumbComponent, StoryBreadcrumbComponent], imports: [CommonModule, RouterModule], - exports: [ItalBreadcrumbComponent], + exports: [ItalBreadcrumbComponent, StoryBreadcrumbComponent], }) export class ItalBreadCrumbModule {} From 8b604bad2bc648de53bef4afa9a92ccd6a3f364a Mon Sep 17 00:00:00 2001 From: Lemmy Date: Mon, 6 May 2024 15:01:40 +0300 Subject: [PATCH 37/42] feat: add breadcrumbs to story editor --- .../src/lib/convl-story-editor.module.ts | 7 ++- .../pages/story-editor/story-editor.page.html | 7 ++- .../pages/story-editor/story-editor.page.scss | 5 ++ .../pages/story-editor/story-editor.page.ts | 50 ++++++++++++++++--- 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/libs/features/convs-mgr/stories/editor/src/lib/convl-story-editor.module.ts b/libs/features/convs-mgr/stories/editor/src/lib/convl-story-editor.module.ts index a6c03e176c..1c08bd07c5 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/convl-story-editor.module.ts +++ b/libs/features/convs-mgr/stories/editor/src/lib/convl-story-editor.module.ts @@ -13,6 +13,8 @@ import { StoryEditorStateModule } from '@app/state/convs-mgr/story-editor'; import { ConvlPageModule } from '@app/elements/layout/page-convl'; import { ToastModule } from '@app/elements/layout/toast' +import { ItalBreadCrumbModule } from '@app/elements/layout/ital-bread-crumb'; + import { BlocksLibraryModule } from '@app/features/convs-mgr/stories/blocks/library/main'; import { ConvsMgrAnchorBlockModule } from '@app/features/convs-mgr/stories/blocks/library/anchor-block' @@ -33,9 +35,6 @@ import { BlockCategoryPipe } from './components/pipes/block-category-pipe.pipe'; import { StoryEditorMiniMapComponent } from './components/minimap/minimap.component'; import { SaveStoryService } from './providers/save-story.service'; - - - @NgModule({ imports: [ CommonModule, MultiLangModule, PortalModule, InfiniteScrollModule, @@ -44,7 +43,7 @@ import { SaveStoryService } from './providers/save-story.service'; ConvlPageModule, ConvsMgrAnchorBlockModule, BlocksLibraryModule, StoryEditorStateModule, ConvlStoryEditorRouterModule, MatStepperModule, - ToastModule + ToastModule, ItalBreadCrumbModule ], declarations: [ diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html index 20987ccc03..333528be15 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.html @@ -1,4 +1,4 @@ - +
@@ -35,6 +35,11 @@ + +
+ +
+
- -
-
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.CMI5-BLOCKS' | transloco }}
+ +
+
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.OPERATION-BLOCKS' | transloco }}
- - -
-
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.IMAGE-BLOCKS' | transloco }}
- -
- - -
-
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.DOCUMENT-BLOCKS' | transloco }}
- -
- - -
-
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.MULTIMEDIA-BLOCKS' | transloco }}
+ +
+
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.BRICKS' | transloco }}
@@ -63,11 +50,5 @@
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.MULTIMEDIA-BLOC
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.END-BLOCK' | transloco }}
- - -
-
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.BRICKS' | transloco }}
- -
diff --git a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts index d81aeba875..e93caf49ce 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts +++ b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.ts @@ -41,33 +41,33 @@ export class BlocksLibraryComponent implements OnInit, OnDestroy { // { id: 'io-questions-block', type: StoryBlockTypes.Input, message: 'Input', blockIcon: this.getBlockIcon(StoryBlockTypes.Input) } as QuestionMessageBlock, { id: 'story-end-anchor', type:StoryBlockTypes.EndStoryAnchorBlock, message: 'End Story', blockIcon:this.getBlockIcon(StoryBlockTypes.EndStoryAnchorBlock), blockCategory: 'end-block'} as EndStoryAnchorBlock, // { id: 'io-block', type: StoryBlockTypes.IO, message: 'IO', blockIcon: this.getBlockIcon(StoryBlockTypes.IO) } as QuestionMessageBlock, - { id: 'input-location-block', type: StoryBlockTypes.Location, message: 'Location', blockIcon: this.getBlockIcon(StoryBlockTypes.Location), blockCategory: 'questions-block' } as LocationMessageBlock, - { id: 'input-image-block', type: StoryBlockTypes.Image, message: 'Image', blockIcon: this.getBlockIcon(StoryBlockTypes.Image), blockCategory: 'images-block' } as ImageMessageBlock, + { id: 'input-location-block', type: StoryBlockTypes.Location, message: 'Location', blockIcon: this.getBlockIcon(StoryBlockTypes.Location), blockCategory: 'messages-block' } as LocationMessageBlock, + { id: 'input-image-block', type: StoryBlockTypes.Image, message: 'Image', blockIcon: this.getBlockIcon(StoryBlockTypes.Image), blockCategory: 'messages-block' } as ImageMessageBlock, { id: 'input-question-block', type: StoryBlockTypes.QuestionBlock, message: 'Question', blockIcon: this.getBlockIcon(StoryBlockTypes.QuestionBlock), blockCategory: 'questions-block' } as QuestionMessageBlock, - { id: 'input-docs-block', type: StoryBlockTypes.Document, message: 'Document', blockIcon: this.getBlockIcon(StoryBlockTypes.Document), blockCategory: 'documents-block' } as DocumentMessageBlock, - { id: 'input-audio-block', type: StoryBlockTypes.Audio, message: 'Audio', blockIcon: this.getBlockIcon(StoryBlockTypes.Audio), blockCategory: 'multimedia-block' } as VoiceMessageBlock, + { id: 'input-docs-block', type: StoryBlockTypes.Document, message: 'Document', blockIcon: this.getBlockIcon(StoryBlockTypes.Document), blockCategory: 'messages-block' } as DocumentMessageBlock, + { id: 'input-audio-block', type: StoryBlockTypes.Audio, message: 'Audio', blockIcon: this.getBlockIcon(StoryBlockTypes.Audio), blockCategory: 'messages-block' } as VoiceMessageBlock, // { id: 'io-structural-block', type: StoryBlockTypes.Structural, message: 'Structural', blockIcon: this.getBlockIcon(StoryBlockTypes.Structural) } as TextMessageBlock, { id: 'io-name-block', type: StoryBlockTypes.Name, message: 'Name', blockIcon: this.getBlockIcon(StoryBlockTypes.Name), blockCategory: 'questions-block' } as NameMessageBlock, { id: 'io-email-block', type: StoryBlockTypes.Email, message: 'Email', blockIcon: this.getBlockIcon(StoryBlockTypes.Email), blockCategory: 'questions-block' } as EmailMessageBlock, { id: 'io-phone-block', type: StoryBlockTypes.PhoneNumber, message: 'Phone', blockIcon: this.getBlockIcon(StoryBlockTypes.PhoneNumber), blockCategory: 'questions-block' } as PhoneMessageBlock, - { id: 'input-video-block', type: StoryBlockTypes.Video, message: 'Video', blockIcon: this.getBlockIcon(StoryBlockTypes.Video), blockCategory: 'multimedia-block' } as VideoMessageBlock, + { id: 'input-video-block', type: StoryBlockTypes.Video, message: 'Video', blockIcon: this.getBlockIcon(StoryBlockTypes.Video), blockCategory: 'messages-block' } as VideoMessageBlock, // { id: 'input-sticker-block', type: StoryBlockTypes.Sticker, message: 'Sticker', blockIcon: this.getBlockIcon(StoryBlockTypes.Sticker), blockCategory: 'images-block' } as StickerMessageBlock, { id: 'io-list-block', type: StoryBlockTypes.List, message: 'List', blockIcon: this.getBlockIcon(StoryBlockTypes.List), blockCategory: 'questions-block' } as ListMessageBlock, // { id: 'input-reply-block', type: StoryBlockTypes.Reply, message: 'Reply', blockIcon: this.getBlockIcon(StoryBlockTypes.Reply) } as ReplyMessageBlock, - { id: 'jump-story-block', type: StoryBlockTypes.JumpBlock, message: 'Jump', blockIcon: this.getBlockIcon(StoryBlockTypes.JumpBlock), blockCategory: 'questions-block' } as JumpBlock, + { id: 'jump-story-block', type: StoryBlockTypes.JumpBlock, message: 'Jump', blockIcon: this.getBlockIcon(StoryBlockTypes.JumpBlock), blockCategory: 'operation-block' } as JumpBlock, // { id: 'io-multiple-input-block', type: StoryBlockTypes.MultipleInput, message: 'MultipleInput', blockIcon:this.getBlockIcon(StoryBlockTypes.MultipleInput) } as MultipleInputMessageBlock, - { id: 'fail-block', type: StoryBlockTypes.FailBlock, message: 'Fail', blockIcon:this.getBlockIcon(StoryBlockTypes.FailBlock), blockCategory: 'questions-block' } as FailBlock, - { id: 'io-image-input-block' , type: StoryBlockTypes.ImageInput, message: 'Image Input', blockIcon:this.getBlockIcon(StoryBlockTypes.ImageInput), blockCategory: 'images-block' } as ImageInputBlock, - { id: 'io-audio-input-block' , type: StoryBlockTypes.AudioInput, message: 'Audio Input', blockIcon:this.getBlockIcon(StoryBlockTypes.AudioInput), blockCategory: 'multimedia-block' } as AudioInputBlock, + // { id: 'fail-block', type: StoryBlockTypes.FailBlock, message: 'Fail', blockIcon:this.getBlockIcon(StoryBlockTypes.FailBlock), blockCategory: 'questions-block' } as FailBlock, + { id: 'io-image-input-block' , type: StoryBlockTypes.ImageInput, message: 'Image Input', blockIcon:this.getBlockIcon(StoryBlockTypes.ImageInput), blockCategory: 'questions-block' } as ImageInputBlock, + { id: 'io-audio-input-block' , type: StoryBlockTypes.AudioInput, message: 'Audio Input', blockIcon:this.getBlockIcon(StoryBlockTypes.AudioInput), blockCategory: 'questions-block' } as AudioInputBlock, // { id: 'input-reply-block', type: StoryBlockTypes.Reply, message: 'Reply', blockIcon: this.getBlockIcon(StoryBlockTypes.Reply) } as ReplyMessageBlock { id: 'io-location-input-block' , type: StoryBlockTypes.LocationInputBlock, message: 'Location input', blockIcon:this.getBlockIcon(StoryBlockTypes.LocationInputBlock), blockCategory: 'questions-block' } as LocationInputBlock, - { id: 'io-video-input-block', type: StoryBlockTypes.VideoInput, message: 'Video Input', blockIcon:this.getBlockIcon(StoryBlockTypes.VideoInput), blockCategory: 'multimedia-block' } as VideoInputBlock, - { id: 'webhook-block' , type: StoryBlockTypes.WebhookBlock, message: 'Webhook', blockIcon:this.getBlockIcon(StoryBlockTypes.WebhookBlock), blockCategory: 'questions-block' } as WebhookBlock, + { id: 'io-video-input-block', type: StoryBlockTypes.VideoInput, message: 'Video Input', blockIcon:this.getBlockIcon(StoryBlockTypes.VideoInput), blockCategory: 'questions-block' } as VideoInputBlock, + { id: 'webhook-block' , type: StoryBlockTypes.WebhookBlock, message: 'Webhook', blockIcon:this.getBlockIcon(StoryBlockTypes.WebhookBlock), blockCategory: 'operation-block' } as WebhookBlock, { id: 'open-ended-question-block', type:StoryBlockTypes.OpenEndedQuestion, message: 'Open Ended Question', blockIcon:this.getBlockIcon(StoryBlockTypes.OpenEndedQuestion), blockCategory: 'questions-block' } as OpenEndedQuestionBlock, - { id: 'keyword-jump-block', type:StoryBlockTypes.keyword, message: 'Keyword Jump', blockIcon:this.getBlockIcon(StoryBlockTypes.keyword), blockCategory: 'questions-block' } as KeywordMessageBlock, - { id: 'event-block', type:StoryBlockTypes.Event, message: 'Event', blockIcon:this.getBlockIcon(StoryBlockTypes.Event), blockCategory: 'questions-block' } as EventBlock, + { id: 'keyword-jump-block', type:StoryBlockTypes.keyword, message: 'Keyword Jump', blockIcon:this.getBlockIcon(StoryBlockTypes.keyword), blockCategory: 'operation-block' } as KeywordMessageBlock, + { id: 'event-block', type:StoryBlockTypes.Event, message: 'Event', blockIcon:this.getBlockIcon(StoryBlockTypes.Event), blockCategory: 'operation-block' } as EventBlock, { id: 'assessment-brick', type:StoryBlockTypes.Assessment, message: 'Assessment', blockIcon:this.getBlockIcon(StoryBlockTypes.Assessment), blockCategory: 'bricks' } as AssessmentBrick, - { id: 'conditional-block', type:StoryBlockTypes.Conditional, message: 'Conditional', blockIcon:this.getBlockIcon(StoryBlockTypes.Conditional), blockCategory: 'questions-block' } as ConditionalBlock, + { id: 'conditional-block', type:StoryBlockTypes.Conditional, message: 'Conditional', blockIcon:this.getBlockIcon(StoryBlockTypes.Conditional), blockCategory: 'operation-block' } as ConditionalBlock, // { id: 'end-anchor-block', type:StoryBlockTypes.EndStoryAnchorBlock, message: 'End Story', blockIcon:this.getBlockIcon(StoryBlockTypes.EndStoryAnchorBlock), blockCategory: 'end-block'} as EndStoryAnchorBlock { id: 'CMI5-block', type:StoryBlockTypes.CMI5Block, message: 'CMI5 Block', blockIcon:this.getBlockIcon(StoryBlockTypes.CMI5Block), blockCategory: 'bricks' } as CMI5Block ];