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/apps/conv-learning-manager/src/assets/i18n/en.json b/apps/conv-learning-manager/src/assets/i18n/en.json index 7d79a3114c..09408fed5c 100644 --- a/apps/conv-learning-manager/src/assets/i18n/en.json +++ b/apps/conv-learning-manager/src/assets/i18n/en.json @@ -301,8 +301,9 @@ "MULTIMEDIA-BLOCKS": "Multimedia blocks", "DOCUMENT-BLOCKS": "Document blocks", "IMAGE-BLOCKS": "Images blocks", - "QUESTION-BLOCKS": "Question Blocks", - "MESSAGE-BLOCK": "Message Block", + "QUESTION-BLOCKS": "Questions", + "MESSAGE-BLOCK": "Messages", + "OPERATION-BLOCKS": "Operations", "CMI5-BLOCK" :"CMI5 Block", "ADMIN_SETTINGS": "Settings" } 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/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..bcbd665316 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,11 @@ 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 {} 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; } 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..fd0ee5c23c 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,11 +1,25 @@ -
-
- - - - +
+
+
+ +
+
+ +
+ Choose Element
+
+
+ + +
+
+ + +
@@ -19,28 +33,15 @@
{{ 'PAGE-CONTENT.BLOCK-CATEGORY.QUESTION-BLOCKS
- -
-
{{ '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 }}
@@ -49,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.scss b/libs/features/convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss index 3e65d217b5..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 @@ -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%; @@ -7,7 +12,7 @@ overflow-y: hidden; scrollbar-gutter: stable both-edges; background-color: #F6F6F6; - color: slategray; + color: #101010; } .nav:hover { @@ -19,13 +24,71 @@ width: 5px; } -.search-input { - width: 100%; +.block-library-top-section { + display: flex; + flex-direction: column; + margin-top: 1rem; + align-items: flex-end; + + .btn-wrapper { + padding: 0.2rem; + cursor: pointer; + right: 5px; + top: 5px; + color: black; + } } -.search, -.search input { - max-width: 100%; +.header-title { + +} + +.block-filters { + display: flex; + 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 { + font-size: small; + font-weight: 300; + color: #101010; + } +} + +.search { + height: 5px; + width: 90%; + background-color: white; + border-radius: 30px; + display: flex; + align-items: center; + padding: 20px; + + &_tooltip { + color: #101010; + font-size: 20px; + font-weight: 300 !important; + } + + &_input { + width: 90%; + height: 30px; + border: none; + outline: none; + font-size: 15px; + padding-left: 6px; + } } .block-list { @@ -33,6 +96,7 @@ margin-bottom: 0.4rem; font-size: 0.8rem; margin-top: 0px; + font-weight: 400; &:not(.first-title) { margin-top: 1rem; 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..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 @@ -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,47 +34,52 @@ 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, // { 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 ]; 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(); } 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; 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..361f52289d 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 { @@ -21,22 +27,25 @@ margin: 0; } - .blocks-main:hover { - background-color: #fbc113 !important; + .block:hover { + background-color: #2E7A8C !important; + color: white !important; + cursor: pointer; + } - #icons { - color: white !important; - } + .block:hover > .block-messages { + color: white !important; } .block-messages { - font-size: 0.7rem; + font-size: 0.725rem; text-align: center; 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; } } 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 8d85dd58fd..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 @@ - +
@@ -31,21 +31,23 @@
- + +
+ +
+ -
- - - -
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..6a5fbd6c27 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,28 +65,30 @@ 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; + } .toggle-btn { - background-color: var(--endpoint-color); + position: fixed; + background-color: white; border: none; transition: transform 0.3s ease; - padding: 8px; - border-radius: 5px; - width: 3.5rem; cursor: pointer; - color: var(--endpoint-outline); + color: black; + margin-left: -1rem; + padding: 0.2rem 0.3rem 0.2rem 0.6rem; .tooltip { font-size: 1.2rem; @@ -96,6 +98,31 @@ 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; } .wrapper-edit { @@ -134,7 +161,7 @@ convl-story-editor-frame { .error-count{ color: #707070; - background-color: white; + background-color: #F6F6F6; padding-right: 17em; /* Reg 14 */ font-family: Roboto; @@ -162,3 +189,8 @@ convl-story-editor-frame { a.save-anyway:hover { cursor: pointer; } + + +.breadcrumb-wrapper { + margin-left: 1.4rem; +} diff --git a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.ts b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.ts index 472acb1474..9026220ced 100644 --- a/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.ts +++ b/libs/features/convs-mgr/stories/editor/src/lib/pages/story-editor/story-editor.page.ts @@ -5,17 +5,20 @@ import { ComponentPortal, TemplatePortal } from '@angular/cdk/portal'; import { FormControl, FormGroup } from '@angular/forms'; import { SubSink } from 'subsink'; -import { BehaviorSubject, filter, Observable, take } from 'rxjs'; +import { BehaviorSubject, filter, Observable, of, switchMap, take } from 'rxjs'; -import { Breadcrumb, Logger } from '@iote/bricks-angular'; +import { Logger } from '@iote/bricks-angular'; import { StoryEditorState, StoryEditorStateService } from '@app/state/convs-mgr/story-editor'; import { SidemenuToggleService } from '@app/elements/layout/page-convl'; -import { HOME_CRUMB, STORY_EDITOR_CRUMB } from '@app/elements/nav/convl/breadcrumbs'; import { ToastMessageTypeEnum, ToastStatus } from '@app/model/layout/toast'; -import { StoryError } from '@app/model/convs-mgr/stories/main'; +import { iTalBreadcrumb } from '@app/model/layout/ital-breadcrumb'; +import { Story, StoryError } from '@app/model/convs-mgr/stories/main'; + +import { BotModulesStateService } from '@app/state/convs-mgr/modules'; +import { BotsStateService } from '@app/state/convs-mgr/bots'; import { StoryEditorFrame } from '../../model/story-editor-frame.model'; @@ -52,7 +55,7 @@ export class StoryEditorPageComponent implements OnInit, OnDestroy isSideScreenOpen:boolean; state: StoryEditorState; - breadcrumbs: Breadcrumb[] = []; + breadcrumbs$: Observable loading = new BehaviorSubject(true); frame: StoryEditorFrame; @@ -68,7 +71,8 @@ export class StoryEditorPageComponent implements OnInit, OnDestroy constructor(private _editorStateService: StoryEditorStateService, private _blockPortalService: BlockPortalService, private _saveStory: SaveStoryService, - + private _moduleStateServ$: BotModulesStateService, + private _botStateServ$: BotsStateService, private _sideMenu: SidemenuToggleService, private sideScreen: SideScreenToggleService, @@ -93,7 +97,8 @@ export class StoryEditorPageComponent implements OnInit, OnDestroy this.pageName = `Story overview :: ${state.story.name}`; const story = state.story; - this.breadcrumbs = [HOME_CRUMB(_router), STORY_EDITOR_CRUMB(_router, story.id, story.name as string, true)]; + this.setBreadcrumbs(story); + this.loading.next(false); }); } @@ -295,6 +300,41 @@ export class StoryEditorPageComponent implements OnInit, OnDestroy } } + setBreadcrumbs(story: Story) { + if (!story.parentModule) return + + this.breadcrumbs$ = this._moduleStateServ$ + .getBotModuleById(story?.parentModule) + .pipe( + switchMap((botModule) => { + return this._botStateServ$.getBotById(botModule?.parentBot as string).pipe( + switchMap((bot) => { + const breadcrumbs: iTalBreadcrumb[] = [ + { + label: { src: 'assets/svgs/breadcrumbs/bots-stroked.svg' }, + link: `/bots/dashboard` + }, + { + label: bot?.name ?? "", + link: `/bots/${bot?.id}` + }, + { + label: botModule?.name ?? "", + link: `/bots/${bot?.id}/modules/${botModule?.id}` + }, + { + label: story?.name ?? "", + link : `/stories/${story?.id}` + } + ] + + return of(breadcrumbs); + }) + ) + } + )) + } + ngOnDestroy() { this._editorStateService.flush(); this._sb.unsubscribe(); 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..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 @@ -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 { @@ -165,16 +166,17 @@ export class BotsListAllCoursesComponent implements OnInit, AfterViewInit, OnDes this.openSnackBar('Media upload failed. Confirm channel details', 'OK'); } }) + + this._sbS.unsubscribe(); } - 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 +188,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/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 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/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 { + private cloudSchedulerClient: CloudSchedulerClient; + private projectId: string; + private locationId = 'europe-west1'; + private baseCronPath: string; + + constructor() { + super(); + this.cloudSchedulerClient = new CloudSchedulerClient(); + } + + public async execute(data: WhatsappCronUpdateData, context: HttpsContext, tools: HandlerTools) { + try { + tools.Logger.log(() => `[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`); + + const job = await this.checkIfJobExists(jobName); + + if (job) { + tools.Logger.log(() => `[WhatsappMediaUpdateCronHandler] - Job ${job.name} already exists. Exiting...`); + return; + } + + const res = await this.createCronJob(data.channel, jobName); + + tools.Logger.log(() =>`[WhatsappMediaUpdateCronHandler] - Job successfully created with Name: ${res.name}`); + } catch (error) { + tools.Logger.error(() => `[WhatsappMediaUpdateCronHandler] - Error in WhatsappMediaUpdateCronHandler: ${error.message}`); + } + } + + private async checkIfJobExists(jobName: string) { + const [jobs] = await this.cloudSchedulerClient.listJobs({ + parent: this.baseCronPath, + }); + + 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({ data: channel }); + + const currentTime = Timestamp.fromDate(new Date()); + + const newJob: GcpJob = { + name: jobName, + httpTarget: { + uri: endpoint, + 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', + }; + + const request = { parent: this.baseCronPath, job: newJob }; + + const [res] = await this.cloudSchedulerClient.createJob(request as any); + this.cloudSchedulerClient.runJob({ name: res.name }); + + return res + } + + private getJobName(bot: Bot): string { + const jobPath = `${this.baseCronPath}/jobs/`; + const jobId = `${bot.id}`; + + return jobPath + jobId; + } +} 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..ed061057f6 --- /dev/null +++ b/libs/model/cloud-scheduler/src/index.ts @@ -0,0 +1,2 @@ +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/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/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-scheduler.service.ts b/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-scheduler.service.ts index 03445b07f1..81adbce9d9 100644 --- a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-scheduler.service.ts +++ b/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-scheduler.service.ts @@ -5,8 +5,7 @@ import { HandlerTools } from '@iote/cqrs'; import { ScheduleOptions } from '@app/model/convs-mgr/functions'; -import { GcpTask } from '../../model/gcp/gcp-task.interface'; -import { GcpJob, HttpMethodTypes } from '../../model/gcp/gcp-job.interface'; +import { GcpJob, GcpTask, HttpMethodTypes } from '@app/model/cloud-scheduler'; import { ModifyCronString } from '../../utils/modify-custom-cron.util'; class CloudSchedulerService diff --git a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-task.service.ts b/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-task.service.ts index 7b9f1a50ee..ccbaf41fb8 100644 --- a/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-task.service.ts +++ b/libs/private/functions/convs-mgr/conversations/message-templates/scheduler/src/lib/model/services/cloud-task.service.ts @@ -5,7 +5,7 @@ import { HandlerTools } from '@iote/cqrs'; import { ScheduleOptions } from '@app/model/convs-mgr/functions'; -import { GcpTask } from '../../model/gcp/gcp-task.interface'; +import { GcpTask } from '@app/model/cloud-scheduler'; class CloudTasksService { 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..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,6 +4,7 @@ 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'; @@ -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 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 0e38feb238..dcbebacb54 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", 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" ],