@pronto-tools-and-more/components 10.36.0 → 10.38.0

package/dist/main.js

@@ -46,13 +46,36 @@ var ArticleAuthors = ({
   return /* @__PURE__ */ React.createElement("div", { className: "ArticleAuthors" }, /* @__PURE__ */ React.createElement(JsonComponent, { json }));
 };
 
+// src/parts/CreatePropertiesFilter/CreatePropertiesFilter.ts
+var createPropertiesFilter = (properties) => {
+  const entries = Object.entries(properties);
+  if (entries.length === 0) {
+    return [];
+  }
+  const outerFilter = [];
+  for (const [key, value] of Object.entries(properties)) {
+    if (Array.isArray(value)) {
+      const innerFilter = [];
+      for (const item of value) {
+        innerFilter.push({
+          properties: {
+            key,
+            value: item
+          }
+        });
+      }
+      if (innerFilter.length > 0) {
+        outerFilter.push({
+          OR: innerFilter
+        });
+      }
+    }
+  }
+  return outerFilter;
+};
+
 // src/parts/CreateFilterFromProperties/CreateFilterFromProperties.ts
-var createFilterFromProperties = ({
-  properties,
-  authorId,
-  categoryId,
-  bundleId
-}) => {
+var createBundleFilter = (bundleId) => {
   if (bundleId) {
     return [
       {
@@ -64,6 +87,9 @@ var createFilterFromProperties = ({
       }
     ];
   }
+  return [];
+};
+var createCategoryFilter = (categoryId) => {
   if (categoryId) {
     return [
       {
@@ -79,6 +105,9 @@ var createFilterFromProperties = ({
       }
     ];
   }
+  return [];
+};
+var createAuthorFilter = (authorId) => {
   if (authorId) {
     return [
       {
@@ -94,30 +123,39 @@ var createFilterFromProperties = ({
       }
     ];
   }
-  const entries = Object.entries(properties);
-  if (entries.length === 0) {
+  return [];
+};
+var mergeFilters = (filters) => {
+  const relevantFilters = filters.filter((f) => f.length > 0);
+  if (relevantFilters.length === 0) {
     return [];
   }
-  const outerFilter = [];
-  for (const [key, value] of Object.entries(properties)) {
-    if (Array.isArray(value)) {
-      const innerFilter = [];
-      for (const item of value) {
-        innerFilter.push({
-          properties: {
-            key,
-            value: item
-          }
-        });
-      }
-      if (innerFilter.length > 0) {
-        outerFilter.push({
-          OR: innerFilter
-        });
-      }
-    }
+  if (relevantFilters.length === 1) {
+    return relevantFilters[0];
   }
-  return outerFilter;
+  return [
+    {
+      AND: relevantFilters.flat(1)
+    }
+  ];
+};
+var createFilterFromProperties = ({
+  properties,
+  authorId,
+  categoryId,
+  bundleId
+}) => {
+  const categoryFilter = createCategoryFilter(categoryId);
+  const authorFilter = createAuthorFilter(authorId);
+  const bundleFilter = createBundleFilter(bundleId);
+  const propertiesFilter = createPropertiesFilter(properties);
+  const merged = mergeFilters([
+    categoryFilter,
+    authorFilter,
+    bundleFilter,
+    propertiesFilter
+  ]);
+  return merged;
 };
 
 // src/parts/GetArticleListDataSource/GetArticleListDataSource.ts

package/dist/parts/CreatePropertiesFilter/CreatePropertiesFilter.d.ts

@@ -0,0 +1 @@
+export declare const createPropertiesFilter: (properties: any) => any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/components",
-  "version": "10.36.0",
+  "version": "10.38.0",
   "description": "",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",