From 9fb00d4db217df533bc2613a3ce86e9833bc102e Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Sun, 22 May 2022 20:15:44 +0700
Subject: [PATCH] Minor Filter fixes (#1825)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .../src/components/filter/FilterBar.svelte      |  2 +-
 .../src/components/filter/ObjectFilter.svelte   |  2 +-
 .../src/components/filter/ValueFilter.svelte    | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/plugins/view-resources/src/components/filter/FilterBar.svelte b/plugins/view-resources/src/components/filter/FilterBar.svelte
index 6a5f7542b1..f19eee6436 100644
--- a/plugins/view-resources/src/components/filter/FilterBar.svelte
+++ b/plugins/view-resources/src/components/filter/FilterBar.svelte
@@ -120,7 +120,7 @@
 </script>
 
 {#if visible}
-  <div class="flex pl-4 pr-4">
+  <div class="flex-row-center pl-4 pr-4">
     {#each filters as filter, i}
       <FilterSection
         {_class}
diff --git a/plugins/view-resources/src/components/filter/ObjectFilter.svelte b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
index 4fb5096235..149121bcd8 100644
--- a/plugins/view-resources/src/components/filter/ObjectFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ObjectFilter.svelte
@@ -81,7 +81,7 @@
         : {
             _id: { $in: Array.from(targets.keys()) }
           }
-    values = await client.findAll(targetClass, resultQuery, { projection: { _id: 1 } })
+    values = await client.findAll(targetClass, resultQuery)
     if (targets.has(undefined)) {
       values.unshift(undefined)
     }
diff --git a/plugins/view-resources/src/components/filter/ValueFilter.svelte b/plugins/view-resources/src/components/filter/ValueFilter.svelte
index b07439127f..dcaaa92c85 100644
--- a/plugins/view-resources/src/components/filter/ValueFilter.svelte
+++ b/plugins/view-resources/src/components/filter/ValueFilter.svelte
@@ -72,7 +72,15 @@
             ...query
           }
         : query
-    const res = await client.findAll(_class, resultQuery, { projection: { [filter.key.key]: 1 } })
+    let prefix = ''
+
+    const attr = client.getHierarchy().getAttribute(_class, filter.key.key)
+    if (client.getHierarchy().isMixin(attr.attributeOf)) {
+      prefix = attr.attributeOf + '.'
+      console.log('prefix', prefix)
+    }
+    const res = await client.findAll(_class, resultQuery, { projection: { [prefix + filter.key.key]: 1 } })
+
     for (const object of res) {
       const realValue = getObjectValue(filter.key.key, object)
       const value = typeof realValue === 'string' ? realValue.trim().toUpperCase() : realValue ?? undefined
@@ -123,6 +131,7 @@
     <div class="box">
       {#await promise then attribute}
         {#each Array.from(values.keys()) as value}
+          {@const realValue = [...(realValues.get(value) ?? [])][0]}
           <button
             class="menu-item"
             on:click={() => {
@@ -135,7 +144,11 @@
                   <CheckBox checked={isSelected(value, selectedValues)} primary />
                 </div>
                 {#if value}
-                  <svelte:component this={attribute.presenter} {value} {...attribute.props} />
+                  <svelte:component
+                    this={attribute.presenter}
+                    value={typeof value === 'string' ? realValue : value}
+                    {...attribute.props}
+                  />
                 {:else}
                   <Label label={ui.string.NotSelected} />
                 {/if}