Merge branch 'master' into deploy-new-contribs

SocialGouv · Oct 12, 2023 · b4635f5 · b4635f5
2 parents d89df56 + 46e64a8
commit b4635f5
Show file tree

Hide file tree

Showing 87 changed files with 1,660 additions and 1,516 deletions.
diff --git a/.kontinuous/env/dev/templates/www.configmap.yaml b/.kontinuous/env/dev/templates/www.configmap.yaml
@@ -6,7 +6,6 @@ data:
   HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
   MATOMO_URL: "https://matomo.fabrique.social.gouv.fr/"
   NODE_ENV: "production"
-  SENTRY_DSN: "https://[email protected]/42"
   SMTP_URL: "smtp.tipimail.com"
   STORAGE_CONTAINER: "cdtn-dev-source"
   URL_EXPORT: "http://export"
diff --git a/.kontinuous/env/preprod/templates/www.configmap.yaml b/.kontinuous/env/preprod/templates/www.configmap.yaml
@@ -6,7 +6,6 @@ data:
   HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
   MATOMO_URL: "https://matomo.fabrique.social.gouv.fr/"
   NODE_ENV: "production"
-  SENTRY_DSN: "https://[email protected]/42"
   SMTP_URL: "smtp.tipimail.com"
   STORAGE_CONTAINER: "cdtn-preprod-source"
   URL_EXPORT: "http://export"
diff --git a/.kontinuous/env/prod/templates/www.configmap.yaml b/.kontinuous/env/prod/templates/www.configmap.yaml
@@ -8,7 +8,6 @@ data:
   MATOMO_URL: "https://matomo.fabrique.social.gouv.fr/"
   NODE_ENV: "production"
   PRODUCTION: "true"
-  SENTRY_DSN: "https://[email protected]/42"
   SMTP_URL: "smtp.tipimail.com"
   STORAGE_CONTAINER: "cdtn"
   URL_EXPORT: "http://export"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+### Bug Fixes
