Fix select component invocation

onechiporenko · Sep 23, 2022 · cc45863 · cc45863
1 parent c5a1321
commit cc45863
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 71 deletions.
diff --git a/addon/components/models-table/themes/bootstrap4/data-group-by-select.hbs b/addon/components/models-table/themes/bootstrap4/data-group-by-select.hbs
@@ -7,7 +7,7 @@
         options=this.options
         value=this.value
         themeInstance=@themeInstance
-        class=@themeInstance.changeGroupByField
+        cssPropertyName=@themeInstance.changeGroupByField
         changeValue=@changeGroupingPropertyName
       )
       sort=this.doSort
@@ -36,4 +36,4 @@
       </div>
     {{/if}}
   {{/let}}
-</div>
+</div>
diff --git a/addon/components/models-table/themes/bootstrap4/row-filtering-cell.hbs b/addon/components/models-table/themes/bootstrap4/row-filtering-cell.hbs
@@ -35,15 +35,17 @@
         <label for={{this.inputId}} class="emt-sr-only">{{@column.columnTitle}}</label>
         <div class={{@themeInstance.inputGroup}}>
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              options=@column.filterOptions
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <Input
               id={{this.inputId}}
@@ -70,4 +72,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>
diff --git a/addon/components/models-table/themes/default/pagination-simple.hbs b/addon/components/models-table/themes/default/pagination-simple.hbs
@@ -5,7 +5,6 @@
         component (ensure-safe-component @themeInstance.selectComponent)
         id=this.inputId
         options=@currentPageNumberOptions
-        label=@themeInstance.currentPageNumberMsg
         value=@currentPageNumber
         type="number"
         themeInstance=@themeInstance
@@ -72,4 +71,4 @@
       {{/if}}
     {{/if}}
   {{/let}}
-</div>
+</div>
diff --git a/addon/components/models-table/themes/default/row-filtering-cell.hbs b/addon/components/models-table/themes/default/row-filtering-cell.hbs
@@ -37,16 +37,17 @@
           class="{{@themeInstance.formElementWrapper}} {{if @column.filterUsed "has-feedback"}}">
           <label for={{this.inputId}} class="emt-sr-only">{{@column.columnTitle}}</label>
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              id=this.inputId
-              options=@column.filterOptions
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <Input
               id={{this.inputId}}
@@ -70,4 +71,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>
diff --git a/addon/components/models-table/themes/ember-bootstrap-v4/row-filtering-cell.hbs b/addon/components/models-table/themes/ember-bootstrap-v4/row-filtering-cell.hbs
@@ -35,16 +35,17 @@
         <label for={{this.inputId}} class="emt-sr-only">{{@column.columnTitle}}</label>
         <div class="input-group">
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              id=this.inputId
-              options=@column.filterOptions
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <Input
               id={{this.inputId}}
@@ -72,4 +73,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>
diff --git a/addon/components/models-table/themes/ember-bootstrap-v5/row-filtering-cell.hbs b/addon/components/models-table/themes/ember-bootstrap-v5/row-filtering-cell.hbs
@@ -35,16 +35,17 @@
         <label for={{this.inputId}} class="emt-sr-only">{{@column.columnTitle}}</label>
         <div class={{@themeInstance.inputGroup}}>
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              id=this.inputId
-              options=@column.filterOptions
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <Input
               id={{this.inputId}}
@@ -70,4 +71,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>
diff --git a/addon/components/models-table/themes/ember-paper/row-filtering-cell.hbs b/addon/components/models-table/themes/ember-paper/row-filtering-cell.hbs
@@ -35,18 +35,17 @@
       {{#if @column.useFilter}}
         <div class={{@themeInstance.filteringCellInternalWrapper}}>
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              id=this.inputId
-              options=@column.filterOptions
-              label=@column.columnTitle
-              placeholder=@column.filterPlaceholder
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <this.PaperInput
               class={{@themeInstance.input}}
@@ -68,4 +67,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>
diff --git a/addon/components/models-table/themes/plain-html/row-filtering-cell.hbs b/addon/components/models-table/themes/plain-html/row-filtering-cell.hbs
@@ -35,16 +35,17 @@
         <div class="filter-wrapper">
           <label for={{this.inputId}} class="emt-sr-only">{{@column.columnTitle}}</label>
           {{#if @column.filterWithSelect}}
-            {{component
-              (ensure-safe-component @themeInstance.selectComponent)
-              id=this.inputId
-              options=@column.filterOptions
-              cssPropertyName=@column.cssPropertyName
-              value=@column.filterString
-              themeInstance=@themeInstance
-              class=(concat @themeInstance.input " changeFilterForColumn")
-              changeValue=this.updateColumnFilter
-            }}
+            {{#let (component (ensure-safe-component @themeInstance.selectComponent)) as |Select|}}
+              <Select
+                @id={{this.inputId}}
+                @options={{@column.filterOptions}}
+                @cssPropertyName={{@column.cssPropertyName}}
+                @value={{@column.filterString}}
+                @themeInstance={{@themeInstance}}
+                @changeValue={{this.updateColumnFilter}}
+                class="changeFilterForColumn"
+              />
+            {{/let}}
           {{else}}
             <Input
               id={{this.inputId}}
@@ -67,4 +68,4 @@
       {{/if}}
     {{/if}}
   {{/if}}
-</th>
+</th>