From 9e528a139d880f7c7bea6428dbb76e1bb6831e61 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 14:53:16 +0100
Subject: [PATCH 1/9] feat: Better responsive behavior for iframes

Constraint iframe default max width to 100%
This way, on mobile, iframes do not take up more horizontal space than
available
---
 app/components/publish-actions.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/publish-actions.tsx b/app/components/publish-actions.tsx
index 0f9454a31..c3ada9c72 100644
--- a/app/components/publish-actions.tsx
+++ b/app/components/publish-actions.tsx
@@ -324,7 +324,7 @@ export const Embed = ({ configKey, locale }: EmbedShareProps) => {
           <CopyToClipboardTextInput
             mt={1}
             mb={2}
-            content={`<iframe src="${embedIframeUrl}" style="border:0px #ffffff none;" name="visualize.admin.ch" scrolling="no" frameborder="1" marginheight="0px" marginwidth="0px" height="${iFrameHeight}" width="600px" allowfullscreen></iframe>`}
+            content={`<iframe src="${embedIframeUrl}" style="border:0px #ffffff none; max-width: 100%" name="visualize.admin.ch" scrolling="no" frameborder="1" marginheight="0px" marginwidth="0px" height="${iFrameHeight}" width="600px" allowfullscreen></iframe>`}
           />
         </div>
 

From f2f3992abc2d9457c936b3fff6b89487bca5b138 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 15:19:28 +0100
Subject: [PATCH 2/9] fix: Parse literals that are fetch in batch

---
 app/rdf/queries.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/rdf/queries.ts b/app/rdf/queries.ts
index aaac9b4d2..d345f93e4 100644
--- a/app/rdf/queries.ts
+++ b/app/rdf/queries.ts
@@ -21,6 +21,7 @@ import {
   Observation,
   ObservationValue,
   parseObservationValue,
+  parseRDFLiteral,
   shouldLoadMinMaxValues,
 } from "../domain/data";
 import { ResolvedDataCube, ResolvedDimension } from "../graphql/shared-types";
@@ -374,10 +375,12 @@ export const getCubeDimensionValuesWithMetadata = async ({
       literals.map(({ iri, alternateName, identifier, position, color }) => [
         iri.value,
         {
-          alternateName: alternateName?.value,
-          identifier: identifier?.value,
-          position: position?.value,
-          color: color?.value,
+          alternateName: alternateName
+            ? parseRDFLiteral(alternateName)
+            : undefined,
+          identifier: identifier ? parseRDFLiteral(identifier) : undefined,
+          position: position ? parseRDFLiteral(position) : undefined,
+          color: color ? parseRDFLiteral(color) : undefined,
         },
       ])
     );

From ad0a9de5b0e155a9305332655a4ad76790073386 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 15:37:47 +0100
Subject: [PATCH 3/9] feat: Add small caption when no filter has been set

---
 .../components/chart-configurator.tsx         |  11 ++
 app/locales/de/messages.po                    | 122 +++++++++---------
 app/locales/en/messages.po                    | 122 +++++++++---------
 app/locales/fr/messages.po                    | 122 +++++++++---------
 app/locales/it/messages.po                    | 122 +++++++++---------
 5 files changed, 263 insertions(+), 236 deletions(-)

diff --git a/app/configurator/components/chart-configurator.tsx b/app/configurator/components/chart-configurator.tsx
index 20210ef22..010ac844a 100644
--- a/app/configurator/components/chart-configurator.tsx
+++ b/app/configurator/components/chart-configurator.tsx
@@ -624,6 +624,17 @@ export const ChartConfigurator = ({
                 </Trans>
               </Typography>
             ) : null}
+            {filterDimensions.length === 0 ? (
+              <Typography
+                variant="body2"
+                color="text.secondary"
+                sx={{ mb: -4 }}
+              >
+                <Trans id="controls.section.data.filters.none">
+                  No filters
+                </Trans>
+              </Typography>
+            ) : null}
             <DragDropContext onDragEnd={handleDragEnd}>
               <Droppable droppableId="filters">
                 {(provided) => (
diff --git a/app/locales/de/messages.po b/app/locales/de/messages.po
index 1ce8c536f..28ec84710 100644
--- a/app/locales/de/messages.po
+++ b/app/locales/de/messages.po
@@ -13,24 +13,24 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
-#: app/configurator/components/chart-configurator.tsx:701
+#: app/configurator/components/chart-configurator.tsx:713
 msgid "Add filter"
 msgstr "Filter hinzufügen"
 
-#: app/configurator/components/chart-configurator.tsx:674
+#: app/configurator/components/chart-configurator.tsx:686
 msgid "Drag filters to reorganize"
 msgstr "Ziehen Sie die Filter per Drag & Drop, um sie neu zu organisieren"
 
-#: app/configurator/components/chart-configurator.tsx:671
+#: app/configurator/components/chart-configurator.tsx:683
 msgid "Move filter down"
 msgstr "Filter nach unten verschieben"
 
-#: app/configurator/components/chart-configurator.tsx:668
+#: app/configurator/components/chart-configurator.tsx:680
 msgid "Move filter up"
 msgstr "Filter nach oben verschieben"
 
 #: app/components/select-tree.tsx:525
-#: app/configurator/components/dataset-browse.tsx:1046
+#: app/configurator/components/dataset-browse.tsx:1053
 msgid "No results"
 msgstr "Kein Ergebnis"
 
@@ -42,11 +42,11 @@ msgstr "[ Ohne Beschreibung ]"
 msgid "annotation.add.title"
 msgstr "[ Ohne Titel ]"
 
-#: app/configurator/components/dataset-browse.tsx:977
+#: app/configurator/components/dataset-browse.tsx:984
 msgid "browse-panel.organizations"
 msgstr "Organisationen"
 
-#: app/configurator/components/dataset-browse.tsx:959
+#: app/configurator/components/dataset-browse.tsx:966
 msgid "browse-panel.themes"
 msgstr "Kategorien"
 
@@ -90,16 +90,16 @@ msgstr "Daten aus der Grafik"
 msgid "button.download.runsparqlquery.visible"
 msgstr "SPARQL-Abfrage ausführen"
 
-#: app/components/publish-actions.tsx:258
+#: app/components/publish-actions.tsx:251
 msgid "button.embed"
 msgstr "Einbetten"
 
-#: app/components/publish-actions.tsx:409
-#: app/components/publish-actions.tsx:415
+#: app/components/copy-to-clipboard-text-input.tsx:108
+#: app/components/copy-to-clipboard-text-input.tsx:114
 msgid "button.hint.click.to.copy"
 msgstr "Kopieren"
 
-#: app/components/publish-actions.tsx:439
+#: app/components/copy-to-clipboard-text-input.tsx:138
 msgid "button.hint.copied"
 msgstr "Kopiert!"
 
@@ -111,7 +111,7 @@ msgstr "Neue Visualisierung erstellen"
 msgid "button.publish"
 msgstr "Diese Visualisierung veröffentlichen"
 
-#: app/components/publish-actions.tsx:107
+#: app/components/publish-actions.tsx:100
 msgid "button.share"
 msgstr "Teilen"
 
@@ -119,7 +119,7 @@ msgstr "Teilen"
 msgid "chart.map.layers.area"
 msgstr "Flächen"
 
-#: app/configurator/components/chart-configurator.tsx:754
+#: app/configurator/components/chart-configurator.tsx:766
 #: app/configurator/components/chart-options-selector.tsx:1055
 #: app/configurator/components/field-i18n.ts:31
 msgid "chart.map.layers.base"
@@ -288,7 +288,7 @@ msgstr "Diskret"
 msgid "controls.color.select"
 msgstr "Farbe auswählen"
 
-#: app/configurator/components/chart-controls/color-picker.tsx:183
+#: app/configurator/components/chart-controls/color-picker.tsx:185
 msgid "controls.colorpicker.open"
 msgstr "Farbauswahl öffnen"
 
@@ -306,9 +306,9 @@ msgstr "Beschreibung hinzufügen"
 
 #: app/charts/shared/chart-data-filters.tsx:249
 #: app/charts/shared/chart-data-filters.tsx:296
-#: app/configurator/components/field.tsx:167
-#: app/configurator/components/field.tsx:267
-#: app/configurator/components/field.tsx:367
+#: app/configurator/components/field.tsx:166
+#: app/configurator/components/field.tsx:269
+#: app/configurator/components/field.tsx:369
 msgid "controls.dimensionvalue.none"
 msgstr "Kein Filter"
 
@@ -432,8 +432,8 @@ msgstr "Zurück zur Übersicht"
 msgid "controls.nav.back-to-preview"
 msgstr "Zurück zur Vorschau"
 
-#: app/configurator/components/field.tsx:706
-#: app/configurator/components/field.tsx:878
+#: app/configurator/components/field.tsx:708
+#: app/configurator/components/field.tsx:880
 #: app/configurator/interactive-filters/interactive-filters-config-options.tsx:244
 msgid "controls.none"
 msgstr "Keine"
@@ -470,11 +470,15 @@ msgstr "Spalten"
 msgid "controls.section.columnstyle"
 msgstr "Spaltenstil"
 
-#: app/configurator/components/chart-configurator.tsx:605
+#: app/configurator/components/chart-configurator.tsx:606
 msgid "controls.section.data.filters"
 msgstr "Filter"
 
-#: app/configurator/components/chart-configurator.tsx:621
+#: app/configurator/components/chart-configurator.tsx:634
+msgid "controls.section.data.filters.none"
+msgstr "Keine Filter"
+
+#: app/configurator/components/chart-configurator.tsx:622
 msgid "controls.section.data.filters.possible-filters-error"
 msgstr "Beim Abrufen möglicher Filter ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut oder laden Sie die Seite neu."
 
@@ -585,24 +589,24 @@ msgstr "Dimension auswählen"
 msgid "controls.select.measure"
 msgstr "Messwert auswählen"
 
-#: app/configurator/components/field.tsx:172
-#: app/configurator/components/field.tsx:272
-#: app/configurator/components/field.tsx:372
-#: app/configurator/components/field.tsx:711
-#: app/configurator/components/field.tsx:883
+#: app/configurator/components/field.tsx:171
+#: app/configurator/components/field.tsx:274
+#: app/configurator/components/field.tsx:374
+#: app/configurator/components/field.tsx:713
+#: app/configurator/components/field.tsx:885
 msgid "controls.select.optional"
 msgstr ""
 
 #: app/configurator/components/filters.tsx:380
-#: app/configurator/components/filters.tsx:807
+#: app/configurator/components/filters.tsx:809
 msgid "controls.set-filters"
 msgstr "Filter bearbeiten"
 
-#: app/configurator/components/filters.tsx:815
+#: app/configurator/components/filters.tsx:817
 msgid "controls.set-filters-caption"
 msgstr "Für beste Ergebnisse wählen Sie nicht mehr als 7 Werte für die Visualisierung aus"
 
-#: app/configurator/components/filters.tsx:855
+#: app/configurator/components/filters.tsx:857
 msgid "controls.set-values-apply"
 msgstr "Filter anwenden"
 
@@ -710,15 +714,15 @@ msgstr "Titel hinzufügen"
 msgid "controls.tree.select-value"
 msgstr "Auswählen"
 
-#: app/pages/_cube-checker.tsx:257
+#: app/pages/_cube-checker.tsx:258
 msgid "cube-checker.cube-checker"
 msgstr "Cube Prüfer"
 
-#: app/pages/_cube-checker.tsx:260
+#: app/pages/_cube-checker.tsx:261
 msgid "cube-checker.description"
 msgstr "Cube Checker hilft Ihnen zu verstehen, ob ein Cube alle hat notwendige Attribute und Eigenschaften, um angezeigt zu werden visualize.admin.ch."
 
-#: app/pages/_cube-checker.tsx:274
+#: app/pages/_cube-checker.tsx:275
 msgid "cube-checker.field-placeholder"
 msgstr "Cube IRI"
 
@@ -817,7 +821,7 @@ msgstr "Name, Organisation, Stichwort..."
 msgid "dataset.sortby"
 msgstr "Sortieren nach"
 
-#: app/configurator/components/dataset-browse.tsx:1155
+#: app/configurator/components/dataset-browse.tsx:1162
 msgid "dataset.tag.draft"
 msgstr "Entwurf"
 
@@ -849,19 +853,19 @@ msgstr "Status"
 msgid "footer.tutorials"
 msgstr "Tutorials"
 
-#: app/components/hint.tsx:196
+#: app/components/hint.tsx:205
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:203
 msgid "hint.chartunexpected.title"
 msgstr ""
 
-#: app/components/hint.tsx:182
+#: app/components/hint.tsx:191
 msgid "hint.coordinatesloadingerror.message"
 msgstr "Es gab ein Problem beim Laden der Koordinaten aus den geografischen Dimensionen. Bitte später erneut versuchen."
 
-#: app/components/hint.tsx:178
+#: app/components/hint.tsx:187
 msgid "hint.coordinatesloadingerror.title"
 msgstr "Koordinaten-Ladefehler"
 
@@ -869,15 +873,15 @@ msgstr "Koordinaten-Ladefehler"
 msgid "hint.create.your.own.chart"
 msgstr "Kopieren Sie diese Visualisierung oder erstellen Sie eine neue Visualisierung mit Swiss Open Government Data."
 
-#: app/components/hint.tsx:145
+#: app/components/hint.tsx:154
 msgid "hint.dataloadingerror.message"
 msgstr "Die Daten konnten nicht geladen werden."
 
-#: app/components/hint.tsx:154
+#: app/components/hint.tsx:163
 msgid "hint.dataloadingerror.status"
 msgstr "Weitere Informationen finden Sie auf der Statusseite"
 
-#: app/components/hint.tsx:143
+#: app/components/hint.tsx:152
 msgid "hint.dataloadingerror.title"
 msgstr "Daten-Ladefehler"
 
@@ -902,15 +906,15 @@ msgstr "Bitte versuchen Sie es mit einer anderen Filterkombination."
 msgid "hint.nodata.title"
 msgstr "Keine Daten für die aktuelle Filterauswahl"
 
-#: app/components/hint.tsx:218
+#: app/components/hint.tsx:227
 msgid "hint.only.negative.data.message"
 msgstr "Negative Datenwerte können mit diesem Diagrammtyp nicht dargestellt werden."
 
-#: app/components/hint.tsx:216
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.title"
 msgstr "Negative Werte"
 
-#: app/components/hint.tsx:226
+#: app/components/hint.tsx:235
 msgid "hint.publication.success"
 msgstr "Die Visualisierung ist jetzt veröffentlicht. Sie können sie teilen oder einbetten, indem Sie die URL kopieren oder das Menü oben verwenden."
 
@@ -947,68 +951,68 @@ msgstr "Zur Diagrammansicht wechseln"
 msgid "metadata.switch.table"
 msgstr "Zur Tabellenansicht wechseln"
 
-#: app/components/publish-actions.tsx:338
+#: app/components/publish-actions.tsx:333
 msgid "publication.embed.AEM"
 msgstr "Einbett-Code für AEM «Externe Applikation»"
 
-#: app/components/publish-actions.tsx:343
+#: app/components/publish-actions.tsx:338
 msgid "publication.embed.AEM.caption"
 msgstr "Verwenden Sie diesen Code, um das Diagramm in Adobe Experience Manager einzubetten"
 
-#: app/components/publish-actions.tsx:323
+#: app/components/publish-actions.tsx:316
 msgid "publication.embed.iframe"
 msgstr "Einbett-Code"
 
-#: app/components/publish-actions.tsx:326
+#: app/components/publish-actions.tsx:319
 msgid "publication.embed.iframe.caption"
 msgstr "Verwenden Sie diesen Code, um das Diagramm auf einer Webseite einzubetten"
 
-#: app/components/publish-actions.tsx:304
+#: app/components/publish-actions.tsx:297
 msgid "publication.embed.style.minimal"
 msgstr "Minimale"
 
-#: app/components/publish-actions.tsx:309
+#: app/components/publish-actions.tsx:302
 msgid "publication.embed.style.minimal.caption"
 msgstr "Nur Visualisierung mit Link zu mehr Informationen auf visualize.admin.ch"
 
-#: app/components/publish-actions.tsx:284
+#: app/components/publish-actions.tsx:277
 msgid "publication.embed.style.standard"
 msgstr "Standard"
 
-#: app/components/publish-actions.tsx:289
+#: app/components/publish-actions.tsx:282
 msgid "publication.embed.style.standard.caption"
 msgstr "Stellt Metadata und Downloadlink für das Datenset zur Verfügung"
 
-#: app/components/publish-actions.tsx:122
+#: app/components/publish-actions.tsx:115
 msgid "publication.popup.share"
 msgstr "Teilen"
 
-#: app/components/publish-actions.tsx:170
+#: app/components/publish-actions.tsx:163
 msgid "publication.share.chart.url"
 msgstr "Diagramm-URL:"
 
-#: app/components/publish-actions.tsx:128
+#: app/components/publish-actions.tsx:121
 msgid "publication.share.linktitle.facebook"
 msgstr "Teilen via Facebook"
 
-#: app/components/publish-actions.tsx:148
+#: app/components/publish-actions.tsx:141
 msgid "publication.share.linktitle.mail"
 msgstr "Versenden via E-Mail"
 
-#: app/components/publish-actions.tsx:138
+#: app/components/publish-actions.tsx:131
 msgid "publication.share.linktitle.twitter"
 msgstr "Teilen via Twitter"
 
-#: app/components/publish-actions.tsx:159
+#: app/components/publish-actions.tsx:152
 msgid "publication.share.mail.body"
 msgstr "Hier ist eine Visualisierung, die ich mit visualize.admin.ch erstellt habe"
 
-#: app/components/publish-actions.tsx:154
+#: app/components/publish-actions.tsx:147
 msgid "publication.share.mail.subject"
 msgstr "visualize.admin.ch"
 
 #: app/configurator/components/dataset-browse.tsx:378
-#: app/configurator/components/filters.tsx:824
+#: app/configurator/components/filters.tsx:826
 msgid "select.controls.filters.search"
 msgstr "Suche"
 
diff --git a/app/locales/en/messages.po b/app/locales/en/messages.po
index c027cb1f5..678213829 100644
--- a/app/locales/en/messages.po
+++ b/app/locales/en/messages.po
@@ -13,24 +13,24 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
-#: app/configurator/components/chart-configurator.tsx:701
+#: app/configurator/components/chart-configurator.tsx:713
 msgid "Add filter"
 msgstr "Add filter"
 
-#: app/configurator/components/chart-configurator.tsx:674
+#: app/configurator/components/chart-configurator.tsx:686
 msgid "Drag filters to reorganize"
 msgstr "Drag filters to reorganize"
 
-#: app/configurator/components/chart-configurator.tsx:671
+#: app/configurator/components/chart-configurator.tsx:683
 msgid "Move filter down"
 msgstr "Move filter down"
 
-#: app/configurator/components/chart-configurator.tsx:668
+#: app/configurator/components/chart-configurator.tsx:680
 msgid "Move filter up"
 msgstr "Move filter up"
 
 #: app/components/select-tree.tsx:525
-#: app/configurator/components/dataset-browse.tsx:1046
+#: app/configurator/components/dataset-browse.tsx:1053
 msgid "No results"
 msgstr "No results"
 
@@ -42,11 +42,11 @@ msgstr "[ No Description ]"
 msgid "annotation.add.title"
 msgstr "[ No Title ]"
 
-#: app/configurator/components/dataset-browse.tsx:977
+#: app/configurator/components/dataset-browse.tsx:984
 msgid "browse-panel.organizations"
 msgstr "Organizations"
 
-#: app/configurator/components/dataset-browse.tsx:959
+#: app/configurator/components/dataset-browse.tsx:966
 msgid "browse-panel.themes"
 msgstr "Categories"
 
@@ -90,16 +90,16 @@ msgstr "Chart dataset"
 msgid "button.download.runsparqlquery.visible"
 msgstr "Run SPARQL query"
 
-#: app/components/publish-actions.tsx:258
+#: app/components/publish-actions.tsx:251
 msgid "button.embed"
 msgstr "Embed"
 
-#: app/components/publish-actions.tsx:409
-#: app/components/publish-actions.tsx:415
+#: app/components/copy-to-clipboard-text-input.tsx:108
+#: app/components/copy-to-clipboard-text-input.tsx:114
 msgid "button.hint.click.to.copy"
 msgstr "Click to copy"
 
-#: app/components/publish-actions.tsx:439
+#: app/components/copy-to-clipboard-text-input.tsx:138
 msgid "button.hint.copied"
 msgstr "Copied!"
 
@@ -111,7 +111,7 @@ msgstr "Create New Visualization"
 msgid "button.publish"
 msgstr "Publish this visualization"
 
-#: app/components/publish-actions.tsx:107
+#: app/components/publish-actions.tsx:100
 msgid "button.share"
 msgstr "Share"
 
@@ -119,7 +119,7 @@ msgstr "Share"
 msgid "chart.map.layers.area"
 msgstr "Areas"
 
-#: app/configurator/components/chart-configurator.tsx:754
+#: app/configurator/components/chart-configurator.tsx:766
 #: app/configurator/components/chart-options-selector.tsx:1055
 #: app/configurator/components/field-i18n.ts:31
 msgid "chart.map.layers.base"
@@ -288,7 +288,7 @@ msgstr "Discrete"
 msgid "controls.color.select"
 msgstr "Select a color"
 
-#: app/configurator/components/chart-controls/color-picker.tsx:183
+#: app/configurator/components/chart-controls/color-picker.tsx:185
 msgid "controls.colorpicker.open"
 msgstr "Open Color Picker"
 
@@ -306,9 +306,9 @@ msgstr "Description"
 
 #: app/charts/shared/chart-data-filters.tsx:249
 #: app/charts/shared/chart-data-filters.tsx:296
-#: app/configurator/components/field.tsx:167
-#: app/configurator/components/field.tsx:267
-#: app/configurator/components/field.tsx:367
+#: app/configurator/components/field.tsx:166
+#: app/configurator/components/field.tsx:269
+#: app/configurator/components/field.tsx:369
 msgid "controls.dimensionvalue.none"
 msgstr "No Filter"
 
@@ -432,8 +432,8 @@ msgstr "Back to main"
 msgid "controls.nav.back-to-preview"
 msgstr "Back to preview"
 
-#: app/configurator/components/field.tsx:706
-#: app/configurator/components/field.tsx:878
+#: app/configurator/components/field.tsx:708
+#: app/configurator/components/field.tsx:880
 #: app/configurator/interactive-filters/interactive-filters-config-options.tsx:244
 msgid "controls.none"
 msgstr "None"
@@ -470,11 +470,15 @@ msgstr "Columns"
 msgid "controls.section.columnstyle"
 msgstr "Column Style"
 
-#: app/configurator/components/chart-configurator.tsx:605
+#: app/configurator/components/chart-configurator.tsx:606
 msgid "controls.section.data.filters"
 msgstr "Filters"
 
-#: app/configurator/components/chart-configurator.tsx:621
+#: app/configurator/components/chart-configurator.tsx:634
+msgid "controls.section.data.filters.none"
+msgstr "No filters"
+
+#: app/configurator/components/chart-configurator.tsx:622
 msgid "controls.section.data.filters.possible-filters-error"
 msgstr "An error happened while fetching possible filters, please retry later or reload the page."
 
@@ -585,24 +589,24 @@ msgstr "Select a dimension"
 msgid "controls.select.measure"
 msgstr "Select a measure"
 
-#: app/configurator/components/field.tsx:172
-#: app/configurator/components/field.tsx:272
-#: app/configurator/components/field.tsx:372
-#: app/configurator/components/field.tsx:711
-#: app/configurator/components/field.tsx:883
+#: app/configurator/components/field.tsx:171
+#: app/configurator/components/field.tsx:274
+#: app/configurator/components/field.tsx:374
+#: app/configurator/components/field.tsx:713
+#: app/configurator/components/field.tsx:885
 msgid "controls.select.optional"
 msgstr "optional"
 
 #: app/configurator/components/filters.tsx:380
-#: app/configurator/components/filters.tsx:807
+#: app/configurator/components/filters.tsx:809
 msgid "controls.set-filters"
 msgstr "Edit filters"
 
-#: app/configurator/components/filters.tsx:815
+#: app/configurator/components/filters.tsx:817
 msgid "controls.set-filters-caption"
 msgstr "For best results, do not select more than 7 values in the visualization."
 
-#: app/configurator/components/filters.tsx:855
+#: app/configurator/components/filters.tsx:857
 msgid "controls.set-values-apply"
 msgstr "Apply filters"
 
@@ -710,15 +714,15 @@ msgstr "Title"
 msgid "controls.tree.select-value"
 msgstr "Select"
 
-#: app/pages/_cube-checker.tsx:257
+#: app/pages/_cube-checker.tsx:258
 msgid "cube-checker.cube-checker"
 msgstr "Cube checker"
 
-#: app/pages/_cube-checker.tsx:260
+#: app/pages/_cube-checker.tsx:261
 msgid "cube-checker.description"
 msgstr "Cube checker helps you understand if a cube has all the necessary attributes and properties to be viewable in visualize.admin.ch."
 
-#: app/pages/_cube-checker.tsx:274
+#: app/pages/_cube-checker.tsx:275
 msgid "cube-checker.field-placeholder"
 msgstr "Cube IRI"
 
@@ -817,7 +821,7 @@ msgstr "Name, organization, keyword..."
 msgid "dataset.sortby"
 msgstr "Sort by"
 
-#: app/configurator/components/dataset-browse.tsx:1155
+#: app/configurator/components/dataset-browse.tsx:1162
 msgid "dataset.tag.draft"
 msgstr "Draft"
 
@@ -849,19 +853,19 @@ msgstr "Status"
 msgid "footer.tutorials"
 msgstr "Tutorials"
 
-#: app/components/hint.tsx:196
+#: app/components/hint.tsx:205
 msgid "hint.chartunexpected.message"
 msgstr "An unexpected error occurred while displaying this chart."
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:203
 msgid "hint.chartunexpected.title"
 msgstr "Unexpected error"
 
-#: app/components/hint.tsx:182
+#: app/components/hint.tsx:191
 msgid "hint.coordinatesloadingerror.message"
 msgstr "There was a problem with loading the coordinates from geographical dimensions. Please try again later."
 
-#: app/components/hint.tsx:178
+#: app/components/hint.tsx:187
 msgid "hint.coordinatesloadingerror.title"
 msgstr "Coordinates loading error"
 
@@ -869,15 +873,15 @@ msgstr "Coordinates loading error"
 msgid "hint.create.your.own.chart"
 msgstr "Copy this visualization or make a new visualization using Swiss Open Government Data."
 
-#: app/components/hint.tsx:145
+#: app/components/hint.tsx:154
 msgid "hint.dataloadingerror.message"
 msgstr "The data could not be loaded."
 
-#: app/components/hint.tsx:154
+#: app/components/hint.tsx:163
 msgid "hint.dataloadingerror.status"
 msgstr "Check the status page for more information"
 
-#: app/components/hint.tsx:143
+#: app/components/hint.tsx:152
 msgid "hint.dataloadingerror.title"
 msgstr "Data loading error"
 
@@ -902,15 +906,15 @@ msgstr "Please try with another combination of filters."
 msgid "hint.nodata.title"
 msgstr "No data available for current filter selection"
 
-#: app/components/hint.tsx:218
+#: app/components/hint.tsx:227
 msgid "hint.only.negative.data.message"
 msgstr "Negative data values cannot be displayed with this chart type."
 
-#: app/components/hint.tsx:216
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.title"
 msgstr "Negative Values"
 
-#: app/components/hint.tsx:226
+#: app/components/hint.tsx:235
 msgid "hint.publication.success"
 msgstr "Your visualization is now published. Share it by copying the URL or use the Embed menu above."
 
@@ -947,68 +951,68 @@ msgstr "Switch to chart view"
 msgid "metadata.switch.table"
 msgstr "Switch to table view"
 
-#: app/components/publish-actions.tsx:338
+#: app/components/publish-actions.tsx:333
 msgid "publication.embed.AEM"
 msgstr "Embed Code for AEM \"External Application\""
 
-#: app/components/publish-actions.tsx:343
+#: app/components/publish-actions.tsx:338
 msgid "publication.embed.AEM.caption"
 msgstr "Use this link to embed the chart into Adobe Experience Manager assets."
 
-#: app/components/publish-actions.tsx:323
+#: app/components/publish-actions.tsx:316
 msgid "publication.embed.iframe"
 msgstr "Embed Code"
 
-#: app/components/publish-actions.tsx:326
+#: app/components/publish-actions.tsx:319
 msgid "publication.embed.iframe.caption"
 msgstr "Use this link to embed the chart in any webpage."
 
-#: app/components/publish-actions.tsx:304
+#: app/components/publish-actions.tsx:297
 msgid "publication.embed.style.minimal"
 msgstr "Minimal"
 
-#: app/components/publish-actions.tsx:309
+#: app/components/publish-actions.tsx:302
 msgid "publication.embed.style.minimal.caption"
 msgstr "Chart only with link to full information on visualize.admin.ch."
 
-#: app/components/publish-actions.tsx:284
+#: app/components/publish-actions.tsx:277
 msgid "publication.embed.style.standard"
 msgstr "Standard"
 
-#: app/components/publish-actions.tsx:289
+#: app/components/publish-actions.tsx:282
 msgid "publication.embed.style.standard.caption"
 msgstr "Provides metadata and download links for the dataset"
 
-#: app/components/publish-actions.tsx:122
+#: app/components/publish-actions.tsx:115
 msgid "publication.popup.share"
 msgstr "Share"
 
-#: app/components/publish-actions.tsx:170
+#: app/components/publish-actions.tsx:163
 msgid "publication.share.chart.url"
 msgstr "Chart URL:"
 
-#: app/components/publish-actions.tsx:128
+#: app/components/publish-actions.tsx:121
 msgid "publication.share.linktitle.facebook"
 msgstr "Share on Facebook"
 
-#: app/components/publish-actions.tsx:148
+#: app/components/publish-actions.tsx:141
 msgid "publication.share.linktitle.mail"
 msgstr "Share via Email"
 
-#: app/components/publish-actions.tsx:138
+#: app/components/publish-actions.tsx:131
 msgid "publication.share.linktitle.twitter"
 msgstr "Share on Twitter"
 
-#: app/components/publish-actions.tsx:159
+#: app/components/publish-actions.tsx:152
 msgid "publication.share.mail.body"
 msgstr "Here is a visualization I created using visualize.admin.ch"
 
-#: app/components/publish-actions.tsx:154
+#: app/components/publish-actions.tsx:147
 msgid "publication.share.mail.subject"
 msgstr "visualize.admin.ch"
 
 #: app/configurator/components/dataset-browse.tsx:378
-#: app/configurator/components/filters.tsx:824
+#: app/configurator/components/filters.tsx:826
 msgid "select.controls.filters.search"
 msgstr "Search"
 
diff --git a/app/locales/fr/messages.po b/app/locales/fr/messages.po
index 6ed4b8505..1568de930 100644
--- a/app/locales/fr/messages.po
+++ b/app/locales/fr/messages.po
@@ -13,24 +13,24 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
-#: app/configurator/components/chart-configurator.tsx:701
+#: app/configurator/components/chart-configurator.tsx:713
 msgid "Add filter"
 msgstr "Ajouter un filtre"
 
-#: app/configurator/components/chart-configurator.tsx:674
+#: app/configurator/components/chart-configurator.tsx:686
 msgid "Drag filters to reorganize"
 msgstr "Faites glisser les filtres pour les réorganiser"
 
-#: app/configurator/components/chart-configurator.tsx:671
+#: app/configurator/components/chart-configurator.tsx:683
 msgid "Move filter down"
 msgstr "Déplacer le filtre vers le bas"
 
-#: app/configurator/components/chart-configurator.tsx:668
+#: app/configurator/components/chart-configurator.tsx:680
 msgid "Move filter up"
 msgstr "Déplacer le filtre vers le haut"
 
 #: app/components/select-tree.tsx:525
-#: app/configurator/components/dataset-browse.tsx:1046
+#: app/configurator/components/dataset-browse.tsx:1053
 msgid "No results"
 msgstr "Aucun résultat"
 
@@ -42,11 +42,11 @@ msgstr "[ Pas de description ]"
 msgid "annotation.add.title"
 msgstr "[ Pas de titre ]"
 
-#: app/configurator/components/dataset-browse.tsx:977
+#: app/configurator/components/dataset-browse.tsx:984
 msgid "browse-panel.organizations"
 msgstr "Organisations"
 
-#: app/configurator/components/dataset-browse.tsx:959
+#: app/configurator/components/dataset-browse.tsx:966
 msgid "browse-panel.themes"
 msgstr "Catégories"
 
@@ -90,16 +90,16 @@ msgstr "Données du graphique"
 msgid "button.download.runsparqlquery.visible"
 msgstr "Lancer la requête SPARQL"
 
-#: app/components/publish-actions.tsx:258
+#: app/components/publish-actions.tsx:251
 msgid "button.embed"
 msgstr "Intégrer"
 
-#: app/components/publish-actions.tsx:409
-#: app/components/publish-actions.tsx:415
+#: app/components/copy-to-clipboard-text-input.tsx:108
+#: app/components/copy-to-clipboard-text-input.tsx:114
 msgid "button.hint.click.to.copy"
 msgstr "Cliquer pour copier"
 
-#: app/components/publish-actions.tsx:439
+#: app/components/copy-to-clipboard-text-input.tsx:138
 msgid "button.hint.copied"
 msgstr "Copié!"
 
@@ -111,7 +111,7 @@ msgstr "Créer une nouvelle visualisation"
 msgid "button.publish"
 msgstr "Publier cette visualisation"
 
-#: app/components/publish-actions.tsx:107
+#: app/components/publish-actions.tsx:100
 msgid "button.share"
 msgstr "Partager"
 
@@ -119,7 +119,7 @@ msgstr "Partager"
 msgid "chart.map.layers.area"
 msgstr "Zones"
 
-#: app/configurator/components/chart-configurator.tsx:754
+#: app/configurator/components/chart-configurator.tsx:766
 #: app/configurator/components/chart-options-selector.tsx:1055
 #: app/configurator/components/field-i18n.ts:31
 msgid "chart.map.layers.base"
@@ -288,7 +288,7 @@ msgstr "Discrète"
 msgid "controls.color.select"
 msgstr "Sélectionner une couleur"
 
-#: app/configurator/components/chart-controls/color-picker.tsx:183
+#: app/configurator/components/chart-controls/color-picker.tsx:185
 msgid "controls.colorpicker.open"
 msgstr "Ouvrir la pipette à couleur"
 
@@ -306,9 +306,9 @@ msgstr "Description"
 
 #: app/charts/shared/chart-data-filters.tsx:249
 #: app/charts/shared/chart-data-filters.tsx:296
-#: app/configurator/components/field.tsx:167
-#: app/configurator/components/field.tsx:267
-#: app/configurator/components/field.tsx:367
+#: app/configurator/components/field.tsx:166
+#: app/configurator/components/field.tsx:269
+#: app/configurator/components/field.tsx:369
 msgid "controls.dimensionvalue.none"
 msgstr "Aucune filtre"
 
@@ -432,8 +432,8 @@ msgstr "Retour aux paramètres généraux"
 msgid "controls.nav.back-to-preview"
 msgstr "Retour à l'aperçu"
 
-#: app/configurator/components/field.tsx:706
-#: app/configurator/components/field.tsx:878
+#: app/configurator/components/field.tsx:708
+#: app/configurator/components/field.tsx:880
 #: app/configurator/interactive-filters/interactive-filters-config-options.tsx:244
 msgid "controls.none"
 msgstr "Aucun"
@@ -470,11 +470,15 @@ msgstr "Colonnes"
 msgid "controls.section.columnstyle"
 msgstr "Style de la colonne"
 
-#: app/configurator/components/chart-configurator.tsx:605
+#: app/configurator/components/chart-configurator.tsx:606
 msgid "controls.section.data.filters"
 msgstr "Filtres"
 
-#: app/configurator/components/chart-configurator.tsx:621
+#: app/configurator/components/chart-configurator.tsx:634
+msgid "controls.section.data.filters.none"
+msgstr "Aucun filtre"
+
+#: app/configurator/components/chart-configurator.tsx:622
 msgid "controls.section.data.filters.possible-filters-error"
 msgstr "Une erreur s'est produite lors de la récupération des filtres possibles. Merci de réessayer plus tard ou d'actualiser la page."
 
@@ -585,24 +589,24 @@ msgstr "Sélectionner une dimension"
 msgid "controls.select.measure"
 msgstr "Sélectionner une variable"
 
-#: app/configurator/components/field.tsx:172
-#: app/configurator/components/field.tsx:272
-#: app/configurator/components/field.tsx:372
-#: app/configurator/components/field.tsx:711
-#: app/configurator/components/field.tsx:883
+#: app/configurator/components/field.tsx:171
+#: app/configurator/components/field.tsx:274
+#: app/configurator/components/field.tsx:374
+#: app/configurator/components/field.tsx:713
+#: app/configurator/components/field.tsx:885
 msgid "controls.select.optional"
 msgstr ""
 
 #: app/configurator/components/filters.tsx:380
-#: app/configurator/components/filters.tsx:807
+#: app/configurator/components/filters.tsx:809
 msgid "controls.set-filters"
 msgstr "Modifier les filtres"
 
-#: app/configurator/components/filters.tsx:815
+#: app/configurator/components/filters.tsx:817
 msgid "controls.set-filters-caption"
 msgstr "Pour de meilleurs résultats, ne sélectionnez pas plus de 7 valeurs dans la visualisation."
 
-#: app/configurator/components/filters.tsx:855
+#: app/configurator/components/filters.tsx:857
 msgid "controls.set-values-apply"
 msgstr "Appliquer les filtres"
 
@@ -710,15 +714,15 @@ msgstr "Titre"
 msgid "controls.tree.select-value"
 msgstr "Sélectionner"
 
-#: app/pages/_cube-checker.tsx:257
+#: app/pages/_cube-checker.tsx:258
 msgid "cube-checker.cube-checker"
 msgstr "Vérificateur de cube"
 
-#: app/pages/_cube-checker.tsx:260
+#: app/pages/_cube-checker.tsx:261
 msgid "cube-checker.description"
 msgstr "Cet outil vous permet de vérifier qu'un cube a tous les attributs nécessaires pour être affiché dans visualize.admin.ch"
 
-#: app/pages/_cube-checker.tsx:274
+#: app/pages/_cube-checker.tsx:275
 msgid "cube-checker.field-placeholder"
 msgstr "IRI du cube"
 
@@ -817,7 +821,7 @@ msgstr "Nom, organisation, mots clés..."
 msgid "dataset.sortby"
 msgstr "Trier par"
 
-#: app/configurator/components/dataset-browse.tsx:1155
+#: app/configurator/components/dataset-browse.tsx:1162
 msgid "dataset.tag.draft"
 msgstr "Brouillon"
 
@@ -849,19 +853,19 @@ msgstr "Statut"
 msgid "footer.tutorials"
 msgstr "Tutoriels"
 
-#: app/components/hint.tsx:196
+#: app/components/hint.tsx:205
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:203
 msgid "hint.chartunexpected.title"
 msgstr ""
 
-#: app/components/hint.tsx:182
+#: app/components/hint.tsx:191
 msgid "hint.coordinatesloadingerror.message"
 msgstr "Les données géographiques n’ont pas pu être chargées, merci de réessayer plus tard."
 
-#: app/components/hint.tsx:178
+#: app/components/hint.tsx:187
 msgid "hint.coordinatesloadingerror.title"
 msgstr "Erreur de chargement des coordonnées"
 
@@ -869,15 +873,15 @@ msgstr "Erreur de chargement des coordonnées"
 msgid "hint.create.your.own.chart"
 msgstr "Copiez cette visualisation ou créez une nouvelle visualisation à partir des données ouvertes de l’administration publique suisse."
 
-#: app/components/hint.tsx:145
+#: app/components/hint.tsx:154
 msgid "hint.dataloadingerror.message"
 msgstr "Les données n'ont pas pu être téléchargées."
 
-#: app/components/hint.tsx:154
+#: app/components/hint.tsx:163
 msgid "hint.dataloadingerror.status"
 msgstr "Consultez la page de statut pour plus d'informations"
 
-#: app/components/hint.tsx:143
+#: app/components/hint.tsx:152
 msgid "hint.dataloadingerror.title"
 msgstr "Problème de téléchargement des données"
 
@@ -902,15 +906,15 @@ msgstr "Veuillez essayer avec une autre combinaison de filtres."
 msgid "hint.nodata.title"
 msgstr "Il n'y a pas de données correspondant aux filtres sélectionnés"
 
-#: app/components/hint.tsx:218
+#: app/components/hint.tsx:227
 msgid "hint.only.negative.data.message"
 msgstr "Ce type de graphique ne permet pas de représenter des données négatives."
 
-#: app/components/hint.tsx:216
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.title"
 msgstr "Valeurs négatives"
 
-#: app/components/hint.tsx:226
+#: app/components/hint.tsx:235
 msgid "hint.publication.success"
 msgstr "Votre visualisation est à présent publiée. Partagez-là en copiant l'URL ou en utilisant les options d'intégration."
 
@@ -947,68 +951,68 @@ msgstr "Passer à la vue graphique"
 msgid "metadata.switch.table"
 msgstr "Passer à la vue en tableau"
 
-#: app/components/publish-actions.tsx:338
+#: app/components/publish-actions.tsx:333
 msgid "publication.embed.AEM"
 msgstr "Code pour intégrer sur AEM comme \"External Application\""
 
-#: app/components/publish-actions.tsx:343
+#: app/components/publish-actions.tsx:338
 msgid "publication.embed.AEM.caption"
 msgstr "Utilisez ce code pour intégrer le graphique sur Adobe Experience Manager"
 
-#: app/components/publish-actions.tsx:323
+#: app/components/publish-actions.tsx:316
 msgid "publication.embed.iframe"
 msgstr "Code pour intégrer"
 
-#: app/components/publish-actions.tsx:326
+#: app/components/publish-actions.tsx:319
 msgid "publication.embed.iframe.caption"
 msgstr "Utilisez ce code pour intégrer le graphique sur une page web"
 
-#: app/components/publish-actions.tsx:304
+#: app/components/publish-actions.tsx:297
 msgid "publication.embed.style.minimal"
 msgstr "Minimal"
 
-#: app/components/publish-actions.tsx:309
+#: app/components/publish-actions.tsx:302
 msgid "publication.embed.style.minimal.caption"
 msgstr "Seulement le graphique et un lien vers visualize.admin.ch pour plus d'informations"
 
-#: app/components/publish-actions.tsx:284
+#: app/components/publish-actions.tsx:277
 msgid "publication.embed.style.standard"
 msgstr "Standard"
 
-#: app/components/publish-actions.tsx:289
+#: app/components/publish-actions.tsx:282
 msgid "publication.embed.style.standard.caption"
 msgstr "Inclut les métadonnées et un lien de téléchargement des données"
 
-#: app/components/publish-actions.tsx:122
+#: app/components/publish-actions.tsx:115
 msgid "publication.popup.share"
 msgstr "Partager"
 
-#: app/components/publish-actions.tsx:170
+#: app/components/publish-actions.tsx:163
 msgid "publication.share.chart.url"
 msgstr "URL du graphique:"
 
-#: app/components/publish-actions.tsx:128
+#: app/components/publish-actions.tsx:121
 msgid "publication.share.linktitle.facebook"
 msgstr "Partager sur Facebook"
 
-#: app/components/publish-actions.tsx:148
+#: app/components/publish-actions.tsx:141
 msgid "publication.share.linktitle.mail"
 msgstr "Partager par courriel"
 
-#: app/components/publish-actions.tsx:138
+#: app/components/publish-actions.tsx:131
 msgid "publication.share.linktitle.twitter"
 msgstr "Partager sur Twitter"
 
-#: app/components/publish-actions.tsx:159
+#: app/components/publish-actions.tsx:152
 msgid "publication.share.mail.body"
 msgstr "Voici une visualisation que j'ai créée sur visualize.admin.ch"
 
-#: app/components/publish-actions.tsx:154
+#: app/components/publish-actions.tsx:147
 msgid "publication.share.mail.subject"
 msgstr "visualize.admin.ch"
 
 #: app/configurator/components/dataset-browse.tsx:378
-#: app/configurator/components/filters.tsx:824
+#: app/configurator/components/filters.tsx:826
 msgid "select.controls.filters.search"
 msgstr "Chercher"
 
diff --git a/app/locales/it/messages.po b/app/locales/it/messages.po
index 9f3ee705c..bdc7e23fd 100644
--- a/app/locales/it/messages.po
+++ b/app/locales/it/messages.po
@@ -13,24 +13,24 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
-#: app/configurator/components/chart-configurator.tsx:701
+#: app/configurator/components/chart-configurator.tsx:713
 msgid "Add filter"
 msgstr "Aggiungi filtro"
 
-#: app/configurator/components/chart-configurator.tsx:674
+#: app/configurator/components/chart-configurator.tsx:686
 msgid "Drag filters to reorganize"
 msgstr "Trascina i filtri per riorganizzarli"
 
-#: app/configurator/components/chart-configurator.tsx:671
+#: app/configurator/components/chart-configurator.tsx:683
 msgid "Move filter down"
 msgstr "Sposta il filtro in basso"
 
-#: app/configurator/components/chart-configurator.tsx:668
+#: app/configurator/components/chart-configurator.tsx:680
 msgid "Move filter up"
 msgstr "Sposta il filtro in alto"
 
 #: app/components/select-tree.tsx:525
-#: app/configurator/components/dataset-browse.tsx:1046
+#: app/configurator/components/dataset-browse.tsx:1053
 msgid "No results"
 msgstr "Nessun risultato"
 
@@ -42,11 +42,11 @@ msgstr "[ Nessuna descrizione ]"
 msgid "annotation.add.title"
 msgstr "[ Nessun titolo ]"
 
-#: app/configurator/components/dataset-browse.tsx:977
+#: app/configurator/components/dataset-browse.tsx:984
 msgid "browse-panel.organizations"
 msgstr "Organizzazioni"
 
-#: app/configurator/components/dataset-browse.tsx:959
+#: app/configurator/components/dataset-browse.tsx:966
 msgid "browse-panel.themes"
 msgstr "Categorie"
 
@@ -90,16 +90,16 @@ msgstr "Dati del grafico"
 msgid "button.download.runsparqlquery.visible"
 msgstr "Esegui query SPARQL"
 
-#: app/components/publish-actions.tsx:258
+#: app/components/publish-actions.tsx:251
 msgid "button.embed"
 msgstr "Incorpora"
 
-#: app/components/publish-actions.tsx:409
-#: app/components/publish-actions.tsx:415
+#: app/components/copy-to-clipboard-text-input.tsx:108
+#: app/components/copy-to-clipboard-text-input.tsx:114
 msgid "button.hint.click.to.copy"
 msgstr "Clicca per copiare"
 
-#: app/components/publish-actions.tsx:439
+#: app/components/copy-to-clipboard-text-input.tsx:138
 msgid "button.hint.copied"
 msgstr "Copiato!"
 
@@ -111,7 +111,7 @@ msgstr "Crea una nuova visualizzazione"
 msgid "button.publish"
 msgstr "Pubblica questa visualizzazione"
 
-#: app/components/publish-actions.tsx:107
+#: app/components/publish-actions.tsx:100
 msgid "button.share"
 msgstr "Condividi"
 
@@ -119,7 +119,7 @@ msgstr "Condividi"
 msgid "chart.map.layers.area"
 msgstr "Aree"
 
-#: app/configurator/components/chart-configurator.tsx:754
+#: app/configurator/components/chart-configurator.tsx:766
 #: app/configurator/components/chart-options-selector.tsx:1055
 #: app/configurator/components/field-i18n.ts:31
 msgid "chart.map.layers.base"
@@ -288,7 +288,7 @@ msgstr "Discreto"
 msgid "controls.color.select"
 msgstr "Seleziona un colore"
 
-#: app/configurator/components/chart-controls/color-picker.tsx:183
+#: app/configurator/components/chart-controls/color-picker.tsx:185
 msgid "controls.colorpicker.open"
 msgstr "Apri il selettore di colore"
 
@@ -306,9 +306,9 @@ msgstr "Descrizione"
 
 #: app/charts/shared/chart-data-filters.tsx:249
 #: app/charts/shared/chart-data-filters.tsx:296
-#: app/configurator/components/field.tsx:167
-#: app/configurator/components/field.tsx:267
-#: app/configurator/components/field.tsx:367
+#: app/configurator/components/field.tsx:166
+#: app/configurator/components/field.tsx:269
+#: app/configurator/components/field.tsx:369
 msgid "controls.dimensionvalue.none"
 msgstr "Nessun filtro"
 
@@ -432,8 +432,8 @@ msgstr "Torna alle impostazioni generali"
 msgid "controls.nav.back-to-preview"
 msgstr "Torna all'anteprima"
 
-#: app/configurator/components/field.tsx:706
-#: app/configurator/components/field.tsx:878
+#: app/configurator/components/field.tsx:708
+#: app/configurator/components/field.tsx:880
 #: app/configurator/interactive-filters/interactive-filters-config-options.tsx:244
 msgid "controls.none"
 msgstr "Nessuno"
@@ -470,11 +470,15 @@ msgstr "Colonne"
 msgid "controls.section.columnstyle"
 msgstr "Stile della colonna"
 
-#: app/configurator/components/chart-configurator.tsx:605
+#: app/configurator/components/chart-configurator.tsx:606
 msgid "controls.section.data.filters"
 msgstr "Filtri"
 
-#: app/configurator/components/chart-configurator.tsx:621
+#: app/configurator/components/chart-configurator.tsx:634
+msgid "controls.section.data.filters.none"
+msgstr "Nessun filtro"
+
+#: app/configurator/components/chart-configurator.tsx:622
 msgid "controls.section.data.filters.possible-filters-error"
 msgstr "Si è verificato un errore durante il recupero dei possibili filtri. Riprova più tardi o aggiorna la pagina."
 
@@ -585,24 +589,24 @@ msgstr "Seleziona una dimensione"
 msgid "controls.select.measure"
 msgstr "Seleziona una misura"
 
-#: app/configurator/components/field.tsx:172
-#: app/configurator/components/field.tsx:272
-#: app/configurator/components/field.tsx:372
-#: app/configurator/components/field.tsx:711
-#: app/configurator/components/field.tsx:883
+#: app/configurator/components/field.tsx:171
+#: app/configurator/components/field.tsx:274
+#: app/configurator/components/field.tsx:374
+#: app/configurator/components/field.tsx:713
+#: app/configurator/components/field.tsx:885
 msgid "controls.select.optional"
 msgstr ""
 
 #: app/configurator/components/filters.tsx:380
-#: app/configurator/components/filters.tsx:807
+#: app/configurator/components/filters.tsx:809
 msgid "controls.set-filters"
 msgstr "Modificare i filtri"
 
-#: app/configurator/components/filters.tsx:815
+#: app/configurator/components/filters.tsx:817
 msgid "controls.set-filters-caption"
 msgstr "Pour de meilleurs résultats, ne sélectionnez pas plus de 7 valeurs dans la visualisation"
 
-#: app/configurator/components/filters.tsx:855
+#: app/configurator/components/filters.tsx:857
 msgid "controls.set-values-apply"
 msgstr "Appliquer les filtres"
 
@@ -710,15 +714,15 @@ msgstr "Titolo"
 msgid "controls.tree.select-value"
 msgstr "Selezionare"
 
-#: app/pages/_cube-checker.tsx:257
+#: app/pages/_cube-checker.tsx:258
 msgid "cube-checker.cube-checker"
 msgstr "Cube checker"
 
-#: app/pages/_cube-checker.tsx:260
+#: app/pages/_cube-checker.tsx:261
 msgid "cube-checker.description"
 msgstr "Cube checker ti aiuta a capire se un cubo ha tutti i attributi e proprietà necessari per essere visualizzati su visualizza.admin.ch."
 
-#: app/pages/_cube-checker.tsx:274
+#: app/pages/_cube-checker.tsx:275
 msgid "cube-checker.field-placeholder"
 msgstr "Cubo IRI"
 
@@ -817,7 +821,7 @@ msgstr "Nome, organizzazione, parola chiave..."
 msgid "dataset.sortby"
 msgstr "Ordina per"
 
-#: app/configurator/components/dataset-browse.tsx:1155
+#: app/configurator/components/dataset-browse.tsx:1162
 msgid "dataset.tag.draft"
 msgstr "Bozza"
 
@@ -849,19 +853,19 @@ msgstr "Stato"
 msgid "footer.tutorials"
 msgstr "Tutorials"
 
-#: app/components/hint.tsx:196
+#: app/components/hint.tsx:205
 msgid "hint.chartunexpected.message"
 msgstr ""
 
-#: app/components/hint.tsx:194
+#: app/components/hint.tsx:203
 msgid "hint.chartunexpected.title"
 msgstr ""
 
-#: app/components/hint.tsx:182
+#: app/components/hint.tsx:191
 msgid "hint.coordinatesloadingerror.message"
 msgstr "C'è stato un problema con il caricamento delle coordinate dalle dimensioni geografiche. Per favore riprova più tardi."
 
-#: app/components/hint.tsx:178
+#: app/components/hint.tsx:187
 msgid "hint.coordinatesloadingerror.title"
 msgstr "Errore di caricamento delle coordinate"
 
@@ -869,15 +873,15 @@ msgstr "Errore di caricamento delle coordinate"
 msgid "hint.create.your.own.chart"
 msgstr "Copia questa visualizzazione o crea una nuova visualizzazione usando «dati aperti» dell’amministrazione pubblica svizzera"
 
-#: app/components/hint.tsx:145
+#: app/components/hint.tsx:154
 msgid "hint.dataloadingerror.message"
 msgstr "I dati non possono essere caricati."
 
-#: app/components/hint.tsx:154
+#: app/components/hint.tsx:163
 msgid "hint.dataloadingerror.status"
 msgstr "Controlla la pagina di stato per ulteriori informazioni”"
 
-#: app/components/hint.tsx:143
+#: app/components/hint.tsx:152
 msgid "hint.dataloadingerror.title"
 msgstr "Problema di caricamento dei dati"
 
@@ -902,15 +906,15 @@ msgstr "Prova con un'altra combinazione di filtri."
 msgid "hint.nodata.title"
 msgstr "Non ci sono dati corrispondenti ai filtri selezionati"
 
-#: app/components/hint.tsx:218
+#: app/components/hint.tsx:227
 msgid "hint.only.negative.data.message"
 msgstr "Dati con valori negativi non possono essere visualizzati con questo tipo di grafico."
 
-#: app/components/hint.tsx:216
+#: app/components/hint.tsx:225
 msgid "hint.only.negative.data.title"
 msgstr "Valori negativi"
 
-#: app/components/hint.tsx:226
+#: app/components/hint.tsx:235
 msgid "hint.publication.success"
 msgstr "La tua visualizzazione è ora pubblicata. Condividila copiando l'URL o utilizzando le opzioni di incorporamento."
 
@@ -947,68 +951,68 @@ msgstr "Passare alla visualizzazione del grafico"
 msgid "metadata.switch.table"
 msgstr "Passare alla vista tabella"
 
-#: app/components/publish-actions.tsx:338
+#: app/components/publish-actions.tsx:333
 msgid "publication.embed.AEM"
 msgstr "Codice da incorporare su AEM come \"External Application\""
 
-#: app/components/publish-actions.tsx:343
+#: app/components/publish-actions.tsx:338
 msgid "publication.embed.AEM.caption"
 msgstr "Utilisez ce code pour intégrer le graphique sur une application Adobe Experience Manager"
 
-#: app/components/publish-actions.tsx:323
+#: app/components/publish-actions.tsx:316
 msgid "publication.embed.iframe"
 msgstr "Codice di incorporamento"
 
-#: app/components/publish-actions.tsx:326
+#: app/components/publish-actions.tsx:319
 msgid "publication.embed.iframe.caption"
 msgstr "Usa questo codice per incorporare il grafico in una pagina web"
 
-#: app/components/publish-actions.tsx:304
+#: app/components/publish-actions.tsx:297
 msgid "publication.embed.style.minimal"
 msgstr "Minimal"
 
-#: app/components/publish-actions.tsx:309
+#: app/components/publish-actions.tsx:302
 msgid "publication.embed.style.minimal.caption"
 msgstr "Solo la grafica e un link a visualize.admin.ch per maggiori informazioni"
 
-#: app/components/publish-actions.tsx:284
+#: app/components/publish-actions.tsx:277
 msgid "publication.embed.style.standard"
 msgstr "Standard"
 
-#: app/components/publish-actions.tsx:289
+#: app/components/publish-actions.tsx:282
 msgid "publication.embed.style.standard.caption"
 msgstr "Include metadati e un link per il download dei dati"
 
-#: app/components/publish-actions.tsx:122
+#: app/components/publish-actions.tsx:115
 msgid "publication.popup.share"
 msgstr "Condividi"
 
-#: app/components/publish-actions.tsx:170
+#: app/components/publish-actions.tsx:163
 msgid "publication.share.chart.url"
 msgstr "URL del grafico:"
 
-#: app/components/publish-actions.tsx:128
+#: app/components/publish-actions.tsx:121
 msgid "publication.share.linktitle.facebook"
 msgstr "Condividi su Facebook"
 
-#: app/components/publish-actions.tsx:148
+#: app/components/publish-actions.tsx:141
 msgid "publication.share.linktitle.mail"
 msgstr "Condividi via Email"
 
-#: app/components/publish-actions.tsx:138
+#: app/components/publish-actions.tsx:131
 msgid "publication.share.linktitle.twitter"
 msgstr "Condividi su Twitter"
 
-#: app/components/publish-actions.tsx:159
+#: app/components/publish-actions.tsx:152
 msgid "publication.share.mail.body"
 msgstr "Ecco una visualizzazione che ho creato usando visualize.admin.ch"
 
-#: app/components/publish-actions.tsx:154
+#: app/components/publish-actions.tsx:147
 msgid "publication.share.mail.subject"
 msgstr "visualize.admin.ch"
 
 #: app/configurator/components/dataset-browse.tsx:378
-#: app/configurator/components/filters.tsx:824
+#: app/configurator/components/filters.tsx:826
 msgid "select.controls.filters.search"
 msgstr "Cerca"
 

From df63717b7821348342d2f49d965c62269bea74a1 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 15:38:08 +0100
Subject: [PATCH 4/9] fix: Dimension values are correctly sorted in filters

FIx #973
---
 app/configurator/components/field.tsx |  6 ++++--
 app/domain/data.ts                    | 10 +++++-----
 app/rdf/queries.ts                    | 15 +++++++--------
 app/utils/sorting-values.ts           |  6 +++++-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/configurator/components/field.tsx b/app/configurator/components/field.tsx
index 54b409361..ac3a8cc4e 100644
--- a/app/configurator/components/field.tsx
+++ b/app/configurator/components/field.tsx
@@ -56,7 +56,6 @@ import {
   useConfiguratorState,
 } from "@/configurator/configurator-state";
 import { FIELD_VALUE_NONE } from "@/configurator/constants";
-import { DimensionValue } from "@/domain/data";
 import { truthy } from "@/domain/types";
 import { useTimeFormatLocale } from "@/formatters";
 import { DimensionMetadataFragment, TimeUnit } from "@/graphql/query-hooks";
@@ -176,7 +175,10 @@ export const DataFilterSelect = ({
 
   const sortedValues = useMemo(() => {
     const sorters = makeDimensionValueSorters(dimension);
-    const sortedValues = orderBy(dimension.values, sorters) as DimensionValue[];
+    const sortedValues = orderBy(
+      dimension.values,
+      sorters.map((s) => (dv) => s(dv.label))
+    );
 
     return sortedValues;
   }, [dimension]);
diff --git a/app/domain/data.ts b/app/domain/data.ts
index cee05dedc..8458367f0 100644
--- a/app/domain/data.ts
+++ b/app/domain/data.ts
@@ -26,7 +26,7 @@ export type DimensionValue = {
   description?: string;
   position?: number;
   color?: string;
-  identifier?: string;
+  identifier?: string | number;
   alternateName?: string;
 };
 
@@ -71,13 +71,13 @@ export type GeoData = {
 };
 
 const xmlSchema = "http://www.w3.org/2001/XMLSchema#";
-export const parseRDFLiteral = (value: Literal): ObservationValue => {
+export const parseRDFLiteral = <T = ObservationValue>(value: Literal): T => {
   const v = value.value;
   const dt = value.datatype.value.replace(xmlSchema, "");
   switch (dt) {
     case "string":
     case "boolean":
-      return v;
+      return v as T;
     // return v === "true" ? true : false;
     case "float":
     case "integer":
@@ -95,7 +95,7 @@ export const parseRDFLiteral = (value: Literal): ObservationValue => {
     case "byte":
     case "unsignedShort":
     case "unsignedByte":
-      return +v;
+      return +v as T;
     // TODO: Figure out how to preserve granularity of date (maybe include interval?)
     // case "date":
     // case "time":
@@ -104,7 +104,7 @@ export const parseRDFLiteral = (value: Literal): ObservationValue => {
     // case "gYearMonth":
     //   return new Date(v);
     default:
-      return v;
+      return v as T;
   }
 };
 
diff --git a/app/rdf/queries.ts b/app/rdf/queries.ts
index d345f93e4..d8d039c11 100644
--- a/app/rdf/queries.ts
+++ b/app/rdf/queries.ts
@@ -376,11 +376,13 @@ export const getCubeDimensionValuesWithMetadata = async ({
         iri.value,
         {
           alternateName: alternateName
-            ? parseRDFLiteral(alternateName)
+            ? parseRDFLiteral<string>(alternateName)
             : undefined,
-          identifier: identifier ? parseRDFLiteral(identifier) : undefined,
-          position: position ? parseRDFLiteral(position) : undefined,
-          color: color ? parseRDFLiteral(color) : undefined,
+          identifier: identifier
+            ? parseRDFLiteral<number>(identifier)
+            : undefined,
+          position: position ? parseRDFLiteral<number>(position) : undefined,
+          color: color ? parseRDFLiteral<string>(color) : undefined,
         },
       ])
     );
@@ -404,10 +406,7 @@ export const getCubeDimensionValuesWithMetadata = async ({
         value: unversionedLookup.get(iri.value) ?? iri.value,
         label: labelsLookup.get(iri.value) ?? "",
         description: descriptionsLookup.get(iri.value),
-        position:
-          lookupValue?.position !== undefined
-            ? parseInt(lookupValue.position, 10)
-            : undefined,
+        position: lookupValue?.position,
         identifier: lookupValue?.identifier,
         color: lookupValue?.color,
         alternateName: lookupValue?.alternateName,
diff --git a/app/utils/sorting-values.ts b/app/utils/sorting-values.ts
index 25aa0f07a..e961e805f 100644
--- a/app/utils/sorting-values.ts
+++ b/app/utils/sorting-values.ts
@@ -3,11 +3,15 @@ import { DimensionValue } from "@/domain/data";
 
 import { DataCubeObservationsQuery } from "../graphql/query-hooks";
 
-const maybeInt = (value?: string): number | string => {
+const maybeInt = (value?: string | number): number | string => {
   if (!value) {
     return Infinity;
   }
 
+  if (typeof value === "number") {
+    return value;
+  }
+
   const maybeInt = parseInt(value, 10);
 
   if (isNaN(maybeInt)) {

From 42b6644ef32a2a1f9a80bd9056e30fe09e16fd48 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 15:53:30 +0100
Subject: [PATCH 5/9] fix: Size of trash icon for optional filter

---
 app/configurator/components/chart-configurator.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/configurator/components/chart-configurator.tsx b/app/configurator/components/chart-configurator.tsx
index 010ac844a..b66d756f4 100644
--- a/app/configurator/components/chart-configurator.tsx
+++ b/app/configurator/components/chart-configurator.tsx
@@ -119,7 +119,7 @@ const DataFilterSelectGeneric = ({
         onClick={onRemove}
         size="small"
       >
-        <Icon name="trash" width="16" height="16" />
+        <Icon name="trash" size="16" />
       </IconButton>
     </Box>
   );

From fb5ac9096e6b14483602f2faae6b4225760dffb0 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 16:15:45 +0100
Subject: [PATCH 6/9] fix: Optional field was badly labeled with [Object
 object]

ReactNode was stringified to [object object]
---
 app/configurator/components/field.tsx | 77 ++++++++++++++++-----------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/app/configurator/components/field.tsx b/app/configurator/components/field.tsx
index ac3a8cc4e..d78ab6499 100644
--- a/app/configurator/components/field.tsx
+++ b/app/configurator/components/field.tsx
@@ -80,6 +80,14 @@ const FieldEditIcon = () => {
 };
 
 const useStyles = makeStyles<Theme>((theme) => ({
+  root: {
+    display: "flex",
+    alignItems: "center",
+    gap: "0.25rem",
+  },
+  optional: {
+    paddingBottom: "4px",
+  },
   loadingIndicator: {
     color: theme.palette.grey[700],
     display: "inline-block",
@@ -168,11 +176,6 @@ export const DataFilterSelect = ({
     message: `No Filter`,
   });
 
-  const optionalLabel = t({
-    id: "controls.select.optional",
-    message: `optional`,
-  });
-
   const sortedValues = useMemo(() => {
     const sorters = makeDimensionValueSorters(dimension);
     const sortedValues = orderBy(
@@ -219,7 +222,7 @@ export const DataFilterSelect = ({
   if (hierarchy && hierarchyOptions) {
     return (
       <SelectTree
-        label={isOptional ? `${label} (${optionalLabel})` : label}
+        label={<FieldLabel label={label} isOptional={isOptional} />}
         options={hierarchyOptions}
         onClose={handleClose}
         onOpen={handleOpen}
@@ -234,7 +237,7 @@ export const DataFilterSelect = ({
   return (
     <Select
       id={id}
-      label={isOptional ? `${label} (${optionalLabel})` : label}
+      label={<FieldLabel label={label} isOptional={isOptional} />}
       disabled={disabled}
       options={allValues}
       sortOptions={false}
@@ -689,6 +692,34 @@ export const ColorPickerField = ({
   );
 };
 
+const FieldLabel = ({
+  label,
+  isOptional,
+  isFetching,
+}: {
+  label: React.ReactNode;
+  isOptional?: boolean;
+  isFetching?: boolean;
+}) => {
+  const classes = useStyles();
+  const optionalLabel = t({
+    id: "controls.select.optional",
+    message: `optional`,
+  });
+  return (
+    <div className={classes.root}>
+      {label}
+
+      {isOptional ? (
+        <span className={classes.optional}>({optionalLabel})</span>
+      ) : null}
+      {isFetching ? (
+        <CircularProgress size={12} className={classes.loadingIndicator} />
+      ) : null}
+    </div>
+  );
+};
+
 export const ChartFieldField = ({
   label,
   field,
@@ -702,7 +733,6 @@ export const ChartFieldField = ({
   optional?: boolean;
   disabled?: boolean;
 }) => {
-  const classes = useStyles();
   const { fetching, ...fieldProps } = useChartFieldField({ field });
 
   const noneLabel = t({
@@ -710,28 +740,16 @@ export const ChartFieldField = ({
     message: "None",
   });
 
-  const optionalLabel = t({
-    id: "controls.select.optional",
-    message: `optional`,
-  });
-
   return (
     <Select
       key={`select-${field}-dimension`}
       id={field}
       label={
-        <>
-          {optional ? (
-            <span>
-              {label} ({optionalLabel})
-            </span>
-          ) : (
-            <span>{label}</span>
-          )}
-          {fetching ? (
-            <CircularProgress size={12} className={classes.loadingIndicator} />
-          ) : null}
-        </>
+        <FieldLabel
+          isOptional={optional || false}
+          isFetching={fetching}
+          label={label}
+        />
       }
       disabled={disabled || fetching}
       options={
@@ -882,11 +900,6 @@ export const ChartOptionSelectField = <ValueType extends {} = string>({
     message: "None",
   });
 
-  const optionalLabel = t({
-    id: "controls.select.optional",
-    message: "optional",
-  });
-
   const allOptions = useMemo(() => {
     return isOptional
       ? [
@@ -904,7 +917,9 @@ export const ChartOptionSelectField = <ValueType extends {} = string>({
     <Select
       id={id}
       disabled={disabled}
-      label={isOptional ? `${label} (${optionalLabel})` : label}
+      label={
+        <FieldLabel isOptional={isOptional} isFetching={false} label={label} />
+      }
       options={allOptions}
       {...fieldProps}
     />

From 62132ffb7173ee6299839c17f3ae99fb2482c8d6 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 15:43:36 +0100
Subject: [PATCH 7/9] fix: Sort values correctly in metadata panel

---
 app/components/metadata-panel.tsx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/components/metadata-panel.tsx b/app/components/metadata-panel.tsx
index 066eccbcb..e13a6a6a6 100644
--- a/app/components/metadata-panel.tsx
+++ b/app/components/metadata-panel.tsx
@@ -17,8 +17,9 @@ import match from "autosuggest-highlight/match";
 import parse from "autosuggest-highlight/parse";
 import clsx from "clsx";
 import { AnimatePresence, Transition } from "framer-motion";
+import orderBy from "lodash/orderBy";
 import { useRouter } from "next/router";
-import React from "react";
+import React, { useMemo } from "react";
 import { createStore, useStore } from "zustand";
 import shallow from "zustand/shallow";
 
@@ -32,6 +33,7 @@ import { Icon } from "@/icons";
 import SvgIcArrowRight from "@/icons/components/IcArrowRight";
 import SvgIcClose from "@/icons/components/IcClose";
 import { useEmbedOptions } from "@/utils/embed";
+import { makeDimensionValueSorters } from "@/utils/sorting-values";
 import useEvent from "@/utils/use-event";
 
 import Flex from "./flex";
@@ -603,8 +605,16 @@ const TabPanelDataDimension = ({
 };
 
 const DimensionValues = ({ dim }: { dim: DimensionMetadataFragment }) => {
+  const sortedValues = useMemo(() => {
+    const sorters = makeDimensionValueSorters(dim);
+    return orderBy(
+      dim.values,
+      sorters.map((s) => (dv) => s(dv.label))
+    ) as DimensionValue[];
+  }, [dim]);
+
   if (isStandardErrorDimension(dim)) {
-    return <DimensionValuesNumeric values={dim.values} />;
+    return <DimensionValuesNumeric values={sortedValues} />;
   }
 
   switch (dim.__typename) {
@@ -613,11 +623,11 @@ const DimensionValues = ({ dim }: { dim: DimensionMetadataFragment }) => {
     case "OrdinalMeasure":
     case "GeoCoordinatesDimension":
     case "GeoShapesDimension":
-      return <DimensionValuesNominal values={dim.values} />;
+      return <DimensionValuesNominal values={sortedValues} />;
     case "NumericalMeasure":
     case "TemporalDimension":
-      return dim.values.length > 0 ? (
-        <DimensionValuesNumeric values={dim.values} />
+      return sortedValues.length > 0 ? (
+        <DimensionValuesNumeric values={sortedValues} />
       ) : null;
     default:
       const _exhaustiveCheck: never = dim;

From f3093d4f182d2cb8f2adeb211630a4d51787723b Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Fri, 24 Feb 2023 16:58:30 +0100
Subject: [PATCH 8/9] fix: Sort selector correctly shows default sorting type
 if not sorting order is there

Fix #980
---
 app/configurator/components/chart-options-selector.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/configurator/components/chart-options-selector.tsx b/app/configurator/components/chart-options-selector.tsx
index be5993bb2..5f57f02b9 100644
--- a/app/configurator/components/chart-options-selector.tsx
+++ b/app/configurator/components/chart-options-selector.tsx
@@ -4,7 +4,7 @@ import get from "lodash/get";
 import keyBy from "lodash/keyBy";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 
-import { getFieldComponentIri } from "@/charts";
+import { DEFAULT_SORTING, getFieldComponentIri } from "@/charts";
 import {
   chartConfigOptionsUISpec,
   EncodingFieldType,
@@ -552,7 +552,7 @@ const ChartFieldSorting = ({
   const locale = useLocale();
   const [, dispatch] = useConfiguratorState();
 
-  const getSortingTypeLabel = (type: SortingType) => {
+  const getSortingTypeLabel = (type: SortingType): string => {
     switch (type) {
       case "byDimensionLabel":
         return t({ id: "controls.sorting.byDimensionLabel", message: `Name` });
@@ -565,7 +565,7 @@ const ChartFieldSorting = ({
       default:
         const _sanityCheck: never = type;
         console.warn(`Sorting type label is ${_sanityCheck}`);
-        return t({ id: "controls.sorting.byDimensionLabel", message: `Name` });
+        return getSortingTypeLabel(DEFAULT_SORTING["sortingType"]);
     }
   };
 
@@ -593,7 +593,7 @@ const ChartFieldSorting = ({
   const activeSortingType = get(
     state,
     ["chartConfig", "fields", field, "sorting", "sortingType"],
-    "byDimensionLabel"
+    DEFAULT_SORTING["sortingType"]
   );
 
   // FIXME: Remove this once it's properly encoded in chart-config-ui-options

From 1b20ce06ceb9d3840ecc050109e86b188ad955b0 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Tue, 28 Feb 2023 10:28:42 +0100
Subject: [PATCH 9/9] fix: Remove unneeded || false

---
 app/configurator/components/field.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/configurator/components/field.tsx b/app/configurator/components/field.tsx
index d78ab6499..fb8bc3ff7 100644
--- a/app/configurator/components/field.tsx
+++ b/app/configurator/components/field.tsx
@@ -745,11 +745,7 @@ export const ChartFieldField = ({
       key={`select-${field}-dimension`}
       id={field}
       label={
-        <FieldLabel
-          isOptional={optional || false}
-          isFetching={fetching}
-          label={label}
-        />
+        <FieldLabel isOptional={optional} isFetching={fetching} label={label} />
       }
       disabled={disabled || fetching}
       options={