@solidxai/core-ui 0.1.9-beta.17 → 0.1.9-beta.19

package/dist/components/core/common/SolidGlobalSearchElement.js

@@ -788,27 +788,61 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
             setPredefinedSearchChip(null);
             setPredefinedSearchBaseFilter(null);
             setInputValue("");
-            var fieldsData = (_b = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _b === void 0 ? void 0 : _b.solidFieldsMetadata;
+            var fieldsData_1 = (_b = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _b === void 0 ? void 0 : _b.solidFieldsMetadata;
             // console.log(`fiels data while rendering solid global search element: `);
             // console.log(fieldsData);
             var layoutChildren = (_f = (_e = (_d = (_c = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _c === void 0 ? void 0 : _c.solidView) === null || _d === void 0 ? void 0 : _d.layout) === null || _e === void 0 ? void 0 : _e.children) !== null && _f !== void 0 ? _f : [];
             var fieldElements_1 = extractFields(layoutChildren);
-            var fieldsList = Object.entries(fieldsData !== null && fieldsData !== void 0 ? fieldsData : {}).map(function (_a) {
-                var _b, _c, _d, _e, _f, _g;
+            // Build one entry per layout column (not per field name), so multiple columns
+            // sharing the same field name (e.g. several viewMetadata columns with different
+            // searchFields/labels) each appear as a separate searchable option.
+            var seenKeys_1 = new Set();
+            var fieldsList_1 = [];
+            // First pass: one entry per unique field name (for non-searchable / filter use)
+            Object.entries(fieldsData_1 !== null && fieldsData_1 !== void 0 ? fieldsData_1 : {}).forEach(function (_a) {
+                var _b, _c, _d, _e, _f, _g, _h, _j;
                 var key = _a[0], value = _a[1];
                 var viewFieldElement = fieldElements_1.find(function (f) { var _a; return ((_a = f === null || f === void 0 ? void 0 : f.attrs) === null || _a === void 0 ? void 0 : _a.name) === key; });
-                return {
-                    name: value.displayName,
+                seenKeys_1.add(key);
+                fieldsList_1.push({
+                    name: (_c = (_b = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _b === void 0 ? void 0 : _b.label) !== null && _c !== void 0 ? _c : value.displayName,
                     value: key,
                     type: value.type,
                     ormType: value.ormType,
-                    matchMode: (_b = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _b === void 0 ? void 0 : _b.searchMatchMode,
-                    searchField: (_d = (_c = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _c === void 0 ? void 0 : _c.searchField) !== null && _d !== void 0 ? _d : null,
-                    isSearchable: (_f = (_e = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _e === void 0 ? void 0 : _e.isSearchable) !== null && _f !== void 0 ? _f : false,
-                    relationType: (_g = value === null || value === void 0 ? void 0 : value.relationType) !== null && _g !== void 0 ? _g : null,
-                };
+                    matchMode: (_d = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _d === void 0 ? void 0 : _d.searchMatchMode,
+                    searchField: (_f = (_e = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _e === void 0 ? void 0 : _e.searchField) !== null && _f !== void 0 ? _f : null,
+                    isSearchable: (_h = (_g = viewFieldElement === null || viewFieldElement === void 0 ? void 0 : viewFieldElement.attrs) === null || _g === void 0 ? void 0 : _g.isSearchable) !== null && _h !== void 0 ? _h : false,
+                    relationType: (_j = value === null || value === void 0 ? void 0 : value.relationType) !== null && _j !== void 0 ? _j : null,
+                });
+            });
+            // Second pass: for any layout column that shares a field name but has a
+            // distinct searchField, add it as an additional searchable entry.
+            fieldElements_1.forEach(function (fieldElement) {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var key = (_a = fieldElement === null || fieldElement === void 0 ? void 0 : fieldElement.attrs) === null || _a === void 0 ? void 0 : _a.name;
+                var searchField = (_b = fieldElement === null || fieldElement === void 0 ? void 0 : fieldElement.attrs) === null || _b === void 0 ? void 0 : _b.searchField;
+                var isSearchable = (_d = (_c = fieldElement === null || fieldElement === void 0 ? void 0 : fieldElement.attrs) === null || _c === void 0 ? void 0 : _c.isSearchable) !== null && _d !== void 0 ? _d : false;
+                if (!isSearchable || !searchField)
+                    return;
+                // Already covered by the first pass entry for this key?
+                var existingEntry = fieldsList_1.find(function (e) { return e.value === key && e.searchField === searchField; });
+                if (existingEntry)
+                    return; // already in list
+                var value = (fieldsData_1 !== null && fieldsData_1 !== void 0 ? fieldsData_1 : {})[key];
+                if (!value)
+                    return;
+                fieldsList_1.push({
+                    name: (_f = (_e = fieldElement === null || fieldElement === void 0 ? void 0 : fieldElement.attrs) === null || _e === void 0 ? void 0 : _e.label) !== null && _f !== void 0 ? _f : value.displayName,
+                    value: key,
+                    type: value.type,
+                    ormType: value.ormType,
+                    matchMode: (_g = fieldElement === null || fieldElement === void 0 ? void 0 : fieldElement.attrs) === null || _g === void 0 ? void 0 : _g.searchMatchMode,
+                    searchField: searchField,
+                    isSearchable: true,
+                    relationType: (_h = value === null || value === void 0 ? void 0 : value.relationType) !== null && _h !== void 0 ? _h : null,
+                });
             });
-            var filterableFieldsList = fieldsList.filter(function (field) {
+            var filterableFieldsList = fieldsList_1.filter(function (field) {
                 switch (field.type) {
                     case "mediaSingle":
                     case "mediaMultiple":
@@ -818,7 +852,7 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                 }
             });
             setFields(filterableFieldsList);
-            var searchableFieldsList = fieldsList.filter(function (field) {
+            var searchableFieldsList = fieldsList_1.filter(function (field) {
                 if (!field.isSearchable)
                     return false;
                 switch (field.type) {
@@ -837,7 +871,7 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                         return false;
                 }
             });
-            var groupableFieldsList = fieldsList.filter(function (field) {
+            var groupableFieldsList = fieldsList_1.filter(function (field) {
                 switch (field.type) {
                     case "relation":
                         // Only include relation if searchField is present