From 75320439a182936481e28da12242f826b1507f41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 08:53:32 +0000 Subject: [PATCH 01/54] Bump @types/react-color from 3.0.7 to 3.0.9 in /cl2-component-library Bumps [@types/react-color](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-color) from 3.0.7 to 3.0.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-color) --- updated-dependencies: - dependency-name: "@types/react-color" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 14 +++++++------- cl2-component-library/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index dea9fba3b844..f4cf03bc6a43 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -44,7 +44,7 @@ "@types/jest": "^28.1.6", "@types/lodash": "^4.14.197", "@types/react": "^17.0.2", - "@types/react-color": "3.0.7", + "@types/react-color": "3.0.9", "@types/react-dom": "^17.0.13", "@types/react-places-autocomplete": "6.x", "@types/react-transition-group": "4.4.6", @@ -11000,9 +11000,9 @@ } }, "node_modules/@types/react-color": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.7.tgz", - "integrity": "sha512-IGZA7e8Oia0+Sb3/1KP0qTThGelZ9DRspfeLrFWQWv5vXHiYlJJQMC2kgQr75CtP4uL8/kvT8qBgrOVlxVoNTw==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.9.tgz", + "integrity": "sha512-Ojyc6jySSKvM6UYQrZxaYe0JZXtgHHXwR2q9H4MhcNCswFdeZH1owYZCvPtdHtMOfh7t8h1fY0Gd0nvU1JGDkQ==", "dev": true, "dependencies": { "@types/react": "*", @@ -39371,9 +39371,9 @@ } }, "@types/react-color": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.7.tgz", - "integrity": "sha512-IGZA7e8Oia0+Sb3/1KP0qTThGelZ9DRspfeLrFWQWv5vXHiYlJJQMC2kgQr75CtP4uL8/kvT8qBgrOVlxVoNTw==", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.9.tgz", + "integrity": "sha512-Ojyc6jySSKvM6UYQrZxaYe0JZXtgHHXwR2q9H4MhcNCswFdeZH1owYZCvPtdHtMOfh7t8h1fY0Gd0nvU1JGDkQ==", "dev": true, "requires": { "@types/react": "*", diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json index cce7bf062516..370054e1e619 100644 --- a/cl2-component-library/package.json +++ b/cl2-component-library/package.json @@ -59,7 +59,7 @@ "@types/jest": "^28.1.6", "@types/lodash": "^4.14.197", "@types/react": "^17.0.2", - "@types/react-color": "3.0.7", + "@types/react-color": "3.0.9", "@types/react-dom": "^17.0.13", "@types/react-places-autocomplete": "6.x", "@types/react-transition-group": "4.4.6", From 9ec0114a954ceec802ac1213ed49e30d8d243af0 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 20 Oct 2023 13:41:41 +0200 Subject: [PATCH 02/54] Fix bookmark summary title --- .../Admin/projects/project/analysis/Insights/Summary.tsx | 2 +- .../Admin/projects/project/analysis/Insights/messages.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/front/app/containers/Admin/projects/project/analysis/Insights/Summary.tsx b/front/app/containers/Admin/projects/project/analysis/Insights/Summary.tsx index be91c3aadf7c..d5b82bdb28ef 100644 --- a/front/app/containers/Admin/projects/project/analysis/Insights/Summary.tsx +++ b/front/app/containers/Admin/projects/project/analysis/Insights/Summary.tsx @@ -246,7 +246,7 @@ const Summary = ({ insight }: Props) => { } iconColor={colors.teal400} iconColorOnHover={colors.teal700} - a11y_buttonActionMessage={formatMessage(messages.deleteSummary)} + a11y_buttonActionMessage={formatMessage(messages.bookmarkSummary)} onClick={() => toggleBookmark({ analysisId, id: insight.id })} /> diff --git a/front/app/containers/Admin/projects/project/analysis/Insights/messages.ts b/front/app/containers/Admin/projects/project/analysis/Insights/messages.ts index a9a5a209ddaa..258e4ad035a3 100644 --- a/front/app/containers/Admin/projects/project/analysis/Insights/messages.ts +++ b/front/app/containers/Admin/projects/project/analysis/Insights/messages.ts @@ -61,6 +61,10 @@ export default defineMessages({ id: 'app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary', defaultMessage: 'Delete summary', }, + bookmarkSummary: { + id: 'app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary', + defaultMessage: 'Bookmark summary', + }, deleteSummaryConfirmation: { id: 'app.containers.AdminPage.projects.project.analysis.Insights.deleteSummaryConfirmation', defaultMessage: 'Are you sure you want to delete these summaries?', From a209d2d7ff4bcbc79a16441a29c86a7a137728d3 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Fri, 20 Oct 2023 11:44:11 +0000 Subject: [PATCH 03/54] Translations updated by CI (extract-intl) --- front/app/translations/admin/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/en.json b/front/app/translations/admin/en.json index 7512a96b6cd9..12f708fdbd67 100644 --- a/front/app/translations/admin/en.json +++ b/front/app/translations/admin/en.json @@ -1969,6 +1969,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Applies to currently selected inputs", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Ask", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Ask a question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bookmark summary", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Delete question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Are you sure you want to delete this question?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Delete summary", From 75af53ada8a6e8c48dff2a395d3f7f8ec562c28e Mon Sep 17 00:00:00 2001 From: Iva Date: Mon, 23 Oct 2023 14:16:10 +0300 Subject: [PATCH 04/54] Increase page size to 1000 --- .../UserFilterConditions/ValueSelector/EventValuesSelector.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx b/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx index fd29d64016d6..6f6e94c0d909 100644 --- a/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx +++ b/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx @@ -13,7 +13,7 @@ export interface Props { } const EventValuesSelector = ({ value, onChange }: Props) => { - const { data: events } = useEvents({ sort: '-start_at' }); + const { data: events } = useEvents({ sort: '-start_at', pageSize: 1000 }); const localize = useLocalize(); const handleOnChange = (options: IOption[]) => { From 92c16b5d3bf32f130b2b6d47fce286962b8e9710 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 13:45:43 +0100 Subject: [PATCH 05/54] [TAN-446] POC: Naive filtering of any 'image' param --- back/config/initializers/filter_parameter_logging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index 61b00ef02a59..98599276afe6 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -6,5 +6,5 @@ # sensitive information. See the ActiveSupport::ParameterFilter documentation for supported # notations and behaviors. Rails.application.config.filter_parameters += %i[ - password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx + image password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx ] From efe33e44feaea29c47e733db689890541b9a70f0 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 15:09:29 +0100 Subject: [PATCH 06/54] [TAN-446] Filter only exact matches --- back/config/initializers/filter_parameter_logging.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index 98599276afe6..1bbd7b9876b9 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -6,5 +6,9 @@ # sensitive information. See the ActiveSupport::ParameterFilter documentation for supported # notations and behaviors. Rails.application.config.filter_parameters += %i[ - image password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx + password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx ] + +# Filter only exact matches of specified parameter keys. This avoids filtering false positives. +# E.g. `image` will filter both `image` and `imageUrl`, whereas `^image$` will only filter `image`. +Rails.application.config.filter_parameters += [/^image$/] From 0c29f786adaf7723112e5ef2f1aff9bb70dedf7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:02:28 +0000 Subject: [PATCH 07/54] Bump tough-cookie from 4.1.2 to 4.1.3 in /cl2-component-library Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index dea9fba3b844..a2bf8ac160b7 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -30054,9 +30054,9 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { "psl": "^1.1.33", @@ -53736,9 +53736,9 @@ "dev": true }, "tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "requires": { "psl": "^1.1.33", From bada2f29f3b299a37f089e6ab016a3dfceb06f2d Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:09 +0000 Subject: [PATCH 08/54] New translations en.json (German) --- front/app/translations/admin/de-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/de-DE.json b/front/app/translations/admin/de-DE.json index 8f7d5b67f717..05c18c8e3d2c 100644 --- a/front/app/translations/admin/de-DE.json +++ b/front/app/translations/admin/de-DE.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Gilt für die aktuell ausgewählten Beiträge", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Fragen", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Eine Frage stellen", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Lesezeichen Zusammenfassung", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Frage löschen", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Sind Sie sicher, dass Sie diese Frage löschen möchten?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Zusammenfassung löschen", From cfb725ad37292803215815181a8320ecf9864f31 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:12 +0000 Subject: [PATCH 09/54] New translations en.json (French) --- front/app/translations/admin/fr-FR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/fr-FR.json b/front/app/translations/admin/fr-FR.json index 5ffe880d49c7..141523b3f308 100644 --- a/front/app/translations/admin/fr-FR.json +++ b/front/app/translations/admin/fr-FR.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "S'applique uniquement aux contributions sélectionnées", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Soumettre", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Posez une question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Résumé des signets", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Supprimer la question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Êtes-vous sûr de vouloir supprimer cette question ?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Supprimer le résumé", From 4a2e6412e3eb514f2e28e1292b659ef75059c724 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:17 +0000 Subject: [PATCH 10/54] New translations en.json (Spanish) --- front/app/translations/admin/es-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/es-ES.json b/front/app/translations/admin/es-ES.json index 86192b05b53a..b3afa463b658 100644 --- a/front/app/translations/admin/es-ES.json +++ b/front/app/translations/admin/es-ES.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Se aplica a las entradas seleccionadas actualmente", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Pregunta a", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Haz una pregunta", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Resumen de marcapáginas", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Borrar pregunta", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "¿Estás seguro de que quieres borrar esta pregunta?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Borrar resumen", From e290f4e6dffcb1852eb93bb35103c23f3e38d4cc Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:25 +0000 Subject: [PATCH 11/54] New translations en.json (Arabic) --- front/app/translations/admin/ar-SA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/ar-SA.json b/front/app/translations/admin/ar-SA.json index 71a3b1ca22ab..4245afd867f3 100644 --- a/front/app/translations/admin/ar-SA.json +++ b/front/app/translations/admin/ar-SA.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "ينطبق على المدخلات المحددة حاليا", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "بسأل", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "طرح سؤال", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "ملخص المرجعية", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "حذف السؤال", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "هل أنت متأكد أنك تريد حذف هذا السؤال؟", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "حذف الملخص", From 9cc2753b4f359f08072c0ffe3538275ae0d6344f Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:35 +0000 Subject: [PATCH 12/54] New translations en.json (Danish) --- front/app/translations/admin/da-DK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/da-DK.json b/front/app/translations/admin/da-DK.json index d77418d1f58a..c68ae737663e 100644 --- a/front/app/translations/admin/da-DK.json +++ b/front/app/translations/admin/da-DK.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Gælder for de aktuelt valgte inputs", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Spørg", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Stil et spørgsmål", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bogmærkeoversigt", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Slet spørgsmål", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Er du sikker på, at du vil slette dette spørgsmål?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Slet resumé", From a02e45501d7896199896b1b05d624bca5cfa9241 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:40 +0000 Subject: [PATCH 13/54] New translations en.json (Portuguese, Brazilian) --- front/app/translations/pt-BR.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/front/app/translations/pt-BR.json b/front/app/translations/pt-BR.json index d60b86580c91..2074c6dddf59 100644 --- a/front/app/translations/pt-BR.json +++ b/front/app/translations/pt-BR.json @@ -156,7 +156,7 @@ "app.components.FolderFolderCard.a11y_folderTitle": "Título da pasta:", "app.components.FolderFolderCard.archived": "Arquivado", "app.components.FolderFolderCard.numberOfProjectsInFolder": "{numberOfProjectsInFolder, plural, no {# projetos} one {# projeto} other {# projetos}}", - "app.components.FormBuilder.components.FormBuilderTopBar.downloadPDF": "Descarregar como pdf", + "app.components.FormBuilder.components.FormBuilderTopBar.downloadPDF": "Baixe como pdf", "app.components.GoBackButton.group.edit.goBack": "Voltar", "app.components.GoBackButton.group.edit.goBackToPreviousPage": "Voltar à página anterior", "app.components.HookForm.Feedback.errorTitle": "Há um problema", @@ -603,9 +603,9 @@ "app.components.form.blockedVerified": "Você não pode editar este campo porque ele contém informações confirmadas", "app.components.form.controls.adminFieldTooltip": "Somente os administradores podem ver", "app.components.form.controls.notPublic": "*Esta resposta só será partilhada com os moderadores, e não com o público.", - "app.components.form.controls.selectAsManyAsYouLike": "*Selecionar todos os que quiser", + "app.components.form.controls.selectAsManyAsYouLike": "*Selecione quantos quiser", "app.components.form.controls.selectBetween": "*Selecionar entre as opções {minItems} e {maxItems}", - "app.components.form.controls.selectExactly2": "*Selecionar exatamente {selectExactly, plural, one {# option} other {# opções}}", + "app.components.form.controls.selectExactly2": "*Selecione exatamente {selectExactly, plural, one {#opção} other {# opções}}", "app.components.form.controls.selectMany": "*Escolha quantos quiser", "app.components.form.error": "Erro", "app.components.form.locationGoogleUnavailable": "Não foi possível carregar o campo de localização fornecido pelo google maps.", @@ -648,7 +648,7 @@ "app.components.formBuilder.labels": "Etiquetas", "app.components.formBuilder.labelsTooltipContent": "Escolha etiquetas opcionais para os seus valores mínimo e máximo.", "app.components.formBuilder.layout": "Layout", - "app.components.formBuilder.limitAnswersTooltip": "Quando ativado, os inquiridos têm de selecionar o número especificado de respostas para prosseguir.", + "app.components.formBuilder.limitAnswersTooltip": "Quando ativado, os entrevistados precisam selecionar o número especificado de respostas para prosseguir.", "app.components.formBuilder.limitNumberAnswers": "Limitar o número de respostas", "app.components.formBuilder.linearScale": "Escala linear", "app.components.formBuilder.locationDescription": "Localização", @@ -1037,7 +1037,7 @@ "app.containers.IdeasShow.ideaWhatsAppMessage": "Apoie esta ideia: {postTitle}", "app.containers.IdeasShow.ideasWhatsAppMessage": "Apoie este problema: {postTitle}", "app.containers.IdeasShow.imported": "Importado", - "app.containers.IdeasShow.importedTooltip": "O site {inputTerm} foi coletado off-line e carregado automaticamente na plataforma.", + "app.containers.IdeasShow.importedTooltip": "Este {inputTerm} foi coletado offline e carregado automaticamente na plataforma.", "app.containers.IdeasShow.issueEmailSharingBody": "Apoie este problema '{postTitle}' em {postUrl}!", "app.containers.IdeasShow.issueEmailSharingSubject": "Apoie este problema: {postTitle}", "app.containers.IdeasShow.issueFacebookMessage": "Apoie este problema: {postTitle}", @@ -1482,7 +1482,7 @@ "app.containers.SpamReport.otherReasonPlaceholder": "Descrição", "app.containers.SpamReport.wrong_content": "Isto não pertence aqui.", "app.containers.UsersEditPage.a11y_imageDropzoneRemoveIconAriaTitle": "Remover imagem de perfil", - "app.containers.UsersEditPage.activeProposalVotesWillBeDeleted": "Seus votos em propostas que ainda estão abertas para votação serão excluídos. Os votos em propostas cujo período de votação tenha sido encerrado não serão excluídos.", + "app.containers.UsersEditPage.activeProposalVotesWillBeDeleted": "Seus votos nas propostas que ainda estiverem abertas para votação serão deletados. As votações em propostas cujo período de votação tenha encerrado não serão eliminadas.", "app.containers.UsersEditPage.addPassword": "Adicionar palavra-passe", "app.containers.UsersEditPage.becomeVerifiedSubtitle": "Participar em projetos para usuários verificados.", "app.containers.UsersEditPage.becomeVerifiedTitle": "Verifique o seu usuário", From 86aa48a3c9351f3435942c5b1d87447a9c296207 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:05:57 +0000 Subject: [PATCH 14/54] New translations en.json (Dutch) --- front/app/translations/admin/nl-NL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/nl-NL.json b/front/app/translations/admin/nl-NL.json index 393f2aae1e3c..709f0d04a5d3 100644 --- a/front/app/translations/admin/nl-NL.json +++ b/front/app/translations/admin/nl-NL.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Geldt voor de huidig geselecteerde bijdragen", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Vraag", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Stel een vraag", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Overzicht bladwijzers", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Verwijder vraag", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Weet je zeker dat je deze vraag wilt verwijderen?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Verwijder samenvatting", From ed7da28e4d4cc041902feff8b2918f87cb52da9c Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:04 +0000 Subject: [PATCH 15/54] New translations en.json (Norwegian) --- front/app/translations/admin/nb-NO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/nb-NO.json b/front/app/translations/admin/nb-NO.json index 74ae6f07b868..597d7d779fae 100644 --- a/front/app/translations/admin/nb-NO.json +++ b/front/app/translations/admin/nb-NO.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Gjelder for gjeldende valgte innganger", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Spørre", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Spør et spørsmål", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bokmerke sammendrag", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Slett spørsmålet", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Er du sikker på at du vil slette dette spørsmålet?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Slett sammendraget", From d601017f27216f201f1d35ae3215715f74c610cd Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:11 +0000 Subject: [PATCH 16/54] New translations en.json (Polish) --- front/app/translations/admin/pl-PL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/pl-PL.json b/front/app/translations/admin/pl-PL.json index 9c6269f2bc9f..520952f8514e 100644 --- a/front/app/translations/admin/pl-PL.json +++ b/front/app/translations/admin/pl-PL.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Dotyczy aktualnie wybranych wejść", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Zapytaj", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Zadaj pytanie", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Podsumowanie zakładki", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Usuń pytanie", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Czy na pewno chcesz usunąć to pytanie?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Usuń podsumowanie", From 1e0882d3904308e04fdd65de102963bfe2bbfc37 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:18 +0000 Subject: [PATCH 17/54] New translations en.json (Serbian (Cyrillic)) --- front/app/translations/admin/sr-SP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/sr-SP.json b/front/app/translations/admin/sr-SP.json index f5685e030b22..65d70a9ebeee 100644 --- a/front/app/translations/admin/sr-SP.json +++ b/front/app/translations/admin/sr-SP.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Примењује се на тренутно изабране улазе", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Питати", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Поставите питање", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Резиме обележивача", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Избриши питање", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Да ли сте сигурни да желите да избришете ово питање?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Избриши резиме", From b1af8c5343924a69a41af18045d6d8878d950e97 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:25 +0000 Subject: [PATCH 18/54] New translations en.json (Swedish) --- front/app/translations/admin/sv-SE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/sv-SE.json b/front/app/translations/admin/sv-SE.json index 4bbe0c001a19..085656b82d41 100644 --- a/front/app/translations/admin/sv-SE.json +++ b/front/app/translations/admin/sv-SE.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Gäller för för tillfället valda ingångar", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Fråga", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Ställ en fråga", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Sammanfattning av bokmärken", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Radera fråga", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Är du säker på att du vill ta bort den här frågan?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Radera sammanfattning", From e2140e2236dcc09b857aaba36113bfcb4fbb5365 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:32 +0000 Subject: [PATCH 19/54] New translations en.json (Turkish) --- front/app/translations/admin/tr-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/tr-TR.json b/front/app/translations/admin/tr-TR.json index 8899b37f559e..33369d7d6c7c 100644 --- a/front/app/translations/admin/tr-TR.json +++ b/front/app/translations/admin/tr-TR.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Geçerli olarak seçilen girişler için geçerlidir", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Sor", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Bir soru sorun", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Yer imi özeti", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Soruyu sil", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Bu soruyu silmek istediğinizden emin misiniz?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Özeti sil", From 816eb41623d991125df6e57ab5f95a552d017ef8 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:35 +0000 Subject: [PATCH 20/54] New translations en.yml (Portuguese, Brazilian) --- back/config/locales/pt-BR.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/back/config/locales/pt-BR.yml b/back/config/locales/pt-BR.yml index a7e551934fcd..2d9de430cf3b 100644 --- a/back/config/locales/pt-BR.yml +++ b/back/config/locales/pt-BR.yml @@ -215,7 +215,7 @@ pt: status: 'Status' assignee_fullname: 'Atribuído' assignee_email: 'E-mail do assinante' - image_url: 'URL da imagem' + image_url: 'imagem URL' anonymous: 'Anônimo' form_builder: default_select_field: @@ -227,21 +227,21 @@ pt: description: "Por favor, submeta as suas respostas, selecionando abaixo 'Submeter pesquisa'." pdf_export: personal_data: 'Dados pessoais' - personal_data_explanation_ideation: "Enviaremos sua contribuição para a plataforma de participação on-line do %{organizationName}. Se você quiser que seu nome seja exibido como autor desta contribuição e receber atualizações relevantes à sua contribuição por e-mail, preencha os campos a seguir nesta página e criaremos uma conta para você. Seu e-mail não será público e será usado apenas por %{organizationName}. Se quiser permanecer anônimo ou não concordar com o uso de seus dados pessoais dessa forma, você pode deixá-los em branco." - personal_data_explanation_native_survey: "Enviaremos sua contribuição para a plataforma de participação on-line do %{organizationName}. Se você quiser receber atualizações relevantes à sua contribuição por e-mail, preencha os campos a seguir nesta página e nós criaremos uma conta para você. Seus dados não serão públicos e serão usados somente por %{organizationName}. Se não concordar com o uso de seus dados pessoais dessa forma, você pode deixá-los em branco." - first_name: 'Nome próprio' - last_name: 'Apelido' - email_address: 'Endereço de correio eletrónico' + personal_data_explanation_ideation: "Enviaremos sua entrada para a plataforma de participação on-line da %{organizationName}. Se você deseja que seu nome seja exibido como autor desta contribuição e receba atualizações relevantes à sua contribuição por e-mail, preencha os seguintes campos nesta página e criaremos uma conta para você. Seu e-mail não será público e será usado apenas por %{organizationName}. Se quiser permanecer anônimo ou não concordar que utilizemos seus dados pessoais desta forma, você pode deixá-los em branco." + personal_data_explanation_native_survey: "Enviaremos sua entrada para a plataforma de participação on-line da %{organizationName}. Se você deseja receber atualizações relevantes sobre sua opinião por e-mail, preencha os seguintes campos nesta página e criaremos uma conta para você. Os seus dados não serão públicos e serão utilizados apenas pela %{organizationName}. Se não concordar que utilizemos os seus dados pessoais desta forma, pode deixá-los vazios." + first_name: 'Primeiro(s) nome' + last_name: 'Sobrenome' + email_address: 'Endereço de email' by_checking_this_box: "Ao marcar esta caixa, concordo que meus dados sejam usados para criar uma conta na plataforma de participação do %{organizationName}." - optional: 'facultativo' - permission: 'Autorização' - choose_as_many: 'Escolha tantos quantos quiser' + optional: 'opcional' + permission: 'Permissão' + choose_as_many: 'Escolha quantos quiser' this_answer: 'Esta resposta só será partilhada com os moderadores e não com o público.' page: 'Página' date_published: 'Data de publicação (dd-mm-aaaa)' instructions: 'Instruções' - write_as_clearly: 'Escreva o mais claramente possível - estes formulários podem ser digitalizados' - write_in_language: 'Escreva as suas respostas na mesma língua que o presente formulário' + write_as_clearly: 'Escreva com a clareza possível - esses formulários podem ser digitalizados' + write_in_language: 'Escreva suas respostas no mesmo idioma deste formulário' project_copy: title_suffix: 'Cópia' confirmations_mailer: From f8b91ae54610d85f1611d9ab5341dfcd9b13da5d Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:40 +0000 Subject: [PATCH 21/54] New translations en.json (Portuguese, Brazilian) --- front/app/translations/admin/pt-BR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/pt-BR.json b/front/app/translations/admin/pt-BR.json index dbb52247f4e2..c94d460d60ed 100644 --- a/front/app/translations/admin/pt-BR.json +++ b/front/app/translations/admin/pt-BR.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Aplica-se às entradas atualmente selecionadas", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Perguntar", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Faça uma pergunta", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Resumo do marcador", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Excluir pergunta", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Tem certeza de que deseja excluir esta pergunta?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Excluir resumo", From 35d79823385e3675ec39705725e14b66c80901b7 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:45 +0000 Subject: [PATCH 22/54] New translations en.json (Spanish, Chile) --- front/app/translations/admin/es-CL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/es-CL.json b/front/app/translations/admin/es-CL.json index ad336af97fb1..b544daf29efb 100644 --- a/front/app/translations/admin/es-CL.json +++ b/front/app/translations/admin/es-CL.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Se aplica a las entradas seleccionadas actualmente", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Pregunta a", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Haz una pregunta", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Resumen de marcapáginas", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Borrar pregunta", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "¿Estás seguro de que quieres borrar esta pregunta?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Borrar resumen", From 910655051f9e705f216e4445fdad1d2cc25fb7a0 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:52 +0000 Subject: [PATCH 23/54] New translations en.json (Croatian) --- front/app/translations/admin/hr-HR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/hr-HR.json b/front/app/translations/admin/hr-HR.json index 3ecec4ea1278..ab44b341c62d 100644 --- a/front/app/translations/admin/hr-HR.json +++ b/front/app/translations/admin/hr-HR.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Primjenjuje se na trenutno odabrane ulaze", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Pitajte", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Pitati pitanje", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Označite sažetak", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Izbriši pitanje", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Jeste li sigurni da želite izbrisati ovo pitanje?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Izbriši sažetak", From a22dcdb25ace05c6f010844526cab06758cba42d Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:06:59 +0000 Subject: [PATCH 24/54] New translations en.json (Latvian) --- front/app/translations/admin/lv-LV.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/lv-LV.json b/front/app/translations/admin/lv-LV.json index c46a3fb8e9f1..32f7ace3c675 100644 --- a/front/app/translations/admin/lv-LV.json +++ b/front/app/translations/admin/lv-LV.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Attiecas uz pašreiz izvēlētajiem ievades datiem", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Jautājiet", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Uzdot jautājumu", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Grāmatzīmes kopsavilkums", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Dzēst jautājumu", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Vai esat pārliecināts, ka vēlaties dzēst šo jautājumu?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Dzēst kopsavilkumu", From a331a22d04ad455a12ad6132eb99662a1186bd75 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:07 +0000 Subject: [PATCH 25/54] New translations en.json (English, Canada) --- front/app/translations/admin/en-CA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/en-CA.json b/front/app/translations/admin/en-CA.json index ce563af744ca..1ef7abcc628d 100644 --- a/front/app/translations/admin/en-CA.json +++ b/front/app/translations/admin/en-CA.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Applies to currently selected inputs", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Ask", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Ask a question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bookmark summary", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Delete question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Are you sure you want to delete this question?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Delete summary", From 38ab8815da54ede75aee720544e63697e531db09 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:14 +0000 Subject: [PATCH 26/54] New translations en.json (English, United Kingdom) --- front/app/translations/admin/en-GB.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/en-GB.json b/front/app/translations/admin/en-GB.json index 4971181ec9bc..4481a08b7735 100644 --- a/front/app/translations/admin/en-GB.json +++ b/front/app/translations/admin/en-GB.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Applies to currently selected inputs", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Ask", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Ask a question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bookmark summary", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Delete question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Are you sure you want to delete this question?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Delete summary", From 21fe25dcdcf57906e73b7312ff138839861de272 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:25 +0000 Subject: [PATCH 27/54] New translations en.json (Serbian (Latin)) --- front/app/translations/admin/sr-Latn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/sr-Latn.json b/front/app/translations/admin/sr-Latn.json index 91ed011ba828..db97937221d2 100644 --- a/front/app/translations/admin/sr-Latn.json +++ b/front/app/translations/admin/sr-Latn.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Applies to currently selected inputs", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Ask", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Ask a question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Bookmark summary", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Delete question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Are you sure you want to delete this question?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Delete summary", From ce1dc17c0eac4e67c99a06d7845555ab0555decc Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:32 +0000 Subject: [PATCH 28/54] New translations en.json (Dutch, Belgium) --- front/app/translations/admin/nl-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/nl-BE.json b/front/app/translations/admin/nl-BE.json index c6d4b53d05c7..29637d08bde1 100644 --- a/front/app/translations/admin/nl-BE.json +++ b/front/app/translations/admin/nl-BE.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Geldt voor de huidig geselecteerde bijdragen", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Vraag", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Stel een vraag", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Overzicht bladwijzers", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Verwijder vraag", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Weet je zeker dat je deze vraag wilt verwijderen?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Verwijder samenvatting", From 3b4e3bc8f34ace7ad8b289e2c7e89100636cf53a Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:40 +0000 Subject: [PATCH 29/54] New translations en.json (French, Belgium) --- front/app/translations/admin/fr-BE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/fr-BE.json b/front/app/translations/admin/fr-BE.json index 12b7586f596b..ae8b65fcf453 100644 --- a/front/app/translations/admin/fr-BE.json +++ b/front/app/translations/admin/fr-BE.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "S'applique uniquement aux contributions sélectionnées", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Soumettre", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Posez une question", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Résumé des signets", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Supprimer la question", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Êtes-vous sûr de vouloir supprimer cette question ?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Supprimer le résumé", From f8aa69314cac0d33b446d3263a7f43c5aeb6c17e Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:07:49 +0000 Subject: [PATCH 30/54] New translations en.json (Acholi) --- front/app/translations/admin/ach-UG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/app/translations/admin/ach-UG.json b/front/app/translations/admin/ach-UG.json index 63f3369f3a72..365fb3484be0 100644 --- a/front/app/translations/admin/ach-UG.json +++ b/front/app/translations/admin/ach-UG.json @@ -1984,6 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "crwdns1199524:0crwdne1199524:0", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "crwdns1199526:0crwdne1199526:0", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "crwdns1199528:0crwdne1199528:0", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "crwdns1211266:0crwdne1211266:0", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "crwdns1199530:0crwdne1199530:0", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "crwdns1199532:0crwdne1199532:0", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "crwdns1199534:0crwdne1199534:0", From fb9e0d86bfcaa755ba83c896c3056b8b97d92d8d Mon Sep 17 00:00:00 2001 From: Iva Date: Mon, 23 Oct 2023 18:23:06 +0300 Subject: [PATCH 31/54] Add spinner --- .../ValueSelector/EventValuesSelector.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx b/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx index 6f6e94c0d909..57227e14f6da 100644 --- a/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx +++ b/front/app/modules/commercial/smart_groups/components/UserFilterConditions/ValueSelector/EventValuesSelector.tsx @@ -5,6 +5,7 @@ import MultipleSelect from 'components/UI/MultipleSelect'; import useLocalize from 'hooks/useLocalize'; import useEvents from 'api/events/useEvents'; import { generateOptions } from './utils'; +import { Spinner } from '@citizenlab/cl2-component-library'; export interface Props { rule: TRule; @@ -13,7 +14,10 @@ export interface Props { } const EventValuesSelector = ({ value, onChange }: Props) => { - const { data: events } = useEvents({ sort: '-start_at', pageSize: 1000 }); + const { data: events, isLoading } = useEvents({ + sort: '-start_at', + pageSize: 1000, + }); const localize = useLocalize(); const handleOnChange = (options: IOption[]) => { @@ -21,6 +25,8 @@ const EventValuesSelector = ({ value, onChange }: Props) => { onChange(optionIds); }; + if (isLoading) return ; + return ( Date: Mon, 23 Oct 2023 15:37:44 +0000 Subject: [PATCH 32/54] Bump fsevents from 2.3.2 to 2.3.3 in /front Bumps [fsevents](https://github.com/fsevents/fsevents) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/fsevents/fsevents/releases) - [Commits](https://github.com/fsevents/fsevents/compare/v2.3.2...v2.3.3) --- updated-dependencies: - dependency-name: fsevents dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- front/package-lock.json | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/front/package-lock.json b/front/package-lock.json index 7688443abe86..1fb3c3645e01 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -39,6 +39,7 @@ "file-saver": "^2.0.5", "focus-visible": "5.2.0", "formatcoords": "1.1.3", + "fsevents": "^2", "graphql": "^16.8.1", "history": "^5.3.0", "https-browserify": "^1.0.0", @@ -215,7 +216,10 @@ "fsevents": "^2" } }, - "../cl2-component-library/dist": {}, + "../cl2-component-library/dist": { + "name": "@citizenlab/cl2-component-library", + "version": "0.0.1" + }, "node_modules/@adobe/css-tools": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz", @@ -11051,9 +11055,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, "optional": true, "os": [ @@ -29539,9 +29543,9 @@ "dev": true }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "optional": true }, "function-bind": { From 549207796cdd2649b2ea697900405175b97296e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:38:55 +0000 Subject: [PATCH 33/54] Bump @types/react-transition-group in /cl2-component-library Bumps [@types/react-transition-group](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-transition-group) from 4.4.6 to 4.4.8. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-transition-group) --- updated-dependencies: - dependency-name: "@types/react-transition-group" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 14 +++++++------- cl2-component-library/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index f222a3e386c7..54885feaeadb 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -47,7 +47,7 @@ "@types/react-color": "3.0.9", "@types/react-dom": "^17.0.13", "@types/react-places-autocomplete": "6.x", - "@types/react-transition-group": "4.4.6", + "@types/react-transition-group": "4.4.8", "@types/styled-components": "^5.1.26", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", @@ -11029,9 +11029,9 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz", - "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==", + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz", + "integrity": "sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==", "dev": true, "dependencies": { "@types/react": "*" @@ -39400,9 +39400,9 @@ } }, "@types/react-transition-group": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz", - "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==", + "version": "4.4.8", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz", + "integrity": "sha512-QmQ22q+Pb+HQSn04NL3HtrqHwYMf4h3QKArOy5F8U5nEVMaihBs3SR10WiOM1iwPz5jIo8x/u11al+iEGZZrvg==", "dev": true, "requires": { "@types/react": "*" diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json index 370054e1e619..c92c0d308252 100644 --- a/cl2-component-library/package.json +++ b/cl2-component-library/package.json @@ -62,7 +62,7 @@ "@types/react-color": "3.0.9", "@types/react-dom": "^17.0.13", "@types/react-places-autocomplete": "6.x", - "@types/react-transition-group": "4.4.6", + "@types/react-transition-group": "4.4.8", "@types/styled-components": "^5.1.26", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", From b9e5311633416430a87f43f99c94eaafb9b1ada4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:39:12 +0000 Subject: [PATCH 34/54] Bump eslint from 8.50.0 to 8.52.0 in /cl2-component-library Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.52.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.52.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 76 +++++++++++++++---------- cl2-component-library/package.json | 2 +- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index f222a3e386c7..21d17165b303 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -55,7 +55,7 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "css-mediaquery": "^0.1.2", - "eslint": "^8.50.0", + "eslint": "^8.52.0", "eslint-plugin-import": "^2.28.1", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-react": "^7.33.1", @@ -3320,9 +3320,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3396,12 +3396,12 @@ "dev": true }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -3423,9 +3423,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@icons/material": { @@ -11674,6 +11674,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -16763,18 +16769,19 @@ } }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -33840,9 +33847,9 @@ } }, "@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", + "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", "dev": true }, "@fal-works/esbuild-plugin-global-externals": { @@ -33906,12 +33913,12 @@ "dev": true }, "@humanwhocodes/config-array": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", - "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" } @@ -33923,9 +33930,9 @@ "dev": true }, "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "@icons/material": { @@ -39817,6 +39824,12 @@ "eslint-visitor-keys": "^3.3.0" } }, + "@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -43667,18 +43680,19 @@ } }, "eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.52.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", + "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", - "@humanwhocodes/config-array": "^0.11.11", + "@eslint/js": "8.52.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json index 370054e1e619..0543b8207b38 100644 --- a/cl2-component-library/package.json +++ b/cl2-component-library/package.json @@ -70,7 +70,7 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "css-mediaquery": "^0.1.2", - "eslint": "^8.50.0", + "eslint": "^8.52.0", "eslint-plugin-import": "^2.28.1", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-react": "^7.33.1", From 45820aceeab82cbd8229ead83259091fbc6e0177 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:41:28 +0000 Subject: [PATCH 35/54] Bump postcss from 8.4.30 to 8.4.31 in /cl2-component-library Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 14 +++++++------- cl2-component-library/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index f222a3e386c7..03278306376b 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -69,7 +69,7 @@ "jest-junit": "^16.0.0", "jest-styled-components": "^7.1.1", "moment": "2.29.4", - "postcss": "^8.4.27", + "postcss": "^8.4.31", "prettier": "^3.0.3", "raf-stub": "^3.0.0", "react": "^17.0.2", @@ -26239,9 +26239,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -50867,9 +50867,9 @@ "dev": true }, "postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { "nanoid": "^3.3.6", diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json index 370054e1e619..e46e594215b8 100644 --- a/cl2-component-library/package.json +++ b/cl2-component-library/package.json @@ -84,7 +84,7 @@ "jest-junit": "^16.0.0", "jest-styled-components": "^7.1.1", "moment": "2.29.4", - "postcss": "^8.4.27", + "postcss": "^8.4.31", "prettier": "^3.0.3", "raf-stub": "^3.0.0", "react": "^17.0.2", From e040812e4e69e4c65c873a7446fa28fe2fe2f966 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:49:39 +0000 Subject: [PATCH 36/54] Bump babel-jest from 29.5.0 to 29.7.0 in /cl2-component-library Bumps [babel-jest](https://github.com/jestjs/jest/tree/HEAD/packages/babel-jest) from 29.5.0 to 29.7.0. - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v29.7.0/packages/babel-jest) --- updated-dependencies: - dependency-name: babel-jest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- cl2-component-library/package-lock.json | 94 +++---------------------- cl2-component-library/package.json | 2 +- 2 files changed, 12 insertions(+), 84 deletions(-) diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json index 21d17165b303..71d193963cb6 100644 --- a/cl2-component-library/package-lock.json +++ b/cl2-component-library/package-lock.json @@ -51,7 +51,7 @@ "@types/styled-components": "^5.1.26", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", - "babel-jest": "^29.5.0", + "babel-jest": "^29.7.0", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "css-mediaquery": "^0.1.2", @@ -12524,15 +12524,15 @@ } }, "node_modules/babel-jest": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz", - "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^29.5.0", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.5.0", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" @@ -14607,27 +14607,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/create-jest/node_modules/babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "dependencies": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.8.0" - } - }, "node_modules/create-jest/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -21058,27 +21037,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/jest-cli/node_modules/babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "dependencies": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "@babel/core": "^7.8.0" - } - }, "node_modules/jest-cli/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -40519,15 +40477,15 @@ "requires": {} }, "babel-jest": { - "version": "29.5.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.5.0.tgz", - "integrity": "sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "requires": { - "@jest/transform": "^29.5.0", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.5.0", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" @@ -42120,21 +42078,6 @@ "color-convert": "^2.0.1" } }, - "babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "requires": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - } - }, "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -47023,21 +46966,6 @@ "color-convert": "^2.0.1" } }, - "babel-jest": { - "version": "29.7.0", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", - "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", - "dev": true, - "requires": { - "@jest/transform": "^29.7.0", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^29.6.3", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "slash": "^3.0.0" - } - }, "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json index 0543b8207b38..c11686f0162c 100644 --- a/cl2-component-library/package.json +++ b/cl2-component-library/package.json @@ -66,7 +66,7 @@ "@types/styled-components": "^5.1.26", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", - "babel-jest": "^29.5.0", + "babel-jest": "^29.7.0", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "css-mediaquery": "^0.1.2", From 52ae2514829bc87797831e902b0c852a13b814f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:50:00 +0000 Subject: [PATCH 37/54] Bump @types/leaflet.markercluster from 1.5.1 to 1.5.3 in /front Bumps [@types/leaflet.markercluster](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet.markercluster) from 1.5.1 to 1.5.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet.markercluster) --- updated-dependencies: - dependency-name: "@types/leaflet.markercluster" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- front/package-lock.json | 19 +++++++++++-------- front/package.json | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/front/package-lock.json b/front/package-lock.json index 7688443abe86..113eafbf2566 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -130,7 +130,7 @@ "@types/js-cookie": "2.2.7", "@types/json-stable-stringify": "^1.0.34", "@types/leaflet": "1.9.6", - "@types/leaflet.markercluster": "1.5.1", + "@types/leaflet.markercluster": "1.5.3", "@types/lodash-es": "4.17.9", "@types/node": "^18.13.0", "@types/node-uuid": "0.0.29", @@ -215,7 +215,10 @@ "fsevents": "^2" } }, - "../cl2-component-library/dist": {}, + "../cl2-component-library/dist": { + "name": "@citizenlab/cl2-component-library", + "version": "0.0.1" + }, "node_modules/@adobe/css-tools": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz", @@ -4818,9 +4821,9 @@ } }, "node_modules/@types/leaflet.markercluster": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz", - "integrity": "sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz", + "integrity": "sha512-G19K7/Nzwvoz9RDKL2/U1RxkdhDqXPDVRokrmI4eNDfSLShlitY6w/hp4bUaMdi2cwyYcNgdNOarpzDHMuSFrQ==", "dev": true, "dependencies": { "@types/leaflet": "*" @@ -24757,9 +24760,9 @@ } }, "@types/leaflet.markercluster": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.1.tgz", - "integrity": "sha512-gzJzP10qO6Zkts5QNVmSAEDLYicQHTEBLT9HZpFrJiSww9eDAs5OWHvIskldf41MvDv1gbMukuEBQEawHn+wtA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz", + "integrity": "sha512-G19K7/Nzwvoz9RDKL2/U1RxkdhDqXPDVRokrmI4eNDfSLShlitY6w/hp4bUaMdi2cwyYcNgdNOarpzDHMuSFrQ==", "dev": true, "requires": { "@types/leaflet": "*" diff --git a/front/package.json b/front/package.json index 787ed845a9e2..f88466d8be28 100644 --- a/front/package.json +++ b/front/package.json @@ -169,7 +169,7 @@ "@types/js-cookie": "2.2.7", "@types/json-stable-stringify": "^1.0.34", "@types/leaflet": "1.9.6", - "@types/leaflet.markercluster": "1.5.1", + "@types/leaflet.markercluster": "1.5.3", "@types/lodash-es": "4.17.9", "@types/node": "^18.13.0", "@types/node-uuid": "0.0.29", From 3190c956d169dc395ca89616c144dedc86bb88f1 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 17:57:06 +0100 Subject: [PATCH 38/54] [TAN-446] filter base64 strings from multiloc values --- .../config/initializers/filter_parameter_logging.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index 1bbd7b9876b9..c1d1b37934f5 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -9,6 +9,17 @@ password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx ] +# Filtering out base64 image encoding. ------------------------------------------------------------------------- +# # Filter only exact matches of specified parameter keys. This avoids filtering false positives. # E.g. `image` will filter both `image` and `imageUrl`, whereas `^image$` will only filter `image`. -Rails.application.config.filter_parameters += [/^image$/] +Rails.application.config.filter_parameters += [/^avatar$/, /^header_bg$/, /^image$/, /^layout_image$/, /^logo$/] + +# Custom filter to remove base64 image encoding from multiloc values, +# as our WYSIWIG editors enable the addition of (multiple) images in the string value(s) of a mutliloc. +Rails.application.config.filter_parameters << lambda do |param, value| + if CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,') + value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } + end +end +# --------------------------------------------------------------------------------------------------------------- From 69da30c24537c9ec016aa3043349c9b8e28689a8 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 18:38:34 +0100 Subject: [PATCH 39/54] [TAN-446] also filter 'file' param values --- back/config/initializers/filter_parameter_logging.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index c1d1b37934f5..6eebf3c9a219 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -9,14 +9,14 @@ password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx ] -# Filtering out base64 image encoding. ------------------------------------------------------------------------- +# Filtering out base64 encoding. ------------------------------------------------------------------------- # # Filter only exact matches of specified parameter keys. This avoids filtering false positives. # E.g. `image` will filter both `image` and `imageUrl`, whereas `^image$` will only filter `image`. -Rails.application.config.filter_parameters += [/^avatar$/, /^header_bg$/, /^image$/, /^layout_image$/, /^logo$/] +Rails.application.config.filter_parameters += [/^avatar$/, /^file$/, /^header_bg$/, /^image$/, /^layout_image$/, /^logo$/] -# Custom filter to remove base64 image encoding from multiloc values, -# as our WYSIWIG editors enable the addition of (multiple) images in the string value(s) of a mutliloc. +# Custom filter to remove base64 image encoding from multiloc values, as our WYSIWIG editors enable the addition +# of (multiple) images in the string value(s) of a mutliloc, which the FE encodes as base64. Rails.application.config.filter_parameters << lambda do |param, value| if CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,') value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } From d26704e9a4a8a27898898a5945d10da8ac8c3400 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 18:51:05 +0100 Subject: [PATCH 40/54] [TAN-446] tidy up comments --- .../initializers/filter_parameter_logging.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index 6eebf3c9a219..253b2707fb42 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -9,17 +9,22 @@ password current_password passw secret token _key crypt salt certificate otp ssn import_ideas.pdf import_ideas.xlsx ] -# Filtering out base64 encoding. ------------------------------------------------------------------------- +# Filter out base64 encoding # # Filter only exact matches of specified parameter keys. This avoids filtering false positives. # E.g. `image` will filter both `image` and `imageUrl`, whereas `^image$` will only filter `image`. -Rails.application.config.filter_parameters += [/^avatar$/, /^file$/, /^header_bg$/, /^image$/, /^layout_image$/, /^logo$/] - -# Custom filter to remove base64 image encoding from multiloc values, as our WYSIWIG editors enable the addition -# of (multiple) images in the string value(s) of a mutliloc, which the FE encodes as base64. +Rails.application.config.filter_parameters += [ + /^avatar$/, + /^file$/, + /^header_bg$/, + /^image$/, + /^layout_image$/, + /^logo$/ +] +# Custom filter to remove base64 image encoding from multiloc values, as our WYSIWYG editors enable the addition +# of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. Rails.application.config.filter_parameters << lambda do |param, value| if CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,') value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } end end -# --------------------------------------------------------------------------------------------------------------- From 67e0cff7a79a0b99fb5500d43912362b549b6425 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 19:09:51 +0100 Subject: [PATCH 41/54] [TAN-446] avoid removing file details when removing base64 --- back/config/initializers/filter_parameter_logging.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index 253b2707fb42..d2983195064e 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -15,16 +15,17 @@ # E.g. `image` will filter both `image` and `imageUrl`, whereas `^image$` will only filter `image`. Rails.application.config.filter_parameters += [ /^avatar$/, - /^file$/, /^header_bg$/, /^image$/, /^layout_image$/, /^logo$/ ] -# Custom filter to remove base64 image encoding from multiloc values, as our WYSIWYG editors enable the addition +# Custom filter that does 2 things: +# 1. Removes base64 image encoding from multiloc values, as our WYSIWYG editors enable the addition # of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. +# 2. Removes base64 encoding from the `file` parameter value, leaving other information intact (e.g. filename). Rails.application.config.filter_parameters << lambda do |param, value| - if CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,') + if param == 'file' || (CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,')) value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } end end From 306a1b0315e5ef00fea80ae4bf59eebd57c5d645 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Mon, 23 Oct 2023 19:13:57 +0100 Subject: [PATCH 42/54] [TAN-446] indent numbered comments --- back/config/initializers/filter_parameter_logging.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index d2983195064e..f42d70c7b17d 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -21,9 +21,9 @@ /^logo$/ ] # Custom filter that does 2 things: -# 1. Removes base64 image encoding from multiloc values, as our WYSIWYG editors enable the addition -# of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. -# 2. Removes base64 encoding from the `file` parameter value, leaving other information intact (e.g. filename). +# 1. Removes base64 image encoding from multiloc values, as our WYSIWYG editors enable the addition +# of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. +# 2. Removes base64 encoding from the `file` parameter value, leaving other information intact (e.g. filename). Rails.application.config.filter_parameters << lambda do |param, value| if param == 'file' || (CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,')) value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } From f2eb99c1fdfe5a3244b2eb0b55fccc7aea9c2206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 07:42:50 +0000 Subject: [PATCH 43/54] Bump clipboard-polyfill from 3.0.3 to 4.0.1 in /front Bumps [clipboard-polyfill](https://github.com/lgarron/clipboard-polyfill) from 3.0.3 to 4.0.1. - [Release notes](https://github.com/lgarron/clipboard-polyfill/releases) - [Commits](https://github.com/lgarron/clipboard-polyfill/compare/v3.0.3...v4.0.1) --- updated-dependencies: - dependency-name: clipboard-polyfill dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- front/package-lock.json | 15 +++++++-------- front/package.json | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/front/package-lock.json b/front/package-lock.json index a53ef104ff3e..1aa8cd18dce7 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -29,7 +29,7 @@ "bowser": "1.x", "canvas-to-blob": "^1.0.0", "canvg": "^4.0.1", - "clipboard-polyfill": "3.0.3", + "clipboard-polyfill": "4.0.1", "compression": "1.7.4", "cross-env": "7.0.3", "d3-force": "^3.0.0", @@ -39,7 +39,6 @@ "file-saver": "^2.0.5", "focus-visible": "5.2.0", "formatcoords": "1.1.3", - "fsevents": "^2", "graphql": "^16.8.1", "history": "^5.3.0", "https-browserify": "^1.0.0", @@ -7611,9 +7610,9 @@ } }, "node_modules/clipboard-polyfill": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-3.0.3.tgz", - "integrity": "sha512-hts0o01ZkwjA1qHA5gFePzAj/780W7v+eyN3GdaCRyDnapzcPsKRV5aodv77gcr40NDIcyNjNmc+HvfKV+jD0g==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-4.0.1.tgz", + "integrity": "sha512-oOxooaJd9dzy78jk1fw4IL+J0SiBn+W24KqUYUwsr0OWEsb5aZlKAWglr9Fg/XEFQMT3ZmJ2AnRoRMZZOMcOQQ==" }, "node_modules/cliui": { "version": "8.0.1", @@ -26926,9 +26925,9 @@ "dev": true }, "clipboard-polyfill": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-3.0.3.tgz", - "integrity": "sha512-hts0o01ZkwjA1qHA5gFePzAj/780W7v+eyN3GdaCRyDnapzcPsKRV5aodv77gcr40NDIcyNjNmc+HvfKV+jD0g==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-4.0.1.tgz", + "integrity": "sha512-oOxooaJd9dzy78jk1fw4IL+J0SiBn+W24KqUYUwsr0OWEsb5aZlKAWglr9Fg/XEFQMT3ZmJ2AnRoRMZZOMcOQQ==" }, "cliui": { "version": "8.0.1", diff --git a/front/package.json b/front/package.json index f88466d8be28..9c15c0fba7aa 100644 --- a/front/package.json +++ b/front/package.json @@ -68,7 +68,7 @@ "bowser": "1.x", "canvas-to-blob": "^1.0.0", "canvg": "^4.0.1", - "clipboard-polyfill": "3.0.3", + "clipboard-polyfill": "4.0.1", "compression": "1.7.4", "cross-env": "7.0.3", "d3-force": "^3.0.0", From c7e3857e03490ccea374f9938285cb8b383f6352 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:45:02 +0000 Subject: [PATCH 44/54] New translations en.json (Spanish) --- front/app/translations/admin/es-ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/es-ES.json b/front/app/translations/admin/es-ES.json index b3afa463b658..582c319f89d6 100644 --- a/front/app/translations/admin/es-ES.json +++ b/front/app/translations/admin/es-ES.json @@ -1984,7 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Se aplica a las entradas seleccionadas actualmente", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Pregunta a", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Haz una pregunta", - "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Resumen de marcapáginas", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Guardar este resumen", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Borrar pregunta", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "¿Estás seguro de que quieres borrar esta pregunta?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Borrar resumen", From 97f4d7ab071729f26ed4804ca0b053ddbc754701 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:45:06 +0000 Subject: [PATCH 45/54] New translations en.json (German) --- front/app/translations/de-DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/de-DE.json b/front/app/translations/de-DE.json index 9cb3378449f2..4c5fae2ab5b1 100644 --- a/front/app/translations/de-DE.json +++ b/front/app/translations/de-DE.json @@ -21,7 +21,7 @@ "app.components.AssignMultipleVotesControl.votesSubmitted": "Sie haben Ihre Stimme bereits abgegeben. Klicken Sie auf \"Abstimmung ändern\", um Ihre Stimmen zu ändern.", "app.components.AssignMultipleVotesControl.votesSubmittedIdeaPage": "Sie haben Ihre Stimme bereits abgegeben. Um Ihre Stimme zu ändern, gehen Sie zurück zur Projektseite und klicken Sie auf \"Abstimmung ändern\".", "app.components.AssignMultipleVotesControl.xVotes2": "{votes, plural, one {{singular}} other {{plural}}}", - "app.components.AssignVoteControl.vote": "Stimme", + "app.components.AssignVoteControl.vote": "Auswählen", "app.components.AssignVoteControl.voteForAtLeastOne": "Für mindestens 1 Option stimmen", "app.components.AssignVoteControl.voted": "Ausgewählt", "app.components.AssignVoteControl.votesSubmitted": "Sie haben bereits Ihre {votes, plural, one {Stimme} other {Stimmen}} abgegeben. Klicken Sie auf \"Abstimmung ändern\", um Ihre {votes, plural, one {Stimme} other {Stimmen}} zu ändern.", From 6cab292d0c73c2ec06abcebd7c8dab5e654fdd7b Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Tue, 24 Oct 2023 10:22:35 +0100 Subject: [PATCH 46/54] [TAN-446] Don't use JSON.generate --- back/config/initializers/filter_parameter_logging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index f42d70c7b17d..e88cf7bb49ce 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -25,7 +25,7 @@ # of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. # 2. Removes base64 encoding from the `file` parameter value, leaving other information intact (e.g. filename). Rails.application.config.filter_parameters << lambda do |param, value| - if param == 'file' || (CL2_SUPPORTED_LOCALES.include?(param.to_sym) && JSON.generate(value).include?(';base64,')) + if param == 'file' || (CL2_SUPPORTED_LOCALES.include?(param.to_sym) && value.include?(';base64,')) value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } end end From 048c94599befff3abde2e2ea7e6d7c36c05bc334 Mon Sep 17 00:00:00 2001 From: Simon Tharby Date: Tue, 24 Oct 2023 10:42:36 +0100 Subject: [PATCH 47/54] [TAN-446] Add respond_to?(:include?) check --- back/config/initializers/filter_parameter_logging.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/back/config/initializers/filter_parameter_logging.rb b/back/config/initializers/filter_parameter_logging.rb index e88cf7bb49ce..4fc9352f077b 100644 --- a/back/config/initializers/filter_parameter_logging.rb +++ b/back/config/initializers/filter_parameter_logging.rb @@ -25,7 +25,9 @@ # of (multiple) images in the string value(s) of mutlilocs, which the FE encodes as base64. # 2. Removes base64 encoding from the `file` parameter value, leaving other information intact (e.g. filename). Rails.application.config.filter_parameters << lambda do |param, value| - if param == 'file' || (CL2_SUPPORTED_LOCALES.include?(param.to_sym) && value.include?(';base64,')) + if param == 'file' || ( + CL2_SUPPORTED_LOCALES.include?(param.to_sym) && value.respond_to?(:include?) && value.include?(';base64,') + ) value.gsub!(/;base64,[^ ]*/) { ';base64,[FILTERED]' } end end From a33ef42a92572ee3578033c2f9ca8b52b66e1195 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:51:20 +0000 Subject: [PATCH 48/54] New translations en.json (German) --- front/app/translations/admin/de-DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/de-DE.json b/front/app/translations/admin/de-DE.json index 05c18c8e3d2c..c1bbc2e93a2e 100644 --- a/front/app/translations/admin/de-DE.json +++ b/front/app/translations/admin/de-DE.json @@ -1984,7 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Gilt für die aktuell ausgewählten Beiträge", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Fragen", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Eine Frage stellen", - "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Lesezeichen Zusammenfassung", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Zusammenfassung der Lesezeichen", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Frage löschen", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "Sind Sie sicher, dass Sie diese Frage löschen möchten?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Zusammenfassung löschen", From 50ce3a3e794ff2e91a8ba9c92f40e85496ac0558 Mon Sep 17 00:00:00 2001 From: cl-dev-bot <88031410+cl-dev-bot@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:52:15 +0000 Subject: [PATCH 49/54] New translations en.json (Spanish, Chile) --- front/app/translations/admin/es-CL.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/translations/admin/es-CL.json b/front/app/translations/admin/es-CL.json index b544daf29efb..e3cbebc5df69 100644 --- a/front/app/translations/admin/es-CL.json +++ b/front/app/translations/admin/es-CL.json @@ -1984,7 +1984,7 @@ "app.containers.AdminPage.projects.project.analysis.Insights.appliesTo": "Se aplica a las entradas seleccionadas actualmente", "app.containers.AdminPage.projects.project.analysis.Insights.ask": "Pregunta a", "app.containers.AdminPage.projects.project.analysis.Insights.askQuestion": "Haz una pregunta", - "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Resumen de marcapáginas", + "app.containers.AdminPage.projects.project.analysis.Insights.bookmarkSummary": "Guardar este resumen", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestion": "Borrar pregunta", "app.containers.AdminPage.projects.project.analysis.Insights.deleteQuestionConfirmation": "¿Estás seguro de que quieres borrar esta pregunta?", "app.containers.AdminPage.projects.project.analysis.Insights.deleteSummary": "Borrar resumen", From b2840da7212de90734f11974e9099f059a9e9a3a Mon Sep 17 00:00:00 2001 From: Adrien Dessy Date: Tue, 24 Oct 2023 12:06:21 +0200 Subject: [PATCH 50/54] CL-4190 Upgrade Node.js to version 18 Node.js 15 is no longer supported. To encourage people to migrate to a newer version, the installation script waits (suspends the execution) for 20 + 60 seconds. --- back/Dockerfile.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/Dockerfile.development b/back/Dockerfile.development index fb0999c38a16..c0c62655a442 100644 --- a/back/Dockerfile.development +++ b/back/Dockerfile.development @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -qq -y --no-install-recommends \ build-essential libpq-dev file imagemagick curl git optipng jpegoptim pngquant libgeos-dev libgmp3-dev netcat shared-mime-info \ less clang -RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - RUN apt-get -y install nodejs # Install MJML parser required by email engine. From 614be45bb4fc83b252bed24ac6d032e3ecc5c483 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 10:38:45 +0000 Subject: [PATCH 51/54] Bump savon from 2.12.1 to 2.14.0 in /back Bumps [savon](https://github.com/savonrb/savon) from 2.12.1 to 2.14.0. - [Release notes](https://github.com/savonrb/savon/releases) - [Changelog](https://github.com/savonrb/savon/blob/master/CHANGELOG.md) - [Commits](https://github.com/savonrb/savon/compare/v2.12.1...v2.14.0) --- updated-dependencies: - dependency-name: savon dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- back/Gemfile.lock | 30 +++++++++---------- back/engines/commercial/id_cow/id_cow.gemspec | 2 +- .../id_id_card_lookup.gemspec | 2 +- .../verification/verification.gemspec | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/back/Gemfile.lock b/back/Gemfile.lock index a150b8a0e01e..7727586d2f3d 100644 --- a/back/Gemfile.lock +++ b/back/Gemfile.lock @@ -125,7 +125,7 @@ PATH specs: id_cow (0.1.0) rails (~> 7.0) - savon (~> 2.12.0) + savon (>= 2.12, < 2.15) verification PATH @@ -164,7 +164,7 @@ PATH id_id_card_lookup (0.1.0) admin_api rails (~> 7.0) - savon (~> 2.12.0) + savon (>= 2.12, < 2.15) verification PATH @@ -316,7 +316,7 @@ PATH pundit (~> 2.0) rails (~> 7.0) ros-apartment (>= 2.9.0) - savon (~> 2.12.0) + savon (>= 2.12, < 2.15) PATH remote: engines/free/document_annotation @@ -473,7 +473,7 @@ GEM tzinfo (~> 2.0) acts_as_list (1.1.0) activerecord (>= 4.2) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) akami (1.3.1) @@ -727,9 +727,8 @@ GEM mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - httpi (2.5.0) + httpi (3.0.1) rack - socksify i18n (1.14.1) concurrent-ruby (~> 1.0) icalendar (2.9.0) @@ -998,7 +997,6 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.81) rbtree (0.4.6) redcarpet (3.6.0) regexp_parser (2.8.0) @@ -1012,7 +1010,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.6) rgeo (3.0.0) rgeo-activerecord (7.0.1) activerecord (>= 5.0) @@ -1107,11 +1105,12 @@ GEM rubyzip (1.3.0) saharspec (0.0.10) ruby2_keywords - savon (2.12.1) + savon (2.14.0) akami (~> 1.2) builder (>= 2.1.2) gyoku (~> 1.2) - httpi (~> 2.3) + httpi (>= 2.4.5) + mail (~> 2.5) nokogiri (>= 1.8.1) nori (~> 2.4) wasabi (~> 3.4) @@ -1148,7 +1147,6 @@ GEM rack-protection (= 3.0.6) tilt (~> 2.0) smstools (0.2.2) - socksify (1.7.1) sorted_set (1.0.3) rbtree set (~> 1.0) @@ -1169,8 +1167,10 @@ GEM thor (1.2.2) thread (0.2.2) thread_safe (0.3.6) - tiktoken_ruby (0.0.5) - rb_sys (~> 0.9.68) + tiktoken_ruby (0.0.5-aarch64-linux) + tiktoken_ruby (0.0.5-arm64-darwin) + tiktoken_ruby (0.0.5-x86_64-darwin) + tiktoken_ruby (0.0.5-x86_64-linux) tilt (2.1.0) timeout (0.4.0) tomlrb (2.0.3) @@ -1198,9 +1198,9 @@ GEM activemodel (>= 3.0.0) public_suffix vcr (6.1.0) - wasabi (3.7.0) + wasabi (3.8.0) addressable - httpi (~> 2.0) + httpi (~> 3.0) nokogiri (>= 1.4.2) webfinger (2.1.2) activesupport diff --git a/back/engines/commercial/id_cow/id_cow.gemspec b/back/engines/commercial/id_cow/id_cow.gemspec index cf1875e19b74..25284af06443 100644 --- a/back/engines/commercial/id_cow/id_cow.gemspec +++ b/back/engines/commercial/id_cow/id_cow.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'rails', '~> 7.0' s.add_dependency 'verification' - s.add_dependency 'savon', '~> 2.12.0' + s.add_dependency 'savon', '>= 2.12', '< 2.15' s.add_development_dependency 'rspec_api_documentation' s.add_development_dependency 'rspec-rails' diff --git a/back/engines/commercial/id_id_card_lookup/id_id_card_lookup.gemspec b/back/engines/commercial/id_id_card_lookup/id_id_card_lookup.gemspec index e968ba4db595..be8bf17beb87 100644 --- a/back/engines/commercial/id_id_card_lookup/id_id_card_lookup.gemspec +++ b/back/engines/commercial/id_id_card_lookup/id_id_card_lookup.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'rails', '~> 7.0' s.add_dependency 'verification' - s.add_dependency 'savon', '~> 2.12.0' + s.add_dependency 'savon', '>= 2.12', '< 2.15' s.add_dependency 'admin_api' s.add_development_dependency 'rspec_api_documentation' diff --git a/back/engines/commercial/verification/verification.gemspec b/back/engines/commercial/verification/verification.gemspec index adee005f01e6..54e512dfa5dc 100644 --- a/back/engines/commercial/verification/verification.gemspec +++ b/back/engines/commercial/verification/verification.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.add_dependency 'granular_permissions' s.add_dependency 'pundit', '~> 2.0' s.add_dependency 'rails', '~> 7.0' - s.add_dependency 'savon', '~> 2.12.0' + s.add_dependency 'savon', '>= 2.12', '< 2.15' s.add_development_dependency 'rspec_api_documentation' s.add_development_dependency 'rspec-rails' From f4c0a1fd919ad44e9a53e87e86b97425361481c6 Mon Sep 17 00:00:00 2001 From: Adrien Dessy Date: Tue, 24 Oct 2023 15:36:09 +0200 Subject: [PATCH 52/54] [NO-TICKET] Fix Gemfile.lock Fix the following error: > #16 1.193 Fetching gem metadata from https://rubygems.org/....... > #16 3.238 tiktoken_ruby-0.0.5-x86_64-linux requires ruby version < 3.3.dev, >= 3.0, which > #16 3.238 is incompatible with the current version, 2.7.6 --- back/Gemfile.lock | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/back/Gemfile.lock b/back/Gemfile.lock index 7727586d2f3d..524b3d99aa79 100644 --- a/back/Gemfile.lock +++ b/back/Gemfile.lock @@ -997,6 +997,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rb_sys (0.9.81) rbtree (0.4.6) redcarpet (3.6.0) regexp_parser (2.8.0) @@ -1167,10 +1168,8 @@ GEM thor (1.2.2) thread (0.2.2) thread_safe (0.3.6) - tiktoken_ruby (0.0.5-aarch64-linux) - tiktoken_ruby (0.0.5-arm64-darwin) - tiktoken_ruby (0.0.5-x86_64-darwin) - tiktoken_ruby (0.0.5-x86_64-linux) + tiktoken_ruby (0.0.5) + rb_sys (~> 0.9.68) tilt (2.1.0) timeout (0.4.0) tomlrb (2.0.3) From a99540a62ee1852b5ae64a1b00f9e1b7c1b53c06 Mon Sep 17 00:00:00 2001 From: Iva Date: Tue, 24 Oct 2023 16:42:03 +0300 Subject: [PATCH 53/54] Change workflow --- .github/workflows/main.yml | 2 +- .github/workflows/storybook.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b7c622dcb3b6..c0683ed237b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,7 @@ name: CI on: push: - paths: ['cl2-component-library/src/**']# Trigger the action only when files change in the folders defined here + paths: ['cl2-component-library/**'] # Trigger the action when files change in the folder defined here jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml index 8edc54691d8d..16d12ceea4a8 100644 --- a/.github/workflows/storybook.yml +++ b/.github/workflows/storybook.yml @@ -3,7 +3,7 @@ on: push: branches: - master - paths: ['cl2-component-library/src/**'] # Trigger the action only when files change in the folders defined here + paths: ['cl2-component-library/**'] # Trigger the action when files change in the folder defined here jobs: build-and-deploy: runs-on: ubuntu-latest From 80cb57363eef8a793a1a8a9fc41eeccc84412f90 Mon Sep 17 00:00:00 2001 From: Luuc van der Zee Date: Tue, 24 Oct 2023 16:39:15 +0100 Subject: [PATCH 54/54] Rename projectFilter to projectId for all craft widgets default props --- .../Widgets/ChartWidgets/ActiveUsersWidget/index.tsx | 2 +- .../ReportBuilder/Widgets/ChartWidgets/AgeWidget/index.tsx | 2 +- .../Widgets/ChartWidgets/CommentsByTimeWidget/index.tsx | 2 +- .../ReportBuilder/Widgets/ChartWidgets/GenderWidget/index.tsx | 2 +- .../Widgets/ChartWidgets/PostsByTimeWidget/index.tsx | 2 +- .../Widgets/ChartWidgets/ReactionsByTimeWidget/index.tsx | 2 +- .../Widgets/ChartWidgets/VisitorsTrafficSourcesWidget/index.tsx | 2 +- .../ReportBuilder/Widgets/ChartWidgets/VisitorsWidget/index.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ActiveUsersWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ActiveUsersWidget/index.tsx index dcdacc0a34ed..6338f2cdddff 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ActiveUsersWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ActiveUsersWidget/index.tsx @@ -39,7 +39,7 @@ const ActiveUsersWidget = ({ ActiveUsersWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAtMoment: undefined, endAtMoment: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/AgeWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/AgeWidget/index.tsx index b9372c3122a7..3ee781e67758 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/AgeWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/AgeWidget/index.tsx @@ -24,7 +24,7 @@ const AgeWidget = ({ title, projectId, startAt, endAt }: ChartWidgetProps) => { AgeWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/CommentsByTimeWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/CommentsByTimeWidget/index.tsx index ed064a1666fa..0b89e993e061 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/CommentsByTimeWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/CommentsByTimeWidget/index.tsx @@ -39,7 +39,7 @@ const CommentsByTimeWidget = ({ CommentsByTimeWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/GenderWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/GenderWidget/index.tsx index 191a1f5c35f2..c911b1e09cae 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/GenderWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/GenderWidget/index.tsx @@ -33,7 +33,7 @@ const GenderWidget = ({ GenderWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/PostsByTimeWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/PostsByTimeWidget/index.tsx index ecb16a40c0ff..5a3c4884cfdf 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/PostsByTimeWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/PostsByTimeWidget/index.tsx @@ -39,7 +39,7 @@ const PostsByTimeWidget = ({ PostsByTimeWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ReactionsByTimeWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ReactionsByTimeWidget/index.tsx index 1d539d66d681..11497dfc5203 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ReactionsByTimeWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/ReactionsByTimeWidget/index.tsx @@ -39,7 +39,7 @@ const ReactionsByTimeWidget = ({ ReactionsByTimeWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsTrafficSourcesWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsTrafficSourcesWidget/index.tsx index 2990decf1882..77c3440c15e2 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsTrafficSourcesWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsTrafficSourcesWidget/index.tsx @@ -42,7 +42,7 @@ const VisitorsTrafficSourcesWidget = ({ VisitorsTrafficSourcesWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAtMoment: undefined, endAtMoment: null, }, diff --git a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsWidget/index.tsx b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsWidget/index.tsx index 06a0036bf761..6b03745a4f5d 100644 --- a/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsWidget/index.tsx +++ b/front/app/containers/Admin/reporting/components/ReportBuilder/Widgets/ChartWidgets/VisitorsWidget/index.tsx @@ -40,7 +40,7 @@ const VisitorsWidget = ({ VisitorsWidget.craft = { props: { title: '', - projectFilter: undefined, + projectId: undefined, startAt: undefined, endAt: undefined, },