From ffa4e79a8dffe681e21770407517eda180b4765a Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Fri, 24 May 2024 12:05:16 +0200 Subject: [PATCH 1/6] update client --- client/package-lock.json | 96 ++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f911fca..cddd696 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -777,9 +777,9 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "@remix-run/router": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.0.tgz", - "integrity": "sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==" + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", + "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==" }, "@sindresorhus/merge-streams": { "version": "2.3.0", @@ -885,9 +885,9 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" }, "@types/lodash": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", - "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==" + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==" }, "@types/long": { "version": "4.0.2", @@ -900,9 +900,9 @@ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==" }, "@types/node": { - "version": "20.12.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", - "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", "requires": { "undici-types": "~5.26.4" } @@ -2154,6 +2154,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, "requires": { "fill-range": "^7.0.1" } @@ -2476,9 +2477,9 @@ } }, "caniuse-db": { - "version": "1.0.30001617", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001617.tgz", - "integrity": "sha512-JEfZYiroeTkXqNyFv8JJR0aN1tpTgBhst4UawTTKQ7ZVlAsMPWq1U8H9F/THtIXcV6u3CZCFEnkX+Fhgve8Z/w==" + "version": "1.0.30001621", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001621.tgz", + "integrity": "sha512-2iwAHB4j4OVlWcivkHnc1ycKl/FXZd0x+NdNhX7PpZciZp77nxDSloromhwBZJQgprZK9Yad+1Y+e2VUq2YILg==" }, "center-align": { "version": "0.1.3", @@ -3415,9 +3416,9 @@ } }, "dompurify": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.2.tgz", - "integrity": "sha512-hLGGBI1tw5N8qTELr3blKjAML/LY4ANxksbS612UiJyDfyf/2D092Pvm+S7pmeTGJRqvlJkFzBoHBQKgQlOQVg==" + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.4.tgz", + "integrity": "sha512-2gnshi6OshmuKil8rMZuQCGiUF3cUxHY3NGDzUAdUx/NPEe5DVnO8BDoAQouvgwnx0R/+a6jUn36Z0FSdq8vww==" }, "domutils": { "version": "2.8.0", @@ -3455,9 +3456,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.762", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.762.tgz", - "integrity": "sha512-rrFvGweLxPwwSwJOjIopy3Vr+J3cIPtZzuc74bmlvmBIgQO3VYJDvVrlj94iKZ3ukXUH64Ex31hSfRTLqvjYJQ==" + "version": "1.4.782", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz", + "integrity": "sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==" }, "elliptic": { "version": "6.5.5", @@ -4236,6 +4237,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, "requires": { "to-regex-range": "^5.0.1" } @@ -6109,12 +6111,30 @@ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" + }, + "dependencies": { + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "requires": { + "fill-range": "^7.1.1" + } + }, + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "requires": { + "to-regex-range": "^5.0.1" + } + } } }, "miller-rabin": { @@ -6424,7 +6444,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#97be26751583dbc84b5d8ad167da460b1ff044c5", + "version": "github:superdesk/newsroom-core#ef05c2b84e231d972f7e94150a386f153aa6c63b", "from": "github:superdesk/newsroom-core#release/2.7", "requires": { "@dnd-kit/core": "^6.0.8", @@ -7465,9 +7485,9 @@ } }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" }, "picomatch": { "version": "2.3.1", @@ -8398,9 +8418,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-onclickoutside": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", - "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==" + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.1.tgz", + "integrity": "sha512-LdrrxK/Yh9zbBQdFbMTXPp3dTSN9B+9YJQucdDu3JNKRrbdU+H+/TVONJoWtOwy4II8Sqf1y/DTI6w/vGPYW0w==" }, "react-popper": { "version": "2.3.0", @@ -8432,20 +8452,20 @@ } }, "react-router": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.0.tgz", - "integrity": "sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==", + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz", + "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==", "requires": { - "@remix-run/router": "1.16.0" + "@remix-run/router": "1.16.1" } }, "react-router-dom": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.0.tgz", - "integrity": "sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==", + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz", + "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==", "requires": { - "@remix-run/router": "1.16.0", - "react-router": "6.23.0" + "@remix-run/router": "1.16.1", + "react-router": "6.23.1" } }, "react-sortable-hoc": { From bdc99ba0eb66624dca8f2d5dedb41027245cf31b Mon Sep 17 00:00:00 2001 From: Ketan <73937490+devketanpro@users.noreply.github.com> Date: Fri, 24 May 2024 16:35:54 +0530 Subject: [PATCH 2/6] update real email alerts templates [CPCN-531] (#172) --- server/theme/email_item.fr_ca.html | 8 ++++---- server/theme/email_item.fr_ca.txt | 9 +++++---- server/theme/email_item.html | 11 +++++------ server/theme/email_item.txt | 9 +++++---- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/server/theme/email_item.fr_ca.html b/server/theme/email_item.fr_ca.html index 9442a65..05cd2ee 100644 --- a/server/theme/email_item.fr_ca.html +++ b/server/theme/email_item.fr_ca.html @@ -1,16 +1,16 @@

{{ get_highlighted_field(item, ["headline"]) | safe }}

- Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }}
+ {% if item.slugline %}Titre de rappel: {{ get_highlighted_field(item, ["slugline"]) | safe }}
{% endif %} + {% if item.source %}Source: {{ item.source }}
{% endif %} + Publié: {{ item.versioncreated | datetime_long }}
{% if topic_name %}Nouvel élément pour votre sujet suivi: {{ topic_name }}
{% endif %} {% if item.service %}Catégorie: {{ item.service[0].name }}
{% endif %} Nombre de mots: {{ item.wordcount }}

