From 4d249c3bcfebad87f20258d602a50d4eaf3d3812 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Thu, 1 Oct 2020 16:06:44 +0200
Subject: [PATCH] some fixes ^^

---
 zero.Core/Extensions/RavenQueryableExtensions.cs |  4 ++--
 zero.Web.UI/App/components/tables/table.vue      |  6 ++++++
 zero.Web.UI/App/components/tabs/tab.vue          | 15 +++++++++++++--
 zero.Web.UI/App/components/tabs/tabs.vue         |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/zero.Core/Extensions/RavenQueryableExtensions.cs b/zero.Core/Extensions/RavenQueryableExtensions.cs
index efc509d5..ce8faf0f 100644
--- a/zero.Core/Extensions/RavenQueryableExtensions.cs
+++ b/zero.Core/Extensions/RavenQueryableExtensions.cs
@@ -70,13 +70,13 @@ namespace zero.Core.Extensions
       {
         if (!query.Search.IsNullOrEmpty() && query.SearchSelector != null)
         {
-          rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*");
+          rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
         }
         if (!query.Search.IsNullOrEmpty() && query.SearchSelectors.Length > 0)
         {
           foreach (var selector in query.SearchSelectors)
           {
-            rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.Or);
+            rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.And);
           }
         }
 
diff --git a/zero.Web.UI/App/components/tables/table.vue b/zero.Web.UI/App/components/tables/table.vue
index c39563ce..a46236de 100644
--- a/zero.Web.UI/App/components/tables/table.vue
+++ b/zero.Web.UI/App/components/tables/table.vue
@@ -183,6 +183,7 @@
       {
         this.configuration.items(this.filter).then(result =>
         {
+          this.$emit('loaded', result);
           this.pages = result.totalPages;
           this.count = result.totalItems;
 
@@ -576,6 +577,11 @@
     }
   }
 
+  .ui-table-cell .-minor
+  {
+    color: var(--color-text-dim);
+  }
+
   .ui-table-field-image
   {
     border-radius: 3px;
diff --git a/zero.Web.UI/App/components/tabs/tab.vue b/zero.Web.UI/App/components/tabs/tab.vue
index 745c466c..198e3ecb 100644
--- a/zero.Web.UI/App/components/tabs/tab.vue
+++ b/zero.Web.UI/App/components/tabs/tab.vue
@@ -30,24 +30,35 @@
       id: null,
       loaded: false,
       active: false,
-      hasErrors: false
+      hasErrors: false,
+      countOutput: 0
     }),
 
     watch: {
       active(val)
       {
         this.loaded = true;
+      },
+      count(val)
+      {
+        this.countOutput = val;
       }
     },
 
-    mounted ()
+    created()
     {
       this.id = Strings.guid();
       this.loaded = this.active;
+      this.countOutput = this.count;
     },
 
     methods: {
 
+      setCount(count)
+      {
+        this.countOutput = count;
+      },
+
       // set and display errors
       setErrors(errors, append)
       {
diff --git a/zero.Web.UI/App/components/tabs/tabs.vue b/zero.Web.UI/App/components/tabs/tabs.vue
index 7cfc7078..0c08b508 100644
--- a/zero.Web.UI/App/components/tabs/tabs.vue
+++ b/zero.Web.UI/App/components/tabs/tabs.vue
@@ -5,7 +5,7 @@
               :aria-selected="tab.active" role="tab" @click="select(index)">
         <i v-if="tab.hasErrors" class="ui-tabs-list-item-error fth-alert-circle"></i>
         {{ tab.label | localize }}
-        <i v-if="tab.count > 0" class="ui-tabs-list-item-count">{{tab.count}}</i>
+        <i v-if="tab.countOutput > 0" class="ui-tabs-list-item-count">{{tab.countOutput}}</i>
       </button>
     </div>
     <div class="ui-tabs-items">