From 64e4fa6124eabfef1430403af21eb204cc5ad3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elodie=20Labb=C3=A9?= Date: Wed, 13 Aug 2025 16:49:32 +0200 Subject: [PATCH 1/2] fix hypertable labels to match design --- .../filtering-renderers/common/existence.hbs | 2 +- .../common/facets-loader.hbs | 2 +- .../filtering-renderers/common/ordering.hbs | 2 +- .../filtering-renderers/common/search.hbs | 2 +- .../filtering-renderers/date.hbs | 28 ++++++++++--------- .../filtering-renderers/numeric.hbs | 4 +-- .../hyper-table/filters-renderers/date.hbs | 18 ++++++------ .../hyper-table/filters-renderers/money.hbs | 8 +++--- .../hyper-table/filters-renderers/numeric.hbs | 6 ++-- .../hyper-table/filters-renderers/text.hbs | 6 ++-- 10 files changed, 41 insertions(+), 37 deletions(-) diff --git a/addon/components/hyper-table-v2/filtering-renderers/common/existence.hbs b/addon/components/hyper-table-v2/filtering-renderers/common/existence.hbs index 7c92d220..14fc2ea8 100644 --- a/addon/components/hyper-table-v2/filtering-renderers/common/existence.hbs +++ b/addon/components/hyper-table-v2/filtering-renderers/common/existence.hbs @@ -1,4 +1,4 @@ -
+
{{#each-in this.existenceFilters as |label value|}} diff --git a/addon/components/hyper-table-v2/filtering-renderers/common/facets-loader.hbs b/addon/components/hyper-table-v2/filtering-renderers/common/facets-loader.hbs index e1e18a59..c1669ab7 100644 --- a/addon/components/hyper-table-v2/filtering-renderers/common/facets-loader.hbs +++ b/addon/components/hyper-table-v2/filtering-renderers/common/facets-loader.hbs @@ -1,6 +1,6 @@
{{#if this.searchEnabled}} -
+
+
-
+
+
{{#if (eq this.filterOption "fixed")}} - - +
+ + +
{{else}} {{#each-in this.movingDateOptions as |label value|}}
{{#if this.showBounds}}
-
+
<:input> @@ -40,7 +40,7 @@
-
+
<:input> diff --git a/addon/components/hyper-table/filters-renderers/date.hbs b/addon/components/hyper-table/filters-renderers/date.hbs index e1d13667..1ff44d05 100644 --- a/addon/components/hyper-table/filters-renderers/date.hbs +++ b/addon/components/hyper-table/filters-renderers/date.hbs @@ -1,15 +1,17 @@ {{#if @column.orderable}} - - +
+ + +
{{/if}} {{#if @column.filterable}} -
+
+
+
{{#each-in this.existenceFilters as |label value|}} @@ -27,7 +27,7 @@ class="fx-row fx-gap-px-12 margin-top-px-12" data-control-name={{concat this._controlNamePrefix "_range_inputs"}} > -
+
<:input> @@ -44,7 +44,7 @@
-
+
<:input> diff --git a/addon/components/hyper-table/filters-renderers/numeric.hbs b/addon/components/hyper-table/filters-renderers/numeric.hbs index 51800a4e..1255dfd1 100644 --- a/addon/components/hyper-table/filters-renderers/numeric.hbs +++ b/addon/components/hyper-table/filters-renderers/numeric.hbs @@ -11,7 +11,7 @@ {{/if}} {{#if this.column.filterable}} -
+
{{#each-in this.existenceFilters as |label value|}} @@ -27,7 +27,7 @@ class="fx-row fx-gap-px-12 margin-top-px-12" data-control-name={{concat this._controlNamePrefix "_range_inputs"}} > -
+
<:input> @@ -44,7 +44,7 @@
-
+
<:input> diff --git a/addon/components/hyper-table/filters-renderers/text.hbs b/addon/components/hyper-table/filters-renderers/text.hbs index c6421a68..a92bff5a 100644 --- a/addon/components/hyper-table/filters-renderers/text.hbs +++ b/addon/components/hyper-table/filters-renderers/text.hbs @@ -1,5 +1,5 @@ {{#if this.column.orderable}} -
+
+
{{#each-in this.existenceFilters as |label value|}} @@ -23,7 +23,7 @@
-
+
Date: Wed, 20 Aug 2025 11:42:22 +0200 Subject: [PATCH 2/2] Bump @upfluence/oss-components to 3.81.1 --- package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 215529d3..ae842fc8 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1d2323d..6aee59c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,8 +148,8 @@ importers: specifier: ^5.32.0 version: 5.62.0(eslint@7.32.0)(typescript@4.9.5) '@upfluence/oss-components': - specifier: ^3.79.0 - version: 3.79.0(@babel/core@7.26.0)(@ember/test-helpers@2.9.4(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)))(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0))(qunit@2.23.1)(typescript@4.9.5)(webpack@5.97.1) + specifier: ^3.81.1 + version: 3.81.1(@babel/core@7.26.0)(@ember/test-helpers@2.9.4(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)))(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0))(qunit@2.23.1)(typescript@4.9.5)(webpack@5.97.1) broccoli-asset-rev: specifier: ^3.0.0 version: 3.0.0 @@ -996,9 +996,9 @@ packages: typescript: optional: true - '@fortawesome/fontawesome-pro@git+https://git@github.com:upfluence/fontawesome-pro.git#2151d30ec8f1c1db594035ee504ea985b4e962c9': - resolution: {commit: 2151d30ec8f1c1db594035ee504ea985b4e962c9, repo: git@github.com:upfluence/fontawesome-pro.git, type: git} - version: 6.5.1 + '@fortawesome/fontawesome-pro@git+https://git@github.com:upfluence/fontawesome-pro.git#2ae6c0044b34d06543101723202e117125257264': + resolution: {commit: 2ae6c0044b34d06543101723202e117125257264, repo: git@github.com:upfluence/fontawesome-pro.git, type: git} + version: 6.7.2 engines: {node: '>=6'} '@glimmer/component@1.1.2': @@ -1345,8 +1345,8 @@ packages: resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - '@upfluence/oss-components@3.79.0': - resolution: {integrity: sha512-knG0sEPyj6nbDPIjVPDfRtjgU54kPLRoaTnAU26FtZeP4LZEl7VK7akhw9IHgMwom39408cDfmsxdwKLjmermQ==, tarball: https://npm.pkg.github.com/download/@upfluence/oss-components/3.79.0/56161dbca59e5771eb09040d4c1dd7329de8373a} + '@upfluence/oss-components@3.81.1': + resolution: {integrity: sha512-qERzhdIJtZGcoRpM5J7gq9hHkdfixyAt8qtZLbrxsu+kvcpZA4SHsCt8XMBJEvBl0MwQTsPNtSBTa9TmVTAykQ==, tarball: https://npm.pkg.github.com/download/@upfluence/oss-components/3.81.1/a5be47f63b2e12cb05c48936151d232c75134829} engines: {node: 12.* || 14.* || >= 16} peerDependencies: qunit: ^2.x @@ -7933,7 +7933,7 @@ snapshots: optionalDependencies: typescript: 4.9.5 - '@fortawesome/fontawesome-pro@git+https://git@github.com:upfluence/fontawesome-pro.git#2151d30ec8f1c1db594035ee504ea985b4e962c9': {} + '@fortawesome/fontawesome-pro@git+https://git@github.com:upfluence/fontawesome-pro.git#2ae6c0044b34d06543101723202e117125257264': {} '@glimmer/component@1.1.2(@babel/core@7.26.0)': dependencies: @@ -8404,13 +8404,13 @@ snapshots: '@typescript-eslint/types': 5.62.0 eslint-visitor-keys: 3.4.3 - '@upfluence/oss-components@3.79.0(@babel/core@7.26.0)(@ember/test-helpers@2.9.4(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)))(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0))(qunit@2.23.1)(typescript@4.9.5)(webpack@5.97.1)': + '@upfluence/oss-components@3.81.1(@babel/core@7.26.0)(@ember/test-helpers@2.9.4(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)))(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0))(qunit@2.23.1)(typescript@4.9.5)(webpack@5.97.1)': dependencies: '@ember/render-modifiers': 2.1.0(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)) '@embroider/macros': 1.16.10(@glint/template@1.5.1) '@embroider/util': 1.13.3(@glint/template@1.5.1)(ember-source@3.28.12(@babel/core@7.26.0)) '@floating-ui/dom': 1.7.2 - '@fortawesome/fontawesome-pro': git+https://git@github.com:upfluence/fontawesome-pro.git#2151d30ec8f1c1db594035ee504ea985b4e962c9 + '@fortawesome/fontawesome-pro': git+https://git@github.com:upfluence/fontawesome-pro.git#2ae6c0044b34d06543101723202e117125257264 babel-plugin-debug-macros: 0.3.4(@babel/core@7.26.0) bootstrap: 3.4.1 broccoli-funnel: 3.0.8