diff --git a/.coveragerc b/.coveragerc
index 4ae861b5cc0b0d65204bba1fc28438ff0dc70433..fd36a318fa7e69a64d29e330d49aae77d6b14d9e 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,3 @@
[run]
omit = greg/tests/*.py
+ gregui/tests/*.py
diff --git a/README.md b/README.md
index 801e785daa19efaa2decbf6378d56a569ac33df6..b9b8f371b6c9c7021a05801e0c3b8572979ff899 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
# Greg
+
[](https://git.app.uib.no/it-bott-integrasjoner/greg/-/commits/master)
[](https://git.app.uib.no/it-bott-integrasjoner/greg/-/commits/master)
@@ -42,7 +43,7 @@ Refer to [drf-spectacular](https://github.com/tfranzel/drf-spectacular/) for det
## Sending notifications
- python manage.py start_notification_publisher
+ python manage.py notification_publisher
## Testing
@@ -50,6 +51,13 @@ Use pytest with the pytest-django library to run unit tests.
pytest
+There are two scripts for adding data to the database:
+
+- greg/tests/populate_fixtures.py
+- greg/tests/populate_database.py
+
+where the former uses randomized data, and the latter uses specific data useful in combination with the frontend. See the respective files for how to use them.
+
## Static type analysis
Use [mypy](http://mypy-lang.org/) to run static type checks using type hints.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 74b8230598c3d4caec3763eb080a8aca02f4cf59..cc0b999f4001d28c50db65fd8e1a49be540967fa 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,54 +8,56 @@
"name": "greg",
"version": "0.1.0",
"dependencies": {
- "@emotion/react": "^11.4.1",
+ "@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
- "@mui/icons-material": "^5.0.1",
+ "@mui/icons-material": "^5.0.5",
"@mui/lab": "^5.0.0-alpha.49",
- "@mui/material": "^5.0.1",
- "@mui/system": "^5.0.1",
+ "@mui/material": "^5.0.5",
+ "@mui/system": "^5.0.5",
"@mui/utils": "^5.0.1",
"@navikt/fnrvalidator": "^1.1.4",
"@testing-library/jest-dom": "^5.14.1",
- "@testing-library/react": "^11.2.7",
- "@testing-library/user-event": "^13.2.1",
- "@types/jest": "^26.0.24",
- "@types/node": "^12.20.24",
- "@types/react": "^17.0.20",
- "@types/react-datepicker": "^4.1.7",
- "@types/react-dom": "^17.0.9",
- "@types/react-helmet": "^6.1.2",
- "@types/react-router-dom": "^5.1.8",
+ "@testing-library/react": "^12.1.2",
+ "@testing-library/user-event": "^13.5.0",
+ "@types/jest": "^27.0.2",
+ "@types/lodash": "^4.14.176",
+ "@types/node": "^16.11.6",
+ "@types/react": "^17.0.33",
+ "@types/react-dom": "^17.0.10",
+ "@types/react-helmet": "^6.1.4",
+ "@types/react-router-dom": "^5.3.2",
"date-fns": "^2.24.0",
"fetch-intercept": "^2.4.0",
"http-proxy-middleware": "^2.0.1",
- "i18next": "^20.6.0",
+ "i18n-iso-countries": "^6.8.0",
+ "i18next": "^21.3.3",
"i18next-browser-languagedetector": "^6.1.2",
"i18next-http-backend": "^1.3.1",
"libphonenumber-js": "^1.9.35",
+ "lodash": "^4.17.21",
"react": "^17.0.2",
- "react-datepicker": "^4.2.1",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
- "react-hook-form": "^7.15.3",
+ "react-hook-form": "^7.17.5",
"react-i18next": "^11.11.4",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"typeface-roboto": "^1.1.13",
- "typescript": "^4.4.2",
- "web-vitals": "^1.1.2"
+ "typescript": "^4.4.4",
+ "web-vitals": "^2.1.2"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.31.1",
"@typescript-eslint/parser": "^4.31.1",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
- "eslint-config-airbnb-typescript": "^14.0.0",
+ "eslint-config-airbnb-typescript": "^14.0.1",
"eslint-config-prettier": "^8.3.0",
- "eslint-plugin-import": "^2.24.2",
+ "eslint-plugin-import": "^2.25.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.2.0",
+ "jest-fetch-mock": "^3.0.3",
"jest-junit": "^12.2.0"
}
},
@@ -1631,9 +1633,9 @@
}
},
"node_modules/@babel/preset-modules": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
- "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -1868,15 +1870,15 @@
}
},
"node_modules/@emotion/cache": {
- "version": "11.4.0",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",
- "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",
+ "version": "11.5.0",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.5.0.tgz",
+ "integrity": "sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==",
"dependencies": {
"@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.0.0",
+ "@emotion/sheet": "^1.0.3",
"@emotion/utils": "^1.0.0",
"@emotion/weak-memoize": "^0.2.5",
- "stylis": "^4.0.3"
+ "stylis": "^4.0.10"
}
},
"node_modules/@emotion/hash": {
@@ -1898,14 +1900,14 @@
"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
},
"node_modules/@emotion/react": {
- "version": "11.4.1",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.1.tgz",
- "integrity": "sha512-pRegcsuGYj4FCdZN6j5vqCALkNytdrKw3TZMekTzNXixRg4wkLsU5QEaBG5LC6l01Vppxlp7FE3aTHpIG5phLg==",
+ "version": "11.5.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.5.0.tgz",
+ "integrity": "sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==",
"dependencies": {
"@babel/runtime": "^7.13.10",
- "@emotion/cache": "^11.4.0",
+ "@emotion/cache": "^11.5.0",
"@emotion/serialize": "^1.0.2",
- "@emotion/sheet": "^1.0.2",
+ "@emotion/sheet": "^1.0.3",
"@emotion/utils": "^1.0.0",
"@emotion/weak-memoize": "^0.2.5",
"hoist-non-react-statics": "^3.3.1"
@@ -1936,9 +1938,9 @@
}
},
"node_modules/@emotion/sheet": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.2.tgz",
- "integrity": "sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw=="
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.3.tgz",
+ "integrity": "sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ=="
},
"node_modules/@emotion/styled": {
"version": "11.3.0",
@@ -2000,9 +2002,9 @@
}
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
- "version": "13.11.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
- "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+ "version": "13.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+ "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -2406,18 +2408,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/@jest/core/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/core/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2426,42 +2416,6 @@
"node": ">=8"
}
},
- "node_modules/@jest/core/node_modules/jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "dependencies": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- },
- "engines": {
- "node": ">= 10.14.2"
- },
- "peerDependencies": {
- "ts-node": ">=9.0.0"
- },
- "peerDependenciesMeta": {
- "ts-node": {
- "optional": true
- }
- }
- },
"node_modules/@jest/core/node_modules/jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -2480,110 +2434,6 @@
"node": ">= 10.14.2"
}
},
- "node_modules/@jest/core/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/core/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@jest/core/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/core/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/@jest/core/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/core/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@jest/core/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/core/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@jest/core/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/core/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2595,14 +2445,6 @@
"node": ">=8"
}
},
- "node_modules/@jest/core/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/environment": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
@@ -3012,18 +2854,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/@jest/reporters/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/reporters/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3032,6 +2862,20 @@
"node": ">=8"
}
},
+ "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+ "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+ "dependencies": {
+ "@babel/core": "^7.7.5",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-coverage": "^3.0.0",
+ "semver": "^6.3.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/@jest/reporters/node_modules/jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -3050,96 +2894,6 @@
"node": ">= 10.14.2"
}
},
- "node_modules/@jest/reporters/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/reporters/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@jest/reporters/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/reporters/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/@jest/reporters/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/reporters/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@jest/reporters/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/@jest/reporters/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/reporters/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -3159,14 +2913,6 @@
"node": ">=8"
}
},
- "node_modules/@jest/reporters/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@jest/source-map": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
@@ -3425,10 +3171,9 @@
}
},
"node_modules/@jest/types": {
- "version": "27.2.4",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.4.tgz",
- "integrity": "sha512-IDO2ezTxeMvQAHxzG/ZvEyA47q0aVfzT95rGFl7bZs/Go0aIucvfDbS2rmnoEdXxlLQhcolmoG/wvL/uKx4tKA==",
- "peer": true,
+ "version": "27.2.5",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
+ "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
"dependencies": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
@@ -3444,7 +3189,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -3459,7 +3203,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -3475,7 +3218,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
"dependencies": {
"color-name": "~1.1.4"
},
@@ -3486,14 +3228,12 @@
"node_modules/@jest/types/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/@jest/types/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true,
"engines": {
"node": ">=8"
}
@@ -3502,7 +3242,6 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -3511,13 +3250,14 @@
}
},
"node_modules/@mui/core": {
- "version": "5.0.0-alpha.50",
- "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.50.tgz",
- "integrity": "sha512-szmmzbyAjEQku17IoEWs7t77n0Kr4zVnT5fREfMd+CnCA4YDifr68ccGJfWaeoGp5Zw/JmfKjQJXLY4GgT6i/g==",
+ "version": "5.0.0-alpha.53",
+ "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.53.tgz",
+ "integrity": "sha512-dTwuhzE0puewJ+/Cw35iAiaBGVcZqVyqspheQHVJuhysSd+o58SONRAiM6MQgI/iFKiJ57HKh+En1MwuC7DMLw==",
"dependencies": {
"@babel/runtime": "^7.15.4",
"@emotion/is-prop-valid": "^1.1.0",
"@mui/utils": "^5.0.1",
+ "@popperjs/core": "^2.4.4",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
@@ -3537,9 +3277,9 @@
}
},
"node_modules/@mui/icons-material": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.3.tgz",
- "integrity": "sha512-Lktn+4GNnXdVrOCUUvNNvOD9VyrGazWBsJy0BQeQgBe/+IjFMdlcNrDEUIlGlA5ZXOq7Mr/Mv9Os02mgF65jiw==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.5.tgz",
+ "integrity": "sha512-beJo4kmgZwr+2x0ppgHcqqdNQYX4WKddJyMn4eHJAh9dNAGyeY1AJ/8Po+TJKyoSr3C2ZqnW7WrSonAJr2HrUw==",
"dependencies": {
"@babel/runtime": "^7.15.4"
},
@@ -3547,7 +3287,7 @@
"node": ">=12.0.0"
},
"peerDependencies": {
- "@mui/material": "^5.0.0-rc.0",
+ "@mui/material": "^5.0.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2"
},
@@ -3558,17 +3298,17 @@
}
},
"node_modules/@mui/lab": {
- "version": "5.0.0-alpha.50",
- "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.50.tgz",
- "integrity": "sha512-8DgRjQjjObrHpdFx5HSjw27zQlSf0gc+I911ZSs+YIn7TADQgtg3QzaHqe5o54b+91LhMfugQAtPlRjqXMaEKA==",
+ "version": "5.0.0-alpha.53",
+ "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.53.tgz",
+ "integrity": "sha512-fUyGCuxj8Wdwvyc9v0X3YTNshItFWp6DtuCPjhPy6yhKjUAa0u0XKI4FcM5z/wPWUR56nJceNz9WwNZ72vkwWw==",
"dependencies": {
"@babel/runtime": "^7.15.4",
"@date-io/date-fns": "^2.11.0",
"@date-io/dayjs": "^2.11.0",
"@date-io/luxon": "^2.11.1",
"@date-io/moment": "^2.11.0",
- "@mui/core": "5.0.0-alpha.50",
- "@mui/system": "^5.0.3",
+ "@mui/core": "5.0.0-alpha.53",
+ "@mui/system": "^5.0.6",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
@@ -3580,9 +3320,9 @@
"node": ">=12.0.0"
},
"peerDependencies": {
- "@mui/material": "^5.0.0-rc.0",
+ "@mui/material": "^5.0.0",
"@types/react": "^16.8.6 || ^17.0.0",
- "date-fns": "^2.24.0",
+ "date-fns": "^2.25.0",
"dayjs": "^1.10.7",
"luxon": "^1.28.0",
"moment": "^2.29.1",
@@ -3608,17 +3348,16 @@
}
},
"node_modules/@mui/material": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.3.tgz",
- "integrity": "sha512-Qj2hwSi63qrYRJuHrUFdN83lCT6HXyLzpCniDTvK7NlqXCnpy4F3Gg0hRJTnO4hNqTTBV+SCOKTSbfuzHl/dnQ==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.6.tgz",
+ "integrity": "sha512-1NmLel2Q+PnSfhFhdrhTbZFLfGpGKcPbu8onwGJu+vbD3YMTjr8gXvQ/sYZC0Motfu8jLnQdlq4FD4fRhqndnw==",
"dependencies": {
"@babel/runtime": "^7.15.4",
- "@mui/core": "5.0.0-alpha.50",
- "@mui/system": "^5.0.3",
+ "@mui/core": "5.0.0-alpha.53",
+ "@mui/system": "^5.0.6",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
- "@popperjs/core": "^2.4.4",
- "@types/react-transition-group": "^4.4.3",
+ "@types/react-transition-group": "^4.4.4",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"hoist-non-react-statics": "^3.3.2",
@@ -3634,7 +3373,7 @@
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
- "@emotion/react": "^11.4.1",
+ "@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2",
@@ -3679,12 +3418,12 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz",
- "integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.2.tgz",
+ "integrity": "sha512-vApnXLj/5V+SbBy+jGFtPgu3tgs0ybSdwWLwXcnUAdNdRyJBffi2KyOP8fhUONLOcZBMU2heNXWz/Zqn5kbDKQ==",
"dependencies": {
"@babel/runtime": "^7.15.4",
- "@emotion/cache": "^11.4.0",
+ "@emotion/cache": "^11.5.0",
"prop-types": "^15.7.2"
},
"engines": {
@@ -3709,13 +3448,13 @@
}
},
"node_modules/@mui/system": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.3.tgz",
- "integrity": "sha512-pNkW9p6Dj/ch3YCKjvrXrBhKsAyJ1/l273Q0hh60hhTKHJXgKBVONQ8r7l1fFHtufI0NNz6UGMVJooIXg4JJtA==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.6.tgz",
+ "integrity": "sha512-qZdgODiO82/r1bH9KV5bdqqx/q14i32OGUK/bO6phhXM/DX0TmWSUsnPqFX4F7/UKrvBHsGzIb8ohdRuihQD+Q==",
"dependencies": {
"@babel/runtime": "^7.15.4",
"@mui/private-theming": "^5.0.1",
- "@mui/styled-engine": "^5.0.1",
+ "@mui/styled-engine": "^5.0.2",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
@@ -3730,7 +3469,7 @@
"url": "https://opencollective.com/material-ui"
},
"peerDependencies": {
- "@emotion/react": "^11.4.1",
+ "@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^17.0.2"
@@ -4227,17 +3966,16 @@
}
},
"node_modules/@testing-library/dom": {
- "version": "8.7.2",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.7.2.tgz",
- "integrity": "sha512-2zN0Zv9dMnaMAd4c/1E1ZChu4QrICyvWtkUvHFQBPhS1oG3VYGcM7SLGLYdda7187ILRXzIUOvOsbXQm4EASjA==",
- "peer": true,
+ "version": "8.10.1",
+ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.10.1.tgz",
+ "integrity": "sha512-rab7vpf1uGig5efWwsCOn9j4/doy+W3VBoUyzX7C4y77u0wAckwc7R8nyH6e2rw0rRzKJR+gWPiAg8zhiFbxWQ==",
"dependencies": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
"@types/aria-query": "^4.2.0",
- "aria-query": "^4.2.2",
+ "aria-query": "^5.0.0",
"chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.6",
+ "dom-accessibility-api": "^0.5.9",
"lz-string": "^1.4.4",
"pretty-format": "^27.0.2"
},
@@ -4249,7 +3987,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -4264,7 +4001,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -4280,7 +4016,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
"dependencies": {
"color-name": "~1.1.4"
},
@@ -4291,14 +4026,12 @@
"node_modules/@testing-library/dom/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/@testing-library/dom/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true,
"engines": {
"node": ">=8"
}
@@ -4307,7 +4040,6 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -4350,6 +4082,18 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
+ "node_modules/@testing-library/jest-dom/node_modules/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==",
+ "dependencies": {
+ "@babel/runtime": "^7.10.2",
+ "@babel/runtime-corejs3": "^7.10.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
"node_modules/@testing-library/jest-dom/node_modules/chalk": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -4398,144 +4142,25 @@
}
},
"node_modules/@testing-library/react": {
- "version": "11.2.7",
- "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
- "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
+ "version": "12.1.2",
+ "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.2.tgz",
+ "integrity": "sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==",
"dependencies": {
"@babel/runtime": "^7.12.5",
- "@testing-library/dom": "^7.28.1"
+ "@testing-library/dom": "^8.0.0"
},
"engines": {
- "node": ">=10"
+ "node": ">=12"
},
"peerDependencies": {
"react": "*",
"react-dom": "*"
}
},
- "node_modules/@testing-library/react/node_modules/@jest/types": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
- "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
- "dependencies": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^15.0.0",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": ">= 10.14.2"
- }
- },
- "node_modules/@testing-library/react/node_modules/@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==",
- "dependencies": {
- "@babel/code-frame": "^7.10.4",
- "@babel/runtime": "^7.12.5",
- "@types/aria-query": "^4.2.0",
- "aria-query": "^4.2.2",
- "chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.6",
- "lz-string": "^1.4.4",
- "pretty-format": "^26.6.2"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/@testing-library/react/node_modules/@types/yargs": {
- "version": "15.0.14",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/@testing-library/react/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dependencies": {
- "color-convert": "^2.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/@testing-library/react/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/@testing-library/react/node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/@testing-library/react/node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- },
- "node_modules/@testing-library/react/node_modules/has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@testing-library/react/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@testing-library/react/node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@testing-library/user-event": {
- "version": "13.2.1",
- "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.2.1.tgz",
- "integrity": "sha512-cczlgVl+krjOb3j1625usarNEibI0IFRJrSWX9UsJ1HKYFgCQv9Nb7QAipUDXl3Xdz8NDTsiS78eAkPSxlzTlw==",
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
+ "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
"dependencies": {
"@babel/runtime": "^7.12.5"
},
@@ -4598,9 +4223,9 @@
}
},
"node_modules/@types/eslint": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
- "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
+ "version": "7.28.2",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+ "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
"dependencies": {
"@types/estree": "*",
"@types/json-schema": "*"
@@ -4612,9 +4237,9 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
},
"node_modules/@types/glob": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
- "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
"dependencies": {
"@types/minimatch": "*",
"@types/node": "*"
@@ -4668,113 +4293,12 @@
}
},
"node_modules/@types/jest": {
- "version": "26.0.24",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
- "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+ "version": "27.0.2",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.2.tgz",
+ "integrity": "sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==",
"dependencies": {
- "jest-diff": "^26.0.0",
- "pretty-format": "^26.0.0"
- }
- },
- "node_modules/@types/jest/node_modules/@jest/types": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
- "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
- "dependencies": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^15.0.0",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": ">= 10.14.2"
- }
- },
- "node_modules/@types/jest/node_modules/@types/yargs": {
- "version": "15.0.14",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
- "dependencies": {
- "@types/yargs-parser": "*"
- }
- },
- "node_modules/@types/jest/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dependencies": {
- "color-convert": "^2.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/@types/jest/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/@types/jest/node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/@types/jest/node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- },
- "node_modules/@types/jest/node_modules/has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@types/jest/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/@types/jest/node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
+ "jest-diff": "^27.0.0",
+ "pretty-format": "^27.0.0"
}
},
"node_modules/@types/json-schema": {
@@ -4787,15 +4311,20 @@
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
},
+ "node_modules/@types/lodash": {
+ "version": "4.14.176",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+ "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="
+ },
"node_modules/@types/minimatch": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="
},
"node_modules/@types/node": {
- "version": "12.20.28",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.28.tgz",
- "integrity": "sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w=="
+ "version": "16.11.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
+ "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
},
"node_modules/@types/normalize-package-data": {
"version": "2.4.1",
@@ -4823,46 +4352,35 @@
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
},
"node_modules/@types/react": {
- "version": "17.0.27",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.27.tgz",
- "integrity": "sha512-zgiJwtsggVGtr53MndV7jfiUESTqrbxOcBvwfe6KS/9bzaVPCTDieTWnFNecVNx6EAaapg5xsLLWFfHHR437AA==",
+ "version": "17.0.33",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
+ "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
"csstype": "^3.0.2"
}
},
- "node_modules/@types/react-datepicker": {
- "version": "4.1.7",
- "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.1.7.tgz",
- "integrity": "sha512-8FZt62redGDsO/Dptb8/kdu/JZsAD17lsU3E8OwJqxhtNk4EsdVT0v2ArP8efDGkmtonIKVF2usoPzF6ZeL8zw==",
- "dependencies": {
- "@popperjs/core": "^2.9.2",
- "@types/react": "*",
- "date-fns": "^2.0.1",
- "react-popper": "^2.2.5"
- }
- },
"node_modules/@types/react-dom": {
- "version": "17.0.9",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz",
- "integrity": "sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==",
+ "version": "17.0.10",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.10.tgz",
+ "integrity": "sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==",
"dependencies": {
"@types/react": "*"
}
},
"node_modules/@types/react-helmet": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.3.tgz",
- "integrity": "sha512-U4onVxaZxAp78KpXsfmyCIhLjsvJJ3goG3CYFOo+xW0cPYAz9oe5cBAUSAcN7l35OTbrFvu9TuE0YkcZMKGr4A==",
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.4.tgz",
+ "integrity": "sha512-jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA==",
"dependencies": {
"@types/react": "*"
}
},
"node_modules/@types/react-is": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.2.tgz",
- "integrity": "sha512-2+L0ilcAEG8udkDnvx8B0upwXFBbNnVwOsSCTxW3SDOkmar9NyEeLG0ZLa3uOEw9zyYf/fQapcnfXAVmDKlyHw==",
+ "version": "17.0.3",
+ "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz",
+ "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==",
"dependencies": {
"@types/react": "*"
}
@@ -4877,9 +4395,9 @@
}
},
"node_modules/@types/react-router-dom": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.1.tgz",
- "integrity": "sha512-UvyRy73318QI83haXlaMwmklHHzV9hjl3u71MmM6wYNu0hOVk9NLTa0vGukf8zXUqnwz4O06ig876YSPpeK28A==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.2.tgz",
+ "integrity": "sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==",
"dependencies": {
"@types/history": "*",
"@types/react": "*",
@@ -4887,9 +4405,9 @@
}
},
"node_modules/@types/react-transition-group": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.3.tgz",
- "integrity": "sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==",
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
+ "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
"dependencies": {
"@types/react": "*"
}
@@ -4989,7 +4507,6 @@
"version": "16.0.4",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
- "peer": true,
"dependencies": {
"@types/yargs-parser": "*"
}
@@ -5067,6 +4584,23 @@
"eslint": "*"
}
},
+ "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+ "dependencies": {
+ "eslint-visitor-keys": "^2.0.0"
+ },
+ "engines": {
+ "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/mysticatea"
+ },
+ "peerDependencies": {
+ "eslint": ">=5"
+ }
+ },
"node_modules/@typescript-eslint/parser": {
"version": "4.33.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz",
@@ -5554,13 +5088,9 @@
}
},
"node_modules/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==",
- "dependencies": {
- "@babel/runtime": "^7.10.2",
- "@babel/runtime-corejs3": "^7.10.2"
- },
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+ "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
"engines": {
"node": ">=6.0"
}
@@ -5808,10 +5338,15 @@
"url": "https://tidelift.com/funding/github/npm/autoprefixer"
}
},
+ "node_modules/autoprefixer/node_modules/picocolors": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ },
"node_modules/axe-core": {
- "version": "4.3.3",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.3.tgz",
- "integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==",
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
+ "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ==",
"engines": {
"node": ">=4"
}
@@ -6031,14 +5566,14 @@
}
},
"node_modules/babel-plugin-istanbul": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
- "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
"@istanbuljs/load-nyc-config": "^1.0.0",
"@istanbuljs/schema": "^0.1.2",
- "istanbul-lib-instrument": "^4.0.0",
+ "istanbul-lib-instrument": "^5.0.4",
"test-exclude": "^6.0.0"
},
"engines": {
@@ -6743,15 +6278,15 @@
}
},
"node_modules/browserslist": {
- "version": "4.17.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz",
- "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
+ "version": "4.17.5",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+ "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
"dependencies": {
- "caniuse-lite": "^1.0.30001264",
- "electron-to-chromium": "^1.3.857",
+ "caniuse-lite": "^1.0.30001271",
+ "electron-to-chromium": "^1.3.878",
"escalade": "^3.1.1",
- "node-releases": "^1.1.77",
- "picocolors": "^0.2.1"
+ "node-releases": "^2.0.1",
+ "picocolors": "^1.0.0"
},
"bin": {
"browserslist": "cli.js"
@@ -6955,9 +6490,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001265",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz",
- "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==",
+ "version": "1.0.30001271",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+ "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/browserslist"
@@ -7162,15 +6697,10 @@
"node": ">=0.10.0"
}
},
- "node_modules/classnames": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
- "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
- },
"node_modules/clean-css": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
- "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+ "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
"dependencies": {
"source-map": "~0.6.0"
},
@@ -7494,9 +7024,9 @@
}
},
"node_modules/core-js": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.2.tgz",
- "integrity": "sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
+ "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -7504,11 +7034,11 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz",
- "integrity": "sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
+ "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
"dependencies": {
- "browserslist": "^4.17.3",
+ "browserslist": "^4.17.5",
"semver": "7.0.0"
},
"funding": {
@@ -7525,9 +7055,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz",
- "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
+ "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -7824,9 +7354,9 @@
}
},
"node_modules/css-what": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
- "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+ "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
"engines": {
"node": ">= 6"
},
@@ -8460,12 +7990,17 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
+ "node_modules/diacritics": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
+ "integrity": "sha1-PvqHMj67hj5mls67AILUj/PW96E="
+ },
"node_modules/diff-sequences": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
- "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+ "version": "27.0.6",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
+ "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
"engines": {
- "node": ">= 10.14.2"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/diffie-hellman": {
@@ -8528,9 +8063,9 @@
}
},
"node_modules/dom-accessibility-api": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.7.tgz",
- "integrity": "sha512-ml3lJIq9YjUfM9TUnEPvEYWFSwivwIGBPKpewX7tii7fwCazA8yCioGdqQcNsItPpfFvSJ3VIdMQPj60LJhcQA=="
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.9.tgz",
+ "integrity": "sha512-+KPF4o71fl6NrdnqIrJc6m44NA+Rhf1h7In2MRznejSQasWkjqmHOBUlk+pXJ77cVOSYyZeNHFwn/sjotB6+Sw=="
},
"node_modules/dom-converter": {
"version": "0.2.0",
@@ -8700,9 +8235,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.3.861",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz",
- "integrity": "sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg=="
+ "version": "1.3.880",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz",
+ "integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw=="
},
"node_modules/elliptic": {
"version": "6.5.4",
@@ -9109,10 +8644,13 @@
}
},
"node_modules/eslint-config-airbnb-typescript": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.0.tgz",
- "integrity": "sha512-d2Nit2ByZARGRYK6tgSNl3nnmGZPyvsgbsKFcmm+nAhvT8VjVpifG5jI4tzObUUPb0sWw0E1oO/0pSpBD/pIuQ==",
+ "version": "14.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.1.tgz",
+ "integrity": "sha512-tF4GwC3sRrw8kEj4/yxX8F7AcLzj/1IESBnsCiFMplzYmxre459qm2z9DFkCpqBVQFSH6j2K4+VKVteX4m0GsQ==",
"dev": true,
+ "dependencies": {
+ "eslint-config-airbnb-base": "14.2.1"
+ },
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3"
@@ -9180,11 +8718,12 @@
}
},
"node_modules/eslint-module-utils": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz",
- "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==",
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
+ "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
"dependencies": {
"debug": "^3.2.7",
+ "find-up": "^2.1.0",
"pkg-dir": "^2.0.0"
},
"engines": {
@@ -9215,23 +8754,21 @@
}
},
"node_modules/eslint-plugin-import": {
- "version": "2.24.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
- "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
+ "version": "2.25.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
+ "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
"dependencies": {
- "array-includes": "^3.1.3",
- "array.prototype.flat": "^1.2.4",
+ "array-includes": "^3.1.4",
+ "array.prototype.flat": "^1.2.5",
"debug": "^2.6.9",
"doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.6",
- "eslint-module-utils": "^2.6.2",
- "find-up": "^2.0.0",
+ "eslint-module-utils": "^2.7.0",
"has": "^1.0.3",
- "is-core-module": "^2.6.0",
+ "is-core-module": "^2.7.0",
+ "is-glob": "^4.0.3",
"minimatch": "^3.0.4",
- "object.values": "^1.1.4",
- "pkg-up": "^2.0.0",
- "read-pkg-up": "^3.0.0",
+ "object.values": "^1.1.5",
"resolve": "^1.20.0",
"tsconfig-paths": "^3.11.0"
},
@@ -9239,7 +8776,7 @@
"node": ">=4"
},
"peerDependencies": {
- "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
}
},
"node_modules/eslint-plugin-import/node_modules/debug": {
@@ -9267,9 +8804,9 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/eslint-plugin-jest": {
- "version": "24.5.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.5.2.tgz",
- "integrity": "sha512-lrI3sGAyZi513RRmP08sIW241Ti/zMnn/6wbE4ZBhb3M2pJ9ztaZMnSKSKKBUfotVdwqU8W1KtD8ao2/FR8DIg==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
+ "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
"dependencies": {
"@typescript-eslint/experimental-utils": "^4.0.1"
},
@@ -9310,6 +8847,18 @@
"eslint": "^3 || ^4 || ^5 || ^6 || ^7"
}
},
+ "node_modules/eslint-plugin-jsx-a11y/node_modules/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==",
+ "dependencies": {
+ "@babel/runtime": "^7.10.2",
+ "@babel/runtime-corejs3": "^7.10.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
"node_modules/eslint-plugin-react": {
"version": "7.26.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz",
@@ -9462,20 +9011,6 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/eslint-plugin-testing-library/node_modules/eslint-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
- "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "dependencies": {
- "eslint-visitor-keys": "^1.1.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/mysticatea"
- }
- },
"node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -9519,20 +9054,25 @@
}
},
"node_modules/eslint-utils": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
- "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
"dependencies": {
- "eslint-visitor-keys": "^2.0.0"
+ "eslint-visitor-keys": "^1.1.0"
},
"engines": {
- "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+ "node": ">=6"
},
"funding": {
"url": "https://github.com/sponsors/mysticatea"
- },
- "peerDependencies": {
- "eslint": ">=5"
+ }
+ },
+ "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+ "engines": {
+ "node": ">=4"
}
},
"node_modules/eslint-visitor-keys": {
@@ -9637,32 +9177,10 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/eslint/node_modules/eslint-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
- "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "dependencies": {
- "eslint-visitor-keys": "^1.1.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/mysticatea"
- }
- },
- "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
- "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/eslint/node_modules/globals": {
- "version": "13.11.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
- "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+ "version": "13.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+ "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -9781,9 +9299,9 @@
}
},
"node_modules/estraverse": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
- "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
"engines": {
"node": ">=4.0"
}
@@ -10094,6 +9612,14 @@
"node": ">=8"
}
},
+ "node_modules/expect/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/expect/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11485,10 +11011,21 @@
"node": ">=8.12.0"
}
},
+ "node_modules/i18n-iso-countries": {
+ "version": "6.8.0",
+ "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-6.8.0.tgz",
+ "integrity": "sha512-jJs/+CA6+VUICFxqGcB0vFMERGfhfvyNk+8Vb9EagSZkl7kSpm/kT0VyhvzM/zixDWEV/+oN9L7v/GT9BwzoGg==",
+ "dependencies": {
+ "diacritics": "1.3.0"
+ },
+ "engines": {
+ "node": ">= 10"
+ }
+ },
"node_modules/i18next": {
- "version": "20.6.1",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.6.1.tgz",
- "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==",
+ "version": "21.3.3",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.3.3.tgz",
+ "integrity": "sha512-Wv5arCT9pK35nfhOzTdS64T7JpPcoqnkOEidxc4zF0DZ8KetpvmnkO+uWkXy+DFz6zWzPX7U9bIemwBqpFRprw==",
"dependencies": {
"@babel/runtime": "^7.12.0"
}
@@ -11927,9 +11464,9 @@
}
},
"node_modules/is-core-module": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
- "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+ "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
"dependencies": {
"has": "^1.0.3"
},
@@ -12283,19 +11820,20 @@
}
},
"node_modules/istanbul-lib-coverage": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
- "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+ "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
"engines": {
"node": ">=8"
}
},
"node_modules/istanbul-lib-instrument": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
- "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz",
+ "integrity": "sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw==",
"dependencies": {
- "@babel/core": "^7.7.5",
+ "@babel/core": "^7.12.3",
+ "@babel/parser": "^7.14.7",
"@istanbuljs/schema": "^0.1.2",
"istanbul-lib-coverage": "^3.0.0",
"semver": "^6.3.0"
@@ -12351,16 +11889,16 @@
}
},
"node_modules/istanbul-lib-source-maps": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
- "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+ "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
"dependencies": {
"debug": "^4.1.1",
"istanbul-lib-coverage": "^3.0.0",
"source-map": "^0.6.1"
},
"engines": {
- "node": ">=8"
+ "node": ">=10"
}
},
"node_modules/istanbul-lib-source-maps/node_modules/source-map": {
@@ -12372,9 +11910,9 @@
}
},
"node_modules/istanbul-reports": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.3.tgz",
- "integrity": "sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
+ "integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
"dependencies": {
"html-escaper": "^2.0.0",
"istanbul-lib-report": "^3.0.0"
@@ -12725,18 +12263,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/jest-cli/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-cli/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -12745,7 +12271,18 @@
"node": ">=8"
}
},
- "node_modules/jest-cli/node_modules/jest-config": {
+ "node_modules/jest-cli/node_modules/supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dependencies": {
+ "has-flag": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-config": {
"version": "26.6.3",
"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
"integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
@@ -12781,77 +12318,109 @@
}
}
},
- "node_modules/jest-cli/node_modules/jest-resolve": {
+ "node_modules/jest-config/node_modules/@jest/types": {
"version": "26.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
- "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+ "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
"dependencies": {
- "@jest/types": "^26.6.2",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.4",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^26.6.2",
- "read-pkg-up": "^7.0.1",
- "resolve": "^1.18.1",
- "slash": "^3.0.0"
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^15.0.0",
+ "chalk": "^4.0.0"
},
"engines": {
"node": ">= 10.14.2"
}
},
- "node_modules/jest-cli/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "node_modules/jest-config/node_modules/@types/yargs": {
+ "version": "15.0.14",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+ "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
"dependencies": {
- "p-locate": "^4.1.0"
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/jest-config/node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dependencies": {
+ "color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "node_modules/jest-cli/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "node_modules/jest-config/node_modules/chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dependencies": {
- "p-try": "^2.0.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
},
"engines": {
- "node": ">=6"
+ "node": ">=10"
},
"funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "url": "https://github.com/chalk/chalk?sponsor=1"
}
},
- "node_modules/jest-cli/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "node_modules/jest-config/node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
- "p-limit": "^2.2.0"
+ "color-name": "~1.1.4"
},
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/jest-config/node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "node_modules/jest-config/node_modules/has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"engines": {
"node": ">=8"
}
},
- "node_modules/jest-cli/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "node_modules/jest-config/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
"engines": {
- "node": ">=6"
+ "node": ">= 10.14.2"
}
},
- "node_modules/jest-cli/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "node_modules/jest-config/node_modules/jest-resolve": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+ "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+ "dependencies": {
+ "@jest/types": "^26.6.2",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.4",
+ "jest-pnp-resolver": "^1.2.2",
+ "jest-util": "^26.6.2",
+ "read-pkg-up": "^7.0.1",
+ "resolve": "^1.18.1",
+ "slash": "^3.0.0"
+ },
"engines": {
- "node": ">=8"
+ "node": ">= 10.14.2"
}
},
- "node_modules/jest-cli/node_modules/pretty-format": {
+ "node_modules/jest-config/node_modules/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==",
@@ -12865,45 +12434,7 @@
"node": ">= 10"
}
},
- "node_modules/jest-cli/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-cli/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-cli/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-cli/node_modules/supports-color": {
+ "node_modules/jest-config/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -12914,49 +12445,18 @@
"node": ">=8"
}
},
- "node_modules/jest-cli/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-diff": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
- "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
+ "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
"dependencies": {
"chalk": "^4.0.0",
- "diff-sequences": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "pretty-format": "^26.6.2"
+ "diff-sequences": "^27.0.6",
+ "jest-get-type": "^27.3.1",
+ "pretty-format": "^27.3.1"
},
"engines": {
- "node": ">= 10.14.2"
- }
- },
- "node_modules/jest-diff/node_modules/@jest/types": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
- "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
- "dependencies": {
- "@types/istanbul-lib-coverage": "^2.0.0",
- "@types/istanbul-reports": "^3.0.0",
- "@types/node": "*",
- "@types/yargs": "^15.0.0",
- "chalk": "^4.0.0"
- },
- "engines": {
- "node": ">= 10.14.2"
- }
- },
- "node_modules/jest-diff/node_modules/@types/yargs": {
- "version": "15.0.14",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
- "dependencies": {
- "@types/yargs-parser": "*"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-diff/node_modules/ansi-styles": {
@@ -13012,20 +12512,6 @@
"node": ">=8"
}
},
- "node_modules/jest-diff/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
"node_modules/jest-diff/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13139,6 +12625,14 @@
"node": ">=8"
}
},
+ "node_modules/jest-each/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-each/node_modules/pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -13371,12 +12865,22 @@
"node": ">=8"
}
},
+ "node_modules/jest-fetch-mock": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+ "integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+ "dev": true,
+ "dependencies": {
+ "cross-fetch": "^3.0.4",
+ "promise-polyfill": "^8.1.3"
+ }
+ },
"node_modules/jest-get-type": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
- "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
+ "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==",
"engines": {
- "node": ">= 10.14.2"
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
"node_modules/jest-haste-map": {
@@ -13745,6 +13249,14 @@
"node": ">=8"
}
},
+ "node_modules/jest-leak-detector/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-leak-detector/node_modules/pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -13852,6 +13364,14 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "node_modules/jest-matcher-utils/node_modules/diff-sequences": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+ "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-matcher-utils/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -13860,6 +13380,28 @@
"node": ">=8"
}
},
+ "node_modules/jest-matcher-utils/node_modules/jest-diff": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+ "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^26.6.2",
+ "jest-get-type": "^26.3.0",
+ "pretty-format": "^26.6.2"
+ },
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
+ "node_modules/jest-matcher-utils/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-matcher-utils/node_modules/pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -14314,18 +13856,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/jest-resolve/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-resolve/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -14334,96 +13864,6 @@
"node": ">=8"
}
},
- "node_modules/jest-resolve/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-resolve/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-resolve/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-resolve/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jest-resolve/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-resolve/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-resolve/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-resolve/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-resolve/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14435,14 +13875,6 @@
"node": ">=8"
}
},
- "node_modules/jest-resolve/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runner": {
"version": "26.6.3",
"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
@@ -14541,18 +13973,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/jest-runner/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runner/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -14561,42 +13981,6 @@
"node": ">=8"
}
},
- "node_modules/jest-runner/node_modules/jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "dependencies": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- },
- "engines": {
- "node": ">= 10.14.2"
- },
- "peerDependencies": {
- "ts-node": ">=9.0.0"
- },
- "peerDependenciesMeta": {
- "ts-node": {
- "optional": true
- }
- }
- },
"node_modules/jest-runner/node_modules/jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -14615,110 +13999,6 @@
"node": ">= 10.14.2"
}
},
- "node_modules/jest-runner/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runner/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-runner/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runner/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jest-runner/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runner/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/jest-runner/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runner/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-runner/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runner/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14730,14 +14010,6 @@
"node": ">=8"
}
},
- "node_modules/jest-runner/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runtime": {
"version": "26.6.3",
"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
@@ -14846,18 +14118,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/jest-runtime/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runtime/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -14866,42 +14126,6 @@
"node": ">=8"
}
},
- "node_modules/jest-runtime/node_modules/jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "dependencies": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- },
- "engines": {
- "node": ">= 10.14.2"
- },
- "peerDependencies": {
- "ts-node": ">=9.0.0"
- },
- "peerDependenciesMeta": {
- "ts-node": {
- "optional": true
- }
- }
- },
"node_modules/jest-runtime/node_modules/jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -14920,110 +14144,6 @@
"node": ">= 10.14.2"
}
},
- "node_modules/jest-runtime/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runtime/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-runtime/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runtime/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jest-runtime/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runtime/node_modules/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==",
- "dependencies": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- },
- "engines": {
- "node": ">= 10"
- }
- },
- "node_modules/jest-runtime/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-runtime/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-runtime/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-runtime/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -15035,14 +14155,6 @@
"node": ">=8"
}
},
- "node_modules/jest-runtime/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-serializer": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
@@ -15149,16 +14261,12 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "node_modules/jest-snapshot/node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
+ "node_modules/jest-snapshot/node_modules/diff-sequences": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+ "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
"engines": {
- "node": ">=8"
+ "node": ">= 10.14.2"
}
},
"node_modules/jest-snapshot/node_modules/has-flag": {
@@ -15169,6 +14277,28 @@
"node": ">=8"
}
},
+ "node_modules/jest-snapshot/node_modules/jest-diff": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+ "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^26.6.2",
+ "jest-get-type": "^26.3.0",
+ "pretty-format": "^26.6.2"
+ },
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
+ "node_modules/jest-snapshot/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-snapshot/node_modules/jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -15187,58 +14317,6 @@
"node": ">= 10.14.2"
}
},
- "node_modules/jest-snapshot/node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-snapshot/node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-snapshot/node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-snapshot/node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jest-snapshot/node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-snapshot/node_modules/pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -15253,44 +14331,6 @@
"node": ">= 10"
}
},
- "node_modules/jest-snapshot/node_modules/read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "dependencies": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/jest-snapshot/node_modules/read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "dependencies": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/jest-snapshot/node_modules/read-pkg/node_modules/type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-snapshot/node_modules/semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -15316,14 +14356,6 @@
"node": ">=8"
}
},
- "node_modules/jest-snapshot/node_modules/type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/jest-util": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
@@ -15519,6 +14551,14 @@
"node": ">=8"
}
},
+ "node_modules/jest-validate/node_modules/jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+ "engines": {
+ "node": ">= 10.14.2"
+ }
+ },
"node_modules/jest-validate/node_modules/pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -15837,26 +14877,6 @@
"node": ">=0.4.0"
}
},
- "node_modules/jsdom/node_modules/ws": {
- "version": "7.5.5",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
- "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
- "engines": {
- "node": ">=8.3.0"
- },
- "peerDependencies": {
- "bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
- },
- "peerDependenciesMeta": {
- "bufferutil": {
- "optional": true
- },
- "utf-8-validate": {
- "optional": true
- }
- }
- },
"node_modules/jsesc": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -15952,9 +14972,9 @@
}
},
"node_modules/klona": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
- "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+ "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
"engines": {
"node": ">= 8"
}
@@ -16002,57 +15022,15 @@
}
},
"node_modules/libphonenumber-js": {
- "version": "1.9.37",
- "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.37.tgz",
- "integrity": "sha512-RnUR4XwiVhMLnT7uFSdnmLeprspquuDtaShAgKTA+g/ms9/S4hQU3/QpFdh3iXPHtxD52QscXLm2W2+QBmvYAg=="
+ "version": "1.9.39",
+ "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.39.tgz",
+ "integrity": "sha512-TxYz/Ii7mjkocKGKmFHhsTAvvcxr4AY3yUlZzZ2z7HC4DPRrNlzJ9n32/SMogqsyFOXLMXQPCkCInNRbiVaEPA=="
},
"node_modules/lines-and-columns": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
},
- "node_modules/load-json-file": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
- "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
- "dependencies": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^4.0.0",
- "pify": "^3.0.0",
- "strip-bom": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/load-json-file/node_modules/parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
- "dependencies": {
- "error-ex": "^1.3.1",
- "json-parse-better-errors": "^1.0.1"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/load-json-file/node_modules/pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/load-json-file/node_modules/strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/loader-runner": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -16222,11 +15200,11 @@
}
},
"node_modules/makeerror": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
- "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+ "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
"dependencies": {
- "tmpl": "1.0.x"
+ "tmpl": "1.0.5"
}
},
"node_modules/map-cache": {
@@ -16646,9 +15624,9 @@
"optional": true
},
"node_modules/nanoid": {
- "version": "3.1.29",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz",
- "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==",
+ "version": "3.1.30",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
+ "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -16816,9 +15794,9 @@
}
},
"node_modules/node-releases": {
- "version": "1.1.77",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
- "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
},
"node_modules/normalize-package-data": {
"version": "2.5.0",
@@ -17500,9 +16478,9 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"node_modules/picocolors": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
- "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
},
"node_modules/picomatch": {
"version": "2.3.0",
@@ -17565,14 +16543,70 @@
}
},
"node_modules/pkg-up": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
- "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+ "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
"dependencies": {
- "find-up": "^2.1.0"
+ "find-up": "^3.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
+ }
+ },
+ "node_modules/pkg-up/node_modules/find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "dependencies": {
+ "locate-path": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/pkg-up/node_modules/locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "dependencies": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/pkg-up/node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/pkg-up/node_modules/p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "dependencies": {
+ "p-limit": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/pkg-up/node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "engines": {
+ "node": ">=6"
}
},
"node_modules/pnp-webpack-plugin": {
@@ -18712,12 +17746,12 @@
}
},
"node_modules/postcss-safe-parser/node_modules/postcss": {
- "version": "8.3.9",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz",
- "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
+ "version": "8.3.11",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+ "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
"dependencies": {
- "nanoid": "^3.1.28",
- "picocolors": "^0.2.1",
+ "nanoid": "^3.1.30",
+ "picocolors": "^1.0.0",
"source-map-js": "^0.6.2"
},
"engines": {
@@ -18807,6 +17841,11 @@
"node": ">=6.14.4"
}
},
+ "node_modules/postcss/node_modules/picocolors": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ },
"node_modules/postcss/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -18852,12 +17891,11 @@
}
},
"node_modules/pretty-format": {
- "version": "27.2.4",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.4.tgz",
- "integrity": "sha512-NUjw22WJHldzxyps2YjLZkUj6q1HvjqFezkB9Y2cklN8NtVZN/kZEXGZdFw4uny3oENzV5EEMESrkI0YDUH8vg==",
- "peer": true,
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
+ "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
"dependencies": {
- "@jest/types": "^27.2.4",
+ "@jest/types": "^27.2.5",
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
"react-is": "^17.0.1"
@@ -18870,7 +17908,6 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
- "peer": true,
"engines": {
"node": ">=10"
},
@@ -18912,6 +17949,12 @@
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
},
+ "node_modules/promise-polyfill": {
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.1.tgz",
+ "integrity": "sha512-3p9zj0cEHbp7NVUxEYUWjQlffXqnXaZIMPkAO7HhFh8u5636xLRDHOUo2vpWSK0T2mqm6fKLXYn1KP6PAZ2gKg==",
+ "dev": true
+ },
"node_modules/prompts": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
@@ -19168,23 +18211,6 @@
"node": ">=10"
}
},
- "node_modules/react-datepicker": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.2.1.tgz",
- "integrity": "sha512-0gcvHMnX8rS1fV90PjjsB7MQdsWNU77JeVHf6bbwK9HnFxgwjVflTx40ebKmHV+leqe+f+FgUP9Nvqbe5RGyfA==",
- "dependencies": {
- "@popperjs/core": "^2.9.2",
- "classnames": "^2.2.6",
- "date-fns": "^2.0.1",
- "prop-types": "^15.7.2",
- "react-onclickoutside": "^6.10.0",
- "react-popper": "^2.2.5"
- },
- "peerDependencies": {
- "react": "^16.9.0 || ^17",
- "react-dom": "^16.9.0 || ^17"
- }
- },
"node_modules/react-dev-utils": {
"version": "11.0.4",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -19298,6 +18324,11 @@
"node": ">=8"
}
},
+ "node_modules/react-dev-utils/node_modules/node-releases": {
+ "version": "1.1.77",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
+ "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="
+ },
"node_modules/react-dev-utils/node_modules/p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -19339,59 +18370,6 @@
"node": ">=8"
}
},
- "node_modules/react-dev-utils/node_modules/pkg-up": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
- "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
- "dependencies": {
- "find-up": "^3.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/react-dev-utils/node_modules/pkg-up/node_modules/find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
- "dependencies": {
- "locate-path": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/react-dev-utils/node_modules/pkg-up/node_modules/locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
- "dependencies": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/react-dev-utils/node_modules/pkg-up/node_modules/p-locate": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
- "dependencies": {
- "p-limit": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/react-dev-utils/node_modules/pkg-up/node_modules/path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/react-dev-utils/node_modules/strip-ansi": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -19441,9 +18419,9 @@
}
},
"node_modules/react-hook-form": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.17.1.tgz",
- "integrity": "sha512-9nQ+qKFHFpnWzQHdDh6F4Egxa8iJkue1KU921F8qqeyUVbPPjgQZDXaQyNHABEYjRh0ndjTI24GDA+lwm2lQdg==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.18.0.tgz",
+ "integrity": "sha512-aTFs1jXGvpBBv4vYuhheVd9KbAZw/l3DOZhLIadNDyFddaDQmn+yJa63IZ14GDFz4NFgIi+ROkubfGJG2x6q2Q==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/react-hook-form"
@@ -19470,32 +18448,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
- "node_modules/react-onclickoutside": {
- "version": "6.12.0",
- "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.0.tgz",
- "integrity": "sha512-oPlOTYcISLHfpMog2lUZMFSbqOs4LFcA4+vo7fpfevB5v9Z0D5VBDBkfeO5lv+hpEcGoaGk67braLT+QT+eICA==",
- "funding": {
- "type": "individual",
- "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
- },
- "peerDependencies": {
- "react": "^15.5.x || ^16.x || ^17.x",
- "react-dom": "^15.5.x || ^16.x || ^17.x"
- }
- },
- "node_modules/react-popper": {
- "version": "2.2.5",
- "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
- "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
- "dependencies": {
- "react-fast-compare": "^3.0.1",
- "warning": "^4.0.2"
- },
- "peerDependencies": {
- "@popperjs/core": "^2.0.0",
- "react": "^16.8.0 || ^17"
- }
- },
"node_modules/react-refresh": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
@@ -19714,47 +18666,113 @@
}
},
"node_modules/read-pkg": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
- "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"dependencies": {
- "load-json-file": "^4.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^3.0.0"
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/read-pkg-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
- "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"dependencies": {
- "find-up": "^2.0.0",
- "read-pkg": "^3.0.0"
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/read-pkg/node_modules/path-type": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
- "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+ "node_modules/read-pkg-up/node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dependencies": {
- "pify": "^3.0.0"
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
- "node_modules/read-pkg/node_modules/pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "node_modules/read-pkg-up/node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
"engines": {
- "node": ">=4"
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg/node_modules/type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "engines": {
+ "node": ">=8"
}
},
"node_modules/readable-stream": {
@@ -22719,9 +21737,9 @@
"integrity": "sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="
},
"node_modules/typescript": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
- "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+ "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -23154,19 +22172,11 @@
}
},
"node_modules/walker": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
- "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
- "dependencies": {
- "makeerror": "1.0.x"
- }
- },
- "node_modules/warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+ "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
"dependencies": {
- "loose-envify": "^1.0.0"
+ "makeerror": "1.0.12"
}
},
"node_modules/watchpack": {
@@ -23450,9 +22460,9 @@
}
},
"node_modules/web-vitals": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz",
- "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig=="
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.2.tgz",
+ "integrity": "sha512-nZnEH8dj+vJFqCRYdvYv0a59iLXsb8jJkt+xvXfwgnkyPdsSLtKNlYmtTDiHmTNGXeSXtpjTTUcNvFtrAk6VMQ=="
},
"node_modules/webidl-conversions": {
"version": "6.1.0",
@@ -24117,6 +23127,14 @@
"node": ">=6"
}
},
+ "node_modules/webpack-dev-server/node_modules/ws": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+ "dependencies": {
+ "async-limiter": "~1.0.0"
+ }
+ },
"node_modules/webpack-dev-server/node_modules/yargs": {
"version": "13.3.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -24923,11 +23941,23 @@
}
},
"node_modules/ws": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
- "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
- "dependencies": {
- "async-limiter": "~1.0.0"
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+ "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
}
},
"node_modules/xml": {
@@ -26135,9 +25165,9 @@
}
},
"@babel/preset-modules": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
- "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+ "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -26301,15 +25331,15 @@
}
},
"@emotion/cache": {
- "version": "11.4.0",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",
- "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",
+ "version": "11.5.0",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.5.0.tgz",
+ "integrity": "sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw==",
"requires": {
"@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.0.0",
+ "@emotion/sheet": "^1.0.3",
"@emotion/utils": "^1.0.0",
"@emotion/weak-memoize": "^0.2.5",
- "stylis": "^4.0.3"
+ "stylis": "^4.0.10"
}
},
"@emotion/hash": {
@@ -26331,14 +25361,14 @@
"integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
},
"@emotion/react": {
- "version": "11.4.1",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.1.tgz",
- "integrity": "sha512-pRegcsuGYj4FCdZN6j5vqCALkNytdrKw3TZMekTzNXixRg4wkLsU5QEaBG5LC6l01Vppxlp7FE3aTHpIG5phLg==",
+ "version": "11.5.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.5.0.tgz",
+ "integrity": "sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==",
"requires": {
"@babel/runtime": "^7.13.10",
- "@emotion/cache": "^11.4.0",
+ "@emotion/cache": "^11.5.0",
"@emotion/serialize": "^1.0.2",
- "@emotion/sheet": "^1.0.2",
+ "@emotion/sheet": "^1.0.3",
"@emotion/utils": "^1.0.0",
"@emotion/weak-memoize": "^0.2.5",
"hoist-non-react-statics": "^3.3.1"
@@ -26357,9 +25387,9 @@
}
},
"@emotion/sheet": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.2.tgz",
- "integrity": "sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw=="
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.3.tgz",
+ "integrity": "sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ=="
},
"@emotion/styled": {
"version": "11.3.0",
@@ -26405,9 +25435,9 @@
},
"dependencies": {
"globals": {
- "version": "13.11.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
- "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+ "version": "13.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+ "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
"requires": {
"type-fest": "^0.20.2"
}
@@ -26713,45 +25743,11 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "requires": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- }
- },
"jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -26767,79 +25763,6 @@
"slash": "^3.0.0"
}
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -26847,11 +25770,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -27166,20 +26084,22 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "istanbul-lib-instrument": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+ "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+ "requires": {
+ "@babel/core": "^7.7.5",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-coverage": "^3.0.0",
+ "semver": "^6.3.0"
+ }
+ },
"jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -27195,68 +26115,6 @@
"slash": "^3.0.0"
}
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -27269,11 +26127,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -27475,10 +26328,9 @@
}
},
"@jest/types": {
- "version": "27.2.4",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.4.tgz",
- "integrity": "sha512-IDO2ezTxeMvQAHxzG/ZvEyA47q0aVfzT95rGFl7bZs/Go0aIucvfDbS2rmnoEdXxlLQhcolmoG/wvL/uKx4tKA==",
- "peer": true,
+ "version": "27.2.5",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz",
+ "integrity": "sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==",
"requires": {
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
@@ -27491,7 +26343,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
"requires": {
"color-convert": "^2.0.1"
}
@@ -27500,7 +26351,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -27510,7 +26360,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -27518,20 +26367,17 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
"requires": {
"has-flag": "^4.0.0"
}
@@ -27539,38 +26385,39 @@
}
},
"@mui/core": {
- "version": "5.0.0-alpha.50",
- "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.50.tgz",
- "integrity": "sha512-szmmzbyAjEQku17IoEWs7t77n0Kr4zVnT5fREfMd+CnCA4YDifr68ccGJfWaeoGp5Zw/JmfKjQJXLY4GgT6i/g==",
+ "version": "5.0.0-alpha.53",
+ "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.53.tgz",
+ "integrity": "sha512-dTwuhzE0puewJ+/Cw35iAiaBGVcZqVyqspheQHVJuhysSd+o58SONRAiM6MQgI/iFKiJ57HKh+En1MwuC7DMLw==",
"requires": {
"@babel/runtime": "^7.15.4",
"@emotion/is-prop-valid": "^1.1.0",
"@mui/utils": "^5.0.1",
+ "@popperjs/core": "^2.4.4",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
"react-is": "^17.0.2"
}
},
"@mui/icons-material": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.3.tgz",
- "integrity": "sha512-Lktn+4GNnXdVrOCUUvNNvOD9VyrGazWBsJy0BQeQgBe/+IjFMdlcNrDEUIlGlA5ZXOq7Mr/Mv9Os02mgF65jiw==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.5.tgz",
+ "integrity": "sha512-beJo4kmgZwr+2x0ppgHcqqdNQYX4WKddJyMn4eHJAh9dNAGyeY1AJ/8Po+TJKyoSr3C2ZqnW7WrSonAJr2HrUw==",
"requires": {
"@babel/runtime": "^7.15.4"
}
},
"@mui/lab": {
- "version": "5.0.0-alpha.50",
- "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.50.tgz",
- "integrity": "sha512-8DgRjQjjObrHpdFx5HSjw27zQlSf0gc+I911ZSs+YIn7TADQgtg3QzaHqe5o54b+91LhMfugQAtPlRjqXMaEKA==",
+ "version": "5.0.0-alpha.53",
+ "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.53.tgz",
+ "integrity": "sha512-fUyGCuxj8Wdwvyc9v0X3YTNshItFWp6DtuCPjhPy6yhKjUAa0u0XKI4FcM5z/wPWUR56nJceNz9WwNZ72vkwWw==",
"requires": {
"@babel/runtime": "^7.15.4",
"@date-io/date-fns": "^2.11.0",
"@date-io/dayjs": "^2.11.0",
"@date-io/luxon": "^2.11.1",
"@date-io/moment": "^2.11.0",
- "@mui/core": "5.0.0-alpha.50",
- "@mui/system": "^5.0.3",
+ "@mui/core": "5.0.0-alpha.53",
+ "@mui/system": "^5.0.6",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
"prop-types": "^15.7.2",
@@ -27580,17 +26427,16 @@
}
},
"@mui/material": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.3.tgz",
- "integrity": "sha512-Qj2hwSi63qrYRJuHrUFdN83lCT6HXyLzpCniDTvK7NlqXCnpy4F3Gg0hRJTnO4hNqTTBV+SCOKTSbfuzHl/dnQ==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.6.tgz",
+ "integrity": "sha512-1NmLel2Q+PnSfhFhdrhTbZFLfGpGKcPbu8onwGJu+vbD3YMTjr8gXvQ/sYZC0Motfu8jLnQdlq4FD4fRhqndnw==",
"requires": {
"@babel/runtime": "^7.15.4",
- "@mui/core": "5.0.0-alpha.50",
- "@mui/system": "^5.0.3",
+ "@mui/core": "5.0.0-alpha.53",
+ "@mui/system": "^5.0.6",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
- "@popperjs/core": "^2.4.4",
- "@types/react-transition-group": "^4.4.3",
+ "@types/react-transition-group": "^4.4.4",
"clsx": "^1.1.1",
"csstype": "^3.0.9",
"hoist-non-react-statics": "^3.3.2",
@@ -27610,23 +26456,23 @@
}
},
"@mui/styled-engine": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz",
- "integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.2.tgz",
+ "integrity": "sha512-vApnXLj/5V+SbBy+jGFtPgu3tgs0ybSdwWLwXcnUAdNdRyJBffi2KyOP8fhUONLOcZBMU2heNXWz/Zqn5kbDKQ==",
"requires": {
"@babel/runtime": "^7.15.4",
- "@emotion/cache": "^11.4.0",
+ "@emotion/cache": "^11.5.0",
"prop-types": "^15.7.2"
}
},
"@mui/system": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.3.tgz",
- "integrity": "sha512-pNkW9p6Dj/ch3YCKjvrXrBhKsAyJ1/l273Q0hh60hhTKHJXgKBVONQ8r7l1fFHtufI0NNz6UGMVJooIXg4JJtA==",
+ "version": "5.0.6",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.6.tgz",
+ "integrity": "sha512-qZdgODiO82/r1bH9KV5bdqqx/q14i32OGUK/bO6phhXM/DX0TmWSUsnPqFX4F7/UKrvBHsGzIb8ohdRuihQD+Q==",
"requires": {
"@babel/runtime": "^7.15.4",
"@mui/private-theming": "^5.0.1",
- "@mui/styled-engine": "^5.0.1",
+ "@mui/styled-engine": "^5.0.2",
"@mui/types": "^7.0.0",
"@mui/utils": "^5.0.1",
"clsx": "^1.1.1",
@@ -27934,17 +26780,16 @@
}
},
"@testing-library/dom": {
- "version": "8.7.2",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.7.2.tgz",
- "integrity": "sha512-2zN0Zv9dMnaMAd4c/1E1ZChu4QrICyvWtkUvHFQBPhS1oG3VYGcM7SLGLYdda7187ILRXzIUOvOsbXQm4EASjA==",
- "peer": true,
+ "version": "8.10.1",
+ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.10.1.tgz",
+ "integrity": "sha512-rab7vpf1uGig5efWwsCOn9j4/doy+W3VBoUyzX7C4y77u0wAckwc7R8nyH6e2rw0rRzKJR+gWPiAg8zhiFbxWQ==",
"requires": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
"@types/aria-query": "^4.2.0",
- "aria-query": "^4.2.2",
+ "aria-query": "^5.0.0",
"chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.6",
+ "dom-accessibility-api": "^0.5.9",
"lz-string": "^1.4.4",
"pretty-format": "^27.0.2"
},
@@ -27953,7 +26798,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
"requires": {
"color-convert": "^2.0.1"
}
@@ -27962,7 +26806,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -27972,7 +26815,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -27980,20 +26822,17 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
"requires": {
"has-flag": "^4.0.0"
}
@@ -28024,6 +26863,15 @@
"color-convert": "^2.0.1"
}
},
+ "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==",
+ "requires": {
+ "@babel/runtime": "^7.10.2",
+ "@babel/runtime-corejs3": "^7.10.2"
+ }
+ },
"chalk": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -28062,109 +26910,18 @@
}
},
"@testing-library/react": {
- "version": "11.2.7",
- "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
- "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
+ "version": "12.1.2",
+ "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.1.2.tgz",
+ "integrity": "sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g==",
"requires": {
"@babel/runtime": "^7.12.5",
- "@testing-library/dom": "^7.28.1"
- },
- "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"
- }
- },
- "@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==",
- "requires": {
- "@babel/code-frame": "^7.10.4",
- "@babel/runtime": "^7.12.5",
- "@types/aria-query": "^4.2.0",
- "aria-query": "^4.2.2",
- "chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.6",
- "lz-string": "^1.4.4",
- "pretty-format": "^26.6.2"
- }
- },
- "@types/yargs": {
- "version": "15.0.14",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
+ "@testing-library/dom": "^8.0.0"
}
},
"@testing-library/user-event": {
- "version": "13.2.1",
- "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.2.1.tgz",
- "integrity": "sha512-cczlgVl+krjOb3j1625usarNEibI0IFRJrSWX9UsJ1HKYFgCQv9Nb7QAipUDXl3Xdz8NDTsiS78eAkPSxlzTlw==",
+ "version": "13.5.0",
+ "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
+ "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
"requires": {
"@babel/runtime": "^7.12.5"
}
@@ -28217,9 +26974,9 @@
}
},
"@types/eslint": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
- "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
+ "version": "7.28.2",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+ "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
"requires": {
"@types/estree": "*",
"@types/json-schema": "*"
@@ -28231,9 +26988,9 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
},
"@types/glob": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
- "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
"requires": {
"@types/minimatch": "*",
"@types/node": "*"
@@ -28287,88 +27044,12 @@
}
},
"@types/jest": {
- "version": "26.0.24",
- "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
- "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+ "version": "27.0.2",
+ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.2.tgz",
+ "integrity": "sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==",
"requires": {
- "jest-diff": "^26.0.0",
- "pretty-format": "^26.0.0"
- },
- "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.14",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
- "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
- "requires": {
- "@types/yargs-parser": "*"
- }
- },
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
+ "jest-diff": "^27.0.0",
+ "pretty-format": "^27.0.0"
}
},
"@types/json-schema": {
@@ -28381,15 +27062,20 @@
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
},
+ "@types/lodash": {
+ "version": "4.14.176",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz",
+ "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="
+ },
"@types/minimatch": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="
},
"@types/node": {
- "version": "12.20.28",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.28.tgz",
- "integrity": "sha512-cBw8gzxUPYX+/5lugXIPksioBSbE42k0fZ39p+4yRzfYjN6++eq9kAPdlY9qm+MXyfbk9EmvCYAYRn380sF46w=="
+ "version": "16.11.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
+ "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
},
"@types/normalize-package-data": {
"version": "2.4.1",
@@ -28417,46 +27103,35 @@
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
},
"@types/react": {
- "version": "17.0.27",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.27.tgz",
- "integrity": "sha512-zgiJwtsggVGtr53MndV7jfiUESTqrbxOcBvwfe6KS/9bzaVPCTDieTWnFNecVNx6EAaapg5xsLLWFfHHR437AA==",
+ "version": "17.0.33",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.33.tgz",
+ "integrity": "sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw==",
"requires": {
"@types/prop-types": "*",
"@types/scheduler": "*",
"csstype": "^3.0.2"
}
},
- "@types/react-datepicker": {
- "version": "4.1.7",
- "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.1.7.tgz",
- "integrity": "sha512-8FZt62redGDsO/Dptb8/kdu/JZsAD17lsU3E8OwJqxhtNk4EsdVT0v2ArP8efDGkmtonIKVF2usoPzF6ZeL8zw==",
- "requires": {
- "@popperjs/core": "^2.9.2",
- "@types/react": "*",
- "date-fns": "^2.0.1",
- "react-popper": "^2.2.5"
- }
- },
"@types/react-dom": {
- "version": "17.0.9",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz",
- "integrity": "sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==",
+ "version": "17.0.10",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.10.tgz",
+ "integrity": "sha512-8oz3NAUId2z/zQdFI09IMhQPNgIbiP8Lslhv39DIDamr846/0spjZK0vnrMak0iB8EKb9QFTTIdg2Wj2zH5a3g==",
"requires": {
"@types/react": "*"
}
},
"@types/react-helmet": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.3.tgz",
- "integrity": "sha512-U4onVxaZxAp78KpXsfmyCIhLjsvJJ3goG3CYFOo+xW0cPYAz9oe5cBAUSAcN7l35OTbrFvu9TuE0YkcZMKGr4A==",
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.4.tgz",
+ "integrity": "sha512-jyx50RNZXVaTGHY3MsoRPNpeiVk8b0XTPgD/O6KHF6COTDnG/+lRjPYvTK5nfWtR3xDOux0w6bHLAsaHo2ZLTA==",
"requires": {
"@types/react": "*"
}
},
"@types/react-is": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.2.tgz",
- "integrity": "sha512-2+L0ilcAEG8udkDnvx8B0upwXFBbNnVwOsSCTxW3SDOkmar9NyEeLG0ZLa3uOEw9zyYf/fQapcnfXAVmDKlyHw==",
+ "version": "17.0.3",
+ "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz",
+ "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==",
"requires": {
"@types/react": "*"
}
@@ -28471,9 +27146,9 @@
}
},
"@types/react-router-dom": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.1.tgz",
- "integrity": "sha512-UvyRy73318QI83haXlaMwmklHHzV9hjl3u71MmM6wYNu0hOVk9NLTa0vGukf8zXUqnwz4O06ig876YSPpeK28A==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.2.tgz",
+ "integrity": "sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==",
"requires": {
"@types/history": "*",
"@types/react": "*",
@@ -28481,9 +27156,9 @@
}
},
"@types/react-transition-group": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.3.tgz",
- "integrity": "sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==",
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz",
+ "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
"requires": {
"@types/react": "*"
}
@@ -28580,7 +27255,6 @@
"version": "16.0.4",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
- "peer": true,
"requires": {
"@types/yargs-parser": "*"
}
@@ -28626,6 +27300,16 @@
"@typescript-eslint/typescript-estree": "4.33.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
+ },
+ "dependencies": {
+ "eslint-utils": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+ "requires": {
+ "eslint-visitor-keys": "^2.0.0"
+ }
+ }
}
},
"@typescript-eslint/parser": {
@@ -29005,13 +27689,9 @@
}
},
"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==",
- "requires": {
- "@babel/runtime": "^7.10.2",
- "@babel/runtime-corejs3": "^7.10.2"
- }
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+ "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="
},
"arity-n": {
"version": "1.0.4",
@@ -29197,12 +27877,19 @@
"picocolors": "^0.2.1",
"postcss": "^7.0.32",
"postcss-value-parser": "^4.1.0"
+ },
+ "dependencies": {
+ "picocolors": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ }
}
},
"axe-core": {
- "version": "4.3.3",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.3.tgz",
- "integrity": "sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA=="
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.4.tgz",
+ "integrity": "sha512-4Hk6iSA/H90rtiPoCpSkeJxNWCPBf7szwVvaUqrPdxo0j2Y04suHK9jPKXaE3WI7OET6wBSwsWw7FDc1DBq7iQ=="
},
"axobject-query": {
"version": "2.2.0",
@@ -29366,14 +28053,14 @@
}
},
"babel-plugin-istanbul": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
- "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@istanbuljs/load-nyc-config": "^1.0.0",
"@istanbuljs/schema": "^0.1.2",
- "istanbul-lib-instrument": "^4.0.0",
+ "istanbul-lib-instrument": "^5.0.4",
"test-exclude": "^6.0.0"
}
},
@@ -29961,15 +28648,15 @@
}
},
"browserslist": {
- "version": "4.17.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz",
- "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==",
+ "version": "4.17.5",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+ "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
"requires": {
- "caniuse-lite": "^1.0.30001264",
- "electron-to-chromium": "^1.3.857",
+ "caniuse-lite": "^1.0.30001271",
+ "electron-to-chromium": "^1.3.878",
"escalade": "^3.1.1",
- "node-releases": "^1.1.77",
- "picocolors": "^0.2.1"
+ "node-releases": "^2.0.1",
+ "picocolors": "^1.0.0"
}
},
"bser": {
@@ -30131,9 +28818,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001265",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz",
- "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw=="
+ "version": "1.0.30001271",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+ "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA=="
},
"capture-exit": {
"version": "2.0.0",
@@ -30292,15 +28979,10 @@
}
}
},
- "classnames": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
- "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
- },
"clean-css": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
- "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+ "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
"requires": {
"source-map": "~0.6.0"
},
@@ -30569,16 +29251,16 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
},
"core-js": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.2.tgz",
- "integrity": "sha512-zNhPOUoSgoizoSQFdX1MeZO16ORRb9FFQLts8gSYbZU5FcgXhp24iMWMxnOQo5uIaIG7/6FA/IqJPwev1o9ZXQ=="
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
+ "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg=="
},
"core-js-compat": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.2.tgz",
- "integrity": "sha512-25VJYCJtGjZwLguj7d66oiHfmnVw3TMOZ0zV8DyMJp/aeQ3OjR519iOOeck08HMyVVRAqXxafc2Hl+5QstJrsQ==",
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.0.tgz",
+ "integrity": "sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw==",
"requires": {
- "browserslist": "^4.17.3",
+ "browserslist": "^4.17.5",
"semver": "7.0.0"
},
"dependencies": {
@@ -30590,9 +29272,9 @@
}
},
"core-js-pure": {
- "version": "3.18.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.2.tgz",
- "integrity": "sha512-4hMMLUlZhKJKOWbbGD1/VDUxGPEhEoN/T01k7bx271WiBKCvCfkgPzy0IeRS4PB50p6/N1q/SZL4B/TRsTE5bA=="
+ "version": "3.19.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.0.tgz",
+ "integrity": "sha512-UEQk8AxyCYvNAs6baNoPqDADv7BX0AmBLGxVsrAifPPx/C8EAzV4Q+2ZUJqVzfI2TQQEZITnwUkWcHpgc/IubQ=="
},
"core-util-is": {
"version": "1.0.3",
@@ -30829,9 +29511,9 @@
}
},
"css-what": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
- "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+ "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="
},
"css.escape": {
"version": "1.5.1",
@@ -31314,10 +29996,15 @@
}
}
},
+ "diacritics": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
+ "integrity": "sha1-PvqHMj67hj5mls67AILUj/PW96E="
+ },
"diff-sequences": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
- "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="
+ "version": "27.0.6",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
+ "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ=="
},
"diffie-hellman": {
"version": "5.0.3",
@@ -31375,9 +30062,9 @@
}
},
"dom-accessibility-api": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.7.tgz",
- "integrity": "sha512-ml3lJIq9YjUfM9TUnEPvEYWFSwivwIGBPKpewX7tii7fwCazA8yCioGdqQcNsItPpfFvSJ3VIdMQPj60LJhcQA=="
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.9.tgz",
+ "integrity": "sha512-+KPF4o71fl6NrdnqIrJc6m44NA+Rhf1h7In2MRznejSQasWkjqmHOBUlk+pXJ77cVOSYyZeNHFwn/sjotB6+Sw=="
},
"dom-converter": {
"version": "0.2.0",
@@ -31510,9 +30197,9 @@
"integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
},
"electron-to-chromium": {
- "version": "1.3.861",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz",
- "integrity": "sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg=="
+ "version": "1.3.880",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz",
+ "integrity": "sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw=="
},
"elliptic": {
"version": "6.5.4",
@@ -31842,25 +30529,10 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "eslint-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
- "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "requires": {
- "eslint-visitor-keys": "^1.1.0"
- },
- "dependencies": {
- "eslint-visitor-keys": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
- "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
- }
- }
- },
"globals": {
- "version": "13.11.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
- "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+ "version": "13.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
+ "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
"requires": {
"type-fest": "^0.20.2"
}
@@ -31921,11 +30593,13 @@
}
},
"eslint-config-airbnb-typescript": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.0.tgz",
- "integrity": "sha512-d2Nit2ByZARGRYK6tgSNl3nnmGZPyvsgbsKFcmm+nAhvT8VjVpifG5jI4tzObUUPb0sWw0E1oO/0pSpBD/pIuQ==",
+ "version": "14.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-14.0.1.tgz",
+ "integrity": "sha512-tF4GwC3sRrw8kEj4/yxX8F7AcLzj/1IESBnsCiFMplzYmxre459qm2z9DFkCpqBVQFSH6j2K4+VKVteX4m0GsQ==",
"dev": true,
- "requires": {}
+ "requires": {
+ "eslint-config-airbnb-base": "14.2.1"
+ }
},
"eslint-config-prettier": {
"version": "8.3.0",
@@ -31962,11 +30636,12 @@
}
},
"eslint-module-utils": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz",
- "integrity": "sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==",
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz",
+ "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==",
"requires": {
"debug": "^3.2.7",
+ "find-up": "^2.1.0",
"pkg-dir": "^2.0.0"
},
"dependencies": {
@@ -31990,23 +30665,21 @@
}
},
"eslint-plugin-import": {
- "version": "2.24.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz",
- "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==",
+ "version": "2.25.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz",
+ "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==",
"requires": {
- "array-includes": "^3.1.3",
- "array.prototype.flat": "^1.2.4",
+ "array-includes": "^3.1.4",
+ "array.prototype.flat": "^1.2.5",
"debug": "^2.6.9",
"doctrine": "^2.1.0",
"eslint-import-resolver-node": "^0.3.6",
- "eslint-module-utils": "^2.6.2",
- "find-up": "^2.0.0",
+ "eslint-module-utils": "^2.7.0",
"has": "^1.0.3",
- "is-core-module": "^2.6.0",
+ "is-core-module": "^2.7.0",
+ "is-glob": "^4.0.3",
"minimatch": "^3.0.4",
- "object.values": "^1.1.4",
- "pkg-up": "^2.0.0",
- "read-pkg-up": "^3.0.0",
+ "object.values": "^1.1.5",
"resolve": "^1.20.0",
"tsconfig-paths": "^3.11.0"
},
@@ -32035,9 +30708,9 @@
}
},
"eslint-plugin-jest": {
- "version": "24.5.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.5.2.tgz",
- "integrity": "sha512-lrI3sGAyZi513RRmP08sIW241Ti/zMnn/6wbE4ZBhb3M2pJ9ztaZMnSKSKKBUfotVdwqU8W1KtD8ao2/FR8DIg==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz",
+ "integrity": "sha512-wUxdF2bAZiYSKBclsUMrYHH6WxiBreNjyDxbRv345TIvPeoCEgPNEn3Sa+ZrSqsf1Dl9SqqSREXMHExlMMu1DA==",
"requires": {
"@typescript-eslint/experimental-utils": "^4.0.1"
}
@@ -32058,6 +30731,17 @@
"has": "^1.0.3",
"jsx-ast-utils": "^3.1.0",
"language-tags": "^1.0.5"
+ },
+ "dependencies": {
+ "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==",
+ "requires": {
+ "@babel/runtime": "^7.10.2",
+ "@babel/runtime-corejs3": "^7.10.2"
+ }
+ }
}
},
"eslint-plugin-react": {
@@ -32154,14 +30838,6 @@
"eslint-visitor-keys": "^1.1.0"
}
},
- "eslint-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
- "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "requires": {
- "eslint-visitor-keys": "^1.1.0"
- }
- },
"eslint-visitor-keys": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
@@ -32194,11 +30870,18 @@
}
},
"eslint-utils": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
- "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
"requires": {
- "eslint-visitor-keys": "^2.0.0"
+ "eslint-visitor-keys": "^1.1.0"
+ },
+ "dependencies": {
+ "eslint-visitor-keys": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
+ }
}
},
"eslint-visitor-keys": {
@@ -32270,9 +30953,9 @@
}
},
"estraverse": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
- "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
},
"estree-walker": {
"version": "1.0.1",
@@ -32511,6 +31194,11 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -33610,10 +32298,18 @@
"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
},
+ "i18n-iso-countries": {
+ "version": "6.8.0",
+ "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-6.8.0.tgz",
+ "integrity": "sha512-jJs/+CA6+VUICFxqGcB0vFMERGfhfvyNk+8Vb9EagSZkl7kSpm/kT0VyhvzM/zixDWEV/+oN9L7v/GT9BwzoGg==",
+ "requires": {
+ "diacritics": "1.3.0"
+ }
+ },
"i18next": {
- "version": "20.6.1",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.6.1.tgz",
- "integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==",
+ "version": "21.3.3",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.3.3.tgz",
+ "integrity": "sha512-Wv5arCT9pK35nfhOzTdS64T7JpPcoqnkOEidxc4zF0DZ8KetpvmnkO+uWkXy+DFz6zWzPX7U9bIemwBqpFRprw==",
"requires": {
"@babel/runtime": "^7.12.0"
}
@@ -33930,9 +32626,9 @@
}
},
"is-core-module": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.7.0.tgz",
- "integrity": "sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==",
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+ "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
"requires": {
"has": "^1.0.3"
}
@@ -34163,16 +32859,17 @@
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
},
"istanbul-lib-coverage": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
- "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+ "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
},
"istanbul-lib-instrument": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
- "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+ "version": "5.0.4",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz",
+ "integrity": "sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw==",
"requires": {
- "@babel/core": "^7.7.5",
+ "@babel/core": "^7.12.3",
+ "@babel/parser": "^7.14.7",
"@istanbuljs/schema": "^0.1.2",
"istanbul-lib-coverage": "^3.0.0",
"semver": "^6.3.0"
@@ -34212,9 +32909,9 @@
}
},
"istanbul-lib-source-maps": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
- "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+ "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
"requires": {
"debug": "^4.1.1",
"istanbul-lib-coverage": "^3.0.0",
@@ -34229,9 +32926,9 @@
}
},
"istanbul-reports": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.3.tgz",
- "integrity": "sha512-0i77ZFLsb9U3DHi22WzmIngVzfoyxxbQcZRqlF3KoKmCJGq9nhFHoGi8FqBztN2rE8w6hURnZghetn0xpkVb6A==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.5.tgz",
+ "integrity": "sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ==",
"requires": {
"html-escaper": "^2.0.0",
"istanbul-lib-report": "^3.0.0"
@@ -34496,133 +33193,11 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "requires": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- }
- },
- "jest-resolve": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
- "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
- "requires": {
- "@jest/types": "^26.6.2",
- "chalk": "^4.0.0",
- "graceful-fs": "^4.2.4",
- "jest-pnp-resolver": "^1.2.2",
- "jest-util": "^26.6.2",
- "read-pkg-up": "^7.0.1",
- "resolve": "^1.18.1",
- "slash": "^3.0.0"
- }
- },
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -34630,22 +33205,31 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
- "jest-diff": {
- "version": "26.6.2",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
- "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "jest-config": {
+ "version": "26.6.3",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+ "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
"requires": {
+ "@babel/core": "^7.1.0",
+ "@jest/test-sequencer": "^26.6.3",
+ "@jest/types": "^26.6.2",
+ "babel-jest": "^26.6.3",
"chalk": "^4.0.0",
- "diff-sequences": "^26.6.2",
+ "deepmerge": "^4.2.2",
+ "glob": "^7.1.1",
+ "graceful-fs": "^4.2.4",
+ "jest-environment-jsdom": "^26.6.2",
+ "jest-environment-node": "^26.6.2",
"jest-get-type": "^26.3.0",
+ "jest-jasmine2": "^26.6.3",
+ "jest-regex-util": "^26.0.0",
+ "jest-resolve": "^26.6.2",
+ "jest-util": "^26.6.2",
+ "jest-validate": "^26.6.2",
+ "micromatch": "^4.0.2",
"pretty-format": "^26.6.2"
},
"dependencies": {
@@ -34704,6 +33288,26 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
+ "jest-resolve": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+ "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+ "requires": {
+ "@jest/types": "^26.6.2",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.4",
+ "jest-pnp-resolver": "^1.2.2",
+ "jest-util": "^26.6.2",
+ "read-pkg-up": "^7.0.1",
+ "resolve": "^1.18.1",
+ "slash": "^3.0.0"
+ }
+ },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -34725,6 +33329,62 @@
}
}
},
+ "jest-diff": {
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz",
+ "integrity": "sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==",
+ "requires": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^27.0.6",
+ "jest-get-type": "^27.3.1",
+ "pretty-format": "^27.3.1"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"jest-docblock": {
"version": "26.0.0",
"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
@@ -34800,6 +33460,11 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -34978,10 +33643,20 @@
}
}
},
+ "jest-fetch-mock": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+ "integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+ "dev": true,
+ "requires": {
+ "cross-fetch": "^3.0.4",
+ "promise-polyfill": "^8.1.3"
+ }
+ },
"jest-get-type": {
- "version": "26.3.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
- "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz",
+ "integrity": "sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg=="
},
"jest-haste-map": {
"version": "26.6.2",
@@ -35263,6 +33938,11 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -35345,11 +34025,32 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "diff-sequences": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+ "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="
+ },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-diff": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+ "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "requires": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^26.6.2",
+ "jest-get-type": "^26.3.0",
+ "pretty-format": "^26.6.2"
+ }
+ },
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -35613,82 +34314,11 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -35696,11 +34326,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -35856,45 +34481,11 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "requires": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- }
- },
"jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -35910,79 +34501,6 @@
"slash": "^3.0.0"
}
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -35990,11 +34508,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -36082,45 +34595,11 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
- "jest-config": {
- "version": "26.6.3",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
- "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
- "requires": {
- "@babel/core": "^7.1.0",
- "@jest/test-sequencer": "^26.6.3",
- "@jest/types": "^26.6.2",
- "babel-jest": "^26.6.3",
- "chalk": "^4.0.0",
- "deepmerge": "^4.2.2",
- "glob": "^7.1.1",
- "graceful-fs": "^4.2.4",
- "jest-environment-jsdom": "^26.6.2",
- "jest-environment-node": "^26.6.2",
- "jest-get-type": "^26.3.0",
- "jest-jasmine2": "^26.6.3",
- "jest-regex-util": "^26.0.0",
- "jest-resolve": "^26.6.2",
- "jest-util": "^26.6.2",
- "jest-validate": "^26.6.2",
- "micromatch": "^4.0.2",
- "pretty-format": "^26.6.2"
- }
- },
"jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -36136,79 +34615,6 @@
"slash": "^3.0.0"
}
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
- "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==",
- "requires": {
- "@jest/types": "^26.6.2",
- "ansi-regex": "^5.0.0",
- "ansi-styles": "^4.0.0",
- "react-is": "^17.0.1"
- }
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -36216,11 +34622,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -36306,20 +34707,32 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- }
+ "diff-sequences": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+ "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q=="
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-diff": {
+ "version": "26.6.2",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+ "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+ "requires": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^26.6.2",
+ "jest-get-type": "^26.3.0",
+ "pretty-format": "^26.6.2"
+ }
+ },
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"jest-resolve": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
@@ -36335,40 +34748,6 @@
"slash": "^3.0.0"
}
},
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -36380,34 +34759,6 @@
"react-is": "^17.0.1"
}
},
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
- "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
- "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
- "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- }
- },
"semver": {
"version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -36423,11 +34774,6 @@
"requires": {
"has-flag": "^4.0.0"
}
- },
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
}
}
},
@@ -36577,6 +34923,11 @@
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
+ "jest-get-type": {
+ "version": "26.3.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+ "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig=="
+ },
"pretty-format": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
@@ -36813,12 +35164,6 @@
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
"integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="
- },
- "ws": {
- "version": "7.5.5",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
- "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
- "requires": {}
}
}
},
@@ -36894,9 +35239,9 @@
"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
},
"klona": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
- "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+ "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
},
"language-subtag-registry": {
"version": "0.3.21",
@@ -36935,47 +35280,15 @@
}
},
"libphonenumber-js": {
- "version": "1.9.37",
- "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.37.tgz",
- "integrity": "sha512-RnUR4XwiVhMLnT7uFSdnmLeprspquuDtaShAgKTA+g/ms9/S4hQU3/QpFdh3iXPHtxD52QscXLm2W2+QBmvYAg=="
+ "version": "1.9.39",
+ "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.39.tgz",
+ "integrity": "sha512-TxYz/Ii7mjkocKGKmFHhsTAvvcxr4AY3yUlZzZ2z7HC4DPRrNlzJ9n32/SMogqsyFOXLMXQPCkCInNRbiVaEPA=="
},
"lines-and-columns": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
},
- "load-json-file": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
- "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
- "requires": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^4.0.0",
- "pify": "^3.0.0",
- "strip-bom": "^3.0.0"
- },
- "dependencies": {
- "parse-json": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
- "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
- "requires": {
- "error-ex": "^1.3.1",
- "json-parse-better-errors": "^1.0.1"
- }
- },
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
- },
- "strip-bom": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
- "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
- }
- }
- },
"loader-runner": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -37116,11 +35429,11 @@
}
},
"makeerror": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
- "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+ "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
"requires": {
- "tmpl": "1.0.x"
+ "tmpl": "1.0.5"
}
},
"map-cache": {
@@ -37445,9 +35758,9 @@
"optional": true
},
"nanoid": {
- "version": "3.1.29",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz",
- "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg=="
+ "version": "3.1.30",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
+ "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="
},
"nanomatch": {
"version": "1.2.13",
@@ -37592,9 +35905,9 @@
}
},
"node-releases": {
- "version": "1.1.77",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
- "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
},
"normalize-package-data": {
"version": "2.5.0",
@@ -38107,9 +36420,9 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"picocolors": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
- "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
},
"picomatch": {
"version": "2.3.0",
@@ -38151,11 +36464,51 @@
}
},
"pkg-up": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
- "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+ "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
"requires": {
- "find-up": "^2.1.0"
+ "find-up": "^3.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+ }
}
},
"pnp-webpack-plugin": {
@@ -38208,6 +36561,11 @@
"source-map": "^0.6.1"
},
"dependencies": {
+ "picocolors": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -39098,12 +37456,12 @@
},
"dependencies": {
"postcss": {
- "version": "8.3.9",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz",
- "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==",
+ "version": "8.3.11",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+ "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
"requires": {
- "nanoid": "^3.1.28",
- "picocolors": "^0.2.1",
+ "nanoid": "^3.1.30",
+ "picocolors": "^1.0.0",
"source-map-js": "^0.6.2"
}
}
@@ -39203,12 +37561,11 @@
}
},
"pretty-format": {
- "version": "27.2.4",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.4.tgz",
- "integrity": "sha512-NUjw22WJHldzxyps2YjLZkUj6q1HvjqFezkB9Y2cklN8NtVZN/kZEXGZdFw4uny3oENzV5EEMESrkI0YDUH8vg==",
- "peer": true,
+ "version": "27.3.1",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz",
+ "integrity": "sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==",
"requires": {
- "@jest/types": "^27.2.4",
+ "@jest/types": "^27.2.5",
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
"react-is": "^17.0.1"
@@ -39217,8 +37574,7 @@
"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==",
- "peer": true
+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
}
}
},
@@ -39250,6 +37606,12 @@
"resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
},
+ "promise-polyfill": {
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.1.tgz",
+ "integrity": "sha512-3p9zj0cEHbp7NVUxEYUWjQlffXqnXaZIMPkAO7HhFh8u5636xLRDHOUo2vpWSK0T2mqm6fKLXYn1KP6PAZ2gKg==",
+ "dev": true
+ },
"prompts": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
@@ -39459,19 +37821,6 @@
"whatwg-fetch": "^3.4.1"
}
},
- "react-datepicker": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.2.1.tgz",
- "integrity": "sha512-0gcvHMnX8rS1fV90PjjsB7MQdsWNU77JeVHf6bbwK9HnFxgwjVflTx40ebKmHV+leqe+f+FgUP9Nvqbe5RGyfA==",
- "requires": {
- "@popperjs/core": "^2.9.2",
- "classnames": "^2.2.6",
- "date-fns": "^2.0.1",
- "prop-types": "^15.7.2",
- "react-onclickoutside": "^6.10.0",
- "react-popper": "^2.2.5"
- }
- },
"react-dev-utils": {
"version": "11.0.4",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -39557,6 +37906,11 @@
"p-locate": "^4.1.0"
}
},
+ "node-releases": {
+ "version": "1.1.77",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz",
+ "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="
+ },
"p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -39583,46 +37937,6 @@
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
},
- "pkg-up": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
- "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
- "requires": {
- "find-up": "^3.0.0"
- },
- "dependencies": {
- "find-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
- "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
- "requires": {
- "locate-path": "^3.0.0"
- }
- },
- "locate-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
- "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
- "requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-locate": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
- "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
- "requires": {
- "p-limit": "^2.0.0"
- }
- },
- "path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
- }
- }
- },
"strip-ansi": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -39665,9 +37979,9 @@
}
},
"react-hook-form": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.17.1.tgz",
- "integrity": "sha512-9nQ+qKFHFpnWzQHdDh6F4Egxa8iJkue1KU921F8qqeyUVbPPjgQZDXaQyNHABEYjRh0ndjTI24GDA+lwm2lQdg==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.18.0.tgz",
+ "integrity": "sha512-aTFs1jXGvpBBv4vYuhheVd9KbAZw/l3DOZhLIadNDyFddaDQmn+yJa63IZ14GDFz4NFgIi+ROkubfGJG2x6q2Q==",
"requires": {}
},
"react-i18next": {
@@ -39684,21 +37998,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
},
- "react-onclickoutside": {
- "version": "6.12.0",
- "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.0.tgz",
- "integrity": "sha512-oPlOTYcISLHfpMog2lUZMFSbqOs4LFcA4+vo7fpfevB5v9Z0D5VBDBkfeO5lv+hpEcGoaGk67braLT+QT+eICA==",
- "requires": {}
- },
- "react-popper": {
- "version": "2.2.5",
- "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
- "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
- "requires": {
- "react-fast-compare": "^3.0.1",
- "warning": "^4.0.2"
- }
- },
"react-refresh": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
@@ -39872,37 +38171,81 @@
}
},
"read-pkg": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
- "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"requires": {
- "load-json-file": "^4.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^3.0.0"
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
},
"dependencies": {
- "path-type": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
- "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
- "requires": {
- "pify": "^3.0.0"
- }
- },
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+ "type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
}
}
},
"read-pkg-up": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
- "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"requires": {
- "find-up": "^2.0.0",
- "read-pkg": "^3.0.0"
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+ },
+ "type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+ }
}
},
"readable-stream": {
@@ -42259,9 +40602,9 @@
"integrity": "sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="
},
"typescript": {
- "version": "4.4.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",
- "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="
+ "version": "4.4.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+ "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="
},
"unbox-primitive": {
"version": "1.0.1",
@@ -42599,19 +40942,11 @@
}
},
"walker": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
- "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
- "requires": {
- "makeerror": "1.0.x"
- }
- },
- "warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+ "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
"requires": {
- "loose-envify": "^1.0.0"
+ "makeerror": "1.0.12"
}
},
"watchpack": {
@@ -42852,9 +41187,9 @@
}
},
"web-vitals": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz",
- "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig=="
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.2.tgz",
+ "integrity": "sha512-nZnEH8dj+vJFqCRYdvYv0a59iLXsb8jJkt+xvXfwgnkyPdsSLtKNlYmtTDiHmTNGXeSXtpjTTUcNvFtrAk6VMQ=="
},
"webidl-conversions": {
"version": "6.1.0",
@@ -43600,6 +41935,14 @@
}
}
},
+ "ws": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ },
"yargs": {
"version": "13.3.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -44037,12 +42380,10 @@
}
},
"ws": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
- "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
- "requires": {
- "async-limiter": "~1.0.0"
- }
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+ "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+ "requires": {}
},
"xml": {
"version": "1.0.1",
diff --git a/frontend/package.json b/frontend/package.json
index 8048554994014c225236c156172982cb61f3a8b6..869252b77debd5493aaba95d2487a6a5d898b60a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,42 +3,43 @@
"version": "0.1.0",
"private": true,
"dependencies": {
- "@emotion/react": "^11.4.1",
+ "@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
- "@mui/icons-material": "^5.0.1",
+ "@mui/icons-material": "^5.0.5",
"@mui/lab": "^5.0.0-alpha.49",
- "@mui/material": "^5.0.1",
- "@mui/system": "^5.0.1",
+ "@mui/material": "^5.0.5",
+ "@mui/system": "^5.0.5",
"@mui/utils": "^5.0.1",
"@navikt/fnrvalidator": "^1.1.4",
"@testing-library/jest-dom": "^5.14.1",
- "@testing-library/react": "^11.2.7",
- "@testing-library/user-event": "^13.2.1",
- "@types/jest": "^26.0.24",
- "@types/node": "^12.20.24",
- "@types/react": "^17.0.20",
- "@types/react-dom": "^17.0.9",
- "@types/react-datepicker": "^4.1.7",
- "@types/react-helmet": "^6.1.2",
- "@types/react-router-dom": "^5.1.8",
+ "@testing-library/react": "^12.1.2",
+ "@testing-library/user-event": "^13.5.0",
+ "@types/jest": "^27.0.2",
+ "@types/lodash": "^4.14.176",
+ "@types/node": "^16.11.6",
+ "@types/react": "^17.0.33",
+ "@types/react-dom": "^17.0.10",
+ "@types/react-helmet": "^6.1.4",
+ "@types/react-router-dom": "^5.3.2",
"date-fns": "^2.24.0",
"fetch-intercept": "^2.4.0",
"http-proxy-middleware": "^2.0.1",
- "i18next": "^20.6.0",
+ "i18n-iso-countries": "^6.8.0",
+ "i18next": "^21.3.3",
"i18next-browser-languagedetector": "^6.1.2",
"i18next-http-backend": "^1.3.1",
"libphonenumber-js": "^1.9.35",
+ "lodash": "^4.17.21",
"react": "^17.0.2",
- "react-datepicker": "^4.2.1",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
- "react-hook-form": "^7.15.3",
+ "react-hook-form": "^7.17.5",
"react-i18next": "^11.11.4",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"typeface-roboto": "^1.1.13",
- "typescript": "^4.4.2",
- "web-vitals": "^1.1.2"
+ "typescript": "^4.4.4",
+ "web-vitals": "^2.1.2"
},
"scripts": {
"start": "NODE_ENV=development HOST=0.0.0.0 npm run build:env && DISABLE_ESLINT_PLUGIN='true' react-scripts start",
@@ -77,12 +78,13 @@
"@typescript-eslint/parser": "^4.31.1",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
- "eslint-config-airbnb-typescript": "^14.0.0",
+ "eslint-config-airbnb-typescript": "^14.0.1",
"eslint-config-prettier": "^8.3.0",
- "eslint-plugin-import": "^2.24.2",
+ "eslint-plugin-import": "^2.25.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.2.0",
+ "jest-fetch-mock": "^3.0.3",
"jest-junit": "^12.2.0"
}
}
diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
index b90a20a2fc719799c153614cde98b45b368a43ab..49ba93ed697ebfbf10b27dd731ddc7bb5b4e08e5 100644
--- a/frontend/public/locales/en/common.json
+++ b/frontend/public/locales/en/common.json
@@ -17,16 +17,38 @@
"roleStartDate": "From",
"roleEndDate": "To",
"comment": "Comment",
+ "contact": "Contact person",
+ "searchable": "Available in search?",
"email": "E-mail",
"fullName": "Full name",
- "mobilePhone": "Mobile phone"
+ "mobilePhone": "Mobile phone",
+ "passportNumber": "Passport number",
+ "passportNationality": "Passport nationality",
+ "countryCallingCode": "Country code",
+ "contactPersonUnit": "Contact at unit"
},
"sponsor": {
+ "addRole": "Add role",
+ "roleInfoText": "You can change the start and end dates for the role.",
+ "choose": "Choose",
+ "details": "Details",
+ "modifyEnd": "Change end date",
+ "endNow": "End role"
+ },
+ "guestInfo": {
"contactInfo": "Contact information",
- "roleInfo": "Guest role- and period information",
- "overviewGuest": "Guest overview"
+ "roleInfoHead": "Roles and periods",
+ "roleInfoBody": "You can only change roles that you have given"
+ },
+ "guest": {
+ "headerText": "Add new role and period.",
+ "bodyText": "Here you can add a new role to the same guest"
+ },
+ "register": {
+ "registerHeading": "Register new guest",
+ "registerText": "Please search for e-mail or phone number before registering a new guest to prevent duplicates.",
+ "registerButtonText": "Register new guest"
},
-
"loading": "Loading...",
"termsHeader": "Terms",
"staging": "Staging",
@@ -45,6 +67,12 @@
"activeGuests": "Your active guests",
"activeGuestsDescription": "Make changes to your existing guests",
"noActiveGuests": "No active guests",
+ "sentInvitations": "Sent invitations",
+ "sentInvitationsDescription": "Invitations awaiting response from guest.",
+ "noInvitations": "No invitations",
+ "status": "Status",
+ "active": "Active",
+ "expired": "Expired",
"details": "Details",
"nationalIdNumber": "National ID number",
"validation": {
@@ -57,13 +85,19 @@
"roleEndRequired": "Role end date is required",
"emailRequired": "E-mail is required",
"invalidMobilePhoneNumber": "Invalid phone number",
- "invalidEmail": "Invalid e-mail address"
+ "invalidEmail": "Invalid e-mail address",
+ "passportNumberRequired": "Passport number required",
+ "mobilePhoneRequired": "Mobile phone is required",
+ "startDateMustBeSet": "Start date must be set",
+ "startDateMustBeBeforeEndDate": "Start date has to be before end date"
},
"button": {
"back": "Back",
"next": "Next",
"save": "Save",
- "cancel": "Cancel"
+ "cancel": "Cancel",
+ "backToFrontPage": "Go to front page",
+ "cancelInvitation": "Cancel"
},
"registerWizardText": {
"registerPage": "Enter the contact information for the guest below. All fields are mandatory.",
@@ -79,5 +113,17 @@
"guestDepartment": "Department"
},
"yourGuests": "Your guests",
- "registerNewGuest": "Register new guest"
+ "registerNewGuest": "Register new guest",
+ "guestOverview": "Guest overview",
+ "guestRegisterWizardText": {
+ "yourContactInformation": "Your contact information",
+ "contactInformationDescription": "Fill in your mobile phone number.",
+ "yourGuestPeriod": "Your guest period",
+ "guestPeriodDescription": "Period registered for your guest role."
+ },
+ "yourGuestAccount": "Your guest account",
+ "feideId": "Feide ID",
+ "thankYou": "Thanks!",
+ "sponsorSubmitSuccessDescription": "Your registration has been completed. You will receive an e-mail when the guest has filled in the missing information, so that the guest account can be approved.",
+ "guestSubmitSuccessDescription": "Your registration is now completed. You will receive an e-mail or SMS when your account has been created."
}
diff --git a/frontend/public/locales/en/invite.json b/frontend/public/locales/en/invite.json
new file mode 100644
index 0000000000000000000000000000000000000000..70693d275ab5a2c20d9513f1854d1fa4e0643844
--- /dev/null
+++ b/frontend/public/locales/en/invite.json
@@ -0,0 +1,6 @@
+{
+ "description": "Please choose how you want to log in to complete your registration. The recommended way is to log in with either Feide or ID-porten. If that is not possible you can manually fill out the registration form with your passport number.",
+ "header": "Guest Registration",
+ "login": "Log in with FEIDE",
+ "manual": "Registrate manually"
+}
diff --git a/frontend/public/locales/nb/common.json b/frontend/public/locales/nb/common.json
index a03c35a9cda2ca740f27c07b9d1dbf6dda309160..31337194bae1593ed86b83d324ca358595ffe793 100644
--- a/frontend/public/locales/nb/common.json
+++ b/frontend/public/locales/nb/common.json
@@ -17,14 +17,37 @@
"roleStartDate": "Fra",
"roleEndDate": "Til",
"comment": "Kommentar",
+ "contact": "Kontaktperson",
+ "searchable": "Synlig i søk?",
"email": "E-post",
"fullName": "Fullt navn",
- "mobilePhone": "Mobilnummer"
+ "mobilePhone": "Mobilnummer",
+ "passportNumber": "Passnummer",
+ "passportNationality": "Passnasjonalitet",
+ "countryCallingCode": "Landkode",
+ "contactPersonUnit": "Kontakt ved avdeling"
},
"sponsor": {
+ "addRole": "Legg til rolle",
+ "roleInfoText": "Her kan du endre på start- og sluttdato for gjesterollen eller avslutte perioden",
+ "choose": "Velg",
+ "details": "Detaljer",
+ "modifyEnd": "Endre sluttdato",
+ "endNow": "Avslutt rolle"
+ },
+ "guestInfo": {
"contactInfo": "Kontaktinformasjon",
- "roleInfo": "Gjesterolle- og periodeinformasjon",
- "overviewGuest": "Oversikt over gjest"
+ "roleInfoHead": "Roller og perioder",
+ "roleInfoBody": "Du kan bare endre på gjesteroller som du er vert for"
+ },
+ "guest": {
+ "headerText": "Legg til ny rolle og periode",
+ "bodyText": "Her kan du legge til en ny rolle på samme gjest"
+ },
+ "register": {
+ "registerHeading": "Registrer ny gjest",
+ "registerText": "Søk etter e-post eller mobilnummer før du registrerer ny gjest for å unngå dobbeltoppføringer.",
+ "registerButtonText": "Registrer ny gjest"
},
"loading": "Laster...",
"termsHeader": "Vilkår",
@@ -44,6 +67,12 @@
"activeGuests": "Dine aktive gjester",
"activeGuestsDescription": "Her kan du endre på eksisterende gjester",
"noActiveGuests": "Ingen aktive gjester",
+ "sentInvitations": "Sendte invitasjoner",
+ "sentInvitationsDescription": "Invitasjoner som venter på at gjesten skal ferdigstille registreringen.",
+ "noInvitations": "Ingen invitasjoner",
+ "status": "Status",
+ "active": "Aktiv",
+ "expired": "Utgått",
"details": "Detaljer",
"nationalIdNumber": "Fødselsnummer",
"validation": {
@@ -56,13 +85,19 @@
"roleEndRequired": "Sluttdato for rolle er obligatorisk",
"emailRequired": "E-post er obligatorisk",
"invalidMobilePhoneNumber": "Ugyldig telefonnummer",
- "invalidEmail": "Ugyldig e-postadresse"
+ "invalidEmail": "Ugyldig e-postadresse",
+ "passportNumberRequired": "Passnummer er obligatorisk",
+ "mobilePhoneRequired": "Mobilnummer er obligatorisk",
+ "startDateMustBeSet": "Startdato må være satt",
+ "startDateMustBeBeforeEndDate": "Startdato må være før sluttdato"
},
"button": {
"back": "Tilbake",
"next": "Neste",
"save": "Lagre",
- "cancel": "Avbryt"
+ "cancel": "Avbryt",
+ "backToFrontPage": "Tilbake til forsiden",
+ "cancelInvitation": "Kanseller"
},
"registerWizardText": {
"registerPage": "Fyll inn kontaktinformasjonen til gjesten under. Alle feltene er obligatoriske.",
@@ -78,5 +113,17 @@
"guestDepartment": "Avdeling"
},
"yourGuests": "Dine gjester",
- "registerNewGuest": "Registrer ny gjest"
+ "registerNewGuest": "Registrer ny gjest",
+ "guestOverview": "Oversikt over gjest",
+ "guestRegisterWizardText": {
+ "yourContactInformation": "Din kontaktinfo",
+ "contactInformationDescription": "Fyll inn ditt mobilnummer.",
+ "yourGuestPeriod": "Din gjesteperiode",
+ "guestPeriodDescription": "Registrert periode for din gjesterolle."
+ },
+ "yourGuestAccount": "Din gjestekonto",
+ "feideId": "Feide ID",
+ "thankYou": "Takk!",
+ "sponsorSubmitSuccessDescription": "Din registrering er nå fullført. Du vil få en e-post når gjesten har fylt inn informasjonen som mangler, slik at gjestekontoen kan godkjennes.",
+ "guestSubmitSuccessDescription": "Din registrering er nå fullført. Du vil få en e-post eller SMS når kontoen er opprettet."
}
diff --git a/frontend/public/locales/nb/invite.json b/frontend/public/locales/nb/invite.json
new file mode 100644
index 0000000000000000000000000000000000000000..6f6b73f0d316f226596aeaa894184030db619f91
--- /dev/null
+++ b/frontend/public/locales/nb/invite.json
@@ -0,0 +1,6 @@
+{
+ "description": "Vennligst velg hvordan du vil logge inn for å fullføre registreringen. Den anbefalte metoden er å logge inn gjennom Feide eller ID-porten. Dersom det ikke er mulig kan du fylle ut registreringskjemaet manuelt med passnummer",
+ "header": "Gjestetjenesten",
+ "login": "Logg inn med FEIDE",
+ "manual": "Registrer manuelt"
+}
diff --git a/frontend/public/locales/nn/common.json b/frontend/public/locales/nn/common.json
index 8ec2986b7089f2c73a41b3bf5fda5351c33b8161..9752c901d8cff562b150e2d074f501b7cb74befb 100644
--- a/frontend/public/locales/nn/common.json
+++ b/frontend/public/locales/nn/common.json
@@ -18,14 +18,37 @@
"roleStartDate": "Frå",
"roleEndDate": "Til",
"comment": "Kommentar",
+ "contact": "Kontaktperson",
+ "searchable": "Synleg i søk?",
"email": "E-post",
"fullName": "Fullt namn",
- "mobilePhone": "Mobilnummer"
+ "mobilePhone": "Mobilnummer",
+ "passportNumber": "Passnummer",
+ "passportNationality": "Passnasjonalitet",
+ "countryCallingCode": "Landkode",
+ "contactPersonUnit": "Kontakt ved avdeling"
},
"sponsor": {
+ "addRole": "Legg til role",
+ "roleInfoText": "Her kan du endre på start- og sluttdato for gjesterollen eller avslutte perioden",
+ "choose": "Velg",
+ "details": "Detaljer",
+ "modifyEnd": "Endre sluttdato",
+ "endNow": "Avslutt rolle"
+ },
+ "guestInfo": {
"contactInfo": "Kontaktinformasjon",
- "roleInfo": "Gjesterolle- og periodeinformasjon",
- "overviewGuest": "Oversikt over gjest"
+ "roleInfoHead": "Roller og perioder",
+ "roleInfoBody": "Du kan bare endre på gjesteroller som du er vert for"
+ },
+ "guest": {
+ "headerText": "Legg til ny rolle og periode",
+ "bodyText": "Her kan du legge til en ny rolle på samme gjest"
+ },
+ "register": {
+ "registerHeading": "Registrer ny gjest",
+ "registerText": "Søk etter e-post eller mobilnummer før du registrerer ny gjest for å unngå dobbeltoppføringer.",
+ "registerButtonText": "Registrer ny gjest"
},
"loading": "Lastar...",
"termsHeader": "Vilkår",
@@ -45,6 +68,12 @@
"activeGuests": "Dine aktive gjester",
"activeGuestsDescription": "Her kan du endre på eksisterende gjester",
"noActiveGuests": "Ingen aktive gjester",
+ "sentInvitations": "Sendte invitasjonar",
+ "sentInvitationsDescription": "Invitasjonar som venter på at gjesten skal ferdigstille registreringa.",
+ "noInvitations": "Ingen invitasjonar",
+ "status": "Status",
+ "active": "Aktiv",
+ "expired": "Utgått",
"details": "Detaljer",
"nationalIdNumber": "Fødselsnummer",
"validation": {
@@ -57,13 +86,19 @@
"roleEndRequired": "Sluttdato for rolle er obligatorisk",
"emailRequired": "E-post er obligatorisk",
"invalidMobilePhoneNumber": "Ugyldig telefonnummer",
- "invalidEmail": "Ugyldig e-postadresse"
+ "invalidEmail": "Ugyldig e-postadresse",
+ "passportNumberRequired": "Passnummer er obligatorisk",
+ "mobilePhoneRequired": "Mobilnummer er obligatorisk",
+ "startDateMustBeSet": "Startdato må vere satt",
+ "startDateMustBeBeforeEndDate": "Startdato må vere før sluttdato"
},
"button": {
"back": "Tilbake",
"next": "Neste",
"save": "Lagre",
- "cancel": "Avbryt"
+ "cancel": "Avbryt",
+ "backToFrontPage": "Tilbake til forsida",
+ "cancelInvitation": "Kanseller"
},
"registerWizardText": {
"registerPage": "Fyll inn kontaktinformasjonen til gjesten under. Alle feltene er obligatoriske.",
@@ -79,5 +114,17 @@
"guestDepartment": "Avdeling"
},
"yourGuests": "Dine gjestar",
- "registerNewGuest": "Registrer ny gjest"
+ "registerNewGuest": "Registrer ny gjest",
+ "guestOverview": "Oversikt over gjest",
+ "guestRegisterWizardText": {
+ "yourContactInformation": "Din kontaktinfo",
+ "contactInformationDescription": "Fyll inn ditt mobilnummer.",
+ "yourGuestPeriod": "Din gjesteperiode",
+ "guestPeriodDescription": "Registrert periode for di gjesterolle."
+ },
+ "yourGuestAccount": "Din gjestekonto",
+ "feideId": "Feide ID",
+ "thankYou": "Takk!",
+ "sponsorSubmitSuccessDescription": "Di registrering er no fullført. Du vil få ein e-post når gjesten har fylt inn informasjonen som manglar, slik at gjestekontoen kan godkjennast.",
+ "guestSubmitSuccessDescription": "Di registrering er no fullført. Du vil få ein e-post eller SMS når kontoen er oppretta."
}
diff --git a/frontend/public/locales/nn/invite.json b/frontend/public/locales/nn/invite.json
new file mode 100644
index 0000000000000000000000000000000000000000..abb2afaf0747f645944c94525cc49b28015e87bf
--- /dev/null
+++ b/frontend/public/locales/nn/invite.json
@@ -0,0 +1,6 @@
+{
+ "description": "Ver venleg og vel korleis du vil logge inn for å fullføre registreringa. Den anbefalte metoden er å logge inn gjennom Feide eller ID-porten. Dersom det ikkje er mogeleg kan du fylle ut registreringskjemaet manuelt med passnummer",
+ "header": "Gjestetjenesten",
+ "login": "Logg inn med FEIDE",
+ "manual": "Registrer manuelt"
+}
diff --git a/frontend/src/components/button/index.tsx b/frontend/src/components/button/index.tsx
index 86754f65372556a64daa8da31e431fc5a0aff776..255b7af8f01ad8b96e6e9a7bb1e9984ddbd076f7 100644
--- a/frontend/src/components/button/index.tsx
+++ b/frontend/src/components/button/index.tsx
@@ -8,7 +8,11 @@ interface IHrefButton {
function HrefButton({ to, children }: IHrefButton) {
return (
- <Button variant="contained" href={to} sx={{ backgroundColor: '#18191C' }}>
+ <Button
+ variant="contained"
+ href={to}
+ sx={{ backgroundColor: 'theme.palette.secondary' }}
+ >
{children}
</Button>
)
diff --git a/frontend/src/components/button/linebutton.tsx b/frontend/src/components/button/linebutton.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..a5ec984a2ab7adc84a396576b829789fcf00771a
--- /dev/null
+++ b/frontend/src/components/button/linebutton.tsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import { Button } from '@mui/material'
+
+interface IHrefButton {
+ to: string
+ children: React.ReactNode
+}
+
+function HrefLineButton({ to, children }: IHrefButton) {
+ return (
+ <Button href={to} sx={{ color: 'theme.palette.secondary' }}>
+ {children}
+ </Button>
+ )
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export { HrefLineButton }
diff --git a/frontend/src/components/protectedRoute/index.tsx b/frontend/src/components/protectedRoute/index.tsx
index c5e3fe8f388c1a503a16ea692ddebba1dea3e4b5..bc7cc48c4abbd804d6e0c16cf4e9d7d2630cb64c 100644
--- a/frontend/src/components/protectedRoute/index.tsx
+++ b/frontend/src/components/protectedRoute/index.tsx
@@ -1,6 +1,7 @@
import React from 'react'
-import { Route, Redirect, RouteProps } from 'react-router-dom'
+import { Route, RouteProps, useLocation, useHistory } from 'react-router-dom'
+import { setCookie } from 'utils'
import { useUserContext } from 'contexts'
interface IProtectedRoute extends RouteProps {
@@ -9,17 +10,19 @@ interface IProtectedRoute extends RouteProps {
function ProtectedRoute({ children, ...rest }: IProtectedRoute) {
// Simple protected route component
- // TODO: redirect back to the requested site after login
const { user } = useUserContext()
+
+ if ( !user.auth ) {
+ const location = useLocation()
+ const history = useHistory()
+ setCookie('redirect', location.pathname)
+ history.push('/')
+ }
+
return (
- <Route
- {...rest}
- /* eslint-disable arrow-body-style */
- render={() => {
- return user.auth ? children : <Redirect to="/" />
- }}
- /* eslint-enable arrow-body-style */
- />
+ <Route {...rest}>
+ {children}
+ </Route>
)
}
diff --git a/frontend/src/hooks/useOus/index.tsx b/frontend/src/hooks/useOus/index.tsx
index 64c12dba296b0065935a9415892ecd6c21f672e7..01459176acb55d3eeada3c9271b7ffc640d6b0b8 100644
--- a/frontend/src/hooks/useOus/index.tsx
+++ b/frontend/src/hooks/useOus/index.tsx
@@ -22,5 +22,25 @@ function useOus(): OuData[] {
return ous
}
+export const enSort = (a: OuData, b: OuData) => {
+ if (a.en > b.en) {
+ return 1
+ }
+ if (b.en > a.en) {
+ return -1
+ }
+ return 0
+}
+
+export const nbSort = (a: OuData, b: OuData) => {
+ if (a.nb > b.nb) {
+ return 1
+ }
+ if (b.nb > a.nb) {
+ return -1
+ }
+ return 0
+}
+
export type { OuData }
export default useOus
diff --git a/frontend/src/hooks/useRoleTypes/index.tsx b/frontend/src/hooks/useRoleTypes/index.tsx
index 3a89e7725d3fc57920fb1b2247b14dff12711d29..0a61d01311038623c0769937dbbfc6e6703fc21c 100644
--- a/frontend/src/hooks/useRoleTypes/index.tsx
+++ b/frontend/src/hooks/useRoleTypes/index.tsx
@@ -5,6 +5,7 @@ type RoleTypeData = {
identifier: string
name_en: string
name_nb: string
+ max_days: number
}
function useRoleTypes(): RoleTypeData[] {
@@ -12,12 +13,12 @@ function useRoleTypes(): RoleTypeData[] {
async function fetchRoleTypes() {
fetch(`/api/ui/v1/roletypes`)
- .then(data => data.text())
- .then((result => {
+ .then((data) => data.text())
+ .then((result) => {
// The response is a JSON-array
setRoleTypes(JSON.parse(result))
- }))
- .catch(error => {
+ })
+ .catch((error) => {
console.error(error)
})
}
diff --git a/frontend/src/interfaces/index.ts b/frontend/src/interfaces/index.ts
index 5eed9cc3e452d2de7fd61ad9efc2464901afe002..2fcb395309af8118e41f2e79078a293881338a64 100644
--- a/frontend/src/interfaces/index.ts
+++ b/frontend/src/interfaces/index.ts
@@ -1,30 +1,47 @@
export type Guest = {
- id: string
pid: string
- name: string
+ first: string
+ last: string
email: string
mobile: string
fnr: string
- role_nb: string
- role_en: string
- period: string
active: boolean
- ou_nb: string
- ou_en: string
+ registered: boolean
+ verified: boolean
+ roles: Role[]
}
export interface FetchedGuest {
- id: string
pid: string
first: string
last: string
email: string
mobile: string
fnr: string
- role_nb: string
- role_en: string
- period: string
+ active: boolean
+ registered: boolean
+ verified: boolean
+ roles: FetchedRole[]
+}
+
+export type Role = {
+ id: string
+ name_nb: string
+ name_en: string
ou_nb: string
ou_en: string
- active: boolean
+ start_date: Date
+ end_date: Date
+ max_days: number
+}
+
+export type FetchedRole = {
+ id: string
+ name_nb: string
+ name_en: string
+ ou_nb: string
+ ou_en: string
+ start_date: string
+ end_date: string
+ max_days: number
}
diff --git a/frontend/src/routes/components/overviewGuestButton.tsx b/frontend/src/routes/components/overviewGuestButton.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..4111268f812c1eef908d905f2edec4db7fe81b24
--- /dev/null
+++ b/frontend/src/routes/components/overviewGuestButton.tsx
@@ -0,0 +1,58 @@
+import PersonIcon from '@mui/icons-material/Person'
+import { Box, IconButton } from '@mui/material'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { useHistory } from 'react-router-dom'
+import ArrowBackIcon from '@mui/icons-material/ArrowBack'
+import ArrowForwardIcon from '@mui/icons-material/ArrowForward'
+
+export default function OverviewGuestButton() {
+ const { t } = useTranslation(['common'])
+ const history = useHistory()
+
+ const goToGuestOverview = () => {
+ history.push('/guestregister')
+ }
+
+ return (
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'row',
+ alignItems: 'baseline',
+ justifyContent: 'space-evenly',
+ }}
+ >
+ {/* TODO Where should the back arrow point to? */}
+ <ArrowBackIcon />
+
+ <Box
+ sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}
+ >
+ <IconButton onClick={goToGuestOverview}>
+ <PersonIcon
+ fontSize="large"
+ sx={{
+ borderRadius: '2rem',
+ borderStyle: 'solid',
+ borderColor: 'primary.main',
+ fill: 'white',
+ backgroundColor: 'primary.main',
+ }}
+ />
+ </IconButton>
+ <Box
+ sx={{
+ typography: 'caption',
+ }}
+ >
+ {t('yourGuestAccount')}
+ </Box>
+ </Box>
+
+ <IconButton disabled>
+ <ArrowForwardIcon visibility="hidden" />
+ </IconButton>
+ </Box>
+ )
+}
diff --git a/frontend/src/routes/components/sponsorInfoButtons.tsx b/frontend/src/routes/components/sponsorInfoButtons.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..ce50eb18df2b7452bd7c5c2d215de70ec2bbad73
--- /dev/null
+++ b/frontend/src/routes/components/sponsorInfoButtons.tsx
@@ -0,0 +1,56 @@
+import { IconButton, Theme, Box } from '@mui/material'
+import { Link } from 'react-router-dom'
+import PersonOutlineRoundedIcon from '@mui/icons-material/PersonOutlineRounded'
+import ArrowBackIcon from '@mui/icons-material/ArrowBack'
+
+interface SponsorInfoButtonsProps {
+ to: string
+ name: string
+}
+
+export default function SponsorInfoButtons({
+ to,
+ name,
+}: SponsorInfoButtonsProps) {
+ return (
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'row',
+ justifyContent: 'center',
+ marginBottom: '2rem',
+ }}
+ >
+ <Box>
+ <IconButton component={Link} to={to}>
+ <ArrowBackIcon />
+ </IconButton>
+ </Box>
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'center',
+ }}
+ >
+ <PersonOutlineRoundedIcon
+ fontSize="large"
+ sx={{
+ borderRadius: '2rem',
+ borderStyle: 'solid',
+ borderColor: (theme: Theme) => theme.palette.primary.main,
+ fill: 'white',
+ backgroundColor: (theme: Theme) => theme.palette.primary.main,
+ }}
+ />
+ <Box
+ sx={{
+ typography: 'caption',
+ }}
+ >
+ {name}
+ </Box>
+ </Box>
+ </Box>
+ )
+}
diff --git a/frontend/src/routes/frontpage/index.tsx b/frontend/src/routes/frontpage/index.tsx
index 07ef806e04bef454ec1c815f45d1a97abb2562d2..54205f53e10c02996b76d37e64740be16c39277e 100644
--- a/frontend/src/routes/frontpage/index.tsx
+++ b/frontend/src/routes/frontpage/index.tsx
@@ -28,6 +28,9 @@ export default function FrontPage() {
<li key="register">
<Link to="/register/">Registration</Link>
</li>
+ <li key="guestregister">
+ <Link to="/guestregister/">Guest Registration</Link>
+ </li>
</ul>
</p>
<Debug />
diff --git a/frontend/src/routes/guest/register/authenticationMethod.ts b/frontend/src/routes/guest/register/authenticationMethod.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f01a26db655697443c98a7e2c6dd9266cb00b920
--- /dev/null
+++ b/frontend/src/routes/guest/register/authenticationMethod.ts
@@ -0,0 +1,9 @@
+/**
+ * Controls what is shown in the registration form
+ */
+enum AuthenticationMethod {
+ Feide,
+ Invite,
+}
+
+export default AuthenticationMethod
diff --git a/frontend/src/routes/guest/register/enteredGuestData.ts b/frontend/src/routes/guest/register/enteredGuestData.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d731360363d3a0ce30826799031b11e2c1a18d6e
--- /dev/null
+++ b/frontend/src/routes/guest/register/enteredGuestData.ts
@@ -0,0 +1,12 @@
+/**
+ * This is data the guest has entered about himself. It is stored
+ * separate from ContactInformationBySponsor to make it clear that
+ * most of the data there the guest cannot change.
+ */
+export type EnteredGuestData = {
+ mobilePhoneCountry: string
+ mobilePhone: string
+ nationalIdNumber?: string
+ passportNumber?: string
+ passportNationality?: string
+}
diff --git a/frontend/src/routes/guest/register/guestDataForm.ts b/frontend/src/routes/guest/register/guestDataForm.ts
new file mode 100644
index 0000000000000000000000000000000000000000..09e7da4288e247fdf95e43dce5e164bd20956daa
--- /dev/null
+++ b/frontend/src/routes/guest/register/guestDataForm.ts
@@ -0,0 +1,35 @@
+import AuthenticationMethod from './authenticationMethod'
+
+/**
+ * This is the basis for the data shown in the guest registration form.
+ *
+ * It mostly contains data about the guest that was entered during the invite step.
+ */
+export type GuestInviteInformation = {
+ first_name: string
+ last_name: string
+ ou_name_nb: string
+ ou_name_en: string
+ role_name_en: string
+ role_name_nb: string
+ role_start: string
+ role_end: string
+ comment?: string
+
+ feide_id?: string
+
+ // These fields are in the form, but it is not expected that
+ // they are set, with the exception of e-mail, when the guest
+ // first follows the invite link
+ email?: string
+
+ mobile_phone_country_code?: string
+ mobile_phone?: string
+
+ fnr?: string
+ passport?: string
+ passportNationality?: string
+ countryForCallingCode?: string
+
+ authentication_method: AuthenticationMethod
+}
diff --git a/frontend/src/routes/guest/register/guestRegisterCallableMethods.ts b/frontend/src/routes/guest/register/guestRegisterCallableMethods.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b7f590e89facc2f43b97563241f34b9c7c92ea34
--- /dev/null
+++ b/frontend/src/routes/guest/register/guestRegisterCallableMethods.ts
@@ -0,0 +1,6 @@
+/**
+ * Contains methods that GuestRegister can call on in GuestRegisterStep
+ */
+export interface GuestRegisterCallableMethods {
+ doSubmit: () => void
+}
diff --git a/frontend/src/routes/guest/register/guestRegisterMethods.tsx b/frontend/src/routes/guest/register/guestRegisterMethods.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..c4ac5c2e5706cd0f9355c90d52a0e1c225587d6b
--- /dev/null
+++ b/frontend/src/routes/guest/register/guestRegisterMethods.tsx
@@ -0,0 +1,6 @@
+/**
+ * Contains methods that GuestRegisterStep can call on in GuestRegister
+ */
+export interface GuestRegisterMethods {
+ handleNext: () => void
+}
diff --git a/frontend/src/routes/guest/register/index.test.tsx b/frontend/src/routes/guest/register/index.test.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..8b264ad24fa70588adcf37ce9309716cae67086a
--- /dev/null
+++ b/frontend/src/routes/guest/register/index.test.tsx
@@ -0,0 +1,56 @@
+import React from 'react'
+import fetchMock, { enableFetchMocks } from 'jest-fetch-mock'
+import { render, waitFor, screen } from 'test-utils'
+import AdapterDateFns from '@mui/lab/AdapterDateFns'
+import { LocalizationProvider } from '@mui/lab'
+import GuestRegister from './index'
+
+enableFetchMocks()
+
+const testData = {
+ person: {
+ first_name: 'Test',
+ last_name: 'Tester',
+ mobile_phone: '+4797543910',
+ email: 'test@example.org',
+ fnr: '04062141242',
+ passport: 'NO-123456',
+ },
+ role: {
+ ou_name_en: 'English organizational unit name',
+ ou_name_nb: 'Norsk navn organisasjonsenhet',
+ name_en: 'Guest role',
+ name_nb: 'Gjesterolle',
+ start: '2021-08-10',
+ end: '2021-08-16',
+ comment: '',
+ },
+ meta: {
+ session_type: 'invite',
+ },
+}
+
+beforeEach(() => {
+ fetchMock.mockIf('/api/ui/v1/invited', () =>
+ Promise.resolve<any>(JSON.stringify(testData))
+ )
+})
+
+test('Mobile phone number parsed and split correctly', async () => {
+ render(
+ <LocalizationProvider dateAdapter={AdapterDateFns}>
+ <GuestRegister />
+ </LocalizationProvider>
+ )
+
+ await waitFor(() => screen.queryByText(testData.person.first_name))
+ await waitFor(() => screen.queryByText(testData.person.last_name))
+ await waitFor(() => screen.queryByText(testData.person.email))
+ await waitFor(() => screen.queryByText(testData.person.fnr))
+ await waitFor(() => screen.queryByText('NO'))
+ await waitFor(() => screen.queryByText('123456'))
+
+ // There is no proper i18n loaded so the country name will be undefined, the country code should still show though
+ await waitFor(() => screen.queryByText('undefined (47)'))
+ await waitFor(() => screen.queryByText('97543910'))
+})
diff --git a/frontend/src/routes/guest/register/index.tsx b/frontend/src/routes/guest/register/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..4fa17263838f99d201569bc7b0837447ec945e6b
--- /dev/null
+++ b/frontend/src/routes/guest/register/index.tsx
@@ -0,0 +1,250 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Box, Button } from '@mui/material'
+import Page from 'components/page'
+
+import { useHistory } from 'react-router-dom'
+import {
+ CountryCode,
+ getCountries,
+ getCountryCallingCode,
+} from 'libphonenumber-js'
+import OverviewGuestButton from '../../components/overviewGuestButton'
+import GuestRegisterStep from './registerPage'
+import { GuestRegisterCallableMethods } from './guestRegisterCallableMethods'
+import { EnteredGuestData } from './enteredGuestData'
+import { GuestInviteInformation } from './guestDataForm'
+import AuthenticationMethod from './authenticationMethod'
+import { splitPhoneNumber, submitJsonOpts } from '../../../utils'
+import StepSubmitSuccessGuest from './submitSuccessPage'
+
+enum SubmitState {
+ NotSubmitted,
+ Submitted,
+ SubmittedError,
+}
+
+enum Step {
+ RegisterStep = 0,
+ SubmitSuccessStep = 1,
+}
+
+/*
+ * When the guest reaches this page he has already an invite ID set in his session.
+ */
+export default function GuestRegister() {
+ const { t } = useTranslation(['common'])
+ const history = useHistory()
+ // TODO On submit successful the user should be directed to some page telling
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const [submitState, setSubmitState] = useState<SubmitState>(
+ SubmitState.NotSubmitted
+ )
+ const guestRegisterRef = useRef<GuestRegisterCallableMethods>(null)
+ // TODO Set step when user moves between pages
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const [activeStep, setActiveStep] = useState(0)
+
+ const [guestFormData, setGuestFormData] = useState<GuestInviteInformation>({
+ first_name: '',
+ last_name: '',
+ ou_name_en: '',
+ ou_name_nb: '',
+ role_name_en: '',
+ role_name_nb: '',
+ role_start: '',
+ role_end: '',
+ comment: '',
+ email: '',
+ mobile_phone: '',
+ fnr: '',
+ passport: '',
+ passportNationality: '',
+ countryForCallingCode: '',
+ authentication_method: AuthenticationMethod.Invite,
+ })
+
+ const [errorState, setErrorState] = useState<string>('')
+
+ const guestContactInfo = async () => {
+ try {
+ const response = await fetch('/api/ui/v1/invited')
+
+ if (response.ok) {
+ response.json().then((jsonResponse) => {
+ // TODO Remove after development
+ console.log(`Data from server: ${JSON.stringify(jsonResponse)}`)
+
+ const authenticationMethod =
+ jsonResponse.meta.session_type === 'invite'
+ ? AuthenticationMethod.Invite
+ : AuthenticationMethod.Feide
+
+ const [countryCode, nationalNumber] = jsonResponse.person.mobile_phone
+ ? splitPhoneNumber(jsonResponse.person.mobile_phone)
+ : ['', '']
+
+ let extractedCountryCode = ''
+ if (countryCode) {
+ const matchingCountries = getCountries().find(
+ (value) => getCountryCallingCode(value) === countryCode
+ )
+
+ if (matchingCountries && matchingCountries.length > 0) {
+ extractedCountryCode = matchingCountries.toString()
+ }
+ }
+
+ setGuestFormData({
+ first_name: jsonResponse.person.first_name,
+ last_name: jsonResponse.person.last_name,
+ ou_name_en: jsonResponse.role.ou_name_en,
+ ou_name_nb: jsonResponse.role.ou_name_nb,
+ role_name_en: jsonResponse.role.role_name_en,
+ role_name_nb: jsonResponse.role.role_name_nb,
+ role_start: jsonResponse.role.start,
+ role_end: jsonResponse.role.end,
+ comment: jsonResponse.role.comments,
+
+ email: jsonResponse.person.email,
+ feide_id: jsonResponse.person.feide_id,
+ mobile_phone_country_code: countryCode,
+ mobile_phone: nationalNumber,
+ fnr: jsonResponse.fnr,
+ passport: jsonResponse.passport,
+ // TODO Separate out nationality based on what is in the server response
+ passportNationality: '',
+ countryForCallingCode: extractedCountryCode,
+
+ authentication_method: authenticationMethod,
+ })
+ })
+ }
+ } catch (error) {
+ console.log(error)
+ }
+ }
+
+ useEffect(() => {
+ guestContactInfo()
+ }, [])
+
+ const handleNext = () => {
+ // TODO Go to consent page
+ // setActiveStep((prevActiveStep) => prevActiveStep + 1)
+ }
+
+ const handleSave = () => {
+ if (activeStep === 0) {
+ if (guestRegisterRef.current) {
+ guestRegisterRef.current.doSubmit()
+ }
+ }
+ }
+
+ const handleForwardFromRegister = (
+ updateFormData: EnteredGuestData
+ ): void => {
+ // TODO Should go to consent page here. Submit should after after consent page
+
+ const payload: any = {}
+ payload.person = {}
+ payload.person.mobile_phone = `+${getCountryCallingCode(
+ updateFormData.mobilePhoneCountry as CountryCode
+ )}${updateFormData.mobilePhone}`
+
+ if (updateFormData.passportNumber && updateFormData.passportNationality) {
+ // The user has entered some passport information, check that both nationality and number are present
+ if (
+ (updateFormData.passportNumber &&
+ !updateFormData.passportNationality) ||
+ (!updateFormData.passportNumber && updateFormData.passportNationality)
+ ) {
+ // TODO Make better text and use translation
+ setErrorState(
+ 'Both passport nationality and passport number need to be set'
+ )
+ return
+ }
+ setErrorState('')
+ payload.person.passport = `${updateFormData.passportNationality}-${updateFormData.passportNumber}`
+ }
+
+ if (updateFormData.nationalIdNumber) {
+ payload.person.fnr = updateFormData.nationalIdNumber
+ }
+
+ // TODO Remove after development
+ console.log(`Payload: ${JSON.stringify(payload)}`)
+
+ fetch('/api/ui/v1/invited/', submitJsonOpts('POST', payload))
+ .then((response) => {
+ if (response.ok) {
+ setSubmitState(SubmitState.Submitted)
+ setActiveStep(Step.SubmitSuccessStep)
+ } else {
+ setSubmitState(SubmitState.SubmittedError)
+ console.error(`Server responded with status: ${response.status}`)
+ }
+ })
+ .catch((error) => {
+ setSubmitState(SubmitState.SubmittedError)
+ console.error(error)
+ })
+ }
+
+ const handleCancel = () => {
+ history.push('/')
+ }
+
+ return (
+ <Page>
+ <OverviewGuestButton />
+ {/* Current page in wizard */}
+ <Box sx={{ width: '100%' }}>
+ {activeStep === Step.RegisterStep && (
+ <GuestRegisterStep
+ nextHandler={handleForwardFromRegister}
+ guestData={guestFormData}
+ ref={guestRegisterRef}
+ />
+ )}
+ </Box>
+
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'row',
+ pt: 2,
+ color: 'primary.main',
+ paddingBottom: '1rem',
+ }}
+ >
+ {activeStep === Step.RegisterStep && (
+ <Button
+ data-testid="button-next"
+ sx={{ color: 'theme.palette.secondary', mr: 1 }}
+ onClick={handleNext}
+ >
+ {t('button.next')}
+ </Button>
+ )}
+
+ {activeStep !== Step.SubmitSuccessStep && (
+ <>
+ <Button onClick={handleCancel}>{t('button.cancel')}</Button>
+
+ {/* TODO This button is only for testing while developing */}
+ <Button onClick={handleSave}>{t('button.save')}</Button>
+ </>
+ )}
+ </Box>
+
+ {activeStep === Step.SubmitSuccessStep && <StepSubmitSuccessGuest />}
+
+ {/* TODO Give better feedback to user */}
+ {errorState && <h2>{errorState}</h2>}
+ </Page>
+ )
+}
diff --git a/frontend/src/routes/guest/register/registerPage.test.tsx b/frontend/src/routes/guest/register/registerPage.test.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..634f2467b358f2858827e208a8c437f4fa8ec2dd
--- /dev/null
+++ b/frontend/src/routes/guest/register/registerPage.test.tsx
@@ -0,0 +1,47 @@
+import React from 'react'
+import { render, screen, waitFor } from 'test-utils'
+import AdapterDateFns from '@mui/lab/AdapterDateFns'
+import { LocalizationProvider } from '@mui/lab'
+import GuestRegisterStep from './registerPage'
+import { EnteredGuestData } from './enteredGuestData'
+import AuthenticationMethod from './authenticationMethod'
+import { GuestInviteInformation } from './guestDataForm'
+
+function getEmptyGuestData(): GuestInviteInformation {
+ return {
+ first_name: '',
+ last_name: '',
+ ou_name_en: '',
+ ou_name_nb: '',
+ role_name_en: '',
+ role_name_nb: '',
+ role_start: '',
+ role_end: '',
+ comment: '',
+ email: '',
+ mobile_phone: '',
+ fnr: '',
+ passport: '',
+ countryForCallingCode: '',
+ authentication_method: AuthenticationMethod.Invite,
+ }
+}
+
+test('Guest register page showing passport field on manual registration', async () => {
+ const nextHandler = (enteredGuestData: EnteredGuestData) => {
+ console.log(`Entered data: ${enteredGuestData}`)
+ }
+
+ render(
+ <LocalizationProvider dateAdapter={AdapterDateFns}>
+ <GuestRegisterStep
+ nextHandler={nextHandler}
+ guestData={getEmptyGuestData()}
+ />
+ </LocalizationProvider>
+ )
+
+ await waitFor(() => {
+ expect(screen.queryByTestId('passport_number_input')).toBeInTheDocument()
+ })
+})
diff --git a/frontend/src/routes/guest/register/registerPage.tsx b/frontend/src/routes/guest/register/registerPage.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..8ce656e09a49cf9859cf06d8342ca142dd77e119
--- /dev/null
+++ b/frontend/src/routes/guest/register/registerPage.tsx
@@ -0,0 +1,344 @@
+import {
+ Box,
+ MenuItem,
+ Select,
+ SelectChangeEvent,
+ Stack,
+ TextField,
+ Typography,
+} from '@mui/material'
+import { SubmitHandler, useForm } from 'react-hook-form'
+import React, {
+ forwardRef,
+ Ref,
+ useEffect,
+ useImperativeHandle,
+ useState,
+} from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+ CountryCallingCode,
+ CountryCode,
+ getCountries,
+ getCountryCallingCode,
+} from 'libphonenumber-js'
+import { getAlpha2Codes, getName } from 'i18n-iso-countries'
+import { GuestInviteInformation } from './guestDataForm'
+import { EnteredGuestData } from './enteredGuestData'
+import { GuestRegisterCallableMethods } from './guestRegisterCallableMethods'
+import { isValidFnr, isValidMobilePhoneNumber } from '../../../utils'
+import AuthenticationMethod from './authenticationMethod'
+
+interface GuestRegisterProperties {
+ nextHandler(guestData: EnteredGuestData): void
+
+ guestData: GuestInviteInformation
+}
+
+/**
+ * This component is the form where the guest enters missing information about himself and
+ * where he can see the data the sponsor has entered and the role. The page may also
+ * be populated with data from a third-party like Feide if the guest logged in using that.
+ */
+const GuestRegisterStep = forwardRef(
+ (props: GuestRegisterProperties, ref: Ref<GuestRegisterCallableMethods>) => {
+ const { i18n, t } = useTranslation(['common'])
+ const { nextHandler, guestData } = props
+
+ const [countryCode, setCountryCode] = useState<
+ CountryCallingCode | undefined
+ >(undefined)
+ const [mobilePhone, setMobilePhone] = useState<string>('')
+
+ const submit: SubmitHandler<EnteredGuestData> = (data) => {
+ nextHandler(data)
+ }
+
+ const {
+ register,
+ handleSubmit,
+ setValue,
+ setError,
+ clearErrors,
+ formState: { errors },
+ } = useForm<EnteredGuestData>()
+ const onSubmit = handleSubmit<EnteredGuestData>(submit)
+
+ const handleCountryCodeChange = (event: SelectChangeEvent) => {
+ if (event.target.value) {
+ const countryCodeType = event.target.value as CountryCode
+ setCountryCode(countryCodeType)
+ setValue('mobilePhoneCountry', countryCodeType)
+ } else {
+ setCountryCode(undefined)
+ }
+ }
+
+ const handleMobilePhoneChange = (value: any) => {
+ if (countryCode) {
+ // The country code and the rest of the mobile number are in two fields, so cannot
+ // register the field directly in form, but need to have extra logic defined
+ // to combine the values before writing them to the form handling
+
+ const phoneNumberWithCountryCode = `+${getCountryCallingCode(
+ countryCode as CountryCode
+ )}${value.target.value}`
+ const isValidPhoneNumber = isValidMobilePhoneNumber(
+ phoneNumberWithCountryCode
+ )
+
+ if (isValidPhoneNumber === true) {
+ setValue('mobilePhone', value.target.value)
+ clearErrors('mobilePhone')
+ } else {
+ setError('mobilePhone', {
+ type: 'manual',
+ message: isValidPhoneNumber || undefined,
+ })
+ }
+ }
+
+ setMobilePhone(value.target.value)
+ }
+
+ useEffect(() => {
+ setCountryCode(guestData.countryForCallingCode)
+ setMobilePhone(guestData.mobile_phone ? guestData.mobile_phone : '')
+ setValue(
+ 'mobilePhoneCountry',
+ guestData.countryForCallingCode ? guestData.countryForCallingCode : ''
+ )
+ }, [guestData])
+
+ function doSubmit() {
+ return onSubmit()
+ }
+
+ register('mobilePhone', {
+ required: t<string>('validation.mobilePhoneRequired'),
+ })
+ register('mobilePhoneCountry')
+
+ useImperativeHandle(ref, () => ({ doSubmit }))
+
+ return (
+ <>
+ <Typography
+ variant="h5"
+ sx={{
+ paddingTop: '1rem',
+ paddingBottom: '1rem',
+ }}
+ >
+ {t('guestRegisterWizardText.yourContactInformation')}
+ </Typography>
+ <Typography sx={{ paddingBottom: '2rem' }}>
+ {t('guestRegisterWizardText.contactInformationDescription')}
+ </Typography>
+ <Box sx={{ maxWidth: '30rem' }}>
+ <form onSubmit={onSubmit}>
+ <Stack spacing={2}>
+ <TextField
+ id="firstName"
+ label={t('input.firstName')}
+ value={guestData.first_name}
+ disabled
+ />
+ <TextField
+ id="lastName"
+ label={t('input.lastName')}
+ value={guestData.last_name}
+ disabled
+ />
+
+ <TextField
+ id="email"
+ label={t('input.email')}
+ value={!guestData.email ? '' : guestData.email}
+ disabled
+ />
+
+ {/* Only show the Feide ID field if the value is present */}
+ {guestData.feide_id && (
+ <TextField
+ id="feide_id"
+ label={t('feideId')}
+ value={guestData.feide_id}
+ disabled
+ />
+ )}
+
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'row',
+ }}
+ >
+ <Select
+ sx={{
+ maxHeight: '2.5rem',
+ minWidth: '5rem',
+ marginRight: '0.5rem',
+ }}
+ labelId="phone-number-select"
+ id="phone-number-select"
+ displayEmpty
+ onChange={handleCountryCodeChange}
+ value={countryCode ? countryCode.toString() : ''}
+ renderValue={(selected: any) => {
+ if (!selected) {
+ return t('input.countryCallingCode')
+ }
+ return `${getName(
+ selected,
+ i18n.language
+ )} (${getCountryCallingCode(selected as CountryCode)})`
+ }}
+ data-testid="phone-country-code-select"
+ inputProps={{
+ 'data-testid': 'phone-country-code-select-inner',
+ }}
+ >
+ <MenuItem disabled value="">
+ {t('input.countryCallingCode')}
+ </MenuItem>
+ {getCountries().map((country) => (
+ <MenuItem key={country} value={country}>
+ {getName(country, i18n.language)} (
+ {getCountryCallingCode(country)})
+ </MenuItem>
+ ))}
+ </Select>
+
+ <TextField
+ sx={{ flexGrow: 2 }}
+ label={t('input.mobilePhone')}
+ error={!!errors.mobilePhone}
+ value={mobilePhone}
+ helperText={errors.mobilePhone && errors.mobilePhone.message}
+ onChange={handleMobilePhoneChange}
+ />
+ </Box>
+ {guestData.authentication_method ===
+ AuthenticationMethod.Invite && (
+ <>
+ {/* The guest should fill in one of national ID number or passport number */}
+ <TextField
+ id="national_id_number"
+ label={t('input.nationalIdNumber')}
+ error={!!errors.nationalIdNumber}
+ helperText={
+ errors.nationalIdNumber && errors.nationalIdNumber.message
+ }
+ {...register('nationalIdNumber', {
+ // It is not required that the national ID number be filled in, the guest may not have
+ // one, so allow empty values for the validation to pass
+ validate: (value) => isValidFnr(value, true),
+ })}
+ />
+
+ <TextField
+ id="passport-number-id"
+ data-testid="passport_number_input"
+ label={t('input.passportNumber')}
+ {...register('passportNumber', {
+ required: false,
+ })}
+ />
+
+ <Select
+ sx={{
+ maxHeight: '2.5rem',
+ }}
+ id="passport-nationality-id"
+ labelId="passport-nationality-label"
+ label={t('input.passportNationality')}
+ displayEmpty
+ defaultValue=""
+ {...register('passportNationality', {
+ required: false,
+ })}
+ renderValue={(selected: any) => {
+ if (!selected || selected.length === 0) {
+ return t('input.passportNationality')
+ }
+ return getName(selected, i18n.language)
+ }}
+ >
+ <MenuItem disabled value="">
+ {t('input.passportNationality')}
+ </MenuItem>
+ {Object.keys(getAlpha2Codes()).map((countryAlpha2Code) => (
+ <MenuItem
+ key={countryAlpha2Code}
+ value={countryAlpha2Code}
+ >
+ {getName(countryAlpha2Code, i18n.language)}
+ </MenuItem>
+ ))}
+ </Select>
+ </>
+ )}
+
+ {guestData.authentication_method ===
+ AuthenticationMethod.Feide && (
+ <TextField
+ id="national_id_number"
+ data-testid="national_id_number_feide"
+ label={t('input.nationalIdNumber')}
+ disabled
+ />
+ )}
+
+ <Typography variant="h5" sx={{ paddingTop: '1rem' }}>
+ {t('guestRegisterWizardText.yourGuestPeriod')}
+ </Typography>
+ <Typography sx={{ paddingBottom: '1rem' }}>
+ {t('guestRegisterWizardText.guestPeriodDescription')}
+ </Typography>
+ <TextField
+ id="ou-unit"
+ value={
+ i18n.language === 'en'
+ ? guestData.ou_name_en
+ : guestData.ou_name_nb
+ }
+ label={t('ou')}
+ disabled
+ />
+
+ <TextField
+ id="roleType"
+ label={t('input.roleType')}
+ value={
+ i18n.language === 'en'
+ ? guestData.role_name_en
+ : guestData.role_name_nb
+ }
+ disabled
+ />
+
+ <TextField
+ id="rolePeriod"
+ label={t('period')}
+ value={`${guestData.role_start} - ${guestData.role_end}`}
+ disabled
+ />
+
+ <TextField
+ id="comment"
+ label={t('input.comment')}
+ multiline
+ rows={5}
+ value={guestData.comment}
+ disabled
+ />
+ </Stack>
+ </form>
+ </Box>
+ </>
+ )
+ }
+)
+
+export default GuestRegisterStep
diff --git a/frontend/src/routes/guest/register/submitSuccessPage.tsx b/frontend/src/routes/guest/register/submitSuccessPage.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..e139c067b87f0f1cd25dfb97a0ea152918a64aa1
--- /dev/null
+++ b/frontend/src/routes/guest/register/submitSuccessPage.tsx
@@ -0,0 +1,41 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Box, Button } from '@mui/material'
+
+import { useHistory } from 'react-router-dom'
+
+const StepSubmitSuccessGuest = () => {
+ const { t } = useTranslation(['common'])
+ const history = useHistory()
+
+ return (
+ <>
+ <Box
+ sx={{
+ paddingTop: '1rem',
+ paddingBottom: '1rem',
+ typography: 'h3',
+ }}
+ >
+ {t('thankYou')}
+ </Box>
+
+ <Box sx={{ marginTop: '2rem' }}>{t('guestSubmitSuccessDescription')}</Box>
+
+ <Button
+ sx={{
+ marginTop: '2rem',
+ color: 'theme.palette.dark',
+ }}
+ onClick={() => {
+ history.push('/')
+ }}
+ >
+ {t('button.backToFrontPage')}
+ </Button>
+ </>
+ )
+}
+
+export default StepSubmitSuccessGuest
diff --git a/frontend/src/routes/index.tsx b/frontend/src/routes/index.tsx
index a62d0d7f75f6ae2da3f547e464fa2093ebdaca80..c90b06129b2788b4c99629fb0ea3de3349395b43 100644
--- a/frontend/src/routes/index.tsx
+++ b/frontend/src/routes/index.tsx
@@ -1,11 +1,12 @@
-import React from 'react'
-import { Switch, Route } from 'react-router-dom'
+import React, { useEffect } from 'react'
+import { Switch, Route, useHistory } from 'react-router-dom'
import { styled } from '@mui/system'
import { CssBaseline } from '@mui/material'
import fetchIntercept from 'fetch-intercept'
import { useUserContext } from 'contexts'
+import { getCookie, deleteCookie } from 'utils'
import Sponsor from 'routes/sponsor'
import Register from 'routes/sponsor/register'
@@ -16,6 +17,11 @@ import Footer from 'routes/components/footer'
import Header from 'routes/components/header'
import NotFound from 'routes/components/notFound'
import ProtectedRoute from 'components/protectedRoute'
+import { registerLocale } from 'i18n-iso-countries'
+import i18n_iso_countries_en from 'i18n-iso-countries/langs/en.json'
+import i18n_iso_countries_nb from 'i18n-iso-countries/langs/nb.json'
+import i18n_iso_countries_nn from 'i18n-iso-countries/langs/nn.json'
+import GuestRegister from './guest/register'
const AppWrapper = styled('div')({
display: 'flex',
@@ -27,6 +33,21 @@ const AppWrapper = styled('div')({
export default function App() {
const { user, clearUserInfo } = useUserContext()
+ const history = useHistory()
+
+ useEffect( () => {
+ if (user.auth) {
+ const redirect = getCookie('redirect') || '/'
+ deleteCookie('redirect')
+ history.push(redirect)
+ }
+ }, [user.fetched])
+
+
+ // Load country names for the supported languages
+ registerLocale(i18n_iso_countries_en)
+ registerLocale(i18n_iso_countries_nb)
+ registerLocale(i18n_iso_countries_nn)
// Intercept fetch responses
fetchIntercept.register({
@@ -54,8 +75,9 @@ export default function App() {
<ProtectedRoute path="/register">
<Register />
</ProtectedRoute>
- <Route path="/invite/:id" component={InviteLink} />
+ <Route path="/invitelink/" component={InviteLink} />
<Route path="/invite/" component={Invite} />
+ <Route path="/guestregister/" component={GuestRegister} />
<Route>
<NotFound />
</Route>
diff --git a/frontend/src/routes/invite/index.tsx b/frontend/src/routes/invite/index.tsx
index 6d44123163867ae9b567e21122f7e23ce21dc167..ba43e2d7c2a31266e2f209d6a838d44099b22f48 100644
--- a/frontend/src/routes/invite/index.tsx
+++ b/frontend/src/routes/invite/index.tsx
@@ -1,16 +1,29 @@
+import { useTranslation } from 'react-i18next'
import Page from 'components/page'
-import { useUserContext } from 'contexts'
+
+import { styled } from '@mui/material/styles'
+
+import { HrefButton } from 'components/button'
+import { HrefLineButton } from 'components/button/linebutton'
+
+const FlexDiv = styled('div')(() => ({
+ display: 'flex',
+ gap: '0.5rem',
+}))
function Invite() {
- const { user } = useUserContext()
+ const { t } = useTranslation(['invite'])
return (
<Page>
+ <h1>{t('header')}</h1>
<p>
- {user.first_name} {user.last_name}
- TODO: Put information about login options, and buttons to them on this
- page
+ {t('description')}
</p>
+ <FlexDiv>
+ <HrefButton to="/oidc/authenticate/">{t('login')}</HrefButton>
+ <HrefLineButton to="/guestregister/">{t('manual')}</HrefLineButton>
+ </FlexDiv>
</Page>
)
}
diff --git a/frontend/src/routes/invitelink/index.tsx b/frontend/src/routes/invitelink/index.tsx
index 32dc16d0a05eb0debf3469e1224a2c013dffdad0..cfaa21ed82dff761a07eb20afbd40b852e8ee854 100644
--- a/frontend/src/routes/invitelink/index.tsx
+++ b/frontend/src/routes/invitelink/index.tsx
@@ -1,17 +1,17 @@
import { useEffect } from 'react'
-import { Redirect, useParams } from 'react-router-dom'
-
-type TParams = { id: string }
+import { Redirect } from 'react-router-dom'
+import { submitJsonOpts, setCookie } from 'utils'
function InviteLink() {
// Fetch backend endpoint to preserve invite_id in backend session then redirect
// to generic invite page with info about feide login or manual with passport.
- const { id } = useParams<TParams>()
+ const id = window.location.hash.slice(1)
useEffect(() => {
- fetch(`/api/ui/v1/invited/${id}`)
+ fetch('/api/ui/v1/invitecheck/', submitJsonOpts('POST', { uuid: id }))
}, [])
+ setCookie('redirect', 'guestregister')
return <Redirect to="/invite" />
}
diff --git a/frontend/src/routes/sponsor/frontpage/index.tsx b/frontend/src/routes/sponsor/frontpage/index.tsx
index 5a9c0ef22a506e7cd534fd0bbd8bc86b2392363b..225481b539d3a7d3589651b0441addfb05383845 100644
--- a/frontend/src/routes/sponsor/frontpage/index.tsx
+++ b/frontend/src/routes/sponsor/frontpage/index.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import React, { useState } from 'react'
import {
Table,
TableBody,
@@ -10,54 +10,191 @@ import {
Accordion,
AccordionSummary,
AccordionDetails,
+ Button,
} from '@mui/material'
import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import Page from 'components/page'
import { useTranslation } from 'react-i18next'
import { Link } from 'react-router-dom'
-import { Guest } from 'interfaces'
+import { Guest, Role } from 'interfaces'
+import { isBefore, format } from 'date-fns'
+
import SponsorGuestButtons from '../../components/sponsorGuestButtons'
interface GuestProps {
persons: Guest[]
+ // eslint-disable-next-line react/no-unused-prop-types
+ cancelCallback?: (roleId: string) => void
}
+
interface PersonLineProps {
person: Guest
+ role: Role
+ showStatusColumn?: boolean
+ displayCancel?: boolean
+ cancelCallback?: (roleId: string) => void
}
-const PersonLine = ({ person }: PersonLineProps) => {
+const PersonLine = ({
+ person,
+ role,
+ showStatusColumn,
+ displayCancel,
+ cancelCallback,
+}: PersonLineProps) => {
const [t, i18n] = useTranslation(['common'])
-
+ const today = new Date()
+ today.setHours(0, 0, 0, 0)
return (
<TableRow
- key={person.name}
+ key={`${person.first} ${person.last}`}
sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
>
<TableCell component="th" scope="row">
- {person.name}
+ {`${person.first} ${person.last}`}
+ </TableCell>
+ <TableCell align="left">
+ {i18n.language === 'en' ? role.name_en : role.name_nb}
</TableCell>
+
+ {showStatusColumn &&
+ (!isBefore(role.end_date, today) ? (
+ <TableCell sx={{ color: 'green' }} align="left">
+ {t('common:active')}
+ </TableCell>
+ ) : (
+ <TableCell sx={{ color: 'red' }} align="left">
+ {t('common:expired')}
+ </TableCell>
+ ))}
+
<TableCell align="left">
- {i18n.language === 'en' ? person.role_en : person.role_nb}
+ {role.start_date ? format(role.start_date, 'yyyy-MM-dd') : null} -{' '}
+ {format(role.end_date, 'yyyy-MM-dd')}
</TableCell>
- <TableCell align="left">{person.period}</TableCell>
<TableCell align="left">
- {i18n.language === 'en' ? person.ou_en : person.ou_nb}
+ {i18n.language === 'en' ? role.ou_en : role.ou_nb}
</TableCell>
<TableCell align="left">
- <Link to={`/sponsor/guest/${person.pid}`}>{t('common:details')}</Link>
+ <Button
+ variant="contained"
+ component={Link}
+ to={`/sponsor/guest/${person.pid}`}
+ >
+ {t('common:details')}
+ </Button>
</TableCell>
+ {displayCancel && (
+ <TableCell align="left">
+ <Button
+ data-testid="button-invite-cancel"
+ sx={{ color: 'theme.palette.secondary', mr: 1 }}
+ onClick={() => {
+ if (cancelCallback) {
+ cancelCallback(role.id)
+ }
+ }}
+ >
+ {t('common:button.cancel')}
+ </Button>
+ </TableCell>
+ )}
</TableRow>
)
}
+PersonLine.defaultProps = {
+ showStatusColumn: false,
+ displayCancel: false,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ cancelCallback: (roleId: number) => {},
+}
+
+const WaitingForGuestRegistration = ({
+ persons,
+ cancelCallback,
+}: GuestProps) => {
+ const [activeExpanded, setActiveExpanded] = useState(false)
+
+ // Show guests that have not responded to the invite yet
+ let guests = persons.length > 0 ? persons : []
+
+ if (guests.length > 0) {
+ guests = guests.filter((person) => !person.registered)
+ }
+ const [t] = useTranslation(['common'])
+ return (
+ <Accordion
+ expanded={activeExpanded}
+ onChange={() => {
+ setActiveExpanded(!activeExpanded)
+ }}
+ >
+ <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+ <h4>{t('common:sentInvitations')}</h4>
+ </AccordionSummary>
+ <AccordionDetails>
+ <p>{t('common:sentInvitationsDescription')}</p>
+ <TableContainer component={Paper}>
+ <Table sx={{ minWidth: 650 }} aria-label="simple table">
+ <TableHead sx={{ backgroundColor: 'primary.light' }}>
+ <TableRow>
+ <TableCell>{t('common:name')}</TableCell>
+ <TableCell align="left">{t('common:role')}</TableCell>
+ <TableCell align="left">{t('common:period')}</TableCell>
+ <TableCell align="left">{t('common:ou')}</TableCell>
+ <TableCell align="left">{t('common:choice')}</TableCell>
+ <TableCell align="left">
+ {t('common:button.cancelInvitation')}
+ </TableCell>
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ {guests.length > 0 ? (
+ guests.map((person) =>
+ person.roles ? (
+ person.roles.map((role) => (
+ <PersonLine
+ role={role}
+ person={person}
+ displayCancel
+ cancelCallback={cancelCallback}
+ />
+ ))
+ ) : (
+ <></>
+ )
+ )
+ ) : (
+ <></>
+ )}
+
+ <TableRow>
+ <TableCell>
+ {guests.length > 0 ? '' : t('common:noActiveGuests')}
+ </TableCell>
+ </TableRow>
+ </TableBody>
+ </Table>
+ </TableContainer>
+ </AccordionDetails>
+ </Accordion>
+ )
+}
+
+WaitingForGuestRegistration.defaultProps = {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ cancelCallback: (roleId: number) => {},
+}
+
const ActiveGuests = ({ persons }: GuestProps) => {
const [activeExpanded, setActiveExpanded] = useState(false)
- // Only show active people
+ // Show all verified guests
let guests = persons.length > 0 ? persons : []
if (guests.length > 0) {
- guests = guests.filter((person) => person.active)
+ guests = guests.filter((person) => person.verified)
}
const [t] = useTranslation(['common'])
return (
@@ -78,15 +215,32 @@ const ActiveGuests = ({ persons }: GuestProps) => {
<TableRow>
<TableCell>{t('common:name')}</TableCell>
<TableCell align="left">{t('common:role')}</TableCell>
+
+ <TableCell align="left">{t('common:status')}</TableCell>
+
<TableCell align="left">{t('common:period')}</TableCell>
<TableCell align="left">{t('common:ou')}</TableCell>
<TableCell align="left">{t('common:choice')}</TableCell>
</TableRow>
</TableHead>
<TableBody>
- {guests.map((person) => (
- <PersonLine person={person} />
- ))}
+ {guests.length > 0 ? (
+ guests.map((person) =>
+ person.roles ? (
+ person.roles.map((role) => (
+ <PersonLine
+ role={role}
+ person={person}
+ showStatusColumn
+ />
+ ))
+ ) : (
+ <></>
+ )
+ )
+ ) : (
+ <></>
+ )}
<TableRow>
<TableCell>
@@ -101,13 +255,18 @@ const ActiveGuests = ({ persons }: GuestProps) => {
)
}
+ActiveGuests.defaultProps = {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ cancelCallback: (roleId: number) => {},
+}
+
const WaitingGuests = ({ persons }: GuestProps) => {
const [waitingExpanded, setWaitingExpanded] = useState(false)
- // Only show non-active people
+ // Show guests that have completed the registration but are not verified yet
let guests = persons.length > 0 ? persons : []
if (guests.length > 0) {
- guests = guests.filter((person) => !person.active)
+ guests = guests.filter((person) => person.registered && !person.verified)
}
const [t] = useTranslation(['common'])
@@ -137,9 +296,19 @@ const WaitingGuests = ({ persons }: GuestProps) => {
</TableRow>
</TableHead>
<TableBody>
- {guests.map((person) => (
- <PersonLine person={person} />
- ))}
+ {guests.length > 0 ? (
+ guests.map((person) =>
+ person.roles ? (
+ person.roles.map((role) => (
+ <PersonLine role={role} person={person} />
+ ))
+ ) : (
+ <></>
+ )
+ )
+ ) : (
+ <></>
+ )}
<TableRow>
<TableCell>
{guests.length > 0 ? '' : t('common:noWaitingGuests')}
@@ -153,14 +322,24 @@ const WaitingGuests = ({ persons }: GuestProps) => {
)
}
+WaitingGuests.defaultProps = {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ cancelCallback: (roleId: number) => {},
+}
+
interface FrontPageProps {
guests: Guest[]
+ cancelRole: (roleId: string) => void
}
-function FrontPage({ guests }: FrontPageProps) {
+function FrontPage({ guests, cancelRole }: FrontPageProps) {
return (
<Page>
<SponsorGuestButtons yourGuestsActive />
+ <WaitingForGuestRegistration
+ persons={guests}
+ cancelCallback={cancelRole}
+ />
<WaitingGuests persons={guests} />
<ActiveGuests persons={guests} />
</Page>
diff --git a/frontend/src/routes/sponsor/guest/guestInfo/index.tsx b/frontend/src/routes/sponsor/guest/guestInfo/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..139e128465ec003b0200749ad59cc37980185557
--- /dev/null
+++ b/frontend/src/routes/sponsor/guest/guestInfo/index.tsx
@@ -0,0 +1,127 @@
+import { Link, useParams } from 'react-router-dom'
+
+import Page from 'components/page'
+import { useTranslation } from 'react-i18next'
+import {
+ Button,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableHead,
+ TableRow,
+ Paper,
+} from '@mui/material'
+import { Guest, Role } from 'interfaces'
+import SponsorInfoButtons from 'routes/components/sponsorInfoButtons'
+import { format } from 'date-fns'
+
+type GuestInfoParams = {
+ pid: string
+}
+interface RoleLineProps {
+ role: Role
+ pid: string
+}
+type GuestInfoProps = {
+ guest: Guest
+ roles: Role[]
+}
+
+const RoleLine = ({ role, pid }: RoleLineProps) => {
+ const [t, i18n] = useTranslation('common')
+ return (
+ <TableRow sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
+ <TableCell align="left">
+ {i18n.language === 'en' ? role.name_en : role.name_nb}
+ </TableCell>
+ <TableCell component="th" scope="row">
+ {role.start_date ? format(role.start_date, 'yyyy-MM-dd') : null} -{' '}
+ {format(role.end_date, 'yyyy-MM-dd')}
+ </TableCell>
+ <TableCell align="left">
+ {i18n.language === 'en' ? role.ou_en : role.ou_nb}
+ </TableCell>
+ <TableCell>
+ <Button
+ variant="contained"
+ component={Link}
+ to={`/sponsor/guest/${pid}/roles/${role.id}`}
+ >
+ {t('sponsor.choose')}
+ </Button>
+ </TableCell>
+ </TableRow>
+ )
+}
+
+export default function GuestInfo({ guest, roles }: GuestInfoProps) {
+ const { pid } = useParams<GuestInfoParams>()
+ const [t] = useTranslation(['common'])
+
+ return (
+ <Page>
+ <SponsorInfoButtons to="/sponsor" name={`${guest.first} ${guest.last}`} />
+ <h4>{t('guestInfo.contactInfo')}</h4>
+ <TableContainer component={Paper}>
+ <Table sx={{ minWidth: 650 }} aria-label="simple table">
+ <TableHead sx={{ backgroundColor: 'primary.light' }}>
+ <TableRow>
+ <TableCell align="left">{t('guestInfo.contactInfo')}</TableCell>
+ <TableCell />
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ <TableRow>
+ <TableCell align="left">{t('input.fullName')}</TableCell>
+ <TableCell align="left">
+ {`${guest.first} ${guest.last}`}
+ </TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell align="left">{t('input.email')}</TableCell>
+ <TableCell align="left">{guest.email}</TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell align="left">{t('input.nationalIdNumber')}</TableCell>
+ <TableCell align="left">{guest.fnr}</TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell align="left">{t('input.mobilePhone')}</TableCell>
+ <TableCell align="left">{guest.mobile}</TableCell>
+ </TableRow>
+ </TableBody>
+ </Table>
+ </TableContainer>
+ <h4>{t('guestInfo.roleInfoHead')}</h4>
+ <h5>
+ {t('guestInfo.roleInfoBody')}
+ <Button
+ variant="contained"
+ component={Link}
+ to={`/sponsor/guest/${pid}/newrole`}
+ >
+ {t('sponsor.addRole')}
+ </Button>
+ </h5>
+
+ <TableContainer component={Paper}>
+ <Table sx={{ minWidth: 650 }} aria-label="simple table">
+ <TableHead sx={{ backgroundColor: 'primary.light' }}>
+ <TableRow>
+ <TableCell align="left">{t('common:role')}</TableCell>
+ <TableCell align="left">{t('common:period')}</TableCell>
+ <TableCell align="left">{t('common:ou')}</TableCell>
+ <TableCell align="left">{t('common:choice')}</TableCell>
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ {roles.map((role) => (
+ <RoleLine key={role.id} pid={pid} role={role} />
+ ))}
+ </TableBody>
+ </Table>
+ </TableContainer>
+ </Page>
+ )
+}
diff --git a/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..6445c4ac23c5778e3b2707eba9865ce5a389cf42
--- /dev/null
+++ b/frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
@@ -0,0 +1,194 @@
+import format from 'date-fns/format'
+import { addDays } from 'date-fns/fp'
+import {
+ Button,
+ Paper,
+ Table,
+ TableBody,
+ TableCell,
+ TableContainer,
+ TableHead,
+ TableRow,
+ TextField,
+} from '@mui/material'
+import Page from 'components/page'
+import { Guest, Role } from 'interfaces'
+import { useTranslation } from 'react-i18next'
+import { useParams } from 'react-router-dom'
+import SponsorInfoButtons from 'routes/components/sponsorInfoButtons'
+import { DatePicker } from '@mui/lab'
+import { Controller, SubmitHandler, useForm } from 'react-hook-form'
+import { submitJsonOpts } from '../../../../utils'
+
+interface GuestRoleInfoProps {
+ guest: Guest
+ roles: Role[]
+}
+const endPeriodPost = (id: string, data: { end_date: Date }) => {
+ const payload = {
+ end_date: format(data.end_date as Date, 'yyyy-MM-dd'),
+ }
+ console.log('submitting', JSON.stringify(payload))
+
+ fetch(`/api/ui/v1/role/${id}`, submitJsonOpts('PATCH', payload))
+ .then((res) => {
+ if (!res.ok) {
+ return null
+ }
+ return res.text()
+ })
+ .then((result) => {
+ if (result !== null) {
+ console.log('result', result)
+ }
+ })
+ .catch((error) => {
+ console.log('error', error)
+ })
+}
+
+type GuestRoleInfoParams = {
+ pid: string
+ id: string
+}
+
+type RoleFormData = {
+ start_date: Date
+ end_date: Date
+}
+
+export default function GuestRoleInfo({ guest, roles }: GuestRoleInfoProps) {
+ const { pid, id } = useParams<GuestRoleInfoParams>()
+ const [t, i18n] = useTranslation('common')
+
+ // Find the role info relevant for this page
+ const roleInfo = roles.filter((role) => role.id.toString() === id)[0]
+
+ // Prepare min and max date values
+ const today = new Date()
+ const todayPlusMaxDays = addDays(roleInfo.max_days)(today)
+
+ // Make a function for use with onClick of the end role button
+ const endPeriod = () => () => {
+ roleInfo.end_date = today
+ endPeriodPost(id, { end_date: today })
+ }
+
+ // Submit function for the save button
+ const submit: SubmitHandler<RoleFormData> = (data) => {
+ const payload: { start_date?: string; end_date: string } = {
+ end_date: format(data.end_date as Date, 'yyyy-MM-dd'),
+ }
+ // Ignore start dates before today ()
+ if (data.start_date >= today) {
+ payload.start_date = format(data.start_date as Date, 'yyyy-MM-dd')
+ }
+
+ console.log('submitting', JSON.stringify(payload))
+ fetch(`/api/ui/v1/role/${id}`, submitJsonOpts('PATCH', payload))
+ .then((res) => {
+ if (!res.ok) {
+ return null
+ }
+ return res.text()
+ })
+ .then((result) => {
+ if (result !== null) {
+ console.log('result', result)
+ }
+ })
+ .catch((error) => {
+ console.log('error', error)
+ })
+ }
+
+ const { control, handleSubmit } = useForm()
+ const onSubmit = handleSubmit(submit)
+ return (
+ <Page>
+ <SponsorInfoButtons
+ to={`/sponsor/guest/${pid}`}
+ name={`${guest.first} ${guest.last}`}
+ />
+ <h4>{t('sponsor.roleInfoText')}</h4>
+ <form onSubmit={onSubmit}>
+ <TableContainer component={Paper}>
+ <Table sx={{ minWidth: 650 }} aria-label="simple table">
+ <TableHead sx={{ backgroundColor: 'primary.light' }}>
+ <TableRow>
+ <TableCell align="left">{t('sponsor.details')}</TableCell>
+ <TableCell />
+ <TableCell />
+ <TableCell />
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ <TableRow>
+ <TableCell align="left">{t('common:role')}</TableCell>
+ <TableCell>
+ {i18n.language === 'en' ? roleInfo.name_en : roleInfo.name_nb}
+ </TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell align="left">{t('common:period')}</TableCell>
+ <TableCell align="left">
+ <Controller
+ name="start_date"
+ control={control}
+ defaultValue={roleInfo.start_date}
+ render={({ field: { onChange, value } }) => (
+ <DatePicker
+ mask="____-__-__"
+ disabled={roleInfo.start_date <= today}
+ label={t('input.roleStartDate')}
+ value={value}
+ minDate={today}
+ maxDate={todayPlusMaxDays}
+ inputFormat="yyyy-MM-dd"
+ onChange={onChange}
+ renderInput={(params) => <TextField {...params} />}
+ />
+ )}
+ />
+ </TableCell>
+ <TableCell align="left">
+ <Controller
+ name="end_date"
+ control={control}
+ defaultValue={roleInfo.end_date}
+ render={({ field: { onChange, value } }) => (
+ <DatePicker
+ mask="____-__-__"
+ label={t('input.roleEndDate')}
+ disabled={roleInfo.end_date < today}
+ minDate={today}
+ maxDate={todayPlusMaxDays}
+ value={value}
+ inputFormat="yyyy-MM-dd"
+ onChange={onChange}
+ renderInput={(params) => <TextField {...params} />}
+ />
+ )}
+ />
+ </TableCell>
+ <TableCell>
+ <Button onClick={endPeriod()}>{t('sponsor.endNow')}</Button>
+ </TableCell>
+ </TableRow>
+ <TableRow>
+ <TableCell align="left">{t('common:ou')}</TableCell>
+ <TableCell align="left">
+ {i18n.language === 'en' ? roleInfo.ou_en : roleInfo.ou_nb}
+ </TableCell>
+ <TableCell align="left" />
+ </TableRow>
+ </TableBody>
+ </Table>
+ </TableContainer>
+ <Button variant="contained" type="submit">
+ {t('button.save')}
+ </Button>
+ </form>
+ </Page>
+ )
+}
diff --git a/frontend/src/routes/sponsor/guest/index.tsx b/frontend/src/routes/sponsor/guest/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..81152184d3bc670acc3b3ffed86b7dedc8972310
--- /dev/null
+++ b/frontend/src/routes/sponsor/guest/index.tsx
@@ -0,0 +1,73 @@
+import { FetchedRole, Guest, Role } from 'interfaces'
+import { useEffect, useState } from 'react'
+import { Route, useParams } from 'react-router-dom'
+import { parseRole } from 'utils'
+import GuestInfo from './guestInfo'
+import GuestRoleInfo from './guestRoleInfo'
+import NewGuestRole from './newGuestRole'
+
+type GuestInfoParams = {
+ pid: string
+}
+
+function GuestRoutes() {
+ const { pid } = useParams<GuestInfoParams>()
+
+ const [guestInfo, setGuest] = useState<Guest>({
+ pid: '',
+ first: '',
+ last: '',
+ email: '',
+ fnr: '',
+ mobile: '',
+ active: false,
+ registered: false,
+ verified: false,
+ roles: [],
+ })
+ const [roles, setRoles] = useState<Role[]>([])
+
+ const getPerson = async (id: string) => {
+ try {
+ const response = await fetch(`/api/ui/v1/person/${id}`)
+ const rjson = await response.json()
+ if (response.ok) {
+ setGuest({
+ pid: rjson.pid,
+ first: rjson.first,
+ last: rjson.last,
+ email: rjson.email,
+ mobile: rjson.mobile,
+ fnr: rjson.fnr,
+ active: rjson.active,
+ registered: rjson.registered,
+ verified: rjson.verified,
+ roles: rjson.roles,
+ })
+ setRoles(rjson.roles.map((role: FetchedRole) => parseRole(role)))
+ }
+ } catch (error) {
+ console.error(error)
+ }
+ }
+
+ useEffect(() => {
+ getPerson(pid)
+ }, [])
+
+ return (
+ <>
+ <Route path="/sponsor/guest/:pid/roles/:id">
+ <GuestRoleInfo guest={guestInfo} roles={roles} />
+ </Route>
+ <Route exact path="/sponsor/guest/:pid/newrole">
+ <NewGuestRole guest={guestInfo} />
+ </Route>
+ <Route exact path="/sponsor/guest/:pid">
+ <GuestInfo guest={guestInfo} roles={roles} />
+ </Route>
+ </>
+ )
+}
+
+export default GuestRoutes
diff --git a/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx b/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..4aa06b56bea1ae5c080837abd4f8ce413933da7c
--- /dev/null
+++ b/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx
@@ -0,0 +1,274 @@
+import { DatePicker } from '@mui/lab'
+import { addDays } from 'date-fns/fp'
+import {
+ Checkbox,
+ Button,
+ Select,
+ FormControl,
+ InputLabel,
+ MenuItem,
+ Stack,
+ TextField,
+ SelectChangeEvent,
+ FormControlLabel,
+} from '@mui/material'
+import Page from 'components/page'
+import { format } from 'date-fns'
+import useOus, { enSort, nbSort, OuData } from 'hooks/useOus'
+import useRoleTypes, { RoleTypeData } from 'hooks/useRoleTypes'
+import { Guest } from 'interfaces'
+import { useState } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { Link, useParams } from 'react-router-dom'
+import SponsorInfoButtons from 'routes/components/sponsorInfoButtons'
+import { submitJsonOpts } from 'utils'
+
+type AddRoleFormData = {
+ orgunit: number
+ type: string
+ end_date: Date
+ start_date: Date
+ contact_person_unit?: string
+ comments?: string
+ available_in_search?: boolean
+}
+type AddRolePayload = {
+ orgunit: number
+ person: string
+ type: string
+ end_date: string
+ start_date?: string
+ contact_person_unit?: string
+ comments?: string
+ available_in_search?: boolean
+}
+
+type GuestInfoParams = {
+ pid: string
+}
+
+interface NewGuestRoleProps {
+ guest: Guest
+}
+
+const postRole = (formData: AddRoleFormData, pid: string) => {
+ const payload: AddRolePayload = {
+ orgunit: formData.orgunit,
+ person: pid,
+ type: formData.type,
+ end_date: format(formData.end_date as Date, 'yyyy-MM-dd'),
+ }
+ if (formData.start_date) {
+ payload.start_date = format(formData.start_date as Date, 'yyyy-MM-dd')
+ }
+ if (formData.contact_person_unit) {
+ payload.contact_person_unit = formData.contact_person_unit
+ }
+ if (formData.comments) {
+ payload.comments = formData.comments
+ }
+ if (formData.available_in_search) {
+ payload.available_in_search = formData.available_in_search
+ }
+
+ console.log('submitting', JSON.stringify(payload))
+ fetch('/api/ui/v1/role', submitJsonOpts('POST', payload))
+ .then((res) => {
+ if (!res.ok) {
+ console.log('result', res)
+ return null
+ }
+ console.log('result', res)
+ return res.text()
+ })
+ .then((result) => {
+ if (result !== null) {
+ console.log('result', result)
+ }
+ })
+ .catch((error) => {
+ console.log('error', error)
+ })
+}
+
+function NewGuestRole({ guest }: NewGuestRoleProps) {
+ const {
+ register,
+ control,
+ handleSubmit,
+ formState: { errors },
+ setValue,
+ getValues,
+ } = useForm<AddRoleFormData>()
+
+ const { pid } = useParams<GuestInfoParams>()
+ const onSubmit = handleSubmit(() => {
+ postRole(getValues(), pid)
+ })
+
+ const ous = useOus()
+ const roleTypes = useRoleTypes()
+ const [ouChoice, setOuChoice] = useState<string>('')
+ const [roleTypeChoice, setRoleTypeChoice] = useState<string>('')
+ const [t, i18n] = useTranslation('common')
+ const today = new Date()
+
+ const todayPlusMaxDays = () => {
+ if (roleTypeChoice) {
+ const role = roleTypes.filter(
+ (rt) => rt.id.toString() === roleTypeChoice.toString()
+ )[0]
+ return addDays(role.max_days)(today)
+ }
+ return addDays(0)(today)
+ }
+
+ const roleTypeSort = () => (a: RoleTypeData, b: RoleTypeData) => {
+ if (i18n.language === 'en') {
+ return a.name_nb.localeCompare(b.name_nb)
+ }
+ return a.name_en.localeCompare(b.name_en)
+ }
+ // Handling choices in menus
+ const handleRoleTypeChange = (event: SelectChangeEvent) => {
+ setValue('type', event.target.value)
+ setRoleTypeChoice(event.target.value)
+ }
+ const handleOuChange = (event: SelectChangeEvent) => {
+ if (event.target.value) {
+ setOuChoice(event.target.value)
+ setValue('orgunit', parseInt(event.target.value, 10))
+ }
+ }
+ // Functions for menu items
+ const rolesToItem = (roleType: RoleTypeData) => (
+ <MenuItem key={roleType.id.toString()} value={roleType.id}>
+ {i18n.language === 'en' ? roleType.name_en : roleType.name_nb}
+ </MenuItem>
+ )
+ const ouToItem = (ou: OuData) => (
+ <MenuItem key={ou.id.toString()} value={ou.id}>
+ {i18n.language === 'en' ? ou.en : ou.nb} ({ou.id})
+ </MenuItem>
+ )
+
+ return (
+ <Page>
+ <SponsorInfoButtons
+ to={`/sponsor/guest/${pid}`}
+ name={`${guest.first} ${guest.last}`}
+ />
+ <h3>{t('guest.headerText')}</h3>
+ <h4>{t('guest.bodyText')}</h4>
+ <form onSubmit={onSubmit}>
+ <Stack spacing={2}>
+ <FormControl>
+ <InputLabel id="ou-select-label">{t('input.roleType')}</InputLabel>
+ <Select
+ id="roletype-select"
+ defaultValue=""
+ value={roleTypeChoice}
+ error={!!errors.type}
+ label={t('input.roleType')}
+ onChange={handleRoleTypeChange}
+ >
+ {roleTypes.sort(roleTypeSort()).map((rt) => rolesToItem(rt))}
+ </Select>
+ </FormControl>
+
+ <FormControl>
+ <InputLabel id="ou-select-label">{t('common:ou')}</InputLabel>
+ <Select
+ labelId="ou-select-label"
+ id="ou-select-label"
+ defaultValue=""
+ value={ouChoice.toString()}
+ label={t('common:ou')}
+ onChange={handleOuChange}
+ >
+ {ous.length > 0 ? (
+ ous
+ .sort(i18n.language === 'en' ? enSort : nbSort)
+ .map((ou) => ouToItem(ou))
+ ) : (
+ <></>
+ )}
+ </Select>
+ </FormControl>
+ <Controller
+ name="start_date"
+ control={control}
+ defaultValue={today}
+ render={({ field }) => (
+ <DatePicker
+ mask="____-__-__"
+ label={t('input.roleStartDate')}
+ disabled={!roleTypeChoice}
+ value={field.value}
+ minDate={today}
+ maxDate={todayPlusMaxDays()}
+ inputFormat="yyyy-MM-dd"
+ onChange={(value) => {
+ field.onChange(value)
+ }}
+ renderInput={(params) => <TextField {...params} />}
+ />
+ )}
+ />
+ <Controller
+ name="end_date"
+ control={control}
+ defaultValue={today}
+ render={({ field }) => (
+ <DatePicker
+ mask="____-__-__"
+ label={t('input.roleEndDate')}
+ disabled={!roleTypeChoice}
+ value={field.value}
+ minDate={today}
+ maxDate={todayPlusMaxDays()}
+ inputFormat="yyyy-MM-dd"
+ onChange={(value) => {
+ field.onChange(value)
+ }}
+ renderInput={(params) => <TextField {...params} />}
+ />
+ )}
+ />
+
+ <TextField
+ id="contact"
+ label={t('input.contact')}
+ multiline
+ rows={5}
+ {...register('contact_person_unit')}
+ />
+ <TextField
+ id="comments"
+ label={t('input.comment')}
+ multiline
+ rows={5}
+ {...register('comments')}
+ />
+ <FormControlLabel
+ control={
+ <Checkbox
+ id="available_in_search"
+ {...register('available_in_search')}
+ />
+ }
+ label={t('input.searchable')}
+ />
+ <Button variant="contained" type="submit">
+ {t('button.save')}
+ </Button>
+ <Button component={Link} to={`/sponsor/guest/${pid}`}>
+ {t('button.cancel')}
+ </Button>
+ </Stack>
+ </form>
+ </Page>
+ )
+}
+export default NewGuestRole
diff --git a/frontend/src/routes/sponsor/guestInfo/index.tsx b/frontend/src/routes/sponsor/guestInfo/index.tsx
deleted file mode 100644
index dac10d60ca10b30a6525a340b5e5ee1e99ed9250..0000000000000000000000000000000000000000
--- a/frontend/src/routes/sponsor/guestInfo/index.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React from 'react'
-import { Link, useParams } from 'react-router-dom'
-
-import Page from 'components/page'
-import { useTranslation } from 'react-i18next'
-import {
- Box,
- IconButton,
- Table,
- TableBody,
- TableCell,
- TableContainer,
- TableHead,
- TableRow,
- Theme,
- Paper,
-} from '@mui/material'
-import PersonOutlineRoundedIcon from '@mui/icons-material/PersonOutlineRounded'
-import ArrowBackIcon from '@mui/icons-material/ArrowBack'
-import { Guest } from 'interfaces'
-
-type GuestInfoParams = {
- pid: string
-}
-interface RoleLineProps {
- guest: Guest
-}
-
-const RoleLine = ({ guest }: RoleLineProps) => {
- const [, i18n] = useTranslation('common')
- return (
- <TableRow
- key={guest.id}
- sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
- >
- <TableCell align="left">
- {i18n.language === 'en' ? guest.role_en : guest.role_nb}
- </TableCell>
- <TableCell component="th" scope="row">
- {guest.period}
- </TableCell>
- <TableCell align="left">
- {i18n.language === 'en' ? guest.ou_en : guest.ou_nb}
- </TableCell>
- </TableRow>
- )
-}
-
-interface GuestInfoProps {
- guests: Guest[]
-}
-
-export default function GuestInfo({ guests }: GuestInfoProps) {
- const { pid } = useParams<GuestInfoParams>()
- const [t] = useTranslation(['common'])
-
- const roles = guests.filter((guest) => guest.pid.toString() === pid)
- const guestInfo = roles[0]
-
- return (
- <Page>
- <Box
- sx={{
- display: 'flex',
- flexDirection: 'row',
- justifyContent: 'center',
- marginBottom: '2rem',
- }}
- >
- <Box>
- <IconButton component={Link} to="/sponsor">
- <ArrowBackIcon />
- </IconButton>
- </Box>
- <Box
- sx={{
- display: 'flex',
- flexDirection: 'column',
- alignItems: 'center',
- }}
- >
- <PersonOutlineRoundedIcon
- fontSize="large"
- sx={{
- borderRadius: '2rem',
- borderStyle: 'solid',
- borderColor: (theme: Theme) => theme.palette.primary.main,
- fill: 'white',
- backgroundColor: (theme: Theme) => theme.palette.primary.main,
- }}
- />
- <Box
- sx={{
- typography: 'caption',
- }}
- >
- {t('sponsor.overviewGuest')}
- </Box>
- </Box>
- </Box>
- <h4>{t('sponsor.contactInfo')}</h4>
- <TableContainer component={Paper}>
- <Table sx={{ minWidth: 650 }} aria-label="simple table">
- <TableHead sx={{ backgroundColor: 'primary.light' }}>
- <TableRow>
- <TableCell align="left">{t('sponsor.contactInfo')}</TableCell>
- <TableCell />
- </TableRow>
- </TableHead>
- <TableBody>
- <TableRow>
- <TableCell align="left">{t('input.fullName')}</TableCell>
- <TableCell align="left">{guestInfo.name}</TableCell>
- </TableRow>
- <TableRow>
- <TableCell align="left">{t('input.email')}</TableCell>
- <TableCell align="left">{guestInfo.email}</TableCell>
- </TableRow>
- <TableRow>
- <TableCell align="left">{t('input.nationalIdNumber')}</TableCell>
- <TableCell align="left">{guestInfo.fnr}</TableCell>
- </TableRow>
- <TableRow>
- <TableCell align="left">{t('input.mobilePhone')}</TableCell>
- <TableCell align="left">{guestInfo.mobile}</TableCell>
- </TableRow>
- </TableBody>
- </Table>
- </TableContainer>
- <h4>{t('sponsor.roleInfo')}</h4>
- <TableContainer component={Paper}>
- <Table sx={{ minWidth: 650 }} aria-label="simple table">
- <TableHead sx={{ backgroundColor: 'primary.light' }}>
- <TableRow>
- <TableCell align="left">{t('common:role')}</TableCell>
- <TableCell align="left">{t('common:period')}</TableCell>
- <TableCell align="left">{t('common:ou')}</TableCell>
- </TableRow>
- </TableHead>
- <TableBody>
- {roles.map((guest) => (
- <RoleLine guest={guest} />
- ))}
- </TableBody>
- </Table>
- </TableContainer>
- </Page>
- )
-}
diff --git a/frontend/src/routes/sponsor/index.tsx b/frontend/src/routes/sponsor/index.tsx
index ecfd155de1cda2b1c7f04ee1fb392562029e7c66..741bda77f5085ce0aee13de1a09a6dc39d2fbf1f 100644
--- a/frontend/src/routes/sponsor/index.tsx
+++ b/frontend/src/routes/sponsor/index.tsx
@@ -1,9 +1,10 @@
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
import { Route } from 'react-router-dom'
import FrontPage from 'routes/sponsor/frontpage'
-import GuestInfo from 'routes/sponsor/guestInfo'
import { FetchedGuest, Guest } from 'interfaces'
+import { parseRole, submitJsonOpts } from 'utils'
+import GuestRoutes from './guest'
function Sponsor() {
const [guests, setGuests] = useState<Guest[]>([])
@@ -13,31 +14,52 @@ function Sponsor() {
const response = await fetch('/api/ui/v1/guests/?format=json')
const jsonResponse = await response.json()
if (response.ok) {
- const roles = await jsonResponse.roles
+ const persons = await jsonResponse.persons
setGuests(
- roles.map((person: FetchedGuest) => ({
- id: person.id,
- pid: person.pid,
- name: `${person.first} ${person.last}`,
- email: person.email,
- mobile: person.mobile,
- fnr: person.fnr,
- role_nb: person.role_nb,
- role_en: person.role_en,
- period: person.period,
- active: person.active,
- ou_nb: person.ou_nb,
- ou_en: person.ou_en,
- }))
+ persons.map(
+ (person: FetchedGuest): Guest => ({
+ pid: person.pid,
+ first: person.first,
+ last: person.last,
+ email: person.email,
+ mobile: person.mobile,
+ fnr: person.fnr,
+ active: person.active,
+ roles: person.roles.map((role) => parseRole(role)),
+ registered: person.registered,
+ verified: person.verified,
+ })
+ )
)
- } else {
- setGuests([])
}
} catch (error) {
setGuests([])
}
}
+ const cancelRole = (roleId: string) => {
+ // There is no body for this request, but using submitJsonOpts still to
+ // set the CSRF-token
+ fetch(`/api/ui/v1/invite/?role_id=${roleId}`, submitJsonOpts('DELETE', {}))
+ .then((res) => {
+ if (!res.ok) {
+ return null
+ }
+ return res.text()
+ })
+ .then((result) => {
+ if (result !== null) {
+ // The invitation has been removed. Just reload all the data form the server to get updated data.
+ // The guests state will be updated by getGuestsInfo and this will trigger a rerender
+ getGuestsInfo()
+ }
+ })
+ .catch((error) => {
+ // TODO User should get some feedback telling him something failed
+ console.log('error', error)
+ })
+ }
+
useEffect(() => {
getGuestsInfo()
}, [])
@@ -45,10 +67,10 @@ function Sponsor() {
return (
<>
<Route path="/sponsor/guest/:pid">
- <GuestInfo guests={guests} />
+ <GuestRoutes />
</Route>
<Route exact path="/sponsor">
- <FrontPage guests={guests} />
+ <FrontPage guests={guests} cancelRole={cancelRole} />
</Route>
</>
)
diff --git a/frontend/src/routes/sponsor/register/formData.ts b/frontend/src/routes/sponsor/register/formData.ts
index 5e518b30d580c96186d66215ae12c4c6a77d3cda..8e96d7a625f1da93f7e34360939c4ccb0f267cb9 100644
--- a/frontend/src/routes/sponsor/register/formData.ts
+++ b/frontend/src/routes/sponsor/register/formData.ts
@@ -4,6 +4,7 @@ export type RegisterFormData = {
role_type?: string
role_start?: Date
role_end?: Date
+ contact_person_unit?: string
comment?: string
ou_id?: number
email?: string
diff --git a/frontend/src/routes/sponsor/register/frontPage.tsx b/frontend/src/routes/sponsor/register/frontPage.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..297e6abbba6db139f8d9bb05dd59d08f1840a37f
--- /dev/null
+++ b/frontend/src/routes/sponsor/register/frontPage.tsx
@@ -0,0 +1,71 @@
+import { Button, InputAdornment, MenuItem, TextField } from '@mui/material'
+import Page from 'components/page'
+import { Link } from 'react-router-dom'
+import SponsorGuestButtons from 'routes/components/sponsorGuestButtons'
+import SearchIcon from '@mui/icons-material/Search'
+import { useTranslation } from 'react-i18next'
+import { debounce } from 'lodash'
+import React, { useState } from 'react'
+
+type Guest = {
+ first: string
+ last: string
+ pid: string
+ value: string
+}
+
+function FrontPage() {
+ const [t] = useTranslation('common')
+ const [guests, setGuests] = useState<Guest[]>([])
+
+ const getGuests = async (event: React.ChangeEvent<HTMLInputElement>) => {
+ if (event.target.value) {
+ console.log('searching')
+ const response = await fetch(
+ `/api/ui/v1/person/search/${event.target.value}`
+ )
+ const repjson = await response.json()
+ console.log(repjson)
+ if (response.ok) {
+ setGuests(repjson.persons)
+ }
+ }
+ }
+ return (
+ <Page>
+ <SponsorGuestButtons registerNewGuestActive />
+ <h4>{t('register.registerHeading')}</h4>
+ <p>{t('register.registerText')}</p>
+ <TextField
+ InputProps={{
+ endAdornment: (
+ <InputAdornment position="end">
+ <SearchIcon />
+ </InputAdornment>
+ ),
+ }}
+ fullWidth
+ placeholder="Mobile phone, e-mail"
+ onChange={debounce(getGuests, 600)}
+ />
+ {guests ? (
+ guests.map((guest) => {
+ const guestTo = `/sponsor/guest/${guest.pid}`
+ return (
+ <MenuItem component={Link} to={guestTo}>
+ {guest.first} {guest.last}
+ <br />
+ {guest.value}
+ </MenuItem>
+ )
+ })
+ ) : (
+ <></>
+ )}
+ <Button variant="contained" component={Link} to="register/new">
+ {t('register.registerButtonText')}
+ </Button>
+ </Page>
+ )
+}
+export default FrontPage
diff --git a/frontend/src/routes/sponsor/register/index.test.tsx b/frontend/src/routes/sponsor/register/index.test.tsx
index 9dbbc897e7a17086950531c91034710fcfe54a7e..4d699b4f5553db156fb04195321f346c8ec6231a 100644
--- a/frontend/src/routes/sponsor/register/index.test.tsx
+++ b/frontend/src/routes/sponsor/register/index.test.tsx
@@ -3,12 +3,12 @@ import { render, waitFor, screen } from 'test-utils'
import userEvent from '@testing-library/user-event'
import AdapterDateFns from '@mui/lab/AdapterDateFns'
import { LocalizationProvider } from '@mui/lab'
-import Register from './index'
+import StepRegistration from './stepRegistration'
test('Validation message showing if last name is missing', async () => {
render(
<LocalizationProvider dateAdapter={AdapterDateFns}>
- <Register />
+ <StepRegistration />
</LocalizationProvider>
)
diff --git a/frontend/src/routes/sponsor/register/index.tsx b/frontend/src/routes/sponsor/register/index.tsx
index bab1d0613eed1a85ba8f9ca315c70acdfc968678..c53b35efb1d991310e97b429c6b490ebf6d50e32 100644
--- a/frontend/src/routes/sponsor/register/index.tsx
+++ b/frontend/src/routes/sponsor/register/index.tsx
@@ -1,185 +1,17 @@
-import React, { useState, useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { Box, Button } from '@mui/material'
-import Page from 'components/page'
-
-import { useHistory } from 'react-router-dom'
-import format from 'date-fns/format'
-import { RegisterFormData } from './formData'
-import StepSummary from './stepSummary'
-import StepPersonForm from './stepPersonForm'
-import { PersonFormMethods } from './personFormMethods'
-import SubmitState from './submitState'
-import SponsorGuestButtons from '../../components/sponsorGuestButtons'
-import { postJsonOpts } from '../../../utils'
-
-/**
- *
- * This component controls the invite process where the sponsor
- * enters the initial information about a guest.
- *
- */
-export default function StepRegistration() {
- const { t } = useTranslation(['common'])
- const [formData, setFormData] = useState<RegisterFormData>({
- first_name: undefined,
- last_name: undefined,
- role_type: undefined,
- role_start: undefined,
- role_end: undefined,
- comment: undefined,
- ou_id: undefined,
- email: undefined,
- })
- const history = useHistory()
-
- const REGISTER_STEP = 0
- const SUMMARY_STEP = 1
- const [activeStep, setActiveStep] = useState(0)
- const personFormRef = useRef<PersonFormMethods>(null)
- const [submitState, setSubmitState] = useState(SubmitState.NotSubmitted)
-
- const handleNext = () => {
- if (activeStep === 0) {
- if (personFormRef.current) {
- personFormRef.current.doSubmit()
- }
- } else {
- setActiveStep((prevActiveStep) => prevActiveStep + 1)
- }
- }
-
- const registerGuest = () => {
- const payload = {
- first_name: formData.first_name,
- last_name: formData.last_name,
- email: formData.email,
- role: {
- type: formData.role_type,
- start_date:
- formData.role_start === null
- ? null
- : format(formData.role_start as Date, 'yyyy-MM-dd'),
- end_date:
- formData.role_end === null
- ? null
- : format(formData.role_end as Date, 'yyyy-MM-dd'),
- comments: formData.comment,
- orgunit_id: formData.ou_id,
- },
- }
-
- console.log('submitting', JSON.stringify(payload))
- fetch('/api/ui/v1/invite/', postJsonOpts(payload))
- .then((res) => {
- if (!res.ok) {
- setSubmitState(SubmitState.SubmitFailure)
- return null
- }
- return res.text()
- })
- .then((result) => {
- if (result !== null) {
- console.log('result', result)
- setSubmitState(SubmitState.SubmitSuccess)
- }
- })
- .catch((error) => {
- console.log('error', error)
- setSubmitState(SubmitState.SubmitFailure)
- })
- }
-
- const handleBack = () => {
- setActiveStep((prevActiveStep) => prevActiveStep - 1)
- }
-
- const handleForwardFromRegister = (
- updateFormData: RegisterFormData
- ): void => {
- setFormData(updateFormData)
- setActiveStep((prevActiveStep) => prevActiveStep + 1)
- }
-
- const handleCancel = () => {
- history.push('/')
- }
+import { Route } from 'react-router-dom'
+import FrontPage from './frontPage'
+import StepRegistration from './stepRegistration'
+function Register() {
return (
- <Page>
- <SponsorGuestButtons registerNewGuestActive />
- {/* Current page in wizard */}
- <Box sx={{ width: '100%' }}>
- {activeStep === REGISTER_STEP && (
- <StepPersonForm
- nextHandler={handleForwardFromRegister}
- formData={formData}
- ref={personFormRef}
- />
- )}
- {activeStep === SUMMARY_STEP && <StepSummary formData={formData} />}
- </Box>
-
- <Box
- sx={{
- display: 'flex',
- flexDirection: 'row',
- pt: 2,
- color: 'primary.main',
- paddingBottom: '1rem',
- }}
- >
- {activeStep === REGISTER_STEP && (
- <Button
- data-testid="button-next"
- sx={{ color: 'theme.palette.secondary', mr: 1 }}
- onClick={handleNext}
- >
- {t('button.next')}
- </Button>
- )}
-
- {activeStep === SUMMARY_STEP && (
- <>
- <Button
- onClick={handleBack}
- disabled={submitState === SubmitState.SubmitSuccess}
- sx={{ mr: 1 }}
- >
- {t('button.back')}
- </Button>
-
- <Button
- onClick={registerGuest}
- disabled={submitState === SubmitState.SubmitSuccess}
- sx={{ mr: 1 }}
- >
- {t('button.save')}
- </Button>
- </>
- )}
-
- <Button
- onClick={handleCancel}
- disabled={submitState === SubmitState.SubmitSuccess}
- >
- {t('button.cancel')}
- </Button>
- </Box>
-
- {/* TODO For now just showing a heading to give the user some feedback. Should probably go to a different page on success */}
- {submitState === SubmitState.SubmitSuccess && (
- <Box>
- <h2>Submit success</h2>
- </Box>
- )}
-
- {submitState === SubmitState.SubmitFailure && (
- <Box>
- <h2>Submit failure</h2>
- </Box>
- )}
- </Page>
+ <>
+ <Route path="/register/new">
+ <StepRegistration />
+ </Route>
+ <Route exact path="/register">
+ <FrontPage />
+ </Route>
+ </>
)
}
+export default Register
diff --git a/frontend/src/routes/sponsor/register/stepPersonForm.tsx b/frontend/src/routes/sponsor/register/stepPersonForm.tsx
index ca85cbc8165395f479f865d5eea931546d003ec7..c13e7b5e541a58e145e2c1db3dee6e70cc220e69 100644
--- a/frontend/src/routes/sponsor/register/stepPersonForm.tsx
+++ b/frontend/src/routes/sponsor/register/stepPersonForm.tsx
@@ -11,7 +11,7 @@ import {
} from '@mui/material'
import { Controller, SubmitHandler, useForm } from 'react-hook-form'
import { DatePicker } from '@mui/lab'
-import React, {
+import {
forwardRef,
Ref,
useEffect,
@@ -21,7 +21,7 @@ import React, {
import { useTranslation } from 'react-i18next'
import { RegisterFormData } from './formData'
import { PersonFormMethods } from './personFormMethods'
-import useOus, { OuData } from '../../../hooks/useOus'
+import useOus, { enSort, nbSort } from '../../../hooks/useOus'
import useRoleTypes, { RoleTypeData } from '../../../hooks/useRoleTypes'
import { isValidEmail } from '../../../utils'
@@ -51,26 +51,6 @@ const StepPersonForm = forwardRef(
return a.name_en.localeCompare(b.name_en)
}
- const enSort = (a: OuData, b: OuData) => {
- if (a.en > b.en) {
- return 1
- }
- if (b.en > a.en) {
- return -1
- }
- return 0
- }
-
- const nbSort = (a: OuData, b: OuData) => {
- if (a.nb > b.nb) {
- return 1
- }
- if (b.nb > a.nb) {
- return -1
- }
- return 0
- }
-
const submit: SubmitHandler<RegisterFormData> = (data) => {
nextHandler(data)
}
@@ -82,6 +62,7 @@ const StepPersonForm = forwardRef(
formState: { errors },
reset,
setValue,
+ getValues,
} = useForm<RegisterFormData>()
const onSubmit = handleSubmit(submit)
@@ -113,6 +94,19 @@ const StepPersonForm = forwardRef(
useImperativeHandle(ref, () => ({ doSubmit }))
+ const validateStartDateBeforeEndDate = (startDate: Date | undefined) => {
+ if (!startDate) {
+ return t('validation.startDateMustBeSet')
+ }
+
+ const roleEnd = getValues('role_end')
+ if (roleEnd && startDate > roleEnd) {
+ // The role end date is set, but is is before the start date
+ return t('validation.startDateMustBeBeforeEndDate')
+ }
+ return true
+ }
+
return (
<>
<Typography
@@ -205,9 +199,11 @@ const StepPersonForm = forwardRef(
))}
</TextField>
+ {/* There are no particular constraints on the date pickers. It should be allowed to add a role with a start date that is in the past for instance */}
<Controller
name="role_start"
control={control}
+ rules={{ validate: validateStartDateBeforeEndDate }}
render={({ field }) => (
<DatePicker
mask="____-__-__"
@@ -221,11 +217,14 @@ const StepPersonForm = forwardRef(
/>
)}
/>
-
+ {!!errors.role_start && (
+ <Box sx={{ typography: 'caption', color: 'red' }}>
+ {errors.role_start.message}
+ </Box>
+ )}
<Controller
name="role_end"
control={control}
- defaultValue={undefined}
render={({ field }) => (
<DatePicker
mask="____-__-__"
@@ -240,6 +239,12 @@ const StepPersonForm = forwardRef(
)}
/>
+ <TextField
+ id="contact_person"
+ label={t('input.contactPersonUnit')}
+ {...register(`contact_person_unit`)}
+ />
+
<TextField
id="comment"
label={t('input.comment')}
diff --git a/frontend/src/routes/sponsor/register/stepRegistration.tsx b/frontend/src/routes/sponsor/register/stepRegistration.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..36ba38bb127bcd61b14376ad435d4076febd99f3
--- /dev/null
+++ b/frontend/src/routes/sponsor/register/stepRegistration.tsx
@@ -0,0 +1,192 @@
+import React, { useState, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Box, Button } from '@mui/material'
+import Page from 'components/page'
+
+import { useHistory } from 'react-router-dom'
+import format from 'date-fns/format'
+import { RegisterFormData } from './formData'
+import StepSummary from './stepSummary'
+import StepPersonForm from './stepPersonForm'
+import { PersonFormMethods } from './personFormMethods'
+import SubmitState from './submitState'
+import SponsorGuestButtons from '../../components/sponsorGuestButtons'
+import { submitJsonOpts } from '../../../utils'
+import StepSubmitSuccess from './stepSubmitSuccess'
+
+enum Steps {
+ RegisterStep = 0,
+ SummaryStep = 1,
+ SuccessStep = 2,
+}
+
+/**
+ *
+ * This component controls the invite process where the sponsor
+ * enters the initial information about a guest.
+ *
+ */
+export default function StepRegistration() {
+ const { t } = useTranslation(['common'])
+ const [formData, setFormData] = useState<RegisterFormData>({
+ first_name: undefined,
+ last_name: undefined,
+ role_type: undefined,
+ role_start: undefined,
+ role_end: undefined,
+ comment: undefined,
+ ou_id: undefined,
+ email: undefined,
+ })
+ const history = useHistory()
+
+ const [activeStep, setActiveStep] = useState(0)
+ const personFormRef = useRef<PersonFormMethods>(null)
+ const [submitState, setSubmitState] = useState(SubmitState.NotSubmitted)
+
+ const handleNext = () => {
+ if (activeStep === 0) {
+ if (personFormRef.current) {
+ personFormRef.current.doSubmit()
+ }
+ } else {
+ setActiveStep((prevActiveStep) => prevActiveStep + 1)
+ }
+ }
+
+ const registerGuest = () => {
+ const payload = {
+ first_name: formData.first_name,
+ last_name: formData.last_name,
+ email: formData.email,
+ role: {
+ type: formData.role_type,
+ start_date:
+ formData.role_start === null
+ ? null
+ : format(formData.role_start as Date, 'yyyy-MM-dd'),
+ end_date:
+ formData.role_end === null
+ ? null
+ : format(formData.role_end as Date, 'yyyy-MM-dd'),
+ contact_person_unit: formData.contact_person_unit,
+ comments: formData.comment,
+ orgunit: formData.ou_id,
+ },
+ }
+
+ console.log('submitting', JSON.stringify(payload))
+ fetch('/api/ui/v1/invite/', submitJsonOpts('POST', payload))
+ .then((res) => {
+ if (!res.ok) {
+ setSubmitState(SubmitState.SubmitFailure)
+ return null
+ }
+ return res.text()
+ })
+ .then((result) => {
+ if (result !== null) {
+ console.log('result', result)
+ setSubmitState(SubmitState.SubmitSuccess)
+ setActiveStep(Steps.SuccessStep)
+ }
+ })
+ .catch((error) => {
+ console.log('error', error)
+ setSubmitState(SubmitState.SubmitFailure)
+ })
+ }
+
+ const handleBack = () => {
+ setActiveStep((prevActiveStep) => prevActiveStep - 1)
+ }
+
+ const handleForwardFromRegister = (
+ updateFormData: RegisterFormData
+ ): void => {
+ setFormData(updateFormData)
+ setActiveStep((prevActiveStep) => prevActiveStep + 1)
+ }
+
+ const handleCancel = () => {
+ history.push('/')
+ }
+
+ return (
+ <Page>
+ <SponsorGuestButtons registerNewGuestActive />
+ {/* Current page in wizard */}
+ <Box sx={{ width: '100%' }}>
+ {activeStep === Steps.RegisterStep && (
+ <StepPersonForm
+ nextHandler={handleForwardFromRegister}
+ formData={formData}
+ ref={personFormRef}
+ />
+ )}
+ {activeStep === Steps.SummaryStep && (
+ <StepSummary formData={formData} />
+ )}
+ </Box>
+
+ <Box
+ sx={{
+ display: 'flex',
+ flexDirection: 'row',
+ pt: 2,
+ color: 'primary.main',
+ paddingBottom: '1rem',
+ }}
+ >
+ {activeStep === Steps.RegisterStep && (
+ <Button
+ data-testid="button-next"
+ sx={{ color: 'theme.palette.secondary', mr: 1 }}
+ onClick={handleNext}
+ >
+ {t('button.next')}
+ </Button>
+ )}
+
+ {activeStep === Steps.SummaryStep && (
+ <>
+ <Button
+ onClick={handleBack}
+ disabled={submitState === SubmitState.SubmitSuccess}
+ sx={{ mr: 1 }}
+ >
+ {t('button.back')}
+ </Button>
+
+ <Button
+ onClick={registerGuest}
+ disabled={submitState === SubmitState.SubmitSuccess}
+ sx={{ mr: 1 }}
+ >
+ {t('button.save')}
+ </Button>
+ </>
+ )}
+
+ {activeStep !== Steps.SuccessStep && (
+ <Button
+ onClick={handleCancel}
+ disabled={submitState === SubmitState.SubmitSuccess}
+ >
+ {t('button.cancel')}
+ </Button>
+ )}
+ </Box>
+
+ {activeStep === Steps.SuccessStep && <StepSubmitSuccess />}
+
+ {/* TODO For now just showing a heading to give the user some feedback */}
+ {submitState === SubmitState.SubmitFailure && (
+ <Box>
+ <h2>Submit failure</h2>
+ </Box>
+ )}
+ </Page>
+ )
+}
diff --git a/frontend/src/routes/sponsor/register/stepSubmitSuccess.tsx b/frontend/src/routes/sponsor/register/stepSubmitSuccess.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..428390ae01418aa5b577de81c1dd6b9995ff64d3
--- /dev/null
+++ b/frontend/src/routes/sponsor/register/stepSubmitSuccess.tsx
@@ -0,0 +1,43 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { Box, Button } from '@mui/material'
+
+import { useHistory } from 'react-router-dom'
+
+const StepSubmitSuccess = () => {
+ const { t } = useTranslation(['common'])
+ const history = useHistory()
+
+ return (
+ <>
+ <Box
+ sx={{
+ paddingTop: '1rem',
+ paddingBottom: '1rem',
+ typography: 'h3',
+ }}
+ >
+ {t('thankYou')}
+ </Box>
+
+ <Box sx={{ marginTop: '2rem' }}>
+ {t('sponsorSubmitSuccessDescription')}
+ </Box>
+
+ <Button
+ sx={{
+ marginTop: '2rem',
+ color: 'theme.palette.dark',
+ }}
+ onClick={() => {
+ history.push('/')
+ }}
+ >
+ {t('button.backToFrontPage')}
+ </Button>
+ </>
+ )
+}
+
+export default StepSubmitSuccess
diff --git a/frontend/src/setupJest.js b/frontend/src/setupJest.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c3dd9b4776ca61a4c51411d1ee07952783c5fc6
--- /dev/null
+++ b/frontend/src/setupJest.js
@@ -0,0 +1,6 @@
+// adds the 'fetchMock' global variable and rewires 'fetch' global to call 'fetchMock' instead of the real implementation
+// eslint-disable-next-line import/no-extraneous-dependencies
+require('jest-fetch-mock').enableMocks()
+// changes default behavior of fetchMock to use the real 'fetch' implementation and not mock responses
+// eslint-disable-next-line no-undef
+fetchMock.dontMock()
diff --git a/frontend/src/utils/index.test.ts b/frontend/src/utils/index.test.ts
index 66e4269a0348b66b5cf92c20f9568b1fcc8e54b5..24f9d152577bd844e60994a58ca6400588d99cea 100644
--- a/frontend/src/utils/index.test.ts
+++ b/frontend/src/utils/index.test.ts
@@ -1,10 +1,12 @@
import {
getCookie,
+ deleteCookie,
+ setCookie,
isValidEmail,
isValidFnr,
isValidMobilePhoneNumber,
maybeCsrfToken,
- postJsonOpts,
+ submitJsonOpts,
} from './index'
// Mock i18next module to return a translation that just returns the key
@@ -39,7 +41,7 @@ test('Invalid e-mail', async () => {
test('Body has values', async () => {
const data = { foo: 'bar' }
- expect(postJsonOpts(data)).toEqual({
+ expect(submitJsonOpts('POST', data)).toEqual({
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -49,6 +51,18 @@ test('Body has values', async () => {
})
})
+test('Method has correct value', async () => {
+ const data = { foo: 'bar' }
+ expect(submitJsonOpts('PATCH', data)).toEqual({
+ method: 'PATCH',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: '{"foo":"bar"}',
+ credentials: 'same-origin',
+ })
+})
+
test('Get cookie when set', async () => {
document.cookie = 'csrftoken=tokenvalue'
expect(maybeCsrfToken()).toEqual({ 'X-CSRFToken': 'tokenvalue' })
@@ -65,6 +79,33 @@ test('Get unknown cookie returns null', async () => {
document.cookie = 'csrftoken= ; expires = Thu, 01 Jan 1970 00:00:00 GMT'
})
+test('Get known cookie returns value', async () => {
+ document.cookie = 'key=value'
+ expect(getCookie('key')).toEqual('value')
+ document.cookie = 'key= ; expires = Thu, 01, Jan 1970 00:00:00 GMT'
+})
+
+test('Deleting cookie removes it', async () => {
+ document.cookie = 'key=value'
+ expect(getCookie('key')).toEqual('value')
+ deleteCookie('key')
+ expect(getCookie('key')).toEqual(null)
+})
+
+test('setCookie creates a cookie with correct value', async () => {
+ setCookie('key', 'value')
+ expect(getCookie('key')).toEqual('value')
+ deleteCookie('key')
+})
+
+test('setCookie overrides value that was set before', async () => {
+ setCookie('key', 'value')
+ expect(getCookie('key')).toEqual('value')
+ setCookie('key', 'differentvalue')
+ expect(getCookie('key')).toEqual('differentvalue')
+ deleteCookie('key')
+})
+
test('Valid fnr', async () => {
expect(isValidFnr('04026514903')).toEqual(true)
})
diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts
index 8548f91bec1813ecdf4216958d5f5aba57c4a190..08dfed2f91f97bb866ac7efbabd88983711472d0 100644
--- a/frontend/src/utils/index.ts
+++ b/frontend/src/utils/index.ts
@@ -1,61 +1,81 @@
import validator from '@navikt/fnrvalidator'
+import { parseISO } from 'date-fns'
import i18n from 'i18next'
-import {isValidPhoneNumber} from 'libphonenumber-js'
+import { FetchedRole, Role } from 'interfaces'
+import { isValidPhoneNumber, parsePhoneNumber } from 'libphonenumber-js'
-
-const validEmailRegex = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/
+const validEmailRegex =
+ /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/
export function getCookie(name: string) {
- if (!document.cookie) {
- return null
- }
+ if (!document.cookie) {
+ return null
+ }
- const cookies = document.cookie
- .split(';')
- .map((c) => c.trim())
- .filter((c) => c.startsWith(`${name}=`))
+ const cookies = document.cookie
+ .split(';')
+ .map((c) => c.trim())
+ .filter((c) => c.startsWith(`${name}=`))
- if (cookies.length === 0) {
- return null
- }
- return decodeURIComponent(cookies[0].split('=')[1])
+ if (cookies.length === 0) {
+ return null
+ }
+ return decodeURIComponent(cookies[0].split('=')[1])
+}
+
+export function setCookie(name: string, value: string) {
+ document.cookie = `${name}=${value}; path=/`
+}
+
+export function deleteCookie(name: string) {
+ if (getCookie(name)) {
+ setCookie(name, '; expires=Thu, 01 jan 1970 00:00:00 GMT')
+ }
}
export function maybeCsrfToken() {
- const csrfToken = getCookie('csrftoken')
- if (!csrfToken) {
- return null
- }
- return {
- 'X-CSRFToken': csrfToken,
- }
+ const csrfToken = getCookie('csrftoken')
+ if (!csrfToken) {
+ return null
+ }
+ return {
+ 'X-CSRFToken': csrfToken,
+ }
}
-export function postJsonOpts(data: object): RequestInit {
- return {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- ...maybeCsrfToken(),
- },
- body: JSON.stringify(data),
- credentials: 'same-origin',
- }
+export function submitJsonOpts(method: string, data: object): RequestInit {
+ return {
+ method,
+ headers: {
+ 'Content-Type': 'application/json',
+ ...maybeCsrfToken(),
+ },
+ body: JSON.stringify(data),
+ credentials: 'same-origin',
+ }
}
-export function isValidFnr(data: string | undefined): boolean | string {
- if (data === undefined) {
- return i18n.t<string>('common:validation.invalidIdNumber').toString()
- }
- const valid = validator.idnr(data as string).status === 'valid'
- if (valid) {
- return true
+export function isValidFnr(
+ data: string | undefined,
+ allowEmpty = false
+): boolean | string {
+ if (!data) {
+ if (allowEmpty) {
+ return true
}
- // TypeScript complains if toString is not used on the function result
return i18n.t<string>('common:validation.invalidIdNumber').toString()
+ }
+ const valid = validator.idnr(data as string).status === 'valid'
+ if (valid) {
+ return true
+ }
+ // TypeScript complains if toString is not used on the function result
+ return i18n.t<string>('common:validation.invalidIdNumber').toString()
}
-export function isValidMobilePhoneNumber(data: string | undefined): boolean | string {
+export function isValidMobilePhoneNumber(
+ data: string | undefined
+): boolean | string {
if (!data) {
return i18n.t<string>('common:validation.invalidMobilePhoneNumber')
}
@@ -75,3 +95,30 @@ export function isValidEmail(data: string | undefined): boolean | string {
}
return i18n.t<string>('common:validation.invalidEmail')
}
+
+/**
+ * Splits a phone number into a country code and the national number.
+ *
+ * @param phoneNumber The phone number to split
+ */
+export function splitPhoneNumber(phoneNumber: string): [string, string] {
+ const parsedNumber = parsePhoneNumber(phoneNumber)
+
+ return [
+ parsedNumber.countryCallingCode.toString(),
+ parsedNumber.nationalNumber.toString(),
+ ]
+}
+
+export function parseRole(role: FetchedRole): Role {
+ return {
+ id: role.id,
+ name_nb: role.name_nb,
+ name_en: role.name_en,
+ ou_nb: role.ou_nb,
+ ou_en: role.ou_en,
+ start_date: parseISO(role.start_date),
+ end_date: parseISO(role.end_date),
+ max_days: role.max_days,
+ }
+}
diff --git a/greg/admin.py b/greg/admin.py
index 293f4973132a78dc527575442ff74ddf6ff097c1..c19389dce61a8aa022051be0338ce6a6f0e0d6ca 100644
--- a/greg/admin.py
+++ b/greg/admin.py
@@ -2,8 +2,10 @@ from django.contrib import admin
from reversion.admin import VersionAdmin
from greg.models import (
+ OuIdentifier,
Invitation,
InvitationLink,
+ Notification,
Person,
Role,
RoleType,
@@ -91,10 +93,21 @@ class ConsentTypeAdmin(VersionAdmin):
readonly_fields = ("id", "created", "updated")
+class OuIdentifierInline(admin.TabularInline):
+ model = OuIdentifier
+ extra = 1
+
+
+class IdentifierAdmin(VersionAdmin):
+ list_display = ("id", "name", "source", "value")
+ search_fields = ("id", "value")
+
+
class OrganizationalUnitAdmin(VersionAdmin):
- list_display = ("id", "orgreg_id", "name_en", "parent")
+ list_display = ("id", "name_en", "parent")
readonly_fields = ("id", "created", "updated")
- search_fields = ("name_en", "id", "orgreg_id")
+ search_fields = ("name_en", "id")
+ inlines = (OuIdentifierInline,)
class OrganizationalUnitInline(admin.TabularInline):
@@ -121,6 +134,18 @@ class InvitationLinkAdmin(VersionAdmin):
readonly_fields = ("uuid",)
+class NotificationAdmin(VersionAdmin):
+ list_display = (
+ "id",
+ "object_type",
+ "identifier",
+ "operation",
+ "created",
+ "updated",
+ "issued_at",
+ )
+
+
admin.site.register(Person, PersonAdmin)
admin.site.register(Role, RoleAdmin)
admin.site.register(RoleType, RoleTypeAdmin)
@@ -132,3 +157,5 @@ admin.site.register(Sponsor, SponsorAdmin)
admin.site.register(SponsorOrganizationalUnit, SponsorOrganizationalUnitAdmin)
admin.site.register(Invitation, InvitationAdmin)
admin.site.register(InvitationLink, InvitationLinkAdmin)
+admin.site.register(OuIdentifier, IdentifierAdmin)
+admin.site.register(Notification, NotificationAdmin)
diff --git a/greg/api/serializers/organizational_unit.py b/greg/api/serializers/organizational_unit.py
index 12251bffff79f9119d76e9e1f7ddcc58c2984b68..95258a1070bdb4324e0f5d1c288e03d8365794bf 100644
--- a/greg/api/serializers/organizational_unit.py
+++ b/greg/api/serializers/organizational_unit.py
@@ -1,9 +1,22 @@
from rest_framework.serializers import ModelSerializer
+from greg.api.serializers.ouidentifier import OuIdentifierSerializer
from greg.models import OrganizationalUnit
class OrganizationalUnitSerializer(ModelSerializer):
+ identifiers = OuIdentifierSerializer(many=True)
+
class Meta:
model = OrganizationalUnit
- fields = "__all__"
+ fields = [
+ "id",
+ "created",
+ "updated",
+ "name_nb",
+ "name_en",
+ "active",
+ "deleted",
+ "parent",
+ "identifiers",
+ ]
diff --git a/greg/api/serializers/ouidentifier.py b/greg/api/serializers/ouidentifier.py
new file mode 100644
index 0000000000000000000000000000000000000000..c1b9be570cfbc25ff34d9cfb7e3284e9e34a2c88
--- /dev/null
+++ b/greg/api/serializers/ouidentifier.py
@@ -0,0 +1,9 @@
+from rest_framework.serializers import ModelSerializer
+
+from greg.models import OuIdentifier
+
+
+class OuIdentifierSerializer(ModelSerializer):
+ class Meta:
+ model = OuIdentifier
+ fields = ["id", "source", "name", "value"]
diff --git a/greg/api/serializers/person.py b/greg/api/serializers/person.py
index 93958a212eb20b22d59cab74bd0db91b384bc5e0..16d362f73b8813d14638fbcb3ca0addce87e8bd4 100644
--- a/greg/api/serializers/person.py
+++ b/greg/api/serializers/person.py
@@ -15,8 +15,8 @@ class RoleSerializer(serializers.ModelSerializer):
"id",
"start_date",
"end_date",
- "sponsor_id",
- "orgunit_id",
+ "sponsor",
+ "orgunit",
"created",
"updated",
"type",
diff --git a/greg/api/serializers/sponsor.py b/greg/api/serializers/sponsor.py
index 71f3655c9115346a9cf7be5d280f5496a0543d6b..a2c503442a925080364554d4980c8cf1d9774578 100644
--- a/greg/api/serializers/sponsor.py
+++ b/greg/api/serializers/sponsor.py
@@ -1,9 +1,12 @@
from rest_framework import serializers
+from greg.api.serializers.organizational_unit import OrganizationalUnitSerializer
from greg.models import Sponsor
class SponsorSerializer(serializers.ModelSerializer):
+ units = OrganizationalUnitSerializer(many=True, read_only=True)
+
class Meta:
model = Sponsor
- fields = ["id", "feide_id", "first_name", "last_name"]
+ fields = ["id", "feide_id", "first_name", "last_name", "units"]
diff --git a/greg/api/urls.py b/greg/api/urls.py
index efb04f669b5fa86936651ac19413395a8efa7b21..725e195bde80d3798092b99cd7e73e2e83966c82 100644
--- a/greg/api/urls.py
+++ b/greg/api/urls.py
@@ -11,7 +11,11 @@ from greg.api.views.person import (
IdentityViewSet,
)
from greg.api.views.role_type import RoleTypeViewSet
-from greg.api.views.sponsor import SponsorViewSet, SponsorGuestsViewSet
+from greg.api.views.sponsor import (
+ SponsorViewSet,
+ SponsorGuestsViewSet,
+ SponsorOrgunitLinkView,
+)
router = DefaultRouter(trailing_slash=False)
router.register(r"persons", PersonViewSet, basename="person")
@@ -20,7 +24,6 @@ router.register(r"consenttypes", ConsentTypeViewSet, basename="consenttype")
router.register(r"sponsors", SponsorViewSet, basename="sponsor")
router.register(r"orgunit", OrganizationalUnitViewSet, basename="orgunit")
-
urlpatterns = router.urls
urlpatterns += [
@@ -53,4 +56,9 @@ urlpatterns += [
SponsorGuestsViewSet.as_view({"get": "list"}),
name="sponsor_guests-list",
),
+ re_path(
+ r"^sponsors/(?P<sponsor_id>[0-9]+)/orgunit/(?P<orgunit_id>[0-9]+)$",
+ SponsorOrgunitLinkView.as_view({"post": "create", "delete": "destroy"}),
+ name="sponsor_orgunit-detail",
+ ),
]
diff --git a/greg/api/views/sponsor.py b/greg/api/views/sponsor.py
index 5b4ac38b2832873d558cf78135db2125a994b3f4..818fc302b610693f994111a4c1b6f70a3ff93440 100644
--- a/greg/api/views/sponsor.py
+++ b/greg/api/views/sponsor.py
@@ -1,11 +1,19 @@
+import logging
+
+from django.db.models import ProtectedError
+from django.core.exceptions import ValidationError
from drf_spectacular.utils import extend_schema, OpenApiParameter
-from rest_framework import mixins
+from rest_framework import mixins, status
+from rest_framework.response import Response
from rest_framework.viewsets import GenericViewSet, ModelViewSet
from greg.api.pagination import PrimaryKeyCursorPagination
from greg.api.serializers import PersonSerializer
+from greg.api.serializers.organizational_unit import OrganizationalUnitSerializer
from greg.api.serializers.sponsor import SponsorSerializer
-from greg.models import Sponsor, Person
+from greg.models import Sponsor, Person, OrganizationalUnit
+
+logger = logging.getLogger(__name__)
class SponsorViewSet(ModelViewSet):
@@ -16,6 +24,18 @@ class SponsorViewSet(ModelViewSet):
pagination_class = PrimaryKeyCursorPagination
lookup_field = "id"
+ def destroy(self, request, *args, **kwargs):
+ """Overridden method to handle exception"""
+ instance = self.get_object()
+ try:
+ self.perform_destroy(instance)
+ return Response(status=status.HTTP_204_NO_CONTENT)
+ except ProtectedError as error:
+ # Probably the sponsor is being used somewhere as a foreign key and cannot be deleted.
+ # Log the error and return bad request instead an internal server error
+ logger.error(error)
+ return Response(status=status.HTTP_400_BAD_REQUEST)
+
@extend_schema(
parameters=[
@@ -41,3 +61,50 @@ class SponsorGuestsViewSet(mixins.ListModelMixin, GenericViewSet):
sponsor_id = self.kwargs["sponsor_id"]
qs = qs.filter(roles__sponsor_id=sponsor_id).order_by("id")
return qs
+
+
+class SponsorOrgunitLinkView(
+ mixins.CreateModelMixin,
+ mixins.RetrieveModelMixin,
+ mixins.DestroyModelMixin,
+ GenericViewSet,
+):
+ """Endpoint that allows manipulation of links between a sponsor and the units he is attached to"""
+
+ queryset = OrganizationalUnit.objects.all().order_by("id")
+ serializer_class = OrganizationalUnitSerializer
+ pagination_class = PrimaryKeyCursorPagination
+ # This is set so that the orgunit_id parameter in the path of the URL is used for looking up objects
+ lookup_url_kwarg = "orgunit_id"
+
+ def create(self, request, *args, **kwargs):
+ (sponsor_id, orgunit_id) = self._extract_sponsor_and_orgunit(kwargs)
+ # Default to false if hierarchical_access is not specified
+ hierarchical_access = request.data.get("hierarchical_access", "False")
+ sponsor = Sponsor.objects.get(id=sponsor_id)
+ sponsor.units.add(
+ orgunit_id, through_defaults={"hierarchical_access": hierarchical_access}
+ )
+
+ return Response(status=status.HTTP_204_NO_CONTENT)
+
+ def destroy(self, request, *args, **kwargs):
+ """Overridden because a delete at this endpoint should not attempt to delete the organizational unit,
+ but the link between the sponsor and the unit"""
+ (sponsor_id, orgunit_id) = self._extract_sponsor_and_orgunit(kwargs)
+ sponsor = Sponsor.objects.filter(id=sponsor_id).get()
+ sponsor.units.remove(orgunit_id)
+
+ return Response(status=status.HTTP_204_NO_CONTENT)
+
+ def _extract_sponsor_and_orgunit(self, request_data):
+ sponsor_id = request_data["sponsor_id"]
+ orgunit_id = request_data["orgunit_id"]
+
+ if sponsor_id is None:
+ raise ValidationError("Missing sponsor ID")
+
+ if orgunit_id is None:
+ raise ValidationError("Orgunit ID")
+
+ return (sponsor_id, orgunit_id)
diff --git a/greg/management/commands/import_from_orgreg.py b/greg/management/commands/import_from_orgreg.py
index 438accf08ddd1c6fd76031171e90d3f4b5967d4f..2411ed04921d25484d88af2c451043c80b262504 100644
--- a/greg/management/commands/import_from_orgreg.py
+++ b/greg/management/commands/import_from_orgreg.py
@@ -1,6 +1,9 @@
"""
Fetch all OUs from OrgReg and add the complete tree to Greg.
+Ignores OrganizationalUnits without identifiers with source and name matching global
+variables ORGREG_SOURCE and ORGREG_NAME
+
Assumes that the header used for authentication is of the type
'X-Gravitee-Api-Key': 'token'.
@@ -16,7 +19,7 @@ from django.conf import settings
from django.core.management.base import BaseCommand
from orgreg_client import OrgUnit
-from greg.models import OrganizationalUnit
+from greg.models import OrganizationalUnit, OuIdentifier
logger = logging.getLogger(__name__)
@@ -25,16 +28,98 @@ class Command(BaseCommand):
help = __doc__
processed: Dict[int, OrganizationalUnit] = {}
+ def _upsert_extra_identities(
+ self,
+ ou: OrgUnit,
+ ):
+ """Upsert any configured extra IDs from orgreg."""
+ for extra_id in settings.ORGREG_EXTRA_IDS:
+
+ matching_ids = [
+ x
+ for x in ou.external_keys
+ if x.source_system == extra_id["source"] and x.type == extra_id["type"]
+ ]
+
+ if not matching_ids:
+ logger.warning(
+ "No %s id from %s found in OrgReg for ou %s",
+ extra_id["type"],
+ extra_id["source"],
+ ou.ou_id,
+ )
+ continue
+
+ if len(matching_ids) > 1:
+ # External_ids
+ logger.warning(
+ "Found multiple ids matching type: %s source: %s in OrgReg. Using the first one: %s",
+ extra_id["type"],
+ extra_id["source"],
+ matching_ids[0].value,
+ )
+
+ identity_in_orgreg = matching_ids[0]
+
+ # Check if the id exists
+ identify_in_db = (
+ self.processed[ou.ou_id]
+ .identifiers.filter(
+ source=extra_id["source"],
+ name=extra_id["type"],
+ )
+ .first()
+ )
+
+ if identify_in_db:
+ if identify_in_db.value != identity_in_orgreg.value:
+ logger.info(
+ "Updating id: source: %s, type: %s, old_id: %s, new_id %s",
+ extra_id["source"],
+ extra_id["type"],
+ identify_in_db.value,
+ identity_in_orgreg.value,
+ )
+ identify_in_db.value = identity_in_orgreg.value
+ identify_in_db.save()
+ else:
+ OuIdentifier.objects.create(
+ name=extra_id["type"],
+ source=extra_id["source"],
+ value=identity_in_orgreg["value"],
+ orgunit=self.processed[ou.ou_id],
+ )
+ logger.info(
+ "Added new id to ou: %s, type: %s, source: %s value: %s",
+ ou.ou_id,
+ extra_id["type"],
+ extra_id["source"],
+ identity_in_orgreg["value"],
+ )
+
def _get_or_create_and_set_values(
- self, ou, values: Mapping[str, Union[str, int, bool]]
+ self, ou: OrgUnit, values: Mapping[str, Union[str, int, bool]]
):
"""Upsert ou with latest values and store in processed dict."""
-
- self.processed[ou.ou_id], created = OrganizationalUnit.objects.get_or_create(
- orgreg_id=str(ou.ou_id)
- )
+ try:
+ identifier = OuIdentifier.objects.get(
+ name=settings.ORGREG_NAME, source=settings.ORGREG_SOURCE, value=ou.ou_id
+ )
+ except OuIdentifier.DoesNotExist:
+ self.processed[ou.ou_id] = OrganizationalUnit.objects.create()
+ identifier = OuIdentifier.objects.create(
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value=ou.ou_id,
+ orgunit=self.processed[ou.ou_id],
+ )
+ created = True
+ else:
+ self.processed[ou.ou_id] = identifier.orgunit
+ created = False
for k, v in values.items():
setattr(self.processed[ou.ou_id], k, v)
+ self._upsert_extra_identities(ou)
self.processed[ou.ou_id].save()
logger.info(
"%s %s with %s",
@@ -100,13 +185,17 @@ class Command(BaseCommand):
client = orgreg_client.get_client(**settings.ORGREG_CLIENT)
# Fetch already present OUs and those in OrgReg
- current_ous = {int(i.orgreg_id): i for i in OrganizationalUnit.objects.all()}
+ current_ous = {
+ int(i.value): i.orgunit
+ for i in OuIdentifier.objects.filter(
+ source=settings.ORGREG_SOURCE, name=settings.ORGREG_NAME
+ )
+ }
logger.info("Fetch OUs from Orgreg...")
orgreg_ous = {i.ou_id: i for i in client.get_ou()}
- # Set deleted if an OU from Greg no longer exists in OrgReg and inactive if
- # valid_to is set to a date before today
+ # Set deleted if an OU from Greg no longer exists in OrgReg
logger.info("Set deleted tag on removed OUs...")
for ou_id, ou in current_ous.items():
if ou_id not in orgreg_ous:
diff --git a/greg/management/commands/start_notification_publisher.py b/greg/management/commands/notification_publisher.py
similarity index 51%
rename from greg/management/commands/start_notification_publisher.py
rename to greg/management/commands/notification_publisher.py
index 2f8f10660b887f3bec5ed16728d4bfa557e3c93d..f775b339bb5fb71bd759e90f091c3ef618802c8d 100644
--- a/greg/management/commands/start_notification_publisher.py
+++ b/greg/management/commands/notification_publisher.py
@@ -1,12 +1,8 @@
import json
import logging
-import signal
-import sys
+import logging.config
from typing import Union
-import daemon
-import lockfile
-from daemon import pidfile
from django.conf import settings
from django.core.management.base import BaseCommand
from pika_context_manager import PCM
@@ -15,14 +11,7 @@ from greg.models import Notification
from greg.utils import camel_to_snake
logging.config.dictConfig(settings.LOGGING)
-logger = logging.getLogger()
-
-
-def exception_handler(ex_cls, ex, tb):
- logger.critical("Uncaught exception:", exc_info=(ex_cls, ex, tb))
-
-
-sys.excepthook = exception_handler
+logger = logging.getLogger(__name__)
def get_notifications(limit):
@@ -37,7 +26,7 @@ def generate_event_type(n: Notification) -> str:
routing key is removed results in minor changes to the code.
"""
object_type = camel_to_snake(n.object_type)
- return f"{settings.INTERNAL_RK_PREFIX}.{object_type}.{n.operation}"
+ return f"{object_type}.{n.operation}"
def create_cloud_event_payload(n: Notification) -> str:
@@ -60,17 +49,14 @@ def create_cloud_event_payload(n: Notification) -> str:
and source, i.e no.local.greg.person.add
"""
- object_type = camel_to_snake(n.object_type)
content: dict[str, Union[str, dict[str, str]]] = {
"id": str(n.id),
- "source": f"urn:greg:{settings.INSTANCE_NAME}:{object_type}:{n.identifier}",
+ "source": f"greg:{settings.INSTANCE_NAME}:{settings.ENVIRONMENT}",
"specversion": "1.0",
"type": generate_event_type(n),
}
- if n.object_type in ("Role", "Consent", "Identity"):
- content["data"] = {
- "person_id": n.meta.get("person_id"),
- }
+ if n.meta:
+ content["data"] = n.meta
return json.dumps(content)
@@ -107,59 +93,18 @@ def handle_one_notification(notification: Notification, pcm: PCM, exchange: str)
)
-class RunState:
- def __init__(self):
- self.run = True
-
- def stop(self, *args):
- self.run = False
-
-
class Command(BaseCommand):
help = "Publish notifications via AMQP"
- def add_arguments(self, parser):
- parser.add_argument(
- "--detach", action="store_true", help="Run detached as a dæmon"
- )
- parser.add_argument(
- "--use-pidfile", action="store_true", help="Use a PID lockfile"
- )
-
def handle(self, *args, **options):
- state = RunState()
- lock_context = None
- if options.get("use_pidfile"):
- lock_context = pidfile.TimeoutPIDLockFile(
- settings.NOTIFICATION_PUBLISHER["daemon"]["pid_file"]
- )
-
- try:
- with daemon.DaemonContext(
- pidfile=lock_context,
- files_preserve=[x.stream.fileno() for x in logger.handlers],
- stderr=sys.stderr,
- stdout=sys.stdout,
- signal_map={signal.SIGINT: state.stop, signal.SIGTERM: state.stop},
- detach_process=options.get("detach"),
- ):
- logger.info(
- "Running %s", "detached" if options.get("detach") else "attached"
- )
- with PCM(**settings.NOTIFICATION_PUBLISHER["mq"]["connection"]) as pcm:
- exchange = settings.NOTIFICATION_PUBLISHER["mq"]["exchange"]
- while state.run:
- for notification in get_notifications(limit=500):
- handle_one_notification(
- notification=notification, pcm=pcm, exchange=exchange
- )
-
- pcm.sleep(
- settings.NOTIFICATION_PUBLISHER["daemon"]["poll_interval"]
- )
- except lockfile.AlreadyLocked as e:
- logger.warning("Can't start daemon: %s", e)
- # TODO: Figure out how to emit a code other than 0 here
- # TODO: Also, echo the error to stderr
- finally:
- logger.info("Stopped")
+ logger.info("Notification publisher started")
+ connection_config = settings.NOTIFICATION_PUBLISHER["mq"]["connection"]
+ exchange = settings.NOTIFICATION_PUBLISHER["mq"]["exchange"]
+ poll_interval = settings.NOTIFICATION_PUBLISHER["poll_interval"]
+ with PCM(**connection_config) as pcm:
+ while True:
+ for notification in get_notifications(limit=500):
+ handle_one_notification(
+ notification=notification, pcm=pcm, exchange=exchange
+ )
+ pcm.sleep(poll_interval)
diff --git a/greg/management/commands/start_schedule_tasks.py b/greg/management/commands/start_schedule_tasks.py
deleted file mode 100644
index d86b854bff453763261115e5f9495d6059c204a2..0000000000000000000000000000000000000000
--- a/greg/management/commands/start_schedule_tasks.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import logging.config
-import signal
-import sys
-from threading import Event
-
-import daemon
-import lockfile
-from daemon import pidfile
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-from greg.schedule import ExpiringRolesNotification
-
-logging.config.dictConfig(settings.LOGGING)
-logger = logging.getLogger()
-
-
-def exception_handler(ex_cls, ex, tb):
- logger.critical("Uncaught exception:", exc_info=(ex_cls, ex, tb))
-
-
-sys.excepthook = exception_handler
-
-
-class Command(BaseCommand):
- """
- This command starts a basic task runner. All tasks it is supposed to
- run are given explicitly in code
- """
-
- help = "Start schedule task runner"
-
- def add_arguments(self, parser):
- parser.add_argument(
- "--detach", action="store_true", help="Run detached as a dæmon"
- )
- parser.add_argument(
- "--use-pidfile", action="store_true", help="Use a PID lockfile"
- )
-
- def handle(self, *args, **options):
- lock_context = None
- if options.get("use_pidfile"):
- lock_context = pidfile.TimeoutPIDLockFile(
- settings.SCHEDULE_TASKS["daemon"]["pid_file"]
- )
-
- try:
- exit_event = Event()
-
- def exit_wrapper(*args):
- exit_event.set()
-
- with daemon.DaemonContext(
- pidfile=lock_context,
- files_preserve=[x.stream.fileno() for x in logger.handlers],
- stderr=sys.stderr,
- stdout=sys.stdout,
- signal_map={signal.SIGINT: exit_wrapper, signal.SIGTERM: exit_wrapper},
- detach_process=options.get("detach"),
- ):
- logger.info(
- "Running %s", "detached" if options.get("detach") else "attached"
- )
-
- # For now there is just one task, but the idea is that more can
- # be added
- expiring_role_notification_task = ExpiringRolesNotification()
-
- while not exit_event.is_set():
- expiring_role_notification_task.run()
- # The single task is set up for far only needs to run once
- # a day, but running every 6 hours just in case a run fails,
- # it is up the task it self to figure out if needs to do
- # something every time it is called
- exit_event.wait(60 * 60 * 6)
-
- except lockfile.AlreadyLocked as e:
- logger.warning("Can't start daemon: %s", e)
- sys.exit(1)
- finally:
- logger.info("Stopped")
diff --git a/greg/management/commands/stop_notification_publisher.py b/greg/management/commands/stop_notification_publisher.py
deleted file mode 100644
index 037702857bb59177362cc548e77c18a84bdf68c1..0000000000000000000000000000000000000000
--- a/greg/management/commands/stop_notification_publisher.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import signal
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
- help = "Stop notification publisher"
-
- def handle(self, *args, **options):
- try:
- with open(
- settings.NOTIFICATION_PUBLISHER["daemon"]["pid_file"],
- "r",
- encoding="utf-8",
- ) as f:
- pid = int(f.read().strip())
-
- os.kill(pid, signal.SIGINT)
- except FileNotFoundError:
- pass
diff --git a/greg/management/commands/stop_schedule_tasks.py b/greg/management/commands/stop_schedule_tasks.py
deleted file mode 100644
index b04f12e0bb2329d86e4203614a2d9c80fbecf0f7..0000000000000000000000000000000000000000
--- a/greg/management/commands/stop_schedule_tasks.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import signal
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
- help = "Stop schedule tasks"
-
- def handle(self, *args, **options):
- try:
- with open(
- settings.SCHEDULE_TASKS["daemon"]["pid_file"],
- "r",
- encoding="utf-8",
- ) as f:
- pid = int(f.read().strip())
-
- os.kill(pid, signal.SIGINT)
- except FileNotFoundError:
- pass
diff --git a/greg/migrations/0010_roletype_max_days.py b/greg/migrations/0010_roletype_max_days.py
new file mode 100644
index 0000000000000000000000000000000000000000..6da9f31486e553c78b0551763a0531f63c6acee4
--- /dev/null
+++ b/greg/migrations/0010_roletype_max_days.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2021-10-19 07:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('greg', '0009_email_mobile_to_identity'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='roletype',
+ name='max_days',
+ field=models.IntegerField(default=365),
+ ),
+ ]
diff --git a/greg/migrations/0011_role_remove_id_suffix.py b/greg/migrations/0011_role_remove_id_suffix.py
new file mode 100644
index 0000000000000000000000000000000000000000..8af30b8ccef16ec30d0fc3330f96042140e57663
--- /dev/null
+++ b/greg/migrations/0011_role_remove_id_suffix.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.8 on 2021-10-26 14:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('greg', '0010_roletype_max_days'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='role',
+ old_name='orgunit_id',
+ new_name='orgunit',
+ ),
+ migrations.RenameField(
+ model_name='role',
+ old_name='sponsor_id',
+ new_name='sponsor',
+ ),
+ ]
diff --git a/greg/migrations/0012_ou_identifiers.py b/greg/migrations/0012_ou_identifiers.py
new file mode 100644
index 0000000000000000000000000000000000000000..708422fca04e9e81529608d62d7dd352bc15f503
--- /dev/null
+++ b/greg/migrations/0012_ou_identifiers.py
@@ -0,0 +1,74 @@
+# Generated by Django 3.2.8 on 2021-10-28 11:44
+
+import dirtyfields.dirtyfields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def move_orgreg_id_to_identifiers(apps, schema_editor):
+ OuIdentifier = apps.get_model("greg", "OuIdentifier")
+ OrganizationalUnit = apps.get_model("greg", "OrganizationalUnit")
+ for ou in OrganizationalUnit.objects.all():
+ value = getattr(ou, "orgreg_id", None)
+ if value:
+ OuIdentifier.objects.create(
+ orgunit=ou,
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value=value,
+ )
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("greg", "0011_role_remove_id_suffix"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="OuIdentifier",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("created", models.DateTimeField(auto_now_add=True)),
+ ("updated", models.DateTimeField(auto_now=True)),
+ ("name", models.CharField(max_length=256)),
+ ("source", models.CharField(max_length=256)),
+ ("value", models.CharField(max_length=256)),
+ ],
+ bases=(dirtyfields.dirtyfields.DirtyFieldsMixin, models.Model),
+ ),
+ migrations.AddField(
+ model_name="ouidentifier",
+ name="orgunit",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="identifiers",
+ to="greg.organizationalunit",
+ ),
+ ),
+ migrations.RunPython(move_orgreg_id_to_identifiers),
+ migrations.RemoveConstraint(
+ model_name="organizationalunit",
+ name="unique_orgreg_id",
+ ),
+ migrations.RemoveField(
+ model_name="organizationalunit",
+ name="orgreg_id",
+ ),
+ migrations.AddConstraint(
+ model_name="ouidentifier",
+ constraint=models.UniqueConstraint(
+ fields=("name", "value"), name="unique_identifier"
+ ),
+ ),
+ ]
diff --git a/greg/migrations/0013_delete_scheduletask.py b/greg/migrations/0013_delete_scheduletask.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c3b85d65f604c9595bd1f6cf63641cfd282784e
--- /dev/null
+++ b/greg/migrations/0013_delete_scheduletask.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.2.8 on 2021-11-04 10:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("greg", "0012_ou_identifiers"),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name="ScheduleTask",
+ ),
+ ]
diff --git a/greg/models.py b/greg/models.py
index 98d101feb7dbc96054ab77c4277c196ad237df8c..168c69d37616bc611e64926fcbf63c741f20eb73 100644
--- a/greg/models.py
+++ b/greg/models.py
@@ -83,6 +83,14 @@ class Person(BaseModel):
type=Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER
).first()
+ @property
+ def passport(self) -> Optional["Identity"]:
+ """The person's passport if they have one registered.
+ This property was introduced to make updating of passport easier when the guest registers himself."""
+ return self.identities.filter(
+ type=Identity.IdentityType.PASSPORT_NUMBER
+ ).first()
+
@property
def is_registered(self) -> bool:
"""
@@ -180,6 +188,8 @@ class RoleType(BaseModel):
description_nb = models.TextField()
description_en = models.TextField()
default_duration_days = models.IntegerField(null=True)
+ # Max days into the future this role can be assigned
+ max_days = models.IntegerField(default=365)
def __str__(self):
return "{} ({})".format(str(self.name_en or self.name_nb), self.identifier)
@@ -201,7 +211,7 @@ class Role(BaseModel):
type = models.ForeignKey(
"RoleType", on_delete=models.PROTECT, related_name="persons"
)
- orgunit_id = models.ForeignKey(
+ orgunit = models.ForeignKey(
"OrganizationalUnit", on_delete=models.PROTECT, related_name="unit_person_role"
)
# The start date can be null for people that are already
@@ -211,7 +221,7 @@ class Role(BaseModel):
contact_person_unit = models.TextField(blank=True)
comments = models.TextField(blank=True)
available_in_search = models.BooleanField(default=False)
- sponsor_id = models.ForeignKey(
+ sponsor = models.ForeignKey(
"Sponsor", on_delete=models.PROTECT, related_name="sponsor_role"
)
@@ -362,12 +372,32 @@ class Consent(BaseModel):
)
+class OuIdentifier(BaseModel):
+ """Generic identifier"""
+
+ name = models.CharField(max_length=256)
+ source = models.CharField(max_length=256)
+ value = models.CharField(max_length=256)
+ orgunit = models.ForeignKey(
+ "OrganizationalUnit", on_delete=models.CASCADE, related_name="identifiers"
+ )
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(name="unique_identifier", fields=["name", "value"])
+ ]
+
+ def __repr__(self):
+ return "{}(id={!r}, name={!r}, value={!r})".format(
+ self.__class__.__name__, self.pk, self.name, self.value
+ )
+
+
class OrganizationalUnit(BaseModel):
"""
An organizational unit. Units can be organized in a hierarchical manner.
"""
- orgreg_id = models.CharField(max_length=256)
name_nb = models.CharField(max_length=256)
name_en = models.CharField(max_length=256)
parent = models.ForeignKey("self", on_delete=models.PROTECT, null=True, blank=True)
@@ -375,17 +405,12 @@ class OrganizationalUnit(BaseModel):
deleted = models.BooleanField(default=False)
def __repr__(self):
- return "{}(id={!r}, orgreg_id={!r}, name_en={!r}, parent={!r})".format(
- self.__class__.__name__, self.pk, self.orgreg_id, self.name_en, self.parent
+ return "{}(id={!r}, name_en={!r}, parent={!r})".format(
+ self.__class__.__name__, self.pk, self.name_en, self.parent
)
def __str__(self):
- return "{} ({})".format(str(self.name_en or self.name_nb), self.orgreg_id)
-
- class Meta:
- constraints = [
- models.UniqueConstraint(name="unique_orgreg_id", fields=["orgreg_id"])
- ]
+ return "{}".format(str(self.name_en or self.name_nb))
class Sponsor(BaseModel):
@@ -452,20 +477,6 @@ class SponsorOrganizationalUnit(BaseModel):
)
-class ScheduleTask(models.Model):
- """
- Stores information about a task
- """
-
- name = models.CharField(max_length=32)
- last_completed = models.DateTimeField(null=True)
-
- def __repr__(self):
- return "{}(id={!r}, name={!r}, last_completed={!r})".format(
- self.__class__.__name__, self.pk, self.name, self.last_completed
- )
-
-
class InvitationLink(BaseModel):
"""
Link to an invitation.
diff --git a/greg/schedule.py b/greg/schedule.py
deleted file mode 100644
index ee08c9a79ce2285b1d7189ce9cbfcf7d000713c9..0000000000000000000000000000000000000000
--- a/greg/schedule.py
+++ /dev/null
@@ -1,89 +0,0 @@
-import time
-from datetime import date, datetime, timedelta
-from typing import Optional
-
-from abc import ABC, abstractmethod
-from django.utils import timezone
-
-from greg.models import Role, Notification, ScheduleTask
-
-
-class BaseSchedule(ABC):
- """
- Provides common methods for tasks
- """
-
- task_object: ScheduleTask
-
- def __init__(self, name: str):
- self.task_object = ScheduleTask.objects.get(name=name)
-
- def run(self):
- self._run_internal()
- self.task_object.last_completed = timezone.now()
- self.task_object.save()
-
- @abstractmethod
- def _run_internal(self):
- pass
-
- def get_last_run(self) -> Optional[datetime]:
- self.task_object.refresh_from_db()
- return self.task_object.last_completed
-
- def _store_notification(
- self, identifier, object_type, operation, **kwargs
- ) -> Notification:
- return Notification.objects.create(
- identifier=identifier,
- object_type=object_type,
- operation=operation,
- issued_at=int(time.time()),
- meta=kwargs,
- )
-
-
-class ExpiringRolesNotification(BaseSchedule):
- """
- This task does a simple check for roles that will expire in 30 days
- and creates entries in the notification table for them.
-
- There should be an entry in the ScheduleTask-table with name role_expiration
- before this task is run.
-
- Some assumptions that are made:
-
- - The task will be run every day, it does
- not keep track of which roles it has or has not notified, it only
- looks at which roles will expire in exactly 30 days
-
- - If there are roles created that expire in less than 30 days, no
- notification is necessary
- """
-
- EXPIRATION_THRESHOLD_DAYS = 30
-
- def __init__(self):
- # Will raise exception if there is not exactly one result
- super().__init__("role_expiration")
-
- def _run_internal(self):
- last_run = self.get_last_run()
- # Only run once per day
- if last_run is None or last_run.date() != date.today():
- check_date = datetime.today() + timedelta(
- days=self.EXPIRATION_THRESHOLD_DAYS
- )
- self.__get_roles_about_to_expire(check_date)
-
- def __get_roles_about_to_expire(self, end_date: date):
- roles_about_to_expire = Role.objects.filter(end_date=end_date)
-
- for role in roles_about_to_expire:
- meta = {"person_id": role.person.id, "type_id": role.type.id}
- self._store_notification(
- identifier=role.id,
- object_type="PersonRole",
- operation="expire_reminder",
- **meta
- )
diff --git a/greg/signals.py b/greg/signals.py
index 5103e9b76c1a8530aeed3484bbbae543daf3a49f..c9033866acb6d8bbc821fe10d535239574934c33 100644
--- a/greg/signals.py
+++ b/greg/signals.py
@@ -1,10 +1,11 @@
+import datetime
import time
-from typing import Dict
+from typing import Dict, Union
+from django_structlog.signals import bind_extra_request_metadata
from django.db import models
from django.dispatch import receiver
-from django_structlog.signals import bind_extra_request_metadata
-
+from django_q.models import Schedule
from greg.models import (
Person,
Role,
@@ -14,6 +15,7 @@ from greg.models import (
Consent,
ConsentType,
)
+from greg.utils import date_to_datetime_midnight
@receiver(bind_extra_request_metadata)
@@ -79,6 +81,37 @@ def _store_notification(identifier, object_type, operation, **kwargs):
)
+def _queue_role_notification(role_id: int, created: str, attrname: str):
+ """Create a notification if the date in attrname of role is today"""
+ try:
+ instance = Role.objects.get(id=role_id)
+ except Role.DoesNotExist:
+ # Role was deleted, ignore it
+ return
+ if getattr(instance, attrname) != datetime.date.today():
+ # Date was changed after this task was queued, ignore it, the new one will take
+ # care of it
+ return
+ meta = _create_metadata(instance)
+ operation = "add" if created else "update"
+ _store_notification(
+ identifier=instance.id,
+ object_type=instance._meta.object_name,
+ operation=operation,
+ **meta,
+ )
+
+
+def _queue_role_start_notification(role_id: int, created: str):
+ """Create a notification for the role if start_date is today"""
+ _queue_role_notification(role_id, created, "start_date")
+
+
+def _queue_role_end_notification(role_id: int, created: str):
+ """Create a notification for the role if end_date is today"""
+ _queue_role_notification(role_id, created, "end_date")
+
+
@receiver(models.signals.pre_save, dispatch_uid="add_changed_fields_callback")
def add_changed_fields_callback(sender, instance, raw, *args, **kwargs):
"""
@@ -99,13 +132,32 @@ def add_changed_fields_callback(sender, instance, raw, *args, **kwargs):
def save_notification_callback(sender, instance, created, *args, **kwargs):
if not isinstance(instance, SUPPORTED_MODELS):
return
+ # Queue future notifications on start and end date for roles
+ if isinstance(instance, Role):
+ if (
+ "start_date" in instance._changed_fields # pylint: disable=protected-access
+ and instance.start_date
+ ):
+ Schedule.objects.create(
+ func="greg.signals._queue_role_start_notification",
+ args=f"{instance.id},True",
+ next_run=date_to_datetime_midnight(instance.start_date),
+ schedule_type=Schedule.ONCE,
+ )
+ if "end_date" in instance._changed_fields: # pylint: disable=protected-access
+ Schedule.objects.create(
+ func="greg.signals._queue_role_end_notification",
+ args=f"{instance.id},True",
+ next_run=date_to_datetime_midnight(instance.end_date),
+ schedule_type=Schedule.ONCE,
+ )
meta = _create_metadata(instance)
operation = "add" if created else "update"
_store_notification(
identifier=instance.id,
object_type=instance._meta.object_name,
operation=operation,
- **meta
+ **meta,
)
@@ -118,7 +170,7 @@ def delete_notification_callback(sender, instance, *args, **kwargs):
identifier=instance.id,
object_type=instance._meta.object_name,
operation="delete",
- **meta
+ **meta,
)
@@ -151,7 +203,7 @@ def m2m_changed_notification_callback(
identifier=pc.id,
object_type=Consent._meta.object_name,
operation=operation,
- **meta
+ **meta,
)
elif sender is Role:
roles = []
@@ -166,21 +218,28 @@ def m2m_changed_notification_callback(
identifier=pr.id,
object_type=Role._meta.object_name,
operation=operation,
- **meta
+ **meta,
)
-def _create_metadata(instance) -> Dict:
- meta = {}
-
- if isinstance(instance, Role):
+def _create_metadata(instance) -> Dict[str, Union[int, str]]:
+ meta: Dict[str, Union[int, str]] = {}
+ if isinstance(instance, Person):
+ meta["person_id"] = instance.id
+ elif isinstance(instance, Role):
meta["person_id"] = instance.person.id
- meta["type_id"] = instance.type.id
- if isinstance(instance, Identity):
+ meta["role_id"] = instance.id
+ meta["role_type"] = instance.type.identifier
+ meta["role_type_id"] = instance.type.id
+ elif isinstance(instance, RoleType):
+ meta["role_type_id"] = instance.id
+ elif isinstance(instance, Identity):
meta["person_id"] = instance.person.id
meta["identity_id"] = instance.id
- if isinstance(instance, Consent):
+ meta["identity_type"] = instance.type
+ elif isinstance(instance, Consent):
meta["person_id"] = instance.person.id
- meta["consent_id"] = instance.type.id
-
+ meta["consent_id"] = instance.id
+ meta["consent_type"] = instance.type.identifier
+ meta["consent_type_id"] = instance.type.id
return meta
diff --git a/greg/tests/api/test_person.py b/greg/tests/api/test_person.py
index 9a09193c4f98c5ac9135afd24bf4bf641273ae10..c616489ab67c6d3d23c487f1e3f41b9e6f464dbc 100644
--- a/greg/tests/api/test_person.py
+++ b/greg/tests/api/test_person.py
@@ -38,7 +38,7 @@ def role_type_visiting_professor() -> RoleType:
@pytest.fixture
def unit_human_resources() -> OrganizationalUnit:
return OrganizationalUnit.objects.create(
- orgreg_id="org_unit_1", name_nb="Personal", name_en="Human Resources"
+ name_nb="Personal", name_en="Human Resources"
)
@@ -55,8 +55,8 @@ def role_data_guest(
"type": "Test Guest",
"start_date": "2021-06-10",
"end_date": "2021-08-10",
- "sponsor_id": sponsor_bar.id,
- "orgunit_id": unit_foo.id,
+ "sponsor": sponsor_bar.id,
+ "orgunit": unit_foo.id,
}
@@ -131,8 +131,8 @@ def test_add_role(
"type": "visiting_professor",
"start_date": "2021-06-10",
"end_date": "2021-08-10",
- "sponsor_id": "1",
- "orgunit_id": "1",
+ "sponsor": "1",
+ "orgunit": "1",
}
response = client.post(url, role_data)
@@ -425,8 +425,8 @@ def test_add_duplicate_role_fails(client, person_foo: Person, role_person_foo):
"type": role_person_foo.type.identifier,
"start_date": role_person_foo.start_date,
"end_date": role_person_foo.end_date,
- "sponsor_id": role_person_foo.sponsor_id.id,
- "orgunit_id": role_person_foo.unit_id,
+ "sponsor": role_person_foo.sponsor.id,
+ "orgunit": role_person_foo.unit_id,
}
response = client.post(url, role_data)
# If the role cannot be create the return code is 400
@@ -453,8 +453,8 @@ def test_filter_active_includes_person_with_active_role(
person=person_foo,
type=role_type_test_guest,
end_date=date_today + datetime.timedelta(days=1),
- sponsor_id=sponsor_guy,
- orgunit_id=unit_foo,
+ sponsor=sponsor_guy,
+ orgunit=unit_foo,
)
url = reverse("v1:person-list")
@@ -491,8 +491,8 @@ def test_filter_active_value_false(
person=person_foo,
type=role_type_test_guest,
end_date=date_today - datetime.timedelta(days=1),
- sponsor_id=sponsor_guy,
- orgunit_id=unit_foo,
+ sponsor=sponsor_guy,
+ orgunit=unit_foo,
)
url = reverse("v1:person-list")
diff --git a/greg/tests/api/test_sponsor.py b/greg/tests/api/test_sponsor.py
index 65fed98daccf1cdf0f7cba63bfdd0b2d44dafb98..1b6aac1a838b685a36c898b1ae0f9f19e4627d20 100644
--- a/greg/tests/api/test_sponsor.py
+++ b/greg/tests/api/test_sponsor.py
@@ -3,6 +3,14 @@ from rest_framework import status
from rest_framework.reverse import reverse
+from greg.models import (
+ OrganizationalUnit,
+ Sponsor,
+ Person,
+ Identity,
+ SponsorOrganizationalUnit,
+)
+
@pytest.mark.django_db
def test_add_sponsor(client):
@@ -42,3 +50,140 @@ def test_sponsor_empty_guest_list(client, sponsor_guy):
guests_for_sponsor = client.get(url).json()["results"]
assert len(guests_for_sponsor) == 0
+
+
+@pytest.mark.django_db
+def test_add_sponsor_with_unit(client, unit_foo: OrganizationalUnit):
+ sponsor_url = reverse("v1:sponsor-list")
+ data = {
+ "feide_id": "sponsor@example.org",
+ "first_name": "Test",
+ "last_name": "Sponsor",
+ }
+
+ response = client.post(sponsor_url, data=data)
+ sponsor_id = response.json()["id"]
+
+ assert response.status_code == status.HTTP_201_CREATED
+
+ sponsor_lookup_response = client.get(sponsor_url, kwargs={"id": sponsor_id})
+ sponsor_lookup_response_body = sponsor_lookup_response.json()
+
+ assert len(sponsor_lookup_response_body["results"]) == 1
+ assert len(sponsor_lookup_response_body["results"][0]["units"]) == 0
+
+ data = {"hierarchical_access": "True"}
+
+ create_sponsor_link_url = reverse(
+ "v1:sponsor_orgunit-detail",
+ kwargs={"sponsor_id": sponsor_id, "orgunit_id": unit_foo.id},
+ )
+ response = client.post(create_sponsor_link_url, data=data)
+ assert response.status_code == status.HTTP_204_NO_CONTENT
+
+ sponsor_lookup_response = client.get(sponsor_url, kwargs={"id": sponsor_id})
+ sponsor_lookup_response_body = sponsor_lookup_response.json()
+ assert len(sponsor_lookup_response_body["results"][0]["units"]) == 1
+
+ attached_unit = sponsor_lookup_response_body["results"][0]["units"][0]
+ assert attached_unit["id"] == unit_foo.id
+
+
+@pytest.mark.django_db
+def test_remove_sponsor_orgunit_link(
+ client, sponsor_guy: Sponsor, unit_foo: OrganizationalUnit
+):
+ sponsor_detail_url = reverse("v1:sponsor-detail", kwargs={"id": sponsor_guy.id})
+ response_get = client.get(sponsor_detail_url).json()
+ assert len(response_get["units"]) == 0
+
+ data = {"hierarchical_access": "True"}
+
+ sponsor_orgunit_url = reverse(
+ "v1:sponsor_orgunit-detail",
+ kwargs={"sponsor_id": sponsor_guy.id, "orgunit_id": unit_foo.id},
+ )
+ response = client.post(sponsor_orgunit_url, data=data)
+ assert response.status_code == status.HTTP_204_NO_CONTENT
+
+ response_get = client.get(sponsor_detail_url).json()
+
+ assert len(response_get["units"]) == 1
+ assert response_get["units"][0]["id"] == unit_foo.id
+
+ response_delete = client.delete(sponsor_orgunit_url)
+ assert response_delete.status_code == status.HTTP_204_NO_CONTENT
+
+ response_get = client.get(sponsor_detail_url).json()
+ assert len(response_get["units"]) == 0
+
+
+@pytest.mark.django_db
+def test_delete_sponsor_connected_to_identity_not_allowed(
+ client,
+ sponsor_guy: Sponsor,
+ person_foo: Person,
+ person_foo_verified: Identity,
+ unit_foo: OrganizationalUnit,
+):
+ sponsor_detail_url = reverse("v1:sponsor-detail", kwargs={"id": sponsor_guy.id})
+ response_get = client.get(sponsor_detail_url).json()
+ assert len(response_get["units"]) == 0
+
+ response_delete = client.delete(sponsor_detail_url)
+
+ # The delete should fail
+ assert response_delete.status_code == status.HTTP_400_BAD_REQUEST
+ response_get = client.get(sponsor_detail_url).json()
+ assert response_get["id"] == sponsor_guy.id
+
+ # Remove the identity and try to delete the sponsor again
+ url_delete = reverse(
+ "v1:person_identity-detail",
+ kwargs={"person_id": person_foo.id, "id": person_foo_verified.id},
+ )
+ client.delete(url_delete)
+
+ response_delete = client.delete(sponsor_detail_url)
+ assert response_delete.status_code == status.HTTP_204_NO_CONTENT
+
+ # Check that the sponsor has been deleted
+ response_get = client.get(sponsor_detail_url)
+ assert response_get.status_code == status.HTTP_404_NOT_FOUND
+
+
+@pytest.mark.django_db
+def test_add_sponsor_unit_link_with_no_access_parameter(
+ client, unit_foo: OrganizationalUnit
+):
+ sponsor_url = reverse("v1:sponsor-list")
+ data = {
+ "feide_id": "sponsor@example.org",
+ "first_name": "Test",
+ "last_name": "Sponsor",
+ }
+
+ response = client.post(sponsor_url, data=data)
+ sponsor_id = response.json()["id"]
+
+ # Do a post with no data
+ create_sponsor_link_url = reverse(
+ "v1:sponsor_orgunit-detail",
+ kwargs={"sponsor_id": sponsor_id, "orgunit_id": unit_foo.id},
+ )
+ response = client.post(create_sponsor_link_url)
+ assert response.status_code == status.HTTP_204_NO_CONTENT
+
+ # Check that the unit is attached to the sponsor
+ sponsor_lookup_response = client.get(sponsor_url, kwargs={"id": sponsor_id})
+ sponsor_lookup_response_body = sponsor_lookup_response.json()
+ assert len(sponsor_lookup_response_body["results"][0]["units"]) == 1
+
+ attached_unit = sponsor_lookup_response_body["results"][0]["units"][0]
+ assert attached_unit["id"] == unit_foo.id
+
+ # Check that hierarchical_access is set to False for the link between the sponsor and unit
+ sponsor_organization_unit = SponsorOrganizationalUnit.objects.filter(
+ sponsor_id=sponsor_id, organizational_unit_id=unit_foo.id
+ ).get()
+ assert not sponsor_organization_unit.hierarchical_access
diff --git a/greg/tests/conftest.py b/greg/tests/conftest.py
index 1998517c8c42c728e25053a4c150606aef750146..04dfe76cb87facce8fa4db2e09cd8b09c772c34d 100644
--- a/greg/tests/conftest.py
+++ b/greg/tests/conftest.py
@@ -10,6 +10,7 @@ import pytest
from greg.models import (
Consent,
Notification,
+ OuIdentifier,
Person,
Sponsor,
SponsorOrganizationalUnit,
@@ -136,10 +137,18 @@ def role_type_test_guest() -> RoleType:
@pytest.fixture
def unit_foo() -> OrganizationalUnit:
- ou = OrganizationalUnit.objects.create(orgreg_id="12345", name_en="foo_unit")
+ ou = OrganizationalUnit.objects.create(name_en="foo_unit")
return OrganizationalUnit.objects.get(id=ou.id)
+@pytest.fixture
+def ouidentifier_foo(unit_foo) -> OuIdentifier:
+ ouid = OuIdentifier.objcets.create(
+ source="orgreg", name="orgreg", value="12345", orgunit=unit_foo
+ )
+ return OuIdentifier.objects.get(id=ouid.id)
+
+
@pytest.fixture
def role_person_foo(
person_foo: Person,
@@ -152,8 +161,8 @@ def role_person_foo(
type=role_type_test_guest,
start_date="2021-08-02",
end_date="2021-08-06",
- sponsor_id=sponsor_guy,
- orgunit_id=unit_foo,
+ sponsor=sponsor_guy,
+ orgunit=unit_foo,
)
return Role.objects.get(id=role.id)
diff --git a/greg/tests/management/test_import_from_orgreg.py b/greg/tests/management/test_import_from_orgreg.py
index 72d867bffc5b32dec03fb4aaedb161f56c12b03e..d7a39917ce00965d33fabc83ba004dd0664a49a3 100644
--- a/greg/tests/management/test_import_from_orgreg.py
+++ b/greg/tests/management/test_import_from_orgreg.py
@@ -1,16 +1,28 @@
import datetime
import pytest
+from django.conf import settings
from django.core.management import call_command
from orgreg_client import OrgUnit, OrgUnitList
-from greg.models import OrganizationalUnit
+from greg.models import OrganizationalUnit, OuIdentifier
@pytest.fixture
def old_unit():
- OrganizationalUnit.objects.create(orgreg_id="4", name_nb="a", name_en="b")
- return OrganizationalUnit.objects.get(orgreg_id="4")
+ ou = OrganizationalUnit.objects.create(name_nb="a", name_en="b")
+ return OrganizationalUnit.objects.get(id=ou.id)
+
+
+@pytest.fixture
+def old_identifier(unit_foo):
+ ouid = OuIdentifier.objects.create(
+ orgunit=unit_foo,
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value="4",
+ )
+ return OuIdentifier.objects.get(id=ouid.id)
@pytest.fixture
@@ -44,7 +56,7 @@ def orgreg_response():
@pytest.mark.django_db
-def test_command_ou_init(requests_mock, old_unit, orgreg_response):
+def test_command_ou_init(requests_mock, old_identifier, orgreg_response):
requests_mock.get("https://example.com/fake/ou/", text=orgreg_response.json())
assert OrganizationalUnit.objects.all().count() == 1
call_command("import_from_orgreg")
@@ -53,11 +65,20 @@ def test_command_ou_init(requests_mock, old_unit, orgreg_response):
assert OrganizationalUnit.objects.all().count() == 4
# Ensure tree is built correctly
- assert OrganizationalUnit.objects.get(orgreg_id="3").parent.orgreg_id == "2"
- assert OrganizationalUnit.objects.get(orgreg_id="3").parent.parent.orgreg_id == "1"
+ bottom = OrganizationalUnit.objects.get(
+ identifiers__source="orgreg", identifiers__value="3"
+ )
+ assert bottom.name_nb == "bar"
+ assert bottom.parent.identifiers.get().value == "2"
+ assert bottom.parent.name_en == "baz"
+ assert bottom.parent.parent.identifiers.get().value == "1"
+ assert bottom.parent.parent.name_nb == "foo"
# Ensure unknown org is marked deleted
- assert OrganizationalUnit.objects.get(orgreg_id="4").deleted is True
+ old_unit = OrganizationalUnit.objects.get(
+ identifiers__source="orgreg", identifiers__value="4"
+ )
+ assert old_unit.deleted
@pytest.mark.django_db
diff --git a/greg/tests/management/test_notification_publisher.py b/greg/tests/management/test_notification_publisher.py
index 76f937516c80fbdb8225048527235d7423b70823..c428d7bc32d9c29896be2c5478a20c28aeb31c08 100644
--- a/greg/tests/management/test_notification_publisher.py
+++ b/greg/tests/management/test_notification_publisher.py
@@ -1,14 +1,43 @@
+import json
import pytest
-from greg.management.commands.start_notification_publisher import (
+from greg.management.commands.notification_publisher import (
handle_one_notification,
+ create_cloud_event_payload,
)
from greg.models import Notification
+@pytest.fixture
+def role_type_notification():
+ Notification.objects.create(
+ identifier=5,
+ object_type="RoleType",
+ operation="update",
+ issued_at=1234,
+ meta={
+ "integer": 123,
+ "string": "foo",
+ },
+ )
+ return Notification.objects.get(id=1)
+
+
@pytest.mark.django_db
-def test_handle_one_notification(notification, pcm_mock):
+def test_handle_one_notification(role_type_notification, pcm_mock):
"""Check that Notifications are deleted when published to message queue"""
assert Notification.objects.count() == 1
- handle_one_notification(notification, pcm_mock, exchange="bar")
+ handle_one_notification(role_type_notification, pcm_mock, exchange="bar")
assert Notification.objects.count() == 0
+
+
+@pytest.mark.django_db
+def test_create_cloud_event_payload(role_type_notification):
+ payload = create_cloud_event_payload(role_type_notification)
+ assert json.loads(payload) == {
+ "id": "1",
+ "source": "greg:local:unittest",
+ "specversion": "1.0",
+ "type": "role_type.update",
+ "data": {"integer": 123, "string": "foo"},
+ }
diff --git a/greg/tests/models/test_organizational_unit.py b/greg/tests/models/test_organizational_unit.py
index cc318d824b87df964f095cc8f3bd43810f8e5802..ce2043065ff5b367bbb1975976d7173130b55385 100644
--- a/greg/tests/models/test_organizational_unit.py
+++ b/greg/tests/models/test_organizational_unit.py
@@ -5,19 +5,16 @@ from greg.models import OrganizationalUnit
@pytest.mark.django_db
def test_set_parent():
- parent = OrganizationalUnit.objects.create(orgreg_id="parent")
- child = OrganizationalUnit.objects.create(orgreg_id="child", parent=parent)
+ parent = OrganizationalUnit.objects.create()
+ child = OrganizationalUnit.objects.create(parent=parent)
assert list(OrganizationalUnit.objects.filter(parent__id=parent.id)) == [child]
@pytest.mark.django_db
def test_org_repr(unit_foo):
- assert (
- repr(unit_foo)
- == "OrganizationalUnit(id=1, orgreg_id='12345', name_en='foo_unit', parent=None)"
- )
+ assert repr(unit_foo) == "OrganizationalUnit(id=1, name_en='foo_unit', parent=None)"
@pytest.mark.django_db
def test_org_str(unit_foo):
- assert str(unit_foo) == "foo_unit (12345)"
+ assert str(unit_foo) == "foo_unit"
diff --git a/greg/tests/models/test_person.py b/greg/tests/models/test_person.py
index 396b0f0e5e3f1fe994ca70732e470cf7cda364f8..dbf09316b7d40b08e81109afcbc16cf4ce14d399 100644
--- a/greg/tests/models/test_person.py
+++ b/greg/tests/models/test_person.py
@@ -94,18 +94,18 @@ def feide_verified(person: Person, feide_id: Identity) -> Person:
def test_add_multiple_roles_to_person(
person: Person, role_type_foo: RoleType, role_type_bar: RoleType
):
- ou = OrganizationalUnit.objects.create(orgreg_id="12345", name_en="Test unit")
+ ou = OrganizationalUnit.objects.create(name_en="Test unit")
role_with(
person=person,
type=role_type_foo,
- orgunit_id=ou,
- sponsor_id=Sponsor.objects.create(feide_id="foosponsor@uio.no"),
+ orgunit=ou,
+ sponsor=Sponsor.objects.create(feide_id="foosponsor@uio.no"),
)
role_with(
person=person,
type=role_type_bar,
- orgunit_id=ou,
- sponsor_id=Sponsor.objects.create(feide_id="barsponsor@uio.no"),
+ orgunit=ou,
+ sponsor=Sponsor.objects.create(feide_id="barsponsor@uio.no"),
)
assert person.roles.count() == 2
diff --git a/greg/tests/models/test_scheduletask.py b/greg/tests/models/test_scheduletask.py
deleted file mode 100644
index 5b2e199d6ec0609c88700fbe12d057d6163d0746..0000000000000000000000000000000000000000
--- a/greg/tests/models/test_scheduletask.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import pytest
-
-from greg.models import ScheduleTask
-
-
-@pytest.fixture
-def scheduletask():
- ScheduleTask.objects.create(name="foo", last_completed="2020-10-15T23:04Z")
- return ScheduleTask.objects.get(id=1)
-
-
-@pytest.mark.django_db
-def test_scheduletask_repr(scheduletask):
- assert (
- repr(scheduletask)
- == "ScheduleTask(id=1, name='foo', last_completed=datetime.datetime(2020, 10, 15, 23, 4, tzinfo=<UTC>))"
- )
diff --git a/greg/tests/models/test_sponsor.py b/greg/tests/models/test_sponsor.py
index 9f6db4f60574081b3069570a5c1632daed6d1f61..581111194aca42b87195e0cab985ff17aec618ef 100644
--- a/greg/tests/models/test_sponsor.py
+++ b/greg/tests/models/test_sponsor.py
@@ -27,12 +27,12 @@ def sponsor_bar() -> Sponsor:
@pytest.fixture
def unit1() -> OrganizationalUnit:
- return OrganizationalUnit.objects.create(orgreg_id="1", name_en="First unit")
+ return OrganizationalUnit.objects.create(name_en="First unit")
@pytest.fixture
def unit2() -> OrganizationalUnit:
- return OrganizationalUnit.objects.create(orgreg_id="2", name_en="Second unit")
+ return OrganizationalUnit.objects.create(name_en="Second unit")
@pytest.mark.django_db
diff --git a/greg/tests/models/test_sponsor_orgunit.py b/greg/tests/models/test_sponsor_orgunit.py
index 317815f7d696142147e17e91628d8b2ca42e3de3..c05c635ccc20258a0c30ae7a5e4078d919a09406 100644
--- a/greg/tests/models/test_sponsor_orgunit.py
+++ b/greg/tests/models/test_sponsor_orgunit.py
@@ -5,5 +5,5 @@ import pytest
def test_sponsor_org_repr(sponsor_org_unit):
assert (
repr(sponsor_org_unit)
- == "SponsorOrganizationalUnit(id=1, sponsor=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy'), organizational_unit=OrganizationalUnit(id=1, orgreg_id='12345', name_en='foo_unit', parent=None), hierarchical_access=False)"
+ == "SponsorOrganizationalUnit(id=1, sponsor=Sponsor(id=1, feide_id='guy@example.org', first_name='Sponsor', last_name='Guy'), organizational_unit=OrganizationalUnit(id=1, name_en='foo_unit', parent=None), hierarchical_access=False)"
)
diff --git a/greg/tests/populate_database.py b/greg/tests/populate_database.py
index c86d746b3e2419c18283c47b6295119c254e973e..f4e103f1d569a766b3fcc2fb237cdb32bd289716 100644
--- a/greg/tests/populate_database.py
+++ b/greg/tests/populate_database.py
@@ -28,6 +28,8 @@ class DatabasePopulation:
faker: Faker
persons: List[Person] = []
+ emails: List[Identity] = []
+ phones: List[Identity] = []
units: List[OrganizationalUnit] = []
sponsors: List[Sponsor] = []
role_types: List[RoleType] = []
@@ -48,17 +50,30 @@ class DatabasePopulation:
self.random = random.Random()
def populate_database(self):
- for i in range(10):
+ for _ in range(10):
first_name = self.faker.first_name()
last_name = self.faker.last_name()
- self.persons.append(
- Person.objects.create(
- first_name=first_name,
- last_name=last_name,
- date_of_birth=self.faker.date_of_birth(maximum_age=50),
- email=f"{first_name}.{last_name}@example.org",
- mobile_phone=self.faker.phone_number(),
+ person = Person.objects.create(
+ first_name=first_name,
+ last_name=last_name,
+ date_of_birth=self.faker.date_of_birth(maximum_age=50),
+ )
+ self.persons.append(person)
+ self.emails.append(
+ Identity.objects.create(
+ person=person,
+ type=Identity.IdentityType.PRIVATE_EMAIL,
+ value=f"{first_name}.{last_name}@example.org",
+ source=self.faker.company(),
+ )
+ )
+ self.phones.append(
+ Identity.objects.create(
+ person=person,
+ type=Identity.IdentityType.PRIVATE_MOBILE_NUMBER,
+ value=self.faker.phone_number(),
+ source=self.faker.company(),
)
)
@@ -67,21 +82,19 @@ class DatabasePopulation:
RoleType.objects.create(identifier=role_type, name_en=role_type)
)
- for i in range(10):
+ for _ in range(10):
self.units.append(
- OrganizationalUnit.objects.create(
- orgreg_id=f"12345{i}", name_en=self.faker.company()
- )
+ OrganizationalUnit.objects.create(name_en=self.faker.company())
)
- for i in range(5):
+ for _ in range(5):
self.sponsors.append(
Sponsor.objects.create(
feide_id=self.faker.bothify(text="???####@uio.no")
)
)
- for i in range(10):
+ for _ in range(10):
self.consent_types.append(
ConsentType.objects.create(
identifier=self.faker.slug(),
@@ -147,14 +160,14 @@ class DatabasePopulation:
Role.objects.create(
person=random.choice(self.persons),
type=random.choice(self.role_types),
- unit=random.choice(self.units),
+ orgunit=random.choice(self.units),
start_date=self.faker.date_this_decade(),
end_date=self.faker.date_this_decade(
before_today=False, after_today=True
),
contact_person_unit=self.faker.name(),
available_in_search=self.random.random() > 0.5,
- sponsor_id=random.choice(self.sponsors),
+ sponsor=random.choice(self.sponsors),
)
person_role_count += 1
except IntegrityError:
diff --git a/greg/tests/populate_fixtures.py b/greg/tests/populate_fixtures.py
new file mode 100644
index 0000000000000000000000000000000000000000..d7e03f4ed11a58a702c93944b76be8d384b513c7
--- /dev/null
+++ b/greg/tests/populate_fixtures.py
@@ -0,0 +1,343 @@
+"""
+Adds a few more specific models for testing purposes. Alternative to the similiar
+script for adding random data to various fields.
+
+WARNING: This script removes all entries in most tables. Do not execute it unless you
+are absolutely certain you know what you are doing.
+
+There are 4 guests:
+ - One has been invited and not done anything yet
+ - One has followed the invite link and provided a passport number, and is waiting for
+ the sponsor to act
+ - One has had their passport number confirmed by the sponsor and the role is active
+ - One like the previous but the role has ended
+
+There is an OU tree with 4 OUs on three levels, with respective OUIdentifiers.
+There is an invitation object related to each guest with InvitationLinks that are
+expired for all but they invited guest that has not responded.
+
+There are Consent Types, and the active guests have consented to the mandatory one, but
+one of them has denied the other one.
+
+"""
+
+import datetime
+import logging
+
+from django.db import connection
+from django.conf import settings
+from django.utils import timezone
+
+from greg.models import (
+ Consent,
+ ConsentType,
+ Identity,
+ Invitation,
+ InvitationLink,
+ OrganizationalUnit,
+ OuIdentifier,
+ Person,
+ Role,
+ RoleType,
+ Sponsor,
+ SponsorOrganizationalUnit,
+)
+
+
+ROLE_TYPE_EXT_SCI = "extsci"
+ROLE_TYPE_EMERITUS = "emeritus"
+TESTDATA_SOURCE = "testsource"
+SPONSOR_FEIDEID = "sponsor@feide.no"
+OU_EUROPE_NAME_EN = "Europe"
+CONSENT_IDENT_MANDATORY = "mandatory"
+CONSENT_IDENT_OPTIONAL = "optional"
+
+logger = logging.getLogger(__name__)
+
+
+class DatabasePopulation:
+ """
+ Helper class for populating database with specific data
+
+ Run the file in the Django shell: exec(open('greg/tests/populate_fixtures.py').read())
+ """
+
+ def truncate_tables(self):
+ logger.info("truncating tables...")
+ with connection.cursor() as cursor:
+ for table in (
+ "greg_consent",
+ "greg_consenttype",
+ "greg_notification",
+ "greg_identity",
+ "greg_invitationlink",
+ "greg_invitation",
+ "greg_role",
+ "greg_sponsororganizationalunit",
+ "greg_roletype",
+ "greg_ouidentifier",
+ "greg_organizationalunit",
+ "greg_person",
+ "gregui_greguserprofile",
+ "greg_sponsor",
+ ):
+ logging.info("purging table %s", table)
+ cursor.execute(f"DELETE FROM {table}")
+ logger.info("...tables purged")
+
+ def _add_consenttypes(self):
+ ConsentType.objects.create(
+ identifier=CONSENT_IDENT_MANDATORY,
+ name_en="Mandatory consent type",
+ name_nb="PÃ¥krevd samtykketype",
+ user_allowed_to_change=False,
+ mandatory=True,
+ )
+ ConsentType.objects.create(
+ identifier=CONSENT_IDENT_OPTIONAL,
+ name_en="Optional consent type",
+ name_nb="Valgfri samtykketype",
+ user_allowed_to_change=False,
+ )
+
+ def _add_ous_with_identifiers(self):
+ """
+ Create a simple tree
+
+ earth - america
+ - europe - norway
+ """
+ earth = OrganizationalUnit.objects.create(
+ name_nb="Universitetet i Jorden", name_en="University of Earth"
+ )
+ OuIdentifier.objects.create(
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value="2",
+ orgunit=earth,
+ )
+ europe = OrganizationalUnit.objects.create(
+ name_nb="Europa", name_en=OU_EUROPE_NAME_EN, parent=earth
+ )
+ OuIdentifier.objects.create(
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value="3",
+ orgunit=europe,
+ )
+ america = OrganizationalUnit.objects.create(
+ name_nb="Amerika", name_en="America", parent=earth
+ )
+ OuIdentifier.objects.create(
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value="4",
+ orgunit=america,
+ )
+ norway = OrganizationalUnit.objects.create(
+ name_nb="Norge", name_en="Norway", parent=europe
+ )
+ OuIdentifier.objects.create(
+ name=settings.ORGREG_NAME,
+ source=settings.ORGREG_SOURCE,
+ value="5",
+ orgunit=norway,
+ )
+
+ def _add_roletypes(self):
+ RoleType.objects.create(
+ identifier=ROLE_TYPE_EXT_SCI,
+ name_nb="Gjesteforsker",
+ name_en="Guest researcher",
+ description_nb="Gjesteforsker som ikke skal ha lønn",
+ description_en="Guest reasearcher without payment",
+ )
+ RoleType.objects.create(
+ identifier=ROLE_TYPE_EMERITUS,
+ name_nb="Emeritus",
+ name_en="Emeritus",
+ description_nb="Emeritus",
+ description_en="Emeritus",
+ max_days=700,
+ )
+
+ def _add_sponsors(self):
+ """Add a sponsor connected to the Europe unit"""
+ sam = Sponsor.objects.create(
+ feide_id=SPONSOR_FEIDEID, first_name="Sam", last_name="Sponsorson"
+ )
+ SponsorOrganizationalUnit.objects.create(
+ sponsor=sam,
+ organizational_unit=OrganizationalUnit.objects.get(
+ name_en=OU_EUROPE_NAME_EN
+ ),
+ hierarchical_access=False,
+ )
+
+ def _add_invited_person(self):
+ """Person that has been invited and has not followed their invite"""
+ iggy = Person.objects.create(first_name="Iggy", last_name="Invited")
+ role = Role.objects.create(
+ person=iggy,
+ type=RoleType.objects.get(identifier=ROLE_TYPE_EXT_SCI),
+ orgunit=OrganizationalUnit.objects.get(name_en=OU_EUROPE_NAME_EN),
+ start_date=datetime.date.today() + datetime.timedelta(days=2),
+ end_date=datetime.date.today() + datetime.timedelta(days=100),
+ sponsor=Sponsor.objects.get(feide_id=SPONSOR_FEIDEID),
+ )
+ invitation = Invitation.objects.create(
+ role=role,
+ )
+ InvitationLink.objects.create(
+ invitation=invitation,
+ expire=timezone.now() + datetime.timedelta(days=30),
+ )
+
+ def _add_waiting_person(self):
+ """
+ A person with an active role but missing a verified identity of type national
+ id or passport.
+ """
+ walter = Person.objects.create(
+ first_name="Walter",
+ last_name="Waiting",
+ registration_completed_date=datetime.date.today()
+ - datetime.timedelta(days=10),
+ )
+ role = Role.objects.create(
+ person=walter,
+ type=RoleType.objects.get(identifier=ROLE_TYPE_EXT_SCI),
+ orgunit=OrganizationalUnit.objects.get(name_en=OU_EUROPE_NAME_EN),
+ start_date=datetime.date.today() - datetime.timedelta(days=30),
+ end_date=datetime.date.today() + datetime.timedelta(days=100),
+ sponsor=Sponsor.objects.get(feide_id=SPONSOR_FEIDEID),
+ )
+ Identity.objects.create(
+ person=walter,
+ type=Identity.IdentityType.PASSPORT_NUMBER,
+ source=TESTDATA_SOURCE,
+ value="SE-123456789",
+ )
+ invitation = Invitation.objects.create(
+ role=role,
+ )
+ InvitationLink.objects.create(
+ invitation=invitation,
+ expire=timezone.now() - datetime.timedelta(days=35),
+ )
+
+ def _add_active_person(self):
+ """
+ A person with an active role and a verified identity of type national id or
+ passport.
+ """
+ adam = Person.objects.create(
+ first_name="Adam",
+ last_name="Active",
+ registration_completed_date=datetime.date.today()
+ - datetime.timedelta(days=10),
+ )
+ role = Role.objects.create(
+ person=adam,
+ type=RoleType.objects.get(identifier=ROLE_TYPE_EXT_SCI),
+ orgunit=OrganizationalUnit.objects.get(name_en=OU_EUROPE_NAME_EN),
+ start_date=datetime.date.today() - datetime.timedelta(days=30),
+ end_date=datetime.date.today() + datetime.timedelta(days=100),
+ sponsor=Sponsor.objects.get(feide_id=SPONSOR_FEIDEID),
+ )
+ Identity.objects.create(
+ person=adam,
+ type=Identity.IdentityType.PASSPORT_NUMBER,
+ source=TESTDATA_SOURCE,
+ value="NO-123456789",
+ verified_at=timezone.now() - datetime.timedelta(days=31),
+ )
+ Identity.objects.create(
+ person=adam,
+ type=Identity.IdentityType.PRIVATE_MOBILE_NUMBER,
+ source=TESTDATA_SOURCE,
+ value="+4792492412",
+ verified_at=timezone.now() - datetime.timedelta(days=205),
+ )
+ invitation = Invitation.objects.create(
+ role=role,
+ )
+ InvitationLink.objects.create(
+ invitation=invitation,
+ expire=timezone.now() - datetime.timedelta(days=32),
+ )
+ Consent.objects.create(
+ person=adam,
+ type=ConsentType.objects.get(identifier=CONSENT_IDENT_MANDATORY),
+ consent_given_at=datetime.date.today() - datetime.timedelta(days=10),
+ )
+ Consent.objects.create(
+ person=adam,
+ type=ConsentType.objects.get(identifier=CONSENT_IDENT_OPTIONAL),
+ consent_given_at=datetime.date.today() - datetime.timedelta(days=10),
+ )
+
+ def _add_expired_person(self):
+ """
+ A person with an inactive role, and a verified identity of type national id or
+ passport.
+ """
+ esther = Person.objects.create(
+ first_name="Esther",
+ last_name="Expired",
+ registration_completed_date=timezone.now() - datetime.timedelta(days=206),
+ )
+ role = Role.objects.create(
+ person=esther,
+ type=RoleType.objects.get(identifier=ROLE_TYPE_EXT_SCI),
+ orgunit=OrganizationalUnit.objects.get(name_en=OU_EUROPE_NAME_EN),
+ start_date=datetime.date.today() - datetime.timedelta(days=200),
+ end_date=datetime.date.today() - datetime.timedelta(days=100),
+ sponsor=Sponsor.objects.get(feide_id=SPONSOR_FEIDEID),
+ )
+ Identity.objects.create(
+ person=esther,
+ type=Identity.IdentityType.PASSPORT_NUMBER,
+ source=TESTDATA_SOURCE,
+ value="DK-123456789",
+ verified_at=timezone.now() - datetime.timedelta(days=205),
+ )
+ Identity.objects.create(
+ person=esther,
+ type=Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER,
+ source=TESTDATA_SOURCE,
+ value="12345678901",
+ verified_at=timezone.now() - datetime.timedelta(days=205),
+ )
+ invitation = Invitation.objects.create(
+ role=role,
+ )
+ InvitationLink.objects.create(
+ invitation=invitation,
+ expire=timezone.now() - datetime.timedelta(days=204),
+ )
+ Consent.objects.create(
+ person=esther,
+ type=ConsentType.objects.get(identifier=CONSENT_IDENT_MANDATORY),
+ consent_given_at=datetime.date.today() - datetime.timedelta(days=206),
+ )
+
+ def populate_database(self):
+ logger.info("populating db...")
+ # Add the types, sponsors and ous
+ self._add_consenttypes()
+ self._add_ous_with_identifiers()
+ self._add_roletypes()
+ self._add_sponsors()
+ # Add the four guests
+ self._add_active_person()
+ self._add_waiting_person()
+ self._add_invited_person()
+ self._add_expired_person()
+ logger.info("...done populating db")
+
+
+if __name__ == "__main__":
+ database_population = DatabasePopulation()
+ database_population.truncate_tables()
+ database_population.populate_database()
diff --git a/greg/tests/test_expire_role.py b/greg/tests/test_expire_role.py
deleted file mode 100644
index 77ca940cf723736b657488e7975c003d7d25e307..0000000000000000000000000000000000000000
--- a/greg/tests/test_expire_role.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from datetime import datetime, timedelta
-
-import pytest
-from django.db.models import Q
-from django.utils import timezone
-
-from greg.models import (
- ScheduleTask,
- RoleType,
- Person,
- OrganizationalUnit,
- Role,
- Notification,
- Sponsor,
-)
-from greg.schedule import ExpiringRolesNotification
-
-
-@pytest.fixture
-def role_task():
- ScheduleTask.objects.create(
- name="role_expiration", last_completed=timezone.now() - timedelta(days=1)
- )
-
-
-@pytest.fixture
-def role(
- person: Person,
- role_type_bar: RoleType,
- unit_foo: OrganizationalUnit,
- sponsor_guy: Sponsor,
-) -> Role:
- return Role.objects.create(
- person=person,
- type=role_type_bar,
- orgunit_id=unit_foo,
- start_date="2020-03-05",
- end_date=datetime.today() + timedelta(days=30),
- contact_person_unit="Contact Person",
- available_in_search=True,
- sponsor_id=sponsor_guy,
- )
-
-
-@pytest.mark.django_db
-def test_role_picked_up(role_task: ScheduleTask, role: Role):
- role_notification = ExpiringRolesNotification()
- assert len(Notification.objects.filter(~Q(operation="add"))) == 0
- role_notification.run()
- notification = Notification.objects.get(operation="expire_reminder")
- assert notification.identifier == role.id
- role_notification.run()
- notifications = Notification.objects.filter(operation="expire_reminder")
- assert len(notifications) == 1
-
-
-@pytest.mark.django_db
-def test_no_notification_for_role_not_about_to_expire(
- role_task: ScheduleTask, role: Role
-):
- role.end_date = datetime.today() + timedelta(days=31)
- role.save()
- role_notification = ExpiringRolesNotification()
- assert len(Notification.objects.filter(operation="expire_reminder")) == 0
- # Role should not be picked up since it expires in 31 days
- role_notification.run()
- notifications = Notification.objects.filter(operation="expire_reminder")
- assert len(notifications) == 0
diff --git a/greg/tests/test_notifications.py b/greg/tests/test_notifications.py
index 7fcbb4494aed29bc9d35d7404676d37dec89dfb0..c0fd917da896d0866d72b3dc0729bc357c1a5014 100644
--- a/greg/tests/test_notifications.py
+++ b/greg/tests/test_notifications.py
@@ -15,22 +15,25 @@ from greg.models import (
@pytest.fixture
def org_unit_bar() -> OrganizationalUnit:
- return OrganizationalUnit.objects.create(orgreg_id="bar_unit")
+ org = OrganizationalUnit.objects.create()
+ return OrganizationalUnit.objects.get(pk=org.id)
@pytest.fixture
def sponsor() -> Sponsor:
- return Sponsor.objects.create(feide_id="sponsor_id")
+ sp = Sponsor.objects.create(feide_id="sponsor_id")
+ return Sponsor.objects.get(pk=sp.id)
@pytest.fixture
def identity(person: Person) -> Identity:
- return Identity.objects.create(
+ ident = Identity.objects.create(
person=person,
type=Identity.IdentityType.PASSPORT_NUMBER,
source="Test",
value="12345678901",
)
+ return Identity.objects.get(pk=ident.id)
@pytest.mark.django_db
@@ -68,20 +71,21 @@ def test_role_add_notification(
org_unit_bar: OrganizationalUnit,
sponsor: Sponsor,
):
- Role.objects.create(
+ role = Role.objects.create(
person=person,
type=role_type_foo,
start_date="2021-05-06",
end_date="2021-10-20",
- orgunit_id=org_unit_bar,
- sponsor_id=sponsor,
+ orgunit=org_unit_bar,
+ sponsor=sponsor,
)
notifications = Notification.objects.filter(object_type="Role")
assert len(notifications) == 1
assert notifications[0].operation == "add"
- meta_data = notifications[0].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["type_id"] == role_type_foo.id
+ meta = notifications[0].meta
+ assert meta["person_id"] == person.id
+ assert meta["role_id"] == role.id
+ assert meta["role_type"] == role_type_foo.identifier
@pytest.mark.django_db
@@ -91,13 +95,13 @@ def test_role_update_notification(
org_unit_bar: OrganizationalUnit,
sponsor: Sponsor,
):
- Role.objects.create(
+ role = Role.objects.create(
person=person,
type=role_type_foo,
start_date="2021-05-06",
end_date="2021-10-20",
- orgunit_id=org_unit_bar,
- sponsor_id=sponsor,
+ orgunit=org_unit_bar,
+ sponsor=sponsor,
)
assert len(person.roles.all()) == 1
person_role = person.roles.all()[0]
@@ -106,9 +110,10 @@ def test_role_update_notification(
notifications = Notification.objects.filter(object_type="Role")
assert len(notifications) == 2
assert notifications[1].operation == "update"
- meta_data = notifications[1].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["type_id"] == role_type_foo.id
+ meta = notifications[1].meta
+ assert meta["person_id"] == person.id
+ assert meta["role_id"] == role.id
+ assert meta["role_type"] == role_type_foo.identifier
@pytest.mark.django_db
@@ -118,13 +123,13 @@ def test_role_delete_notification(
org_unit_bar: OrganizationalUnit,
sponsor: Sponsor,
):
- Role.objects.create(
+ role = Role.objects.create(
person=person,
type=role_type_foo,
start_date="2021-05-06",
end_date="2021-10-20",
- orgunit_id=org_unit_bar,
- sponsor_id=sponsor,
+ orgunit=org_unit_bar,
+ sponsor=sponsor,
)
assert len(person.roles.all()) == 1
person_role = person.roles.all()[0]
@@ -132,27 +137,31 @@ def test_role_delete_notification(
notifications = Notification.objects.filter(object_type="Role")
assert len(notifications) == 2
assert notifications[1].operation == "delete"
- meta_data = notifications[1].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["type_id"] == role_type_foo.id
+ meta = notifications[1].meta
+ assert meta["person_id"] == person.id
+ assert meta["role_id"] == role.id
+ assert meta["role_type"] == role_type_foo.identifier
+ assert meta["role_type_id"] == role_type_foo.id
@pytest.mark.django_db
def test_consent_add_notification(person: Person, consent_type: ConsentType):
- Consent.objects.create(
+ consent = Consent.objects.create(
person=person, type=consent_type, consent_given_at="2021-06-20"
)
notifications = Notification.objects.filter(object_type="Consent")
assert len(notifications) == 1
assert notifications[0].identifier == person.id
- meta_data = notifications[0].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["consent_id"] == consent_type.id
+ meta = notifications[0].meta
+ assert meta["person_id"] == person.id
+ assert meta["consent_id"] == consent.id
+ assert meta["consent_type"] == consent.type.identifier
+ assert meta["consent_type_id"] == consent.type.id
@pytest.mark.django_db
def test_consent_update_notification(person: Person, consent_type: ConsentType):
- Consent.objects.create(
+ consent = Consent.objects.create(
person=person, type=consent_type, consent_given_at="2021-06-20"
)
consents = Consent.objects.filter(person=person, type=consent_type)
@@ -162,14 +171,16 @@ def test_consent_update_notification(person: Person, consent_type: ConsentType):
notifications = Notification.objects.filter(object_type="Consent")
assert len(notifications) == 2
assert notifications[0].identifier == person.id
- meta_data = notifications[0].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["consent_id"] == consent_type.id
+ meta = notifications[0].meta
+ assert meta["person_id"] == person.id
+ assert meta["consent_id"] == consent.id
+ assert meta["consent_type"] == consent.type.identifier
+ assert meta["consent_type_id"] == consent.type.id
@pytest.mark.django_db
def test_consent_delete_notification(person: Person, consent_type: ConsentType):
- Consent.objects.create(
+ consent = Consent.objects.create(
person=person, type=consent_type, consent_given_at="2021-06-20"
)
consents = Consent.objects.filter(person=person, type=consent_type)
@@ -179,9 +190,11 @@ def test_consent_delete_notification(person: Person, consent_type: ConsentType):
assert len(notifications) == 2
assert notifications[1].identifier == person.id
assert notifications[1].operation == "delete"
- meta_data = notifications[0].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["consent_id"] == consent_type.id
+ meta = notifications[0].meta
+ assert meta["person_id"] == person.id
+ assert meta["consent_id"] == consent.id
+ assert meta["consent_type"] == consent_type.identifier
+ assert meta["consent_type_id"] == consent_type.id
@pytest.mark.django_db
@@ -193,9 +206,10 @@ def test_identity_add_notification(
assert notifications[0].identifier == person.id
assert notifications[0].operation == "add"
- meta_data = notifications[0].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["identity_id"] == identity.id
+ meta = notifications[0].meta
+ assert meta["person_id"] == person.id
+ assert meta["identity_id"] == identity.id
+ assert meta["identity_type"] == identity.type
@pytest.mark.django_db
@@ -212,6 +226,7 @@ def test_identity_update_notification(
assert len(notifications) == 2
assert notifications[1].operation == "update"
- meta_data = notifications[1].meta
- assert meta_data["person_id"] == person.id
- assert meta_data["identity_id"] == identity.id
+ meta = notifications[1].meta
+ assert meta["person_id"] == person.id
+ assert meta["identity_id"] == identity.id
+ assert meta["identity_type"] == identity.type
diff --git a/greg/tests/test_signals.py b/greg/tests/test_signals.py
index 1570fd26c785cc228fe2e339c576841a3c16fb39..31e4da470a1f3503e152e3f432ef4ea5bdf27f45 100644
--- a/greg/tests/test_signals.py
+++ b/greg/tests/test_signals.py
@@ -1,6 +1,22 @@
+import datetime
import pytest
-from greg.models import Notification
+from greg.models import Notification, Role
+from greg.signals import _queue_role_start_notification, _queue_role_end_notification
+
+
+@pytest.fixture
+def role_today(person, role_type_test_guest, sponsor_guy, unit_foo):
+ """A test role with end and start date today."""
+ role = Role.objects.create(
+ person=person,
+ type=role_type_test_guest,
+ sponsor=sponsor_guy,
+ orgunit=unit_foo,
+ start_date=datetime.date.today(),
+ end_date=datetime.date.today(),
+ )
+ return Role.objects.get(pk=role.id)
@pytest.mark.django_db
@@ -17,3 +33,37 @@ def test_delete_signal_ou(unit_foo):
assert Notification.objects.count() == 0
unit_foo.delete()
assert Notification.objects.count() == 0
+
+
+@pytest.mark.django_db
+def test_queue_role_start_notification(role_today):
+ """Check that a notification is produced if the role starts today"""
+ assert Notification.objects.all().count() == 3
+ _queue_role_start_notification(role_today.id, True)
+ assert Notification.objects.all().count() == 4
+
+
+@pytest.mark.django_db
+def test_queue_role_end_notification(role_today):
+ """Check that a notification is produced if the role ends today"""
+ assert Notification.objects.all().count() == 3
+ _queue_role_end_notification(role_today.id, True)
+ assert Notification.objects.all().count() == 4
+
+
+@pytest.mark.django_db
+def test_queue_role_end_notification_wrong_date(role_today):
+ """Check that a notification is produced if the role ends today"""
+ role_today.end_date = datetime.date.today() - datetime.timedelta(days=2)
+ role_today.save()
+ assert Notification.objects.all().count() == 4
+ _queue_role_end_notification(role_today.id, True)
+ assert Notification.objects.all().count() == 4
+
+
+@pytest.mark.django_db
+def test_queue_role_end_notification_role_deleted():
+ """Check that a notification is not produced if the role was deleted"""
+ assert Notification.objects.all().count() == 0
+ _queue_role_end_notification(10, True)
+ assert Notification.objects.all().count() == 0
diff --git a/greg/utils.py b/greg/utils.py
index 8408087a224f8877f6be4c619434eae081bccdce..a7a27171c3f441ebfebc0201c4fc621e0e76223c 100644
--- a/greg/utils.py
+++ b/greg/utils.py
@@ -1,5 +1,8 @@
import re
-from datetime import date
+import typing
+from datetime import date, datetime
+
+from django.utils import timezone
def camel_to_snake(s: str) -> str:
@@ -90,3 +93,12 @@ def _compute_checksum(input_digits: str) -> bool:
k2 = 0
return k1 < 10 and k2 < 10 and k1 == d[9] and k2 == d[10]
+
+
+def date_to_datetime_midnight(in_date: typing.Union[date, str]) -> datetime:
+ """Convert a date or str object to a datetime object with timezone utc"""
+ start_date = (
+ datetime.strptime(in_date, "%Y-%M-%d") if isinstance(in_date, str) else in_date
+ )
+ start = datetime.combine(start_date, datetime.min.time(), tzinfo=timezone.utc)
+ return start
diff --git a/gregsite/settings/base.py b/gregsite/settings/base.py
index 45b2e6401556f600c3669b6ee7b7e7d5e79c671d..a4e14bb70c6df7c63f278e36861fa86e54120504 100644
--- a/gregsite/settings/base.py
+++ b/gregsite/settings/base.py
@@ -283,13 +283,31 @@ NOTIFICATION_PUBLISHER = {
},
"exchange": "test",
},
- "daemon": {"pid_file": "/tmp/greg_notification_publisher.lock", "poll_interval": 1},
+ "poll_interval": 5,
}
-SCHEDULE_TASKS = {
- "daemon": {"pid_file": "/tmp/schedule_tasks.lock"},
+INSTANCE_NAME = "local"
+# i.e. 'prod', 'test', ...
+ENVIRONMENT = "unknown"
+INTERNAL_RK_PREFIX = "no.{instance}.greg".format(instance=INSTANCE_NAME)
+
+FEIDE_SOURCE = "feide"
+
+# Rate limit settings of invite endpoint
+REST_FRAMEWORK = {
+ "DEFAULT_THROTTLE_CLASSES": [
+ "rest_framework.throttling.AnonRateThrottle",
+ ],
+ "DEFAULT_THROTTLE_RATES": {
+ "anon": "100/day",
+ },
}
-INSTANCE_NAME = "local"
-INTERNAL_RK_PREFIX = "no.{instance}.greg".format(instance=INSTANCE_NAME)
+# Used by the OU import from orgreg to distinguish the OuIdentifiers from others
+ORGREG_SOURCE = "orgreg"
+ORGREG_NAME = "orgreg_id"
+
+# Extra ids to be imported from orgreg, list of dict with source/type.
+# [{"source": "sapuio", "type": "legacy_stedkode"}]
+ORGREG_EXTRA_IDS = []
diff --git a/gregsite/settings/dev.py b/gregsite/settings/dev.py
index 1030d593bfeba46f384aed6f1599c75261414920..5120e02bafbd65944f622b2e137410fb0b27b672 100644
--- a/gregsite/settings/dev.py
+++ b/gregsite/settings/dev.py
@@ -2,6 +2,8 @@ from .base import *
# This is the default configuration file when running manage.py
+ENVIRONMENT = "dev"
+
ALLOWED_HOSTS += ["localhost", "127.0.0.1", "0.0.0.0"]
# EMAIL_HOST = "smtp.uio.no"
# EMAIL_PORT = "468"
@@ -75,6 +77,14 @@ LOGGING = {
},
}
+# Disable throttling in development, uncomment CACHES to test
+CACHES = {
+ "default": {
+ "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+ }
+}
+
+
try:
from .local import *
except ImportError:
diff --git a/gregsite/settings/prod.py b/gregsite/settings/prod.py
index d848d3ed1f11eb2661f0393cc9356dc915c328a6..0336f7bc6af9dd96381348351c2053dc900549c7 100644
--- a/gregsite/settings/prod.py
+++ b/gregsite/settings/prod.py
@@ -5,6 +5,8 @@ from .base import *
# This is the default configuration file when starting the app through
# either greg.wsgi.application or greg.asgi.application
+ENVIRONMENT = "prod"
+
# Put secret production settings in local.py
DEBUG = False
@@ -25,6 +27,13 @@ ALLOWED_HOSTS = (
else []
)
+# This is the default values for CACHES, only present for clarity
+CACHES = {
+ "default": {
+ "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+ }
+}
+
try:
from .local import *
diff --git a/gregsite/settings/testing.py b/gregsite/settings/testing.py
index 8562b3f640becf655bcf69d08cfa6fc4a684da65..f07764575c58e835d2853d9062007ce9c1702825 100644
--- a/gregsite/settings/testing.py
+++ b/gregsite/settings/testing.py
@@ -1,5 +1,7 @@
from .dev import *
+ENVIRONMENT = "unittest"
+
AUTHENTICATION_BACKENDS = [
"gregui.authentication.auth_backends.DevBackend", # Fake dev backend
"django.contrib.auth.backends.ModelBackend", # default
diff --git a/gregui/admin.py b/gregui/admin.py
index d5ea59b0fcf2cf68ccd9aeb3737e09cf4c2c2962..7c3f771755952b78e409029ce4c17be9bd6412eb 100644
--- a/gregui/admin.py
+++ b/gregui/admin.py
@@ -1,11 +1,17 @@
from django.contrib import admin
from reversion.admin import VersionAdmin
-from gregui.models import GregUserProfile
+from gregui.models import EmailTemplate, GregUserProfile
class GregUserProfileAdmin(VersionAdmin):
pass
+class EmailTemplateAdmin(VersionAdmin):
+ list_display = ["id", "template_key", "subject", "from_email"]
+ save_as = True
+
+
admin.site.register(GregUserProfile, GregUserProfileAdmin)
+admin.site.register(EmailTemplate, EmailTemplateAdmin)
diff --git a/gregui/api/serializers/guest.py b/gregui/api/serializers/guest.py
index 20a8759264756d36d231509342a3e864af683a46..4c36fa973cfcb14ac2754cdd01e6ac003e189cf2 100644
--- a/gregui/api/serializers/guest.py
+++ b/gregui/api/serializers/guest.py
@@ -1,27 +1,52 @@
+import phonenumbers
from rest_framework import serializers
from greg.models import Identity, Person
+from greg.utils import is_valid_norwegian_national_id_number
+
+
+def _validateNorwegianNationalIdNumber(value):
+ # Not excepted that D-numbers will be entered through the form, so only
+ # accept national ID numbers
+ if not is_valid_norwegian_national_id_number(value, False):
+ raise serializers.ValidationError("Not a valid Norwegian national ID number")
+
+
+def _validatePhoneNumber(value):
+ if not phonenumbers.is_valid_number(phonenumbers.parse(value)):
+ raise serializers.ValidationError("Invalid phone number")
class GuestRegisterSerializer(serializers.ModelSerializer):
- first_name = serializers.CharField(required=True)
- last_name = serializers.CharField(required=True)
- email = serializers.CharField(required=True)
- mobile_phone = serializers.CharField(required=True)
+ # TODO first_name and last_name set as not required to throwing an exception if they are not included in what is sent back from the frontend. It is perhaps not required that they are in the reponse from the client if the guest should be allowed to change them
+ first_name = serializers.CharField(required=False)
+ last_name = serializers.CharField(required=False)
+ # E-mail set to not required to avoid raising exception if it is not included in input. It is not given that
+ # the guest should be allowed to update it
+ email = serializers.CharField(required=False)
+ mobile_phone = serializers.CharField(
+ required=True, validators=[_validatePhoneNumber]
+ )
+ fnr = serializers.CharField(
+ required=False, validators=[_validateNorwegianNationalIdNumber]
+ )
+ passport = serializers.CharField(required=False)
def update(self, instance, validated_data):
- email = validated_data.pop("email")
mobile_phone = validated_data.pop("mobile_phone")
- if not instance.private_email:
- Identity.objects.create(
- person=instance,
- type=Identity.IdentityType.PRIVATE_EMAIL,
- value=email,
- )
- else:
- instance.private_email.value = email
- instance.private_email.save()
+ if "email" in validated_data:
+ email = validated_data.pop("email")
+ if not instance.private_email:
+ Identity.objects.create(
+ person=instance,
+ type=Identity.IdentityType.PRIVATE_EMAIL,
+ value=email,
+ )
+ else:
+ private_email = instance.private_email
+ private_email.value = email
+ private_email.save()
if not instance.private_mobile:
Identity.objects.create(
@@ -30,17 +55,53 @@ class GuestRegisterSerializer(serializers.ModelSerializer):
value=mobile_phone,
)
else:
- instance.private_mobile.value = mobile_phone
- instance.private_mobile.save()
+ private_mobile = instance.private_mobile
+ private_mobile.value = mobile_phone
+ private_mobile.save()
+
+ if "fnr" in validated_data:
+ fnr = validated_data.pop("fnr")
+ if not instance.fnr:
+ Identity.objects.create(
+ person=instance,
+ type=Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER,
+ value=fnr,
+ )
+ else:
+ fnr_existing = instance.fnr
+ fnr_existing.value = fnr
+ fnr_existing.save()
+
+ if "passport" in validated_data:
+ passport = validated_data.pop("passport")
+ if not instance.passport:
+ Identity.objects.create(
+ person=instance,
+ type=Identity.IdentityType.PASSPORT_NUMBER,
+ value=passport,
+ )
+ else:
+ passport_existing = instance.passport
+ passport_existing.value = passport
+ passport_existing.save()
# TODO: we only want to allow changing the name if we don't have one
# from a reliable source (Feide/KORR)
- instance.first_name = validated_data["first_name"]
- instance.last_name = validated_data["last_name"]
+ # TODO Comment back in after it is decided if name updates are allowed
+ # instance.first_name = validated_data["first_name"]
+ # instance.last_name = validated_data["last_name"]
return instance
class Meta:
model = Person
- fields = ("id", "first_name", "last_name", "email", "mobile_phone")
+ fields = (
+ "id",
+ "first_name",
+ "last_name",
+ "email",
+ "mobile_phone",
+ "fnr",
+ "passport",
+ )
read_only_fields = ("id",)
diff --git a/gregui/api/serializers/invitation.py b/gregui/api/serializers/invitation.py
index b1dcda9e88b24dee3cc8f1930fdc4c3a9f5d4c49..18aa892677febf3360f76e90bdd1e70460ed2dca 100644
--- a/gregui/api/serializers/invitation.py
+++ b/gregui/api/serializers/invitation.py
@@ -5,13 +5,13 @@ from django.utils import timezone
from rest_framework import serializers
from greg.models import Invitation, InvitationLink, Person, Role, Identity
-from gregui.api.serializers.role import RoleSerializerUi
+from gregui.api.serializers.role import InviteRoleSerializerUi
from gregui.models import GregUserProfile
class InviteGuestSerializer(serializers.ModelSerializer):
email = serializers.EmailField(required=True)
- role = RoleSerializerUi(required=True)
+ role = InviteRoleSerializerUi(required=True)
uuid = serializers.UUIDField(read_only=True)
def create(self, validated_data):
@@ -30,7 +30,7 @@ class InviteGuestSerializer(serializers.ModelSerializer):
source="greg",
)
role_data["person"] = person
- role_data["sponsor_id"] = user.sponsor
+ role_data["sponsor"] = user.sponsor
role = Role.objects.create(**role_data)
invitation = Invitation.objects.create(role=role)
InvitationLink.objects.create(
diff --git a/gregui/api/serializers/ouidentifier.py b/gregui/api/serializers/ouidentifier.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1a60c2fdd87c4d32ef7ecbe59077bb449d9da0c
--- /dev/null
+++ b/gregui/api/serializers/ouidentifier.py
@@ -0,0 +1,9 @@
+from rest_framework.serializers import ModelSerializer
+
+from greg.models import OuIdentifier
+
+
+class IdentifierSerializer(ModelSerializer):
+ class Meta:
+ model = OuIdentifier
+ fields = ("id", "name", "source", "value")
diff --git a/gregui/api/serializers/role.py b/gregui/api/serializers/role.py
index 1946e6ea9ba9b4412baa5295a936f7df26deccd1..722c8e8f4a71f8387d525093d766c778263b8b60 100644
--- a/gregui/api/serializers/role.py
+++ b/gregui/api/serializers/role.py
@@ -1,13 +1,104 @@
-from rest_framework.serializers import ModelSerializer
+import datetime
+from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
+from rest_framework.validators import UniqueTogetherValidator
from greg.models import Role
-class RoleSerializerUi(ModelSerializer):
+class RoleSerializerUi(serializers.ModelSerializer):
+ """Serializer for the Role model with validation of various fields"""
+
+ class Meta:
+ model = Role
+ fields = [
+ "orgunit",
+ "start_date",
+ "type",
+ "end_date",
+ "contact_person_unit",
+ "comments",
+ "available_in_search",
+ "person",
+ ]
+ validators = [
+ UniqueTogetherValidator(
+ queryset=Role.objects.all(),
+ fields=["person", "type", "orgunit", "start_date", "end_date"],
+ )
+ ]
+
+ def validate_start_date(self, start_date):
+ today = datetime.date.today()
+ # New start dates cannot be in the past
+ if start_date < today:
+ raise serializers.ValidationError("Start date cannot be in the past")
+
+ return start_date
+
+ def validate_end_date(self, end_date):
+ """Ensure rules for end_date are followed"""
+ today = datetime.date.today()
+ if end_date < today:
+ raise serializers.ValidationError("End date cannot be in the past")
+ if self.instance and self.instance.end_date < today:
+ raise serializers.ValidationError("Role has ended, cannot change end date")
+ return end_date
+
+ def validate_orgunit(self, unit):
+ """Enforce rules related to orgunit"""
+ sponsor = self.context["sponsor"]
+ units = sponsor.units.all()
+ # Restrict to a sponsor's own units
+ if not units or unit not in units:
+ raise ValidationError(
+ "A sponsor can only make changes to roles at units they are sponsors for."
+ )
+ # If we are updating an existing roles, we must be the sponsor of the role
+ if self.instance and self.instance.sponsor != sponsor:
+ raise ValidationError("You can only edit your own roles.")
+ return unit
+
+ def validate(self, attrs):
+ """Validate things that need access to multiple fields"""
+ # Ensure end date is not further into the future than the role type allows
+ today = datetime.date.today()
+ if self.instance:
+ max_days = today + datetime.timedelta(days=self.instance.type.max_days)
+ else:
+ max_days = today + datetime.timedelta(days=attrs["type"].max_days)
+ if attrs["end_date"] > max_days:
+ raise serializers.ValidationError(
+ f"New end date too far into the future for this type. Must be before {max_days.strftime('%Y-%m-%d')}"
+ )
+ # Ensure end date is after start date if start date is set
+ if self.instance:
+ start_date = attrs.get("start_date") or self.instance.start_date
+ end_date = attrs.get("end_date") or self.instance.end_date
+ if start_date and end_date < start_date:
+ raise serializers.ValidationError(
+ "End date cannot be before start date."
+ )
+ else:
+ if attrs.get("start_date") and attrs["end_date"] < attrs["start_date"]:
+ raise serializers.ValidationError(
+ "End date cannot be before start date."
+ )
+ return attrs
+
+
+class InviteRoleSerializerUi(RoleSerializerUi):
+ """
+ Serializer for the role part of an invite.
+
+ This one exists so that we don't have to specify the person argument on the role.
+ Simply reuses all the logic of the parent class except requiring the person field.
+ """
+
class Meta:
model = Role
fields = [
- "orgunit_id",
+ "orgunit",
"start_date",
"type",
"end_date",
diff --git a/gregui/api/serializers/roletype.py b/gregui/api/serializers/roletype.py
index 5f1857d69d2ceb8a9e980d9041a99a56386c7ed5..d2adecea1231870408f67ac3d48631f5e4215322 100644
--- a/gregui/api/serializers/roletype.py
+++ b/gregui/api/serializers/roletype.py
@@ -6,4 +6,4 @@ from greg.models import RoleType
class RoleTypeSerializerUi(ModelSerializer):
class Meta:
model = RoleType
- fields = ("id", "identifier", "name_en", "name_nb")
+ fields = ("id", "identifier", "name_en", "name_nb", "max_days")
diff --git a/gregui/api/serializers/unit.py b/gregui/api/serializers/unit.py
index c32945cbaf25cf3c927b57d8514f8801f9208555..565253ee02b4a3f76bbab69f1a1f7ff25efd6b62 100644
--- a/gregui/api/serializers/unit.py
+++ b/gregui/api/serializers/unit.py
@@ -1,9 +1,12 @@
from rest_framework.serializers import ModelSerializer
from greg.models import OrganizationalUnit
+from gregui.api.serializers.ouidentifier import IdentifierSerializer
class UnitSerializerId(ModelSerializer):
+ identifiers = IdentifierSerializer(many=True, read_only=True)
+
class Meta:
model = OrganizationalUnit
- fields = ("orgreg_id", "name_nb", "name_en")
+ fields = ("name_nb", "name_en", "identifiers")
diff --git a/gregui/api/urls.py b/gregui/api/urls.py
index e5b04c50770d4f49878d8cae700d0d4fd677d102..49a4902f5730cf416cf206b0bfc6bbdaf2a820aa 100644
--- a/gregui/api/urls.py
+++ b/gregui/api/urls.py
@@ -4,19 +4,26 @@ from rest_framework.routers import DefaultRouter
from gregui.api.views.invitation import (
CheckInvitationView,
- CreateInvitationView,
+ InvitationView,
InvitedGuestView,
)
+from gregui.api.views.person import PersonSearchView, PersonView
+from gregui.api.views.role import RoleInfoViewSet
from gregui.api.views.roletypes import RoleTypeViewSet
from gregui.api.views.unit import UnitsViewSet
router = DefaultRouter(trailing_slash=False)
+router.register(r"role", RoleInfoViewSet, basename="role")
urlpatterns = router.urls
urlpatterns += [
re_path(r"roletypes/$", RoleTypeViewSet.as_view(), name="role-types"),
re_path(r"units/$", UnitsViewSet.as_view(), name="units"),
path("invited/", InvitedGuestView.as_view(), name="invited-info"),
- path("invited/<uuid>", CheckInvitationView.as_view(), name="invite-verify"),
- path("invite/", CreateInvitationView.as_view(), name="invite-create"),
+ path("invitecheck/", CheckInvitationView.as_view(), name="invite-verify"),
+ path("invite/", InvitationView.as_view(), name="invitation"),
+ path("person/<int:id>", PersonView.as_view(), name="person-get"),
+ path(
+ "person/search/<searchstring>", PersonSearchView.as_view(), name="person-search"
+ ),
]
diff --git a/gregui/api/views/invitation.py b/gregui/api/views/invitation.py
index 176976302487930c0f415d87363b6f0002db152f..a7feaa10006d7417df5ebfac9afbd72ea89b053e 100644
--- a/gregui/api/views/invitation.py
+++ b/gregui/api/views/invitation.py
@@ -1,31 +1,29 @@
-import json
-import datetime
-from uuid import uuid4
+from enum import Enum
+from typing import Optional
+
from django.core import exceptions
from django.db import transaction
from django.http.response import JsonResponse
-
from django.utils import timezone
-from rest_framework import serializers, status
+from rest_framework import status
from rest_framework.authentication import SessionAuthentication, BasicAuthentication
-from rest_framework.generics import CreateAPIView, GenericAPIView
+from rest_framework.generics import CreateAPIView, GenericAPIView, DestroyAPIView
from rest_framework.parsers import JSONParser
-from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.permissions import AllowAny
from rest_framework.response import Response
+from rest_framework.throttling import AnonRateThrottle
from rest_framework.views import APIView
-from greg.models import Identity, Invitation, InvitationLink, Person, Role, Sponsor
+from greg.models import Identity, InvitationLink, Person
from greg.permissions import IsSponsor
from gregui.api.serializers.guest import GuestRegisterSerializer
from gregui.api.serializers.invitation import InviteGuestSerializer
-
-
from gregui.models import GregUserProfile
-class CreateInvitationView(CreateAPIView):
+class InvitationView(CreateAPIView, DestroyAPIView):
"""
- Invitation creation endpoint
+ Endpoint for invitation creation and cancelling
{
@@ -33,7 +31,7 @@ class CreateInvitationView(CreateAPIView):
"last_name": "sss",
"date_of_birth": null,
"role": {
- "orgunit_id": 1,
+ "orgunit": 1,
"start_date": null,
"type": 1,
"end_date": "2021-12-15",
@@ -61,27 +59,47 @@ class CreateInvitationView(CreateAPIView):
"""
sponsor_user = GregUserProfile.objects.get(user=request.user)
serializer = self.serializer_class(
- data=request.data, context={"request": request}
+ data=request.data,
+ context={"request": request, "sponsor": sponsor_user.sponsor},
)
serializer.is_valid(raise_exception=True)
-
- # TODO: check that sponsor has access to OU
person = serializer.save()
invitationlink = InvitationLink.objects.filter(
- invitation__role__person=person.id,
- invitation__role__sponsor_id=sponsor_user.sponsor,
+ invitation__role__person_id=person.id,
+ invitation__role__sponsor_id=sponsor_user.sponsor.id,
)
# TODO: send email to invited guest
print(invitationlink)
return Response(status=status.HTTP_201_CREATED)
+ def delete(self, request, *args, **kwargs) -> Response:
+ role_id = request.query_params["role_id"]
+ invitationlink = InvitationLink.objects.get(invitation__role_id=int(role_id))
+
+ # TODO Determine if person should be deleted as well
+ if invitationlink:
+ if (
+ invitationlink.invitation.role.person.is_registered
+ or invitationlink.invitation.role.person.is_verified
+ ):
+ # The guest has already gone through the registration step. The guest should
+ # not be verified, but including that check just in case here
+ return Response(status.HTTP_400_BAD_REQUEST)
+
+ # Delete the role, the cascading will cause all the invitation links connected
+ # to it to be removed as well
+ invitationlink.invitation.role.delete()
+
+ return Response(status=status.HTTP_200_OK)
+
class CheckInvitationView(APIView):
authentication_classes = []
permission_classes = [AllowAny]
+ throttle_classes = [AnonRateThrottle]
- def get(self, request, *args, **kwargs):
+ def post(self, request, *args, **kwargs):
"""
Endpoint for verifying and setting invite_id in session.
@@ -89,8 +107,12 @@ class CheckInvitationView(APIView):
page you get to by following the invitation url to the frontend. This way a
session is created keeping the invite id safe, until the user returns from
feide login if they choose to use it.
+
+ Uses post to prevent invite id from showing up in various logs.
"""
- invite_id = kwargs["uuid"]
+ invite_id = request.data.get("uuid")
+ if not invite_id:
+ return Response(status=status.HTTP_403_FORBIDDEN)
try:
invite_link = InvitationLink.objects.get(uuid=invite_id)
except (InvitationLink.DoesNotExist, exceptions.ValidationError):
@@ -101,12 +123,21 @@ class CheckInvitationView(APIView):
return Response(status=status.HTTP_200_OK)
+class SessionType(Enum):
+ INVITE = "invite"
+ FEIDE = "feide"
+
+
class InvitedGuestView(GenericAPIView):
authentication_classes = [SessionAuthentication, BasicAuthentication]
+ # The endpoint is only for invited guests, but the authorization happens in the actual method
permission_classes = [AllowAny]
parser_classes = [JSONParser]
serializer_class = GuestRegisterSerializer
+ # TODO Update to make dynamic based on where we get the information from. If we get some from Feide, then the user should not be allowed to change it
+ fields_allowed_to_update = ["email", "fnr", "mobile_phone", "passport"]
+
def get(self, request, *args, **kwargs):
"""
Endpoint for fetching data related to an invite
@@ -127,16 +158,22 @@ class InvitedGuestView(GenericAPIView):
invite_link = InvitationLink.objects.get(uuid=invite_id)
role = invite_link.invitation.role
person = role.person
- sponsor = role.sponsor_id
+ sponsor = role.sponsor
- try:
- fnr = person.identities.get(type="norwegian_national_id_number").value
- except Identity.DoesNotExist:
- fnr = None
- try:
- passport = person.identities.get(type="passport_number").value
- except Identity.DoesNotExist:
- passport = None
+ # If the user is not logged in then tell the client to take him through the manual registration process
+ session_type = (
+ SessionType.INVITE.value
+ if request.user.is_anonymous
+ else SessionType.FEIDE.value
+ )
+
+ fnr = self._get_identity_or_none(
+ person, Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER
+ )
+ passport = self._get_identity_or_none(
+ person, Identity.IdentityType.PASSPORT_NUMBER
+ )
+ feide_id = self._get_identity_or_none(person, Identity.IdentityType.FEIDE_ID)
data = {
"person": {
@@ -146,20 +183,22 @@ class InvitedGuestView(GenericAPIView):
"mobile_phone": person.private_mobile and person.private_mobile.value,
"fnr": fnr,
"passport": passport,
+ "feide_id": feide_id,
},
"sponsor": {
"first_name": sponsor.first_name,
"last_name": sponsor.last_name,
},
"role": {
- "ou_name_nb": role.orgunit_id.name_nb,
- "ou_name_en": role.orgunit_id.name_en,
+ "ou_name_nb": role.orgunit.name_nb,
+ "ou_name_en": role.orgunit.name_en,
"role_name_nb": role.type.name_nb,
"role_name_en": role.type.name_en,
"start": role.start_date,
"end": role.end_date,
"comments": role.comments,
},
+ "meta": {"session_type": session_type},
}
return JsonResponse(data=data, status=status.HTTP_200_OK)
@@ -172,7 +211,6 @@ class InvitedGuestView(GenericAPIView):
the guest.
"""
invite_id = request.session.get("invite_id")
- data = request.data
# Ensure the invitation link is valid and not expired
try:
@@ -184,8 +222,21 @@ class InvitedGuestView(GenericAPIView):
person = invite_link.invitation.role.person
+ data = request.data
+
+ if self._verified_fnr_already_exists(person) and "fnr" in data:
+ # The user should not be allowed to change a verified fnr
+ return Response(status=status.HTTP_400_BAD_REQUEST)
+
+ if not self._only_allowed_fields_in_request(data):
+ return Response(status=status.HTTP_400_BAD_REQUEST)
+
with transaction.atomic():
- serializer = self.get_serializer(instance=person, data=request.data)
+ # Note this only serializes data for the person, it does not look at other sections
+ # in the response that happen to be there
+ serializer = self.get_serializer(
+ instance=person, data=request.data["person"]
+ )
serializer.is_valid(raise_exception=True)
person = serializer.save()
@@ -198,3 +249,31 @@ class InvitedGuestView(GenericAPIView):
invite_link.save()
# TODO: Send an email to the sponsor?
return Response(status=status.HTTP_200_OK)
+
+ def _verified_fnr_already_exists(self, person) -> bool:
+ try:
+ person.identities.get(
+ type=Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER,
+ verified=Identity.Verified.AUTOMATIC,
+ )
+ return True
+ except Identity.DoesNotExist:
+ return False
+
+ def _only_allowed_fields_in_request(self, request_data) -> bool:
+ # Check how many of the allowed fields are filled in
+ person_data = request_data["person"]
+ number_of_fields_filled_in = sum(
+ map(lambda x: x in person_data.keys(), self.fields_allowed_to_update)
+ )
+ # Check that there are no other fields filled in
+ return number_of_fields_filled_in == len(person_data.keys())
+
+ @staticmethod
+ def _get_identity_or_none(
+ person: Person, identity_type: Identity.IdentityType
+ ) -> Optional[str]:
+ try:
+ return person.identities.get(type=identity_type).value
+ except Identity.DoesNotExist:
+ return None
diff --git a/gregui/api/views/person.py b/gregui/api/views/person.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5953a28e325c22f537781295d4d8c813010d4d5
--- /dev/null
+++ b/gregui/api/views/person.py
@@ -0,0 +1,78 @@
+from django.http.response import JsonResponse
+from rest_framework.authentication import SessionAuthentication, BasicAuthentication
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.views import APIView
+
+from greg.models import Identity, Person
+from greg.permissions import IsSponsor
+
+
+class PersonView(APIView):
+ """
+ Fetch person info for any guest as long as you are a sponsor
+
+ This is required for the functionality where a sponsor wants to add a guest role to
+ an already existing person that is not already their guest.
+
+ Returns enough information to fill a profile page in the frontend
+ """
+
+ authentication_classes = [SessionAuthentication, BasicAuthentication]
+ permission_classes = [IsAuthenticated, IsSponsor]
+
+ def get(self, request, id):
+ person = Person.objects.get(id=id)
+ response = {
+ "pid": person.id,
+ "first": person.first_name,
+ "last": person.last_name,
+ "email": person.private_email and person.private_email.value,
+ "mobile": person.private_mobile and person.private_mobile.value,
+ "fnr": person.fnr and "".join((person.fnr.value[:-5], "*****")),
+ "active": person.is_registered and person.is_verified,
+ "registered": person.is_registered,
+ "verified": person.is_verified,
+ "roles": [
+ {
+ "id": role.id,
+ "name_nb": role.type.name_nb,
+ "name_en": role.type.name_en,
+ "ou_nb": role.orgunit.name_nb,
+ "ou_en": role.orgunit.name_en,
+ "start_date": role.start_date,
+ "end_date": role.end_date,
+ "max_days": role.type.max_days,
+ }
+ for role in person.roles.all()
+ ],
+ }
+ return JsonResponse(response)
+
+
+class PersonSearchView(APIView):
+ """Search for persons using email or phone number"""
+
+ authentication_classes = [SessionAuthentication, BasicAuthentication]
+ permission_classes = [IsAuthenticated, IsSponsor]
+
+ def get(self, requests, searchstring):
+ search = Identity.objects.filter(
+ value__icontains=searchstring, # icontains to include wrong case emails
+ type__in=[
+ Identity.IdentityType.PRIVATE_EMAIL,
+ Identity.IdentityType.PRIVATE_MOBILE_NUMBER,
+ ],
+ )[:10]
+ response = {
+ "persons": [
+ {
+ "pid": i.person.id,
+ "first": i.person.first_name,
+ "last": i.person.last_name,
+ "value": i.value,
+ "type": i.type,
+ }
+ for i in search
+ ]
+ }
+ return JsonResponse(response)
diff --git a/gregui/api/views/role.py b/gregui/api/views/role.py
new file mode 100644
index 0000000000000000000000000000000000000000..7424b2858c5d60b845c3d5eb8146491cd41a7e74
--- /dev/null
+++ b/gregui/api/views/role.py
@@ -0,0 +1,46 @@
+from django.db import transaction
+from rest_framework import serializers, status
+from rest_framework.authentication import BasicAuthentication, SessionAuthentication
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+
+from greg.models import Role
+from greg.permissions import IsSponsor
+from gregui.api.serializers.role import RoleSerializerUi
+from gregui.models import GregUserProfile
+
+
+class RoleInfoViewSet(ModelViewSet):
+ queryset = Role.objects.all()
+ authentication_classes = [SessionAuthentication, BasicAuthentication]
+ permission_classes = [IsAuthenticated, IsSponsor]
+ serializer_class = RoleSerializerUi
+
+ def partial_update(self, request, pk):
+ role = Role.objects.get(pk=pk)
+ sponsor = GregUserProfile.objects.get(user=self.request.user).sponsor
+ with transaction.atomic():
+ serializer = self.serializer_class(
+ instance=role,
+ data=request.data,
+ partial=True,
+ context={"sponsor": sponsor},
+ )
+ serializer.is_valid(raise_exception=True)
+ instance = serializer.update(role, serializer.validated_data)
+ instance.save()
+ return Response(status=status.HTTP_200_OK)
+
+ def create(self, request):
+ sponsor = GregUserProfile.objects.get(user=self.request.user).sponsor
+ with transaction.atomic():
+ serializer = self.serializer_class(
+ data=request.data,
+ context={
+ "sponsor": sponsor,
+ },
+ )
+ serializer.is_valid(raise_exception=True)
+ serializer.save(sponsor=sponsor)
+ return Response(status=status.HTTP_201_CREATED)
diff --git a/gregui/api/views/userinfo.py b/gregui/api/views/userinfo.py
index 3a4a0d4133499c4301042d43929cfa977de8bd87..980cbd31454413298678b420e06bfa3d17b0f490 100644
--- a/gregui/api/views/userinfo.py
+++ b/gregui/api/views/userinfo.py
@@ -68,16 +68,16 @@ class UserInfoView(APIView):
{
"roles": [
{
- "ou_name_nb": role.orgunit_id.name_nb,
- "ou_name_en": role.orgunit_id.name_en,
+ "ou_name_nb": role.orgunit.name_nb,
+ "ou_name_en": role.orgunit.name_en,
"role_name_nb": role.type.name_nb,
"role_name_en": role.type.name_en,
"start": role.start_date,
"end": role.end_date,
"comments": role.comments,
"sponsor": {
- "first_name": role.sponsor_id.first_name,
- "last_name": role.sponsor_id.last_name,
+ "first_name": role.sponsor.first_name,
+ "last_name": role.sponsor.last_name,
},
}
for role in roles.all()
@@ -105,16 +105,16 @@ class UserInfoView(APIView):
"passport": passports and passports.value,
"roles": [
{
- "ou_name_nb": role.orgunit_id.name_nb,
- "ou_name_en": role.orgunit_id.name_en,
+ "ou_name_nb": role.orgunit.name_nb,
+ "ou_name_en": role.orgunit.name_en,
"role_name_nb": role.type.name_nb,
"role_name_en": role.type.name_en,
"start": role.start_date,
"end": role.end_date,
"comments": role.comments,
"sponsor": {
- "first_name": role.sponsor_id.first_name,
- "last_name": role.sponsor_id.last_name,
+ "first_name": role.sponsor.first_name,
+ "last_name": role.sponsor.last_name,
},
}
for role in person.roles.all()
diff --git a/gregui/authentication/auth_backends.py b/gregui/authentication/auth_backends.py
index 484b4b157aed97a04fc24aa6c368836c4628ce0b..a296b9a7aee0c0da712ec922fcb30d16dd896d5c 100644
--- a/gregui/authentication/auth_backends.py
+++ b/gregui/authentication/auth_backends.py
@@ -11,6 +11,7 @@ from django.contrib.auth import get_user_model
from django.contrib.auth.backends import BaseBackend, UserModel
from django.core.exceptions import SuspiciousOperation
from django.utils.timezone import make_aware
+
from mozilla_django_oidc.auth import OIDCAuthenticationBackend
from greg.models import Identity, Person, Sponsor, InvitationLink
diff --git a/gregui/mailutils.py b/gregui/mailutils.py
index 19795179783c9b54b8b60652045159895fa2618b..9ccbe5e3dad930357c69fb3c261253afc0034d73 100644
--- a/gregui/mailutils.py
+++ b/gregui/mailutils.py
@@ -1,41 +1,64 @@
+from typing import Union
from django.conf import settings
-from django.template.loader import render_to_string
+from django.template.context import Context
from django_q.tasks import async_task
+from gregui.models import EmailTemplate
-def registration_template(institution, sponsor) -> str:
- keywords = {
- "institution": institution,
- "sponsor": sponsor,
- "registration_link": "www.google.com",
- }
- return render_to_string("guest_registration.txt", keywords)
+def prepare_arguments(
+ template: EmailTemplate, context: dict[str, str], mail_to: str
+) -> dict[str, Union[str, list[str]]]:
+ """Combine input to a dict ready for use as arguments ti django's send_mail"""
+ return {
+ "subject": template.get_subject(context),
+ "message": template.get_body(context),
+ "from_email": template.from_email or None,
+ "recipient_list": [mail_to],
+ }
-def confirmation_template(guest) -> str:
- keywords = {"guest": guest, "confirmation_link": "www.google.com"}
- return render_to_string("sponsor_confirmation.txt", keywords)
+def registration_template(
+ institution: str, sponsor: str, mail_to: str
+) -> dict[str, Union[str, list[str]]]:
+ """
+ Prepare email for registration
-def send_registration_mail(mail_to, sponsor) -> str:
- return async_task(
- "django.core.mail.send_mail",
- **{
- "subject": "Subject",
- "message": registration_template(settings.INSTANCE_NAME, sponsor),
- "from_email": None,
- "recipient_list": [mail_to],
+ Produces a complete set of arguments ready for use with django.core.mail.send_mail
+ when sending a registration email to the guest.
+ """
+ template = EmailTemplate.objects.get(
+ template_key=EmailTemplate.EmailType.GUEST_REGISTRATION
+ )
+ context = Context(
+ {
+ "institution": institution,
+ "sponsor": sponsor,
+ "registration_link": "www.google.com",
}
)
+ return prepare_arguments(template, context, mail_to)
-def send_confirmation_mail(mail_to, guest) -> str:
- return async_task(
- "django.core.mail.send_mail",
- **{
- "subject": "Subject",
- "message": confirmation_template(guest),
- "from_email": None,
- "recipient_list": [mail_to],
- }
+def confirmation_template(guest: str, mail_to: str) -> dict[str, Union[str, list[str]]]:
+ """
+ Prepare email for confirmation
+
+ Produces a complete set of arguments ready for use with django.core.mail.send_mail
+ when sending a confirmation email to the sponsor.
+ """
+ template = EmailTemplate.objects.get(
+ template_key=EmailTemplate.EmailType.SPONSOR_CONFIRMATION
)
+ context = Context({"guest": guest, "confirmation_link": "www.google.com"})
+ return prepare_arguments(template, context, mail_to)
+
+
+def send_registration_mail(mail_to: str, sponsor: str) -> str:
+ arguments = registration_template(settings.INSTANCE_NAME, sponsor, mail_to)
+ return async_task("django.core.mail.send_mail", **arguments)
+
+
+def send_confirmation_mail(mail_to: str, guest: str) -> str:
+ arguments = confirmation_template(guest, mail_to)
+ return async_task("django.core.mail.send_mail", **arguments)
diff --git a/gregui/migrations/0002_emailtemplate.py b/gregui/migrations/0002_emailtemplate.py
new file mode 100644
index 0000000000000000000000000000000000000000..15c4b7b6a3c3b1fe58631cb3b613f54d40eb736e
--- /dev/null
+++ b/gregui/migrations/0002_emailtemplate.py
@@ -0,0 +1,48 @@
+# Generated by Django 3.2.8 on 2021-11-02 12:49
+
+import dirtyfields.dirtyfields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("gregui", "0001_initial"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="EmailTemplate",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("created", models.DateTimeField(auto_now_add=True)),
+ ("updated", models.DateTimeField(auto_now=True)),
+ (
+ "template_key",
+ models.CharField(
+ choices=[
+ ("guest_registration", "Guest Registration"),
+ ("sponsor_confirmation", "Sponsor Confirmation"),
+ ],
+ max_length=64,
+ unique=True,
+ ),
+ ),
+ ("subject", models.CharField(blank=True, max_length=255, null=True)),
+ ("from_email", models.CharField(blank=True, max_length=255, null=True)),
+ ("body", models.TextField(blank=True, null=True)),
+ ],
+ options={
+ "abstract": False,
+ },
+ bases=(dirtyfields.dirtyfields.DirtyFieldsMixin, models.Model),
+ ),
+ ]
diff --git a/gregui/models.py b/gregui/models.py
index 48b579bed9dae968c69c4e84f5ebce32171b7cd6..551b20f8127c5a265b39f69b027381ef99a25292 100644
--- a/gregui/models.py
+++ b/gregui/models.py
@@ -1,3 +1,4 @@
+from django import template
from django.conf import settings
from django.db import models
from django.utils.translation import gettext_lazy
@@ -24,3 +25,34 @@ class GregUserProfile(BaseModel):
null=True,
)
userid_feide = models.CharField(gettext_lazy("userid-feide"), max_length=150)
+
+
+class EmailTemplate(BaseModel):
+ """
+ Stores templates for emails.
+
+ Only one template of each type is allowed. To introduce new ones, simply add a new
+ EmailType.
+ """
+
+ class EmailType(models.TextChoices):
+ """Types of Emails"""
+
+ GUEST_REGISTRATION = "guest_registration"
+ SPONSOR_CONFIRMATION = "sponsor_confirmation"
+
+ template_key = models.CharField(
+ max_length=64, choices=EmailType.choices, unique=True
+ )
+ subject = models.CharField(max_length=255, blank=True, null=True)
+ from_email = models.CharField(max_length=255, blank=True, null=True)
+ body = models.TextField(blank=True, null=True)
+
+ def get_rendered_template(self, tpl, context):
+ return template.Template(tpl).render(context)
+
+ def get_subject(self, context):
+ return self.get_rendered_template(self.subject, context)
+
+ def get_body(self, context):
+ return self.get_rendered_template(self.body, context)
diff --git a/gregui/tests/api/test_invitation.py b/gregui/tests/api/test_invitation.py
index b1dfd1df053e7a2500e96d916e0975b1a0b48aeb..cfe46caa94ff6f9511970941fb2bf4823b747581 100644
--- a/gregui/tests/api/test_invitation.py
+++ b/gregui/tests/api/test_invitation.py
@@ -4,23 +4,21 @@ from rest_framework import status
from rest_framework.reverse import reverse
from rest_framework.test import APIClient
-from greg.models import InvitationLink, Person
+from greg.models import InvitationLink, Person, Identity
@pytest.mark.django_db
def test_get_invite(client):
"""Forbid access with bad invitation link uuid"""
- response = client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": "baduuid"})
- )
+ response = client.post(reverse("gregui-v1:invite-verify"), data={"uuid": "baduuid"})
assert response.status_code == status.HTTP_403_FORBIDDEN
@pytest.mark.django_db
def test_get_invite_ok(client, invitation_link):
"""Access okay with valid invitation link"""
- response = client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
+ response = client.post(
+ reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid}
)
assert response.status_code == status.HTTP_200_OK
@@ -28,10 +26,8 @@ def test_get_invite_ok(client, invitation_link):
@pytest.mark.django_db
def test_get_invite_expired(client, invitation_link_expired):
"""Forbid access with expired invite link"""
- response = client.get(
- reverse(
- "gregui-v1:invite-verify", kwargs={"uuid": invitation_link_expired.uuid}
- )
+ response = client.post(
+ reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link_expired.uuid}
)
assert response.status_code == status.HTTP_403_FORBIDDEN
@@ -49,9 +45,7 @@ def test_get_invited_info_session_okay(
person, invitation_link = invited_person
# get a session
- client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
- )
+ client.post(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
# Get info
response = client.get(reverse("gregui-v1:invited-info"))
assert response.status_code == status.HTTP_200_OK
@@ -63,6 +57,7 @@ def test_get_invited_info_session_okay(
mobile_phone=None,
fnr=person.fnr.value,
passport=None,
+ feide_id=None,
)
assert data.get("sponsor") == dict(
first_name=sponsor_foo_data["first_name"],
@@ -84,9 +79,7 @@ def test_get_invited_info_expired_link(
client, invitation_link, invitation_expired_date
):
# Get a session while link is valid
- client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
- )
+ client.get(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
# Set expire link to expire long ago
invlink = InvitationLink.objects.get(uuid=invitation_link.uuid)
invlink.expire = invitation_expired_date
@@ -102,9 +95,7 @@ def test_invited_guest_can_post_information(
client: APIClient, invitation_link, person_invited
):
# get a session
- client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
- )
+ client.post(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
person = invitation_link.invitation.role.person
assert person.private_mobile is None
@@ -128,7 +119,6 @@ def test_invited_guest_can_post_information(
# Check that the object was updated in the database
assert Person.objects.count() == 1
- assert person.private_email.value == new_email
assert person.private_mobile.value == new_phone
@@ -137,9 +127,7 @@ def test_post_invited_info_expired_session(
client, invitation_link, invitation_expired_date
):
# get a session
- client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
- )
+ client.post(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
# Set expire link to expire long ago
invlink = InvitationLink.objects.get(uuid=invitation_link.uuid)
invlink.expire = invitation_expired_date
@@ -153,9 +141,7 @@ def test_post_invited_info_expired_session(
@pytest.mark.django_db
def test_post_invited_info_deleted_inv_link(client, invitation_link):
# get a session
- client.get(
- reverse("gregui-v1:invite-verify", kwargs={"uuid": invitation_link.uuid})
- )
+ client.post(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
# Delete link
invlink = InvitationLink.objects.get(uuid=invitation_link.uuid)
invlink.delete()
@@ -163,3 +149,111 @@ def test_post_invited_info_deleted_inv_link(client, invitation_link):
# invitation link
response = client.post(reverse("gregui-v1:invited-info"))
assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+@pytest.mark.django_db
+def test_post_invited_info_invalid_national_id_number(
+ client, invitation_link, person_foo_data, person
+):
+ data = {
+ "person": {
+ "mobile_phone": "+4707543001",
+ "email": "test@example.com",
+ "fnr": "123",
+ }
+ }
+ url = reverse("gregui-v1:invited-info")
+
+ assert person.fnr is None
+
+ session = client.session
+ session["invite_id"] = str(invitation_link.uuid)
+ session.save()
+
+ response = client.post(url, data, format="json")
+
+ # The request should fail and the fnr-property should stay unchanged
+ assert response.status_code == status.HTTP_400_BAD_REQUEST
+ person.refresh_from_db()
+ assert person.fnr is None
+
+
+@pytest.mark.django_db
+def test_post_invited_info_valid_national_id_number(
+ client, invitation_link, person_foo_data, person
+):
+ fnr = "11120618212"
+ data = {
+ "person": {
+ "mobile_phone": "+4797543992",
+ "email": "test@example.com",
+ "fnr": fnr,
+ }
+ }
+ url = reverse("gregui-v1:invited-info")
+
+ assert person.fnr is None
+
+ session = client.session
+ session["invite_id"] = str(invitation_link.uuid)
+ session.save()
+
+ response = client.post(url, data, format="json")
+
+ assert response.status_code == status.HTTP_200_OK
+ person.refresh_from_db()
+ assert person.fnr.value == fnr
+
+
+@pytest.mark.django_db
+def test_email_update(client, invitation_link, person_foo_data, person):
+ email_test = "test@example.com"
+ url = reverse("gregui-v1:invited-info")
+
+ Identity.objects.create(
+ person=person,
+ type=Identity.IdentityType.PRIVATE_EMAIL,
+ value=email_test,
+ )
+ person.private_email.refresh_from_db()
+ assert person.private_email.value == email_test
+
+ session = client.session
+ session["invite_id"] = str(invitation_link.uuid)
+ session.save()
+
+ data = {"person": {"mobile_phone": "+4797543992", "email": "test2@example.com"}}
+ response = client.post(url, data, format="json")
+ assert response.status_code == status.HTTP_200_OK
+
+ person.private_email.refresh_from_db()
+ assert person.private_email.value == "test2@example.com"
+
+
+@pytest.mark.django_db
+def test_register_passport(client, invitation_link, person_foo_data, person):
+ passport_information = "EN-123456789"
+ data = {"person": {"mobile_phone": "+4797543992", "passport": passport_information}}
+ url = reverse("gregui-v1:invited-info")
+
+ session = client.session
+ session["invite_id"] = str(invitation_link.uuid)
+ session.save()
+
+ assert (
+ Identity.objects.filter(
+ person__id=person.id, type=Identity.IdentityType.PASSPORT_NUMBER
+ ).count()
+ == 0
+ )
+
+ response = client.post(url, data, format="json")
+
+ assert response.status_code == status.HTTP_200_OK
+ person.refresh_from_db()
+
+ registered_passport = Identity.objects.filter(
+ person__id=person.id, type=Identity.IdentityType.PASSPORT_NUMBER
+ ).get()
+
+ assert registered_passport.value == passport_information
diff --git a/gregui/tests/api/test_invite_guest.py b/gregui/tests/api/test_invite_guest.py
index 55a962e330cf5bd92fbbf94f511da9f41ecfec73..4c819f997aeb91f7d2ef638d4dcbec8b9f113ba6 100644
--- a/gregui/tests/api/test_invite_guest.py
+++ b/gregui/tests/api/test_invite_guest.py
@@ -1,35 +1,41 @@
+import datetime
import pytest
from rest_framework import status
from rest_framework.reverse import reverse
from rest_framework.test import APIRequestFactory, force_authenticate
-from greg.models import Identity, Person
-from gregui.api.views.invitation import CreateInvitationView
+from greg.models import Identity, Person, Role, Invitation, InvitationLink
+from gregui.api.views.invitation import InvitationView
@pytest.mark.django_db
def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo):
+ test_comment = "This is a test comment"
+ contact_person_unit = "This is a test contact person"
+ role_start_date = datetime.datetime.today() + datetime.timedelta(days=1)
+ role_end_date = datetime.datetime.today() + datetime.timedelta(days=10)
+
data = {
"first_name": "Foo",
"last_name": "Bar",
"email": "test@example.com",
"role": {
- "start_date": "2019-08-06",
- "end_date": "2019-08-10",
- "orgunit_id": unit_foo.id,
+ "start_date": (role_start_date).strftime("%Y-%m-%d"),
+ "end_date": (role_end_date).strftime("%Y-%m-%d"),
+ "orgunit": unit_foo.id,
"type": role_type_foo.id,
+ "comments": test_comment,
+ "contact_person_unit": contact_person_unit,
},
}
- url = reverse("gregui-v1:invite-create")
+ url = reverse("gregui-v1:invitation")
- all_persons = Person.objects.all()
- assert len(all_persons) == 0
+ assert len(Person.objects.all()) == 0
- factory = APIRequestFactory()
- request = factory.post(url, data, format="json")
+ request = APIRequestFactory().post(url, data, format="json")
force_authenticate(request, user=user_sponsor)
- view = CreateInvitationView.as_view()
+ view = InvitationView.as_view()
response = view(request)
assert response.status_code == status.HTTP_201_CREATED
@@ -44,3 +50,31 @@ def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo):
type=Identity.IdentityType.PRIVATE_EMAIL,
value="test@example.com",
).exists()
+
+ role = Role.objects.filter(person__id=person.id).get()
+ assert role.orgunit == unit_foo
+ assert role.type == role_type_foo
+ assert role.start_date == role_start_date.date()
+ assert role.end_date == role_end_date.date()
+ assert role.contact_person_unit == contact_person_unit
+ assert role.comments == test_comment
+
+
+@pytest.mark.django_db
+def test_invite_cancel(
+ client, invitation_link, invitation, role, log_in, sponsor_guy, user_sponsor
+):
+ # TODO: Should all sponsors be allowed to delete arbitrary invitations?
+ log_in(user_sponsor)
+ url = reverse("gregui-v1:invitation")
+
+ # Check that the role is there
+ role = Role.objects.get(id=role.id)
+ response = client.delete("%s?role_id=%s" % (url, str(role.id)))
+
+ assert response.status_code == status.HTTP_200_OK
+
+ # The role, invitation and connected links should now have been removed
+ assert Role.objects.filter(id=role.id).count() == 0
+ assert Invitation.objects.filter(id=invitation.id).count() == 0
+ assert InvitationLink.objects.filter(invitation__id=invitation.id).count() == 0
diff --git a/gregui/tests/conftest.py b/gregui/tests/conftest.py
index f8a702a8c3977c54e7f0c2a94f5a266bd282332b..7aefec5c3794e253207b8fd838fb16cbf2cd7d3d 100644
--- a/gregui/tests/conftest.py
+++ b/gregui/tests/conftest.py
@@ -12,7 +12,6 @@ from django.utils.timezone import make_aware
from rest_framework.authtoken.admin import User
from rest_framework.test import APIClient
-
from greg.models import (
Identity,
Invitation,
@@ -24,12 +23,13 @@ from greg.models import (
Sponsor,
)
-from gregui.models import GregUserProfile
+from gregui.models import EmailTemplate, GregUserProfile
# faker spams the logs with localisation warnings
# see https://github.com/joke2k/faker/issues/753
logging.getLogger("faker").setLevel(logging.ERROR)
+
# OIDC stuff
@pytest.fixture
def claims():
@@ -68,9 +68,7 @@ def client() -> APIClient:
@pytest.fixture
def unit_foo() -> OrganizationalUnit:
- ou = OrganizationalUnit.objects.create(
- orgreg_id="12345", name_en="Foo EN", name_nb="Foo NB"
- )
+ ou = OrganizationalUnit.objects.create(name_en="Foo EN", name_nb="Foo NB")
return OrganizationalUnit.objects.get(id=ou.id)
@@ -398,3 +396,33 @@ def log_in(client) -> Callable[[UserModel], APIClient]:
return client
return _log_in
+
+
+@pytest.fixture
+def confirmation_template():
+ et = EmailTemplate.objects.create(
+ template_key=EmailTemplate.EmailType.SPONSOR_CONFIRMATION,
+ subject="confirmation subject",
+ body="""Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
+Din gjest, {{ guest }}, har fullført registrering, bekreft gjesten her: {{ confirmation_link }}
+
+This message has been automatically generated by the guest registration system.
+Your guest, {{ guest }}, has completed their registration, please confirm the guest here: {{ confirmation_link }}""",
+ )
+ return EmailTemplate.objects.get(id=et.id)
+
+
+@pytest.fixture
+def registration_template():
+ et = EmailTemplate.objects.create(
+ template_key=EmailTemplate.EmailType.GUEST_REGISTRATION,
+ subject="registration subject",
+ body="""Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
+Du har blitt registrert som gjest på {{ institution }} av {{ sponsor }}.
+For å fullføre registreringen av gjestekontoen følg denne lenken: {{ registration_link }}
+
+This message has been automatically generated by the guest registration system.
+You have been registered as a guest at {{ institution }} by {{ sponsor }}.
+To complete the registration of your guest account, please follow this link: {{ registration_link }}""",
+ )
+ return EmailTemplate.objects.get(id=et.id)
diff --git a/gregui/tests/test_mailutils.py b/gregui/tests/test_mailutils.py
index 03f30f3de2d4604859dbf5e1945e47a0830faf4e..7977f4cfac3568e8064c65ebe7d273035d941234 100644
--- a/gregui/tests/test_mailutils.py
+++ b/gregui/tests/test_mailutils.py
@@ -6,33 +6,43 @@ from gregui import mailutils
@pytest.mark.django_db
-def test_registration_template():
- prefilled_template = """Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
+def test_registration_template(registration_template):
+ prefilled_template = {
+ "from_email": None,
+ "recipient_list": ["test@example.com"],
+ "subject": "registration subject",
+ "message": """Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
Du har blitt registrert som gjest på InstanceName av Foo Bar.
For å fullføre registreringen av gjestekontoen følg denne lenken: www.google.com
This message has been automatically generated by the guest registration system.
You have been registered as a guest at InstanceName by Foo Bar.
-To complete the registration of your guest account, please follow this link: www.google.com
-"""
- rendered_template = mailutils.registration_template("InstanceName", "Foo Bar")
+To complete the registration of your guest account, please follow this link: www.google.com""",
+ }
+ rendered_template = mailutils.registration_template(
+ "InstanceName", "Foo Bar", "test@example.com"
+ )
assert rendered_template == prefilled_template
@pytest.mark.django_db
-def test_confirmation_template():
- prefilled_template = """Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
+def test_confirmation_template(confirmation_template):
+ prefilled_template = {
+ "from_email": None,
+ "recipient_list": ["test@example.com"],
+ "subject": "confirmation subject",
+ "message": """Dette er en automatisk generert melding fra gjesteregistreringstjenesten.
Din gjest, Foo Bar, har fullført registrering, bekreft gjesten her: www.google.com
This message has been automatically generated by the guest registration system.
-Your guest, Foo Bar, has completed their registration, please confirm the guest here: www.google.com
-"""
- rendered_template = mailutils.confirmation_template("Foo Bar")
+Your guest, Foo Bar, has completed their registration, please confirm the guest here: www.google.com""",
+ }
+ rendered_template = mailutils.confirmation_template("Foo Bar", "test@example.com")
assert rendered_template == prefilled_template
@pytest.mark.django_db
-def test_registration_mail():
+def test_registration_mail(registration_template):
mail.outbox = []
task_id = mailutils.send_registration_mail("test@example.no", "Foo")
assert result(task_id) == 1
@@ -41,7 +51,7 @@ def test_registration_mail():
@pytest.mark.django_db
-def test_confirmation_mail():
+def test_confirmation_mail(confirmation_template):
mail.outbox = []
task_id = mailutils.send_confirmation_mail("test@example.no", "Foo")
assert result(task_id) == 1
diff --git a/gregui/views.py b/gregui/views.py
index a16ac09b889279d24caf0266185a242d3c8a378b..4721cccb27e0426fa2874796671bb62d1b55dbaa 100644
--- a/gregui/views.py
+++ b/gregui/views.py
@@ -6,7 +6,7 @@ from rest_framework.authentication import SessionAuthentication, BasicAuthentica
from rest_framework.permissions import IsAuthenticated
from rest_framework.views import APIView
-from greg.models import Role, Sponsor
+from greg.models import Person, Sponsor
from greg.permissions import IsSponsor
from gregui import mailutils
from gregui.models import GregUserProfile
@@ -85,6 +85,8 @@ class OusView(APIView):
class GuestInfoView(APIView):
+ """Fetch all the sponsors guests"""
+
authentication_classes = [SessionAuthentication, BasicAuthentication]
permission_classes = [IsAuthenticated, IsSponsor]
@@ -92,28 +94,37 @@ class GuestInfoView(APIView):
# pylint: disable=W0622
def get(request, format=None):
user = GregUserProfile.objects.get(user=request.user)
+
return JsonResponse(
{
- "roles": [
+ "persons": [
{
- "id": i.id,
- "pid": i.person.id,
- "first": i.person.first_name,
- "last": i.person.last_name,
- "email": i.person.private_email
- and i.person.private_email.value,
- "mobile": i.person.private_mobile
- and i.person.private_mobile.value,
- "fnr": i.person.fnr
- and "".join((i.person.fnr.value[:-5], "*****")),
- "role_nb": i.type.name_nb,
- "role_en": i.type.name_en,
- "period": f"{i.start_date} - {i.end_date}",
- "ou_nb": i.orgunit_id.name_nb,
- "ou_en": i.orgunit_id.name_en,
- "active": i.person.is_registered and i.person.is_verified,
+ "pid": person.id,
+ "first": person.first_name,
+ "last": person.last_name,
+ "email": person.private_email and person.private_email.value,
+ "mobile": person.private_mobile and person.private_mobile.value,
+ "fnr": person.fnr and "".join((person.fnr.value[:-5], "*****")),
+ "active": person.is_registered and person.is_verified,
+ "registered": person.is_registered,
+ "verified": person.is_verified,
+ "roles": [
+ {
+ "id": role.id,
+ "name_nb": role.type.name_nb,
+ "name_en": role.type.name_en,
+ "ou_nb": role.orgunit.name_nb,
+ "ou_en": role.orgunit.name_en,
+ "start_date": role.start_date,
+ "end_date": role.end_date,
+ "max_days": role.type.max_days,
+ }
+ for role in person.roles.all()
+ ],
}
- for i in Role.objects.filter(sponsor_id=user.sponsor)
+ for person in Person.objects.filter(
+ roles__sponsor=user.sponsor
+ ).distinct()
]
}
)
diff --git a/mypy.ini b/mypy.ini
index a2e9693357cb6aebed2fe960ac2a95f43f8d4dc8..67b5755d1536d9ff082523fd6e614ed10ab59839 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -20,6 +20,9 @@ ignore_missing_imports = True
[mypy-django_extensions.db.fields]
ignore_missing_imports = True
+[mypy-django_q.*]
+ignore_missing_imports = True
+
[mypy-django_filters.*]
ignore_missing_imports = True
diff --git a/poetry.lock b/poetry.lock
index 64134c147f1f708fe1f1717bb3b78d76cc726519..72a79eb7c345ef7b73e8618dc5abb4fb38d89f35 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -16,7 +16,7 @@ python-versions = "*"
[[package]]
name = "arrow"
-version = "1.2.0"
+version = "1.2.1"
description = "Better dates & times for Python"
category = "main"
optional = false
@@ -38,7 +38,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"]
[[package]]
name = "astroid"
-version = "2.8.2"
+version = "2.8.4"
description = "An abstract syntax tree for Python with inference support."
category = "dev"
optional = false
@@ -47,7 +47,7 @@ python-versions = "~=3.6"
[package.dependencies]
lazy-object-proxy = ">=1.4.0"
typing-extensions = {version = ">=3.10", markers = "python_version < \"3.10\""}
-wrapt = ">=1.11,<1.13"
+wrapt = ">=1.11,<1.14"
[[package]]
name = "atomicwrites"
@@ -81,7 +81,7 @@ python-versions = "*"
[[package]]
name = "black"
-version = "21.9b0"
+version = "21.10b0"
description = "The uncompromising code formatter."
category = "dev"
optional = false
@@ -101,9 +101,9 @@ typing-extensions = [
[package.extras]
colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.6.0)", "aiohttp-cors (>=0.4.0)"]
+d = ["aiohttp (>=3.7.4)"]
jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-python2 = ["typed-ast (>=1.4.2)"]
+python2 = ["typed-ast (>=1.4.3)"]
uvloop = ["uvloop (>=0.15.2)"]
[[package]]
@@ -129,7 +129,7 @@ python-versions = "*"
[[package]]
name = "cffi"
-version = "1.14.6"
+version = "1.15.0"
description = "Foreign Function Interface for Python calling C code."
category = "main"
optional = false
@@ -195,7 +195,7 @@ jinja2 = "*"
[[package]]
name = "coverage"
-version = "6.0.2"
+version = "6.1.1"
description = "Code coverage measurement for Python"
category = "dev"
optional = false
@@ -233,7 +233,7 @@ python-versions = ">=3.5"
[[package]]
name = "django"
-version = "3.2.8"
+version = "3.2.9"
description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design."
category = "main"
optional = false
@@ -261,7 +261,7 @@ Django = ">=1.11"
[[package]]
name = "django-extensions"
-version = "3.1.3"
+version = "3.1.5"
description = "Extensions for Django"
category = "main"
optional = false
@@ -291,7 +291,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
[[package]]
name = "django-log-request-id"
-version = "1.6.0"
+version = "1.7.0"
description = "Django middleware and log filter to attach a unique ID to every log message generated as part of a request"
category = "main"
optional = false
@@ -336,7 +336,7 @@ sentry = ["django-q-sentry (>=0.1)"]
[[package]]
name = "django-reversion"
-version = "4.0.0"
+version = "4.0.1"
description = "An extension to the Django web framework that provides version control for model instances."
category = "main"
optional = false
@@ -428,17 +428,9 @@ mypy = ">=0.790"
requests = ">=2.0.0"
typing-extensions = ">=3.7.2"
-[[package]]
-name = "docutils"
-version = "0.17.1"
-description = "Docutils -- Python Documentation Utilities"
-category = "main"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-
[[package]]
name = "drf-spectacular"
-version = "0.20.1"
+version = "0.20.2"
description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework"
category = "main"
optional = false
@@ -458,7 +450,7 @@ sidecar = ["drf-spectacular-sidecar"]
[[package]]
name = "faker"
-version = "9.3.1"
+version = "9.8.0"
description = "Faker is a Python package that generates fake data for you."
category = "dev"
optional = false
@@ -470,7 +462,7 @@ text-unidecode = "1.3"
[[package]]
name = "idna"
-version = "3.2"
+version = "3.3"
description = "Internationalized Domain Names in Applications (IDNA)"
category = "main"
optional = false
@@ -494,7 +486,7 @@ python-versions = "*"
[[package]]
name = "ipython"
-version = "7.28.0"
+version = "7.29.0"
description = "IPython: Productive Interactive Computing"
category = "dev"
optional = false
@@ -526,7 +518,7 @@ test = ["nose (>=0.10.1)", "requests", "testpath", "pygments", "nbformat", "ipyk
[[package]]
name = "isort"
-version = "5.9.3"
+version = "5.10.1"
description = "A Python utility / library to sort Python imports."
category = "dev"
optional = false
@@ -563,7 +555,7 @@ testing = ["Django (<3.1)", "colorama", "docopt", "pytest (<6.0.0)"]
[[package]]
name = "jinja2"
-version = "3.0.2"
+version = "3.0.3"
description = "A very fast and expressive template engine."
category = "dev"
optional = false
@@ -605,7 +597,7 @@ tests = ["coverage (>=4.0)", "flake8", "mypy", "pytest-cov", "pytest-flake8 (>=0
[[package]]
name = "jsonschema"
-version = "4.1.0"
+version = "4.2.1"
description = "An implementation of JSON Schema validation for Python"
category = "main"
optional = false
@@ -627,14 +619,6 @@ category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-[[package]]
-name = "lockfile"
-version = "0.12.2"
-description = "Platform-independent file locking module"
-category = "main"
-optional = false
-python-versions = "*"
-
[[package]]
name = "markupsafe"
version = "2.0.1"
@@ -722,14 +706,14 @@ resolved_reference = "bb60dbba6b48dd82a6a585f4568fd3199eced188"
[[package]]
name = "packaging"
-version = "21.0"
+version = "21.2"
description = "Core utilities for Python packages"
category = "dev"
optional = false
python-versions = ">=3.6"
[package.dependencies]
-pyparsing = ">=2.0.2"
+pyparsing = ">=2.0.2,<3"
[[package]]
name = "parso"
@@ -762,6 +746,14 @@ python-versions = "*"
[package.dependencies]
ptyprocess = ">=0.5"
+[[package]]
+name = "phonenumbers"
+version = "8.12.36"
+description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
+category = "main"
+optional = false
+python-versions = "*"
+
[[package]]
name = "pickleshare"
version = "0.7.5"
@@ -827,7 +819,7 @@ testing = ["pytest", "pytest-benchmark"]
[[package]]
name = "prompt-toolkit"
-version = "3.0.20"
+version = "3.0.22"
description = "Library for building powerful interactive command lines in Python"
category = "dev"
optional = false
@@ -854,15 +846,15 @@ python-versions = "*"
[[package]]
name = "py"
-version = "1.10.0"
+version = "1.11.0"
description = "library with cross-python path, ini-parsing, io, code, log facilities"
category = "dev"
optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]]
name = "pycparser"
-version = "2.20"
+version = "2.21"
description = "C parser in Python"
category = "main"
optional = false
@@ -1003,21 +995,6 @@ pytest = ">=5.4.0"
docs = ["sphinx", "sphinx-rtd-theme"]
testing = ["django", "django-configurations (>=2.0)"]
-[[package]]
-name = "python-daemon"
-version = "2.3.0"
-description = "Library to implement a well-behaved Unix daemon process."
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-docutils = "*"
-lockfile = ">=0.10"
-
-[package.extras]
-test = ["coverage", "docutils", "testscenarios (>=0.4)", "testtools"]
-
[[package]]
name = "python-dateutil"
version = "2.8.2"
@@ -1047,11 +1024,11 @@ python-versions = "*"
[[package]]
name = "pyyaml"
-version = "5.4.1"
+version = "6.0"
description = "YAML parser and emitter for Python"
category = "main"
optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+python-versions = ">=3.6"
[[package]]
name = "redis"
@@ -1066,7 +1043,7 @@ hiredis = ["hiredis (>=0.1.3)"]
[[package]]
name = "regex"
-version = "2021.10.8"
+version = "2021.11.10"
description = "Alternative regular expression module, to replace re."
category = "dev"
optional = false
@@ -1108,7 +1085,7 @@ test = ["fixtures", "mock", "purl", "pytest", "sphinx", "testrepository (>=0.0.1
[[package]]
name = "rope"
-version = "0.20.1"
+version = "0.21.0"
description = "a python refactoring library..."
category = "dev"
optional = false
@@ -1193,7 +1170,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
[[package]]
name = "tomli"
-version = "1.2.1"
+version = "1.2.2"
description = "A lil' TOML parser"
category = "dev"
optional = false
@@ -1201,7 +1178,7 @@ python-versions = ">=3.6"
[[package]]
name = "traitlets"
-version = "5.1.0"
+version = "5.1.1"
description = "Traitlets Python configuration system"
category = "dev"
optional = false
@@ -1220,7 +1197,7 @@ python-versions = "*"
[[package]]
name = "types-pyyaml"
-version = "5.4.11"
+version = "6.0.0"
description = "Typing stubs for PyYAML"
category = "dev"
optional = false
@@ -1244,7 +1221,7 @@ python-versions = "*"
[[package]]
name = "uritemplate"
-version = "4.0.0"
+version = "4.1.1"
description = "Implementation of RFC 6570 URI Templates"
category = "main"
optional = false
@@ -1284,16 +1261,16 @@ brotli = ["brotli"]
[[package]]
name = "wrapt"
-version = "1.12.1"
+version = "1.13.3"
description = "Module for decorators, wrappers and monkey patching."
category = "dev"
optional = false
-python-versions = "*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
[metadata]
lock-version = "1.1"
python-versions = "^3.9"
-content-hash = "a7dc31ee7d84556710050592c816eece8e1fa8e40a247aaac740a1abbe039cac"
+content-hash = "2904f495b0722fecda78524691e40ef0aa96c53367f3cd9c2a2c8f432c88b887"
[metadata.files]
ansicon = [
@@ -1305,16 +1282,16 @@ appnope = [
{file = "appnope-0.1.2.tar.gz", hash = "sha256:dd83cd4b5b460958838f6eb3000c660b1f9caf2a5b1de4264e941512f603258a"},
]
arrow = [
- {file = "arrow-1.2.0-py3-none-any.whl", hash = "sha256:8fb7d9d3d4bf90e49e734c22fa077bdd0964135c4b8120de2510575a8d1f620c"},
- {file = "arrow-1.2.0.tar.gz", hash = "sha256:16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074"},
+ {file = "arrow-1.2.1-py3-none-any.whl", hash = "sha256:6b2914ef3997d1fd7b37a71ce9dd61a6e329d09e1c7b44f4d3099ca4a5c0933e"},
+ {file = "arrow-1.2.1.tar.gz", hash = "sha256:c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"},
]
asgiref = [
{file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"},
{file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"},
]
astroid = [
- {file = "astroid-2.8.2-py3-none-any.whl", hash = "sha256:9eaeaf92b3e21b70bec1a262e7eb118d2e96294892a5de595c92a12adc80dfc2"},
- {file = "astroid-2.8.2.tar.gz", hash = "sha256:304e99c129794f2cfda584a12b71fde85205da950e2f330f4be09150525ae949"},
+ {file = "astroid-2.8.4-py3-none-any.whl", hash = "sha256:0755c998e7117078dcb7d0bda621391dd2a85da48052d948c7411ab187325346"},
+ {file = "astroid-2.8.4.tar.gz", hash = "sha256:1e83a69fd51b013ebf5912d26b9338d6643a55fec2f20c787792680610eed4a2"},
]
atomicwrites = [
{file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
@@ -1329,8 +1306,8 @@ backcall = [
{file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"},
]
black = [
- {file = "black-21.9b0-py3-none-any.whl", hash = "sha256:380f1b5da05e5a1429225676655dddb96f5ae8c75bdf91e53d798871b902a115"},
- {file = "black-21.9b0.tar.gz", hash = "sha256:7de4cfc7eb6b710de325712d40125689101d21d25283eed7e9998722cf10eb91"},
+ {file = "black-21.10b0-py3-none-any.whl", hash = "sha256:6eb7448da9143ee65b856a5f3676b7dda98ad9abe0f87fce8c59291f15e82a5b"},
+ {file = "black-21.10b0.tar.gz", hash = "sha256:a9952229092e325fe5f3dae56d81f639b23f7131eb840781947e4b2886030f33"},
]
blessed = [
{file = "blessed-1.19.0-py2.py3-none-any.whl", hash = "sha256:1f2d462631b2b6d2d4c3c65b54ef79ad87a6ca2dd55255df2f8d739fcc8a1ddb"},
@@ -1341,51 +1318,56 @@ certifi = [
{file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
]
cffi = [
- {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"},
- {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"},
- {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"},
- {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"},
- {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"},
- {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"},
- {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"},
- {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"},
- {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"},
- {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"},
- {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"},
- {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"},
- {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"},
- {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"},
- {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"},
- {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"},
- {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"},
- {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"},
- {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"},
- {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"},
- {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"},
- {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"},
- {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"},
- {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"},
- {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"},
+ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"},
+ {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"},
+ {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"},
+ {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"},
+ {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"},
+ {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"},
+ {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"},
+ {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"},
+ {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"},
+ {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"},
+ {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"},
+ {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"},
+ {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"},
+ {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"},
+ {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"},
+ {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"},
+ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
]
charset-normalizer = [
{file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
@@ -1408,39 +1390,52 @@ coreschema = [
{file = "coreschema-0.0.4.tar.gz", hash = "sha256:9503506007d482ab0867ba14724b93c18a33b22b6d19fb419ef2d239dd4a1607"},
]
coverage = [
- {file = "coverage-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1549e1d08ce38259de2bc3e9a0d5f3642ff4a8f500ffc1b2df73fd621a6cdfc0"},
- {file = "coverage-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bcae10fccb27ca2a5f456bf64d84110a5a74144be3136a5e598f9d9fb48c0caa"},
- {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:53a294dc53cfb39c74758edaa6305193fb4258a30b1f6af24b360a6c8bd0ffa7"},
- {file = "coverage-6.0.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8251b37be1f2cd9c0e5ccd9ae0380909c24d2a5ed2162a41fcdbafaf59a85ebd"},
- {file = "coverage-6.0.2-cp310-cp310-win32.whl", hash = "sha256:db42baa892cba723326284490283a68d4de516bfb5aaba369b4e3b2787a778b7"},
- {file = "coverage-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:bbffde2a68398682623d9dd8c0ca3f46fda074709b26fcf08ae7a4c431a6ab2d"},
- {file = "coverage-6.0.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:60e51a3dd55540bec686d7fff61b05048ca31e804c1f32cbb44533e6372d9cc3"},
- {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a6a9409223a27d5ef3cca57dd7cd4dfcb64aadf2fad5c3b787830ac9223e01a"},
- {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4b34ae4f51bbfa5f96b758b55a163d502be3dcb24f505d0227858c2b3f94f5b9"},
- {file = "coverage-6.0.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3bbda1b550e70fa6ac40533d3f23acd4f4e9cb4e6e77251ce77fdf41b3309fb2"},
- {file = "coverage-6.0.2-cp36-cp36m-win32.whl", hash = "sha256:4e28d2a195c533b58fc94a12826f4431726d8eb029ac21d874345f943530c122"},
- {file = "coverage-6.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a82d79586a0a4f5fd1cf153e647464ced402938fbccb3ffc358c7babd4da1dd9"},
- {file = "coverage-6.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3be1206dc09fb6298de3fce70593e27436862331a85daee36270b6d0e1c251c4"},
- {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9cd3828bbe1a40070c11fe16a51df733fd2f0cb0d745fb83b7b5c1f05967df7"},
- {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d036dc1ed8e1388e995833c62325df3f996675779541f682677efc6af71e96cc"},
- {file = "coverage-6.0.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04560539c19ec26995ecfb3d9307ff154fbb9a172cb57e3b3cfc4ced673103d1"},
- {file = "coverage-6.0.2-cp37-cp37m-win32.whl", hash = "sha256:e4fb7ced4d9dec77d6cf533acfbf8e1415fe799430366affb18d69ee8a3c6330"},
- {file = "coverage-6.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:77b1da5767ed2f44611bc9bc019bc93c03fa495728ec389759b6e9e5039ac6b1"},
- {file = "coverage-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:61b598cbdbaae22d9e34e3f675997194342f866bb1d781da5d0be54783dce1ff"},
- {file = "coverage-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36e9040a43d2017f2787b28d365a4bb33fcd792c7ff46a047a04094dc0e2a30d"},
- {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9f1627e162e3864a596486774876415a7410021f4b67fd2d9efdf93ade681afc"},
- {file = "coverage-6.0.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e7a0b42db2a47ecb488cde14e0f6c7679a2c5a9f44814393b162ff6397fcdfbb"},
- {file = "coverage-6.0.2-cp38-cp38-win32.whl", hash = "sha256:a1b73c7c4d2a42b9d37dd43199c5711d91424ff3c6c22681bc132db4a4afec6f"},
- {file = "coverage-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:1db67c497688fd4ba85b373b37cc52c50d437fd7267520ecd77bddbd89ea22c9"},
- {file = "coverage-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f2f184bf38e74f152eed7f87e345b51f3ab0b703842f447c22efe35e59942c24"},
- {file = "coverage-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd1cf1deb3d5544bd942356364a2fdc8959bad2b6cf6eb17f47d301ea34ae822"},
- {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad9b8c1206ae41d46ec7380b78ba735ebb77758a650643e841dd3894966c31d0"},
- {file = "coverage-6.0.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:381d773d896cc7f8ba4ff3b92dee4ed740fb88dfe33b6e42efc5e8ab6dfa1cfe"},
- {file = "coverage-6.0.2-cp39-cp39-win32.whl", hash = "sha256:424c44f65e8be58b54e2b0bd1515e434b940679624b1b72726147cfc6a9fc7ce"},
- {file = "coverage-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:abbff240f77347d17306d3201e14431519bf64495648ca5a49571f988f88dee9"},
- {file = "coverage-6.0.2-pp36-none-any.whl", hash = "sha256:7092eab374346121805fb637572483270324407bf150c30a3b161fc0c4ca5164"},
- {file = "coverage-6.0.2-pp37-none-any.whl", hash = "sha256:30922626ce6f7a5a30bdba984ad21021529d3d05a68b4f71ea3b16bda35b8895"},
- {file = "coverage-6.0.2.tar.gz", hash = "sha256:6807947a09510dc31fa86f43595bf3a14017cd60bf633cc746d52141bfa6b149"},
+ {file = "coverage-6.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7"},
+ {file = "coverage-6.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a"},
+ {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef"},
+ {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336"},
+ {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6"},
+ {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26"},
+ {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9"},
+ {file = "coverage-6.1.1-cp310-cp310-win32.whl", hash = "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026"},
+ {file = "coverage-6.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9"},
+ {file = "coverage-6.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d"},
+ {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e"},
+ {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8"},
+ {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67"},
+ {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f"},
+ {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a"},
+ {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489"},
+ {file = "coverage-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003"},
+ {file = "coverage-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b"},
+ {file = "coverage-6.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717"},
+ {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533"},
+ {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33"},
+ {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271"},
+ {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2"},
+ {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce"},
+ {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b"},
+ {file = "coverage-6.1.1-cp37-cp37m-win32.whl", hash = "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685"},
+ {file = "coverage-6.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926"},
+ {file = "coverage-6.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8"},
+ {file = "coverage-6.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e"},
+ {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a"},
+ {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271"},
+ {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9"},
+ {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4"},
+ {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad"},
+ {file = "coverage-6.1.1-cp38-cp38-win32.whl", hash = "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b"},
+ {file = "coverage-6.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54"},
+ {file = "coverage-6.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201"},
+ {file = "coverage-6.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6"},
+ {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9"},
+ {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a"},
+ {file = "coverage-6.1.1-cp39-cp39-win32.whl", hash = "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0"},
+ {file = "coverage-6.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b"},
+ {file = "coverage-6.1.1-pp36-none-any.whl", hash = "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f"},
+ {file = "coverage-6.1.1-pp37-none-any.whl", hash = "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"},
+ {file = "coverage-6.1.1-pp38-none-any.whl", hash = "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5"},
+ {file = "coverage-6.1.1.tar.gz", hash = "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0"},
]
cryptography = [
{file = "cryptography-35.0.0-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:d57e0cdc1b44b6cdf8af1d01807db06886f10177469312fbde8f44ccbb284bc9"},
@@ -1469,16 +1464,16 @@ decorator = [
{file = "decorator-5.1.0.tar.gz", hash = "sha256:e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7"},
]
django = [
- {file = "Django-3.2.8-py3-none-any.whl", hash = "sha256:42573831292029639b798fe4d3812996bfe4ff3275f04566da90764daec011a5"},
- {file = "Django-3.2.8.tar.gz", hash = "sha256:f6d2c4069c9b9bfac03bedff927ea1f9e0d29e34525cec8a68fd28eb2a8df7af"},
+ {file = "Django-3.2.9-py3-none-any.whl", hash = "sha256:e22c9266da3eec7827737cde57694d7db801fedac938d252bf27377cec06ed1b"},
+ {file = "Django-3.2.9.tar.gz", hash = "sha256:51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08"},
]
django-dirtyfields = [
{file = "django-dirtyfields-1.7.0.tar.gz", hash = "sha256:76fd01c69e077fd39f49376d9684d04188b821dafd342bf82d935036ff2f5946"},
{file = "django_dirtyfields-1.7.0-py3-none-any.whl", hash = "sha256:ed8d780d439281372ca1dd301b21d6536b950dad3c32f95740e8236c0ed423bc"},
]
django-extensions = [
- {file = "django-extensions-3.1.3.tar.gz", hash = "sha256:5f0fea7bf131ca303090352577a9e7f8bfbf5489bd9d9c8aea9401db28db34a0"},
- {file = "django_extensions-3.1.3-py3-none-any.whl", hash = "sha256:50de8977794a66a91575dd40f87d5053608f679561731845edbd325ceeb387e3"},
+ {file = "django-extensions-3.1.5.tar.gz", hash = "sha256:28e1e1bf49f0e00307ba574d645b0af3564c981a6dfc87209d48cb98f77d0b1a"},
+ {file = "django_extensions-3.1.5-py3-none-any.whl", hash = "sha256:9238b9e016bb0009d621e05cf56ea8ce5cce9b32e91ad2026996a7377ca28069"},
]
django-filter = [
{file = "django-filter-21.1.tar.gz", hash = "sha256:632a251fa8f1aadb4b8cceff932bb52fe2f826dd7dfe7f3eac40e5c463d6836e"},
@@ -1489,8 +1484,8 @@ django-ipware = [
{file = "django_ipware-4.0.0-py2.py3-none-any.whl", hash = "sha256:116bd0d7940f09bf7ffd465943992e23d87e772a9d6c0d3a57b74040589a383b"},
]
django-log-request-id = [
- {file = "django-log-request-id-1.6.0.tar.gz", hash = "sha256:0126f5da0cacc62cf834efb3cf66e4606031d911ccff048da2f88fe2c0bbcbc9"},
- {file = "django_log_request_id-1.6.0-py3-none-any.whl", hash = "sha256:c3f7f53b1fc92f62269c247bee14d578daab000a2f7ae70b70ae288b603b5907"},
+ {file = "django-log-request-id-1.7.0.tar.gz", hash = "sha256:49e8f8a9e79e25b45e337225769784ad07a38b29e7b65b5e8fcd662d3a65a1a3"},
+ {file = "django_log_request_id-1.7.0-py3-none-any.whl", hash = "sha256:fadd08967b4baee69555f9a71b10db0af251f4d50764539e3d0f0c68320453e3"},
]
django-picklefield = [
{file = "django-picklefield-3.0.1.tar.gz", hash = "sha256:15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287"},
@@ -1501,8 +1496,8 @@ django-q = [
{file = "django_q-1.3.9-py3-none-any.whl", hash = "sha256:1b74ce3a8931990b136903e3a7bc9b07243282a2b5355117246f05ed5d076e68"},
]
django-reversion = [
- {file = "django-reversion-4.0.0.tar.gz", hash = "sha256:ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188"},
- {file = "django_reversion-4.0.0-py3-none-any.whl", hash = "sha256:f059c654e38c0dd8dccd7f0990aa2f6d9ad22dab55c5e095f9596aeda8079dcd"},
+ {file = "django-reversion-4.0.1.tar.gz", hash = "sha256:6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"},
+ {file = "django_reversion-4.0.1-py3-none-any.whl", hash = "sha256:2e40ed41e08cdd83a05dc70a1974feface52a61ba7d289727117163052081ae6"},
]
django-sesame = [
{file = "django-sesame-2.4.tar.gz", hash = "sha256:4f232ba1c3642b4eef23257af9a2feac36970457d2940f4083c48c6a3d9cb0a3"},
@@ -1528,21 +1523,17 @@ djangorestframework-stubs = [
{file = "djangorestframework-stubs-1.4.0.tar.gz", hash = "sha256:037f0582b1e6c79366b6a839da861474d59210c4bfa1d36291545cb6ede6a0da"},
{file = "djangorestframework_stubs-1.4.0-py3-none-any.whl", hash = "sha256:f6ed5fb19c12aa752288ddc6ad28d4ca7c81681ca7f28a19aba9064b2a69489c"},
]
-docutils = [
- {file = "docutils-0.17.1-py2.py3-none-any.whl", hash = "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61"},
- {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"},
-]
drf-spectacular = [
- {file = "drf-spectacular-0.20.1.tar.gz", hash = "sha256:738471216c65c79eb6018dd8be9da28d2b1b7d8a05e1de7f99274c35dd70c15a"},
- {file = "drf_spectacular-0.20.1-py3-none-any.whl", hash = "sha256:34ecb255b4bbe9646671430a4cd27266f2c867553e261168ab0c1bc2de8e59dd"},
+ {file = "drf-spectacular-0.20.2.tar.gz", hash = "sha256:cbc43c8b67bd52a4ff31c4c950419be5257b8a4718cb966e7d2876371692edc1"},
+ {file = "drf_spectacular-0.20.2-py3-none-any.whl", hash = "sha256:af8a0c7c46e82c68aa70c474e3b23fa23bb16e4600270184af8230f5bd76aabb"},
]
faker = [
- {file = "Faker-9.3.1-py3-none-any.whl", hash = "sha256:429a91d73dbac02609d6b616ef15bd4c3f22ed6532dcfceb46f3b8c28c78257a"},
- {file = "Faker-9.3.1.tar.gz", hash = "sha256:cdd9e9af2fba5c96ee2ec4ac8419bba458e26b58a2b98c1f6467ee66096bee52"},
+ {file = "Faker-9.8.0-py3-none-any.whl", hash = "sha256:810182ef3597e0dfc4999a29f7cf17b99c70b361aae0f16743de6b926619ae21"},
+ {file = "Faker-9.8.0.tar.gz", hash = "sha256:22e53b8082890cca9b595ec22f9b01676b9d96c5f2f1890bcb49e4d612aa40a2"},
]
idna = [
- {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"},
- {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"},
+ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
+ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
]
inflection = [
{file = "inflection-0.5.1-py2.py3-none-any.whl", hash = "sha256:f38b2b640938a4f35ade69ac3d053042959b62a0f1076a5bbaa1b9526605a8a2"},
@@ -1553,12 +1544,12 @@ iniconfig = [
{file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
]
ipython = [
- {file = "ipython-7.28.0-py3-none-any.whl", hash = "sha256:f16148f9163e1e526f1008d7c8d966d9c15600ca20d1a754287cf96d00ba6f1d"},
- {file = "ipython-7.28.0.tar.gz", hash = "sha256:2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11"},
+ {file = "ipython-7.29.0-py3-none-any.whl", hash = "sha256:a658beaf856ce46bc453366d5dc6b2ddc6c481efd3540cb28aa3943819caac9f"},
+ {file = "ipython-7.29.0.tar.gz", hash = "sha256:4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa"},
]
isort = [
- {file = "isort-5.9.3-py3-none-any.whl", hash = "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2"},
- {file = "isort-5.9.3.tar.gz", hash = "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899"},
+ {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
+ {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
]
itypes = [
{file = "itypes-1.2.0-py2.py3-none-any.whl", hash = "sha256:03da6872ca89d29aef62773672b2d408f490f80db48b23079a4b194c86dd04c6"},
@@ -1569,8 +1560,8 @@ jedi = [
{file = "jedi-0.18.0.tar.gz", hash = "sha256:92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707"},
]
jinja2 = [
- {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"},
- {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"},
+ {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
+ {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
]
jinxed = [
{file = "jinxed-1.1.0-py2.py3-none-any.whl", hash = "sha256:6a61ccf963c16aa885304f27e6e5693783676897cea0c7f223270c8b8e78baf8"},
@@ -1581,8 +1572,8 @@ josepy = [
{file = "josepy-1.10.0.tar.gz", hash = "sha256:e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b"},
]
jsonschema = [
- {file = "jsonschema-4.1.0-py3-none-any.whl", hash = "sha256:2b3cca28580511d44326f0e7fc582eab3cbe31aabd1a1c2cfa74a399796ffd84"},
- {file = "jsonschema-4.1.0.tar.gz", hash = "sha256:9dd7c33b4a96138dc37bb86b3610d3b12d30d96433d4d73435ca3025804154a8"},
+ {file = "jsonschema-4.2.1-py3-none-any.whl", hash = "sha256:2a0f162822a64d95287990481b45d82f096e99721c86534f48201b64ebca6e8c"},
+ {file = "jsonschema-4.2.1.tar.gz", hash = "sha256:390713469ae64b8a58698bb3cbc3859abe6925b565a973f87323ef21b09a27a8"},
]
lazy-object-proxy = [
{file = "lazy-object-proxy-1.6.0.tar.gz", hash = "sha256:489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"},
@@ -1608,10 +1599,6 @@ lazy-object-proxy = [
{file = "lazy_object_proxy-1.6.0-cp39-cp39-win32.whl", hash = "sha256:1fee665d2638491f4d6e55bd483e15ef21f6c8c2095f235fef72601021e64f61"},
{file = "lazy_object_proxy-1.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b"},
]
-lockfile = [
- {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"},
- {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"},
-]
markupsafe = [
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
{file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
@@ -1726,8 +1713,8 @@ mypy-extensions = [
]
orgreg-client = []
packaging = [
- {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"},
- {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"},
+ {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
+ {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},
]
parso = [
{file = "parso-0.8.2-py2.py3-none-any.whl", hash = "sha256:a8c4922db71e4fdb90e0d0bc6e50f9b273d3397925e5e60a717e719201778d22"},
@@ -1741,6 +1728,10 @@ pexpect = [
{file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"},
{file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"},
]
+phonenumbers = [
+ {file = "phonenumbers-8.12.36-py2.py3-none-any.whl", hash = "sha256:fa91fff1cefee6873c78f08c767f341a7658c849ffb74b605cb38cefef0e76fa"},
+ {file = "phonenumbers-8.12.36.tar.gz", hash = "sha256:e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d"},
+]
pickleshare = [
{file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"},
{file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"},
@@ -1759,8 +1750,8 @@ pluggy = [
{file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
]
prompt-toolkit = [
- {file = "prompt_toolkit-3.0.20-py3-none-any.whl", hash = "sha256:6076e46efae19b1e0ca1ec003ed37a933dc94b4d20f486235d436e64771dcd5c"},
- {file = "prompt_toolkit-3.0.20.tar.gz", hash = "sha256:eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c"},
+ {file = "prompt_toolkit-3.0.22-py3-none-any.whl", hash = "sha256:48d85cdca8b6c4f16480c7ce03fd193666b62b0a21667ca56b4bb5ad679d1170"},
+ {file = "prompt_toolkit-3.0.22.tar.gz", hash = "sha256:449f333dd120bd01f5d296a8ce1452114ba3a71fae7288d2f0ae2c918764fa72"},
]
psycopg2-binary = [
{file = "psycopg2-binary-2.9.1.tar.gz", hash = "sha256:b0221ca5a9837e040ebf61f48899926b5783668b7807419e4adae8175a31f773"},
@@ -1805,12 +1796,12 @@ ptyprocess = [
{file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"},
]
py = [
- {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
- {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
+ {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+ {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
]
pycparser = [
- {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
- {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
+ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
+ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
]
pydantic = [
{file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"},
@@ -1891,10 +1882,6 @@ pytest-django = [
{file = "pytest-django-4.4.0.tar.gz", hash = "sha256:b5171e3798bf7e3fc5ea7072fe87324db67a4dd9f1192b037fed4cc3c1b7f455"},
{file = "pytest_django-4.4.0-py3-none-any.whl", hash = "sha256:65783e78382456528bd9d79a35843adde9e6a47347b20464eb2c885cb0f1f606"},
]
-python-daemon = [
- {file = "python-daemon-2.3.0.tar.gz", hash = "sha256:bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"},
- {file = "python_daemon-2.3.0-py2.py3-none-any.whl", hash = "sha256:191c7b67b8f7aac58849abf54e19fe1957ef7290c914210455673028ad454989"},
-]
python-dateutil = [
{file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
{file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
@@ -1908,88 +1895,94 @@ pytz = [
{file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"},
]
pyyaml = [
- {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
- {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
- {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
- {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
- {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
- {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
- {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"},
- {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"},
- {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
- {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
- {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
- {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
- {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"},
- {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"},
- {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
- {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
- {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
- {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
- {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"},
- {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"},
- {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
- {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
- {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
- {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
- {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"},
- {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"},
- {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
- {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
- {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
+ {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+ {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+ {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+ {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+ {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+ {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+ {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+ {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+ {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+ {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+ {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+ {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+ {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+ {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+ {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+ {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+ {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+ {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+ {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+ {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+ {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+ {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+ {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+ {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+ {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+ {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+ {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+ {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+ {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+ {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+ {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+ {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+ {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
]
redis = [
{file = "redis-3.5.3-py2.py3-none-any.whl", hash = "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24"},
{file = "redis-3.5.3.tar.gz", hash = "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"},
]
regex = [
- {file = "regex-2021.10.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:094a905e87a4171508c2a0e10217795f83c636ccc05ddf86e7272c26e14056ae"},
- {file = "regex-2021.10.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:981c786293a3115bc14c103086ae54e5ee50ca57f4c02ce7cf1b60318d1e8072"},
- {file = "regex-2021.10.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b0f2f874c6a157c91708ac352470cb3bef8e8814f5325e3c5c7a0533064c6a24"},
- {file = "regex-2021.10.8-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:51feefd58ac38eb91a21921b047da8644155e5678e9066af7bcb30ee0dca7361"},
- {file = "regex-2021.10.8-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea8de658d7db5987b11097445f2b1f134400e2232cb40e614e5f7b6f5428710e"},
- {file = "regex-2021.10.8-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1ce02f420a7ec3b2480fe6746d756530f69769292eca363218c2291d0b116a01"},
- {file = "regex-2021.10.8-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39079ebf54156be6e6902f5c70c078f453350616cfe7bfd2dd15bdb3eac20ccc"},
- {file = "regex-2021.10.8-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ff24897f6b2001c38a805d53b6ae72267025878d35ea225aa24675fbff2dba7f"},
- {file = "regex-2021.10.8-cp310-cp310-win32.whl", hash = "sha256:c6569ba7b948c3d61d27f04e2b08ebee24fec9ff8e9ea154d8d1e975b175bfa7"},
- {file = "regex-2021.10.8-cp310-cp310-win_amd64.whl", hash = "sha256:45cb0f7ff782ef51bc79e227a87e4e8f24bc68192f8de4f18aae60b1d60bc152"},
- {file = "regex-2021.10.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fab3ab8aedfb443abb36729410403f0fe7f60ad860c19a979d47fb3eb98ef820"},
- {file = "regex-2021.10.8-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74e55f8d66f1b41d44bc44c891bcf2c7fad252f8f323ee86fba99d71fd1ad5e3"},
- {file = "regex-2021.10.8-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d52c5e089edbdb6083391faffbe70329b804652a53c2fdca3533e99ab0580d9"},
- {file = "regex-2021.10.8-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1abbd95cbe9e2467cac65c77b6abd9223df717c7ae91a628502de67c73bf6838"},
- {file = "regex-2021.10.8-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b9b5c215f3870aa9b011c00daeb7be7e1ae4ecd628e9beb6d7e6107e07d81287"},
- {file = "regex-2021.10.8-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f540f153c4f5617bc4ba6433534f8916d96366a08797cbbe4132c37b70403e92"},
- {file = "regex-2021.10.8-cp36-cp36m-win32.whl", hash = "sha256:1f51926db492440e66c89cd2be042f2396cf91e5b05383acd7372b8cb7da373f"},
- {file = "regex-2021.10.8-cp36-cp36m-win_amd64.whl", hash = "sha256:5f55c4804797ef7381518e683249310f7f9646da271b71cb6b3552416c7894ee"},
- {file = "regex-2021.10.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb2baff66b7d2267e07ef71e17d01283b55b3cc51a81b54cc385e721ae172ba4"},
- {file = "regex-2021.10.8-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9e527ab1c4c7cf2643d93406c04e1d289a9d12966529381ce8163c4d2abe4faf"},
- {file = "regex-2021.10.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36c98b013273e9da5790ff6002ab326e3f81072b4616fd95f06c8fa733d2745f"},
- {file = "regex-2021.10.8-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:55ef044899706c10bc0aa052f2fc2e58551e2510694d6aae13f37c50f3f6ff61"},
- {file = "regex-2021.10.8-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa0ab3530a279a3b7f50f852f1bab41bc304f098350b03e30a3876b7dd89840e"},
- {file = "regex-2021.10.8-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a37305eb3199d8f0d8125ec2fb143ba94ff6d6d92554c4b8d4a8435795a6eccd"},
- {file = "regex-2021.10.8-cp37-cp37m-win32.whl", hash = "sha256:2efd47704bbb016136fe34dfb74c805b1ef5c7313aef3ce6dcb5ff844299f432"},
- {file = "regex-2021.10.8-cp37-cp37m-win_amd64.whl", hash = "sha256:924079d5590979c0e961681507eb1773a142553564ccae18d36f1de7324e71ca"},
- {file = "regex-2021.10.8-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:19b8f6d23b2dc93e8e1e7e288d3010e58fafed323474cf7f27ab9451635136d9"},
- {file = "regex-2021.10.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b09d3904bf312d11308d9a2867427479d277365b1617e48ad09696fa7dfcdf59"},
- {file = "regex-2021.10.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:951be934dc25d8779d92b530e922de44dda3c82a509cdb5d619f3a0b1491fafa"},
- {file = "regex-2021.10.8-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f125fce0a0ae4fd5c3388d369d7a7d78f185f904c90dd235f7ecf8fe13fa741"},
- {file = "regex-2021.10.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f199419a81c1016e0560c39773c12f0bd924c37715bffc64b97140d2c314354"},
- {file = "regex-2021.10.8-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:09e1031e2059abd91177c302da392a7b6859ceda038be9e015b522a182c89e4f"},
- {file = "regex-2021.10.8-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9c070d5895ac6aeb665bd3cd79f673775caf8d33a0b569e98ac434617ecea57d"},
- {file = "regex-2021.10.8-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:176796cb7f82a7098b0c436d6daac82f57b9101bb17b8e8119c36eecf06a60a3"},
- {file = "regex-2021.10.8-cp38-cp38-win32.whl", hash = "sha256:5e5796d2f36d3c48875514c5cd9e4325a1ca172fc6c78b469faa8ddd3d770593"},
- {file = "regex-2021.10.8-cp38-cp38-win_amd64.whl", hash = "sha256:e4204708fa116dd03436a337e8e84261bc8051d058221ec63535c9403a1582a1"},
- {file = "regex-2021.10.8-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6dcf53d35850ce938b4f044a43b33015ebde292840cef3af2c8eb4c860730fff"},
- {file = "regex-2021.10.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b8b6ee6555b6fbae578f1468b3f685cdfe7940a65675611365a7ea1f8d724991"},
- {file = "regex-2021.10.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e2ec1c106d3f754444abf63b31e5c4f9b5d272272a491fa4320475aba9e8157c"},
- {file = "regex-2021.10.8-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:973499dac63625a5ef9dfa4c791aa33a502ddb7615d992bdc89cf2cc2285daa3"},
- {file = "regex-2021.10.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88dc3c1acd3f0ecfde5f95c32fcb9beda709dbdf5012acdcf66acbc4794468eb"},
- {file = "regex-2021.10.8-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4786dae85c1f0624ac77cb3813ed99267c9adb72e59fdc7297e1cf4d6036d493"},
- {file = "regex-2021.10.8-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe6ce4f3d3c48f9f402da1ceb571548133d3322003ce01b20d960a82251695d2"},
- {file = "regex-2021.10.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9e3e2cea8f1993f476a6833ef157f5d9e8c75a59a8d8b0395a9a6887a097243b"},
- {file = "regex-2021.10.8-cp39-cp39-win32.whl", hash = "sha256:82cfb97a36b1a53de32b642482c6c46b6ce80803854445e19bc49993655ebf3b"},
- {file = "regex-2021.10.8-cp39-cp39-win_amd64.whl", hash = "sha256:b04e512eb628ea82ed86eb31c0f7fc6842b46bf2601b66b1356a7008327f7700"},
- {file = "regex-2021.10.8.tar.gz", hash = "sha256:26895d7c9bbda5c52b3635ce5991caa90fbb1ddfac9c9ff1c7ce505e2282fb2a"},
+ {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"},
+ {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
+ {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
+ {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
+ {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
+ {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
+ {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
+ {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
+ {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
+ {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
+ {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
+ {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
+ {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
+ {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
+ {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
+ {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
+ {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
+ {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
+ {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
+ {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
+ {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
+ {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
+ {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
+ {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
]
requests = [
{file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
@@ -2000,7 +1993,7 @@ requests-mock = [
{file = "requests_mock-1.9.3-py2.py3-none-any.whl", hash = "sha256:0a2d38a117c08bb78939ec163522976ad59a6b7fdd82b709e23bb98004a44970"},
]
rope = [
- {file = "rope-0.20.1.tar.gz", hash = "sha256:505a2f6b4ac7b18e0429be179f4d8712243a194da5c866b0731f9d91ce7590bb"},
+ {file = "rope-0.21.0.tar.gz", hash = "sha256:366789e069a267296889b2ee7631f9278173b5e7d468f2ea08abe26069a52aef"},
]
sentry-sdk = [
{file = "sentry-sdk-1.4.3.tar.gz", hash = "sha256:b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828"},
@@ -2027,20 +2020,20 @@ toml = [
{file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
]
tomli = [
- {file = "tomli-1.2.1-py3-none-any.whl", hash = "sha256:8dd0e9524d6f386271a36b41dbf6c57d8e32fd96fd22b6584679dc569d20899f"},
- {file = "tomli-1.2.1.tar.gz", hash = "sha256:a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442"},
+ {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"},
+ {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
]
traitlets = [
- {file = "traitlets-5.1.0-py3-none-any.whl", hash = "sha256:03f172516916220b58c9f19d7f854734136dd9528103d04e9bf139a92c9f54c4"},
- {file = "traitlets-5.1.0.tar.gz", hash = "sha256:bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"},
+ {file = "traitlets-5.1.1-py3-none-any.whl", hash = "sha256:2d313cc50a42cd6c277e7d7dc8d4d7fedd06a2c215f78766ae7b1a66277e0033"},
+ {file = "traitlets-5.1.1.tar.gz", hash = "sha256:059f456c5a7c1c82b98c2e8c799f39c9b8128f6d0d46941ee118daace9eb70c7"},
]
types-pytz = [
{file = "types-pytz-2021.3.0.tar.gz", hash = "sha256:86a61967834dceeaaf98b6902ed8357efdd262bb8afcaf4bc8ccecf748592778"},
{file = "types_pytz-2021.3.0-py3-none-any.whl", hash = "sha256:b5027e5de50a4c978cd60ca16849d934d44c44ebd7d29cf13ada009efaa9feef"},
]
types-pyyaml = [
- {file = "types-PyYAML-5.4.11.tar.gz", hash = "sha256:802566879aa630b3199f33f3523d4ba069d248d04cea1a12cfa35ecd0dd86622"},
- {file = "types_PyYAML-5.4.11-py3-none-any.whl", hash = "sha256:09b7e488b8057677b7cdf348d2ba5fdcf0952d2f468e86834631db56e5125058"},
+ {file = "types-PyYAML-6.0.0.tar.gz", hash = "sha256:3d3591ddfc488fc30be3c506a0c0fe54da968fe98d8b76ab12e59d455330ffca"},
+ {file = "types_PyYAML-6.0.0-py3-none-any.whl", hash = "sha256:746f23d351245d176d7bc89eef79e2ee94b4e7306f7d23bfefb3dc946c0fb58d"},
]
typing-extensions = [
{file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
@@ -2052,8 +2045,8 @@ ua-parser = [
{file = "ua_parser-0.10.0-py2.py3-none-any.whl", hash = "sha256:46ab2e383c01dbd2ab284991b87d624a26a08f72da4d7d413f5bfab8b9036f8a"},
]
uritemplate = [
- {file = "uritemplate-4.0.0-py2.py3-none-any.whl", hash = "sha256:9de62e39c3f7f7584982a4159d70e6aafda5a479a91cccc18e89ae865eab4ae4"},
- {file = "uritemplate-4.0.0.tar.gz", hash = "sha256:6f4c5b093c915d269df69f291028a72dfdcaf68c8345b92e180f31daf53c4971"},
+ {file = "uritemplate-4.1.1-py2.py3-none-any.whl", hash = "sha256:830c08b8d99bdd312ea4ead05994a38e8936266f84b9a7878232db50b044e02e"},
+ {file = "uritemplate-4.1.1.tar.gz", hash = "sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0"},
]
urllib3 = [
{file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
@@ -2068,5 +2061,55 @@ whitenoise = [
{file = "whitenoise-5.3.0.tar.gz", hash = "sha256:d234b871b52271ae7ed6d9da47ffe857c76568f11dd30e28e18c5869dbd11e12"},
]
wrapt = [
- {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"},
+ {file = "wrapt-1.13.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:e05e60ff3b2b0342153be4d1b597bbcfd8330890056b9619f4ad6b8d5c96a81a"},
+ {file = "wrapt-1.13.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:85148f4225287b6a0665eef08a178c15097366d46b210574a658c1ff5b377489"},
+ {file = "wrapt-1.13.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:2dded5496e8f1592ec27079b28b6ad2a1ef0b9296d270f77b8e4a3a796cf6909"},
+ {file = "wrapt-1.13.3-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e94b7d9deaa4cc7bac9198a58a7240aaf87fe56c6277ee25fa5b3aa1edebd229"},
+ {file = "wrapt-1.13.3-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:498e6217523111d07cd67e87a791f5e9ee769f9241fcf8a379696e25806965af"},
+ {file = "wrapt-1.13.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ec7e20258ecc5174029a0f391e1b948bf2906cd64c198a9b8b281b811cbc04de"},
+ {file = "wrapt-1.13.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:87883690cae293541e08ba2da22cacaae0a092e0ed56bbba8d018cc486fbafbb"},
+ {file = "wrapt-1.13.3-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:f99c0489258086308aad4ae57da9e8ecf9e1f3f30fa35d5e170b4d4896554d80"},
+ {file = "wrapt-1.13.3-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:6a03d9917aee887690aa3f1747ce634e610f6db6f6b332b35c2dd89412912bca"},
+ {file = "wrapt-1.13.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:936503cb0a6ed28dbfa87e8fcd0a56458822144e9d11a49ccee6d9a8adb2ac44"},
+ {file = "wrapt-1.13.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f9c51d9af9abb899bd34ace878fbec8bf357b3194a10c4e8e0a25512826ef056"},
+ {file = "wrapt-1.13.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:220a869982ea9023e163ba915077816ca439489de6d2c09089b219f4e11b6785"},
+ {file = "wrapt-1.13.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0877fe981fd76b183711d767500e6b3111378ed2043c145e21816ee589d91096"},
+ {file = "wrapt-1.13.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:43e69ffe47e3609a6aec0fe723001c60c65305784d964f5007d5b4fb1bc6bf33"},
+ {file = "wrapt-1.13.3-cp310-cp310-win32.whl", hash = "sha256:78dea98c81915bbf510eb6a3c9c24915e4660302937b9ae05a0947164248020f"},
+ {file = "wrapt-1.13.3-cp310-cp310-win_amd64.whl", hash = "sha256:ea3e746e29d4000cd98d572f3ee2a6050a4f784bb536f4ac1f035987fc1ed83e"},
+ {file = "wrapt-1.13.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:8c73c1a2ec7c98d7eaded149f6d225a692caa1bd7b2401a14125446e9e90410d"},
+ {file = "wrapt-1.13.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:086218a72ec7d986a3eddb7707c8c4526d677c7b35e355875a0fe2918b059179"},
+ {file = "wrapt-1.13.3-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:e92d0d4fa68ea0c02d39f1e2f9cb5bc4b4a71e8c442207433d8db47ee79d7aa3"},
+ {file = "wrapt-1.13.3-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:d4a5f6146cfa5c7ba0134249665acd322a70d1ea61732723c7d3e8cc0fa80755"},
+ {file = "wrapt-1.13.3-cp35-cp35m-win32.whl", hash = "sha256:8aab36778fa9bba1a8f06a4919556f9f8c7b33102bd71b3ab307bb3fecb21851"},
+ {file = "wrapt-1.13.3-cp35-cp35m-win_amd64.whl", hash = "sha256:944b180f61f5e36c0634d3202ba8509b986b5fbaf57db3e94df11abee244ba13"},
+ {file = "wrapt-1.13.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2ebdde19cd3c8cdf8df3fc165bc7827334bc4e353465048b36f7deeae8ee0918"},
+ {file = "wrapt-1.13.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:610f5f83dd1e0ad40254c306f4764fcdc846641f120c3cf424ff57a19d5f7ade"},
+ {file = "wrapt-1.13.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5601f44a0f38fed36cc07db004f0eedeaadbdcec90e4e90509480e7e6060a5bc"},
+ {file = "wrapt-1.13.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:e6906d6f48437dfd80464f7d7af1740eadc572b9f7a4301e7dd3d65db285cacf"},
+ {file = "wrapt-1.13.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:766b32c762e07e26f50d8a3468e3b4228b3736c805018e4b0ec8cc01ecd88125"},
+ {file = "wrapt-1.13.3-cp36-cp36m-win32.whl", hash = "sha256:5f223101f21cfd41deec8ce3889dc59f88a59b409db028c469c9b20cfeefbe36"},
+ {file = "wrapt-1.13.3-cp36-cp36m-win_amd64.whl", hash = "sha256:f122ccd12fdc69628786d0c947bdd9cb2733be8f800d88b5a37c57f1f1d73c10"},
+ {file = "wrapt-1.13.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:46f7f3af321a573fc0c3586612db4decb7eb37172af1bc6173d81f5b66c2e068"},
+ {file = "wrapt-1.13.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:778fd096ee96890c10ce96187c76b3e99b2da44e08c9e24d5652f356873f6709"},
+ {file = "wrapt-1.13.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0cb23d36ed03bf46b894cfec777eec754146d68429c30431c99ef28482b5c1df"},
+ {file = "wrapt-1.13.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:96b81ae75591a795d8c90edc0bfaab44d3d41ffc1aae4d994c5aa21d9b8e19a2"},
+ {file = "wrapt-1.13.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7dd215e4e8514004c8d810a73e342c536547038fb130205ec4bba9f5de35d45b"},
+ {file = "wrapt-1.13.3-cp37-cp37m-win32.whl", hash = "sha256:47f0a183743e7f71f29e4e21574ad3fa95676136f45b91afcf83f6a050914829"},
+ {file = "wrapt-1.13.3-cp37-cp37m-win_amd64.whl", hash = "sha256:fd76c47f20984b43d93de9a82011bb6e5f8325df6c9ed4d8310029a55fa361ea"},
+ {file = "wrapt-1.13.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b73d4b78807bd299b38e4598b8e7bd34ed55d480160d2e7fdaabd9931afa65f9"},
+ {file = "wrapt-1.13.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ec9465dd69d5657b5d2fa6133b3e1e989ae27d29471a672416fd729b429eb554"},
+ {file = "wrapt-1.13.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dd91006848eb55af2159375134d724032a2d1d13bcc6f81cd8d3ed9f2b8e846c"},
+ {file = "wrapt-1.13.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ae9de71eb60940e58207f8e71fe113c639da42adb02fb2bcbcaccc1ccecd092b"},
+ {file = "wrapt-1.13.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:51799ca950cfee9396a87f4a1240622ac38973b6df5ef7a41e7f0b98797099ce"},
+ {file = "wrapt-1.13.3-cp38-cp38-win32.whl", hash = "sha256:4b9c458732450ec42578b5642ac53e312092acf8c0bfce140ada5ca1ac556f79"},
+ {file = "wrapt-1.13.3-cp38-cp38-win_amd64.whl", hash = "sha256:7dde79d007cd6dfa65afe404766057c2409316135cb892be4b1c768e3f3a11cb"},
+ {file = "wrapt-1.13.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:981da26722bebb9247a0601e2922cedf8bb7a600e89c852d063313102de6f2cb"},
+ {file = "wrapt-1.13.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:705e2af1f7be4707e49ced9153f8d72131090e52be9278b5dbb1498c749a1e32"},
+ {file = "wrapt-1.13.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:25b1b1d5df495d82be1c9d2fad408f7ce5ca8a38085e2da41bb63c914baadff7"},
+ {file = "wrapt-1.13.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:77416e6b17926d953b5c666a3cb718d5945df63ecf922af0ee576206d7033b5e"},
+ {file = "wrapt-1.13.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:865c0b50003616f05858b22174c40ffc27a38e67359fa1495605f96125f76640"},
+ {file = "wrapt-1.13.3-cp39-cp39-win32.whl", hash = "sha256:0a017a667d1f7411816e4bf214646d0ad5b1da2c1ea13dec6c162736ff25a374"},
+ {file = "wrapt-1.13.3-cp39-cp39-win_amd64.whl", hash = "sha256:81bd7c90d28a4b2e1df135bfbd7c23aee3050078ca6441bead44c42483f9ebfb"},
+ {file = "wrapt-1.13.3.tar.gz", hash = "sha256:1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185"},
]
diff --git a/pyproject.toml b/pyproject.toml
index 708d4c3d9173118889ae217d533f7c0e57adb4ae..f1152fc9d848dc3fa79e779c21f2e7d0078027e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,6 @@ pika-context-manager = {git = "https://git.app.uib.no/it-bott-integrasjoner/pika
psycopg2-binary = "*"
orgreg-client = {git = "https://git.app.uib.no/it-bott-integrasjoner/orgreg-client.git", rev = "v0.2.3" }
python = "^3.9"
-python-daemon = "*"
python-json-logger = "*"
sentry-sdk = "*"
whitenoise = "*"
@@ -27,6 +26,7 @@ mozilla-django-oidc = "^2.0.0"
django-q = "^1.3.9"
django-structlog = "^2.1.3"
structlog = "^21.2.0"
+phonenumbers = "^8.12.35"
[tool.poetry.dev-dependencies]
Faker = "*"