- {% if item.slugline %}Titre de rappel: {{ get_highlighted_field(item, ["slugline"]) | safe }}
{% endif %} - {% if item.source %}Source: {{ item.source }}
{% endif %} - Publié: {{ item.versioncreated | datetime_long }}
+ Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }}
{% if item.byline %}{{ item.byline }}{% endif %}

diff --git a/server/theme/email_item.fr_ca.txt b/server/theme/email_item.fr_ca.txt index 39d35af..1d14168 100644 --- a/server/theme/email_item.fr_ca.txt +++ b/server/theme/email_item.fr_ca.txt @@ -1,12 +1,13 @@ {{ item.headline }} -Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }} -{% if topic_name %}Nouvel élément pour votre sujet suivi: {{ topic_name }}{% endif %} -{% if item.service %}Catégorie: {{ item.service[0].name }}{% endif %} -Nombre de mots: {{ item.wordcount }} {% if item.slugline %}Titre de rappel: {{ item.slugline }}{% endif %} {% if item.source %}Source: {{ item.source }}{% endif %} Publié: {{ item.versioncreated | datetime_long }} +{% if topic_name %}Nouvel élément pour votre sujet suivi: {{ topic_name }}{% endif %} +{% if item.service %}Catégorie: {{ item.service[0].name }}{% endif %} +Nombre de mots: {{ item.wordcount }} + +Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }} {% if item.byline %}{{ item.byline }}{% endif %} diff --git a/server/theme/email_item.html b/server/theme/email_item.html index abe404d..cc49ad3 100644 --- a/server/theme/email_item.html +++ b/server/theme/email_item.html @@ -2,18 +2,17 @@

- View this item in your account: {{ url_for_wire(item, True, section) }} + {% if item.slugline %}Slugline: {{ get_highlighted_field(item, ["slugline"]) | safe }}
{% endif %} + {% if item.source %}Source: {{ item.source }}
{% endif %} + Published: {{ item.versioncreated | datetime_long }}
{% if topic_name %}New item for followed topic: {{ topic_name }}
{% endif %} {% if item.service %}Category: {{ item.service[0].name }}
{% endif %} Word count: {{ item.wordcount }}
-

-

- {% if item.slugline %}Slugline: {{ get_highlighted_field(item, ["slugline"]) | safe }}
{% endif %} - {% if item.source %}Source: {{ item.source }}
{% endif %} - Published: {{ item.versioncreated | datetime_long }}
+ View this item in your account: {{ url_for_wire(item, True, section) }} {% if item.byline %}{{ item.byline }}{% endif %} +

