From 62a1b4c15b2ab48693e834bef7466754f9dc44a7 Mon Sep 17 00:00:00 2001 From: Lennart Bank Date: Tue, 12 Sep 2023 15:52:25 +0200 Subject: [PATCH 1/9] UPDATE gatsby-config --- pwa/gatsby-config.js | 5 +++-- pwa/static/.env.development | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pwa/gatsby-config.js b/pwa/gatsby-config.js index c3ccec87..fd1da71c 100644 --- a/pwa/gatsby-config.js +++ b/pwa/gatsby-config.js @@ -4,8 +4,9 @@ require("dotenv").config({ module.exports = { pathPrefix: - process.env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX === "true" ?? - `$/${process.env.GITHUB_REPOSITORY_NAME}`, // we do NOT want to set the prefix if we're using an DNS + process.env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX === "true" + ? `$/${process.env.GITHUB_REPOSITORY_NAME}` + : "", // we do NOT want to set the prefix if we're using an DNS plugins: [ { resolve: `gatsby-plugin-layout`, diff --git a/pwa/static/.env.development b/pwa/static/.env.development index 126fc2f8..4656d5f5 100644 --- a/pwa/static/.env.development +++ b/pwa/static/.env.development @@ -1,5 +1,9 @@ # Connected Repository GITHUB_REPOSITORY_NAME=woo-website-template + +# options: "true" | "false" +USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX="true" + GATSBY_API_BASE_URL=https://api.gateway.commonground.nu/api GATSBY_NL_DESIGN_THEME_CLASSNAME=conduction-theme From 679a2ac70249dbea0b0ffef56a3f685416673be0 Mon Sep 17 00:00:00 2001 From: Lennart Bank Date: Tue, 12 Sep 2023 16:00:01 +0200 Subject: [PATCH 2/9] BUGFIX config --- pwa/gatsby-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwa/gatsby-config.js b/pwa/gatsby-config.js index fd1da71c..72472fa9 100644 --- a/pwa/gatsby-config.js +++ b/pwa/gatsby-config.js @@ -5,7 +5,7 @@ require("dotenv").config({ module.exports = { pathPrefix: process.env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX === "true" - ? `$/${process.env.GITHUB_REPOSITORY_NAME}` + ? `/${process.env.GITHUB_REPOSITORY_NAME}` : "", // we do NOT want to set the prefix if we're using an DNS plugins: [ { From 8ad7fabf469c8aec05043175587ffcb73e32cabe Mon Sep 17 00:00:00 2001 From: Remko Date: Mon, 18 Sep 2023 10:54:11 +0200 Subject: [PATCH 3/9] Added descending sorting on Besluitdatum of woo-publications --- pwa/package-lock.json | 726 ++---------------------- pwa/package.json | 4 +- pwa/src/apiService/resources/openWoo.ts | 2 +- 3 files changed, 39 insertions(+), 693 deletions(-) diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 83a3672b..08f29a97 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.1.40", - "@conduction/theme": "1.0.35", + "@conduction/components": "2.2.5", + "@conduction/theme": "1.0.36", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.1.18", @@ -1997,27 +1997,13 @@ } }, "node_modules/@conduction/components": { - "version": "2.1.40", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.1.40.tgz", - "integrity": "sha512-Rtacgzj3qOH2zsX2ElUFbHstr6LZpHgG6li4Fr+6/rgko2Wsk11b9xBJdCwfqLcx1g2qkWN87jPiHb6VQjqL0Q==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.5.tgz", + "integrity": "sha512-BDKLQqikLM14hyJupR4Ww8uEFbN8g7DTPxAQIkBt8HZ8xpAMk08tx+LZfg/Lzz7b/VtcAC8+8J6cvBHopgCnTA==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", "@fortawesome/react-fontawesome": "^0.2.0", - "@gemeente-denhaag/button": "0.2.3-alpha.205", - "@gemeente-denhaag/design-tokens-components": "0.2.3-alpha.222", - "@gemeente-denhaag/divider": "0.2.3-alpha.205", - "@gemeente-denhaag/form-field": "0.1.1-alpha.98", - "@gemeente-denhaag/formcontrollabel": "0.2.3-alpha.222", - "@gemeente-denhaag/icons": "^0.2.3-alpha.317", - "@gemeente-denhaag/link": "0.2.3-alpha.205", - "@gemeente-denhaag/process-steps": "0.1.0-alpha.51", - "@gemeente-denhaag/sidenav": "0.1.0-alpha.40", - "@gemeente-denhaag/stylesprovider": "0.1.1-alpha.222", - "@gemeente-denhaag/table": "0.1.1-alpha.123", - "@gemeente-denhaag/textarea": "0.1.1-alpha.95", - "@gemeente-denhaag/textfield": "0.2.3-alpha.205", - "@gemeente-denhaag/typography": "0.2.3-alpha.205", "@utrecht/component-library-react": "^1.0.0-alpha.319", "clsx": "^1.1.1", "gatsby": "^4.11.1", @@ -2026,7 +2012,8 @@ "react-hook-form": "7.29.0", "react-paginate": "^8.2.0", "react-select": "5.3.2", - "react-tooltip": "^4.2.21" + "react-tabs": "^6.0.2", + "react-tooltip": "^5.21.3" } }, "node_modules/@conduction/components/node_modules/@fortawesome/react-fontawesome": { @@ -2065,9 +2052,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.35.tgz", - "integrity": "sha512-JPG0IivOmj4+49evuEIILJlWhp41yDUyCbZ0pNHRF1qH5FBjY/kwg1/gYbvqiSwiYseB6uD3bUBOVakf6U8C6w==", + "version": "1.0.36", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.36.tgz", + "integrity": "sha512-RQN6ukFxuPGm98z0DbeYnVd5XI+CEyVWZ3Y+OVId6rGlGssRbzqkcLIskOwPtCG8Ef/8GWPdz0tsNY52Po7oTQ==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } @@ -2323,548 +2310,6 @@ "strip-ansi": "^6.0.0" } }, - "node_modules/@gemeente-denhaag/button": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/button/node_modules/@gemeente-denhaag/baseprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/design-tokens-components": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2" - }, - "node_modules/@gemeente-denhaag/divider": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/basedatadisplayprops": "0.2.3-alpha.205", - "@material-ui/core": "4.12.3" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@emotion/hash": { - "version": "0.8.0", - "license": "MIT" - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@gemeente-denhaag/basedatadisplayprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@gemeente-denhaag/basedatadisplayprops/node_modules/@gemeente-denhaag/baseprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@material-ui/core": { - "version": "4.12.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.4", - "@material-ui/system": "^4.12.1", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.2", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", - "react-transition-group": "^4.4.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@material-ui/core/node_modules/@material-ui/styles": { - "version": "4.11.5", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.8.0", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "clsx": "^1.0.4", - "csstype": "^2.5.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.5.1", - "jss-plugin-camel-case": "^10.5.1", - "jss-plugin-default-unit": "^10.5.1", - "jss-plugin-global": "^10.5.1", - "jss-plugin-nested": "^10.5.1", - "jss-plugin-props-sort": "^10.5.1", - "jss-plugin-rule-value-function": "^10.5.1", - "jss-plugin-vendor-prefixer": "^10.5.1", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@material-ui/core/node_modules/@material-ui/system": { - "version": "4.12.2", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/utils": "^4.11.3", - "csstype": "^2.5.2", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@material-ui/core/node_modules/@material-ui/utils": { - "version": "4.11.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@material-ui/core/node_modules/csstype": { - "version": "2.6.21", - "license": "MIT" - }, - "node_modules/@gemeente-denhaag/divider/node_modules/@types/react": { - "version": "17.0.65", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/react-dom": { - "version": "17.0.2", - "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "scheduler": "^0.20.2" - }, - "peerDependencies": { - "react": "17.0.2" - } - }, - "node_modules/@gemeente-denhaag/divider/node_modules/scheduler": { - "version": "0.20.2", - "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "node_modules/@gemeente-denhaag/form-field": { - "version": "0.1.1-alpha.98", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/formcontrollabel": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/icons": { - "version": "0.2.3-alpha.322", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0 || ^18.0.0" - } - }, - "node_modules/@gemeente-denhaag/link": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.205", - "@gemeente-denhaag/icons": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/link/node_modules/@gemeente-denhaag/baseprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/link/node_modules/@gemeente-denhaag/icons": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/process-steps": { - "version": "0.1.0-alpha.51", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.222", - "@gemeente-denhaag/icons": "0.2.3-alpha.222", - "@gemeente-denhaag/typography": "0.2.3-alpha.222" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/process-steps/node_modules/@gemeente-denhaag/baseprops": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/process-steps/node_modules/@gemeente-denhaag/icons": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/process-steps/node_modules/@gemeente-denhaag/typography": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/basedatadisplayprops": "0.2.3-alpha.222" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/process-steps/node_modules/@gemeente-denhaag/typography/node_modules/@gemeente-denhaag/basedatadisplayprops": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.222" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/sidenav": { - "version": "0.1.0-alpha.40", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/stylesprovider": { - "version": "0.1.1-alpha.222", - "license": "EUPL-1.2", - "dependencies": { - "@material-ui/core": "4.12.4" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@emotion/hash": { - "version": "0.8.0", - "license": "MIT" - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@material-ui/core": { - "version": "4.12.4", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.5", - "@material-ui/system": "^4.12.2", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "hoist-non-react-statics": "^3.3.2", - "popper.js": "1.16.1-lts", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0", - "react-transition-group": "^4.4.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@material-ui/core/node_modules/@material-ui/styles": { - "version": "4.11.5", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.8.0", - "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.3", - "clsx": "^1.0.4", - "csstype": "^2.5.2", - "hoist-non-react-statics": "^3.3.2", - "jss": "^10.5.1", - "jss-plugin-camel-case": "^10.5.1", - "jss-plugin-default-unit": "^10.5.1", - "jss-plugin-global": "^10.5.1", - "jss-plugin-nested": "^10.5.1", - "jss-plugin-props-sort": "^10.5.1", - "jss-plugin-rule-value-function": "^10.5.1", - "jss-plugin-vendor-prefixer": "^10.5.1", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@material-ui/core/node_modules/@material-ui/system": { - "version": "4.12.2", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "@material-ui/utils": "^4.11.3", - "csstype": "^2.5.2", - "prop-types": "^15.7.2" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/material-ui" - }, - "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@material-ui/core/node_modules/@material-ui/utils": { - "version": "4.11.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.4.4", - "prop-types": "^15.7.2", - "react-is": "^16.8.0 || ^17.0.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@material-ui/core/node_modules/csstype": { - "version": "2.6.21", - "license": "MIT" - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/@types/react": { - "version": "17.0.65", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/react-dom": { - "version": "17.0.2", - "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "scheduler": "^0.20.2" - }, - "peerDependencies": { - "react": "17.0.2" - } - }, - "node_modules/@gemeente-denhaag/stylesprovider/node_modules/scheduler": { - "version": "0.20.2", - "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "node_modules/@gemeente-denhaag/table": { - "version": "0.1.1-alpha.123", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/textarea": { - "version": "0.1.1-alpha.95", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/icons": "0.2.3-alpha.222" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/textarea/node_modules/@gemeente-denhaag/icons": { - "version": "0.2.3-alpha.222", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/textfield": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/icons": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/textfield/node_modules/@gemeente-denhaag/icons": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/typography": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/basedatadisplayprops": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/typography/node_modules/@gemeente-denhaag/basedatadisplayprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "dependencies": { - "@gemeente-denhaag/baseprops": "0.2.3-alpha.205" - }, - "peerDependencies": { - "react": "^17.0.0" - } - }, - "node_modules/@gemeente-denhaag/typography/node_modules/@gemeente-denhaag/basedatadisplayprops/node_modules/@gemeente-denhaag/baseprops": { - "version": "0.2.3-alpha.205", - "license": "EUPL-1.2", - "peerDependencies": { - "react": "^17.0.0" - } - }, "node_modules/@graphql-codegen/add": { "version": "3.2.3", "license": "MIT", @@ -3375,18 +2820,6 @@ "win32" ] }, - "node_modules/@material-ui/types": { - "version": "5.1.0", - "license": "MIT", - "peerDependencies": { - "@types/react": "*" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@mischnic/json-sourcemap": { "version": "0.1.0", "license": "MIT", @@ -6948,14 +6381,6 @@ "node": ">=0.10.0" } }, - "node_modules/css-vendor": { - "version": "2.0.8", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.8.3", - "is-in-browser": "^1.0.2" - } - }, "node_modules/css-what": { "version": "6.1.0", "license": "BSD-2-Clause", @@ -10598,10 +10023,6 @@ "url": "https://github.com/sponsors/typicode" } }, - "node_modules/hyphenate-style-name": { - "version": "1.0.4", - "license": "BSD-3-Clause" - }, "node_modules/i18next": { "version": "21.10.0", "funding": [ @@ -10980,10 +10401,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-in-browser": { - "version": "1.1.3", - "license": "MIT" - }, "node_modules/is-installed-globally": { "version": "0.4.0", "license": "MIT", @@ -11391,80 +10808,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jss": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "csstype": "^3.0.2", - "is-in-browser": "^1.1.3", - "tiny-warning": "^1.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/jss" - } - }, - "node_modules/jss-plugin-camel-case": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "hyphenate-style-name": "^1.0.3", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-default-unit": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-global": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-nested": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0", - "tiny-warning": "^1.0.2" - } - }, - "node_modules/jss-plugin-props-sort": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0" - } - }, - "node_modules/jss-plugin-rule-value-function": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "jss": "10.10.0", - "tiny-warning": "^1.0.2" - } - }, - "node_modules/jss-plugin-vendor-prefixer": { - "version": "10.10.0", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.3.1", - "css-vendor": "^2.0.8", - "jss": "10.10.0" - } - }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "license": "MIT", @@ -13482,10 +12825,6 @@ "version": "1.3.6", "license": "MIT" }, - "node_modules/popper.js": { - "version": "1.16.1-lts", - "license": "MIT" - }, "node_modules/postcss": { "version": "8.4.27", "funding": [ @@ -14562,26 +13901,37 @@ "react": "^16.3.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/react-tooltip": { - "version": "4.5.1", - "license": "MIT", + "node_modules/react-tabs": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.0.2.tgz", + "integrity": "sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==", "dependencies": { - "prop-types": "^15.8.1", - "uuid": "^7.0.3" - }, - "engines": { - "npm": ">=6.13" + "clsx": "^2.0.0", + "prop-types": "^15.5.0" }, "peerDependencies": { - "react": ">=16.0.0", - "react-dom": ">=16.0.0" + "react": "^18.0.0" } }, - "node_modules/react-tooltip/node_modules/uuid": { - "version": "7.0.3", - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" + "node_modules/react-tabs/node_modules/clsx": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", + "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "engines": { + "node": ">=6" + } + }, + "node_modules/react-tooltip": { + "version": "5.21.4", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.21.4.tgz", + "integrity": "sha512-LZsllEbiu63zNwuCalq3gIFcBu2Xf0I0fMg7uuF7/5ROo5//uHe8Sum7v9L1Rtp6IozcoU9YAjkNUZdrxutsNg==", + "dependencies": { + "@floating-ui/dom": "^1.0.0", + "classnames": "^2.3.0" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" } }, "node_modules/react-transition-group": { @@ -16155,10 +15505,6 @@ "next-tick": "1" } }, - "node_modules/tiny-warning": { - "version": "1.0.3", - "license": "MIT" - }, "node_modules/title-case": { "version": "3.0.3", "license": "MIT", diff --git a/pwa/package.json b/pwa/package.json index cbb1f7ae..0dd63a7f 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -22,8 +22,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.1.40", - "@conduction/theme": "1.0.35", + "@conduction/components": "2.2.5", + "@conduction/theme": "1.0.36", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.1.18", diff --git a/pwa/src/apiService/resources/openWoo.ts b/pwa/src/apiService/resources/openWoo.ts index c0118711..c15ff9d4 100644 --- a/pwa/src/apiService/resources/openWoo.ts +++ b/pwa/src/apiService/resources/openWoo.ts @@ -15,7 +15,7 @@ export default class OpenWoo { } public getAll = async (filters: IFiltersContext, currentPage: number): Promise => { - let endpoint = `/openWOO?extend[]=all${filtersToQueryParams(filters)}&_limit=${OPEN_WOO_LIMIT}&_page=${currentPage}`; + let endpoint = `/openWOO?extend[]=all${filtersToQueryParams(filters)}&_order[Besluitdatum]=desc&_limit=${OPEN_WOO_LIMIT}&_page=${currentPage}`; if (process.env.GATSBY_OIDN_NUMBER) { endpoint += `&oidn=${process.env.GATSBY_OIDN_NUMBER}`; From cccd6604e01f8e4b94118f4c1ee8dcca906bddf8 Mon Sep 17 00:00:00 2001 From: Remko Huisman <43807324+remko48@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:19:05 +0200 Subject: [PATCH 4/9] Added github issue requested changes. --- .../resultsDisplaySwitch/ResultsDisplaySwitch.module.css | 2 ++ pwa/src/context/filters.ts | 4 ++-- .../templates/templateParts/filters/FiltersTemplate.tsx | 8 ++++---- .../tableResultsTemplate/TableResultsTemplate.tsx | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css index e05def83..c9adcdb3 100644 --- a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css +++ b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css @@ -1,5 +1,7 @@ .container { align-items: center; + flex-wrap: nowrap; + margin-inline-start: 12px; } .button:hover { diff --git a/pwa/src/context/filters.ts b/pwa/src/context/filters.ts index f263d509..187af7e6 100644 --- a/pwa/src/context/filters.ts +++ b/pwa/src/context/filters.ts @@ -5,14 +5,14 @@ export interface IFiltersContext { _search: string | undefined; "Ontvangstdatum[after]": string | undefined; "Ontvangstdatum[before]": string | undefined; - publicationType: string | undefined; + Categorie: string | undefined; } export const defaultFiltersContext: IFiltersContext = { _search: "", "Ontvangstdatum[after]": undefined, "Ontvangstdatum[before]": undefined, - publicationType: undefined, + Categorie: undefined, }; export const useFiltersContext = () => { diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx index 906d618c..c53a3500 100644 --- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx +++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx @@ -33,7 +33,7 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = _search: data.title, "Ontvangstdatum[after]": data.year?.after, "Ontvangstdatum[before]": data.year?.before, - publicationType: data.publicationType?.value, + Categorie: data.category?.value, }); }; @@ -58,9 +58,9 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = option.value === filters.publicationType)} + name="category" + placeholder="Onderwerp" + defaultValue={TEMP_PUBLICATION_TYPES.find((option) => option.value === filters.Categorie)} isClearable {...{ register, errors, control }} /> diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx index d8c1d6fa..84b8f50a 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx @@ -23,7 +23,8 @@ export const TableResultsTemplate: React.FC = ({ requ - Name + Woo-verzoek + Onderwerp Ontvangstdatum Besluitdatum Besluit @@ -33,6 +34,7 @@ export const TableResultsTemplate: React.FC = ({ requ {requests.map((request) => ( navigate(request.id)}> {request.Titel} + {request.Categorie ?? "-"} {translateDate(i18n.language, request.Ontvangstdatum) ?? "-"} {translateDate(i18n.language, request.Besluitdatum) ?? "-"} {request.Besluit !== "" ? request.Besluit : "Geen besluit beschikbaar"} From 9525af6a6b289428cfdad5e2402092b6f60afe26 Mon Sep 17 00:00:00 2001 From: Remko Date: Thu, 21 Sep 2023 15:07:49 +0200 Subject: [PATCH 5/9] Added beschrijving table row --- .../wooItemDetailTemplate/WOOItemDetailTemplate.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx index 8a8ab2dd..cf46bb88 100644 --- a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx +++ b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx @@ -70,6 +70,12 @@ export const WOOItemDetailTemplate: React.FC = ({ wo {getItems.data.Samenvatting} )} + {getItems.data.Beschrijving && ( + + {t("Beschrijving")} + {getItems.data.Beschrijving} + + )} {getItems.data.Termijnoverschrijding && ( From fe8532bef16d612d537a7e158d410a4eaf851447 Mon Sep 17 00:00:00 2001 From: Remko Date: Fri, 22 Sep 2023 13:38:43 +0200 Subject: [PATCH 6/9] added publicationDate --- pwa/README.md | 54 ------------------- pwa/package-lock.json | 30 ++++++----- pwa/package.json | 2 +- pwa/src/apiService/resources/openWoo.ts | 2 +- .../ResultsDisplaySwitch.module.css | 2 +- pwa/src/context/filters.ts | 8 +-- pwa/src/data/years.ts | 4 +- pwa/src/services/dateFormat.ts | 2 + .../CardsResultsTemplate.tsx | 2 +- .../templateParts/filters/FiltersTemplate.tsx | 9 ++-- 10 files changed, 36 insertions(+), 79 deletions(-) diff --git a/pwa/README.md b/pwa/README.md index d517a18e..e69de29b 100644 --- a/pwa/README.md +++ b/pwa/README.md @@ -1,54 +0,0 @@ -

- - Gatsby - -

-

- Gatsby minimal TypeScript starter -

- -## ๐Ÿš€ Quick start - -1. **Create a Gatsby site.** - - Use the Gatsby CLI to create a new site, specifying the minimal TypeScript starter. - - ```shell - # create a new Gatsby site using the minimal TypeScript starter - npm init gatsby - ``` - -2. **Start developing.** - - Navigate into your new siteโ€™s directory and start it up. - - ```shell - cd my-gatsby-site/ - npm run develop - ``` - -3. **Open the code and start customizing!** - - Your site is now running at http://localhost:8000! - - Edit `src/pages/index.tsx` to see your site update in real-time! - -4. **Learn more** - - - [Documentation](https://www.gatsbyjs.com/docs/?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - - - [Tutorials](https://www.gatsbyjs.com/tutorial/?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - - - [Guides](https://www.gatsbyjs.com/tutorial/?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - - - [API Reference](https://www.gatsbyjs.com/docs/api-reference/?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - - - [Plugin Library](https://www.gatsbyjs.com/plugins?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - - - [Cheat Sheet](https://www.gatsbyjs.com/docs/cheat-sheet/?utm_source=starter&utm_medium=readme&utm_campaign=minimal-starter-ts) - -## ๐Ÿš€ Quick start (Gatsby Cloud) - -Deploy this starter with one click on [Gatsby Cloud](https://www.gatsbyjs.com/cloud/): - -[Deploy to Gatsby Cloud](https://www.gatsbyjs.com/dashboard/deploynow?url=https://github.com/gatsbyjs/gatsby-starter-minimal-ts) diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 08f29a97..e34daf0b 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,7 +8,7 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.5", + "@conduction/components": "2.2.8", "@conduction/theme": "1.0.36", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", @@ -1997,9 +1997,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.5.tgz", - "integrity": "sha512-BDKLQqikLM14hyJupR4Ww8uEFbN8g7DTPxAQIkBt8HZ8xpAMk08tx+LZfg/Lzz7b/VtcAC8+8J6cvBHopgCnTA==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.8.tgz", + "integrity": "sha512-eaCLSm2giu+kCNlC6+H+gqZkehIeIFxOVGz/MYfhHBTP+lRulV1C258jQXpK8DjxXY65XHKruNVYrgi2ZEyYpA==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", @@ -3668,7 +3668,8 @@ }, "node_modules/@popperjs/core": { "version": "2.11.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -5677,7 +5678,8 @@ }, "node_modules/classnames": { "version": "2.3.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" }, "node_modules/clean-stack": { "version": "2.2.0", @@ -13601,14 +13603,15 @@ } }, "node_modules/react-datepicker": { - "version": "4.16.0", - "license": "MIT", + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.18.0.tgz", + "integrity": "sha512-0MYt3HmLbHVk1sw4v+RCbLAVg5TA3jWP7RyjZbo53PC+SEi+pjdgc92lB53ai/ENZaTOhbXmgni9GzvMrorMAw==", "dependencies": { "@popperjs/core": "^2.11.8", "classnames": "^2.2.6", "date-fns": "^2.30.0", "prop-types": "^15.7.2", - "react-onclickoutside": "^6.12.2", + "react-onclickoutside": "^6.13.0", "react-popper": "^2.3.0" }, "peerDependencies": { @@ -13781,7 +13784,8 @@ }, "node_modules/react-onclickoutside": { "version": "6.13.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", "funding": { "type": "individual", "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" @@ -13803,7 +13807,8 @@ }, "node_modules/react-popper": { "version": "2.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "dependencies": { "react-fast-compare": "^3.0.1", "warning": "^4.0.2" @@ -16072,7 +16077,8 @@ }, "node_modules/warning": { "version": "4.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "dependencies": { "loose-envify": "^1.0.0" } diff --git a/pwa/package.json b/pwa/package.json index 0dd63a7f..3194d1c1 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -22,7 +22,7 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.5", + "@conduction/components": "2.2.8", "@conduction/theme": "1.0.36", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", diff --git a/pwa/src/apiService/resources/openWoo.ts b/pwa/src/apiService/resources/openWoo.ts index c15ff9d4..91174196 100644 --- a/pwa/src/apiService/resources/openWoo.ts +++ b/pwa/src/apiService/resources/openWoo.ts @@ -15,7 +15,7 @@ export default class OpenWoo { } public getAll = async (filters: IFiltersContext, currentPage: number): Promise => { - let endpoint = `/openWOO?extend[]=all${filtersToQueryParams(filters)}&_order[Besluitdatum]=desc&_limit=${OPEN_WOO_LIMIT}&_page=${currentPage}`; + let endpoint = `/openWOO?extend[]=all${filtersToQueryParams(filters)}&_order[Publicatiedatum]=desc&_limit=${OPEN_WOO_LIMIT}&_page=${currentPage}`; if (process.env.GATSBY_OIDN_NUMBER) { endpoint += `&oidn=${process.env.GATSBY_OIDN_NUMBER}`; diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css index c9adcdb3..db3cb651 100644 --- a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css +++ b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css @@ -1,6 +1,6 @@ .container { align-items: center; - flex-wrap: nowrap; + flex-wrap: nowrap !important; margin-inline-start: 12px; } diff --git a/pwa/src/context/filters.ts b/pwa/src/context/filters.ts index 187af7e6..10736825 100644 --- a/pwa/src/context/filters.ts +++ b/pwa/src/context/filters.ts @@ -3,15 +3,15 @@ import { GlobalContext } from "./global"; export interface IFiltersContext { _search: string | undefined; - "Ontvangstdatum[after]": string | undefined; - "Ontvangstdatum[before]": string | undefined; + "Publicatiedatum[after]": string | undefined; + "Publicatiedatum[before]": string | undefined; Categorie: string | undefined; } export const defaultFiltersContext: IFiltersContext = { _search: "", - "Ontvangstdatum[after]": undefined, - "Ontvangstdatum[before]": undefined, + "Publicatiedatum[after]": undefined, + "Publicatiedatum[before]": undefined, Categorie: undefined, }; diff --git a/pwa/src/data/years.ts b/pwa/src/data/years.ts index 024e08e7..711cfba2 100644 --- a/pwa/src/data/years.ts +++ b/pwa/src/data/years.ts @@ -5,8 +5,8 @@ export const generateYearsArray = (amountOfYears: number) => { for (let i = 0; i < amountOfYears; i++) { const year = currentYear - i; - const beforeDate = `${year + 1}-01-01`; - const afterDate = `${year - 1}-12-31`; + const beforeDate = `${year + 1}-01-01T00:00:00Z`; + const afterDate = `${year - 1}-12-31T23:59:59Z`; yearsArray.push({ label: `${year}`, diff --git a/pwa/src/services/dateFormat.ts b/pwa/src/services/dateFormat.ts index aa02bda2..98c2a0bb 100644 --- a/pwa/src/services/dateFormat.ts +++ b/pwa/src/services/dateFormat.ts @@ -1,6 +1,8 @@ import dateFormat from "dateformat"; export const translateDate = (language: string, date: Date): string => { + if (!date) return "NVT"; + switch (language) { case "nl": return dateFormat(date, "dd-mm-yyyy"); diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx index 72d94160..eddfb02f 100644 --- a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx @@ -22,7 +22,7 @@ export const CardsResultsTemplate: React.FC = ({ requ navigate(request.id)}> - {translateDate(i18n.language, request.Besluitdatum) ?? "-"} + {translateDate(i18n.language, request.Publicatiedatum) ?? "-"} {request.Titel} diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx index c53a3500..38e4335d 100644 --- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx +++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx @@ -28,11 +28,14 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = const watcher = watch(); + const today = new Date(); + const currentYear = today.getFullYear(); + const onSubmit = (data: any) => { setFilters({ _search: data.title, - "Ontvangstdatum[after]": data.year?.after, - "Ontvangstdatum[before]": data.year?.before, + "Publicatiedatum[after]": data.year?.after, + "Publicatiedatum[before]": data.year?.before, Categorie: data.category?.value, }); }; @@ -49,7 +52,7 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = Date: Fri, 22 Sep 2023 13:54:46 +0200 Subject: [PATCH 7/9] added publicationDate --- pwa/src/services/dateFormat.ts | 2 -- .../CardsResultsTemplate.tsx | 3 ++- .../TableResultsTemplate.tsx | 18 ++++++++++++++++-- .../WOOItemDetailTemplate.tsx | 11 +++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/pwa/src/services/dateFormat.ts b/pwa/src/services/dateFormat.ts index 98c2a0bb..aa02bda2 100644 --- a/pwa/src/services/dateFormat.ts +++ b/pwa/src/services/dateFormat.ts @@ -1,8 +1,6 @@ import dateFormat from "dateformat"; export const translateDate = (language: string, date: Date): string => { - if (!date) return "NVT"; - switch (language) { case "nl": return dateFormat(date, "dd-mm-yyyy"); diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx index eddfb02f..0227737a 100644 --- a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx @@ -22,7 +22,8 @@ export const CardsResultsTemplate: React.FC = ({ requ navigate(request.id)}> - {translateDate(i18n.language, request.Publicatiedatum) ?? "-"} + {" "} + {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : "NVT"} {request.Titel} diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx index 84b8f50a..c5d6565b 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx @@ -25,6 +25,7 @@ export const TableResultsTemplate: React.FC = ({ requ Woo-verzoek Onderwerp + Publicatiedatum Ontvangstdatum Besluitdatum Besluit @@ -35,8 +36,21 @@ export const TableResultsTemplate: React.FC = ({ requ navigate(request.id)}> {request.Titel} {request.Categorie ?? "-"} - {translateDate(i18n.language, request.Ontvangstdatum) ?? "-"} - {translateDate(i18n.language, request.Besluitdatum) ?? "-"} + + {request.Publicatiedatum + ? translateDate(i18n.language, request.Publicatiedatum) + : "Geen publicatiedatum beschikbaar"} + + + {request.Ontvangstdatum + ? translateDate(i18n.language, request.Ontvangstdatum) + : "Geen ontvanstdatum beschikbaar"} + + + {request.Besluitdatum + ? translateDate(i18n.language, request.Besluitdatum) + : "Geen besluitdatum beschikbaar"} + {request.Besluit !== "" ? request.Besluit : "Geen besluit beschikbaar"} ))} diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx index cf46bb88..f2b9178b 100644 --- a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx +++ b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx @@ -84,6 +84,17 @@ export const WOOItemDetailTemplate: React.FC = ({ wo )} + {getItems.data.Publicatiedatum && ( + + {t("Publicatiedatum")} + + {getItems.data.Publicatiedatum + ? translateDate(i18n.language, getItems.data.Publicatiedatum) + : "-"} + + + )} + {getItems.data.Ontvangstdatum && ( {t("Ontvangstdatum")} From 0f9af0c12a567e2739b7238a9b553b16e8645a0e Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 26 Sep 2023 09:56:04 +0200 Subject: [PATCH 8/9] changed onderwerp to categorie --- pwa/src/templates/templateParts/filters/FiltersTemplate.tsx | 2 +- .../tableResultsTemplate/TableResultsTemplate.tsx | 2 +- .../templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx index 38e4335d..70e2300f 100644 --- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx +++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx @@ -62,7 +62,7 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = option.value === filters.Categorie)} isClearable {...{ register, errors, control }} diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx index c5d6565b..127f2430 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx @@ -24,7 +24,7 @@ export const TableResultsTemplate: React.FC = ({ requ Woo-verzoek - Onderwerp + Categorie Publicatiedatum Ontvangstdatum Besluitdatum diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx index f2b9178b..cff76af4 100644 --- a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx +++ b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx @@ -59,8 +59,8 @@ export const WOOItemDetailTemplate: React.FC = ({ wo {getItems.data.Titel && ( - {t("Onderwerp")} - {getItems.data.Titel} + {t("Categorie")} + {getItems.data.Categorie ?? "-"} )} From fe66f11cfbeb21c89d492a4beab4eb47aa735e29 Mon Sep 17 00:00:00 2001 From: Remko Date: Wed, 27 Sep 2023 09:42:24 +0200 Subject: [PATCH 9/9] Cleanup plus requested changes --- .../cardsResultsTemplate/CardsResultsTemplate.tsx | 4 ++-- .../tableResultsTemplate/TableResultsTemplate.tsx | 2 +- .../templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx index 0227737a..cf2a776b 100644 --- a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx @@ -23,10 +23,10 @@ export const CardsResultsTemplate: React.FC = ({ requ {" "} - {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : "NVT"} + {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : "N.v.t."} - {request.Titel} + {request.Titel !== "" ? request.Titel : "Geen titel beschikbaar"} diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx index 127f2430..0b939e4f 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx @@ -34,7 +34,7 @@ export const TableResultsTemplate: React.FC = ({ requ {requests.map((request) => ( navigate(request.id)}> - {request.Titel} + {request.Titel !== "" ? request.Titel : "Geen titel beschikbaar"} {request.Categorie ?? "-"} {request.Publicatiedatum diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx index cff76af4..975cfef6 100644 --- a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx +++ b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx @@ -44,9 +44,7 @@ export const WOOItemDetailTemplate: React.FC = ({ wo {getItems.isSuccess && ( <> - {/* This heading is temporary untill all denhaag dependencies are removed from @conduction-components package */} -

{getItems.data.Titel}

- {/* {getItems.data.Titel} */} + {getItems.data.Titel !== "" ? getItems.data.Titel : "Geen titel beschikbaar"}