npm - @clyrex-digital/clyrex-controls-dev - Versions diffs - 0.8.1-dev.20260824062326 → 0.8.1-dev.20260824095913 - Mend

@clyrex-digital/clyrex-controls-dev 0.8.1-dev.20260824062326 → 0.8.1-dev.20260824095913

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/{DataBindingControls-XCAIDMDC.mjs → DataBindingControls-AT7I4FSN.mjs} +11 -4
package/dist/{DataBindingControls-QZ7ES2AS.mjs → DataBindingControls-GHWIJ5N7.mjs} +11 -4
package/dist/{Pagination-GL6B4MNO.mjs → Pagination-2KVND6JU.mjs} +1 -1
package/dist/{Pagination-ZQO3EUKB.mjs → Pagination-PDU7V3HY.mjs} +1 -1
package/dist/{chunk-Q46GMD3P.mjs → chunk-4OH67SPF.mjs} +14 -2
package/dist/{chunk-4P4HO663.mjs → chunk-TKJDEJSU.mjs} +14 -2
package/dist/index.js +98 -68
package/dist/index.mjs +75 -64
package/dist/server.js +98 -68
package/dist/server.mjs +75 -64
package/package.json +1 -1

package/dist/{DataBindingControls-XCAIDMDC.mjs → DataBindingControls-AT7I4FSN.mjs} RENAMED Viewed

