diff --git a/package-lock.json b/package-lock.json index d03c29f82..341d80b78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@amsterdam/amsterdam-react-final-form": "^0.1.140", "@amsterdam/asc-assets": "^0.38.0", "@amsterdam/asc-ui": "^0.37.0", - "@amsterdam/wonen-ui": "^1.0.41", + "@amsterdam/wonen-ui": "^1.0.43", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@reach/router": "^1.3.4", @@ -139,11 +139,11 @@ } }, "node_modules/@amsterdam/wonen-ui": { - "version": "1.0.41", - "resolved": "https://registry.npmjs.org/@amsterdam/wonen-ui/-/wonen-ui-1.0.41.tgz", - "integrity": "sha512-LcVyr/cAAl+BPoCp9SsZ0SIDNJudaHNFVzx3eQmHB4EdPpADCCUDtY+nzRNWXAmBKCVpcjtHkbFUh4CxkRSSNw==", + "version": "1.0.43", + "resolved": "https://registry.npmjs.org/@amsterdam/wonen-ui/-/wonen-ui-1.0.43.tgz", + "integrity": "sha512-qhdXhI9fxoQW0ZIu1XxAaL8tSa2IMcqYaIzU2th7J/Ji9/Tp9Ii/ybL5eHVC4ZGN5PDPZNwsODgf6Bm/JQK18A==", "dependencies": { - "dompurify": "^2.4.1", + "dompurify": "^3.0.1", "lodash.get": "^4.4.2", "lodash.pickby": "^4.6.0", "moment": "^2.29.4", @@ -7427,9 +7427,9 @@ } }, "node_modules/dompurify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", - "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.5.tgz", + "integrity": "sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==" }, "node_modules/domutils": { "version": "2.4.4", @@ -22194,11 +22194,11 @@ } }, "@amsterdam/wonen-ui": { - "version": "1.0.41", - "resolved": "https://registry.npmjs.org/@amsterdam/wonen-ui/-/wonen-ui-1.0.41.tgz", - "integrity": "sha512-LcVyr/cAAl+BPoCp9SsZ0SIDNJudaHNFVzx3eQmHB4EdPpADCCUDtY+nzRNWXAmBKCVpcjtHkbFUh4CxkRSSNw==", + "version": "1.0.43", + "resolved": "https://registry.npmjs.org/@amsterdam/wonen-ui/-/wonen-ui-1.0.43.tgz", + "integrity": "sha512-qhdXhI9fxoQW0ZIu1XxAaL8tSa2IMcqYaIzU2th7J/Ji9/Tp9Ii/ybL5eHVC4ZGN5PDPZNwsODgf6Bm/JQK18A==", "requires": { - "dompurify": "^2.4.1", + "dompurify": "^3.0.1", "lodash.get": "^4.4.2", "lodash.pickby": "^4.6.0", "moment": "^2.29.4", @@ -28403,9 +28403,9 @@ } }, "dompurify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", - "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.5.tgz", + "integrity": "sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==" }, "domutils": { "version": "2.4.4", diff --git a/package.json b/package.json index be5d84f56..47f031472 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@amsterdam/amsterdam-react-final-form": "^0.1.140", "@amsterdam/asc-assets": "^0.38.0", "@amsterdam/asc-ui": "^0.37.0", - "@amsterdam/wonen-ui": "^1.0.41", + "@amsterdam/wonen-ui": "^1.0.43", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@reach/router": "^1.3.4", diff --git a/src/app/components/addresses/AddressMenu/AddressMenu.tsx b/src/app/components/addresses/AddressMenu/AddressMenu.tsx index af9c880c6..904e2b6e5 100644 --- a/src/app/components/addresses/AddressMenu/AddressMenu.tsx +++ b/src/app/components/addresses/AddressMenu/AddressMenu.tsx @@ -21,8 +21,8 @@ const AddressMenu: React.FC = ({ bagId }) => { const [permitDetails] = usePermitDetails(bagId) const [data] = useCasesByBagId(bagId) const numCases = data?.results?.length ?? 0 - const permitsGranted = permitDetails?.permits.filter(p => p.permit_granted === "GRANTED").length - const permitsFound = permitDetails?.permits.filter(p => ["GRANTED", "NOT_GRANTED"].includes(p.permit_granted)).length + const permitsGranted = permitDetails?.permits?.filter(p => p.permit_granted === "GRANTED").length + const permitsFound = permitDetails?.permits?.filter(p => ["GRANTED", "NOT_GRANTED"].includes(p.permit_granted)).length const counts = [ undefined, undefined, @@ -34,30 +34,30 @@ const AddressMenu: React.FC = ({ bagId }) => {
    { routes.map((route, index) => { - const path = typeof route === "string" ? route : route.path - const permissionNames = typeof route !== "string" ? route.permissionNames : undefined - const page = routesObject[path] - if (page?.icon === undefined || page?.title === undefined) return null - const navBlock = ( - - ) - return ( -
  • -
    - { mockedRoutes.includes(path) ? ( - { navBlock } - ) : navBlock - } -
    -
  • - ) - }) + const path = typeof route === "string" ? route : route.path + const permissionNames = typeof route !== "string" ? route.permissionNames : undefined + const page = routesObject[path] + if (page?.icon === undefined || page?.title === undefined) return null + const navBlock = ( + + ) + return ( +
  • +
    + { mockedRoutes.includes(path) ? ( + { navBlock } + ) : navBlock + } +
    +
  • + ) + }) }