From e909064a836634126955584f12168e3c7c45f877 Mon Sep 17 00:00:00 2001 From: Matheus Date: Wed, 20 Sep 2023 09:39:38 -0300 Subject: [PATCH 01/27] feat(104161): Adiciona estado conta no useEffect --- .../FormDadosDasContas/BarraStatusEncerramentoConta.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/componentes/escolas/Associacao/DadosDasContas/FormDadosDasContas/BarraStatusEncerramentoConta.js b/src/componentes/escolas/Associacao/DadosDasContas/FormDadosDasContas/BarraStatusEncerramentoConta.js index 7ba1de470..fec7358d1 100644 --- a/src/componentes/escolas/Associacao/DadosDasContas/FormDadosDasContas/BarraStatusEncerramentoConta.js +++ b/src/componentes/escolas/Associacao/DadosDasContas/FormDadosDasContas/BarraStatusEncerramentoConta.js @@ -15,7 +15,7 @@ export const BarraStatusEncerramentoConta = ({conta}) =>{ useEffect(() => { estadoEncerramentoConta(conta); - }, []) + }, [conta]) const formatarDataSolicitacao = (dataStr) => { const data = new Date(dataStr); From 0a9547579c0e8459b3323fe4c88a25af07e43aab Mon Sep 17 00:00:00 2001 From: ollyvergithub Date: Wed, 20 Sep 2023 11:13:09 -0300 Subject: [PATCH 02/27] tec(101957): Atualiza React para V18.0.0 --- package-lock.json | 1301 +++++++++++++++++++++++++------------------- package.json | 9 +- src/index.js | 28 +- src/rotas/index.js | 15 +- 4 files changed, 767 insertions(+), 586 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd385b9cb..853f7d0d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,9 @@ } }, "@ant-design/icons-svg": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.3.0.tgz", - "integrity": "sha512-WOgvdH/1Wl8Z7VXigRbCa5djO14zxrNTzvrAQzhWiBQtEKT0uTc8K1ltjKZ8U1gPn/wXhMA8/jE39SJl0WNxSg==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.3.1.tgz", + "integrity": "sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==" }, "@ant-design/react-slick": { "version": "1.0.2", @@ -48,11 +48,11 @@ } }, "@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "requires": { - "@babel/highlight": "^7.22.10", + "@babel/highlight": "^7.22.13", "chalk": "^2.4.2" }, "dependencies": { @@ -103,9 +103,9 @@ } }, "@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==" + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==" }, "@babel/core": { "version": "7.9.0", @@ -156,11 +156,11 @@ } }, "@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz", + "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", "requires": { - "@babel/types": "^7.22.10", + "@babel/types": "^7.22.15", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -182,20 +182,20 @@ } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz", - "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "requires": { - "@babel/types": "^7.22.10" + "@babel/types": "^7.22.15" } }, "@babel/helper-compilation-targets": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", - "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "requires": { "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -222,14 +222,14 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz", - "integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz", + "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-replace-supers": "^7.22.9", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", @@ -245,9 +245,9 @@ } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz", - "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", "regexpu-core": "^5.3.1", @@ -315,9 +315,9 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==" + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==" }, "@babel/helper-function-name": { "version": "7.22.5", @@ -337,31 +337,31 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz", + "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==", "requires": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" } }, "@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "requires": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" } }, "@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", + "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", "requires": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" } }, "@babel/helper-optimise-call-expression": { @@ -378,22 +378,22 @@ "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", - "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" } }, "@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "requires": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5" } }, @@ -427,41 +427,41 @@ "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==" }, "@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==" + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==" }, "@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==" + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==" }, "@babel/helper-wrap-function": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", - "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", "requires": { "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" } }, "@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", + "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", "requires": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.22.15", + "@babel/types": "^7.22.15" } }, "@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "requires": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -513,26 +513,26 @@ } }, "@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==" + "version": "7.22.16", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz", + "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz", - "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz", + "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==", "requires": { "@babel/helper-plugin-utils": "^7.22.5" } }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz", - "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz", + "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.5" + "@babel/plugin-transform-optional-chaining": "^7.22.15" } }, "@babel/plugin-proposal-async-generator-functions": { @@ -831,9 +831,9 @@ } }, "@babel/plugin-transform-async-generator-functions": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz", - "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz", + "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==", "requires": { "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", @@ -860,9 +860,9 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz", - "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz", + "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==", "requires": { "@babel/helper-plugin-utils": "^7.22.5" } @@ -877,27 +877,27 @@ } }, "@babel/plugin-transform-class-static-block": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz", - "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz", + "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" } }, "@babel/plugin-transform-classes": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz", - "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz", + "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-function-name": "^7.22.5", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -919,9 +919,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", - "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz", + "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==", "requires": { "@babel/helper-plugin-utils": "^7.22.5" } @@ -944,9 +944,9 @@ } }, "@babel/plugin-transform-dynamic-import": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz", - "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz", + "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3" @@ -962,9 +962,9 @@ } }, "@babel/plugin-transform-export-namespace-from": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz", - "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz", + "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" @@ -980,9 +980,9 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz", - "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz", + "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==", "requires": { "@babel/helper-plugin-utils": "^7.22.5" } @@ -998,9 +998,9 @@ } }, "@babel/plugin-transform-json-strings": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz", - "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz", + "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-json-strings": "^7.8.3" @@ -1015,9 +1015,9 @@ } }, "@babel/plugin-transform-logical-assignment-operators": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz", - "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz", + "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" @@ -1041,22 +1041,22 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz", - "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz", + "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==", "requires": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz", - "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz", + "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==", "requires": { "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.22.9", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.5" } @@ -1088,33 +1088,33 @@ } }, "@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz", - "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz", + "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-transform-numeric-separator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz", - "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz", + "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-transform-object-rest-spread": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz", - "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz", + "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==", "requires": { - "@babel/compat-data": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.22.5" + "@babel/plugin-transform-parameters": "^7.22.15" } }, "@babel/plugin-transform-object-super": { @@ -1127,18 +1127,18 @@ } }, "@babel/plugin-transform-optional-catch-binding": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz", - "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz", + "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-transform-optional-chaining": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz", - "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz", + "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", @@ -1146,9 +1146,9 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz", - "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", "requires": { "@babel/helper-plugin-utils": "^7.22.5" } @@ -1163,12 +1163,12 @@ } }, "@babel/plugin-transform-private-property-in-object": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz", - "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz", + "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } @@ -1198,15 +1198,15 @@ } }, "@babel/plugin-transform-react-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz", - "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz", + "integrity": "sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-jsx": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" } }, "@babel/plugin-transform-react-jsx-development": { @@ -1322,12 +1322,12 @@ } }, "@babel/plugin-transform-typescript": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.10.tgz", - "integrity": "sha512-7++c8I/ymsDo4QQBAgbraXLzIM6jmfao11KgIBEYZRReWzNWH9NtNgJcyrZiXsOPh523FQm6LfpLyy/U5fn46A==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz", + "integrity": "sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==", "requires": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.10", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-typescript": "^7.22.5" } @@ -1368,16 +1368,16 @@ } }, "@babel/preset-env": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz", - "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz", + "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==", "requires": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.10", + "@babel/compat-data": "^7.22.20", + "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", @@ -1398,41 +1398,41 @@ "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.10", + "@babel/plugin-transform-async-generator-functions": "^7.22.15", "@babel/plugin-transform-async-to-generator": "^7.22.5", "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.22.10", + "@babel/plugin-transform-block-scoping": "^7.22.15", "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.5", - "@babel/plugin-transform-classes": "^7.22.6", + "@babel/plugin-transform-class-static-block": "^7.22.11", + "@babel/plugin-transform-classes": "^7.22.15", "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.22.10", + "@babel/plugin-transform-destructuring": "^7.22.15", "@babel/plugin-transform-dotall-regex": "^7.22.5", "@babel/plugin-transform-duplicate-keys": "^7.22.5", - "@babel/plugin-transform-dynamic-import": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.11", "@babel/plugin-transform-exponentiation-operator": "^7.22.5", - "@babel/plugin-transform-export-namespace-from": "^7.22.5", - "@babel/plugin-transform-for-of": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.11", + "@babel/plugin-transform-for-of": "^7.22.15", "@babel/plugin-transform-function-name": "^7.22.5", - "@babel/plugin-transform-json-strings": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.11", "@babel/plugin-transform-literals": "^7.22.5", - "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.11", "@babel/plugin-transform-member-expression-literals": "^7.22.5", "@babel/plugin-transform-modules-amd": "^7.22.5", - "@babel/plugin-transform-modules-commonjs": "^7.22.5", - "@babel/plugin-transform-modules-systemjs": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.15", + "@babel/plugin-transform-modules-systemjs": "^7.22.11", "@babel/plugin-transform-modules-umd": "^7.22.5", "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", "@babel/plugin-transform-new-target": "^7.22.5", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", - "@babel/plugin-transform-numeric-separator": "^7.22.5", - "@babel/plugin-transform-object-rest-spread": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11", + "@babel/plugin-transform-numeric-separator": "^7.22.11", + "@babel/plugin-transform-object-rest-spread": "^7.22.15", "@babel/plugin-transform-object-super": "^7.22.5", - "@babel/plugin-transform-optional-catch-binding": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.10", - "@babel/plugin-transform-parameters": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.11", + "@babel/plugin-transform-optional-chaining": "^7.22.15", + "@babel/plugin-transform-parameters": "^7.22.15", "@babel/plugin-transform-private-methods": "^7.22.5", - "@babel/plugin-transform-private-property-in-object": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.11", "@babel/plugin-transform-property-literals": "^7.22.5", "@babel/plugin-transform-regenerator": "^7.22.10", "@babel/plugin-transform-reserved-words": "^7.22.5", @@ -1446,7 +1446,7 @@ "@babel/plugin-transform-unicode-regex": "^7.22.5", "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "0.1.6-no-external-plugins", - "@babel/types": "^7.22.10", + "@babel/types": "^7.22.19", "babel-plugin-polyfill-corejs2": "^0.4.5", "babel-plugin-polyfill-corejs3": "^0.8.3", "babel-plugin-polyfill-regenerator": "^0.5.2", @@ -1472,14 +1472,14 @@ } }, "@babel/preset-react": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.5.tgz", - "integrity": "sha512-M+Is3WikOpEJHgR385HbuCITPTaPRaNkibTEa9oiofmJvIsrceb4yp9RL9Kb+TE8LznmeyZqpP+Lopwcx59xPQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.22.15.tgz", + "integrity": "sha512-Csy1IJ2uEh/PecCBXXoZGAZBeCATTuePzCSB7dLYWS0vOEj6CNpjxIhW4duWwZodBNueH7QO14WbGn8YyeuN9w==", "requires": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "@babel/plugin-transform-react-display-name": "^7.22.5", - "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/plugin-transform-react-jsx": "^7.22.15", "@babel/plugin-transform-react-jsx-development": "^7.22.5", "@babel/plugin-transform-react-pure-annotations": "^7.22.5" } @@ -1499,45 +1499,45 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "@babel/runtime": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", - "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz", + "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==", "requires": { "regenerator-runtime": "^0.14.0" } }, "@babel/runtime-corejs3": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz", - "integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.15.tgz", + "integrity": "sha512-SAj8oKi8UogVi6eXQXKNPu8qZ78Yzy7zawrlTr0M+IuW/g8Qe9gVDhGcF9h1S69OyACpYoLxEzpjs1M15sI5wQ==", "requires": { "core-js-pure": "^3.30.2", "regenerator-runtime": "^0.14.0" } }, "@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "requires": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" } }, "@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz", + "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", "requires": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/parser": "^7.22.16", + "@babel/types": "^7.22.19", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1563,12 +1563,12 @@ } }, "@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.22.19", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz", + "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", "requires": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.19", "to-fast-properties": "^2.0.0" }, "dependencies": { @@ -1599,9 +1599,9 @@ "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==" }, "@ctrl/tinycolor": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz", - "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==" + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", + "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==" }, "@fortawesome/fontawesome-common-types": { "version": "6.4.2", @@ -2239,9 +2239,9 @@ } }, "@jest/expect-utils": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.3.tgz", - "integrity": "sha512-nvOEW4YoqRKD9HBJ9OJ6przvIvP9qilp5nAn1462P5ZlL/MM9SgPEZFyjTGPfs7QkocdUsJa6KjHhyRn4ueItA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "requires": { "jest-get-type": "^29.6.3" } @@ -3315,6 +3315,11 @@ "rc-util": "^5.24.4" } }, + "@remix-run/router": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz", + "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==" + }, "@restart/context": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", @@ -3528,23 +3533,23 @@ } }, "@tanstack/query-core": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.33.0.tgz", - "integrity": "sha512-qYu73ptvnzRh6se2nyBIDHGBQvPY1XXl3yR769B7B6mIDD7s+EZhdlWHQ67JI6UOTFRaI7wupnTnwJ3gE0Mr/g==" + "version": "4.35.3", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.35.3.tgz", + "integrity": "sha512-PS+WEjd9wzKTyNjjQymvcOe1yg8f3wYc6mD+vb6CKyZAKvu4sIJwryfqfBULITKCla7P9C4l5e9RXePHvZOZeQ==" }, "@tanstack/react-query": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.33.0.tgz", - "integrity": "sha512-97nGbmDK0/m0B86BdiXzx3EW9RcDYKpnyL2+WwyuLHEgpfThYAnXFaMMmnTDuAO4bQJXEhflumIEUfKmP7ESGA==", + "version": "4.35.3", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.35.3.tgz", + "integrity": "sha512-UgTPioip/rGG3EQilXfA2j4BJkhEQsR+KAbF+KIuvQ7j4MkgnTCJF01SfRpIRNtQTlEfz/+IL7+jP8WA8bFbsw==", "requires": { - "@tanstack/query-core": "4.33.0", + "@tanstack/query-core": "4.35.3", "use-sync-external-store": "^1.2.0" } }, "@tanstack/react-query-devtools": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.33.0.tgz", - "integrity": "sha512-6gegkuDmOoiY5e6ZKj1id48vlCXchjfE/6tIpYO8dFlVMQ7t1bYna/Ce6qQJ69+kfEHbYiTTn2lj+FDjIBH7Hg==", + "version": "4.35.3", + "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-4.35.3.tgz", + "integrity": "sha512-UvLT7qPzCuCZ3NfjwsOqDUVN84JvSOuW6ukrjZmSqgjPqVxD6ra/HUp1CEOatQY2TRvKCp8y1lTVu+trXM30fg==", "requires": { "@tanstack/match-sorter-utils": "^8.7.0", "superjson": "^1.10.0", @@ -3552,47 +3557,26 @@ } }, "@testing-library/dom": { - "version": "7.31.2", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz", - "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz", + "integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==", "requires": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", - "@types/aria-query": "^4.2.0", - "aria-query": "^4.2.2", + "@types/aria-query": "^5.0.1", + "aria-query": "5.1.3", "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.6", - "lz-string": "^1.4.4", - "pretty-format": "^26.6.2" + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" }, "dependencies": { - "@jest/types": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz", - "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==", - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^15.0.0", - "chalk": "^4.0.0" - } - }, - "@types/yargs": { - "version": "15.0.15", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz", - "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==", - "requires": { - "@types/yargs-parser": "*" - } - }, "aria-query": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", - "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", "requires": { - "@babel/runtime": "^7.10.2", - "@babel/runtime-corejs3": "^7.10.2" + "deep-equal": "^2.0.5" } }, "chalk": { @@ -3605,14 +3589,20 @@ } }, "pretty-format": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz", - "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==", + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "requires": { - "@jest/types": "^26.6.2", - "ansi-regex": "^5.0.0", - "ansi-styles": "^4.0.0", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", "react-is": "^17.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==" + } } }, "react-is": { @@ -3639,12 +3629,13 @@ } }, "@testing-library/react": { - "version": "10.4.9", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-10.4.9.tgz", - "integrity": "sha512-pHZKkqUy0tmiD81afs8xfiuseXfU/N7rAX3iKjeZYje86t9VaB0LrxYVa+OOsvkrveX5jCK3IjajVn2MbePvqA==", + "version": "12.1.5", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz", + "integrity": "sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==", "requires": { - "@babel/runtime": "^7.10.3", - "@testing-library/dom": "^7.22.3" + "@babel/runtime": "^7.12.5", + "@testing-library/dom": "^8.0.0", + "@types/react-dom": "<18.0.0" } }, "@testing-library/user-event": { @@ -3674,14 +3665,14 @@ } }, "@types/aria-query": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", - "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz", + "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==" }, "@types/babel__core": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", - "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", + "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", "requires": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -3691,26 +3682,26 @@ } }, "@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.5", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", + "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", "requires": { "@babel/types": "^7.0.0" } }, "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.2.tgz", + "integrity": "sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==", "requires": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "@types/babel__traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", - "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz", + "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==", "requires": { "@babel/types": "^7.20.7" } @@ -3730,9 +3721,9 @@ } }, "@types/hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-YIQtIg4PKr7ZyqNPZObpxfHsHEmuB8dXCxd6qVcGuQVDK2bpsF7bYNnBJ4Nn7giuACZg+WewExgrtAJ3XnA4Xw==", "requires": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -3760,18 +3751,18 @@ } }, "@types/jest": { - "version": "29.5.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz", - "integrity": "sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==", + "version": "29.5.5", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.5.tgz", + "integrity": "sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==", "requires": { "expect": "^29.0.0", "pretty-format": "^29.0.0" } }, "@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==" + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", + "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==" }, "@types/minimatch": { "version": "5.1.2", @@ -3779,9 +3770,9 @@ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==" }, "@types/node": { - "version": "20.5.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz", - "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==" + "version": "20.6.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", + "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==" }, "@types/parse-json": { "version": "4.0.0", @@ -3789,29 +3780,37 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.6", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.6.tgz", + "integrity": "sha512-RK/kBbYOQQHLYj9Z95eh7S6t7gq4Ojt/NT8HTk8bWVhA5DaF+5SMnxHKkP4gPNN3wAZkKP+VjAf0ebtYzf+fxg==" }, "@types/q": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz", - "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz", + "integrity": "sha512-IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ==" }, "@types/react": { - "version": "18.2.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.20.tgz", - "integrity": "sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==", + "version": "17.0.65", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.65.tgz", + "integrity": "sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", "csstype": "^3.0.2" } }, + "@types/react-dom": { + "version": "17.0.20", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz", + "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==", + "requires": { + "@types/react": "^17" + } + }, "@types/react-redux": { - "version": "7.1.25", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz", - "integrity": "sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==", + "version": "7.1.26", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.26.tgz", + "integrity": "sha512-UKPo7Cm7rswYU6PH6CmTNCRv5NYF3HrgKuHEYTK8g/3czYLrUux50gQ2pkxc9c7ZpQZi+PNhgmI8oNIRoiVIxg==", "requires": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -4297,9 +4296,9 @@ } }, "antd": { - "version": "4.24.13", - "resolved": "https://registry.npmjs.org/antd/-/antd-4.24.13.tgz", - "integrity": "sha512-N2odRsbomseCE3U845Whf+RdgmQbiWbKvWS6ggH/xHjXojHx951rmZXW4nMqAeSoUp66sQOASGtrP/SUsdA2oQ==", + "version": "4.24.14", + "resolved": "https://registry.npmjs.org/antd/-/antd-4.24.14.tgz", + "integrity": "sha512-hY/MPm7XI0G+9MvjhTlbDkA2sf8oHVbhtrT0XRstlm9+fXYGNXz8oEh3d5qiA3/tY5NL2Kh2tF7Guh01hwWJdg==", "requires": { "@ant-design/colors": "^6.0.0", "@ant-design/icons": "^4.7.0", @@ -4342,7 +4341,7 @@ "rc-tree-select": "~5.5.0", "rc-trigger": "^5.2.10", "rc-upload": "~4.3.0", - "rc-util": "^5.22.5", + "rc-util": "^5.35.1", "scroll-into-view-if-needed": "^2.2.25" } }, @@ -4474,14 +4473,14 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==" }, "array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" } }, @@ -4515,36 +4514,37 @@ "optional": true }, "array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.reduce": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz", - "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz", + "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-array-method-boxes-properly": "^1.0.0", "is-string": "^1.0.7" } }, "arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", "requires": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", "is-shared-array-buffer": "^1.0.2" @@ -4587,27 +4587,12 @@ } }, "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz", + "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==", "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==" - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", - "requires": { - "inherits": "2.0.1" - } - } + "object.assign": "^4.1.4", + "util": "^0.10.4" } }, "assert-plus": { @@ -5980,6 +5965,21 @@ "dns-txt": "^2.0.2", "multicast-dns": "^6.0.1", "multicast-dns-service-types": "^1.1.0" + }, + "dependencies": { + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + } } }, "boolbase": { @@ -6219,6 +6219,13 @@ "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + } } }, "buffer-from": { @@ -6398,9 +6405,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001522", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz", - "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==" + "version": "1.0.30001538", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", + "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==" }, "capture-exit": { "version": "2.0.0", @@ -6823,6 +6830,11 @@ "typedarray": "~0.0.5" }, "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -6958,17 +6970,17 @@ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-js-compat": { - "version": "3.32.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz", - "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==", + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz", + "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==", "requires": { "browserslist": "^4.21.10" } }, "core-js-pure": { - "version": "3.32.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.1.tgz", - "integrity": "sha512-f52QZwkFVDPf7UEQZGHKx6NYxsxmVGJe5DIvbzOdRMJlmT6yv0KDjR8rmy3ngr/t5wU54c7Sp/qIJH0ppbhVpQ==" + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.2.tgz", + "integrity": "sha512-Y2rxThOuNywTjnX/PgA5vWM6CZ9QB9sz9oGeCixV8MqXZO70z/5SHzf9EeBrEBK0PN36DnEBBu9O/aGWzKuMZQ==" }, "core-util-is": { "version": "1.0.3", @@ -7424,9 +7436,9 @@ } }, "dayjs": { - "version": "1.11.9", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", - "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==" + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" }, "debug": { "version": "2.6.9", @@ -7447,16 +7459,28 @@ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==" }, "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz", + "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==", "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.1", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.0", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" } }, "deep-is": { @@ -7478,11 +7502,22 @@ "ip-regex": "^2.1.0" } }, + "define-data-property": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", + "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "requires": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + } + }, "define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "requires": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } @@ -7906,9 +7941,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.496", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.496.tgz", - "integrity": "sha512-qeXC3Zbykq44RCrBa4kr8v/dWzYJA8rAwpyh9Qd+NKWoJfjG5vvJqy9XOJ9H4P/lqulZBCgUWAYi+FeK5AuJ8g==" + "version": "1.4.525", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz", + "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==" }, "elliptic": { "version": "6.5.4", @@ -8015,17 +8050,17 @@ } }, "es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", + "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==", "requires": { "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", + "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", @@ -8041,23 +8076,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", "typed-array-buffer": "^1.0.0", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.11" } }, "es-array-method-boxes-properly": { @@ -8065,6 +8100,22 @@ "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" }, + "es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + } + }, "es-set-tostringtag": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", @@ -8465,6 +8516,11 @@ "locate-path": "^2.0.0" } }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -8798,15 +8854,15 @@ } }, "expect": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.3.tgz", - "integrity": "sha512-x1vY4LlEMWUYVZQrFi4ZANXFwqYbJ/JNQspLVvzhW2BNY28aNcXMQH6imBbt+RBf5sVRTodYHXtSP/TLEU0Dxw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "requires": { - "@jest/expect-utils": "^29.6.3", + "@jest/expect-utils": "^29.7.0", "jest-get-type": "^29.6.3", - "jest-matcher-utils": "^29.6.3", - "jest-message-util": "^29.6.3", - "jest-util": "^29.6.3" + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" } }, "express": { @@ -9429,9 +9485,9 @@ "integrity": "sha512-eNMNr5exLoavuAMhIUVsOKF79SWd/zG104ef6sxBTSw+cZc6BXdQXDvYcGvp0VbxVVSp1XDUNoz7mg1xMtSznA==" }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==" }, "for-each": { "version": "0.3.3", @@ -9682,9 +9738,9 @@ } }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "optional": true }, "glob-parent": { @@ -9875,10 +9931,11 @@ } }, "formik": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/formik/-/formik-2.4.3.tgz", - "integrity": "sha512-2Dy79Szw3zlXmZiokUdKsn+n1ow4G8hRrC/n92cOWHNTWXCRpQXlyvz6HcjW7aSQZrldytvDOavYjhfmDnUq8Q==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/formik/-/formik-2.4.5.tgz", + "integrity": "sha512-Gxlht0TD3vVdzMDHwkiNZqJ7Mvg77xQNfmBRrNtvzcHZs72TJppSTDKHpImCMJZwcWPBJ8jSQQ95GJzXFf1nAQ==", "requires": { + "@types/hoist-non-react-statics": "^3.3.1", "deepmerge": "^2.1.1", "hoist-non-react-statics": "^3.3.0", "lodash": "^4.17.21", @@ -9988,14 +10045,14 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" } }, "functional-red-black-tree": { @@ -11449,6 +11506,11 @@ "is-extglob": "^1.0.0" } }, + "is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" + }, "is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -11549,6 +11611,11 @@ "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==" }, + "is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" + }, "is-shared-array-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", @@ -11596,6 +11663,11 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" }, + "is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" + }, "is-weakref": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", @@ -11604,6 +11676,15 @@ "call-bind": "^1.0.2" } }, + "is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "is-what": { "version": "4.1.15", "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.15.tgz", @@ -11620,9 +11701,9 @@ "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==" }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" }, "isexe": { "version": "2.0.0", @@ -11636,6 +11717,14 @@ "optional": true, "requires": { "isarray": "1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "optional": true + } } }, "isomorphic-fetch": { @@ -12328,14 +12417,14 @@ } }, "jest-diff": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.3.tgz", - "integrity": "sha512-3sw+AdWnwH9sSNohMRKA7JiYUJSRr/WS6+sEFfBuhxU5V5GlEVKfvUn8JuMHE0wqKowemR1C2aHy8VtXbaV8dQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "requires": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", "jest-get-type": "^29.6.3", - "pretty-format": "^29.6.3" + "pretty-format": "^29.7.0" }, "dependencies": { "chalk": { @@ -14018,14 +14107,14 @@ } }, "jest-matcher-utils": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.3.tgz", - "integrity": "sha512-6ZrMYINZdwduSt5Xu18/n49O1IgXdjsfG7NEZaQws9k69eTKWKcVbJBw/MZsjOZe2sSyJFmuzh8042XWwl54Zg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "requires": { "chalk": "^4.0.0", - "jest-diff": "^29.6.3", + "jest-diff": "^29.7.0", "jest-get-type": "^29.6.3", - "pretty-format": "^29.6.3" + "pretty-format": "^29.7.0" }, "dependencies": { "chalk": { @@ -14040,9 +14129,9 @@ } }, "jest-message-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz", - "integrity": "sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "requires": { "@babel/code-frame": "^7.12.13", "@jest/types": "^29.6.3", @@ -14050,7 +14139,7 @@ "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^29.6.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -15567,9 +15656,9 @@ } }, "jest-util": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz", - "integrity": "sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "requires": { "@jest/types": "^29.6.3", "@types/node": "*", @@ -16782,9 +16871,9 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, "nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" }, "nanomatch": { "version": "1.2.13", @@ -17244,34 +17333,34 @@ } }, "object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "object.getownpropertydescriptors": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz", - "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz", + "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==", "requires": { - "array.prototype.reduce": "^1.0.5", + "array.prototype.reduce": "^1.0.6", "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", + "es-abstract": "^1.22.1", "safe-array-concat": "^1.0.0" } }, @@ -17301,13 +17390,13 @@ } }, "object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "obuf": { @@ -18755,9 +18844,9 @@ } }, "pretty-format": { - "version": "29.6.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz", - "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "requires": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -19195,9 +19284,9 @@ } }, "rc-motion": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.7.3.tgz", - "integrity": "sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.0.tgz", + "integrity": "sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -19216,14 +19305,14 @@ } }, "rc-overflow": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.3.1.tgz", - "integrity": "sha512-RY0nVBlfP9CkxrpgaLlGzkSoh9JhjJLu6Icqs9E7CW6Ewh9s0peF9OHIex4OhfoPsR92LR0fN6BlCY9Z4VoUtA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.3.2.tgz", + "integrity": "sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", "rc-resize-observer": "^1.0.0", - "rc-util": "^5.19.2" + "rc-util": "^5.37.0" } }, "rc-pagination": { @@ -19236,9 +19325,9 @@ } }, "rc-picker": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.3.tgz", - "integrity": "sha512-LuuU4ECPYmfIQD3NXTdoiHTH9xnc6Cb69Ad62ggX34Dy60RJmrchNhj6Gjp0puf/l1oIhFKO190slGcHob6ALA==", + "version": "2.7.6", + "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.6.tgz", + "integrity": "sha512-H9if/BUJUZBOhPfWcPeT15JUI3/ntrG9muzERrXDkSoWmDj4yzmBvumozpxYrHwjcKnjyDGAke68d+whWwvhHA==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.1", @@ -19246,7 +19335,7 @@ "dayjs": "1.x", "moment": "^2.24.0", "rc-trigger": "^5.0.4", - "rc-util": "^5.4.0", + "rc-util": "^5.37.0", "shallowequal": "^1.1.0" } }, @@ -19261,9 +19350,9 @@ } }, "rc-rate": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.9.2.tgz", - "integrity": "sha512-SaiZFyN8pe0Fgphv8t3+kidlej+cq/EALkAJAc3A0w0XcPaH2L1aggM8bhe1u6GAGuQNAoFvTLjw4qLPGRKV5g==", + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.9.3.tgz", + "integrity": "sha512-2THssUSnRhtqIouQIIXqsZGzRczvp4WsH4WvGuhiwm+LG2fVpDUJliP9O1zeDOZvYfBE/Bup4SgHun/eCkbjgQ==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -19386,9 +19475,9 @@ } }, "rc-tree": { - "version": "5.7.9", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.7.9.tgz", - "integrity": "sha512-1hKkToz/EVjJlMVwmZnpXeLXt/1iQMsaAq9m+GNkUbK746gkc7QpJXSN/TzjhTI5Hi+LOSlrMaXLMT0bHPqILQ==", + "version": "5.7.12", + "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-5.7.12.tgz", + "integrity": "sha512-LXA5nY2hG5koIAlHW5sgXgLpOMz+bFRbnZZ+cCg0tQs4Wv1AmY7EDi1SK7iFXhslYockbqUerQan82jljoaItg==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -19432,18 +19521,18 @@ } }, "rc-util": { - "version": "5.36.0", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.36.0.tgz", - "integrity": "sha512-a4uUvT+UNHvYL+awzbN8H8zAjfduwY4KAp2wQy40wOz3NyBdo3Xhx/EAAPyDkHLoGm535jIACaMhIqExGiAjHw==", + "version": "5.37.0", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.37.0.tgz", + "integrity": "sha512-cPMV8DzaHI1KDaS7XPRXAf4J7mtBqjvjikLpQieaeOO7+cEbqY2j7Kso/T0R0OiEZTNcLS/8Zl9YrlXiO9UbjQ==", "requires": { "@babel/runtime": "^7.18.3", "react-is": "^16.12.0" } }, "rc-virtual-list": { - "version": "3.10.4", - "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.10.4.tgz", - "integrity": "sha512-SV3MxtBv/5/jXewDyjQeJkP057Sdq6zIuNTDD5BYDGZ9FLZcR9BPxm6IUIp/EFkfRiM4PaQmVs6Ntl+u0rU72w==", + "version": "3.10.10", + "resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.10.10.tgz", + "integrity": "sha512-EqNotqqRLzxFYce9JB/aDtP5fShvgwDVIuEKQeq9qfeNiKmsD4zf/UD+i0LppHtObzDUGtRFSf0HIOfb8FGSPA==", "requires": { "@babel/runtime": "^7.20.0", "classnames": "^2.2.6", @@ -19452,12 +19541,11 @@ } }, "react": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", - "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" } }, "react-app-polyfill": { @@ -19474,9 +19562,9 @@ }, "dependencies": { "core-js": { - "version": "3.32.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz", - "integrity": "sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==" + "version": "3.32.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz", + "integrity": "sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==" }, "promise": { "version": "8.3.0", @@ -19514,9 +19602,9 @@ }, "dependencies": { "@types/react": { - "version": "16.14.45", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.45.tgz", - "integrity": "sha512-XFtKkY3yuPO5VJSE6Lru9yLkVQvYE+l6NbmLp6IWCg4jo5S8Ijbpke8wC9q4NmQ5pJErT8KKboG5eY7n5n718A==", + "version": "16.14.46", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.46.tgz", + "integrity": "sha512-Am4pyXMrr6cWWw/TN3oqHtEZl0j+G6Up/O8m65+xF/3ZaUgkv1GAtTPWw4yNRmH0HJXmur6xKCKoMo3rBGynuw==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -19868,13 +19956,12 @@ } }, "react-dom": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", - "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "requires": { "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "scheduler": "^0.20.2" + "scheduler": "^0.23.0" } }, "react-error-overlay": { @@ -19960,6 +20047,19 @@ "warning": "^4.0.2" }, "dependencies": { + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, "warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", @@ -20020,6 +20120,33 @@ "tiny-warning": "^1.0.0" } }, + "react-router-dom-v5-compat": { + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router-dom-v5-compat/-/react-router-dom-v5-compat-6.16.0.tgz", + "integrity": "sha512-MfjB9qYZVnWUEHENFa+XpVU5qbDPkqpGvjaF/8nHCnCkfy5pxYajrZrmRmaR4v6Ehtu7GAx59JFTSoQGhLu1+g==", + "requires": { + "history": "^5.3.0", + "react-router": "6.16.0" + }, + "dependencies": { + "history": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz", + "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==", + "requires": { + "@babel/runtime": "^7.7.6" + } + }, + "react-router": { + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz", + "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==", + "requires": { + "@remix-run/router": "1.9.0" + } + } + } + }, "react-scripts": { "version": "3.4.4", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.4.tgz", @@ -20248,6 +20375,13 @@ "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + } } }, "readdirp": { @@ -20568,9 +20702,9 @@ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" }, "regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "requires": { "regenerate": "^1.4.2" } @@ -20614,13 +20748,13 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==" }, "regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" } }, "regexpp": { @@ -20821,9 +20955,9 @@ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" }, "resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.6", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", + "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", "requires": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -21071,21 +21205,14 @@ } }, "safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", "isarray": "^2.0.5" - }, - "dependencies": { - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - } } }, "safe-buffer": { @@ -21477,12 +21604,11 @@ } }, "scheduler": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", - "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" } }, "schema-utils": { @@ -21633,6 +21759,16 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "requires": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + } + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -22068,9 +22204,9 @@ } }, "spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==" + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz", + "integrity": "sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==" }, "spdy": { "version": "4.0.2", @@ -22232,6 +22368,14 @@ "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==" }, + "stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "requires": { + "internal-slot": "^1.0.4" + } + }, "stream-browserify": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", @@ -22330,48 +22474,49 @@ } }, "string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" } }, "string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" } }, "string_decoder": { @@ -23139,9 +23284,9 @@ "integrity": "sha512-ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ==" }, "ua-parser-js": { - "version": "0.7.35", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz", - "integrity": "sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==" + "version": "0.7.36", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.36.tgz", + "integrity": "sha512-CPPLoCts2p7D8VbybttE3P2ylv0OBZEAy7a12DsulIEcAiMtWJy+PBgMXgWDI80D5UwqE8oQPHYnk13tm38M2Q==" }, "ultimate-pagination": { "version": "1.0.0", @@ -23297,6 +23442,11 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==" }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", @@ -23332,12 +23482,12 @@ "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==" }, "url": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", - "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", + "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", "requires": { "punycode": "^1.4.1", - "qs": "^6.11.0" + "qs": "^6.11.2" }, "dependencies": { "punycode": { @@ -23582,9 +23732,9 @@ } }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "optional": true }, "glob-parent": { @@ -24925,9 +25075,9 @@ } }, "whatwg-fetch": { - "version": "3.6.17", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz", - "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ==" + "version": "3.6.19", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.19.tgz", + "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw==" }, "whatwg-mimetype": { "version": "2.3.0", @@ -24970,6 +25120,17 @@ "is-symbol": "^1.0.3" } }, + "which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "requires": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + } + }, "which-module": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", diff --git a/package.json b/package.json index ae2431912..73fc23c6c 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "@sentry/react": "^6.0.4", "@tanstack/react-query": "^4.29.19", "@tanstack/react-query-devtools": "^4.29.19", - "@testing-library/jest-dom": "^5.1.1", - "@testing-library/react": "^10.1.0", + "@testing-library/jest-dom": "^5.16.3", + "@testing-library/react": "^12.1.4", "@testing-library/user-event": "^8.1.3", "@tinymce/tinymce-react": "^3.10.1", "@trendmicro/react-sidenav": "^0.5.0", @@ -29,15 +29,16 @@ "ordinal-pt-br": "^1.0.0", "primeicons": "^2.0.0", "primereact": "^4.1.2", - "react": "^17.0.2", + "react": "^18.0.0", "react-bootstrap": "1.0.1", "react-currency-input": "^1.3.6", "react-datepicker": "^3.0.0", - "react-dom": "^17.0.2", + "react-dom": "^18.0.0", "react-loading": "^2.0.3", "react-number-format": "^4.4.1", "react-redux": "^7.2.4", "react-router-dom": "^5.1.2", + "react-router-dom-v5-compat": "^6.16.0", "react-scripts": "3.4.4", "react-sortable-hoc": "^2.0.0", "react-text-mask": "^5.4.3", diff --git a/src/index.js b/src/index.js index fc7c1bc52..822f25710 100644 --- a/src/index.js +++ b/src/index.js @@ -1,8 +1,16 @@ import * as Sentry from "@sentry/browser"; import React from 'react'; -import ReactDOM from 'react-dom'; + +// Migrando para V18 do react +import ReactDOM from "react-dom/client"; + import App from './App'; import {BrowserRouter} from "react-router-dom"; + +// Migrando para V6 do react-router-dom +// Referencia: https://github.com/remix-run/react-router/discussions/8753 +import {CompatRouter} from "react-router-dom-v5-compat"; + import {SidebarContextProvider} from "./context/Sidebar"; import {DespesaContextProvider} from "./context/Despesa"; import {NotificacaoContextProvider} from "./context/Notificacoes"; @@ -12,7 +20,7 @@ import * as serviceWorker from './serviceWorker'; import {Provider} from "react-redux"; import {store} from "./store"; import {QueryClient, QueryClientProvider} from "@tanstack/react-query"; -import { ReactQueryDevtools } from '@tanstack/react-query-devtools' +import {ReactQueryDevtools} from '@tanstack/react-query-devtools' if (process.env.NODE_ENV === "production") { const SENTRY_URL = "SENTRY_URL_REPLACE_ME"; @@ -22,13 +30,14 @@ if (process.env.NODE_ENV === "production") { let REACT_QUERY_DEV_TOOLS = "REACT_QUERY_DEV_TOOLS_REPLACE_ME"; if (process.env.REACT_APP_NODE_ENV === "local") { - REACT_QUERY_DEV_TOOLS = process.env.REACT_APP_REACT_QUERY_DEV_TOOLS; + REACT_QUERY_DEV_TOOLS = process.env.REACT_APP_REACT_QUERY_DEV_TOOLS; } const queryClient = new QueryClient(); -ReactDOM.render( +const root = ReactDOM.createRoot(document.getElementById("root")); +root.render( @@ -37,16 +46,17 @@ ReactDOM.render( - + + + - {REACT_QUERY_DEV_TOOLS === "true" && } - + {REACT_QUERY_DEV_TOOLS === "true" && } + - - , document.getElementById("root")); +); serviceWorker.unregister(); diff --git a/src/rotas/index.js b/src/rotas/index.js index bdfc8d202..6d4d579ad 100644 --- a/src/rotas/index.js +++ b/src/rotas/index.js @@ -95,6 +95,10 @@ import {Mandatos} from "../componentes/sme/Mandatos"; import {MotivosRejeicaoEncerramentoConta} from "../componentes/sme/Parametrizacoes/Estrutura/MotivosRejeicaoEncerramentoConta"; import {PaginaMandatosAnteriores} from "../componentes/escolas/MembrosDaAssociacao/pages/PaginaMandatosAnteriores"; +// Migrando para V6 do react-router-dom +// Referencia: https://github.com/remix-run/react-router/discussions/8753 +import {CompatRoute} from "react-router-dom-v5-compat"; + const routesConfig = [ { exact: true, @@ -257,7 +261,7 @@ const routesConfig = [ exact: true, path: "/dre-comissoes", component: ComissoesDrePage, - permissoes: ['access_comissoes_dre'], + permissoes: ['access_comissoes_dre'], }, { exact: true, @@ -592,13 +596,13 @@ const routesConfig = [ component: RedirectLoginVisaoUe, permissoes: ['view_default'], }, - { + { exact: true, path: "/regularidade-associacoes", component: RegularidadeAssociacoesPage, permissoes: ['access_regularidade_dre'], }, - { + { exact: true, path: "/analises-regularidade-associacao/:associacao_uuid/", component: AnalisesRegularidadeAssociacaoPage, @@ -645,7 +649,12 @@ const PrivateRouter = ( export const Rotas = () => { return ( + {/* + Migrando para V6 do react-router-dom + Referencia: https://github.com/remix-run/react-router/discussions/8753 + */} + {routesConfig.map( From 8af872a4bf57cb3c81fbe6c5f90b64708138abc8 Mon Sep 17 00:00:00 2001 From: rodrigodiaspilotogalvao <60263593+rodrigodiaspilotogalvao@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:13:32 -0300 Subject: [PATCH 03/27] Create Jenkinsfile_new --- Jenkinsfile_new | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 Jenkinsfile_new diff --git a/Jenkinsfile_new b/Jenkinsfile_new new file mode 100644 index 000000000..27a606dd5 --- /dev/null +++ b/Jenkinsfile_new @@ -0,0 +1,124 @@ +pipeline { + environment { + branchname = env.BRANCH_NAME.toLowerCase() + kubeconfig = getKubeconf(env.branchname) + registryCredential = 'jenkins_registry' + namespace = "${env.branchname == 'develop' ? 'sme-ptrf-dev' : env.branchname == 'homolog' ? 'sme-ptrf-hom' : env.branchname == 'homolog-r2' ? 'sme-ptrf-hom2' : 'sme-ptrf' }" + } + + agent { kubernetes { + label 'builder' + defaultContainer 'builder' + } + } + + options { + buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '5')) + disableConcurrentBuilds() + skipDefaultCheckout() + } + + stages { + + stage('CheckOut') { + steps { checkout scm } + } + + + + stage('AnaliseCodigo') { + when { branch 'homolog' } + steps { + withSonarQubeEnv('sonarqube-local'){ + sh 'echo "[ INFO ] Iniciando analise Sonar..." && sonar-scanner \ + -Dsonar.projectKey=SME-PTRF-FrontEnd \ + -Dsonar.sources=.' + } + } + } + + + + stage('Build') { + when { anyOf { branch 'master'; branch 'main'; branch "story/*"; branch 'development'; branch 'develop'; branch 'release'; branch 'homolog'; branch 'homolog-r2'; } } + steps { + script { + imagename1 = "registry.sme.prefeitura.sp.gov.br/${env.branchname}/ptrf-frontend" + //imagename2 = "registry.sme.prefeitura.sp.gov.br/${env.branchname}/sme-outra" + dockerImage1 = docker.build(imagename1, "-f Dockerfile .") + //dockerImage2 = docker.build(imagename2, "-f Dockerfile_outro .") + docker.withRegistry( 'https://registry.sme.prefeitura.sp.gov.br', registryCredential ) { + dockerImage1.push() + //dockerImage2.push() + } + sh "docker rmi $imagename1" + //sh "docker rmi $imagename2" + } + } + } + + stage('Deploy'){ + when { anyOf { branch 'master'; branch 'main'; branch 'develop'; branch 'development'; branch 'release'; branch 'homolog'; branch 'homolog-r2'; } } + steps { + script{ + if ( env.branchname == 'main' || env.branchname == 'master' || env.branchname == 'homolog' || env.branchname == 'release' ) { + sendTelegram("🤩 [Deploy ${env.branchname}] Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nMe aprove! \nLog: \n${env.BUILD_URL}") + timeout(time: 24, unit: "HOURS") { + input message: 'Deseja realizar o deploy?', ok: 'SIM', submitter: 'alessandro_fernandes, kelwy_oliveira, anderson_morais, luis_zimmermann, rodolpho_azeredo, ollyver_ottoboni, rayane_santos, lucas_rocha' + } + } + withCredentials([file(credentialsId: "${kubeconfig}", variable: 'config')]){ + sh('if [ -f '+"$home"+'/.kube/config ]; then rm -f '+"$home"+'/.kube/config; fi') + sh('cp $config '+"$home"+'/.kube/config') + sh "kubectl rollout restart deployment/ptrf-frontend -n ${namespace}" + sh('if [ -f '+"$home"+'/.kube/config ]; then rm -f '+"$home"+'/.kube/config; fi') + } + } + } + } + + stage('Deploy Ambientes'){ + withCredentials([file(credentialsId: "config_release", variable: 'config')]){ + when { anyOf { branch 'master'; branch 'main' } } + steps { + withCredentials([file(credentialsId: "${kubeconfig}", variable: 'config')]){ + sh('cp $config '+"$home"+'/.kube/config') + sh 'kubectl rollout restart deployment/treinamento-frontend -n sme-ptrf-treino' + sh 'kubectl rollout restart deployment/treinamento-frontend -n sme-ptrf-treino2' + sh('if [ -f '+"$home"+'/.kube/config ]; then rm -f '+"$home"+'/.kube/config; fi') + } + } + } + } + } + + post { + success { sendTelegram("🚀 Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nStatus: Success \nLog: \n${env.BUILD_URL}console") } + unstable { sendTelegram("💣 Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nStatus: Unstable \nLog: \n${env.BUILD_URL}console") } + failure { sendTelegram("💥 Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nStatus: Failure \nLog: \n${env.BUILD_URL}console") } + aborted { sendTelegram ("😥 Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nStatus: Aborted \nLog: \n${env.BUILD_URL}console") } + } +} +def sendTelegram(message) { + def encodedMessage = URLEncoder.encode(message, "UTF-8") + withCredentials([string(credentialsId: 'telegramToken', variable: 'TOKEN'), + string(credentialsId: 'telegramChatId', variable: 'CHAT_ID')]) { + response = httpRequest (consoleLogResponseBody: true, + contentType: 'APPLICATION_JSON', + httpMode: 'GET', + url: 'https://api.telegram.org/bot'+"$TOKEN"+'/sendMessage?text='+encodedMessage+'&chat_id='+"$CHAT_ID"+'&disable_web_page_preview=true', + validResponseCodes: '200') + return response + } +} +def getKubeconf(branchName, stageName) { + if("main".equals(branchName)) { return "config_prd"; } + else if ("master".equals(branchName)) { return "config_prd"; } + else if ("homolog".equals(branchName)) { return "config_release"; } + else if ("homolog-r2".equals(branchName)) { return "config_release"; } + else if ("release".equals(branchName)) { return "config_release"; } + else if ("development".equals(branchName)) { return "config_release"; } + else if ("develop".equals(branchName)) { return "config_release"; } + else if ("pre-release".equals(branchName)) { return "config_prd"; } + else if ("atualizarpython".equals(branchName)) { return "config_prd"; } + } From d32428c923afb9b525efb726988c8ac095bf450d Mon Sep 17 00:00:00 2001 From: Matheus Date: Sat, 23 Sep 2023 22:16:31 -0300 Subject: [PATCH 04/27] feat(102929): Unifica endpoint tem_ajuste_bancario com observacoes --- .../DetalheDasPrestacoes/index.js | 30 +++++-------------- .../escolas/PrestacaoDeContas.service.js | 8 ++--- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js index 9c12497c8..1b2a5c241 100644 --- a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js +++ b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js @@ -15,8 +15,7 @@ import { patchDesconciliarDespesa, getDownloadExtratoBancario, pathSalvarJustificativaPrestacaoDeConta, - pathExtratoBancarioPrestacaoDeConta, - getPodeEditarCamposExtrato + pathExtratoBancarioPrestacaoDeConta } from "../../../../services/escolas/PrestacaoDeContas.service"; import {getContas, getPeriodosDePrestacaoDeContasDaAssociacao} from "../../../../services/escolas/Associacao.service"; import Loading from "../../../../utils/Loading"; @@ -173,9 +172,14 @@ export const DetalheDasPrestacoes = () => { if (periodoConta.periodo && periodoConta.conta) { let periodo_uuid = periodoConta.periodo; let conta_uuid = periodoConta.conta; + const associacaoUuid = localStorage.getItem(ASSOCIACAO_UUID) + + let observacao = await getObservacoes(periodo_uuid, conta_uuid, associacaoUuid); + + if(observacao) { + setPermiteEditarCamposExtrato(observacao.permite_editar_campos_extrato) + } - let observacao = await getObservacoes(periodo_uuid, conta_uuid); - if(observacao && observacao.possui_solicitacao_encerramento){ if (periodosAssociacao){ const associacaoUuid = localStorage.getItem(ASSOCIACAO_UUID) @@ -318,24 +322,6 @@ export const DetalheDasPrestacoes = () => { } }; - const verificaSePodeEditarCamposExtrato = useCallback(async (periodoUuid) => { - if (periodosAssociacao) { - const periodo = periodosAssociacao.find(o => o.uuid === periodoUuid); - if (periodo && periodoConta && periodoConta.conta) { - const associacaoUuid = localStorage.getItem(ASSOCIACAO_UUID) - await getPodeEditarCamposExtrato(associacaoUuid, periodoUuid, periodoConta.conta).then(response => { - setPermiteEditarCamposExtrato(response.permite_editar_campos_extrato) - }).catch(error => { - console.log(error); - }); - } - } - }, [periodosAssociacao, periodoConta]); - - useEffect(() => { - verificaSePodeEditarCamposExtrato(periodoConta.periodo); - }, [verificaSePodeEditarCamposExtrato, periodoConta]); - // Tabela Valores Pendentes por Ação const [valoresPendentes, setValoresPendentes] = useState({}); diff --git a/src/services/escolas/PrestacaoDeContas.service.js b/src/services/escolas/PrestacaoDeContas.service.js index 1acb7cb5e..04f4b25ef 100644 --- a/src/services/escolas/PrestacaoDeContas.service.js +++ b/src/services/escolas/PrestacaoDeContas.service.js @@ -105,12 +105,8 @@ export const getDesconciliarReceita = async (receita_uuid, periodo_uuid) => { return (await api.patch(`/api/receitas/${receita_uuid}/desconciliar/?periodo=${periodo_uuid}`, {}, authHeader)).data }; -export const getObservacoes = async (periodo_uuid, conta_uuid) => { - return (await api.get(`/api/conciliacoes/observacoes/?periodo=${periodo_uuid}&conta_associacao=${conta_uuid}`,authHeader)).data -}; - -export const getPodeEditarCamposExtrato = async (associacao_uuid, periodo_uuid, conta_uuid, ) => { - return (await api.get(`/api/conciliacoes/tem_ajuste_bancario/?associacao=${associacao_uuid}&periodo=${periodo_uuid}&conta_associacao=${conta_uuid}`,authHeader)).data +export const getObservacoes = async (periodo_uuid, conta_uuid, associacao_uuid) => { + return (await api.get(`/api/conciliacoes/observacoes/?periodo=${periodo_uuid}&conta_associacao=${conta_uuid}&associacao=${associacao_uuid}`,authHeader)).data }; export const getVisualizarExtratoBancario = async (observacao_uuid) => { From 40a5a2a8616602f52645c1d90edb1b785ed1ae09 Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Sun, 24 Sep 2023 21:01:05 -0300 Subject: [PATCH 05/27] =?UTF-8?q?feat(103824):=20Valida=20data=20inicio=20?= =?UTF-8?q?conta=20no=20formul=C3=A1rio=20de=20gastos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CadastroDeDespesas/CadastroForm.js | 16 ++++- .../CadastroDeDespesas/CadastroFormCapital.js | 7 +- .../CadastroDeDespesas/CadastroFormCusteio.js | 11 +-- .../CadastroFormDespesaImposto.js | 70 ++++++++++--------- .../CadastroDeDespesas/CadastroFormFormik.js | 15 +++- 5 files changed, 75 insertions(+), 44 deletions(-) diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js index 150820799..3a78bfe73 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js @@ -89,7 +89,18 @@ export const CadastroForm = ({verbo_http}) => { return periodo; } - const renderContaAssociacaoOptions = useCallback(() => { + const getOpcoesSelectConta = (data_transacao) => { + return despesasTabelas.contas_associacao.filter((conta) => moment(conta.data_inicio, 'YYYY-MM-DD').toDate() <= data_transacao) + }; + + const renderContaAssociacaoOptions = useCallback((values) => { + + let data_transacao = null; + if (values){ + data_transacao = values['data_transacao'] + } + + const getOptionPorStatus = (item, key) => { const defaultProps = { key: item.uuid, @@ -104,7 +115,7 @@ export const CadastroForm = ({verbo_http}) => { } } return ( - despesasTabelas.contas_associacao.map((item, key) => ( + getOpcoesSelectConta(data_transacao).map((item, key) => ( getOptionPorStatus(item, key) )) ) @@ -1189,6 +1200,7 @@ export const CadastroForm = ({verbo_http}) => { bloqueiaCamposDespesa={bloqueiaCamposDespesa} onCalendarCloseDataDoDocumento={onCalendarCloseDataDoDocumento} renderContaAssociacaoOptions={renderContaAssociacaoOptions} + getOpcoesSelectConta={getOpcoesSelectConta} /> } diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js index c2b034c45..9700c0d36 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js @@ -25,7 +25,8 @@ export const CadastroFormCapital = (propriedades) => { eh_despesa_com_comprovacao_fiscal, eh_despesa_com_retencao_imposto, bloqueiaRateioEstornado, - renderContaAssociacaoOptions + renderContaAssociacaoOptions, + getOpcoesSelectConta } = propriedades; const handleChangeData = (quantidade, valor, setFieldValue) => { @@ -161,9 +162,9 @@ export const CadastroFormCapital = (propriedades) => { name={`rateios[${index}].conta_associacao`} id={`conta_associacao_${index}`} className={`${!rateio.conta_associacao && verboHttp === "PUT" && "is_invalid "} ${!rateio.conta_associacao && 'despesa_incompleta'} form-control`} - disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes)} + disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !formikProps.values['data_transacao']} > - + {renderContaAssociacaoOptions()} diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js index 8a3327e9b..ee3d3f5f6 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js @@ -20,7 +20,8 @@ export const CadastroFormCusteio = (propriedades) => { eh_despesa_com_comprovacao_fiscal, eh_despesa_com_retencao_imposto, bloqueiaRateioEstornado, - renderContaAssociacaoOptions } = propriedades + renderContaAssociacaoOptions, + getOpcoesSelectConta } = propriedades const setValorRateioRealizado=(setFieldValue, index, valor)=>{ setFieldValue(`rateios[${index}].valor_rateio`, trataNumericos(valor)) @@ -125,11 +126,13 @@ export const CadastroFormCusteio = (propriedades) => { name={`rateios[${index}].conta_associacao`} id='conta_associacao' className={`${!rateio.conta_associacao && verboHttp === "PUT" && "is_invalid "} ${!rateio.conta_associacao && 'despesa_incompleta'} form-control`} - disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes)} + disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !formikProps.values['data_transacao']} > - - {renderContaAssociacaoOptions()} + + {renderContaAssociacaoOptions(formikProps.values)} + +
diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js index 30b98f3c2..74b7d3057 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js @@ -7,35 +7,36 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; import {faTimesCircle} from "@fortawesome/free-solid-svg-icons"; export const CadastroFormDespesaImposto = ({ - formikProps, - eh_despesa_com_retencao_imposto, - disabled, - tipos_documento_com_recolhimento_imposto, - numeroDocumentoImpostoReadOnly, - aux, - preenche_tipo_despesa_custeio, - especificacoes_custeio, - despesasTabelas, - cssEscondeDocumentoTransacaoImposto, - labelDocumentoTransacaoImposto, - setCssEscondeDocumentoTransacaoImposto, - setLabelDocumentoTransacaoImposto, - despesaContext, - acoes_custeio, - setValorRateioRealizadoImposto, - readOnlyCamposImposto, - index, - despesa_imposto, - remove, - formErrorsImposto, - onCalendarCloseDataPagamentoImposto, - renderContaAssociacaoOptions - }) => { - + formikProps, + eh_despesa_com_retencao_imposto, + disabled, + tipos_documento_com_recolhimento_imposto, + numeroDocumentoImpostoReadOnly, + aux, + preenche_tipo_despesa_custeio, + especificacoes_custeio, + despesasTabelas, + cssEscondeDocumentoTransacaoImposto, + labelDocumentoTransacaoImposto, + setCssEscondeDocumentoTransacaoImposto, + setLabelDocumentoTransacaoImposto, + despesaContext, + acoes_custeio, + setValorRateioRealizadoImposto, + readOnlyCamposImposto, + index, + despesa_imposto, + remove, + formErrorsImposto, + onCalendarCloseDataPagamentoImposto, + renderContaAssociacaoOptions, + getOpcoesSelectConta +}) => { + return( <>
- {eh_despesa_com_retencao_imposto(formikProps.values) && + {eh_despesa_com_retencao_imposto(formikProps.values) &&
@@ -203,7 +204,10 @@ export const CadastroFormDespesaImposto = ({ value={ despesa_imposto.data_transacao !== null ? despesa_imposto.data_transacao : "" } - onChange={formikProps.setFieldValue} + onChange={(name, value) => { + formikProps.setFieldValue(name, value); + formikProps.setFieldValue(`despesas_impostos[${index}].rateios[0].conta_associacao`, ''); + }} onCalendarClose={async () => { onCalendarCloseDataPagamentoImposto(formikProps.values, formikProps.setFieldValue, index) }} @@ -273,10 +277,10 @@ export const CadastroFormDespesaImposto = ({ name={`despesas_impostos[${index}].rateios[0].conta_associacao`} id={`despesas_impostos[${index}].rateios[0].conta_associacao`} className="form-control" - disabled={readOnlyCamposImposto[index] || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes)} + disabled={readOnlyCamposImposto[index] || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !(despesa_imposto.data_transacao !== null && despesa_imposto.data_transacao !== "")} > - - {renderContaAssociacaoOptions()} + + {renderContaAssociacaoOptions(formikProps.values)}
@@ -322,9 +326,9 @@ export const CadastroFormDespesaImposto = ({
- } + }
- + - ) + ) } \ No newline at end of file diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js index 5f09aa0cf..d19c3457e 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js @@ -108,7 +108,8 @@ export const CadastroFormFormik = ({ parametroLocation, bloqueiaCamposDespesa, onCalendarCloseDataDoDocumento, - renderContaAssociacaoOptions + renderContaAssociacaoOptions, + getOpcoesSelectConta, }) => { // Corrigi Cálculo validação dos valores @@ -116,6 +117,10 @@ export const CadastroFormFormik = ({ values.valor_total = valor } + const resetContaRateios = (setFieldValue, values) => { + setFieldValue('rateios', values.rateios.map((rateio) => {return {...rateio, conta_associacao: ""}})); + }; + return ( <> { + setFieldValue(name, value, true); + resetContaRateios(setFieldValue, props.values); + }} onCalendarClose={async () => { setFormErrors(await validacoesPersonalizadas(values, setFieldValue, "despesa_principal")); onCalendarCloseDataPagamento(values, setFieldValue); @@ -533,6 +541,7 @@ export const CadastroFormFormik = ({ formErrorsImposto={formErrorsImposto} onCalendarCloseDataPagamentoImposto={onCalendarCloseDataPagamentoImposto} renderContaAssociacaoOptions={renderContaAssociacaoOptions} + getOpcoesSelectConta={getOpcoesSelectConta} /> ) @@ -745,6 +754,7 @@ export const CadastroFormFormik = ({ eh_despesa_com_retencao_imposto={eh_despesa_com_retencao_imposto} bloqueiaRateioEstornado={bloqueiaRateioEstornado} renderContaAssociacaoOptions={renderContaAssociacaoOptions} + getOpcoesSelectConta={getOpcoesSelectConta} /> ) : rateio.aplicacao_recurso && rateio.aplicacao_recurso === 'CAPITAL' ? ( @@ -764,6 +774,7 @@ export const CadastroFormFormik = ({ eh_despesa_com_retencao_imposto={eh_despesa_com_retencao_imposto} bloqueiaRateioEstornado={bloqueiaRateioEstornado} renderContaAssociacaoOptions={renderContaAssociacaoOptions} + getOpcoesSelectConta={getOpcoesSelectConta} /> ) : null } From 45cae61cc249219903348e5060f5f6f2b8cf0968 Mon Sep 17 00:00:00 2001 From: rodrigodiaspilotogalvao <60263593+rodrigodiaspilotogalvao@users.noreply.github.com> Date: Mon, 25 Sep 2023 10:52:11 -0300 Subject: [PATCH 06/27] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6ba471a7d..fae4a71bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { branchname = env.BRANCH_NAME.toLowerCase() kubeconfig = getKubeconf(env.branchname) registryCredential = 'jenkins_registry' - namespace = "${env.branchname == 'develop' ? 'sme-ptrf-dev' : env.branchname == 'homolog' ? 'sme-ptrf' : env.branchname == 'homolog-r2' ? 'sme-ptrf-hom2' : 'sme-ptrf' }" + namespace = "${env.branchname == 'develop' ? 'sme-ptrf-dev' : env.branchname == 'homolog' ? 'sme-ptrf-hom' : env.branchname == 'homolog-r2' ? 'sme-ptrf-hom2' : 'sme-ptrf' }" } agent { @@ -111,9 +111,9 @@ def sendTelegram(message) { def getKubeconf(branchName) { if("main".equals(branchName)) { return "config_prd"; } else if ("master".equals(branchName)) { return "config_prd"; } - else if ("homolog".equals(branchName)) { return "config_hom"; } - else if ("homolog-r2".equals(branchName)) { return "config_hom"; } - else if ("release".equals(branchName)) { return "config_hom"; } + else if ("homolog".equals(branchName)) { return "config_release"; } + else if ("homolog-r2".equals(branchName)) { return "config_release"; } + else if ("release".equals(branchName)) { return "config_release"; } else if ("development".equals(branchName)) { return "config_release"; } else if ("develop".equals(branchName)) { return "config_release"; } -} \ No newline at end of file +} From 073c48bec15e14cc795b73f2346975cd49697db5 Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Mon, 25 Sep 2023 16:34:25 -0300 Subject: [PATCH 07/27] =?UTF-8?q?feat(104193):=20Implementa=20alerta=20de?= =?UTF-8?q?=20conclus=C3=A3o=20de=20acertos=20com=20contas=20encerradas=20?= =?UTF-8?q?com=20saldo=20diferente=20de=200.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 2 + src/componentes/Globais/Modal/Modal.js | 25 ++++++++ src/componentes/Globais/Modal/ModalConfirm.js | 57 +++++++++++++++++++ .../escolas/PrestacaoDeContas/index.js | 15 ++++- .../componentes/Globais/Modal/actions.js | 12 ++++ .../componentes/Globais/Modal/reducer.js | 34 +++++++++++ src/store/reducers/index.js | 4 +- 7 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 src/componentes/Globais/Modal/Modal.js create mode 100644 src/componentes/Globais/Modal/ModalConfirm.js create mode 100644 src/store/reducers/componentes/Globais/Modal/actions.js create mode 100644 src/store/reducers/componentes/Globais/Modal/reducer.js diff --git a/src/App.js b/src/App.js index 808cb10e9..1edb0beb5 100644 --- a/src/App.js +++ b/src/App.js @@ -8,6 +8,7 @@ import './assets/css/styles.scss' import {Cabecalho} from './componentes/Globais/Cabecalho' import {SidebarLeft} from './componentes/Globais/SidebarLeft' import {ToastContainer} from "react-toastify"; +import Modal from './componentes/Globais/Modal/Modal' export const App = () => { const pathName = useHistory().location.pathname; @@ -38,6 +39,7 @@ export const App = () => { } + ) diff --git a/src/componentes/Globais/Modal/Modal.js b/src/componentes/Globais/Modal/Modal.js new file mode 100644 index 000000000..5d2c24cee --- /dev/null +++ b/src/componentes/Globais/Modal/Modal.js @@ -0,0 +1,25 @@ +import React from "react"; +import { useDispatch, useSelector } from "react-redux"; +import {Modal} from "react-bootstrap"; +import { closeModal as close } from "../../../store/reducers/componentes/Globais/Modal/actions"; + + +function ModalDialog() { + const dispatch = useDispatch(); + const {open, options} = useSelector(state => state.Modal) + + function handleClose() { + dispatch(close()); + } + return ( + + {options.children} + + ); +} + +export default ModalDialog; \ No newline at end of file diff --git a/src/componentes/Globais/Modal/ModalConfirm.js b/src/componentes/Globais/Modal/ModalConfirm.js new file mode 100644 index 000000000..786007656 --- /dev/null +++ b/src/componentes/Globais/Modal/ModalConfirm.js @@ -0,0 +1,57 @@ +import React from "react"; +import {Button, Modal} from "react-bootstrap"; +import { openModal, closeModal } from "../../../store/reducers/componentes/Globais/Modal/actions"; + +export function ModalConfirm({ + dispatch, + title, + message, + dataQa, + cancelText = "Cancelar", + onCancel, + confirmText = "Confirmar", + onConfirm, +}) { + + + function handleClose() { + if (onCancel) { + onCancel(); + } + + dispatch(closeModal()); + } + + function handleConfirm() { + if (onConfirm) { + onConfirm(); + } + handleClose(); + } + + + return dispatch( + openModal({ + children: ( + <> + + {title} + + + {message} + + + + {onConfirm ? ( + + ) : null} + + + ), + }) + ); +} \ No newline at end of file diff --git a/src/componentes/escolas/PrestacaoDeContas/index.js b/src/componentes/escolas/PrestacaoDeContas/index.js index 29a694a64..b629a9e7a 100644 --- a/src/componentes/escolas/PrestacaoDeContas/index.js +++ b/src/componentes/escolas/PrestacaoDeContas/index.js @@ -26,6 +26,7 @@ import {getRegistrosFalhaGeracaoPc} from "../../../services/Notificacoes.service import {ModalNotificaErroConcluirPC} from "./ModalNotificaErroConcluirPC"; import { ModalPendenciasCadastrais } from "./ModalPendenciasCadastrais"; import { setPersistenteUrlVoltar } from "../../../store/reducers/componentes/escolas/PrestacaoDeContas/PendenciaCadastro/actions"; +import { ModalConfirm } from "../../Globais/Modal/ModalConfirm"; export const PrestacaoDeContas = ({setStatusPC}) => { const history = useHistory(); @@ -333,7 +334,19 @@ export const PrestacaoDeContas = ({setStatusPC}) => { setShowConcluirAcertoComPendencia(true); } else{ - setShowConcluirAcertosSemPendencias(true); + if(statusPrestacaoDeConta.tem_conta_encerrada_com_saldo){ + ModalConfirm({ + dispatch, + title: 'Devido as alterações realizadas houve uma mudança no saldo da conta.', + message: 'A análise da PC não poderá ser concluída pela DRE até a finalização dos acertos que tornem a conta zerada.', + cancelText: 'Voltar', + confirmText: 'Concluir acerto', + dataQa: 'modal-acerto-alterou-saldo-conta-encerrada', + onConfirm: () => setShowConcluirAcertosSemPendencias(true) + }); + } else { + setShowConcluirAcertosSemPendencias(true); + } } } } diff --git a/src/store/reducers/componentes/Globais/Modal/actions.js b/src/store/reducers/componentes/Globais/Modal/actions.js new file mode 100644 index 000000000..b09273edb --- /dev/null +++ b/src/store/reducers/componentes/Globais/Modal/actions.js @@ -0,0 +1,12 @@ +export const OPEN_MODAL = 'OPEN_MODAL' +export const CLOSE_MODAL = 'CLOSE_MODAL' + +export const openModal = (payload) =>({ + type: OPEN_MODAL, + payload, +}) + +export const closeModal = (payload) => ({ + type: CLOSE_MODAL, + payload, +}) \ No newline at end of file diff --git a/src/store/reducers/componentes/Globais/Modal/reducer.js b/src/store/reducers/componentes/Globais/Modal/reducer.js new file mode 100644 index 000000000..beb7be9dc --- /dev/null +++ b/src/store/reducers/componentes/Globais/Modal/reducer.js @@ -0,0 +1,34 @@ +import React from "react"; +import {OPEN_MODAL, CLOSE_MODAL} from "./actions"; + +const initialState = { + open: false, + options: { + children: <>, + }, +} + +export const Modal = (state = initialState, action) => { + switch (action.type) { + case OPEN_MODAL: + return{ + ...state, + open: true, + options: { + ...state.options, + ...action.payload, + }, + } + case CLOSE_MODAL: + return{ + ...state, + open: false, + options: { + children: <>, + }, + } + default: + return state + + } +} \ No newline at end of file diff --git a/src/store/reducers/index.js b/src/store/reducers/index.js index 5ebdd4832..325408744 100644 --- a/src/store/reducers/index.js +++ b/src/store/reducers/index.js @@ -3,10 +3,12 @@ import {DetalharAcertos} from "./componentes/dres/PrestacaoDeContas/DetalhePrest import {DetalharAcertosDocumentos} from "./componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/reducer"; import {DadosAssociacao} from "./componentes/escolas/Associacao/DadosAssociacao/StatusCadastro/reducer"; import { PendenciaCadastro } from "./componentes/escolas/PrestacaoDeContas/PendenciaCadastro/reducer"; +import { Modal } from "./componentes/Globais/Modal/reducer"; export const reducers = combineReducers({ DetalharAcertos, DetalharAcertosDocumentos, DadosAssociacao, - PendenciaCadastro + PendenciaCadastro, + Modal }) \ No newline at end of file From ecf94f40a73ad39f325ece0168b3e6bfe063c116 Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Tue, 26 Sep 2023 13:26:04 -0300 Subject: [PATCH 08/27] =?UTF-8?q?feat(99081):=20Implementa=20valida=C3=A7?= =?UTF-8?q?=C3=A3o=20e=20exclus=C3=A3o=20de=20per=C3=ADodo=20de=20mandato?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/componentes/Globais/Modal/ModalInfo.js | 42 +++++++++++++++++++ .../sme/Mandatos/components/Lista.js | 15 +++++++ .../sme/Mandatos/components/ModalForm.js | 5 +-- .../sme/Mandatos/hooks/useDeleteMandato.js | 34 +++++++++++++++ src/services/Mandatos.service.js | 4 ++ 5 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 src/componentes/Globais/Modal/ModalInfo.js create mode 100644 src/componentes/sme/Mandatos/hooks/useDeleteMandato.js diff --git a/src/componentes/Globais/Modal/ModalInfo.js b/src/componentes/Globais/Modal/ModalInfo.js new file mode 100644 index 000000000..aced48a87 --- /dev/null +++ b/src/componentes/Globais/Modal/ModalInfo.js @@ -0,0 +1,42 @@ +import React from "react"; +import {Button, Modal} from "react-bootstrap"; +import { openModal, closeModal } from "../../../store/reducers/componentes/Globais/Modal/actions"; + +export function ModalInfo({ + dispatch, + title, + message, + dataQa, + cancelText = "Fechar", + onCancel, +}) { + + + function handleClose() { + if (onCancel) { + onCancel(); + } + + dispatch(closeModal()); + } + + return dispatch( + openModal({ + children: ( + <> + + {title} + + + {message} + + + + + + ), + }) + ); +} \ No newline at end of file diff --git a/src/componentes/sme/Mandatos/components/Lista.js b/src/componentes/sme/Mandatos/components/Lista.js index 73ab6822b..843ab6b11 100644 --- a/src/componentes/sme/Mandatos/components/Lista.js +++ b/src/componentes/sme/Mandatos/components/Lista.js @@ -1,4 +1,5 @@ import React, {useContext} from "react"; +import {useDispatch} from "react-redux"; import {Column} from "primereact/column"; import {DataTable} from "primereact/datatable"; import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; @@ -13,13 +14,17 @@ import {usePostMandato} from "../hooks/usePostMandato"; import moment from "moment/moment"; import {ModalInfo} from "./ModalInfo"; import {usePatchMandato} from "../hooks/usePatchMandato"; +import {useDeleteMandato} from "../hooks/useDeleteMandato"; +import { ModalConfirm} from "../../../Globais/Modal/ModalConfirm"; export const Lista = () => { + const dispatch = useDispatch(); const {setShowModalForm, stateFormModal, setStateFormModal, setBloquearBtnSalvarForm} = useContext(MandatosContext) const {isLoading, data} = useGetMandatos() const {mutationPost} = usePostMandato() const {mutationPatch} = usePatchMandato() + const {mutationDelete} = useDeleteMandato() // Necessária pela paginação const {results} = data @@ -68,6 +73,15 @@ export const Lista = () => { } }; + const handleConfirmDeleteMandato = (uuid) => { + ModalConfirm({ + dispatch, + title: 'Tem certeza que deseja deletar período de mandato?', + message: 'Essa ação não poderá ser desfeita.', + onConfirm: () => mutationDelete.mutate({uuid}) + }) + }; + if (isLoading) { return ( {
diff --git a/src/componentes/sme/Mandatos/components/ModalForm.js b/src/componentes/sme/Mandatos/components/ModalForm.js index 9c6d33ead..394ad2c9e 100644 --- a/src/componentes/sme/Mandatos/components/ModalForm.js +++ b/src/componentes/sme/Mandatos/components/ModalForm.js @@ -7,8 +7,7 @@ import {DatePickerField} from "../../../Globais/DatePickerField"; import ReactTooltip from "react-tooltip"; import moment from "moment"; -export const ModalForm = ({handleSubmitFormModal}) => { - +export const ModalForm = ({handleSubmitFormModal, handleConfirmDeleteMandato}) => { const {showModalForm, setShowModalForm, stateFormModal, bloquearBtnSalvarForm} = useContext(MandatosContext) const bodyTextarea = () => { @@ -92,7 +91,7 @@ export const ModalForm = ({handleSubmitFormModal}) => {
{values.uuid && +
- +
diff --git a/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/ModalFormPeriodos.js b/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/ModalFormPeriodos.js index 35d0db227..ce699c317 100644 --- a/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/ModalFormPeriodos.js +++ b/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/ModalFormPeriodos.js @@ -29,6 +29,7 @@ const ModalFormPeriodos = ({show, stateFormModal, handleClose, handleSubmitModal
@@ -138,7 +149,7 @@ const ModalFormPeriodos = ({show, stateFormModal, handleClose, handleSubmitModal {erroDatasAtendemRegras &&
-

{erroDatasAtendemRegras}

+

{erroDatasAtendemRegras}

} @@ -156,17 +167,35 @@ const ModalFormPeriodos = ({show, stateFormModal, handleClose, handleSubmitModal
{values.operacao === 'edit' && values.editavel ? ( - ): null}
- +
{values.operacao === 'create' || (values.operacao === 'edit' && values.editavel) ? (
- +
):null}
diff --git a/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/TabelaPeriodos.js b/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/TabelaPeriodos.js index 700ca7e91..0a508e95b 100644 --- a/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/TabelaPeriodos.js +++ b/src/componentes/sme/Parametrizacoes/Estrutura/Periodos/TabelaPeriodos.js @@ -9,6 +9,7 @@ const TabelaPeriodos = ({rowsPerPage, listaDePeriodos, dataTemplate, acoesTempla rows={rowsPerPage} paginator={listaDePeriodos.length > rowsPerPage} paginatorTemplate="PrevPageLink PageLinks NextPageLink" + id={'tabela-periodos'} > {
- +
diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js index 408b8f50f..b77e59f97 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js @@ -4,8 +4,9 @@ import {PaginasContainer} from "../../../../../../paginas/PaginasContainer"; import {useSelector} from "react-redux"; import {TopoComBotoes} from "./TopoComBotoes"; import CabecalhoDocumento from "./CabecalhoDocumento"; -import {getTiposDeAcertosDocumentos, getSolicitacaoDeAcertosDocumentos, postSolicitacoesParaAcertosDocumentos, getTabelas} from "../../../../../../services/dres/PrestacaoDeContas.service"; +import {getTiposDeAcertosDocumentos, getSolicitacaoDeAcertosDocumentos, postSolicitacoesParaAcertosDocumentos, getTabelas, getContasComMovimentoNaPc} from "../../../../../../services/dres/PrestacaoDeContas.service"; import FormularioAcertos from "./FormularioAcertos"; +import { ModalContaEncerrada } from "../../ConferenciaDeLancamentos/Modais/ModalContaEncerrada"; // Hooks Personalizados import {useCarregaPrestacaoDeContasPorUuid} from "../../../../../../hooks/dres/PrestacaoDeContas/useCarregaPrestacaoDeContasPorUuid"; @@ -26,6 +27,7 @@ const DetalharAcertosDocumentos = () =>{ const [textoCategoria, setTextoCategoria] = useState([]) const [corTextoCategoria, setCorTextoCategoria] = useState([]) const [solicitacoesAcertosDocumentos, setSolicitacoesAcertosDocumentos] = useState({}) + const [showModalContaEncerrada, setShowModalContaEncerrada] = useState(false) const carregaTiposDeAcertoDocumentos = useCallback(async () =>{ if (documentos && documentos[0]){ @@ -86,6 +88,73 @@ const DetalharAcertosDocumentos = () =>{ history.push(`/dre-detalhe-prestacao-de-contas/${prestacao_conta_uuid}#conferencia_de_documentos`) } + const validaContaAoSalvar = async() => { + if (!formRef.current.errors.solicitacoes_acerto && formRef.current.values && formRef.current.values.solicitacoes_acerto) { + let conta_associacao = documentos && documentos[0] && documentos[0].tipo_documento_prestacao_conta && documentos[0].tipo_documento_prestacao_conta.conta_associacao ? documentos[0].tipo_documento_prestacao_conta.conta_associacao : null + let {solicitacoes_acerto} = formRef.current.values + + if(conta_associacao){ + let conta_encerrada = await contaEncerrada(conta_associacao); + + if(conta_encerrada){ + if(possuiAcertosQuePodemAlterarSaldo(solicitacoes_acerto)){ + setShowModalContaEncerrada(true); + } + else{ + await onSubmitFormAcertos(); + } + } + else{ + await onSubmitFormAcertos(); + } + } + } + } + + const contaEncerrada = async(conta_associacao) => { + let contas_com_movimento = await getContasComMovimentoNaPc(prestacaoDeContas.uuid) + let conta_encontrada = contas_com_movimento.find(elemento => elemento.uuid === conta_associacao) + + return conta_encontrada.status === "INATIVA" ? true : false; + } + + const possuiAcertosQuePodemAlterarSaldo = (solicitacoes_acerto) => { + const categoriasQuePodemAlterarSaldoDaConta = [ + 'INCLUSAO_CREDITO', + 'INCLUSAO_GASTO', + ]; + + let possui_acerto_que_altera_saldo = false; + + for(let index_solicitacao_acerto=0; index_solicitacao_acerto <= solicitacoes_acerto.length-1; index_solicitacao_acerto ++){ + let tipo_acerto_uuid = solicitacoes_acerto[index_solicitacao_acerto].tipo_acerto + let categoria = retornaCategoriaTipoAcerto(tipo_acerto_uuid) + + if(categoriasQuePodemAlterarSaldoDaConta.includes(categoria.id)){ + possui_acerto_que_altera_saldo = true; + break; + } + } + + return possui_acerto_que_altera_saldo; + } + + const retornaCategoriaTipoAcerto = (tipo_acerto_uuid) => { + let categoria_encontrada = null; + + for(let index_categoria=0; index_categoria <= tiposDeAcertoDocumentosAgrupados.length -1; index_categoria ++){ + let categoria = tiposDeAcertoDocumentosAgrupados[index_categoria] + + let tipo_acerto = categoria.tipos_acerto_documento.find(elemento => elemento.uuid === tipo_acerto_uuid); + if(tipo_acerto){ + categoria_encontrada = categoria; + break + } + } + + return categoria_encontrada; + } + const onSubmitFormAcertos = async () =>{ if (!formRef.current.errors.solicitacoes_acerto && formRef.current.values && formRef.current.values.solicitacoes_acerto) { @@ -106,6 +175,7 @@ const DetalharAcertosDocumentos = () =>{ try { await postSolicitacoesParaAcertosDocumentos(prestacao_conta_uuid, payload) console.log("Solicitações de Acertos em Documento efetuada com sucesso!") + setShowModalContaEncerrada(false); onClickBtnVoltar(); } catch (e) { console.log("Erro ao fazer Solicitações de Acertos em Documento! ", e.response) @@ -195,7 +265,7 @@ const DetalharAcertosDocumentos = () =>{
{ /> { removeTextoECorCategoriaTipoDeAcertoJaCadastrado={removeTextoECorCategoriaTipoDeAcertoJaCadastrado} ehSolicitacaoCopiada={ehSolicitacaoCopiada} /> + +
+ setShowModalContaEncerrada(false)} + segundoBotaoTexto="Confirmar" + segundoBotaoCss="success" + segundoBotaoOnclick={() => onSubmitFormAcertos()} + handleClose={() => setShowModalContaEncerrada(false)} + /> +
): onClickBtnVoltar() diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/FormularioAcertos.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/FormularioAcertos.js index eb960622b..4ca939a13 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/FormularioAcertos.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/FormularioAcertos.js @@ -8,7 +8,7 @@ import {YupSignupSchemaDetalharAcertos} from './YupSignupSchemaDetalharAcertos' import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; import { ValidarParcialTesouro } from '../../../../../../context/DetalharAcertos'; -export const FormularioAcertos = ({solicitacoes_acerto, listaTiposDeAcertoLancamentosAgrupado, setListaTiposDeAcertoLancamentosAgrupado, onSubmitFormAcertos, formRef, handleChangeTipoDeAcertoLancamento, exibeCamposCategoriaDevolucao, tiposDevolucao, bloqueiaSelectTipoDeAcerto, removeBloqueiaSelectTipoDeAcertoJaCadastrado, textoCategoria, corTextoCategoria, removeTextoECorCategoriaTipoDeAcertoJaCadastrado, adicionaTextoECorCategoriaVazio, ehSolicitacaoCopiada, valorDocumento, lancamentosParaAcertos}) => { +export const FormularioAcertos = ({solicitacoes_acerto, listaTiposDeAcertoLancamentosAgrupado, setListaTiposDeAcertoLancamentosAgrupado, formRef, handleChangeTipoDeAcertoLancamento, exibeCamposCategoriaDevolucao, tiposDevolucao, bloqueiaSelectTipoDeAcerto, removeBloqueiaSelectTipoDeAcertoJaCadastrado, textoCategoria, corTextoCategoria, removeTextoECorCategoriaTipoDeAcertoJaCadastrado, adicionaTextoECorCategoriaVazio, ehSolicitacaoCopiada, valorDocumento, lancamentosParaAcertos, validaContaAoSalvar}) => { useEffect(() => { let statusAcerto = lancamentosParaAcertos[0].documento_mestre.status @@ -130,7 +130,7 @@ export const FormularioAcertos = ({solicitacoes_acerto, listaTiposDeAcertoLancam validateOnBlur={true} validateOnChange={true} validationSchema={YupSignupSchemaDetalharAcertos(uuidDevolucaoTesouro)} - onSubmit={onSubmitFormAcertos} + onSubmit={validaContaAoSalvar} innerRef={formRef} > {props => { diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/TopoComBotoes.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/TopoComBotoes.js index f956a9d16..67b3b829a 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/TopoComBotoes.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/TopoComBotoes.js @@ -4,7 +4,7 @@ import {faArrowLeft} from "@fortawesome/free-solid-svg-icons"; import {ValidarParcialTesouro} from '../../../../../../context/DetalharAcertos' import AssociacaoEPeriodoDoCabecalho from "../../AssociacaoEPeriodoDoCabecalho"; -export const TopoComBotoes = ({onSubmitFormAcertos, onClickBtnVoltar, prestacaoDeContas}) =>{ +export const TopoComBotoes = ({validaContaAoSalvar, onClickBtnVoltar, prestacaoDeContas}) =>{ const {isValorParcialValido} = useContext(ValidarParcialTesouro) return( @@ -21,7 +21,7 @@ export const TopoComBotoes = ({onSubmitFormAcertos, onClickBtnVoltar, prestacaoD
- +
diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js index f4c8848d1..7cacb0878 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js @@ -2,7 +2,7 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from "react"; import {useHistory, useParams} from "react-router-dom"; import {PaginasContainer} from "../../../../../../paginas/PaginasContainer"; import {useSelector} from "react-redux"; -import {getTiposDevolucao, getListaDeSolicitacaoDeAcertos, postSolicitacoesParaAcertos, getTiposDeAcertoLancamentosAgrupadoCategoria} from "../../../../../../services/dres/PrestacaoDeContas.service"; +import {getTiposDevolucao, getListaDeSolicitacaoDeAcertos, postSolicitacoesParaAcertos, getTiposDeAcertoLancamentosAgrupadoCategoria, getContasComMovimentoNaPc} from "../../../../../../services/dres/PrestacaoDeContas.service"; import {TopoComBotoes} from "./TopoComBotoes"; import {TabelaDetalharAcertos} from "./TabelaDetalharAcertos"; import {FormularioAcertos} from "./FormularioAcertos"; @@ -13,6 +13,7 @@ import useDataTemplate from "../../../../../../hooks/Globais/useDataTemplate"; import {ProviderValidaParcial} from "../../../../../../context/DetalharAcertos"; import {useCarregaPrestacaoDeContasPorUuid} from "../../../../../../hooks/dres/PrestacaoDeContas/useCarregaPrestacaoDeContasPorUuid"; import moment from "moment/moment"; +import { ModalContaEncerrada } from "../Modais/ModalContaEncerrada"; export const DetalharAcertos = () => { @@ -34,6 +35,7 @@ export const DetalharAcertos = () => { const [tiposDevolucao, setTiposDevolucao] = useState([]) const [bloqueiaSelectTipoDeAcerto, setBloqueiaSelectTipoDeAcerto] = useState([]) const [loading, setLoading] = useState(true) + const [showModalContaEncerrada, setShowModalContaEncerrada] = useState(false) const totalDelancamentosParaConferencia = useMemo(() => lancamentos_para_acertos.length, [lancamentos_para_acertos]); @@ -297,6 +299,81 @@ export const DetalharAcertos = () => { } } + const validaContaAoSalvar = async() => { + if (!formRef.current.errors.solicitacoes_acerto && formRef.current.values && formRef.current.values.solicitacoes_acerto) { + let {solicitacoes_acerto} = formRef.current.values + let conta_encerrada = await contaEncerrada(); + + if(conta_encerrada){ + if(possuiAcertosQuePodemAlterarSaldo(solicitacoes_acerto)){ + setShowModalContaEncerrada(true); + } + else{ + await onSubmitFormAcertos(); + } + } + else{ + await onSubmitFormAcertos(); + } + } + } + + const contaEncerrada = async() => { + let conta_associacao_dos_lancamentos = null; + + if(lancamentos_para_acertos && lancamentos_para_acertos.length > 0){ + for(let i=0; i<=lancamentos_para_acertos.length-1; i++){ + conta_associacao_dos_lancamentos = lancamentos_para_acertos[i].conta; + break + } + } + + let contas_com_movimento = await getContasComMovimentoNaPc(prestacaoDeContas.uuid) + let conta_encontrada = contas_com_movimento.find(elemento => elemento.uuid === conta_associacao_dos_lancamentos) + + return conta_encontrada.status === "INATIVA" ? true : false; + } + + const possuiAcertosQuePodemAlterarSaldo = (solicitacoes_acerto) => { + const categoriasQuePodemAlterarSaldoDaConta = [ + 'DEVOLUCAO', + 'EDICAO_LANCAMENTO', + 'CONCILIACAO_LANCAMENTO', + 'DESCONCILIACAO_LANCAMENTO', + 'EXCLUSAO_LANCAMENTO' + ]; + + let possui_acerto_que_altera_saldo = false; + + for(let index_solicitacao_acerto=0; index_solicitacao_acerto <= solicitacoes_acerto.length-1; index_solicitacao_acerto ++){ + let tipo_acerto_uuid = solicitacoes_acerto[index_solicitacao_acerto].tipo_acerto + let categoria = retornaCategoriaTipoAcerto(tipo_acerto_uuid); + + if(categoriasQuePodemAlterarSaldoDaConta.includes(categoria.id)){ + possui_acerto_que_altera_saldo = true; + break; + } + } + + return possui_acerto_que_altera_saldo; + } + + const retornaCategoriaTipoAcerto = (tipo_acerto_uuid) => { + let categoria_encontrada = null; + + for(let index_categoria=0; index_categoria <= listaTiposDeAcertoLancamentosAgrupado.length -1; index_categoria ++){ + let categoria = listaTiposDeAcertoLancamentosAgrupado[index_categoria] + + let tipo_acerto = categoria.tipos_acerto_lancamento.find(elemento => elemento.uuid === tipo_acerto_uuid); + if(tipo_acerto){ + categoria_encontrada = categoria; + break + } + } + + return categoria_encontrada; + } + const onSubmitFormAcertos = async () => { if (!formRef.current.errors.solicitacoes_acerto && formRef.current.values && formRef.current.values.solicitacoes_acerto) { @@ -339,6 +416,7 @@ export const DetalharAcertos = () => { try { await postSolicitacoesParaAcertos(prestacao_conta_uuid, payload) + setShowModalContaEncerrada(false); console.log("Solicitações para acertos criadas com sucesso!") onClickBtnVoltar() } catch (e) { @@ -371,7 +449,7 @@ export const DetalharAcertos = () => { <> @@ -394,7 +472,6 @@ export const DetalharAcertos = () => { solicitacoes_acerto={acertos} listaTiposDeAcertoLancamentosAgrupado={listaTiposDeAcertoLancamentosAgrupado} setListaTiposDeAcertoLancamentosAgrupado={setListaTiposDeAcertoLancamentosAgrupado} - onSubmitFormAcertos={onSubmitFormAcertos} formRef={formRef} handleChangeTipoDeAcertoLancamento={handleChangeTipoDeAcertoLancamento} exibeCamposCategoriaDevolucao={exibeCamposCategoriaDevolucao} @@ -409,7 +486,23 @@ export const DetalharAcertos = () => { ehSolicitacaoCopiada={ehSolicitacaoCopiada} valorDocumento={valorDocumento} lancamentosParaAcertos={lancamentos_para_acertos} + validaContaAoSalvar={validaContaAoSalvar} /> + +
+ setShowModalContaEncerrada(false)} + segundoBotaoTexto="Confirmar" + segundoBotaoCss="success" + segundoBotaoOnclick={() => onSubmitFormAcertos()} + handleClose={() => setShowModalContaEncerrada(false)} + /> +
} diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js new file mode 100644 index 000000000..92a166ea9 --- /dev/null +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js @@ -0,0 +1,20 @@ +import {ModalBootstrap} from "../../../../../Globais/ModalBootstrap"; +import React from "react"; + +export const ModalContaEncerrada = (props) => { + return ( + + ) +}; \ No newline at end of file From c91b5a698c3b79425534368323df9ede7cc77743 Mon Sep 17 00:00:00 2001 From: Lucas Santos Rocha Date: Fri, 29 Sep 2023 10:44:36 -0300 Subject: [PATCH 19/27] feat(103826): verifica conta ao criar acertos Altera modal utilizado --- .../DetalharAcertosDocumentos/index.js | 21 ++++++++----------- .../DetalharAcertos/index.js | 21 ++++++++----------- .../Modais/ModalContaEncerrada.js | 20 ------------------ 3 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js index b77e59f97..3d8b5f2d6 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeDocumentos/DetalharAcertosDocumentos/index.js @@ -6,7 +6,7 @@ import {TopoComBotoes} from "./TopoComBotoes"; import CabecalhoDocumento from "./CabecalhoDocumento"; import {getTiposDeAcertosDocumentos, getSolicitacaoDeAcertosDocumentos, postSolicitacoesParaAcertosDocumentos, getTabelas, getContasComMovimentoNaPc} from "../../../../../../services/dres/PrestacaoDeContas.service"; import FormularioAcertos from "./FormularioAcertos"; -import { ModalContaEncerrada } from "../../ConferenciaDeLancamentos/Modais/ModalContaEncerrada"; +import { ModalAntDesignConfirmacao } from "../../../../../Globais/ModalAntDesign"; // Hooks Personalizados import {useCarregaPrestacaoDeContasPorUuid} from "../../../../../../hooks/dres/PrestacaoDeContas/useCarregaPrestacaoDeContasPorUuid"; @@ -285,17 +285,14 @@ const DetalharAcertosDocumentos = () =>{ />
- setShowModalContaEncerrada(false)} - segundoBotaoTexto="Confirmar" - segundoBotaoCss="success" - segundoBotaoOnclick={() => onSubmitFormAcertos()} - handleClose={() => setShowModalContaEncerrada(false)} + onSubmitFormAcertos()} + okText="Confirmar" + handleCancel={(e) => setShowModalContaEncerrada(false)} + cancelText="Cancelar" />
diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js index 7cacb0878..1f9a6a982 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/DetalharAcertos/index.js @@ -13,7 +13,7 @@ import useDataTemplate from "../../../../../../hooks/Globais/useDataTemplate"; import {ProviderValidaParcial} from "../../../../../../context/DetalharAcertos"; import {useCarregaPrestacaoDeContasPorUuid} from "../../../../../../hooks/dres/PrestacaoDeContas/useCarregaPrestacaoDeContasPorUuid"; import moment from "moment/moment"; -import { ModalContaEncerrada } from "../Modais/ModalContaEncerrada"; +import { ModalAntDesignConfirmacao } from "../../../../../Globais/ModalAntDesign"; export const DetalharAcertos = () => { @@ -490,17 +490,14 @@ export const DetalharAcertos = () => { />
- setShowModalContaEncerrada(false)} - segundoBotaoTexto="Confirmar" - segundoBotaoCss="success" - segundoBotaoOnclick={() => onSubmitFormAcertos()} - handleClose={() => setShowModalContaEncerrada(false)} + onSubmitFormAcertos()} + okText="Confirmar" + handleCancel={(e) => setShowModalContaEncerrada(false)} + cancelText="Cancelar" />
diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js deleted file mode 100644 index 92a166ea9..000000000 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalContaEncerrada.js +++ /dev/null @@ -1,20 +0,0 @@ -import {ModalBootstrap} from "../../../../../Globais/ModalBootstrap"; -import React from "react"; - -export const ModalContaEncerrada = (props) => { - return ( - - ) -}; \ No newline at end of file From e198447400c699615c70585c27beed992a96a346 Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 29 Sep 2023 11:23:35 -0300 Subject: [PATCH 20/27] feat(103823): tratamento data inicial conta no credito escola --- .../Receitas/Formularios/ReceitaFormFormik.js | 22 ++++++++++---- .../escolas/Receitas/Formularios/index.js | 29 +++++++++++++++++-- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/componentes/escolas/Receitas/Formularios/ReceitaFormFormik.js b/src/componentes/escolas/Receitas/Formularios/ReceitaFormFormik.js index 016107acb..74f18c82d 100644 --- a/src/componentes/escolas/Receitas/Formularios/ReceitaFormFormik.js +++ b/src/componentes/escolas/Receitas/Formularios/ReceitaFormFormik.js @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect } from "react"; import {ReceitaSchema} from "../Schemas"; import {visoesService} from "../../../../services/visoes.service"; import {DatePickerField} from "../../../Globais/DatePickerField"; @@ -76,6 +76,7 @@ export const ReceitaFormFormik = ({ validacoesPersonalizadasCredito, formDateErrors, escondeBotaoDeletar, + mensagemDataInicialConta }) => { return ( @@ -224,7 +225,10 @@ export const ReceitaFormFormik = ({ name="data" id="data" value={values.data} - onChange={setFieldValue} + onChange={(name, value) => { + setFieldValue('conta_associacao', ''); + setFieldValue(name, value); + }} onCalendarClose={async () => { validacoesPersonalizadasCredito(values, setFieldValue, "credito_principal") }} @@ -249,14 +253,20 @@ export const ReceitaFormFormik = ({ onChange={props.handleChange} onBlur={props.handleBlur} className="form-control" - disabled={readOnlyEstorno || readOnlyValor || readOnlyCampos || readOnlyContaAssociacaoReceita || ![['add_receita'], ['change_receita']].some(visoesService.getPermissoes)} + disabled={mensagemDataInicialConta || readOnlyEstorno || readOnlyValor || readOnlyCampos || readOnlyContaAssociacaoReceita || ![['add_receita'], ['change_receita']].some(visoesService.getPermissoes) || !values.data} > - {receita.conta_associacao - ? null - : } + + {!receita.conta_associacao || props.values.conta_associacao === "" ? ( + + ) : null} {retornaTiposDeContas(props.values)} + {mensagemDataInicialConta && {mensagemDataInicialConta} + } {props.touched.conta_associacao && props.errors.conta_associacao && {props.errors.conta_associacao}} diff --git a/src/componentes/escolas/Receitas/Formularios/index.js b/src/componentes/escolas/Receitas/Formularios/index.js index 9cdfb382c..1a49aa467 100644 --- a/src/componentes/escolas/Receitas/Formularios/index.js +++ b/src/componentes/escolas/Receitas/Formularios/index.js @@ -101,6 +101,7 @@ export const ReceitaForm = () => { const [classificacoesAceitas, setClassificacoesAceitas] = useState([]) const [tituloModalCancelar, setTituloModalCancelar] = useState("Deseja cancelar a inclusão de crédito?") const [periodosValidosAssociacaoencerrada, setPeriodosValidosAssociacaoencerrada] = useState([]) + const [mensagemDataInicialConta, setMensagemDataInicialConta] = useState("") // ************* Modo Estorno const [readOnlyEstorno, setReadOnlyEstorno] = useState(false); @@ -888,6 +889,27 @@ export const ReceitaForm = () => { } }; + const filtraContasPelaDataInicial = ({contasNaoFiltradas = [], dataDigitadaFormulario = initialValue.data}) => { + let contasFiltradasPelaDataInicial = [] + + if(contasNaoFiltradas && dataDigitadaFormulario) { + contasFiltradasPelaDataInicial = contasNaoFiltradas.filter((acc) => { + if (acc.data_inicio && moment(acc.data_inicio, 'YYYY-MM-DD').isValid()) { + return moment(acc.data_inicio, 'YYYY-MM-DD').toDate() <= moment(dataDigitadaFormulario, 'YYYY-MM-DD').toDate(); + } + return false; + }); + + if(!contasFiltradasPelaDataInicial.length) { + setMensagemDataInicialConta("Não existem contas disponíveis para a data do crédito.") + } else { + setMensagemDataInicialConta("") + } + } + + return contasFiltradasPelaDataInicial; + } + const retornaTiposDeContas = (values) => { if (tabelas.contas_associacao !== undefined && tabelas.contas_associacao.length > 0 && values.tipo_receita && e_repasse(values) && Object.keys(repasse).length !== 0) { @@ -915,9 +937,11 @@ export const ReceitaForm = () => { return } } - // Filtra as contas pelos tipos aceitos + + const contasFiltradasPelaDataInicialEPeloTipo = filtraContasPelaDataInicial({contasNaoFiltradas: tabelas.contas_associacao.filter(conta => (tipos_conta.includes(conta.nome))), dataDigitadaFormulario: values.data}) + return ( - tabelas.contas_associacao.filter(conta => (tipos_conta.includes(conta.nome))).map((item, key) => ( + contasFiltradasPelaDataInicialEPeloTipo.map((item, key) => ( getOptionPorStatus(item) ))) } @@ -1280,6 +1304,7 @@ export const ReceitaForm = () => { validacoesPersonalizadasCredito={validacoesPersonalizadasCredito} formDateErrors={formDateErrors} escondeBotaoDeletar={escondeBotaoDeletar} + mensagemDataInicialConta={mensagemDataInicialConta} />
Date: Fri, 29 Sep 2023 13:29:56 -0300 Subject: [PATCH 21/27] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 73201fa27..37857b7bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,7 @@ pipeline { if ( env.branchname == 'main' || env.branchname == 'master' || env.branchname == 'homolog' || env.branchname == 'release' ) { sendTelegram("🤩 [Deploy ${env.branchname}] Job Name: ${JOB_NAME} \nBuild: ${BUILD_DISPLAY_NAME} \nMe aprove! \nLog: \n${env.BUILD_URL}") timeout(time: 24, unit: "HOURS") { - input message: 'Deseja realizar o deploy?', ok: 'SIM', submitter: 'alessandro_fernandes, kelwy_oliveira, anderson_morais, luis_zimmermann, rodolpho_azeredo, ollyver_ottoboni, rayane_santos, lucas_rocha' + input message: 'Deseja realizar o deploy?', ok: 'SIM', submitter: 'alessandro_fernandes, kelwy_oliveira, anderson_morais, luis_zimmermann, rodolpho_azeredo, ollyver_ottoboni, rayane_santos, lucas_rocha, matheus_diori' } } withCredentials([file(credentialsId: "${kubeconfig}", variable: 'config')]){ From f54814e95b1436aefabcf47eb48003b577db85c2 Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 29 Sep 2023 17:40:01 -0300 Subject: [PATCH 22/27] feat(104192): Nao permite concluir analise conta nao zerada --- ...loqueioConclusaoContaEncerradaNaoZerada.js | 16 ++++++++++ .../GetComportamentoPorStatus.js | 5 +-- .../DetalhePrestacaoDeContas/index.js | 31 ++++++++++++++++++- .../dres/PrestacaoDeContas.service.js | 4 +++ 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js new file mode 100644 index 000000000..900c6d1d7 --- /dev/null +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js @@ -0,0 +1,16 @@ +import {ModalBootstrap} from "../../../../../Globais/ModalBootstrap"; +import React from "react"; + +export const ModalBloqueioConclusaoContaEncerradaNaoZerada = (props) => { + return ( + + ) +}; \ No newline at end of file diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/GetComportamentoPorStatus.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/GetComportamentoPorStatus.js index 7fe345ed0..3c569e83d 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/GetComportamentoPorStatus.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/GetComportamentoPorStatus.js @@ -61,7 +61,8 @@ export const GetComportamentoPorStatus = ( onClickDeletarAcertoSaldo, setAnalisesDeContaDaPrestacao, bloqueiaBtnRetroceder, - tooltipRetroceder + tooltipRetroceder, + handleConcluirPCemAnalise }) => { const TEMPERMISSAO = RetornaSeTemPermissaoEdicaoAcompanhamentoDePc() @@ -162,7 +163,7 @@ export const GetComportamentoPorStatus = ( prestacaoDeContas={prestacaoDeContas} textoBtnAvancar={"Concluir análise"} textoBtnRetroceder={"Recebida"} - metodoAvancar={() => setShowConcluirAnalise(true)} + metodoAvancar={() => handleConcluirPCemAnalise()} metodoRetroceder={() => setShowRecebida(true)} disabledBtnAvancar={!TEMPERMISSAO} disabledBtnRetroceder={bloqueiaBtnRetroceder() || !TEMPERMISSAO} diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js index 9f368f5aa..74fd8d3a3 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js @@ -10,7 +10,8 @@ import { getUltimaAnalisePc, postAnaliseAjustesSaldoPorConta, deleteAnaliseAjustesSaldoPorConta, - getAnaliseAjustesSaldoPorConta + getAnaliseAjustesSaldoPorConta, + getStatusPeriodo } from "../../../../services/dres/PrestacaoDeContas.service"; import {getTabelasPrestacoesDeContas, getReceberPrestacaoDeContas, getReabrirPrestacaoDeContas, getDesfazerRecebimento, getAnalisarPrestacaoDeContas, getDesfazerAnalise, getSalvarAnalise, getInfoAta, getConcluirAnalise, getDespesasPorFiltros, getTiposDevolucao} from "../../../../services/dres/PrestacaoDeContas.service"; import {patchReceberAposAcertos} from "../../../../services/dres/PrestacaoDeContas.service"; @@ -23,6 +24,7 @@ import {ModalRecebida} from "../ModalRecebida"; import {ModalConcluirAnalise} from "../ModalConcluirAnalise"; import {ModalVoltarParaAnalise} from "../ModalVoltarParaAnalise"; import { ModalDeleteAjusteSaldoPC } from "../ModalDeleteAjusteSaldoPC"; +import { ModalBloqueioConclusaoContaEncerradaNaoZerada } from "./ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada"; import {getDespesasTabelas} from "../../../../services/escolas/Despesas.service"; import {trataNumericos} from "../../../../utils/ValidacoesAdicionaisFormularios"; import {GetComportamentoPorStatus} from "./GetComportamentoPorStatus"; @@ -117,6 +119,8 @@ export const DetalhePrestacaoDeContas = () =>{ const [showConcluirAnalise, setShowConcluirAnalise] = useState(false); const [showVoltarParaAnalise, setShowVoltarParaAnalise] = useState(false); const [showNaoPodeVoltarParaAnalise, setShowNaoPodeVoltarParaAnalise] = useState(false); + const [showModalBloqueioConclusaoContaEncerradaNaoZerada,setShowModalBloqueioConclusaoContaEncerradaNaoZerada] = useState(false); + const [tiposContasEncerradasComSaldo, setTiposContasEncerradasComSaldo] = useState([]); const [redirectListaPc, setRedirectListaPc] = useState(false); const [informacoesPrestacaoDeContas, setInformacoesPrestacaoDeContas] = useState(initialInformacoesPrestacaoDeContas); const [clickBtnEscolheConta, setClickBtnEscolheConta] = useState({0: true, key_0: true}); @@ -143,6 +147,7 @@ export const DetalhePrestacaoDeContas = () =>{ const [ajusteSaldoSalvoComSucesso, setAjusteSaldoSalvoComSucesso] = useState([]); const [showDeleteAjusteSaldoPC, setShowDeleteAjusteSaldoPC] = useState(false); const [periodoReferencia, setPeriodoReferencia] = useState(''); + const [periodo, setPeriodo] = useState(''); useEffect(()=>{ carregaPrestacaoDeContas(); @@ -194,6 +199,7 @@ export const DetalhePrestacaoDeContas = () =>{ if (prestacaoDeContas?.periodo_uuid){ let periodo = await getPeriodoPorUuid(prestacaoDeContas?.periodo_uuid); setPeriodoReferencia(periodo.referencia) + setPeriodo(periodo) } } retornaPeriodo(); @@ -758,6 +764,7 @@ export const DetalhePrestacaoDeContas = () =>{ setshowErroPrestacaoDeContasPosterior(false); setShowDeleteAjusteSaldoPC(false); setShowNaoPodeVoltarParaAnalise(false); + setShowModalBloqueioConclusaoContaEncerradaNaoZerada(false); }; const onCloseModalSalvarAnalise = () => { @@ -1075,6 +1082,17 @@ export const DetalhePrestacaoDeContas = () =>{ return null; } + const handleConcluirPCemAnalise = async () => { + let status = await getStatusPeriodo(prestacaoDeContas.associacao.uuid, periodo.data_inicio_realizacao_despesas); + + if(status.tem_conta_encerrada_com_saldo) { + setTiposContasEncerradasComSaldo(['Cheque', 'Cartão']) + setShowModalBloqueioConclusaoContaEncerradaNaoZerada(true); + } else { + setShowConcluirAnalise(true); + } + } + return(

Acompanhamento das Prestações de Contas

@@ -1152,6 +1170,7 @@ export const DetalhePrestacaoDeContas = () =>{ setAnalisesDeContaDaPrestacao={setAnalisesDeContaDaPrestacao} bloqueiaBtnRetroceder={bloqueiaBtnRetroceder} tooltipRetroceder={adicionaTooltipBtnRetroceder} + handleConcluirPCemAnalise={handleConcluirPCemAnalise} /> } @@ -1279,6 +1298,16 @@ export const DetalhePrestacaoDeContas = () =>{ segundoBotaoTexto="Confirmar exclusão" />
+
+ 1 ? `

A análise não pode ser concluída pois as contas ${tiposContasEncerradasComSaldo} foram encerradas e os saldos foram alterados. Favor solicitar os acertos necessários para que as contas sejam zeradas.

`:`

A análise não pode ser concluída pois a conta ${tiposContasEncerradasComSaldo} foi encerrada e o saldo foi alterado. Favor solicitar os acertos necessários para que a conta seja zerada.

`} + primeiroBotaoTexto="Fechar" + primeiroBotaoCss="success" + /> +
{redirectListaPc && { export const getTagsConferenciaDocumento = async () => { return (await api.get(`/api/analises-documento-prestacao-conta/tags-informacoes-conferencia/`, authHeader)).data } + +export const getStatusPeriodo = async (uuid_associacao, data_incial_periodo) => { + return(await api.get(`/api/associacoes/${uuid_associacao}/status-periodo/?data=${data_incial_periodo}`, authHeader)).data + }; \ No newline at end of file From cc29dac0857ebd37c0b24942c829551a3898e83c Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Fri, 29 Sep 2023 19:17:48 -0300 Subject: [PATCH 23/27] =?UTF-8?q?feat(104193):=20Corrige=20din=C3=A2mica?= =?UTF-8?q?=20select=20de=20contas=20ativas=20e=20encerradas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CadastroDeDespesas/CadastroForm.js | 43 +++++++++++++------ .../CadastroDeDespesas/CadastroFormCapital.js | 14 ++++-- .../CadastroDeDespesas/CadastroFormCusteio.js | 17 +++++--- .../CadastroFormDespesaImposto.js | 14 ++++-- .../CadastroDeDespesas/CadastroFormFormik.js | 14 ++---- 5 files changed, 66 insertions(+), 36 deletions(-) diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js index 3a78bfe73..3e8d4c97a 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroForm.js @@ -89,18 +89,28 @@ export const CadastroForm = ({verbo_http}) => { return periodo; } - const getOpcoesSelectConta = (data_transacao) => { - return despesasTabelas.contas_associacao.filter((conta) => moment(conta.data_inicio, 'YYYY-MM-DD').toDate() <= data_transacao) - }; - - const renderContaAssociacaoOptions = useCallback((values) => { + const isEditing = () => { + return despesaContext.verboHttp === "PUT"; + } + const filterContas = (data) => { let data_transacao = null; - if (values){ - data_transacao = values['data_transacao'] + + if(moment.isMoment(data)){ + data_transacao = data + } else { + data_transacao = moment(data, 'YYYY-MM-DD').toDate() + } - + return despesasTabelas.contas_associacao.filter((conta) => + (moment(conta.data_inicio, 'YYYY-MM-DD').toDate() <= data_transacao) && + (!conta.solicitacao_encerramento || (conta.solicitacao_encerramento && + moment(conta.solicitacao_encerramento.data_de_encerramento_na_agencia, 'YYYY-MM-DD').toDate() > data_transacao)) + ) + } + + const renderContaAssociacaoOptions = useCallback((data_transacao) => { const getOptionPorStatus = (item, key) => { const defaultProps = { key: item.uuid, @@ -109,13 +119,16 @@ export const CadastroForm = ({verbo_http}) => { if(item.status === STATUS_CONTA_ASSOCIACAO.ATIVA){ return - } else if(item.solicitacao_encerramento && item.solicitacao_encerramento.status !== STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO.APROVADA) { + } else if(item.solicitacao_encerramento && (item.solicitacao_encerramento.status !== STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO.APROVADA) && !isEditing()) { let informacaoExtra = item.solicitacao_encerramento ? `- Conta encerrada em ${moment(item.solicitacao_encerramento.data_de_encerramento_na_agencia).format('DD/MM/YYYY')}` : '' return + } else if(item.solicitacao_encerramento && isEditing()){ + let informacaoExtra = item.solicitacao_encerramento ? `- Conta encerrada em ${moment(item.solicitacao_encerramento.data_de_encerramento_na_agencia).format('DD/MM/YYYY')}` : '' + return } - } + } return ( - getOpcoesSelectConta(data_transacao).map((item, key) => ( + filterContas(data_transacao).map((item, key) => ( getOptionPorStatus(item, key) )) ) @@ -591,11 +604,17 @@ export const CadastroForm = ({verbo_http}) => { const handleErroCriarDespesa = (response) => { let mensagemErro = 'Verifique se os dados foram preenchidos corretamente.' + if (response && response.data){ if (response.data.hasOwnProperty("rateios")) { const rateios = response.data.rateios[0]; mensagemErro += " Rateios: " + rateios.mensagem.map((msg) => msg).join(", ") } + if(response.data.hasOwnProperty("mensagem")){ + if(response.data.mensagem.length){ + mensagemErro = response.data.mensagem[0]; + } + } } toastCustom.ToastCustomError('Erro ao tentar salvar despesa.', mensagemErro) }; @@ -1200,7 +1219,7 @@ export const CadastroForm = ({verbo_http}) => { bloqueiaCamposDespesa={bloqueiaCamposDespesa} onCalendarCloseDataDoDocumento={onCalendarCloseDataDoDocumento} renderContaAssociacaoOptions={renderContaAssociacaoOptions} - getOpcoesSelectConta={getOpcoesSelectConta} + filterContas={filterContas} /> } diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js index 9700c0d36..6978480cc 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCapital.js @@ -13,7 +13,6 @@ export const CadastroFormCapital = (propriedades) => { const { formikProps, rateio, - rateios, index, despesasTabelas, especificaoes_capital, @@ -26,7 +25,7 @@ export const CadastroFormCapital = (propriedades) => { eh_despesa_com_retencao_imposto, bloqueiaRateioEstornado, renderContaAssociacaoOptions, - getOpcoesSelectConta + filterContas } = propriedades; const handleChangeData = (quantidade, valor, setFieldValue) => { @@ -164,9 +163,16 @@ export const CadastroFormCapital = (propriedades) => { className={`${!rateio.conta_associacao && verboHttp === "PUT" && "is_invalid "} ${!rateio.conta_associacao && 'despesa_incompleta'} form-control`} disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !formikProps.values['data_transacao']} > - - {renderContaAssociacaoOptions()} + + {renderContaAssociacaoOptions(formikProps.values.data_transacao)} + { + (formikProps.values.data_transacao && !filterContas(formikProps.values.data_transacao).length) ? + + Não existem contas disponíveis para a data do pagamento + : null + }
diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js index ee3d3f5f6..b797e513e 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormCusteio.js @@ -8,7 +8,6 @@ export const CadastroFormCusteio = (propriedades) => { const { formikProps, rateio, - rateios, index, despesasTabelas, especificacoes_custeio, @@ -21,7 +20,8 @@ export const CadastroFormCusteio = (propriedades) => { eh_despesa_com_retencao_imposto, bloqueiaRateioEstornado, renderContaAssociacaoOptions, - getOpcoesSelectConta } = propriedades + filterContas + } = propriedades const setValorRateioRealizado=(setFieldValue, index, valor)=>{ setFieldValue(`rateios[${index}].valor_rateio`, trataNumericos(valor)) @@ -128,11 +128,16 @@ export const CadastroFormCusteio = (propriedades) => { className={`${!rateio.conta_associacao && verboHttp === "PUT" && "is_invalid "} ${!rateio.conta_associacao && 'despesa_incompleta'} form-control`} disabled={disabled || bloqueiaRateioEstornado(rateio) || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !formikProps.values['data_transacao']} > - - {renderContaAssociacaoOptions(formikProps.values)} + + {renderContaAssociacaoOptions(formikProps.values.data_transacao)} - - + { + (formikProps.values.data_transacao && !filterContas(formikProps.values.data_transacao).length) ? + + Não existem contas disponíveis para a data do pagamento + : null + }
diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js index 74b7d3057..c2ef9aa85 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormDespesaImposto.js @@ -30,7 +30,7 @@ export const CadastroFormDespesaImposto = ({ formErrorsImposto, onCalendarCloseDataPagamentoImposto, renderContaAssociacaoOptions, - getOpcoesSelectConta + filterContas }) => { return( @@ -206,7 +206,6 @@ export const CadastroFormDespesaImposto = ({ } onChange={(name, value) => { formikProps.setFieldValue(name, value); - formikProps.setFieldValue(`despesas_impostos[${index}].rateios[0].conta_associacao`, ''); }} onCalendarClose={async () => { onCalendarCloseDataPagamentoImposto(formikProps.values, formikProps.setFieldValue, index) @@ -279,9 +278,16 @@ export const CadastroFormDespesaImposto = ({ className="form-control" disabled={readOnlyCamposImposto[index] || ![['add_despesa'], ['change_despesa']].some(visoesService.getPermissoes) || !(despesa_imposto.data_transacao !== null && despesa_imposto.data_transacao !== "")} > - - {renderContaAssociacaoOptions(formikProps.values)} + + {renderContaAssociacaoOptions(despesa_imposto.data_transacao)} + { + (despesa_imposto.data_transacao && !filterContas(despesa_imposto.data_transacao).length) ? + + Não existem contas disponíveis para a data do pagamento + : null + }
diff --git a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js index d19c3457e..cda5f2d35 100644 --- a/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js +++ b/src/componentes/escolas/Despesas/CadastroDeDespesas/CadastroFormFormik.js @@ -109,18 +109,13 @@ export const CadastroFormFormik = ({ bloqueiaCamposDespesa, onCalendarCloseDataDoDocumento, renderContaAssociacaoOptions, - getOpcoesSelectConta, + filterContas }) => { // Corrigi Cálculo validação dos valores const setaValorRealizado = (values, valor) =>{ values.valor_total = valor } - - const resetContaRateios = (setFieldValue, values) => { - setFieldValue('rateios', values.rateios.map((rateio) => {return {...rateio, conta_associacao: ""}})); - }; - return ( <> { setFieldValue(name, value, true); - resetContaRateios(setFieldValue, props.values); }} onCalendarClose={async () => { setFormErrors(await validacoesPersonalizadas(values, setFieldValue, "despesa_principal")); @@ -541,7 +535,7 @@ export const CadastroFormFormik = ({ formErrorsImposto={formErrorsImposto} onCalendarCloseDataPagamentoImposto={onCalendarCloseDataPagamentoImposto} renderContaAssociacaoOptions={renderContaAssociacaoOptions} - getOpcoesSelectConta={getOpcoesSelectConta} + filterContas={filterContas} />
) @@ -754,7 +748,7 @@ export const CadastroFormFormik = ({ eh_despesa_com_retencao_imposto={eh_despesa_com_retencao_imposto} bloqueiaRateioEstornado={bloqueiaRateioEstornado} renderContaAssociacaoOptions={renderContaAssociacaoOptions} - getOpcoesSelectConta={getOpcoesSelectConta} + filterContas={filterContas} /> ) : rateio.aplicacao_recurso && rateio.aplicacao_recurso === 'CAPITAL' ? ( @@ -774,7 +768,7 @@ export const CadastroFormFormik = ({ eh_despesa_com_retencao_imposto={eh_despesa_com_retencao_imposto} bloqueiaRateioEstornado={bloqueiaRateioEstornado} renderContaAssociacaoOptions={renderContaAssociacaoOptions} - getOpcoesSelectConta={getOpcoesSelectConta} + filterContas={filterContas} /> ) : null } From 6a8f6560d3a6fd6c34f233481d24cab96c0ceb0a Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 2 Oct 2023 02:01:15 -0300 Subject: [PATCH 24/27] feat(104192): Corrige layout modal aviso bloqueio conclusao pc --- src/assets/img/icone-modal-aviso-vermelho.svg | 6 +++ .../ModalAntDesign/modal-antdesign.scss | 16 ++++++++ .../Globais/ModalAntDesign/modalAviso.js | 38 +++++++++++++++++++ ...loqueioConclusaoContaEncerradaNaoZerada.js | 16 -------- .../DetalhePrestacaoDeContas/index.js | 17 ++++----- .../DetalheDasPrestacoes/index.js | 18 ++++++--- .../PrestacaoDeContas/SelectPeriodoConta.js | 4 +- 7 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 src/assets/img/icone-modal-aviso-vermelho.svg create mode 100644 src/componentes/Globais/ModalAntDesign/modalAviso.js delete mode 100644 src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js diff --git a/src/assets/img/icone-modal-aviso-vermelho.svg b/src/assets/img/icone-modal-aviso-vermelho.svg new file mode 100644 index 000000000..7154f9479 --- /dev/null +++ b/src/assets/img/icone-modal-aviso-vermelho.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/componentes/Globais/ModalAntDesign/modal-antdesign.scss b/src/componentes/Globais/ModalAntDesign/modal-antdesign.scss index ac897c9c1..f9542cde9 100644 --- a/src/componentes/Globais/ModalAntDesign/modal-antdesign.scss +++ b/src/componentes/Globais/ModalAntDesign/modal-antdesign.scss @@ -19,3 +19,19 @@ } } } + +.modal-ant-design{ + .title-modal-antdesign-aviso{ + font-weight: 700; + font-size: 24px; + line-height: 28px; + color: #42474A; + } + + .text-modal-antdesign-aviso{ + font-weight: 400; + font-size: 18px; + line-height: 24px; + color: #B40C02; + } +} \ No newline at end of file diff --git a/src/componentes/Globais/ModalAntDesign/modalAviso.js b/src/componentes/Globais/ModalAntDesign/modalAviso.js new file mode 100644 index 000000000..0c1ab0f9c --- /dev/null +++ b/src/componentes/Globais/ModalAntDesign/modalAviso.js @@ -0,0 +1,38 @@ +import React from "react"; +import { Modal } from 'antd'; +import "./modal-antdesign.scss" +import IconeAvisoVermelho from "../../../assets/img/icone-modal-aviso-vermelho.svg" + + +export const ModalAntDesignAviso = (propriedades) => { + return( +
+ +
+
+
+ +
+
+ +
+
+

{propriedades.titulo}

+
+
+

{propriedades.bodyText}

+
+
+
+ +
+ + + ) +} \ No newline at end of file diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js deleted file mode 100644 index 900c6d1d7..000000000 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada.js +++ /dev/null @@ -1,16 +0,0 @@ -import {ModalBootstrap} from "../../../../../Globais/ModalBootstrap"; -import React from "react"; - -export const ModalBloqueioConclusaoContaEncerradaNaoZerada = (props) => { - return ( - - ) -}; \ No newline at end of file diff --git a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js index 74fd8d3a3..96c130710 100644 --- a/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js +++ b/src/componentes/dres/PrestacaoDeContas/DetalhePrestacaoDeContas/index.js @@ -24,13 +24,13 @@ import {ModalRecebida} from "../ModalRecebida"; import {ModalConcluirAnalise} from "../ModalConcluirAnalise"; import {ModalVoltarParaAnalise} from "../ModalVoltarParaAnalise"; import { ModalDeleteAjusteSaldoPC } from "../ModalDeleteAjusteSaldoPC"; -import { ModalBloqueioConclusaoContaEncerradaNaoZerada } from "./ConferenciaDeLancamentos/Modais/ModalBloqueioConclusaoContaEncerradaNaoZerada"; import {getDespesasTabelas} from "../../../../services/escolas/Despesas.service"; import {trataNumericos} from "../../../../utils/ValidacoesAdicionaisFormularios"; import {GetComportamentoPorStatus} from "./GetComportamentoPorStatus"; import {ModalSalvarPrestacaoDeContasAnalise} from "../../../../utils/Modais"; import Loading from "../../../../utils/Loading"; import {toastCustom} from "../../../Globais/ToastCustom"; +import {ModalAntDesignAviso} from "../../../Globais/ModalAntDesign/modalAviso" import {ModalNaoPodeVoltarParaAnalise} from "../ModalNaoPodeVoltarParaAnalise"; import { getPeriodoPorUuid } from "../../../../services/sme/Parametrizacoes.service"; @@ -1086,7 +1086,7 @@ export const DetalhePrestacaoDeContas = () =>{ let status = await getStatusPeriodo(prestacaoDeContas.associacao.uuid, periodo.data_inicio_realizacao_despesas); if(status.tem_conta_encerrada_com_saldo) { - setTiposContasEncerradasComSaldo(['Cheque', 'Cartão']) + setTiposContasEncerradasComSaldo(status.tipos_das_contas_encerradas_com_saldo) setShowModalBloqueioConclusaoContaEncerradaNaoZerada(true); } else { setShowConcluirAnalise(true); @@ -1299,13 +1299,12 @@ export const DetalhePrestacaoDeContas = () =>{ />
- 1 ? `

A análise não pode ser concluída pois as contas ${tiposContasEncerradasComSaldo} foram encerradas e os saldos foram alterados. Favor solicitar os acertos necessários para que as contas sejam zeradas.

`:`

A análise não pode ser concluída pois a conta ${tiposContasEncerradasComSaldo} foi encerrada e o saldo foi alterado. Favor solicitar os acertos necessários para que a conta seja zerada.

`} - primeiroBotaoTexto="Fechar" - primeiroBotaoCss="success" + 1 ? `A análise não pode ser concluída pois as contas ${tiposContasEncerradasComSaldo} foram encerradas e os saldos foram alterados. Favor solicitar os acertos necessários para que as contas sejam zeradas.`:`A análise não pode ser concluída pois a conta ${tiposContasEncerradasComSaldo} foi encerrada e o saldo foi alterado. Favor solicitar os acertos necessários para que a conta seja zerada.`} + handleCancel={onHandleClose} + cancelText="Fechar" />
{redirectListaPc && diff --git a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js index d4e4aabc8..515331f03 100644 --- a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js +++ b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js @@ -156,14 +156,22 @@ export const DetalheDasPrestacoes = () => { }, [periodoConta.periodo]) ; - const handleChangePeriodoConta = (name, value) => { + const handleChangePeriodoConta = (name, value, periodoOuConta) => { setCheckSalvarJustificativa(false); setCheckSalvarExtratoBancario(false); setBtnSalvarExtratoBancarioDisable(true); - setPeriodoConta({ - ...periodoConta, - [name]: value - }); + + if(periodoOuConta === 'periodo') { + setPeriodoConta({ + conta: '', + [name]: value + }); + } else { + setPeriodoConta({ + ...periodoConta, + [name]: value + }); + } }; const handleChangeTextareaJustificativa = (event) => { diff --git a/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js b/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js index 6a6fb8568..07cba4e88 100644 --- a/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js +++ b/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js @@ -15,7 +15,7 @@ export const SelectPeriodoConta = ({periodoConta, handleChangePeriodoConta, peri
handleChangePeriodoConta(e.target.name, e.target.value)} + onChange={(e) => handleChangePeriodoConta(e.target.name, e.target.value, 'conta')} name="conta" id="conta" className="form-control" From 707a330a3b70d864b95686c6c84d8dfd31b33165 Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 2 Oct 2023 12:42:55 -0300 Subject: [PATCH 25/27] feat(103823): Altera regra de mensagem de aviso --- .../escolas/Receitas/Formularios/index.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/componentes/escolas/Receitas/Formularios/index.js b/src/componentes/escolas/Receitas/Formularios/index.js index 1a49aa467..a7142530f 100644 --- a/src/componentes/escolas/Receitas/Formularios/index.js +++ b/src/componentes/escolas/Receitas/Formularios/index.js @@ -895,16 +895,10 @@ export const ReceitaForm = () => { if(contasNaoFiltradas && dataDigitadaFormulario) { contasFiltradasPelaDataInicial = contasNaoFiltradas.filter((acc) => { if (acc.data_inicio && moment(acc.data_inicio, 'YYYY-MM-DD').isValid()) { - return moment(acc.data_inicio, 'YYYY-MM-DD').toDate() <= moment(dataDigitadaFormulario, 'YYYY-MM-DD').toDate(); + return moment(acc.data_inicio, 'YYYY-MM-DD').toDate() <= moment(dataDigitadaFormulario, 'YYYY-MM-DD').toDate(); } return false; - }); - - if(!contasFiltradasPelaDataInicial.length) { - setMensagemDataInicialConta("Não existem contas disponíveis para a data do crédito.") - } else { - setMensagemDataInicialConta("") - } + }); } return contasFiltradasPelaDataInicial; @@ -940,6 +934,16 @@ export const ReceitaForm = () => { const contasFiltradasPelaDataInicialEPeloTipo = filtraContasPelaDataInicial({contasNaoFiltradas: tabelas.contas_associacao.filter(conta => (tipos_conta.includes(conta.nome))), dataDigitadaFormulario: values.data}) + const contasFiltradasExcluindoContasComEncerramentoAprovado = contasFiltradasPelaDataInicialEPeloTipo.filter((elemento) => { + return !(elemento.status === STATUS_CONTA_ASSOCIACAO.INATIVA && elemento.solicitacao_encerramento.status === STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO.APROVADA); + }) + + if(!contasFiltradasExcluindoContasComEncerramentoAprovado.length && moment(values.data, 'YYYY-MM-DD').isValid()) { + setMensagemDataInicialConta("Não existem contas disponíveis para a data do crédito.") + } else { + setMensagemDataInicialConta("") + } + return ( contasFiltradasPelaDataInicialEPeloTipo.map((item, key) => ( getOptionPorStatus(item) From 517fa73da8275dd71a0bb52b6cbb732a4d36bcf6 Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 2 Oct 2023 13:07:17 -0300 Subject: [PATCH 26/27] feature/103823-corrige-validacao-select-conta --- src/componentes/escolas/Receitas/Formularios/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/componentes/escolas/Receitas/Formularios/index.js b/src/componentes/escolas/Receitas/Formularios/index.js index a7142530f..7a7f1c137 100644 --- a/src/componentes/escolas/Receitas/Formularios/index.js +++ b/src/componentes/escolas/Receitas/Formularios/index.js @@ -935,7 +935,7 @@ export const ReceitaForm = () => { const contasFiltradasPelaDataInicialEPeloTipo = filtraContasPelaDataInicial({contasNaoFiltradas: tabelas.contas_associacao.filter(conta => (tipos_conta.includes(conta.nome))), dataDigitadaFormulario: values.data}) const contasFiltradasExcluindoContasComEncerramentoAprovado = contasFiltradasPelaDataInicialEPeloTipo.filter((elemento) => { - return !(elemento.status === STATUS_CONTA_ASSOCIACAO.INATIVA && elemento.solicitacao_encerramento.status === STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO.APROVADA); + return !(elemento.status === STATUS_CONTA_ASSOCIACAO.INATIVA && elemento.solicitacao_encerramento && elemento.solicitacao_encerramento.status === STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO.APROVADA); }) if(!contasFiltradasExcluindoContasComEncerramentoAprovado.length && moment(values.data, 'YYYY-MM-DD').isValid()) { From 4240e410d07d850506006d03b1cb90c8f2769b41 Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Mon, 2 Oct 2023 19:15:50 -0300 Subject: [PATCH 27/27] feat(99081): Corrige layout modal conforme figma e cores do sistema --- src/assets/img/icone-close.svg | 4 ++ .../Globais/Modal/CustomModalConfirm.js | 69 +++++++++++++++++++ src/componentes/Globais/Modal/ModalConfirm.js | 15 ++-- src/componentes/Globais/Modal/ModalInfo.js | 7 +- .../Globais/Modal/custom-modal.scss | 10 +++ .../Globais/Modal/modal-bootstrap.scss | 18 +++++ .../escolas/PrestacaoDeContas/index.js | 4 +- 7 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 src/assets/img/icone-close.svg create mode 100644 src/componentes/Globais/Modal/CustomModalConfirm.js create mode 100644 src/componentes/Globais/Modal/custom-modal.scss create mode 100644 src/componentes/Globais/Modal/modal-bootstrap.scss diff --git a/src/assets/img/icone-close.svg b/src/assets/img/icone-close.svg new file mode 100644 index 000000000..d9187073c --- /dev/null +++ b/src/assets/img/icone-close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/componentes/Globais/Modal/CustomModalConfirm.js b/src/componentes/Globais/Modal/CustomModalConfirm.js new file mode 100644 index 000000000..815ccb37a --- /dev/null +++ b/src/componentes/Globais/Modal/CustomModalConfirm.js @@ -0,0 +1,69 @@ +import React from "react"; +import {Button} from "react-bootstrap"; +import { openModal, closeModal } from "../../../store/reducers/componentes/Globais/Modal/actions"; +import IconeConfirmacao from "../../../assets/img/icone-modal-confirmacao.svg" +import IconeClose from "../../../assets/img/icone-close.svg" +import "./modal-bootstrap.scss" +import "./custom-modal.scss" + +export function CustomModalConfirm({ + dispatch, + title, + message, + dataQa, + cancelText = "Cancelar", + onCancel, + confirmText = "Confirmar", + onConfirm, +}) { + + function handleClose() { + if (onCancel) { + onCancel(); + } + + dispatch(closeModal()); + } + + function handleConfirm() { + if (onConfirm) { + onConfirm(); + } + handleClose(); + } + + return dispatch( + openModal({ + children: ( +
+
+ +
+ IconeConfirmacao +

{title}

+

{message}

+
+ + {onConfirm ? ( + + ) : null} +
+
+ ), + }) + ); +} \ No newline at end of file diff --git a/src/componentes/Globais/Modal/ModalConfirm.js b/src/componentes/Globais/Modal/ModalConfirm.js index 786007656..52673feb4 100644 --- a/src/componentes/Globais/Modal/ModalConfirm.js +++ b/src/componentes/Globais/Modal/ModalConfirm.js @@ -1,6 +1,7 @@ import React from "react"; -import {Button, Modal} from "react-bootstrap"; +import {Modal} from "react-bootstrap"; import { openModal, closeModal } from "../../../store/reducers/componentes/Globais/Modal/actions"; +import "./modal-bootstrap.scss" export function ModalConfirm({ dispatch, @@ -41,13 +42,17 @@ export function ModalConfirm({ {message} - + {onConfirm ? ( - + ) : null} diff --git a/src/componentes/Globais/Modal/ModalInfo.js b/src/componentes/Globais/Modal/ModalInfo.js index aced48a87..025ce60eb 100644 --- a/src/componentes/Globais/Modal/ModalInfo.js +++ b/src/componentes/Globais/Modal/ModalInfo.js @@ -1,6 +1,7 @@ import React from "react"; import {Button, Modal} from "react-bootstrap"; import { openModal, closeModal } from "../../../store/reducers/componentes/Globais/Modal/actions"; +import "./modal-bootstrap.scss" export function ModalInfo({ dispatch, @@ -31,7 +32,11 @@ export function ModalInfo({ {message} - diff --git a/src/componentes/Globais/Modal/custom-modal.scss b/src/componentes/Globais/Modal/custom-modal.scss new file mode 100644 index 000000000..31ef06fab --- /dev/null +++ b/src/componentes/Globais/Modal/custom-modal.scss @@ -0,0 +1,10 @@ +@import 'src/assets/css/variaveis.scss'; + +.custom-modal-title{ + font-weight: 700; + color: $corFonte; +} +.custom-modal-message{ + font-size: 18px; + color: $corFonte; +} \ No newline at end of file diff --git a/src/componentes/Globais/Modal/modal-bootstrap.scss b/src/componentes/Globais/Modal/modal-bootstrap.scss new file mode 100644 index 000000000..d171eccf1 --- /dev/null +++ b/src/componentes/Globais/Modal/modal-bootstrap.scss @@ -0,0 +1,18 @@ +@import "../../../assets/css/variaveis"; + +.btn-success { + background-color: $corBtnSuccess; + border-color: $corBtnSuccess; +} + +.btn-outline-success { + border-color: $corBtnSuccess; + color: $corBtnSuccess; + background-color: transparent; +} + +.btn-outline-success:hover, .btn-success:hover { + color: #fff; + background-color: $corBtnSuccess; + border-color: $corBtnSuccess; +} \ No newline at end of file diff --git a/src/componentes/escolas/PrestacaoDeContas/index.js b/src/componentes/escolas/PrestacaoDeContas/index.js index b629a9e7a..25376be85 100644 --- a/src/componentes/escolas/PrestacaoDeContas/index.js +++ b/src/componentes/escolas/PrestacaoDeContas/index.js @@ -26,7 +26,7 @@ import {getRegistrosFalhaGeracaoPc} from "../../../services/Notificacoes.service import {ModalNotificaErroConcluirPC} from "./ModalNotificaErroConcluirPC"; import { ModalPendenciasCadastrais } from "./ModalPendenciasCadastrais"; import { setPersistenteUrlVoltar } from "../../../store/reducers/componentes/escolas/PrestacaoDeContas/PendenciaCadastro/actions"; -import { ModalConfirm } from "../../Globais/Modal/ModalConfirm"; +import { CustomModalConfirm } from "../../Globais/Modal/CustomModalConfirm"; export const PrestacaoDeContas = ({setStatusPC}) => { const history = useHistory(); @@ -335,7 +335,7 @@ export const PrestacaoDeContas = ({setStatusPC}) => { } else{ if(statusPrestacaoDeConta.tem_conta_encerrada_com_saldo){ - ModalConfirm({ + CustomModalConfirm({ dispatch, title: 'Devido as alterações realizadas houve uma mudança no saldo da conta.', message: 'A análise da PC não poderá ser concluída pela DRE até a finalização dos acertos que tornem a conta zerada.',