diff --git a/server/theme/email_item.txt b/server/theme/email_item.txt index 6eb99d5..3fa3cd9 100644 --- a/server/theme/email_item.txt +++ b/server/theme/email_item.txt @@ -1,12 +1,13 @@ {{ item.headline }} -View this item in your account: {{ url_for_wire(item, True, section) }} -{% if topic_name %}New item for followed topic: {{ topic_name }}{% endif %} -{% if item.service %}Category: {{ item.service[0].name }}{% endif %} -Word count: {{ item.wordcount }} {% if item.slugline %}Slugline: {{ item.slugline }}{% endif %} {% if item.source %}Source: {{ item.source }}{% endif %} Published: {{ item.versioncreated | datetime_long }} +{% if topic_name %}New item for followed topic: {{ topic_name }}{% endif %} +{% if item.service %}Category: {{ item.service[0].name }}{% endif %} +Word count: {{ item.wordcount }} + +View this item in your account: {{ url_for_wire(item, True, section) }} {% if item.byline %}{{ item.byline }}{% endif %} From 75814f9b1fcd10378b0657bcfc4f5da39983fdbf Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Tue, 28 May 2024 11:28:24 +0200 Subject: [PATCH 3/6] configure AGENDA_PAGE_SIZE CPCN-818 --- server/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/settings.py b/server/settings.py index 5ae16e6..ca22d31 100644 --- a/server/settings.py +++ b/server/settings.py @@ -376,3 +376,5 @@ PRODUCTFRUITS_WORKSPACE_CODE = os.environ.get("PRODUCTFRUITS_WORKSPACE_CODE") PERSONAL_DASHBOARD_CARD_TYPE = "6-text-only" + +AGENDA_PAGE_SIZE = 500 From 933d2e048bc497e468b504fbe54f541476524646 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 29 May 2024 11:02:24 +0200 Subject: [PATCH 4/6] update client --- client/package-lock.json | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index cddd696..7cdcb91 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -3,25 +3,25 @@ "lockfileVersion": 1, "dependencies": { "@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz", + "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==", "requires": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.6", "picocolors": "^1.0.0" } }, "@babel/helper-validator-identifier": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", - "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==" + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz", + "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==" }, "@babel/highlight": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz", - "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz", + "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==", "requires": { - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-validator-identifier": "^7.24.6", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -61,9 +61,9 @@ } }, "@babel/runtime": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", - "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.6.tgz", + "integrity": "sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==", "requires": { "regenerator-runtime": "^0.14.0" } @@ -1090,9 +1090,9 @@ }, "dependencies": { "ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", + "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", "requires": { "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", @@ -2477,9 +2477,9 @@ } }, "caniuse-db": { - "version": "1.0.30001621", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001621.tgz", - "integrity": "sha512-2iwAHB4j4OVlWcivkHnc1ycKl/FXZd0x+NdNhX7PpZciZp77nxDSloromhwBZJQgprZK9Yad+1Y+e2VUq2YILg==" + "version": "1.0.30001625", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001625.tgz", + "integrity": "sha512-dNKjLoVlFRgCx/5eXM+h7qOHtw9fsypF6p8TsA8byf9BfYfdFwsa5kE3kmoo4VUG6BkOi0oIvUERU9usF+xv2Q==" }, "center-align": { "version": "0.1.3", @@ -3456,9 +3456,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.782", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.782.tgz", - "integrity": "sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==" + "version": "1.4.783", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz", + "integrity": "sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==" }, "elliptic": { "version": "6.5.5", @@ -6444,7 +6444,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#ef05c2b84e231d972f7e94150a386f153aa6c63b", + "version": "github:superdesk/newsroom-core#0bd6bdd9ffe608a0f924b114f54ca91b7c4036dd", "from": "github:superdesk/newsroom-core#release/2.7", "requires": { "@dnd-kit/core": "^6.0.8", @@ -6502,7 +6502,7 @@ "style-loader": "^0.19.0", "terser-webpack-plugin-legacy": "^1.2.5", "ts-loader": "^3.5.0", - "typescript": "^4.9.5", + "typescript": "5.2.2", "url-search-params-polyfill": "2.0.3", "webpack": "3.11.0", "webpack-dev-server": "2.11.1", @@ -8107,9 +8107,9 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "primereact": { - "version": "10.6.5", - "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.6.5.tgz", - "integrity": "sha512-YbdvyIRIGSfZVhtIbltizUISBuXVXBn2S4/491xdDJLrxohjjf0uIogu+/sSKRBVVT17b6zFEwARTvc9yUA7tQ==", + "version": "10.6.6", + "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.6.6.tgz", + "integrity": "sha512-+C0Bt6vS/jh09DQVS4UXpVctbvqJDUC3t3mVdGmhmIINYD8kdfL3fvc3bUGniGxkKKzwkSYdAQXhZlcgj8LUgw==", "requires": { "@types/react-transition-group": "^4.4.1", "react-transition-group": "^4.4.1" @@ -9198,9 +9198,9 @@ }, "dependencies": { "ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz", + "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==", "requires": { "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", @@ -10759,9 +10759,9 @@ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==" }, "uglify-to-browserify": { "version": "1.0.2", From e522038751eb0e63c9763f10c7f3acba3580e7bc Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 30 May 2024 10:24:54 +0200 Subject: [PATCH 5/6] update translations template --- server/newsroom-app-cp.pot | 98 ++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 57 deletions(-) diff --git a/server/newsroom-app-cp.pot b/server/newsroom-app-cp.pot index 97edb1d..676acf1 100644 --- a/server/newsroom-app-cp.pot +++ b/server/newsroom-app-cp.pot @@ -1,133 +1,117 @@ # Translations template for Newsroom App CP. -# Copyright (C) 2023 ORGANIZATION +# Copyright (C) 2024 ORGANIZATION # This file is distributed under the same license as the Newsroom App CP # project. -# FIRST AUTHOR , 2023. +# FIRST AUTHOR , 2024. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Newsroom App CP 0.0.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-10-19 11:33+0200\n" +"POT-Creation-Date: 2024-05-30 10:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.12.1\n" +"Generated-By: Babel 2.15.0\n" -#: theme/cp_reset_password.html:14 theme/cp_reset_password_confirmation.html:14 -msgid "Reset Password" -msgstr "" - -#: theme/cp_reset_password.html:24 -msgid "Send Password Reset Email" -msgstr "" - -#: theme/cp_reset_password_confirmation.html:18 -msgid "An email was sent to your inbox. Please follow the instructions there." -msgstr "" - -#: theme/login.html:16 -msgid "Login" -msgstr "" - -#: theme/login.html:25 -msgid "Login using Single Sign On" -msgstr "" - -#: theme/login.html:31 +#: theme/login.html:5 theme/login.html:7 msgid "Sign up" msgstr "" -#: theme/login.html:33 +#: theme/login.html:10 msgid "Forgot your password?" msgstr "" -#: theme/login.html:34 +#: theme/login.html:11 msgid "Please reset my password for NewsPro" msgstr "" -#: theme/login.html:34 +#: theme/login.html:11 msgid "Contact Us" msgstr "" -#: theme/login.html:36 +#: theme/login.html:13 msgid "Reset password" msgstr "" -#: settings.py:137 settings.py:173 theme/login.html:43 -msgid "Language" -msgstr "" - #: theme/page-contact.html:3 theme/page-copyright.html:3 #: theme/page-privacy.html:3 theme/page-terms.html:3 msgid "Copyright" msgstr "" -#: cp/auth.py:40 -msgid "User token is not valid" +#: cp/common_settings.py:8 +msgid "Firebase" +msgstr "" + +#: cp/common_settings.py:12 +msgid "Azure" msgstr "" -#: cp/auth.py:80 -msgid "User not found" +#: cp/password_reset_form.py:8 +msgid "Email" msgstr "" -#: cp/auth.py:82 -msgid "User not enabled" +#: settings.py:143 settings.py:144 +msgid "No coverage" msgstr "" -#: cp/auth.py:89 -msgid "Password reset for your account is not supported through Newshub" +#: settings.py:149 settings.py:150 +msgid "Cancelled / not planned" msgstr "" -#: cp/auth.py:97 -msgid "An error occurred while sending reset password email" +#: settings.py:155 settings.py:156 +msgid "Not decided / on merit" msgstr "" -#: cp/common_settings.py:8 -msgid "Google" +#: settings.py:161 settings.py:162 +msgid "Planned" msgstr "" -#: cp/common_settings.py:12 -msgid "Azure" +#: settings.py:167 settings.py:168 +msgid "Completed" msgstr "" -#: cp/password_reset_form.py:8 -msgid "Email" +#: settings.py:180 settings.py:225 +msgid "Language" +msgstr "" + +#: settings.py:184 +msgid "Media type" msgstr "" -#: settings.py:141 +#: settings.py:193 msgid "Source" msgstr "" -#: settings.py:145 +#: settings.py:197 msgid "Wire Category" msgstr "" -#: settings.py:149 settings.py:191 +#: settings.py:201 settings.py:243 msgid "Subject" msgstr "" -#: settings.py:158 +#: settings.py:210 msgid "Version" msgstr "" -#: settings.py:177 +#: settings.py:229 msgid "Category" msgstr "" -#: settings.py:181 +#: settings.py:233 msgid "Event Type" msgstr "" -#: settings.py:280 +#: settings.py:337 msgid "Calendar" msgstr "" -#: settings.py:281 +#: settings.py:338 msgid "Bookmarks" msgstr "" From f6ee4b162622dc1b7042130c69ebf6a44ea1e934 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 30 May 2024 10:36:01 +0200 Subject: [PATCH 6/6] use core v2.7-rc1 --- client/package-lock.json | 16 ++++++++-------- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 7cdcb91..4d486cb 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -900,9 +900,9 @@ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==" }, "@types/node": { - "version": "20.12.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", - "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "version": "20.12.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.13.tgz", + "integrity": "sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==", "requires": { "undici-types": "~5.26.4" } @@ -3456,9 +3456,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.783", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz", - "integrity": "sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==" + "version": "1.4.786", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.786.tgz", + "integrity": "sha512-i/A2UB0sxYViMN0M2zIotQFRIOt1jLuVXudACHBDiJ5gGuAUzf/crZxwlBTdA0O52Hy4CNtTzS7AKRAacs/08Q==" }, "elliptic": { "version": "6.5.5", @@ -6444,8 +6444,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#0bd6bdd9ffe608a0f924b114f54ca91b7c4036dd", - "from": "github:superdesk/newsroom-core#release/2.7", + "version": "github:superdesk/newsroom-core#d42e83fd8ce8134bf6d7dc84bc397c04cef7f897", + "from": "github:superdesk/newsroom-core#v2.7-rc1", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", diff --git a/client/package.json b/client/package.json index cedb9ad..bfe3f1c 100644 --- a/client/package.json +++ b/client/package.json @@ -4,7 +4,7 @@ "build": "export NODE_ENV=production && webpack --progress --profile --colors" }, "dependencies": { - "newsroom-core": "github:superdesk/newsroom-core#release/2.7" + "newsroom-core": "github:superdesk/newsroom-core#v2.7-rc1" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index d309af7..4088735 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.7#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@v2.7-rc1#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 95bfc16..9b89404 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -35,9 +35,9 @@ blinker==1.7.0 # raven # sentry-sdk # superdesk-core -boto3==1.34.100 +boto3==1.34.115 # via superdesk-core -botocore==1.34.100 +botocore==1.34.115 # via # boto3 # s3transfer @@ -107,7 +107,7 @@ draftjs-exporter[lxml]==2.1.7 # via superdesk-core ecs-logging==2.1.0 # via elastic-apm -elastic-apm[flask]==6.22.0 +elastic-apm[flask]==6.22.2 # via superdesk-core elasticsearch==7.13.4 # via @@ -210,7 +210,7 @@ kombu==5.2.4 # superdesk-core ldap3==2.5.2 # via superdesk-core -limits==3.11.0 +limits==3.12.0 # via flask-limiter lxml==4.6.5 # via @@ -229,7 +229,7 @@ mongolock==1.3.4 # via superdesk-core natsort==8.4.0 # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.7 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.7-rc1 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -248,7 +248,7 @@ pillow==9.2.0 # reportlab # superdesk-core # xhtml2pdf -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.45 # via click-repl pyasn1==0.6.0 # via @@ -334,7 +334,7 @@ reportlab==3.6.13 # superdesk-core # svglib # xhtml2pdf -requests==2.31.0 +requests==2.32.3 # via # pyhanko # pyhanko-certvalidator @@ -375,7 +375,7 @@ tinycss2==1.3.0 # via # cssselect2 # svglib -typing-extensions==4.11.0 +typing-extensions==4.12.0 # via # jwcrypto # limits @@ -388,7 +388,7 @@ tzlocal==2.1 # superdesk-core unidecode==0.4.21 # via superdesk-core -uritools==4.0.2 +uritools==4.0.3 # via pyhanko-certvalidator urllib3==1.25.11 # via @@ -416,7 +416,7 @@ werkzeug==1.0.1 # via # flask # superdesk-core -wrapt==1.14.1 +wrapt==1.16.0 # via # deprecated # elastic-apm