From d431eeeb93c8588ec7bf2545be5eaba27d5a7dd6 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Wed, 15 May 2019 14:02:40 +0200 Subject: [PATCH 1/9] carrierwave: fix typo Turns out the `openstack_identity_api_version` has not actually been filled out for a while, because of a typo. --- config/initializers/carrierwave.rb | 2 +- lib/tasks/2018_12_03_finish_piece_jointe_transfer.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 73298442a..2635e8012 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -31,7 +31,7 @@ CarrierWave.configure do |config| openstack_username: Rails.application.secrets.fog[:openstack_username], openstack_auth_url: Rails.application.secrets.fog[:openstack_auth_url], openstack_region: Rails.application.secrets.fog[:openstack_region], - openstack_identity_api_version: Rails.application.secrets.fog[:oopenstack_identity_api_version] + openstack_identity_api_version: Rails.application.secrets.fog[:openstack_identity_api_version] } end diff --git a/lib/tasks/2018_12_03_finish_piece_jointe_transfer.rake b/lib/tasks/2018_12_03_finish_piece_jointe_transfer.rake index ab1790b36..4977ea7d5 100644 --- a/lib/tasks/2018_12_03_finish_piece_jointe_transfer.rake +++ b/lib/tasks/2018_12_03_finish_piece_jointe_transfer.rake @@ -44,7 +44,7 @@ namespace :'2018_12_03_finish_piece_jointe_transfer' do openstack_username: Rails.application.secrets.fog[:openstack_username], openstack_auth_url: Rails.application.secrets.fog[:openstack_auth_url], openstack_region: Rails.application.secrets.fog[:openstack_region], - openstack_identity_api_version: Rails.application.secrets.fog[:oopenstack_identity_api_version] + openstack_identity_api_version: Rails.application.secrets.fog[:openstack_identity_api_version] } new_pj_storage = Fog::Storage.new(fog_credentials) @new_pjs = new_pj_storage.directories.get(ENV['FOG_ACTIVESTORAGE_DIRECTORY']) From abfeb1c2db0a6c6b98e3b1244bb8283140af0dce Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Wed, 15 May 2019 09:11:40 +0000 Subject: [PATCH 2/9] locales: remove unused carrierwave localisation - It was broken since the renaming of `extension_white_list` to `extension_whitelist` (f0ed61cce8e7faae90a3b3923eedc17a27118023) - The localisation is already included in the `carrierwave-i18n` gem - The localisation included in the gem is better than ours (it mentions which extensions are allowed). --- config/locales/fr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b746c9fa4..435a8fb0e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -187,7 +187,6 @@ fr: etablissement_fail: 'Désolé, nous n’avons pas réussi à enregistrer l’établissement correspondant à ce numéro SIRET' france_connect: connexion: "Erreur lors de la connexion à France Connect." - extension_white_list_error: "Le format de fichier de la pièce jointe n'est pas valide." procedure_archived: "Cette démarche en ligne a été fermée, il n'est plus possible de déposer de dossier." procedure_not_draft: "Cette démarche n’est maintenant plus en brouillon." cadastres_empty: From c21382312edd9ec79914ce2ffd1412f7dbecff8d Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 15 May 2019 11:39:30 +0200 Subject: [PATCH 3/9] Upgrade eslint --- package.json | 8 ++++---- yarn.lock | 49 ++++++++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 22dbdf814..877ec4d32 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "babel-eslint": "^10.0.1", "eclint": "^2.8.1", "eslint": "^5.16.0", - "eslint-config-prettier": "^4.1.0", - "eslint-plugin-prettier": "^3.0.1", - "eslint-plugin-react": "^7.12.4", + "eslint-config-prettier": "^4.2.0", + "eslint-plugin-prettier": "^3.1.0", + "eslint-plugin-react": "^7.13.0", "eslint-plugin-react-hooks": "^1.6.0", - "prettier": "^1.17.0", + "prettier": "^1.17.1", "webpack-dev-server": "^3.3.1" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index c54641d3f..fe3915cd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2953,17 +2953,17 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-prettier@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.1.0.tgz#181364895899fff9fd3605fecb5c4f20e7d5f395" - integrity sha512-zILwX9/Ocz4SV2vX7ox85AsrAgXV3f2o2gpIicdMIOra48WYqgUnWNH/cR/iHtmD2Vb3dLSC3LiEJnS05Gkw7w== +eslint-config-prettier@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.2.0.tgz#70b946b629cd0e3e98233fd9ecde4cb9778de96c" + integrity sha512-y0uWc/FRfrHhpPZCYflWC8aE0KRJRY04rdZVfl8cL3sEZmOYyaBdhdlQPjKZBnuRMyLVK+JUZr7HaZFClQiH4w== dependencies: get-stdin "^6.0.0" -eslint-plugin-prettier@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d" - integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ== +eslint-plugin-prettier@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d" + integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA== dependencies: prettier-linter-helpers "^1.0.0" @@ -2972,18 +2972,18 @@ eslint-plugin-react-hooks@^1.6.0: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.0.tgz#348efcda8fb426399ac7b8609607c7b4025a6f5f" integrity sha512-lHBVRIaz5ibnIgNG07JNiAuBUeKhEf8l4etNx5vfAEwqQ5tcuK3jV9yjmopPgQDagQb7HwIuQVsE3IVcGrRnag== -eslint-plugin-react@^7.12.4: - version "7.12.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz#b1ecf26479d61aee650da612e425c53a99f48c8c" - integrity sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ== +eslint-plugin-react@^7.13.0: + version "7.13.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz#bc13fd7101de67996ea51b33873cd9dc2b7e5758" + integrity sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ== dependencies: array-includes "^3.0.3" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.0.1" + jsx-ast-utils "^2.1.0" object.fromentries "^2.0.0" - prop-types "^15.6.2" - resolve "^1.9.0" + prop-types "^15.7.2" + resolve "^1.10.1" eslint-scope@3.7.1: version "3.7.1" @@ -4631,7 +4631,7 @@ jsts@1.1.2: resolved "https://registry.yarnpkg.com/jsts/-/jsts-1.1.2.tgz#d205d2cc8393081d9e484ae36282110695edc230" integrity sha1-0gXSzIOTCB2eSErjYoIRBpXtwjA= -jsx-ast-utils@^2.0.1: +jsx-ast-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36" integrity sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA== @@ -6550,10 +6550,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008" - integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw== +prettier@^1.17.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db" + integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg== private@^0.1.6: version "0.1.8" @@ -7051,13 +7051,20 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1: version "1.10.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== dependencies: path-parse "^1.0.6" +resolve@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18" + integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA== + dependencies: + path-parse "^1.0.6" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" From 4bd7429de55d723630af0ee4316fa1694354da6c Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 15 May 2019 11:47:16 +0200 Subject: [PATCH 4/9] Upgrade js dependencies --- package.json | 12 ++--- yarn.lock | 137 +++++++++++++++++++++++---------------------------- 2 files changed, 68 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 877ec4d32..d2c06012d 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "dependencies": { "@babel/preset-react": "^7.0.0", - "@fortawesome/fontawesome-svg-core": "^1.2.17", - "@fortawesome/free-solid-svg-icons": "^5.8.1", + "@fortawesome/fontawesome-svg-core": "^1.2.18", + "@fortawesome/free-solid-svg-icons": "^5.8.2", "@fortawesome/react-fontawesome": "^0.1.4", "@rails/webpacker": "4.0.2", - "@sentry/browser": "^5.1.0", + "@sentry/browser": "^5.2.1", "@turf/area": "^6.0.1", "activestorage": "^5.2.3", "autocomplete.js": "^0.36.0", @@ -15,7 +15,7 @@ "debounce": "^1.2.0", "dom4": "^2.1.4", "highcharts": "^6.1.2", - "intersection-observer": "^0.6.0", + "intersection-observer": "^0.7.0", "jquery": "^3.4.1", "leaflet": "^1.4.0", "leaflet-freedraw": "^2.10.0", @@ -26,9 +26,9 @@ "react-dom": "^16.8.6", "react-intersection-observer": "^8.23.0", "react-scroll-to-component": "^1.0.2", - "react-sortable-hoc": "^1.7.1", + "react-sortable-hoc": "^1.9.1", "react_ujs": "^2.5.0", - "select2": "^4.0.6-rc.1", + "select2": "^4.0.7", "turbolinks": "^5.2.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index fe3915cd8..3f7c3b20f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -740,24 +740,24 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@fortawesome/fontawesome-common-types@^0.2.17": - version "0.2.17" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.17.tgz#d8c36e6f6f3b3415fa1f83eaffe4f41bd313715c" - integrity sha512-DEYsEb/iiGVoMPQGjhG2uOylLVuMzTxOxysClkabZ5n80Q3oFDWGnshCLKvOvKoeClsgmKhWVrnnqvsMI1cAbw== +"@fortawesome/fontawesome-common-types@^0.2.18": + version "0.2.18" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.18.tgz#c0d8f073a5116b2de0a2c8a7aba66093a6956ce7" + integrity sha512-834DrzO2Ne3upCW+mJJPC/E6BsFcj+2Z1HmPIhbpbj8UaKmXWum4NClqLpUiMetugRlHuG4jbIHNdv2/lc3c1Q== -"@fortawesome/fontawesome-svg-core@^1.2.17": - version "1.2.17" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.17.tgz#8fce4402e824ebe99a04b1949d56d696eeae2e6d" - integrity sha512-TORMW/wIX2QyyGBd4XwHGPir4/0U18Wxf+iDBAUW3EIJ0/VC/ZMpJOiyiCe1f8g9h0PPzA7sqVtl8JtTUtm4uA== +"@fortawesome/fontawesome-svg-core@^1.2.18": + version "1.2.18" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.18.tgz#c26cbded461895ebe260f0dea771ca29d8cb3517" + integrity sha512-1vyLWVQqxQ8q8bA2zgZcljk3RkeELlDJ757ymLk+ebK019AFgEFH5kTnR5OMN1SFsTwW1OHlFQO3VufdeCg/Gg== dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.17" + "@fortawesome/fontawesome-common-types" "^0.2.18" -"@fortawesome/free-solid-svg-icons@^5.8.1": - version "5.8.1" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.1.tgz#086c70f95b34a4bcf6f50ff1078d46e53486eb52" - integrity sha512-FUcxR75PtMOo3ihRHJOZz64IsWIVdWgB2vCMLJjquTv487wVVCMH5H5gWa72et2oI9lKKD2jvjQ+y+7mxhscVQ== +"@fortawesome/free-solid-svg-icons@^5.8.2": + version "5.8.2" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.2.tgz#aa2f042f73aca43eb4a26149907e63bf26d2e31c" + integrity sha512-5tF6WOFlqqO95zY5ukSB6jliDa3jnk1p5L4K/a58ccDFsbjSkhfGuvZkRkeWxH8uMms81pZd6yQTwQrkedeJmg== dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.17" + "@fortawesome/fontawesome-common-types" "^0.2.18" "@fortawesome/react-fontawesome@^0.1.4": version "0.1.4" @@ -810,56 +810,56 @@ webpack-cli "^3.2.3" webpack-sources "^1.3.0" -"@sentry/browser@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.1.0.tgz#513f51f6f617f848cd031472a841efa7117a43f9" - integrity sha512-OS1r8cbccso+I7vV/jXsudAZ/vfxo9L7X+IdvYkHbUFDXMaSEjwY8WCZxB4J6Y3veM4qQIw1doWtpJd9BKiiLw== +"@sentry/browser@^5.2.1": + version "5.2.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.2.1.tgz#a49cf79a2443fa4c857bb310e819003d49f4fa26" + integrity sha512-fQTqBD4/WTW+ZnQULxjA5sn2yx3mj9OgXCYjdilISd94uRTlLOCtY+gvTAljuOkM5LlGwnBRAs7/bSI2zSaQEg== dependencies: - "@sentry/core" "5.1.0" - "@sentry/types" "5.1.0" - "@sentry/utils" "5.1.0" + "@sentry/core" "5.2.0" + "@sentry/types" "5.2.0" + "@sentry/utils" "5.2.0" tslib "^1.9.3" -"@sentry/core@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.1.0.tgz#c2a5522593cf8fe07c1da8d6af8d5fbaff3300df" - integrity sha512-i7kDqpJuSv4FBs3UvexPvt8Tr1jrbJqHxMeWKoURbMd4btd/sgv7lCXLKOuiRVy2V2IZ3NAPiCikVqK2rEdKKA== +"@sentry/core@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.2.0.tgz#06e932fd338a25d2e13de7671f277f059b461705" + integrity sha512-s6rnJpJZMDIutcj2EIxyzJBjuYn3omVSjL2F8vOfw2oMZgTGJzQdz7a43iYokX/zFgzEDqz5zWGrhJ1wX/I8/w== dependencies: - "@sentry/hub" "5.1.0" - "@sentry/minimal" "5.1.0" - "@sentry/types" "5.1.0" - "@sentry/utils" "5.1.0" + "@sentry/hub" "5.2.0" + "@sentry/minimal" "5.2.0" + "@sentry/types" "5.2.0" + "@sentry/utils" "5.2.0" tslib "^1.9.3" -"@sentry/hub@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.1.0.tgz#edcff4b85c10e6f44c603202da23776af36aeca0" - integrity sha512-gz46z4u65Uywn9ZrSuWNDJRjBgllA1pqov27fhdSPu5yvSr7dwdUCKO/5pvuXNQrBl79OxKzsXwUySX/9p5M1g== +"@sentry/hub@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.2.0.tgz#4fde4b8b97aec3d6375d000f1151600c42cd2d72" + integrity sha512-vMHDHmhKWGMsPqQUaN6f+9p4XuGrLBTB30dV8ZFOXkVbQOSG20rjI9nMaSoDkELCmFFCIu9cL+mvuxLcA7TRug== dependencies: - "@sentry/types" "5.1.0" - "@sentry/utils" "5.1.0" + "@sentry/types" "5.2.0" + "@sentry/utils" "5.2.0" tslib "^1.9.3" -"@sentry/minimal@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.1.0.tgz#7892908c70d4f9f85b79eb861e561b82a170bfc2" - integrity sha512-+TySfvc6DiZ/06m5HePBNkIoDiWsRQClYWrVMysHRz1GzJhvWLmPdCikMXrfSZinlyrGIZGZAuNkd3LhmmtUrQ== +"@sentry/minimal@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.2.0.tgz#6aad5f63cebceef51ee2b3b0010aee1e810a82b0" + integrity sha512-bMoT/+nctMSLo/qNOroTUILojIq/9FhGyW4tvTeHjDCYQorsg+FQqNLEpXo19IHi488Oy51qtBcBeldpxzN4bQ== dependencies: - "@sentry/hub" "5.1.0" - "@sentry/types" "5.1.0" + "@sentry/hub" "5.2.0" + "@sentry/types" "5.2.0" tslib "^1.9.3" -"@sentry/types@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.1.0.tgz#2acda336c73c996b42ca03887679599c78751f10" - integrity sha512-Uo5Fla1RjCfmliQWsV4ehZ1Q4z4taMC66ZGrqrUWx7FyQsaps+TJfQE5QiTIs+jWD6CbgVRf/N+pNMmpIK8JVA== +"@sentry/types@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.2.0.tgz#e42f2ad95c1c10f50656e6b668ff8c8aa06b99d5" + integrity sha512-QzMVYgONsScAiEGY5XRtSeMwH8464oRdaxCMTtXBuYfF9muvxHqQyF094GVRiconpgKelok5ke9HwrbNUEiE7w== -"@sentry/utils@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.1.0.tgz#15067fe64248948379518c23fe9949aae430cf78" - integrity sha512-p2W9Zg6IAtVFd2ejk850ixcv/01++eXA4y1t9YT+feocV3GyhHirz6aGFviPFGcOjSeAai+uuV2rvzFeLJtmkg== +"@sentry/utils@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.2.0.tgz#1b97fbe9a9bf2f9a355670da6531dcac79d9e748" + integrity sha512-/0gWzWSot22P/Zkfz2lxXvuOiHAtM4uwkADlt1yN3mMPTaHD8feV9MTwjg+Z3KxKSZ005riJFncCO+PZQaydSQ== dependencies: - "@sentry/types" "5.1.0" + "@sentry/types" "5.2.0" tslib "^1.9.3" "@turf/area@^6.0.1": @@ -1098,11 +1098,6 @@ ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -almond@~0.3.1: - version "0.3.3" - resolved "https://registry.yarnpkg.com/almond/-/almond-0.3.3.tgz#a0e7c95ac7624d6417b4494b1e68bff693168a20" - integrity sha1-oOfJWsdiTWQXtElLHmi/9pMWiiA= - alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -4177,10 +4172,10 @@ interpret@^1.1.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= -intersection-observer@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.6.0.tgz#d64aae04211b4cec051537168f5fa670a4acc770" - integrity sha512-WUVAqGJr08yh73XKe1JhylQ9BiBIytrkt8SH5Knu7Uy44ij5cICi6PbVLIbV/D2eIx9LJVkGBo9WF80R4VXJ+w== +intersection-observer@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.7.0.tgz#ee16bee978db53516ead2f0a8154b09b400bbdc9" + integrity sha512-Id0Fij0HsB/vKWGeBe9PxeY45ttRiBmhFyyt/geBdDHBYNctMRTE3dC1U3ujzz3lap+hVXlEcVaB56kZP/eEUg== invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" @@ -4517,11 +4512,6 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -jquery-mousewheel@~3.1.13: - version "3.1.13" - resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5" - integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU= - jquery@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" @@ -6769,10 +6759,10 @@ react-scroll-to-component@^1.0.2: dependencies: scroll-to "0.0.2" -react-sortable-hoc@^1.7.1: - version "1.9.0" - resolved "https://registry.yarnpkg.com/react-sortable-hoc/-/react-sortable-hoc-1.9.0.tgz#ca09607d6ea717ebda899abad72cb2df9e0c20db" - integrity sha512-8ziTjeZ5Bg4fCvv/HaX5ULz+wCr7q2j5S41/SXypSfX/k7Z0n61K62m++lZRLG06E5WO5FBRpnd4zbDsF8dPzQ== +react-sortable-hoc@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/react-sortable-hoc/-/react-sortable-hoc-1.9.1.tgz#ae3d28c3cff87fb862be3ddcde9c76b5b5bd2152" + integrity sha512-2VeofjRav8+eZeE5Nm/+b8mrA94rQ+gBsqhXi8pRBSjOWNqslU3ZEm+0XhSlfoXJY2lkgHipfYAUuJbDtCixRg== dependencies: "@babel/runtime" "^7.2.0" invariant "^2.2.4" @@ -7206,13 +7196,10 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -select2@^4.0.6-rc.1: - version "4.0.6-rc.1" - resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.6-rc.1.tgz#aa6c3038a7f0f2e91ffade38f0a21c15e1813276" - integrity sha1-qmwwOKfw8ukf+t448KIcFeGBMnY= - dependencies: - almond "~0.3.1" - jquery-mousewheel "~3.1.13" +select2@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.7.tgz#7b80473ef7900f4dc2b988623275fe569204ae8d" + integrity sha512-t46Z2nkEEYnBYdRpLNw5dj9qqO+YTiTlWKnpJ/B5e1Q3hPND00JRgcLJxYRzqpeLZd+ZkszkHEMagLKIfbTjVA== selfsigned@^1.10.4: version "1.10.4" From 131f1aacc4bc8225b78b377d94050b9813fae888 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Wed, 15 May 2019 11:02:26 +0200 Subject: [PATCH 5/9] =?UTF-8?q?ajout=20de=20plus=20d'informations=20utilis?= =?UTF-8?q?ateur=20pour=20t=C3=A9l=C3=A9charger=20le=20justificatif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../show/_download_justificatif.html.haml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/views/new_user/dossiers/show/_download_justificatif.html.haml b/app/views/new_user/dossiers/show/_download_justificatif.html.haml index 509c594e0..5540050bb 100644 --- a/app/views/new_user/dossiers/show/_download_justificatif.html.haml +++ b/app/views/new_user/dossiers/show/_download_justificatif.html.haml @@ -1,7 +1,16 @@ - if dossier.present? - justificatif = dossier.justificatif_motivation - - if dossier.justificatif_motivation.attached? and dossier.justificatif_motivation.virus_scanner.safe? - .action - = link_to (justificatif), target: '_blank', class: 'button primary' do - %span.icon.download - Télécharger le justificatif + - if justificatif.attached? + - if justificatif.virus_scanner.safe? + .action + = link_to (justificatif), target: '_blank', class: 'button primary' do + %span.icon.download + Télécharger le justificatif + - else + %p + Un justificatif a été joint. + - if justificatif.virus_scanner.pending? + L'analyse antivirus de ce document est en cours. + = link_to "rafraichir", request.path + - if justificatif.virus_scanner.infected? + Il semble contenir un virus : merci de contacter l'administration pour lui demander un autre justificatif. From 285e75f470ab6a9484606c644cdf396184a33fff Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Wed, 15 May 2019 14:38:04 +0200 Subject: [PATCH 6/9] correction wording --- .../dossiers/show/_download_justificatif.html.haml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/new_user/dossiers/show/_download_justificatif.html.haml b/app/views/new_user/dossiers/show/_download_justificatif.html.haml index 5540050bb..3df94f6bd 100644 --- a/app/views/new_user/dossiers/show/_download_justificatif.html.haml +++ b/app/views/new_user/dossiers/show/_download_justificatif.html.haml @@ -6,11 +6,7 @@ = link_to (justificatif), target: '_blank', class: 'button primary' do %span.icon.download Télécharger le justificatif - - else + - elsif justificatif.virus_scanner.pending? %p - Un justificatif a été joint. - - if justificatif.virus_scanner.pending? - L'analyse antivirus de ce document est en cours. - = link_to "rafraichir", request.path - - if justificatif.virus_scanner.infected? - Il semble contenir un virus : merci de contacter l'administration pour lui demander un autre justificatif. + Un justificatif a été joint. L'analyse antivirus de ce document est en cours. + = link_to "rafraichir", request.path From b670b60ac6f6ffe9222983d9774de2671d29acf7 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Wed, 15 May 2019 15:28:26 +0200 Subject: [PATCH 7/9] changement de l'URI de report-uri --- config/initializers/content_security_policy.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 0547856ad..cce47f203 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -1,6 +1,10 @@ Rails.application.config.content_security_policy do |policy| # En cas de non respect d'une des règles, faire un POST sur cette URL - policy.report_uri "https://demarches-simplifiees.report-uri.com/r/d/csp/reportOnly" + if Rails.env.production? + policy.report_uri "https://demarchessimplifieestest.report-uri.com/r/d/csp/reportOnly" + else + policy.report_uri "http://localhost:3000/csp/" # ne pas notifier report-uri en dev/test + end # Whitelist image policy.img_src :self, "*.openstreetmap.org", "static.demarches-simplifiees.fr", "*.cloud.ovh.net", "stats.data.gouv.fr" # Whitelist JS: nous, sendinblue et matomo From 2817e571e8e553ef065264857d46bfcfd50cebaf Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 15 May 2019 15:59:06 +0200 Subject: [PATCH 8/9] Remove unused sendinblue import --- app/views/layouts/application_old.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/layouts/application_old.html.haml b/app/views/layouts/application_old.html.haml index 5f833b011..043342b4d 100644 --- a/app/views/layouts/application_old.html.haml +++ b/app/views/layouts/application_old.html.haml @@ -43,5 +43,3 @@ %i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' } = render partial: 'layouts/footer', locals: { main_container_size: main_container_size } - - if administrateur_signed_in? - = javascript_pack_tag 'sendinblue', async: true From 6fe4031b2e445e70881a8681b05515a3c1df6453 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Wed, 15 May 2019 16:33:27 +0200 Subject: [PATCH 9/9] use constant for localhost --- config/initializers/content_security_policy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index cce47f203..a812e0e9e 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -3,7 +3,7 @@ Rails.application.config.content_security_policy do |policy| if Rails.env.production? policy.report_uri "https://demarchessimplifieestest.report-uri.com/r/d/csp/reportOnly" else - policy.report_uri "http://localhost:3000/csp/" # ne pas notifier report-uri en dev/test + policy.report_uri "http://#{ENV['APP_HOST']}/csp/" # ne pas notifier report-uri en dev/test end # Whitelist image policy.img_src :self, "*.openstreetmap.org", "static.demarches-simplifiees.fr", "*.cloud.ovh.net", "stats.data.gouv.fr"