Merge pull request #6098 from Countly/funnel-ast-next

Updates for AI assistant

Author: ArtursKadikis

CHANGELOG.md

@@ -6,6 +6,7 @@ Features:
 
 Enterprise Features:
 - [journey_engine] Editing/Deleting/Duplication of blocks and version management
+- [cohorts] [funnels] [ai-assistants] Add cohorts and funnels assistant
 
 ## Version 25.03.3
 Fixes:

frontend/express/public/javascripts/countly/vue/components/drawer.js

@@ -20,6 +20,7 @@
                 saveButtonLabel: {type: String, required: false, default: ""},
                 cancelButtonLabel: {type: String, required: false, default: CV.i18n("common.cancel")},
                 closeFn: {type: Function},
+                hasRightSidecar: { type: Boolean, required: false, default: false },
                 hasCancelButton: {type: Boolean, required: false, default: true},
                 hasBackLink: {
                     type: [Object, Boolean],
@@ -60,7 +61,8 @@
                     var classes = {
                         'is-mounted': this.isMounted,
                         'is-open': this.isOpened,
-                        'has-sidecars': this.hasSidecars
+                        'has-sidecars': this.hasSidecars,
+                        'has-right-sidecar': this.hasRightSidecar,
                     };
                     classes["cly-vue-drawer--" + this.currentScreenMode + "-screen"] = true;
                     if (this.currentScreenMode === 'half') {

frontend/express/public/javascripts/countly/vue/components/helpers.js

@@ -746,6 +746,16 @@
                             });
                             self.isLoading = false;
                             resolve(preparedEventList);
+                        }, function() {
+                            const events = countlyEvent.getEvents();
+                            preparedEventList[1].options = events.map(function(event) {
+                                return {label: countlyCommon.unescapeHtml(event.name), value: event.key};
+                            });
+                            preparedEventList = preparedEventList.filter(function(evt) {
+                                return !(self.blacklistedEvents.includes(evt.name));
+                            });
+                            self.isLoading = false;
+                            resolve(preparedEventList);
                         });
                     }
                 });

frontend/express/public/javascripts/countly/vue/templates/drawer.html

@@ -1,4 +1,3 @@
-
 <transition :name="toggleTransition" @enter="onViewEntered">
     <div class="cly-vue-drawer" tabindex="0" v-show="isOpened" @keydown.esc="escKeyEvent" ref="rootEl" :id="id"
         :class="rootClasses">
@@ -99,5 +98,9 @@ <h3>{{title}}</h3>
                 </div>
             </div>
         </div>
+        <div class="cly-vue-drawer__right-sidecar" v-show="hasRightSidecar">
+            <slot name="right-sidecar" v-bind="passedScope">
+            </slot>
+        </div>
     </div>
-</transition>
+</transition>

frontend/express/public/stylesheets/vue/clyvue.scss

@@ -1786,13 +1786,41 @@
             position: absolute;
             left: 0;
         }
+        &__right-sidecar {
+            height: 100%;
+            right: 0;
+        }
         &__steps-view {
             box-sizing: border-box;
             position: absolute;
             right: 0;
             background-color: white;
         }
 
+        &.has-right-sidecar {
+            display: flex;
+            flex-direction: row;
+
+            .cly-vue-drawer__steps-view {
+                position: relative;
+                flex-grow: 1;
+                display: flex;
+                justify-content: center;
+            }
+
+            .cly-vue-drawer__steps-container {
+                position: relative;
+            }
+
+            .cly-vue-drawer__steps-wrapper {
+                max-width: 840px;
+            }
+
+            .cly-vue-drawer__right-sidecar {
+                max-width: 480px;
+            }
+        }
+
         &__steps-view,
         &__sidecars-view {
             height: 100%;

plugins/dbviewer/frontend/public/javascripts/countly.views.js

@@ -670,4 +670,4 @@
 
         app.addMenu("management", {code: "db", permission: FEATURE_NAME, url: "#/manage/db", text: "dbviewer.title", priority: 120});
     }
-})();
+})();

plugins/dbviewer/frontend/public/localization/dbviewer.properties

@@ -46,4 +46,6 @@ dbviewer.mongostat = Mongostat
 dbviewer.enter-aggregation-pipeline = Enter aggregation pipeline
 dbviewer.indexes-of = Indexes of
 dbviewer.projection = Projection
-dbviewer.data = Data
+dbviewer.data = Data
+
+dbviewer.assistant.title= Query Assistant

plugins/dbviewer/frontend/public/templates/main.html

@@ -19,4 +19,4 @@
             </cly-dynamic-tabs>
         </template>
     </cly-header>
-</div> 
+</div>