@social-mail/social-mail-client 1.2.374 → 1.2.375

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.374",
+  "version": "1.2.375",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/public/store/StoreItemListView.tsx

@@ -6,13 +6,14 @@ import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import InfiniteRepeater from "../../common/controls/repeater/InfiniteRepeater";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import EntityService from "../../services/EntityService";
-import { AppFile, IStoreItem, IStoreTag, ITag, StoreItem, StoreMediaFile, StoreTag } from "../../model/model";
+import { AppFile, IStoreItem, IStoreItemTag, IStoreTag, ITag, StoreItem, StoreMediaFile, StoreTag } from "../../model/model";
 import { Sql } from "../../common/Sql";
 import { apiPath } from "../../common/apiPath";
 import SocialMailApp from "../../common/SocialMailApp";
 import { formatPrice } from "../../common/currency";
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
 import { storeItemLink } from "./storeItemLink";
+import Action from "@web-atoms/core/dist/view-model/Action";
 
     styled.css `
 
@@ -108,6 +109,10 @@ export default class StoreItemListView extends AtomControl {
 
     items: IStoreItem[] = [];
 
+    tags: IStoreTag[] = [];
+
+    version = 0;
+
     @InjectProperty
     entityService: EntityService;
 
@@ -121,11 +126,17 @@ export default class StoreItemListView extends AtomControl {
 
         this.render(<div data-shopping-cart-list="shopping-cart-list">
             <header>
+                <AtomRepeater
+                    class="search-tags"
+                    items={this.tags}
+                    itemRenderer={(x) => <div data-layout="row"> <label text={`${x.tag.label} (${x.count})`}/> <i data-click-event="remove-tag" class="fas fa-times-circle"/> </div>}
+                    />
                 <input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
                 <AtomRepeater
                     class="tags"
-                    items={Bind.oneWayAsync((c, e, cancelToken) => this.searchTags(this.search, cancelToken), { default: [] })}
+                    items={Bind.oneWayAsync((c, e, cancelToken) => this.searchTags(this.search, cancelToken, this.version), { default: [] })}
                     itemRenderer={(x: IStoreTag) => <label text={`${x.tag.label} (${x.count})`}/>}
+                    data-click-event="select-tag"
                     />
             </header>
             <AtomRepeater
@@ -136,6 +147,7 @@ export default class StoreItemListView extends AtomControl {
                         this.searchItems({
                             start,
                             search: this.search,
+                            version: this.version,
                             cancelToken
                         })
                 )}
@@ -167,7 +179,22 @@ export default class StoreItemListView extends AtomControl {
 
     }
 
-    async searchTags(search: string, cancelToken): Promise<any> {
+    @Action({ onEvent: "remove-tag"})
+    removeTag(tag: IStoreTag) {
+        this.tags.remove(tag);
+        this.version++;
+    }
+
+    @Action({ onEvent: "select-tag"})
+    selectTag(tag: IStoreTag) {
+        if(this.tags.find((t) => t.tagID === tag.tagID)) {
+            return;
+        }
+        this.tags.add(tag);
+        this.version++;
+    }
+
+    async searchTags(search: string, cancelToken, v): Promise<any> {
         let q = this.entityService.query(StoreTag, "storeQuery");
         if (search) {
             search = search.trim().toLocaleLowerCase() + "%";
@@ -177,6 +204,10 @@ export default class StoreItemListView extends AtomControl {
                 && x.count > 0
             );
         }
+        if (this.tags.length) {
+            const ids = this.tags.map((t) => t.tagID);
+            q = q.where({ ids }, (p) => (x) => ! Sql.in(x.tagID, p.ids));
+        }
         const tags = await q
             .orderByDescending((x) => x.count)
             .include((x) => x.tag)
@@ -199,6 +230,7 @@ export default class StoreItemListView extends AtomControl {
         start,
         search = "",
         size = 50,
+        version = 0,
         cancelToken
     }) {
         let q = this.entityService.query(StoreItem, "storeQuery")
@@ -219,6 +251,10 @@ export default class StoreItemListView extends AtomControl {
                     || Sql.text.like(t.tag.parent.lowerCaseName, p.lowerSearch)))
             );
         }
+        if (this.tags.length) {
+            const ids = this.tags.map((t) => t.tagID);
+            q = q.where({ ids}, (p) => (x) => x.storeItemTags.some((st) => Sql.in(st.tagID, p.ids)));
+        }
         const items = await q.orderByDescending((x) => x.storeItemID)
             .include((x) => [
                 x.storeItemPrices,