@@ -18,6 +18,14 @@ var InputControl_default = InputControl;
 import { jsx, jsxs } from "react/jsx-runtime";
 var humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
 var escapeODataString = (value) => value.replace(/'/g, "''");
+var parseODataSearch = (value) => {
+  if (!value) return "";
+  const trimmedValue = value.trim();
+  if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+    return trimmedValue.slice(1, -1).replace(/''/g, "'");
+  }
+  return trimmedValue;
+};
 var normalizeSortOption = (option) => {
   const direction = option.direction.trim();
   return {
@@ -64,7 +72,7 @@ var DataBindingControls = ({
   const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
   const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
   const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-  const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+  const currentSearch = parseODataSearch(query?.["$Search"]);
   const [searchText, setSearchText] = useState(currentSearch);
   const lastNavigationUrl = useRef(null);
   useEffect(() => {
@@ -82,7 +90,7 @@ var DataBindingControls = ({
       });
       params.delete("$skip");
       params.delete("skip");
-      const queryString = params.toString();
+      const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
       return queryString ? `${path}?${queryString}` : path;
     },
     [path, query]
@@ -115,8 +123,7 @@ var DataBindingControls = ({
     const timeout = window.setTimeout(() => {
       navigateWithoutReload(
         getQueryUrl({
-          searchTerm: trimmedSearchText || void 0,
-          searchText: void 0
+          "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
         })
       );
     }, 500);

package/dist/{DataBindingControls-QZ7ES2AS.mjs → DataBindingControls-GHWIJ5N7.mjs} RENAMED Viewed

@@ -14,6 +14,14 @@ import { useRouter } from "next/navigation";
 import { jsx, jsxs } from "react/jsx-runtime";
 var humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
 var escapeODataString = (value) => value.replace(/'/g, "''");
+var parseODataSearch = (value) => {
+  if (!value) return "";
+  const trimmedValue = value.trim();
+  if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+    return trimmedValue.slice(1, -1).replace(/''/g, "'");
+  }
+  return trimmedValue;
+};
 var normalizeSortOption = (option) => {
   const direction = option.direction.trim();
   return {
@@ -60,7 +68,7 @@ var DataBindingControls = ({
   const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
   const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
   const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-  const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+  const currentSearch = parseODataSearch(query?.["$Search"]);
   const [searchText, setSearchText] = useState(currentSearch);
   const lastNavigationUrl = useRef(null);
   useEffect(() => {
@@ -78,7 +86,7 @@ var DataBindingControls = ({
       });
       params.delete("$skip");
       params.delete("skip");
-      const queryString = params.toString();
+      const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
       return queryString ? `${path}?${queryString}` : path;
     },
     [path, query]
@@ -111,8 +119,7 @@ var DataBindingControls = ({
     const timeout = window.setTimeout(() => {
       navigateWithoutReload(
         getQueryUrl({
-          searchTerm: trimmedSearchText || void 0,
-          searchText: void 0
+          "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
         })
       );
     }, 500);

package/dist/{Pagination-GL6B4MNO.mjs → Pagination-2KVND6JU.mjs} RENAMED Viewed

@@ -3,7 +3,7 @@
 "use client";
 import {
   OdataBuilder
-} from "./chunk-4P4HO663.mjs";
+} from "./chunk-TKJDEJSU.mjs";
 import {
   Hyperlink,
   Icon_default

package/dist/{Pagination-ZQO3EUKB.mjs → Pagination-PDU7V3HY.mjs} RENAMED Viewed

@@ -4,7 +4,7 @@ import {
 } from "./chunk-6PW2RLUJ.mjs";
 import {
   OdataBuilder
-} from "./chunk-Q46GMD3P.mjs";
+} from "./chunk-4OH67SPF.mjs";
 import {
   Hyperlink
 } from "./chunk-2R26M6CK.mjs";

package/dist/{chunk-Q46GMD3P.mjs → chunk-4OH67SPF.mjs} RENAMED Viewed

@@ -38,6 +38,9 @@ var OdataBuilder = class {
           if (key == "searchCols") {
             this.searchCols = odata[key];
           }
+          if (key == "$Search") {
+            this.search = odata[key];
+          }
           if (key == "filter") {
             this.apiFilter = odata[key];
           }
@@ -70,6 +73,9 @@ var OdataBuilder = class {
     if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
       queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
     }
+    if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+      queryString += `&$Search=${obj["$Search"]}`;
+    }
     if (obj?.["filter"] && obj["filter"].trim() !== "") {
       queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
     }
@@ -124,8 +130,8 @@ var OdataBuilder = class {
     return pageNumber;
   }
   appendApiQueryParameters(url) {
-    if (this.searchTerm) {
-      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    if (this.search) {
+      url += `&$Search=${this.search}`;
     }
     if (this.apiFilter) {
       url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -211,6 +217,12 @@ var OdataBuilder = class {
     if (this.orderBy !== null && this.orderBy !== "") {
       url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
     }
+    if (this.searchTerm) {
+      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    }
+    if (this.searchCols) {
+      url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+    }
     return this.appendApiQueryParameters(url);
   }
   getOrderBy() {

package/dist/{chunk-4P4HO663.mjs → chunk-TKJDEJSU.mjs} RENAMED Viewed

@@ -40,6 +40,9 @@ var OdataBuilder = class {
           if (key == "searchCols") {
             this.searchCols = odata[key];
           }
+          if (key == "$Search") {
+            this.search = odata[key];
+          }
           if (key == "filter") {
             this.apiFilter = odata[key];
           }
@@ -72,6 +75,9 @@ var OdataBuilder = class {
     if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
       queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
     }
+    if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+      queryString += `&$Search=${obj["$Search"]}`;
+    }
     if (obj?.["filter"] && obj["filter"].trim() !== "") {
       queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
     }
@@ -126,8 +132,8 @@ var OdataBuilder = class {
     return pageNumber;
   }
   appendApiQueryParameters(url) {
-    if (this.searchTerm) {
-      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    if (this.search) {
+      url += `&$Search=${this.search}`;
     }
     if (this.apiFilter) {
       url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -213,6 +219,12 @@ var OdataBuilder = class {
     if (this.orderBy !== null && this.orderBy !== "") {
       url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
     }
+    if (this.searchTerm) {
+      url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+    }
+    if (this.searchCols) {
+      url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+    }
     return this.appendApiQueryParameters(url);
   }
   getOrderBy() {

package/dist/index.js CHANGED Viewed

@@ -4123,6 +4123,9 @@ var init_OdataBuilder = __esm({
               if (key == "searchCols") {
                 this.searchCols = odata[key];
               }
+              if (key == "$Search") {
+                this.search = odata[key];
+              }
               if (key == "filter") {
                 this.apiFilter = odata[key];
               }
@@ -4155,6 +4158,9 @@ var init_OdataBuilder = __esm({
         if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
           queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
         }
+        if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+          queryString += `&$Search=${obj["$Search"]}`;
+        }
         if (obj?.["filter"] && obj["filter"].trim() !== "") {
           queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
         }
@@ -4209,8 +4215,8 @@ var init_OdataBuilder = __esm({
         return pageNumber;
       }
       appendApiQueryParameters(url) {
-        if (this.searchTerm) {
-          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        if (this.search) {
+          url += `&$Search=${this.search}`;
         }
         if (this.apiFilter) {
           url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -4296,6 +4302,12 @@ var init_OdataBuilder = __esm({
         if (this.orderBy !== null && this.orderBy !== "") {
           url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
         }
+        if (this.searchTerm) {
+          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        }
+        if (this.searchCols) {
+          url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+        }
         return this.appendApiQueryParameters(url);
       }
       getOrderBy() {
@@ -4494,7 +4506,7 @@ var DataBindingControls_exports = {};
 __export(DataBindingControls_exports, {
   default: () => DataBindingControls_default
 });
-var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
+var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, parseODataSearch, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
 var init_DataBindingControls = __esm({
   "src/components/pageRenderingEngine/nodes/DataBindingControls.tsx"() {
     "use strict";
@@ -4506,6 +4518,14 @@ var init_DataBindingControls = __esm({
     import_jsx_runtime77 = require("react/jsx-runtime");
     humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
     escapeODataString = (value) => value.replace(/'/g, "''");
+    parseODataSearch = (value) => {
+      if (!value) return "";
+      const trimmedValue = value.trim();
+      if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+        return trimmedValue.slice(1, -1).replace(/''/g, "'");
+      }
+      return trimmedValue;
+    };
     normalizeSortOption = (option) => {
       const direction = option.direction.trim();
       return {
@@ -4552,7 +4572,7 @@ var init_DataBindingControls = __esm({
       const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
       const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
       const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-      const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+      const currentSearch = parseODataSearch(query?.["$Search"]);
       const [searchText, setSearchText] = (0, import_react55.useState)(currentSearch);
       const lastNavigationUrl = (0, import_react55.useRef)(null);
       (0, import_react55.useEffect)(() => {
@@ -4570,7 +4590,7 @@ var init_DataBindingControls = __esm({
           });
           params.delete("$skip");
           params.delete("skip");
-          const queryString = params.toString();
+          const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
           return queryString ? `${path}?${queryString}` : path;
         },
         [path, query]
@@ -4603,8 +4623,7 @@ var init_DataBindingControls = __esm({
         const timeout = window.setTimeout(() => {
           navigateWithoutReload(
             getQueryUrl({
-              searchTerm: trimmedSearchText || void 0,
-              searchText: void 0
+              "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
             })
           );
         }, 500);
@@ -7736,6 +7755,36 @@ var DivContainer = async (props) => {
     noLinkColor && "no-link-color",
     !!props.node.enterAnimation && "enter-animation"
   ].filter(Boolean).join(" ");
+  const showDataBindingControls = Boolean(
+    dataBindingProperties?.showFacets || dataBindingProperties?.showSortOptions || dataBindingProperties?.showSearchBar
+  );
+  const WrapperComponent = Wrapper;
+  const renderedContainer = /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+    WrapperComponent,
+    {
+      id: guid,
+      style: combinedStyles,
+      className: classNames || void 0,
+      ...wrapperProps,
+      children: dataToRender.map(
+        (item, idx) => item?.links?.view && renderLink ? renderChildren(
+          props.node.children,
+          props,
+          item,
+          idx,
+          props.href ? void 0 : item?.links?.view
+        )?.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(import_react57.default.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
+      )
+    }
+  );
+  const paginationControl = dataBindingProperties?.enablePagination ? /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+    Pagination2,
+    {
+      path: props.path,
+      query: props.query,
+      dataset: response
+    }
+  ) : null;
   return /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
       "style",
@@ -7743,67 +7792,48 @@ var DivContainer = async (props) => {
         dangerouslySetInnerHTML: { __html: cssResult.css + animationCSS }
       }
     ),
-    dataBindingProperties && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-      DataBindingControls2,
-      {
-        mode: "toolbar",
-        path: props.path,
-        query: props.query,
-        facets: response?.facets,
-        sortOptions: response?.sortOptions,
-        showSortOptions: dataBindingProperties.showSortOptions,
-        showSearchBar: dataBindingProperties.showSearchBar
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(
-      "div",
-      {
-        className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("div", { className: "min-w-0", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              Wrapper,
-              {
-                id: guid,
-                style: combinedStyles,
-                className: classNames || void 0,
-                ...wrapperProps,
-                children: dataToRender.map(
-                  (item, idx) => item?.links?.view && renderLink ? renderChildren(
-                    props.node.children,
-                    props,
-                    item,
-                    idx,
-                    props.href ? void 0 : item?.links?.view
-                  )?.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(import_react57.default.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
-                )
-              }
-            ),
-            dataBindingProperties && props.node.dataBinding.enablePagination && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              Pagination2,
-              {
-                path: props.path,
-                query: props.query,
-                dataset: response
-              }
-            )
-          ] }),
-          dataBindingProperties?.showFacets && /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              DataBindingControls2,
-              {
-                mode: "facets",
-                path: props.path,
-                query: props.query,
-                facets: response?.facets,
-                showFacets: dataBindingProperties.showFacets
-              }
-            )
-          ] })
-        ]
-      }
-    )
+    showDataBindingControls ? /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+        DataBindingControls2,
+        {
+          mode: "toolbar",
+          path: props.path,
+          query: props.query,
+          facets: response?.facets,
+          sortOptions: response?.sortOptions,
+          showSortOptions: dataBindingProperties?.showSortOptions,
+          showSearchBar: dataBindingProperties?.showSearchBar
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(
+        "div",
+        {
+          className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("div", { className: "min-w-0", children: [
+              renderedContainer,
+              paginationControl
+            ] }),
+            dataBindingProperties?.showFacets && /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
+              /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+                DataBindingControls2,
+                {
+                  mode: "facets",
+                  path: props.path,
+                  query: props.query,
+                  facets: response?.facets,
+                  showFacets: dataBindingProperties.showFacets
+                }
+              )
+            ] })
+          ]
+        }
+      )
+    ] }) : /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
+      renderedContainer,
+      paginationControl && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("div", { children: paginationControl })
+    ] })
   ] });
 };
 var DivContainer_default = DivContainer;

package/dist/index.mjs CHANGED Viewed

@@ -2,7 +2,7 @@
 import {
   OdataBuilder
-} from "./chunk-4P4HO663.mjs";
+} from "./chunk-TKJDEJSU.mjs";
 import {
   InputControl_default
 } from "./chunk-GKI42H4B.mjs";
@@ -2295,8 +2295,8 @@ var GoogleMapNode_default = GoogleMapNode;
 // src/components/pageRenderingEngine/nodes/DivContainer.tsx
 import { jsx as jsx35, jsxs as jsxs13 } from "react/jsx-runtime";
-var Pagination = dynamic11(() => import("./Pagination-GL6B4MNO.mjs"), { ssr: true });
-var DataBindingControls = dynamic11(() => import("./DataBindingControls-QZ7ES2AS.mjs"), {
+var Pagination = dynamic11(() => import("./Pagination-2KVND6JU.mjs"), { ssr: true });
+var DataBindingControls = dynamic11(() => import("./DataBindingControls-GHWIJ5N7.mjs"), {
   ssr: true
 });
 var Slider = dynamic11(() => import("./Slider-554BKC7N.mjs"), {
@@ -2706,6 +2706,36 @@ var DivContainer = async (props) => {
     noLinkColor && "no-link-color",
     !!props.node.enterAnimation && "enter-animation"
   ].filter(Boolean).join(" ");
+  const showDataBindingControls = Boolean(
+    dataBindingProperties?.showFacets || dataBindingProperties?.showSortOptions || dataBindingProperties?.showSearchBar
+  );
+  const WrapperComponent = Wrapper;
+  const renderedContainer = /* @__PURE__ */ jsx35(
+    WrapperComponent,
+    {
+      id: guid,
+      style: combinedStyles,
+      className: classNames || void 0,
+      ...wrapperProps,
+      children: dataToRender.map(
+        (item, idx) => item?.links?.view && renderLink ? renderChildren(
+          props.node.children,
+          props,
+          item,
+          idx,
+          props.href ? void 0 : item?.links?.view
+        )?.map((child, i) => /* @__PURE__ */ jsx35(React22.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
+      )
+    }
+  );
+  const paginationControl = dataBindingProperties?.enablePagination ? /* @__PURE__ */ jsx35(
+    Pagination,
+    {
+      path: props.path,
+      query: props.query,
+      dataset: response
+    }
+  ) : null;
   return /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
     /* @__PURE__ */ jsx35(
       "style",
@@ -2713,67 +2743,48 @@ var DivContainer = async (props) => {
         dangerouslySetInnerHTML: { __html: cssResult.css + animationCSS }
       }
     ),
-    dataBindingProperties && /* @__PURE__ */ jsx35(
-      DataBindingControls,
-      {
-        mode: "toolbar",
-        path: props.path,
-        query: props.query,
-        facets: response?.facets,
-        sortOptions: response?.sortOptions,
-        showSortOptions: dataBindingProperties.showSortOptions,
-        showSearchBar: dataBindingProperties.showSearchBar
-      }
-    ),
-    /* @__PURE__ */ jsxs13(
-      "div",
-      {
-        className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
-        children: [
-          /* @__PURE__ */ jsxs13("div", { className: "min-w-0", children: [
-            /* @__PURE__ */ jsx35(
-              Wrapper,
-              {
-                id: guid,
-                style: combinedStyles,
-                className: classNames || void 0,
-                ...wrapperProps,
-                children: dataToRender.map(
-                  (item, idx) => item?.links?.view && renderLink ? renderChildren(
-                    props.node.children,
-                    props,
-                    item,
-                    idx,
-                    props.href ? void 0 : item?.links?.view
-                  )?.map((child, i) => /* @__PURE__ */ jsx35(React22.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
-                )
-              }
-            ),
-            dataBindingProperties && props.node.dataBinding.enablePagination && /* @__PURE__ */ jsx35(
-              Pagination,
-              {
-                path: props.path,
-                query: props.query,
-                dataset: response
-              }
-            )
-          ] }),
-          dataBindingProperties?.showFacets && /* @__PURE__ */ jsxs13("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
-            /* @__PURE__ */ jsx35("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
-            /* @__PURE__ */ jsx35(
-              DataBindingControls,
-              {
-                mode: "facets",
-                path: props.path,
-                query: props.query,
-                facets: response?.facets,
-                showFacets: dataBindingProperties.showFacets
-              }
-            )
-          ] })
-        ]
-      }
-    )
+    showDataBindingControls ? /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
+      /* @__PURE__ */ jsx35(
+        DataBindingControls,
+        {
+          mode: "toolbar",
+          path: props.path,
+          query: props.query,
+          facets: response?.facets,
+          sortOptions: response?.sortOptions,
+          showSortOptions: dataBindingProperties?.showSortOptions,
+          showSearchBar: dataBindingProperties?.showSearchBar
+        }
+      ),
+      /* @__PURE__ */ jsxs13(
+        "div",
+        {
+          className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
+          children: [
+            /* @__PURE__ */ jsxs13("div", { className: "min-w-0", children: [
+              renderedContainer,
+              paginationControl
+            ] }),
+            dataBindingProperties?.showFacets && /* @__PURE__ */ jsxs13("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
+              /* @__PURE__ */ jsx35("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
+              /* @__PURE__ */ jsx35(
+                DataBindingControls,
+                {
+                  mode: "facets",
+                  path: props.path,
+                  query: props.query,
+                  facets: response?.facets,
+                  showFacets: dataBindingProperties.showFacets
+                }
+              )
+            ] })
+          ]
+        }
+      )
+    ] }) : /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
+      renderedContainer,
+      paginationControl && /* @__PURE__ */ jsx35("div", { children: paginationControl })
+    ] })
   ] });
 };
 var DivContainer_default = DivContainer;

package/dist/server.js CHANGED Viewed

@@ -1945,6 +1945,9 @@ var init_OdataBuilder = __esm({
               if (key == "searchCols") {
                 this.searchCols = odata[key];
               }
+              if (key == "$Search") {
+                this.search = odata[key];
+              }
               if (key == "filter") {
                 this.apiFilter = odata[key];
               }
@@ -1977,6 +1980,9 @@ var init_OdataBuilder = __esm({
         if (obj?.["searchCols"] && obj["searchCols"].trim() !== "") {
           queryString += `&searchCols=${encodeURIComponent(obj["searchCols"])}`;
         }
+        if (obj?.["$Search"] && obj["$Search"].trim() !== "") {
+          queryString += `&$Search=${obj["$Search"]}`;
+        }
         if (obj?.["filter"] && obj["filter"].trim() !== "") {
           queryString += `&filter=${encodeURIComponent(obj["filter"])}`;
         }
@@ -2031,8 +2037,8 @@ var init_OdataBuilder = __esm({
         return pageNumber;
       }
       appendApiQueryParameters(url) {
-        if (this.searchTerm) {
-          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        if (this.search) {
+          url += `&$Search=${this.search}`;
         }
         if (this.apiFilter) {
           url += `&filter=${encodeURIComponent(this.apiFilter)}`;
@@ -2118,6 +2124,12 @@ var init_OdataBuilder = __esm({
         if (this.orderBy !== null && this.orderBy !== "") {
           url = url + `&$orderby=${encodeURIComponent(this.orderBy)}`;
         }
+        if (this.searchTerm) {
+          url += `&searchTerm=${encodeURIComponent(this.searchTerm)}`;
+        }
+        if (this.searchCols) {
+          url += `&searchCols=${encodeURIComponent(this.searchCols)}`;
+        }
         return this.appendApiQueryParameters(url);
       }
       getOrderBy() {
@@ -4492,7 +4504,7 @@ var DataBindingControls_exports = {};
 __export(DataBindingControls_exports, {
   default: () => DataBindingControls_default
 });
-var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
+var import_react55, import_navigation, import_jsx_runtime77, humanize, escapeODataString, parseODataSearch, normalizeSortOption, DUMMY_FACETS, DUMMY_SORT_OPTIONS, DataBindingControls, DataBindingControls_default;
 var init_DataBindingControls = __esm({
   "src/components/pageRenderingEngine/nodes/DataBindingControls.tsx"() {
     "use strict";
@@ -4504,6 +4516,14 @@ var init_DataBindingControls = __esm({
     import_jsx_runtime77 = require("react/jsx-runtime");
     humanize = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
     escapeODataString = (value) => value.replace(/'/g, "''");
+    parseODataSearch = (value) => {
+      if (!value) return "";
+      const trimmedValue = value.trim();
+      if (trimmedValue.startsWith("'") && trimmedValue.endsWith("'")) {
+        return trimmedValue.slice(1, -1).replace(/''/g, "'");
+      }
+      return trimmedValue;
+    };
     normalizeSortOption = (option) => {
       const direction = option.direction.trim();
       return {
@@ -4550,7 +4570,7 @@ var init_DataBindingControls = __esm({
       const normalizedSortOptions = resolvedSortOptions.map(normalizeSortOption).filter((option) => option.value);
       const currentFilter = query?.["$filter"] ?? query?.filter ?? "";
       const currentSort = query?.["$orderby"] ?? query?.orderBy ?? "";
-      const currentSearch = query?.searchTerm ?? query?.searchText ?? "";
+      const currentSearch = parseODataSearch(query?.["$Search"]);
       const [searchText, setSearchText] = (0, import_react55.useState)(currentSearch);
       const lastNavigationUrl = (0, import_react55.useRef)(null);
       (0, import_react55.useEffect)(() => {
@@ -4568,7 +4588,7 @@ var init_DataBindingControls = __esm({
           });
           params.delete("$skip");
           params.delete("skip");
-          const queryString = params.toString();
+          const queryString = Array.from(params.entries()).map(([key, value]) => `${key}=${value}`).join("&");
           return queryString ? `${path}?${queryString}` : path;
         },
         [path, query]
@@ -4601,8 +4621,7 @@ var init_DataBindingControls = __esm({
         const timeout = window.setTimeout(() => {
           navigateWithoutReload(
             getQueryUrl({
-              searchTerm: trimmedSearchText || void 0,
-              searchText: void 0
+              "$Search": trimmedSearchText ? `'${escapeODataString(trimmedSearchText)}'` : void 0
             })
           );
         }, 500);
@@ -7703,6 +7722,36 @@ var DivContainer = async (props) => {
     noLinkColor && "no-link-color",
     !!props.node.enterAnimation && "enter-animation"
   ].filter(Boolean).join(" ");
+  const showDataBindingControls = Boolean(
+    dataBindingProperties?.showFacets || dataBindingProperties?.showSortOptions || dataBindingProperties?.showSearchBar
+  );
+  const WrapperComponent = Wrapper;
+  const renderedContainer = /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+    WrapperComponent,
+    {
+      id: guid,
+      style: combinedStyles,
+      className: classNames || void 0,
+      ...wrapperProps,
+      children: dataToRender.map(
+        (item, idx) => item?.links?.view && renderLink ? renderChildren(
+          props.node.children,
+          props,
+          item,
+          idx,
+          props.href ? void 0 : item?.links?.view
+        )?.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(import_react57.default.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
+      )
+    }
+  );
+  const paginationControl = dataBindingProperties?.enablePagination ? /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+    Pagination2,
+    {
+      path: props.path,
+      query: props.query,
+      dataset: response
+    }
+  ) : null;
   return /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
       "style",
@@ -7710,67 +7759,48 @@ var DivContainer = async (props) => {
         dangerouslySetInnerHTML: { __html: cssResult.css + animationCSS }
       }
     ),
-    dataBindingProperties && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-      DataBindingControls2,
-      {
-        mode: "toolbar",
-        path: props.path,
-        query: props.query,
-        facets: response?.facets,
-        sortOptions: response?.sortOptions,
-        showSortOptions: dataBindingProperties.showSortOptions,
-        showSearchBar: dataBindingProperties.showSearchBar
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(
-      "div",
-      {
-        className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("div", { className: "min-w-0", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              Wrapper,
-              {
-                id: guid,
-                style: combinedStyles,
-                className: classNames || void 0,
-                ...wrapperProps,
-                children: dataToRender.map(
-                  (item, idx) => item?.links?.view && renderLink ? renderChildren(
-                    props.node.children,
-                    props,
-                    item,
-                    idx,
-                    props.href ? void 0 : item?.links?.view
-                  )?.map((child, i) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(import_react57.default.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
-                )
-              }
-            ),
-            dataBindingProperties && props.node.dataBinding.enablePagination && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              Pagination2,
-              {
-                path: props.path,
-                query: props.query,
-                dataset: response
-              }
-            )
-          ] }),
-          dataBindingProperties?.showFacets && /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
-            /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              DataBindingControls2,
-              {
-                mode: "facets",
-                path: props.path,
-                query: props.query,
-                facets: response?.facets,
-                showFacets: dataBindingProperties.showFacets
-              }
-            )
-          ] })
-        ]
-      }
-    )
+    showDataBindingControls ? /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+        DataBindingControls2,
+        {
+          mode: "toolbar",
+          path: props.path,
+          query: props.query,
+          facets: response?.facets,
+          sortOptions: response?.sortOptions,
+          showSortOptions: dataBindingProperties?.showSortOptions,
+          showSearchBar: dataBindingProperties?.showSearchBar
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(
+        "div",
+        {
+          className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("div", { className: "min-w-0", children: [
+              renderedContainer,
+              paginationControl
+            ] }),
+            dataBindingProperties?.showFacets && /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
+              /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
+                DataBindingControls2,
+                {
+                  mode: "facets",
+                  path: props.path,
+                  query: props.query,
+                  facets: response?.facets,
+                  showFacets: dataBindingProperties.showFacets
+                }
+              )
+            ] })
+          ]
+        }
+      )
+    ] }) : /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(import_react57.default.Fragment, { children: [
+      renderedContainer,
+      paginationControl && /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("div", { children: paginationControl })
+    ] })
   ] });
 };
 var DivContainer_default = DivContainer;

package/dist/server.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
 import {
   OdataBuilder
-} from "./chunk-Q46GMD3P.mjs";
+} from "./chunk-4OH67SPF.mjs";
 import {
   AssetUtility_default
 } from "./chunk-TQ6BXQ3A.mjs";
@@ -2263,8 +2263,8 @@ var GoogleMapNode_default = GoogleMapNode;
 // src/components/pageRenderingEngine/nodes/DivContainer.tsx
 import { jsx as jsx35, jsxs as jsxs13 } from "react/jsx-runtime";
-var Pagination = dynamic11(() => import("./Pagination-ZQO3EUKB.mjs"), { ssr: true });
-var DataBindingControls = dynamic11(() => import("./DataBindingControls-XCAIDMDC.mjs"), {
+var Pagination = dynamic11(() => import("./Pagination-PDU7V3HY.mjs"), { ssr: true });
+var DataBindingControls = dynamic11(() => import("./DataBindingControls-AT7I4FSN.mjs"), {
   ssr: true
 });
 var Slider = dynamic11(() => import("./Slider-PEIVH6A5.mjs"), {
@@ -2674,6 +2674,36 @@ var DivContainer = async (props) => {
     noLinkColor && "no-link-color",
     !!props.node.enterAnimation && "enter-animation"
   ].filter(Boolean).join(" ");
+  const showDataBindingControls = Boolean(
+    dataBindingProperties?.showFacets || dataBindingProperties?.showSortOptions || dataBindingProperties?.showSearchBar
+  );
+  const WrapperComponent = Wrapper;
+  const renderedContainer = /* @__PURE__ */ jsx35(
+    WrapperComponent,
+    {
+      id: guid,
+      style: combinedStyles,
+      className: classNames || void 0,
+      ...wrapperProps,
+      children: dataToRender.map(
+        (item, idx) => item?.links?.view && renderLink ? renderChildren(
+          props.node.children,
+          props,
+          item,
+          idx,
+          props.href ? void 0 : item?.links?.view
+        )?.map((child, i) => /* @__PURE__ */ jsx35(React22.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
+      )
+    }
+  );
+  const paginationControl = dataBindingProperties?.enablePagination ? /* @__PURE__ */ jsx35(
+    Pagination,
+    {
+      path: props.path,
+      query: props.query,
+      dataset: response
+    }
+  ) : null;
   return /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
     /* @__PURE__ */ jsx35(
       "style",
@@ -2681,67 +2711,48 @@ var DivContainer = async (props) => {
         dangerouslySetInnerHTML: { __html: cssResult.css + animationCSS }
       }
     ),
-    dataBindingProperties && /* @__PURE__ */ jsx35(
-      DataBindingControls,
-      {
-        mode: "toolbar",
-        path: props.path,
-        query: props.query,
-        facets: response?.facets,
-        sortOptions: response?.sortOptions,
-        showSortOptions: dataBindingProperties.showSortOptions,
-        showSearchBar: dataBindingProperties.showSearchBar
-      }
-    ),
-    /* @__PURE__ */ jsxs13(
-      "div",
-      {
-        className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
-        children: [
-          /* @__PURE__ */ jsxs13("div", { className: "min-w-0", children: [
-            /* @__PURE__ */ jsx35(
-              Wrapper,
-              {
-                id: guid,
-                style: combinedStyles,
-                className: classNames || void 0,
-                ...wrapperProps,
-                children: dataToRender.map(
-                  (item, idx) => item?.links?.view && renderLink ? renderChildren(
-                    props.node.children,
-                    props,
-                    item,
-                    idx,
-                    props.href ? void 0 : item?.links?.view
-                  )?.map((child, i) => /* @__PURE__ */ jsx35(React22.Fragment, { children: child }, i)) : renderChildren(props.node.children, props, item, idx)
-                )
-              }
-            ),
-            dataBindingProperties && props.node.dataBinding.enablePagination && /* @__PURE__ */ jsx35(
-              Pagination,
-              {
-                path: props.path,
-                query: props.query,
-                dataset: response
-              }
-            )
-          ] }),
-          dataBindingProperties?.showFacets && /* @__PURE__ */ jsxs13("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
-            /* @__PURE__ */ jsx35("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
-            /* @__PURE__ */ jsx35(
-              DataBindingControls,
-              {
-                mode: "facets",
-                path: props.path,
-                query: props.query,
-                facets: response?.facets,
-                showFacets: dataBindingProperties.showFacets
-              }
-            )
-          ] })
-        ]
-      }
-    )
+    showDataBindingControls ? /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
+      /* @__PURE__ */ jsx35(
+        DataBindingControls,
+        {
+          mode: "toolbar",
+          path: props.path,
+          query: props.query,
+          facets: response?.facets,
+          sortOptions: response?.sortOptions,
+          showSortOptions: dataBindingProperties?.showSortOptions,
+          showSearchBar: dataBindingProperties?.showSearchBar
+        }
+      ),
+      /* @__PURE__ */ jsxs13(
+        "div",
+        {
+          className: dataBindingProperties?.showFacets ? "grid items-start gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]" : void 0,
+          children: [
+            /* @__PURE__ */ jsxs13("div", { className: "min-w-0", children: [
+              renderedContainer,
+              paginationControl
+            ] }),
+            dataBindingProperties?.showFacets && /* @__PURE__ */ jsxs13("aside", { className: "border bg-default p-3 lg:sticky lg:top-[90px] lg:self-start", children: [
+              /* @__PURE__ */ jsx35("h2", { className: "mb-2 text-lg font-semibold", children: "Filters" }),
+              /* @__PURE__ */ jsx35(
+                DataBindingControls,
+                {
+                  mode: "facets",
+                  path: props.path,
+                  query: props.query,
+                  facets: response?.facets,
+                  showFacets: dataBindingProperties.showFacets
+                }
+              )
+            ] })
+          ]
+        }
+      )
+    ] }) : /* @__PURE__ */ jsxs13(React22.Fragment, { children: [
+      renderedContainer,
+      paginationControl && /* @__PURE__ */ jsx35("div", { children: paginationControl })
+    ] })
   ] });
 };
 var DivContainer_default = DivContainer;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@clyrex-digital/clyrex-controls-dev",
-  "version": "0.8.1-dev.20260824062326",
+  "version": "0.8.1-dev.20260824095913",
   "description": "Reusable React components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",