feature: add options to removeTriggers and add zIndex to the PublicPa…

…geSettings
devflowinc · Dec 18, 2024 · e9c495d · e9c495d
1 parent 377d330
commit e9c495d
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 2 deletions.
diff --git a/clients/ts-sdk/openapi.json b/clients/ts-sdk/openapi.json
@@ -6977,6 +6977,10 @@
           "mode": {
             "type": "string"
           },
+          "removeTriggers": {
+            "type": "boolean",
+            "nullable": true
+          },
           "selector": {
             "type": "string"
           }
@@ -12447,6 +12451,11 @@
           "useGroupSearch": {
             "type": "boolean",
             "nullable": true
+          },
+          "zIndex": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
           }
         }
       },

diff --git a/clients/ts-sdk/src/types.gen.ts b/clients/ts-sdk/src/types.gen.ts
@@ -132,6 +132,7 @@ export type BulkDeleteChunkPayload = {
 
 export type ButtonTrigger = {
     mode: string;
+    removeTriggers?: (boolean) | null;
     selector: string;
 };
 
@@ -2080,6 +2081,7 @@ export type PublicPageParameters = {
     theme?: ((PublicPageTheme) | null);
     type?: (string) | null;
     useGroupSearch?: (boolean) | null;
+    zIndex?: (number) | null;
 };
 
 export type PublicPageSearchOptions = {

diff --git a/frontends/dashboard/src/pages/dataset/PublicPageSettings.tsx b/frontends/dashboard/src/pages/dataset/PublicPageSettings.tsx
@@ -559,7 +559,7 @@ const PublicPageControls = () => {
               />
             </div>
             <MultiStringInput
-              placeholder={`#search-icon,search`}
+              placeholder={`#search-icon,search,true`}
               value={
                 extraParams.buttonTriggers?.map((trigger) => {
                   return `${trigger.selector},${trigger.mode}`;
@@ -569,10 +569,18 @@ const PublicPageControls = () => {
                 setExtraParams(
                   "buttonTriggers",
                   e.map((trigger) => {
-                    const [selector, mode] = trigger.split(",");
+                    const [selector, mode, replace] = trigger.split(",");
+                    if (replace) {
+                      return {
+                        selector,
+                        mode,
+                        removeTriggers: replace === "true",
+                      };
+                    }
                     return {
                       selector,
                       mode,
+                      removeTriggers: false,
                     };
                   }),
                 );
@@ -760,6 +768,54 @@ const PublicPageControls = () => {
                   options={["search", "chat"]}
                 />
               </div>
+              <div class="grow">
+                <div class="flex items-center gap-1">
+                  <label class="block" for="">
+                    Default Search Mode
+                  </label>
+                  <Tooltip
+                    tooltipText="Set the initial search mode"
+                    body={
+                      <FaRegularCircleQuestion class="h-3 w-3 text-black" />
+                    }
+                  />
+                </div>
+                <Select
+                  display={(option) => option}
+                  onSelected={(option) => {
+                    setExtraParams("defaultSearchMode", option);
+                  }}
+                  class="bg-white py-1"
+                  selected={extraParams.defaultSearchMode || "search"}
+                  options={["search", "chat"]}
+                />
+              </div>
+
+              <div class="grow">
+                <div class="flex items-center gap-1">
+                  <label class="block" for="">
+                    Z Index
+                  </label>
+                  <Tooltip
+                    tooltipText="The z-index of the component modal"
+                    body={
+                      <FaRegularCircleQuestion class="h-3 w-3 text-black" />
+                    }
+                  />
+                </div>
+                <input
+                  type="number"
+                  placeholder="1000"
+                  value={extraParams.zIndex || 1000}
+                  onInput={(e) => {
+                    setExtraParams(
+                      "zIndex",
+                      parseInt(e.currentTarget.value),
+                    );
+                  }}
+                  class="block w-full rounded border border-neutral-300 px-3 py-1.5 shadow-sm placeholder:text-neutral-400 focus:outline-magenta-500 sm:text-sm sm:leading-6"
+                />
+              </div>
 
               <div class="grow">
                 <div class="flex items-center gap-1">

diff --git a/server/src/data/models.rs b/server/src/data/models.rs
@@ -3195,6 +3195,9 @@ impl DatasetConfigurationDTO {
                     brand_font_family: page_parameters_self
                         .brand_font_family
                         .or(page_parameters_curr.brand_font_family),
+                    z_index: page_parameters_self
+                        .z_index
+                        .or(page_parameters_curr.z_index),
                 }),
             },
             DISABLE_ANALYTICS: self

diff --git a/server/src/handlers/page_handler.rs b/server/src/handlers/page_handler.rs
@@ -141,6 +141,7 @@ pub struct OpenGraphMetadata {
 pub struct ButtonTrigger {
     selector: String,
     mode: String,
+    remove_triggers: Option<bool>
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, ToSchema, Default)]
@@ -243,6 +244,8 @@ pub struct PublicPageParameters {
     pub creator_linked_in_url: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub brand_font_family: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub z_index: Option<i32>,
 }
 
 #[utoipa::path(