+
+- bug contribution validation sur page non editable ([#1075](https://github.com/SocialGouv/cdtn-admin/issues/1075)) ([b63771a](https://github.com/SocialGouv/cdtn-admin/commit/b63771aab8f474aebee9eee4e5a8ef9e747ba01f))
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+### Bug Fixes
+
+- **contributions:** restauration de la question 3 et suppression de la 5 ([#1068](https://github.com/SocialGouv/cdtn-admin/issues/1068)) ([f3bdf50](https://github.com/SocialGouv/cdtn-admin/commit/f3bdf50aa0d2a1ac305fdda20a5512add4dcddf3))
+- **nextjs:** downgrade nextjs version ([#1071](https://github.com/SocialGouv/cdtn-admin/issues/1071)) ([bca21f8](https://github.com/SocialGouv/cdtn-admin/commit/bca21f80d9328e6f008dafa50ec71fd95b3c3b9f))
+
+### Features
+
+- **upload:** refacto files in typescript ([#1050](https://github.com/SocialGouv/cdtn-admin/issues/1050)) ([a70fc4f](https://github.com/SocialGouv/cdtn-admin/commit/a70fc4fdbf254876d80b0fc477062ce0983f58af))
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- contribution ref link ([#1047](https://github.com/SocialGouv/cdtn-admin/issues/1047)) ([1b44bfa](https://github.com/SocialGouv/cdtn-admin/commit/1b44bfa86f19da97d64e61db993c4013de268648))
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+- **wording:** rename answer type on contribution page ([#1052](https://github.com/SocialGouv/cdtn-admin/issues/1052)) ([2a0ace5](https://github.com/SocialGouv/cdtn-admin/commit/2a0ace55918f3bda72a34ae9ce8b81b92fdd5a16))
+
+### Features
+
+- 1032 admin amélioration bouton maj des données notamment le vraiment ([#1033](https://github.com/SocialGouv/cdtn-admin/issues/1033)) ([ee41911](https://github.com/SocialGouv/cdtn-admin/commit/ee419116d67ba45b11f32346ee323ae001c3a444))
+- contribution zod ([#1056](https://github.com/SocialGouv/cdtn-admin/issues/1056)) ([6f8021f](https://github.com/SocialGouv/cdtn-admin/commit/6f8021fe83ce6969fa78e66e0e766595eaaf4159)), closes [#1040](https://github.com/SocialGouv/cdtn-admin/issues/1040)
+
+### Reverts
+
+- Revert "feat:1007 admin liste des contenus modifiés lors dune maj des données - page info (#1013)" ([ec3584f](https://github.com/SocialGouv/cdtn-admin/commit/ec3584f59094dc238d4ece3eeadd9c02993608af)), closes [#1013](https://github.com/SocialGouv/cdtn-admin/issues/1013)
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+### Bug Fixes
+
+- **dev:** correction du probleme de socket en phase de dev en HMR + suppression de sentry ([#1045](https://github.com/SocialGouv/cdtn-admin/issues/1045)) ([d371ec1](https://github.com/SocialGouv/cdtn-admin/commit/d371ec1e7e15b3bd4a017f021099ca0edc9c7911))
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+### Bug Fixes
+
+- **env:** set default credentials when `.env` is not set ([#1041](https://github.com/SocialGouv/cdtn-admin/issues/1041)) ([f545433](https://github.com/SocialGouv/cdtn-admin/commit/f54543347a4ed7ece6738b14ac42cbd9d6f828cc))
+- **env:** use config file instead of env for public variable ([#1039](https://github.com/SocialGouv/cdtn-admin/issues/1039)) ([68eaefa](https://github.com/SocialGouv/cdtn-admin/commit/68eaefa0690e43699eca633d46ff1eda2ebb6058))
+- **export:** add missing cdtn-elasticsearch to Dockerfile ([#1038](https://github.com/SocialGouv/cdtn-admin/issues/1038)) ([390e646](https://github.com/SocialGouv/cdtn-admin/commit/390e64660fcb8a7143970a20928e98d6da05c22f))
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -7,6 +7,6 @@
     }
   },
   "npmClient": "yarn",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "useWorkspaces": true
 }
diff --git a/shared/dila-resolver/CHANGELOG.md b/shared/dila-resolver/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @shared/dila-resolver
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/dila-resolver
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @shared/dila-resolver
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @shared/dila-resolver
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @shared/dila-resolver

diff --git a/shared/dila-resolver/package.json b/shared/dila-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shared/dila-resolver",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "main": "lib/index.js",
   "files": [
     "lib"
@@ -25,7 +25,6 @@
     "@types/jest": "^27.0.0",
     "jest": "^27.0.6",
     "lint-staged": "^12.0.0",
-    "prettier": "^2.3.2",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.3"
   },

diff --git a/shared/elasticsearch-document-adapter/CHANGELOG.md b/shared/elasticsearch-document-adapter/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @shared/elasticsearch-document-adapter
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/elasticsearch-document-adapter
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @shared/elasticsearch-document-adapter
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @shared/elasticsearch-document-adapter
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @shared/elasticsearch-document-adapter

diff --git a/shared/elasticsearch-document-adapter/package.json b/shared/elasticsearch-document-adapter/package.json
@@ -2,15 +2,14 @@
   "name": "@shared/elasticsearch-document-adapter",
   "private": true,
   "description": "SocialGouv - Code du travail numerique - Modules - ingester",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "dependencies": {
     "@elastic/elasticsearch": "^7.14.1",
+    "@shared/types": "workspace:^",
     "@socialgouv/cdtn-elasticsearch": "workspace:^",
     "@socialgouv/cdtn-logger": "workspace:^",
-    "@socialgouv/cdtn-monolog": "^1.5.11",
     "@socialgouv/cdtn-slugify": "^4.52.1",
     "@socialgouv/cdtn-sources": "^4.52.1",
-    "@socialgouv/contributions-data-types": "^3.27.0",
     "nctx": "^1.2.0",
     "node-fetch": "^2.6.5",
     "p-map": "5.2.0",
@@ -20,7 +19,6 @@
     "remark-parse": "^9.0.0",
     "remark-rehype": "^8.1.0",
     "remark-stringify": "^9.0.1",
-    "strip-markdown": "^4.2.0",
     "unified": "^9.2.2"
   },
   "devDependencies": {
@@ -29,13 +27,11 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-typescript": "^7.16.7",
     "@shared/eslint-config": "workspace:^",
-    "@socialgouv/kali-data-types": "^2.127.0",
     "@types/jest": "^29.2.3",
     "@types/node-fetch": "^2.5.12",
     "@vercel/ncc": "0.34.0",
     "jest": "^27.1.1",
     "lint-staged": "^12.0.0",
-    "prettier": "^2.3.2",
     "ts-jest": "^29.0.3",
     "typescript": "^4.5.5"
   },

diff --git a/shared/elasticsearch/CHANGELOG.md b/shared/elasticsearch/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @socialgouv/cdtn-elasticsearch
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @socialgouv/cdtn-elasticsearch
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @socialgouv/cdtn-elasticsearch
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @socialgouv/cdtn-elasticsearch
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @socialgouv/cdtn-elasticsearch

diff --git a/shared/elasticsearch/package.json b/shared/elasticsearch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/cdtn-elasticsearch",
   "description": "SocialGouv - Code du travail numerique - Infrastructure - Elasticsearch",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "babel": {
     "plugins": [
       "@babel/plugin-transform-modules-commonjs"
@@ -29,8 +29,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.15.4",
     "@shared/eslint-config": "workspace:^",
     "jest": "^27.1.1",
-    "lint-staged": "^12.0.0",
-    "prettier": "^2.3.2"
+    "lint-staged": "^12.0.0"
   },
   "scripts": {
     "lint": "npx eslint \"./src/**/*.{js,ts}\"",

diff --git a/shared/eslint-config/CHANGELOG.md b/shared/eslint-config/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @shared/eslint-config
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/eslint-config
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/eslint-config
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @shared/eslint-config
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @shared/eslint-config
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @shared/eslint-config

diff --git a/shared/eslint-config/package.json b/shared/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shared/eslint-config",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "main": "index.js",
   "private": true,
   "dependencies": {

diff --git a/shared/graphql-client/CHANGELOG.md b/shared/graphql-client/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @shared/graphql-client
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/graphql-client
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Reverts
+
+- Revert "feat:1007 admin liste des contenus modifiés lors dune maj des données - page info (#1013)" ([ec3584f](https://github.com/SocialGouv/cdtn-admin/commit/ec3584f59094dc238d4ece3eeadd9c02993608af)), closes [#1013](https://github.com/SocialGouv/cdtn-admin/issues/1013)
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @shared/graphql-client
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @shared/graphql-client
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @shared/graphql-client

diff --git a/shared/graphql-client/package.json b/shared/graphql-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shared/graphql-client",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "main": "build/index.js",
   "module": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/shared/id-generator/CHANGELOG.md b/shared/id-generator/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @shared/id-generator
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @shared/id-generator
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @shared/id-generator
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @shared/id-generator
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @shared/id-generator

diff --git a/shared/id-generator/package.json b/shared/id-generator/package.json
@@ -1,16 +1,12 @@
 {
   "name": "@shared/id-generator",
-  "version": "2.17.7",
+  "version": "2.19.1",
   "dependencies": {
     "uuid": "^8.3.2",
     "xxhashjs": "^0.2.2"
   },
   "main": "src/index.js",
   "module": "src/index.js",
   "types": "src/index.d.ts",
-  "private": true,
-  "devDependencies": {
-    "@types/uuid": "^8.3.1",
-    "@types/xxhashjs": "^0.2.2"
-  }
+  "private": true
 }
diff --git a/shared/logger/CHANGELOG.md b/shared/logger/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10)
+
+**Note:** Version bump only for package @socialgouv/cdtn-logger
+
+# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09)
+
+**Note:** Version bump only for package @socialgouv/cdtn-logger
+
+# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09)
+
+### Bug Fixes
+
+- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4))
+
+## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29)
+
+**Note:** Version bump only for package @socialgouv/cdtn-logger
+
+## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28)
+
+**Note:** Version bump only for package @socialgouv/cdtn-logger
+
 ## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27)
 
 **Note:** Version bump only for package @socialgouv/cdtn-logger