Skip to content

Fix hypertable labels to match design #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Elodie-DeMatteis-Upf merged 2 commits into from
Aug 20, 2025
Merged

Fix hypertable labels to match design #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64e4fa6
fix hypertable labels to match design
Elodie-DeMatteis-Upf Aug 13, 2025
c7df15e
Bump @upfluence/oss-components to 3.81.1
Elodie-DeMatteis-Upf Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/filtering-renderers/common/existence.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>{{this.label}}</label>
<div class="fx-col fx-gap-px-3" ...attributes>
{{#each-in this.existenceFilters as |label value|}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/filtering-renderers/common/facets-loader.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="hypertable__facetting fx-col">
{{#if this.searchEnabled}}
<div class="margin-bottom-px-6">
<div class="fx-col fx-gap-px-6 margin-bottom-px-6">
<label>{{t "hypertable.column.filtering.search_term.label"}}</label>
<OSS::SearchField
@value={{this.searchQuery}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/filtering-renderers/common/ordering.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="fx-col" ...attributes>
<div class="fx-col fx-gap-px-6" ...attributes>
<label>{{@label}}</label>
<OSS::ToggleButtons
@toggles={{this.toggles}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/filtering-renderers/common/search.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_filters"}}>
<div class="margin-top-xxx-sm">
<div class="fx-col fx-gap-px-6 margin-top-xxx-sm">
<label>{{t "hypertable.column.filtering.search_term.label"}}</label>
<OSS::SearchField
@value={{this.searchQuery}}
Expand Down
28 changes: 15 additions & 13 deletions addon/components/hyper-table-v2/filtering-renderers/date.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{/if}}

{{#if @column.definition.filterable}}
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>{{t "hypertable.column.filtering.label"}}</label>
<OSS::ToggleButtons
@toggles={{this.filteringOptions}}
Expand All @@ -27,18 +27,20 @@
data-control-name={{concat "hypertable__column_filtering_for_" @column.definition.key "_date_range_inputs"}}
>
{{#if (eq this.filterOption "fixed")}}
<label>{{t "hypertable.column.filtering.date.range.label"}}</label>
<EmberFlatpickr
@onChange={{this.selectFixedDate}}
@dateFormat="M/D/Y"
@placeholder={{t "hypertable.column.filtering.date.range.label"}}
@mode="range"
@date={{readonly this._currentDateValue}}
@altInput={{true}}
@altInputClass="upf-input"
@onOpen={{this.openedFlatpickr}}
@onClose={{this.closedFlatpickr}}
/>
<div class="fx-col fx-gap-px-6">
<label>{{t "hypertable.column.filtering.date.range.label"}}</label>
<EmberFlatpickr
@onChange={{this.selectFixedDate}}
@dateFormat="M/D/Y"
@placeholder={{t "hypertable.column.filtering.date.range.label"}}
@mode="range"
@date={{readonly this._currentDateValue}}
@altInput={{true}}
@altInputClass="upf-input"
@onOpen={{this.openedFlatpickr}}
@onClose={{this.closedFlatpickr}}
/>
</div>
{{else}}
{{#each-in this.movingDateOptions as |label value|}}
<div
Expand Down
4 changes: 2 additions & 2 deletions addon/components/hyper-table-v2/filtering-renderers/numeric.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/>
{{#if this.showBounds}}
<div class="fx-row fx-gap-px-12">
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>{{t "hypertable.column.filtering.from"}}</label>
<OSS::InputContainer>
<:input>
Expand All @@ -40,7 +40,7 @@
</:input>
</OSS::InputContainer>
</div>
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>{{t "hypertable.column.filtering.to"}}</label>
<OSS::InputContainer>
<:input>
Expand Down
18 changes: 10 additions & 8 deletions addon/components/hyper-table/filters-renderers/date.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{{#if @column.orderable}}
<label>{{t "hypertable.column.ordering.label"}}</label>
<OSS::ToggleButtons
@toggles={{this.orderingOptions}}
@selectedToggle={{@column.orderBy}}
@onSelection={{this.orderingOptionChanged}}
data-control-name={{concat this._controlNamePrefix "_order_by_radiogroup"}}
/>
<div class="fx-col fx-gap-px-6">
<label>{{t "hypertable.column.ordering.label"}}</label>
<OSS::ToggleButtons
@toggles={{this.orderingOptions}}
@selectedToggle={{@column.orderBy}}
@onSelection={{this.orderingOptionChanged}}
data-control-name={{concat this._controlNamePrefix "_order_by_radiogroup"}}
/>
</div>
{{/if}}

{{#if @column.filterable}}
<div class={{if @column.orderable "margin-top-xx-sm"}}>
<div class={{concat "fx-col fx-gap-px-6" (if @column.orderable "margin-top-xx-sm")}}>
<label>{{t "hypertable.column.filtering.label"}}</label>
<OSS::ToggleButtons
@toggles={{this.filteringOptions}}
Expand Down
8 changes: 4 additions & 4 deletions addon/components/hyper-table/filters-renderers/money.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if this.column.orderable}}
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>Order By</label>
<OSS::ToggleButtons
@toggles={{this.orderingOptions}}
Expand All @@ -11,7 +11,7 @@
{{/if}}

{{#if this.column.filterable}}
<div class={{concat "fx-col" (if this.column.orderable " margin-top-px-12")}}>
<div class={{concat "fx-col fx-gap-px-6" (if this.column.orderable " margin-top-px-12")}}>
<label>Display</label>
<div class="fx-col fx-gap-px-3" data-control-name={{concat this._controlNamePrefix "_filter_by_radio"}}>
{{#each-in this.existenceFilters as |label value|}}
Expand All @@ -27,7 +27,7 @@
class="fx-row fx-gap-px-12 margin-top-px-12"
data-control-name={{concat this._controlNamePrefix "_range_inputs"}}
>
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>From</label>
<OSS::InputContainer>
<:input>
Expand All @@ -44,7 +44,7 @@
</OSS::InputContainer>
</div>

<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>To</label>
<OSS::InputContainer>
<:input>
Expand Down
6 changes: 3 additions & 3 deletions addon/components/hyper-table/filters-renderers/numeric.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{{/if}}

{{#if this.column.filterable}}
<div class={{concat "fx-col" (if this.column.orderable " margin-top-px-12")}}>
<div class={{concat "fx-col fx-gap-px-6" (if this.column.orderable " margin-top-px-12")}}>
<label>Display</label>
<div class="fx-col fx-gap-px-3" data-control-name={{concat this._controlNamePrefix "_display_radiogroup"}}>
{{#each-in this.existenceFilters as |label value|}}
Expand All @@ -27,7 +27,7 @@
class="fx-row fx-gap-px-12 margin-top-px-12"
data-control-name={{concat this._controlNamePrefix "_range_inputs"}}
>
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>From</label>
<OSS::InputContainer>
<:input>
Expand All @@ -44,7 +44,7 @@
</OSS::InputContainer>
</div>

<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>To</label>
<OSS::InputContainer>
<:input>
Expand Down
6 changes: 3 additions & 3 deletions addon/components/hyper-table/filters-renderers/text.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if this.column.orderable}}
<div class="fx-col">
<div class="fx-col fx-gap-px-6">
<label>Sort</label>
<OSS::ToggleButtons
@toggles={{this.orderingOptions}}
Expand All @@ -11,7 +11,7 @@
{{/if}}

{{#if this.column.filterable}}
<div class={{concat "fx-col" (if this.column.orderable " margin-top-px-12")}}>
<div class={{concat "fx-col fx-gap-px-6" (if this.column.orderable " margin-top-px-12")}}>
<label>Display</label>
<div class="fx-col fx-gap-px-3" data-control-name={{concat this._controlNamePrefix "_display_radiogroup"}}>
{{#each-in this.existenceFilters as |label value|}}
Expand All @@ -23,7 +23,7 @@
</div>
</div>

<div class="fx-col margin-top-px-12">
<div class="fx-col fx-gap-px-6 margin-top-px-12">
<label>Search</label>
<OSS::InputContainer
@value={{this._searchQuery}}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@types/sinon": "^10.0.6",
"@types/tether": "^1.4.6",
"@typescript-eslint/parser": "^5.32.0",
"@upfluence/oss-components": "^3.79.0",
"@upfluence/oss-components": "^3.81.1",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.28.6",
"ember-cli-code-coverage": "^3.0.0",
Expand Down
20 changes: 10 additions & 10 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.