From d8ff3a84d91362d992f073c10c2a95dc2815f346 Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 26 Apr 2026 08:57:47 +0200
Subject: [PATCH] fixed user references

---
 .../FormGeneratorTable/FormGeneratorTable.tsx | 19 ++++++++++++-------
 .../realestate/RealEstateParcelsView.tsx      |  1 +
 .../realestate/RealEstateProjectsView.tsx     |  1 +
 .../views/trustee/TrusteeDocumentsView.tsx    |  1 +
 .../views/trustee/TrusteePositionsView.tsx    |  1 +
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
index 38efc96..71843d9 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
@@ -2138,6 +2138,9 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                               );
                             }
 
+                            const columnFilterValues = getUniqueValuesForColumn(column.key);
+                            const hasEmptyOption = columnFilterValues.some(v => v === null);
+
                             return (
                               <>
                                 <div
@@ -2146,12 +2149,14 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                 >
                                   ({t('Alle')})
                                 </div>
-                                <div
-                                  className={`${styles.filterOption} ${filters[column.key] === null ? styles.filterOptionSelected : ''}`}
-                                  onClick={() => handleFilter(column.key, _EMPTY_FILTER_SENTINEL)}
-                                >
-                                  ({t('Leer')})
-                                </div>
+                                {hasEmptyOption && (
+                                  <div
+                                    className={`${styles.filterOption} ${filters[column.key] === null ? styles.filterOptionSelected : ''}`}
+                                    onClick={() => handleFilter(column.key, _EMPTY_FILTER_SENTINEL)}
+                                  >
+                                    ({t('Leer')})
+                                  </div>
+                                )}
                                 {filterValuesLoading[column.key] ? (
                                   <div className={styles.filterOptionMore} style={{ textAlign: 'center', padding: '8px' }}>
                                     {t('Lade Filterwerte...')}
@@ -2159,7 +2164,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                 ) : (
                                   <FilterValuesList
                                     columnKey={column.key}
-                                    allValues={getUniqueValuesForColumn(column.key)}
+                                    allValues={columnFilterValues}
                                     activeFilter={filters[column.key]}
                                     onSelect={(value) => handleFilter(column.key, value)}
                                     resolveLabel={column.filterLabelResolver}
diff --git a/src/pages/views/realestate/RealEstateParcelsView.tsx b/src/pages/views/realestate/RealEstateParcelsView.tsx
index 174c50e..80fc0dd 100644
--- a/src/pages/views/realestate/RealEstateParcelsView.tsx
+++ b/src/pages/views/realestate/RealEstateParcelsView.tsx
@@ -64,6 +64,7 @@ export const RealEstateParcelsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: (attr as any).displayField,
     }));
   }, [attributes]);
 
diff --git a/src/pages/views/realestate/RealEstateProjectsView.tsx b/src/pages/views/realestate/RealEstateProjectsView.tsx
index 07f425f..4d25a4b 100644
--- a/src/pages/views/realestate/RealEstateProjectsView.tsx
+++ b/src/pages/views/realestate/RealEstateProjectsView.tsx
@@ -62,6 +62,7 @@ export const RealEstateProjectsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: (attr as any).displayField,
     }));
   }, [attributes]);
 
diff --git a/src/pages/views/trustee/TrusteeDocumentsView.tsx b/src/pages/views/trustee/TrusteeDocumentsView.tsx
index 90ca654..4bbdd3b 100644
--- a/src/pages/views/trustee/TrusteeDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteeDocumentsView.tsx
@@ -77,6 +77,7 @@ export const TrusteeDocumentsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: attr.displayField,
     }));
     const byKey = new Map(allCols.map(c => [c.key, c]));
     const ordered: typeof allCols = [];
diff --git a/src/pages/views/trustee/TrusteePositionsView.tsx b/src/pages/views/trustee/TrusteePositionsView.tsx
index 3fedbf7..66122c2 100644
--- a/src/pages/views/trustee/TrusteePositionsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionsView.tsx
@@ -292,6 +292,7 @@ export const TrusteePositionsView: React.FC = () => {
           width: attr.width || 150,
           minWidth: attr.minWidth || 100,
           maxWidth: attr.maxWidth || 400,
+          displayField: attr.displayField,
         };
         if (amountFields.has(attr.name)) {
           col.formatter = (v: unknown) => formatAmount(v);