Merge pull request smeup#2280 from smeup/cmfix

fix(date/timepicker): updated filters ids to be assigned to the comp (and not the fcomp)
apuliasoft · Dec 6, 2024 · 8bb1235 · 8bb1235
2 parents 73bb1db + a4752b3
commit 8bb1235
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/ketchup/src/utils/kup-column-menu/kup-column-menu.ts b/packages/ketchup/src/utils/kup-column-menu/kup-column-menu.ts
@@ -592,14 +592,14 @@ export class KupColumnMenu {
                 'kup-text-field': {
                     fullWidth: true,
                     helperWhenFocused: true,
-                    id: KupColumnMenuIds.TEXTFIELD_FROM,
-                    key: KupColumnMenuIds.TEXTFIELD_FROM + column.name,
                     isClearable: true,
                     label: dom.ketchup.language.translate(
                         KupLanguageSearch.FROM
                     ),
                 },
             },
+            id: KupColumnMenuIds.TEXTFIELD_FROM,
+            key: KupColumnMenuIds.TEXTFIELD_FROM + column.name,
             initialValue: initialValueFrom,
             manageSeconds: dom.ketchup.objects.isTimeWithSeconds(column.obj),
         });
@@ -613,12 +613,12 @@ export class KupColumnMenu {
                 'kup-text-field': {
                     fullWidth: true,
                     helperWhenFocused: true,
-                    id: KupColumnMenuIds.TEXTFIELD_TO,
-                    key: KupColumnMenuIds.TEXTFIELD_TO + column.name,
                     isClearable: true,
                     label: dom.ketchup.language.translate(KupLanguageSearch.TO),
                 },
             },
+            id: KupColumnMenuIds.TEXTFIELD_TO,
+            key: KupColumnMenuIds.TEXTFIELD_TO + column.name,
             initialValue: initialValueTo,
             manageSeconds: dom.ketchup.objects.isTimeWithSeconds(column.obj),
         });
@@ -682,14 +682,14 @@ export class KupColumnMenu {
                 'kup-text-field': {
                     fullWidth: true,
                     helperWhenFocused: true,
-                    id: KupColumnMenuIds.TEXTFIELD_FROM,
-                    key: KupColumnMenuIds.TEXTFIELD_FROM + column.name,
                     isClearable: true,
                     label: dom.ketchup.language.translate(
                         KupLanguageSearch.FROM
                     ),
                 },
             },
+            id: KupColumnMenuIds.TEXTFIELD_FROM,
+            key: KupColumnMenuIds.TEXTFIELD_FROM + column.name,
             initialValue: initialValueFrom,
         });
         props.push({
@@ -703,12 +703,12 @@ export class KupColumnMenu {
                 'kup-text-field': {
                     fullWidth: true,
                     helperWhenFocused: true,
-                    id: KupColumnMenuIds.TEXTFIELD_TO,
-                    key: KupColumnMenuIds.TEXTFIELD_TO + column.name,
                     isClearable: true,
                     label: dom.ketchup.language.translate(KupLanguageSearch.TO),
                 },
             },
+            id: KupColumnMenuIds.TEXTFIELD_TO,
+            key: KupColumnMenuIds.TEXTFIELD_TO + column.name,
             initialValue: initialValueTo,
         });