Merge branch 'develop'

italanta · May 13, 2024 · f962abe · f962abe
2 parents bd5e5e6 + c1ecec1
commit f962abe
Show file tree

Hide file tree

Showing 43 changed files with 599 additions and 163 deletions.
diff --git 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
@@ -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
@@ -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();
diff --git 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
@@ -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
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
@@ -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/...ories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss b/...ories/blocks/library/anchor-block/src/lib/components/end-anchor/end-anchor.component.scss
@@ -4,14 +4,15 @@
 	height: 1.5rem;
 	width: 6.5rem;
 	padding: 0.4rem;
+  padding-left: 1rem;
 	background-color: var(--convs-mgr-button-color);
 	color: white;
 	text-align: center;
 	cursor: pointer;
 	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/.../convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html b/.../convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.html
@@ -1,11 +1,25 @@
-<div class="nav" fxLayout="column" fxLayoutAlign="start" fxFlex>
-  <div class="search" fxFlex>
-    <mat-form-field class="search-input" appearance="outline">
-      <input matInput placeholder="Search" (input)="filterBlocks($event)" />
-      <mat-icon matPrefix class="fa fa-search"></mat-icon>
-    </mat-form-field>
+<div class="nav">
+  <div class="block-library-top-section">
+    <div *ngIf="isSideScreenOpen" class="btn-wrapper" (click)="toggleSidenav()">
+      <i class="fas fa-chevron-left"></i>
+    </div>
+  </div>
+
+  <div class="blocks-header">
+    <span class="header-title"> Choose Element</span>
   </div>
 
+  <div class="block-filters">
+    <div class="search">
+      <i class="fas fa-search search_tooltip"></i>
+      <input class="search_input" type="text" name="search table"
+        placeholder="Search element" id=""
+        (keyup)="filterBlocks($event)">
+        </div>
+  </div>
+
+  <mat-divider></mat-divider>
+
   <div fxLayout="column" *ngIf="blockTemplate$ | async as blocks" fxFlex>
     <!-- message block -->
     <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'messages-block' as groupedBlocks">
@@ -19,28 +33,15 @@ <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.QUESTION-BLOCKS
       <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
     </div>
 
-      <!-- cmi5 block -->
-      <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'cmi5-block' as groupedBlocks">
-        <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.CMI5-BLOCKS' | transloco }}</h6>
+      <!-- Operations block -->
+      <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'operation-block' as groupedBlocks">
+        <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.OPERATION-BLOCKS' | transloco }}</h6>
         <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
       </div>
-
 
-    <!-- Image block -->
-    <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'images-block' as groupedBlocks">
-      <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.IMAGE-BLOCKS' | transloco }}</h6>
-      <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
-    </div>
-
-    <!-- documents block -->
-    <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'documents-block' as groupedBlocks">
-      <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.DOCUMENT-BLOCKS' | transloco }}</h6>
-      <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
-    </div>
-
-    <!-- multimedia block -->
-    <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'multimedia-block' as groupedBlocks">
-      <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.MULTIMEDIA-BLOCKS' | transloco }}</h6>
+    <!-- bricks -->
+    <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'bricks' as groupedBlocks">
+      <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.BRICKS' | transloco }}</h6>
       <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
     </div>
 
@@ -49,11 +50,5 @@ <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.MULTIMEDIA-BLOC
       <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.END-BLOCK' | transloco }}</h6>
       <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
     </div>
-
-    <!-- bricks -->
-    <div class="block-list" *ngIf="blocks | blockCategoryPipe: 'bricks' as groupedBlocks">
-      <h6 *ngIf="groupedBlocks.length">{{ 'PAGE-CONTENT.BLOCK-CATEGORY.BRICKS' | transloco }}</h6>
-      <convl-grouped-blocks [groupedBlocks]="groupedBlocks" [frame]="frame"></convl-grouped-blocks>
-    </div>
   </div>
 </div>
diff --git a/.../convs-mgr/stories/editor/src/lib/components/blocks-library/blocks-library.component.scss b/.../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,20 +24,79 @@
   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 {
   h6 {
     margin-bottom: 0.4rem;
     font-size: 0.8rem;
     margin-top: 0px;
+    font-weight: 400;
 
     &:not(.first-title) {
       margin-top: 1rem;