@vonaffenfels/contentful-teasermanager 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-teasermanager",
-    "version": "1.2.15",
+    "version": "1.2.17",
     "main": "dist/index.js",
     "scripts": {
         "prepublish": "yarn run build",
@@ -102,7 +102,7 @@
         "contentful-resolve-response": "^1.9.2",
         "webpack": "5.88.2"
     },
-    "gitHead": "704f3fe096d4f2f05348b49d1b46e1fba1745510",
+    "gitHead": "a954d2810be5635ab95a6630152130beb04cea87",
     "publishConfig": {
         "access": "public"
     }

package/src/components/Contentful/Dialog/LogicEditor.js

@@ -120,6 +120,11 @@ const LogicEditorInner = ({
         isOver: isAndOver,
         node: andNode,
     } = useDroppable({id: "and"});
+    const {
+        setNodeRef: setExcludeNodeRef,
+        isOver: isExcludeOver,
+        node: excludeNode,
+    } = useDroppable({id: "exclude"});
 
     useEffect(() => {
         setLoading(true);
@@ -185,6 +190,7 @@ const LogicEditorInner = ({
 
     const andTags = selectedTags.filter((t) => t.type === "and");
     const orTags = selectedTags.filter((t) => t.type === "or");
+    const excludeTags = selectedTags.filter((t) => t.type === "exclude");
 
     return <div className="flex flex-col gap-2 p-4">
         <div className="z-10 flex w-full flex-col gap-4 border-b border-gray-200 bg-white py-4">
@@ -229,7 +235,7 @@ const LogicEditorInner = ({
             </div>
             <div className="flex w-full flex-row items-center gap-2" style={{minHeight: 36}}>
                 <SectionHeading style={{marginBottom: 0}}>Gewählte Kategorien & Tags:</SectionHeading>
-                <div className="grid w-full grid-cols-4 gap-4">
+                <div className="grid w-full grid-cols-5 gap-4">
                     <div className="flex w-full flex-col gap-2">
                         <div>
                             <SectionHeading style={{marginBottom: 0}}>Oder</SectionHeading>
@@ -279,6 +285,30 @@ const LogicEditorInner = ({
                             })}
                         </div>
                     </div>
+                    <div className="flex w-full flex-col gap-2">
+                        <SectionHeading style={{marginBottom: 0}}>Ausschließen</SectionHeading>
+                        <div
+                            ref={setExcludeNodeRef}
+                            style={{
+                                minHeight: 36,
+                                backgroundColor: isExcludeOver ? "rgba(0, 255, 0, 0.3)" : "transparent",
+                            }}
+                            className="flex h-full w-full flex-row flex-wrap gap-2"
+                        >
+                            {excludeTags.map((tag) => {
+                                return <DraggablePill
+                                    key={tag.id}
+                                    id={tag.id}
+                                    testId={tag.id}
+                                    variant="active"
+                                    label={(`${tag.label}`)}
+                                    onClose={() => {
+                                        setSelectedTags(selectedTags.filter((t) => t.id !== tag.id));
+                                    }}
+                                />;
+                            })}
+                        </div>
+                    </div>
                     <div className="col-span-2 flex w-full flex-col gap-4">
                         <div>
                             <SectionHeading style={{marginBottom: 0}}>Artikel</SectionHeading>

package/src/queryFromLogic.js

@@ -1,6 +1,7 @@
 export const queryFromLogic = (logic) => {
     const orTags = logic.tags.filter(v => v.type === "or").map(v => v.id);
     const andTags = logic.tags.filter(v => v.type === "and").map(v => v.id);
+    const excludeTags = logic.tags.filter(v => v.type === "exclude").map(v => v.id);
     const timeZoneOffsetInHours = new Date().getTimezoneOffset() / 60;
     const differenceToGermanTime = timeZoneOffsetInHours + 2;
     const hours = [...(logic.timepoints || [])].map(v => parseInt(v)).sort((a, b) => a - b);
@@ -19,6 +20,10 @@ export const queryFromLogic = (logic) => {
         logicQuery["fields.tags.sys.id[all]"] = andTags.join(",");
     }
 
+    if (excludeTags.length) {
+        logicQuery["fields.tags.sys.id[nin]"] = excludeTags.join(",");
+    }
+
     if (nearestPassedTime && hours.length) {
         logicQuery["fields.date[lte]"] = new Date(new Date().setHours(
             nearestPassedTime + differenceToGermanTime, 0, 0, 0,