Skip to content

Commit c724fbf

Browse files
maxgfrmaxgfr
authored
feat(glossary): from export to publish (#1424)
* fix: glossary * fix: glossary * fix: glossary * fix: glossary * fix: glossary * fix: glossary * fix: glossary * fix: deployment * fix: ui * fix: variable * fix: variable * fix: variable * fix: variable * fix: replace uuid * fix: formattage * fix: alert-cli * empty * fix: glossary * fix: glossary * fix: glossary * fix: glossary * fix: glossary * empty * fix: glossary * fix: glossary * fix: glossary * fix: log * fix: log * fix: donnnnnne * fix: done * fix: done * empty * fix: done * fix: performance * fix: performance * fix: returning * fix: performance * fix: fetch * fix: build encore * fix: build encore
1 parent 5534aa3 commit c724fbf

File tree

84 files changed

+1187
-715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1187
-715
lines changed

‎.env

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
1-
##
2-
## Hasura
3-
##
4-
PUBLICATION_WEBHOOK_URL=http://host.docker.internal:3001/api/webhooks/publication
51
API_URL=http://host.docker.internal:3001/api
62
HASURA_GRAPHQL_DATABASE_URL=postgres://postgres:postgrespassword@postgres:5432/postgres
73
HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, query-log
84
HASURA_GRAPHQL_NO_OF_RETRIES=5
95
HASURA_GRAPHQL_MIGRATIONS_SERVER_TIMEOUT=10
106
HASURA_GRAPHQL_UNAUTHORIZED_ROLE=public
7+
HASURA_GRAPHQL_ADMIN_SECRET=admin1
8+
HASURA_GRAPHQL_JWT_SECRET={"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}
119

1210
SMTP_URL=smtp.url
1311
SMTP_EMAIL_USER=email
1412
SMTP_EMAIL_PASSWORD=pass
15-
16-
##
17-
## Shared secret between hasura and frontend
18-
##
19-
20-
# Hasura
21-
HASURA_GRAPHQL_ADMIN_SECRET=admin1
22-
HASURA_GRAPHQL_JWT_SECRET={"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}
23-
24-
# webhook & action
25-
ACTIONS_SECRET=a random string that will be verify when calling the webhook
26-
PUBLICATION_SECRET=a random string that will be verify when calling the webhook

‎.kontinuous/env/dev/templates/export.configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ data:
77
NLP_URL: "https://serving-ml-preprod.ovh.fabrique.social.gouv.fr"
88
NODE_ENV: "production"
99
LOG_LEVEL: "info"
10-
GLOSSARY_PREPROD_DISABLE: "true"
1110
NLP_PREPROD_DISABLE: "true"
1211
BUCKET_DEFAULT_FOLDER: "default"
1312
BUCKET_DRAFT_FOLDER: "draft"

‎.kontinuous/env/dev/templates/hasura.configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: hasura
55
data:
66
API_URL: "http://www/api"
7-
PUBLICATION_WEBHOOK_URL: "http://www/api/webhooks/publication"
87
HASURA_GRAPHQL_ENABLE_CONSOLE: "false"
98
HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log"
109
HASURA_GRAPHQL_NO_OF_RETRIES: "5"

‎.kontinuous/env/dev/templates/hasura.sealed-secret.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ spec:
1010
encryptedData:
1111
HASURA_GRAPHQL_ADMIN_SECRET: AgC4DoTx/Burraa4LQnxWJ8pa4gK7mSHWd4fFFUHWeVrTmcoxLRyVVqH8ajgXFBZ1uksTujs8LM0eDtxeO/d6e88y7lF8epCutVm/9Lr39E8eMA4zwMU6QNrCX4j34YRonf4vbOnlUfm88XKek7DTOsUsbTp5BbO/IrESzabBJ9ntLBAdCVK+j6eGZyCC44VcfszHoiQINwi0Iax66KuA4oUvpQuTdTbB20wr9vzZarMatDDQRYtjugtYFzQQAv45+BZscb1Q+cMz+MXGOeJTDpFrhhV0OeDp5llEDhmx3nhyeRGyeWZdvONrDl4lDvftO6b8CTV1jBaoCX1r8pKcdp69WbkX2V+62lqamr5bmgJiuBWeOTHT1qQrv9uuInhrBBrkcHrXXMKlTY+p9auY/IQLw9CyBn41sK+RDteQfoZFRHSo2UOipbfgB5j9mCVnyJLDYLfyH4TEdGM6lkCATnKHr7Jz16IeR+GwmLfHrHkv3TW6zPijBBZRVcC5Z6LQNVv/6BzrKlzOkgZCKsX5pgaQWQBDSJSe8QGkx3Ccik6XpC/jgdHPEuP8zqDhE4VzWM6FrsxLAvso5WWNgdmS3i01RFa+pnFK7wLp7oLtDjKo7GyG2mXGt2B2+uvUffAmrE4jTCIbjUQtgrHHDBpq0hhxrG0njbh3SL29fNz1FeaXOFdubRfs0Zg2aNXtwDFHDrM8jCt/Yj4mY21uKup82mQZG6FCENCx+Hl7GGtuhs=
1212
HASURA_GRAPHQL_JWT_SECRET: AgDSW4ceV9HFoxBNqg/hGa6uunl76cjtKBRSYf5LEPKzNHtXixd73LoFGa2y6/cQ/yGevNU6k7w62pkbWnz5rNAznsBE8QtBt1eRKQqjyJJ21m4sWI/MK6UI3gUS/Ad+LeCMxSoKG3XEzFSAwSndSXsgmwAP4KPpBF83DvdpVVpZtAjvPbNYNE6Ocjhtmt/TLqWjsV4Z+hkS8CKGk+PsYDEuR74Mj5TJys0MALJA9TB2dTIqMHOVZofD8T9hKH42yJWCDruH+gNNPKcleG/R0Pt7LJSamZtsqtXdxeE02tB+I9/VaEMrBL2WCJKhGHTjlDxexl4V/fswFYgXc/T4+hmPVB76xWVi6yFfggD/tLcAvgw3Ivdmbk/1c4CayKjU0+B+57EVrRqCGbJieBfbv6L3EWjU0uQj/uJEaZxIF4st3/r+iSGnrtPveBqnUgkJeqOmhf4sWJwE3xsPJM2kNYDPelWpYdxpoPaq3PNcLs7WpxMtRvwvvz2LMsWhEuUyHpe5yLOvi5swhcGqX1ALxGxfxzV+O229WfuTmV/kGUmcHhdf/VXdJRa+PYS83YK39wC1ZsoXJvPjAvEMgoTaRE8NHPWVD2ookNwdiRQIoLrSrGMP6F+Team2KtCic9ONYnM2wwUj2JCQRkFX2LZXwm9g9uR/Leuyd/IL5+tczwfF+PHfs6TQv+uKVz2qoZQZk4myQ/0JwHluOSXHTwEWkvuwGYO8QMTDOTTdp4Dor3kN7hQZyvWf41V/EHmOoLeFsdpQkWexo1FWHRZYtgG7ZVrgs07bY65gY6c1tZOKFaWhacTuneiLosz79vxn5omsFpjOOiWdSQOPZU8GkGxqJVq16H3VJg==
13-
PUBLICATION_SECRET: AgAtDPOTr9khd47wV5WPXJaLSj+6Kmh5N/Wt9SJUTmRgn9jp8trclhS5DvZxmfVv/rYRRiDTuPATDR4yMbfvtrO9ABAhmRZFvmU5VbxdtCDrc9qtv5ZJ4dsYIVxyXIad7+CumHkunXYSwgmCqr2bvv5oeWRmTx2x4uwaNzhEKQ4hUzYCyWp9laJHt5mYT/c/IWZu0PaDXJQVWQuep3fJvjtxQw9EZVy+ehGAqyClL7bkqT1KVrVBDfvpPeO97O2e2de49RcdZSCtBTmGDHKg7fwUziBJSSI8ObtUMzWm56223XZXKqrxdChAlWJE05tHsvowa18NadFDjJwVt3RtPp+HguVj+I7PiTJMTjyZpsmHlr767teLYrXAoAVc9MRrGeznvYw4i0DhNFZXfyYghSKnKPW4yfYzNKwX50huCyQethn1TqU6MAYGrWiyx9XsaHy3bNgAO4ru9o8WV7bfyeRRsABMoiubyq9RCxfOXRU3cbWYaiS8aiPxALZRKjhSeQhJ5ufdL700rJWV2nuoxXG8jjR3yw3bpCL6imIrLRIAP1+Wki5I8Qo98dfBBF/nahEWeXdCqCjpImfSLUioKMes2IrH8ragfja+85x06S8717b67qyBqtGeGAfX2JYLDWILoA0k9RdzyIwuakAZkChGoWTUy8aRjC7GJIKCQ5IKZ5FQr0IuVVjj1xoGBh6O/sFsOLF7/sA3hRcvirzcCFvCIwsmHs/q4K1iU7nDR0WE1AUV/uccbP3yzAzv6gqElztn1f/LOpA01b2Wn9YAzi6S65wUXUWx7UAx6YaiiofmnySnseSNfE+8
14-
ACTIONS_SECRET: AgCrnvsRqo0y0d2B5jJOSfdsu7zPJ+DmjbS7GVXRYEHOMIi2tLwuuNvZdRk7iBc/DtbCrIA4Wg55gKTUD1XYtzIYcdysovYTDEBl1IcR1/9mSzbYB7XXWrBfsyP36UbNIEah/caigryy0THA4Rulde6yZ71lSIX3nmpXObEdoO3AHfGQtQE948CCwQdA/9SI90bvvCp9aYJ+oGbB4xqipguchUQIFH8UpRxsWywFQo7I6ao/lB6KfxIxdLxfEFOwisFEHWdranEE/ai2QJrzE0Eeo5y0jcp8FMJ2WvWmIVNrg+4mfDK4dzmSozbP06X03FDWLtRmkU3F5M42/aqBRSCw1kU2yuTNjP3DzyIdwOEYRIShzU5A2RaGWzLclkeqjQQFXSXs0Ju3mcaD6C8WWde+A7tFm9pSrx8yp8PkG+7E5DfNsC8jMQnIFDLIqgcFMPF6vnOyb6HS1fW/Aa0O7xD2Oq6Gpx6wyw0GzZ6ZB8IkUp1PMc+bNNR0bY6Rh0PjdjPXuyPFVuZ1zHc9Kpd9pYhNr06ldiOe6ZrtI/GEAUJe2DEtkZYDjVu6A5IdEFIn1mTW/+H5EduxQv6NuVzYudNg2n6/wC2S8637EkyPrgklHS+lCxMr7N9uHPRHJm+tAB5bwds/jZjivHrePv52rVtZxSaPc1AchoORsGqbJks2L3u0Bu7o2sdDtNAj2vyxp39FHpgeMqNbBF21nyohjhXvR7gPWvzBGl1+0au6CJfqEkOzgovbI4hPmUWzXbf0jW6pMcAERiQ04h07ZjqyHYRAXw4J9Gm1GDooxNDdVi7yOu1dI4iKoLwD
1513
template:
1614
metadata:
1715
annotations: *a1

‎.kontinuous/env/dev/templates/ingester.configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ metadata:
55
data:
66
NODE_ENV: "production"
77
HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
8+
URL_EXPORT: "http://export"

‎.kontinuous/env/preprod/templates/hasura.configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: hasura
55
data:
66
API_URL: "http://www/api"
7-
PUBLICATION_WEBHOOK_URL: "http://www/api/webhooks/publication"
87
HASURA_GRAPHQL_ENABLE_CONSOLE: "false"
98
HASURA_GRAPHQL_ENABLED_LOG_TYPES: "startup, http-log, webhook-log, websocket-log, query-log"
109
HASURA_GRAPHQL_NO_OF_RETRIES: "5"

‎.kontinuous/env/preprod/templates/hasura.sealed-secret.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ spec:
1010
encryptedData:
1111
HASURA_GRAPHQL_ADMIN_SECRET: AgC4DoTx/Burraa4LQnxWJ8pa4gK7mSHWd4fFFUHWeVrTmcoxLRyVVqH8ajgXFBZ1uksTujs8LM0eDtxeO/d6e88y7lF8epCutVm/9Lr39E8eMA4zwMU6QNrCX4j34YRonf4vbOnlUfm88XKek7DTOsUsbTp5BbO/IrESzabBJ9ntLBAdCVK+j6eGZyCC44VcfszHoiQINwi0Iax66KuA4oUvpQuTdTbB20wr9vzZarMatDDQRYtjugtYFzQQAv45+BZscb1Q+cMz+MXGOeJTDpFrhhV0OeDp5llEDhmx3nhyeRGyeWZdvONrDl4lDvftO6b8CTV1jBaoCX1r8pKcdp69WbkX2V+62lqamr5bmgJiuBWeOTHT1qQrv9uuInhrBBrkcHrXXMKlTY+p9auY/IQLw9CyBn41sK+RDteQfoZFRHSo2UOipbfgB5j9mCVnyJLDYLfyH4TEdGM6lkCATnKHr7Jz16IeR+GwmLfHrHkv3TW6zPijBBZRVcC5Z6LQNVv/6BzrKlzOkgZCKsX5pgaQWQBDSJSe8QGkx3Ccik6XpC/jgdHPEuP8zqDhE4VzWM6FrsxLAvso5WWNgdmS3i01RFa+pnFK7wLp7oLtDjKo7GyG2mXGt2B2+uvUffAmrE4jTCIbjUQtgrHHDBpq0hhxrG0njbh3SL29fNz1FeaXOFdubRfs0Zg2aNXtwDFHDrM8jCt/Yj4mY21uKup82mQZG6FCENCx+Hl7GGtuhs=
1212
HASURA_GRAPHQL_JWT_SECRET: AgDSW4ceV9HFoxBNqg/hGa6uunl76cjtKBRSYf5LEPKzNHtXixd73LoFGa2y6/cQ/yGevNU6k7w62pkbWnz5rNAznsBE8QtBt1eRKQqjyJJ21m4sWI/MK6UI3gUS/Ad+LeCMxSoKG3XEzFSAwSndSXsgmwAP4KPpBF83DvdpVVpZtAjvPbNYNE6Ocjhtmt/TLqWjsV4Z+hkS8CKGk+PsYDEuR74Mj5TJys0MALJA9TB2dTIqMHOVZofD8T9hKH42yJWCDruH+gNNPKcleG/R0Pt7LJSamZtsqtXdxeE02tB+I9/VaEMrBL2WCJKhGHTjlDxexl4V/fswFYgXc/T4+hmPVB76xWVi6yFfggD/tLcAvgw3Ivdmbk/1c4CayKjU0+B+57EVrRqCGbJieBfbv6L3EWjU0uQj/uJEaZxIF4st3/r+iSGnrtPveBqnUgkJeqOmhf4sWJwE3xsPJM2kNYDPelWpYdxpoPaq3PNcLs7WpxMtRvwvvz2LMsWhEuUyHpe5yLOvi5swhcGqX1ALxGxfxzV+O229WfuTmV/kGUmcHhdf/VXdJRa+PYS83YK39wC1ZsoXJvPjAvEMgoTaRE8NHPWVD2ookNwdiRQIoLrSrGMP6F+Team2KtCic9ONYnM2wwUj2JCQRkFX2LZXwm9g9uR/Leuyd/IL5+tczwfF+PHfs6TQv+uKVz2qoZQZk4myQ/0JwHluOSXHTwEWkvuwGYO8QMTDOTTdp4Dor3kN7hQZyvWf41V/EHmOoLeFsdpQkWexo1FWHRZYtgG7ZVrgs07bY65gY6c1tZOKFaWhacTuneiLosz79vxn5omsFpjOOiWdSQOPZU8GkGxqJVq16H3VJg==
13-
PUBLICATION_SECRET: AgAtDPOTr9khd47wV5WPXJaLSj+6Kmh5N/Wt9SJUTmRgn9jp8trclhS5DvZxmfVv/rYRRiDTuPATDR4yMbfvtrO9ABAhmRZFvmU5VbxdtCDrc9qtv5ZJ4dsYIVxyXIad7+CumHkunXYSwgmCqr2bvv5oeWRmTx2x4uwaNzhEKQ4hUzYCyWp9laJHt5mYT/c/IWZu0PaDXJQVWQuep3fJvjtxQw9EZVy+ehGAqyClL7bkqT1KVrVBDfvpPeO97O2e2de49RcdZSCtBTmGDHKg7fwUziBJSSI8ObtUMzWm56223XZXKqrxdChAlWJE05tHsvowa18NadFDjJwVt3RtPp+HguVj+I7PiTJMTjyZpsmHlr767teLYrXAoAVc9MRrGeznvYw4i0DhNFZXfyYghSKnKPW4yfYzNKwX50huCyQethn1TqU6MAYGrWiyx9XsaHy3bNgAO4ru9o8WV7bfyeRRsABMoiubyq9RCxfOXRU3cbWYaiS8aiPxALZRKjhSeQhJ5ufdL700rJWV2nuoxXG8jjR3yw3bpCL6imIrLRIAP1+Wki5I8Qo98dfBBF/nahEWeXdCqCjpImfSLUioKMes2IrH8ragfja+85x06S8717b67qyBqtGeGAfX2JYLDWILoA0k9RdzyIwuakAZkChGoWTUy8aRjC7GJIKCQ5IKZ5FQr0IuVVjj1xoGBh6O/sFsOLF7/sA3hRcvirzcCFvCIwsmHs/q4K1iU7nDR0WE1AUV/uccbP3yzAzv6gqElztn1f/LOpA01b2Wn9YAzi6S65wUXUWx7UAx6YaiiofmnySnseSNfE+8
14-
ACTIONS_SECRET: AgCrnvsRqo0y0d2B5jJOSfdsu7zPJ+DmjbS7GVXRYEHOMIi2tLwuuNvZdRk7iBc/DtbCrIA4Wg55gKTUD1XYtzIYcdysovYTDEBl1IcR1/9mSzbYB7XXWrBfsyP36UbNIEah/caigryy0THA4Rulde6yZ71lSIX3nmpXObEdoO3AHfGQtQE948CCwQdA/9SI90bvvCp9aYJ+oGbB4xqipguchUQIFH8UpRxsWywFQo7I6ao/lB6KfxIxdLxfEFOwisFEHWdranEE/ai2QJrzE0Eeo5y0jcp8FMJ2WvWmIVNrg+4mfDK4dzmSozbP06X03FDWLtRmkU3F5M42/aqBRSCw1kU2yuTNjP3DzyIdwOEYRIShzU5A2RaGWzLclkeqjQQFXSXs0Ju3mcaD6C8WWde+A7tFm9pSrx8yp8PkG+7E5DfNsC8jMQnIFDLIqgcFMPF6vnOyb6HS1fW/Aa0O7xD2Oq6Gpx6wyw0GzZ6ZB8IkUp1PMc+bNNR0bY6Rh0PjdjPXuyPFVuZ1zHc9Kpd9pYhNr06ldiOe6ZrtI/GEAUJe2DEtkZYDjVu6A5IdEFIn1mTW/+H5EduxQv6NuVzYudNg2n6/wC2S8637EkyPrgklHS+lCxMr7N9uHPRHJm+tAB5bwds/jZjivHrePv52rVtZxSaPc1AchoORsGqbJks2L3u0Bu7o2sdDtNAj2vyxp39FHpgeMqNbBF21nyohjhXvR7gPWvzBGl1+0au6CJfqEkOzgovbI4hPmUWzXbf0jW6pMcAERiQ04h07ZjqyHYRAXw4J9Gm1GDooxNDdVi7yOu1dI4iKoLwD
1513
template:
1614
metadata:
1715
annotations: *a1

‎.kontinuous/env/preprod/templates/ingester.configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ metadata:
55
data:
66
NODE_ENV: "production"
77
HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
8+
URL_EXPORT: "http://export"

‎.kontinuous/env/prod/templates/hasura.configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ data:
99
HASURA_GRAPHQL_NO_OF_RETRIES: "5"
1010
HASURA_GRAPHQL_SERVER_PORT: "8080"
1111
HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "public"
12-
PUBLICATION_WEBHOOK_URL: "http://www/api/webhooks/publication"

‎.kontinuous/env/prod/templates/hasura.sealed-secret.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ spec:
77
encryptedData:
88
HASURA_GRAPHQL_ADMIN_SECRET: AgBq/VnExWhATvCrlpqyhvUwUCEZUpQEZ0N7A4glKiU8BhuuyTIj+1HIfLMANcjoXMfOUWT46DNRy5fRHzUFm/j22QZd+4lfvQIytrMlcdpuFb5yMCWW62+/i44EXW3GcXkUnacVp5NN4WOWPzQNuhf/0oIDlIN1ULKzUleFzJfS1MCPxD5T721qTkvcSfoJosSjRCCQbOeUcxYLbCGbCQSflaEJ11SE2EXTGf4jv9px9eAUlKbhOgyThQnSlnfaRYcepa27zZNM1X3ggjCLHHG+C2cElpkBzepw/hrEnAiq64DbzgGcoPWDCjAwKTrCdytnyrqj3cJkbAuWQVbhv39vPSy/HW/pKGsakNGvZV7ofCAfFWQC5wGFkd7Kph4/cV3XRuPfCq/8kNrQpfmfVwJpsJH63o/Do9svynLvyWmtmJiE50tUOhI1yOzeRFNGtcGPCRJGBmXAAz9LkF1bpT6WWxrTya0jbXolvkuqwYHDaUcL29DGmNwfcfW94z9NrfmGp/ppeN9A1j7cqU53U/c444mn8Ns+kpbV7Q1VmZIzeNrq4zX88VAXbmou5tJyiWuCpKQRvtqfvoCGlWVKmdoya+yFHHR2NeDoj9246Hi66K9K7BluWsK9CKY74lXKBzDW2B3ThOxdpmWDof6WJaPKOltszm0xQLAK8l2VRVrSv6mmUkiYsAu2iBjfB/C9jQRBYYWy75LHS6V3lEKj0hkGMtwh6apya/RpwPL76do=
99
HASURA_GRAPHQL_JWT_SECRET: AgBsyXBoL2VRo5DZ3mwg7XtRm+HvPMVs8xxcL8OHaHsiAeTkIbLnBShtgOIwOYTWmoGjLQTBnPdrbKOzqzZNZVdZojPqZeFuxo/Y0E72rnEQQWTFCmQ7wwJxtWnMaBBukqQqMjhqBD1octAR+B5693dLRRd4bgjVSOY57CwNh15S2bXLNNqXPbmQMhlM/8xWEPFTAWs/9CT7ARnUgOEPThQ3RrFKXyJvCByVVz75Ly1EEeVHucfN5PngsN13Y5P3qDSOSBhbfn6+zZqSrvfboMVF4lACwKYoTulUkQFTboxuHv1dsepqA0y7fntcOAnoVDwe8CryMUX4+vJb/ikKfFhkl1h+NyTRPzjbsghxEWvz5jsnaLeJGZl9yvkZoVpIpxfQFIE1ATORgfWiB4qs31bbl24EH8m3sTMsBzC4Ssjy8/5zd7hDP+mmT8IUIaoCNf8CCGONPpw9RzgbX2xdEhEKyR8DMjFEPH05F8lamHcj4u8z1w7pjRL1hzfu4IZSnawwJ7AYqClLH4Gfcvw9WdPTUazB4/A6/xAM0gKMCuueNYfegHmWReD/Xs2pMly14x7tzfT/h/b9N0+7diJ6KkieO6VFxc7kDhTUZZWZtcsmfigO4wFDXINZNJX/dSKGj8YO2pp8HvsMcTEL+EVE74ZRLCH2bq7GwATTxInRJpkAUBTYmeI8XtbHF6cEg+bignl90CFfmwdSrD+adSD1v7nHpWvysOkfFDu7rotthvlE8HpFKReaomoyiAybPUPABC2ftMOzLpD/iSgmVA4YrU9VJKxkOrMrjF8VnvG+bkTEBrqnRg1T8fL4zvzj1XB1g5ZVVry8UGeA+s9uJTze/iF6BmccHw==
10-
PUBLICATION_SECRET: AgBcsYTPFZtlCxaB6GhB+y2Bv2D+amWD188Hk5HgYVTz18yWpLlqQiylERizCGmqrH1lQM7UeVyhH45e90BVcZ2M2B33S1HKCtElIIf8ZpTI3XM2HhlZo0z9ij+lKi3te4e7ccjvgjni8FuxUv/C0LW9rXFJ93PsxdSQA8b0VyFohEKGmzFJIv+vuNopyFxpew2EtgSES/n3Km8sySdqFGiwwmPx2L/fUDfdvsW1pACsitvAZe3sDfi/Bq+d6psLQ45copWDhJDhP8GuPgVeogw9mHbTTeNnqHffEvBGQyQMmuf21CpFd4OCjuw6W7kyNxqno5eGs0pvQut7Bx+al7AHGKc4fNF3Paz9z+YZU2qCffdtUGtQ7ZpUvK07o03FCgb1KMBABrLBVxRurde+4AutBYhgSgRQhY2d3O9fwIUqB6oFF4YhBXo4YZUa0BdxZ0v0gz9VyaTj3/jjg2aC/VHi3hnI+zyO6cSWDzSiG7eh3XZfUo8gHwMY4hqqsNKJA++9GjMufsRRReHB+7GbDxiWidpiHD0eMUfR4AXj/4fUPk8mIR2HMHES3XlBvdOjHwvzXpjIyI0WJNMisv1K4IzOPLQ7MLmsVwa+LJntUYZxS7p74tn/DXDZ5bQ5pVERMKN8KcSqigAoLssYkUsUGMvnBRIhn8d8BwZhJvz5PXHuneyiNrQY85v/rp6j0Ls1/pCBQF6LifHFlmd3uVArVUskqvkxcfa17X84u6oIqL9hWFLdJyPnifsO+SUvyEF386V+npsXpbsuHPf3UjzzXAUQfiXMQrjQH+VjfjilQnTLUB1h1/iX146w
11-
ACTIONS_SECRET: AgCkkuGEYepd3F5aYpHWr1UKcFYkA2a0xzr4CFYZgQ2JAA0bW3iPuNEWEZUNQvH8fiwQXn1rv6tP47s8uxeefJzEyMmjxF6Zia9nmdrfwzEZ9/4rjSKT0yXqqsnpq/PaJhQKcMZV8MXTA//dheFGKZzWgoEUJM1VsoVDsoL5xwA+qq3Y72CtPsFOMoVtPBmUauvIySYVf2Nsn23s+nkP0crdwigpQ5030QQ+gyJEm8UPD68ibNkcGR5/NhFsNu29EFwbWLq0aXG0q7q3bS31Yo/7ZebRNBb7vcDqOcwu7xQBbg0OOweNbTp4xBaHZCEhme2WEc+FZIwFEWNyv7cpwLSjpJYtKZBbFEFzEEKINFlIKrLFEEWodS0/kKrlLRD1oFWilfa8xhk2ZegKA1G5wIrJ0BEgoIA9JnjPMEAny8/wEGSVJAUvsbKMp7NManU7kCRalD6GmSZ+Oy5ZEi8rCorNT1rAQSEERBpCMsglnW5XGewf4TlLrIM4ynki4DUlu8CdG3zJyqjMdYHAcL/2JI5pMjg4aM00aAS7ZlmYOTuREbp19NXXJf2ScCpXHjWSHHjxzAZpa4pxHZfnmkYWgo9g/eAq/W7WK9oBVO4Cla3p+cuH/sHsSIY/2dga/slAyhHzhzJ/xZeQT77a5FxMGNHrk5nv/XvzLWZO12Tnq2GINQsxJr0Xs08Xiqzpp9oypCgJkFKyAQlxlSgcqpo/cFgb2m+5M1YOX6agvZiXnC2izT7PmCvtUiRrCv9Fby0DYY3WayF5kI6lpoLcl1oIeY9jyzlRC760X7A20xk3+g70vWdBGwPV7xFx
1210
template:
1311
metadata:
1412
name: hasura

‎.kontinuous/env/prod/templates/ingester.configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ metadata:
55
data:
66
NODE_ENV: "production"
77
HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
8+
URL_EXPORT: "http://export"

‎.kontinuous/env/prod/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ export:
2727
replicas: 1
2828
resources:
2929
limits:
30-
cpu: "1500m"
30+
cpu: "2000m"
3131
memory: "4096Mi"
3232
requests:
33-
cpu: "1000m"
34-
memory: "896Mi"
33+
cpu: "1500m"
34+
memory: "2Gi"
3535

3636
hasura:
3737
autoscale:

‎.kontinuous/sql/post-restore.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ VALUES (
1919
'Administrateur',
2020
'super',
2121
TRUE,
22-
'd8b11bd2-dd16-4632-b5de-0e7021faadeb'
22+
'8babda41-6001-4665-96f5-c430fddb0c53'
2323
);
2424

2525
-- Remove all data from audit tables

‎.kontinuous/templates/alert.cronjob.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ spec:
66
concurrencyPolicy: Forbid
77
successfulJobsHistoryLimit: 3
88
failedJobsHistoryLimit: 3
9-
schedule: 30 1 * * *
9+
schedule: 30 2 * * *
1010
jobTemplate:
1111
{{- include "job.alert" . | nindent 4 }}

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,14 @@ docker-compose up -d hasura minio elasticsearch createbuckets
149149
#### 5. Run ingester in development mode
150150

151151
```sh
152-
GLOSSARY_PREPROD_DISABLE=true DISABLE_LIMIT_EXPORT=true DISABLE_AGREEMENTS=true DISABLE_SITEMAP=true HASURA_GRAPHQL_ENDPOINT="http://localhost:8080/v1/graphql" HASURA_GRAPHQL_ADMIN_SECRET="admin1" ELASTICSEARCH_URL_PREPROD="http://localhost:9200" ELASTICSEARCH_URL_PROD="http://localhost:9200" SITEMAP_DESTINATION_FOLDER="sitemap" SITEMAP_NAME="sitemap.xml" SITEMAP_ENDPOINT="http://localhost:3001/api/sitemap" AGREEMENTS_DESTINATION_FOLDER="agreements" AGREEMENTS_DESTINATION_NAME="index.json" BUCKET_DEFAULT_FOLDER="default" BUCKET_DRAFT_FOLDER="draft" BUCKET_PUBLISHED_FOLDER= BUCKET_PREVIEW_FOLDER="preview" BUCKET_ACCESS_KEY="MINIO_ACCESS_KEY" BUCKET_ENDPOINT=http://localhost:9000 BUCKET_NAME="cdtn" BUCKET_SECRET_KEY="MINIO_SECRET_KEY" BUCKET_REGION="us-east-1" CDTN_ADMIN_ENDPOINT="http://localhost:8080/v1/graphql" ELASTICSEARCH_INDEX_PREPROD="cdtn-v2" ELASTICSEARCH_INDEX_PROD="cdtn-v2" FETCH_PAGE_SIZE=1000 FETCH_JOB_CONCURRENCY=5 yarn workspace export-elasticsearch dev
152+
DISABLE_LIMIT_EXPORT=true DISABLE_AGREEMENTS=true DISABLE_SITEMAP=true HASURA_GRAPHQL_ENDPOINT="http://localhost:8080/v1/graphql" HASURA_GRAPHQL_ADMIN_SECRET="admin1" ELASTICSEARCH_URL_PREPROD="http://localhost:9200" ELASTICSEARCH_URL_PROD="http://localhost:9200" SITEMAP_DESTINATION_FOLDER="sitemap" SITEMAP_NAME="sitemap.xml" SITEMAP_ENDPOINT="http://localhost:3001/api/sitemap" AGREEMENTS_DESTINATION_FOLDER="agreements" AGREEMENTS_DESTINATION_NAME="index.json" BUCKET_DEFAULT_FOLDER="default" BUCKET_DRAFT_FOLDER="draft" BUCKET_PUBLISHED_FOLDER= BUCKET_PREVIEW_FOLDER="preview" BUCKET_ACCESS_KEY="MINIO_ACCESS_KEY" BUCKET_ENDPOINT=http://localhost:9000 BUCKET_NAME="cdtn" BUCKET_SECRET_KEY="MINIO_SECRET_KEY" BUCKET_REGION="us-east-1" CDTN_ADMIN_ENDPOINT="http://localhost:8080/v1/graphql" ELASTICSEARCH_INDEX_PREPROD="cdtn-v2" ELASTICSEARCH_INDEX_PROD="cdtn-v2" FETCH_PAGE_SIZE=1000 FETCH_JOB_CONCURRENCY=5 yarn workspace export-elasticsearch dev
153153
```
154154

155155
- `DISABLE_LIMIT_EXPORT` is used to disable the limit to run two export in less than one hour
156156
- `DISABLE_INGESTER` is used to disable the copy from postgres to elasticsearch
157157
- `DISABLE_COPY` is used to disable copy between two containers
158158
- `DISABLE_SITEMAP` is used to disable copy of the sitemap
159159
- `DISABLE_AGREEMENTS` is used to disable copy of the agreements
160-
- `GLOSSARY_PREPROD_DISABLE` is used to disable glossary to gain time.
161160
- `NLP_URL` could be set by `https://serving-ml-preprod.ovh.fabrique.social.gouv.fr`, by default it is `undefined`
162161

163162
> **Note**: You can remove `NLP_URL` from your environment variables if you don't want to use the NLP service and gain time during the process of ingester elasticsearch.

‎docker-compose.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,6 @@ services:
3232
HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations
3333
HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata
3434

35-
www:
36-
build:
37-
context: .
38-
dockerfile: targets/frontend/Dockerfile
39-
shm_size: 512m
40-
secrets:
41-
- npmTiptapToken
42-
depends_on:
43-
- hasura
44-
ports:
45-
- "3001:3001"
46-
env_file:
47-
- .env
48-
environment:
49-
HASURA_GRAPHQL_ENDPOINT: "http://hasura:8080/v1/graphql"
50-
5135
ingester:
5236
build:
5337
context: .
@@ -118,6 +102,21 @@ services:
118102
depends_on:
119103
- elasticsearch
120104

105+
www:
106+
build:
107+
context: .
108+
dockerfile: targets/frontend/Dockerfile
109+
secrets:
110+
- npmTiptapToken
111+
depends_on:
112+
- hasura
113+
ports:
114+
- "3001:3000"
115+
environment:
116+
HASURA_GRAPHQL_ENDPOINT: "http://hasura:8080/v1/graphql"
117+
NEXTAUTH_SECRET: "6ZYMHbt0mxOj9y6mTyG2nJVt2zWDEdckLJz248uflwI="
118+
NEXTAUTH_URL: "http://localhost:3001"
119+
121120
export:
122121
platform: linux/amd64
123122
build:

‎shared/types/src/elastic/editorial-content.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import { EditorialContentDoc } from "../hasura";
22
import { KeysToCamelCase } from "../utility";
33
import { DocumentElasticWithSource } from "./common";
44

5-
export type EditorialContentElasticDocument = DocumentElasticWithSource<
6-
KeysToCamelCase<EditorialContentDoc>,
7-
"information"
5+
export type EditorialContentElasticDocument = Omit<
6+
DocumentElasticWithSource<
7+
KeysToCamelCase<EditorialContentDoc>,
8+
"information"
9+
>,
10+
"introWithGlossary"
811
>;

‎shared/types/src/hasura/contributions.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ type ContributionDocumentJsonBasic = {
8888
idcc: string; // 0000 pour la générique, impossible d'être nulle
8989
};
9090

91-
type ContributionDocumentJsonContent = ContributionDocumentJsonBasic & {
91+
export type ContributionDocumentJsonContent = ContributionDocumentJsonBasic & {
9292
type: "content";
9393
content: string;
94+
contentWithGlossary: string;
9495
};
9596

9697
type ContributionDocumentJsonGenericNoCDT = ContributionDocumentJsonBasic & {

‎shared/types/src/hasura/editorial-content.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export type MarkdownContentPart = {
2222
type: EditorialContentType.markdown;
2323
markdown: string;
2424
html: string;
25+
htmlWithGlossary: string;
2526
};
2627

2728
export type ContentItem = {
@@ -65,6 +66,7 @@ export type GraphicContentPart = {
6566
fileUrl: string;
6667
markdown: string;
6768
html: string;
69+
htmlWithGlossary: string;
6870
};
6971

7072
export enum EditorialSectionDisplayMode {
@@ -75,6 +77,7 @@ export enum EditorialSectionDisplayMode {
7577
export type EditorialContentDoc = {
7678
date: string;
7779
intro: string;
80+
introWithGlossary: string;
7881
section_display_mode?: EditorialSectionDisplayMode;
7982
dismissalProcess?: boolean;
8083
contents: EditorialContentBaseContentPart[];

‎shared/types/src/hasura/fiche-travail.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface FicheTravailEmploiDoc {
1616
export interface Section {
1717
anchor: string;
1818
html: string;
19+
htmlWithGlossary: string;
1920
text: string;
2021
title: string;
2122
description: string;

‎targets/export-elasticsearch/src/ingester/types.ts renamed to ‎shared/types/src/hasura/glossary.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ export interface Term {
88
slug?: string;
99
references?: string[];
1010
}
11+
12+
export type GlossaryTerms = {
13+
definition: string | null;
14+
pattern: RegExp;
15+
};

‎shared/types/src/hasura/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ export * from "./highlights";
1212
export * from "./modeles-de-courrier";
1313
export * from "./prequalified";
1414
export * from "./themes";
15+
export * from "./glossary";

‎shared/utils/src/__tests__/dila-resolver.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type DilaApiClient from "@socialgouv/dila-api-client";
22

3-
import { createGetArticleReference, extractArticleId } from "../dila-resolver";
3+
import { createGetArticleReference, extractArticleId } from "../dilaResolver";
44
import getKaliArticlePayload from "./__mocks__/kaliArticle.json";
55
import getLegiArticlePayload from "./__mocks__/legiArticle.json";
66

0 commit comments

Comments
 (0)