From 2c4f377e49f3a35138f2cc8a03fce2f28eff176b Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 11:58:29 +0200 Subject: [PATCH 01/22] chore: link change to new QB guideline link change to new QB guideline --- src/app/modules/about-module/layout.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/modules/about-module/layout.tsx b/src/app/modules/about-module/layout.tsx index fe2bd58e..afeb3c57 100644 --- a/src/app/modules/about-module/layout.tsx +++ b/src/app/modules/about-module/layout.tsx @@ -150,7 +150,7 @@ export const AboutLayout = () => {
For guidance on how to use the query builder, see the{' '} Query Builder User Guide. @@ -166,8 +166,7 @@ export const AboutLayout = () => { The benefit of IATI.cloud is that you can convert the - original IATI data, provided in XML format, into three - formats - CSV, XLM and JSON. All data in IATI.cloud is filtered + original IATI raw XML data into three different formats - CSV, XLM and JSON. All data in IATI.cloud is filtered and output based on IATI activities. The exception is converting the data into CSV format, which also allows you to output it based on budgets and transactions. From 5dba805d8b43a1aef16f28e66daa1730020fb44a Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 12:05:04 +0200 Subject: [PATCH 02/22] chore: updating to correct referenes updating to correct referenes --- src/app/modules/common/ModuleHeader/index.tsx | 2 +- src/app/modules/landing-module/common/LandingMidSection.tsx | 4 ++-- src/app/modules/landing-module/index.tsx | 2 +- src/app/modules/landing-module/layout.tsx | 2 +- src/app/modules/notfound-module/index.tsx | 2 +- src/app/modules/notfound-module/layout.tsx | 6 +++--- src/app/modules/querybuilder-module/index.tsx | 2 +- src/app/modules/querybuilder-module/layout.tsx | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/modules/common/ModuleHeader/index.tsx b/src/app/modules/common/ModuleHeader/index.tsx index 011ecae7..162e62b2 100644 --- a/src/app/modules/common/ModuleHeader/index.tsx +++ b/src/app/modules/common/ModuleHeader/index.tsx @@ -36,7 +36,7 @@ export const ModuleHeader = (props: ModuleModel) => { For guidance on how
to use the query builder, see the{' '} Query Builder User Guide. diff --git a/src/app/modules/landing-module/common/LandingMidSection.tsx b/src/app/modules/landing-module/common/LandingMidSection.tsx index 0f64d929..4971dce2 100644 --- a/src/app/modules/landing-module/common/LandingMidSection.tsx +++ b/src/app/modules/landing-module/common/LandingMidSection.tsx @@ -11,8 +11,8 @@ export const LandingMidSection = () => { { - The IATI Datastore provides data on development and humanitarian + IATI.cloud provides data on development and humanitarian spending and projects that address poverty and crises across the world. diff --git a/src/app/modules/notfound-module/index.tsx b/src/app/modules/notfound-module/index.tsx index f774c635..70100df9 100644 --- a/src/app/modules/notfound-module/index.tsx +++ b/src/app/modules/notfound-module/index.tsx @@ -5,6 +5,6 @@ import { PageNotFoundLayout } from './layout'; import { useTitle } from 'react-use'; export function PageNotFound() { - useTitle('IATI Datastore - 404 Page not found'); + useTitle('IATI.cloud - 404 Page not found'); return ; } diff --git a/src/app/modules/notfound-module/layout.tsx b/src/app/modules/notfound-module/layout.tsx index c8bd75d0..01fc5d5f 100644 --- a/src/app/modules/notfound-module/layout.tsx +++ b/src/app/modules/notfound-module/layout.tsx @@ -15,7 +15,7 @@ export const PageNotFoundLayout = () => { {/* Appbar component needs a refactor, therefore not in this PR.*/} - {/* What can I do with the IATI Datastore? */} + {/* What can I do with IATI.cloud? */}
{
- {/* What can I do with the IATI Datastore? */} + {/* What can I do with IATI.cloud?? */} { error image - {/* What can I do with the IATI Datastore? */} + {/* What can I do with IATI.cloud?? */} { {/* module header */} From d990963dedcd261d4512dacb1fe29dc0a4d642d8 Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 12:09:06 +0200 Subject: [PATCH 03/22] chore: kill off sematext kill off sematext --- README.md | 8 ++++---- public/index.html | 22 ++-------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 373b9fcf..d36f808c 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@ IATI is a global aid transparency standard and it makes information about aid sp ## About the project * Website: www.iati.cloud * Authors: Zimmerman -* License: AGPLv3 (see included LICENSE file for full license) -* Github Repo: github.com/zimmerman-zimmerman/query-builder-iati.cloud -* Bug Tracker: github.com/zimmerman-zimmerman/query-builder-iati.cloud/issues +* License: AGPLv3 (see included LICENSE file for full license) +* Github Repo: github.com/zimmerman-zimmerman/query-builder-iati.cloud +* Bug Tracker: github.com/zimmerman-zimmerman/query-builder-iati.cloud/issues ## Installing -1. Set up the iati.cloud backend first
+1. Set up the iati.cloud backend first
2. Checkout this repository to a local folder
3. Make sure you've installed node.js 10.16.3 or higher
4. Run ```yarn install```
diff --git a/public/index.html b/public/index.html index 8b875904..70144929 100644 --- a/public/index.html +++ b/public/index.html @@ -32,26 +32,8 @@ - - + + IATI.cloud From 680bee659520aac8fd8cc904b148a8afd4e53695 Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 12:09:49 +0200 Subject: [PATCH 04/22] chore: removed Google Tag chore: removed Google Tag --- public/index.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/public/index.html b/public/index.html index 70144929..10bb95b4 100644 --- a/public/index.html +++ b/public/index.html @@ -21,14 +21,7 @@ --> - - + From b00789ea846b01de52b832996ac4dac861237f5f Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 12:19:38 +0200 Subject: [PATCH 05/22] fix: updated the base url for good QB behaviour So it works off the bat in local QB --- .circleci/config.yml | 6 +++--- .../components/inputs/selects/AsyncSelect/index.tsx | 2 +- src/app/modules/about-module/layout.tsx | 11 ++++++----- .../common/DocDetail/common/ApiCallFragment/index.tsx | 2 +- .../DocCallPreview/common/RequestExample/code.ts | 2 +- .../DocCallPreview/common/RequestExample/index.tsx | 2 +- .../DocCallPreview/common/RequestResponse/index.tsx | 2 +- src/app/state/api/index.ts | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b955479..5a8c9653 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,11 +100,11 @@ workflows: # name: Set env variables # command: | # if [ "${CIRCLE_BRANCH}" == "master" ]; then - # echo 'export CYPRESS_BASE_URL="https://iatidatastore.iatistandard.org"' >> $BASH_ENV + # echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV # elif [ "${CIRCLE_BRANCH}" == "develop" ]; then - # echo 'export CYPRESS_BASE_URL="https://store.staging.iati.cloud"' >> $BASH_ENV + # echo 'export CYPRESS_BASE_URL="https://iati.cloud""' >> $BASH_ENV # else - # echo 'export CYPRESS_BASE_URL="https://store.staging.iati.cloud"' >> $BASH_ENV + # echo 'export CYPRESS_BASE_URL="https://iati.cloud""' >> $BASH_ENV # fi # source $BASH_ENV # yarn: true diff --git a/src/app/components/inputs/selects/AsyncSelect/index.tsx b/src/app/components/inputs/selects/AsyncSelect/index.tsx index 813ba66d..4c1dec02 100644 --- a/src/app/components/inputs/selects/AsyncSelect/index.tsx +++ b/src/app/components/inputs/selects/AsyncSelect/index.tsx @@ -33,7 +33,7 @@ const customStyles = { }; async function loadOptions(search, loadedOptions, { page }, pivot) { - const url = `https://iatidatastore.iatistandard.org/search/activity?q=${pivot}:*&facet=on&facet.pivot=${pivot}&rows=0&facet.limit=15&facet.offset=${page * + const url = `https://iati.cloud/search/activity?q=${pivot}:*&facet=on&facet.pivot=${pivot}&rows=0&facet.limit=15&facet.offset=${page * 10}&facet.contains=${search.replace(/[&\/\\#,+()$~%.'":*?<>{}]/g, '')}&facet.contains.ignoreCase=true`; const response = await fetch(url); const responseJSON = await response.json(); diff --git a/src/app/modules/about-module/layout.tsx b/src/app/modules/about-module/layout.tsx index afeb3c57..2712f0a9 100644 --- a/src/app/modules/about-module/layout.tsx +++ b/src/app/modules/about-module/layout.tsx @@ -35,7 +35,7 @@ export const AboutLayout = () => { development and humanitarian resources and results through using the{' '} IATI.cloud API @@ -54,7 +54,7 @@ export const AboutLayout = () => { The new{' '} IATI.cloud API @@ -113,7 +113,7 @@ export const AboutLayout = () => { For detailed documentation on how to use the API, please refer to the{' '} IATI.cloud API documentation @@ -139,7 +139,7 @@ export const AboutLayout = () => { The{' '} Query builder @@ -166,7 +166,8 @@ export const AboutLayout = () => { The benefit of IATI.cloud is that you can convert the - original IATI raw XML data into three different formats - CSV, XLM and JSON. All data in IATI.cloud is filtered + original IATI data, provided in XML format, into three + formats - CSV, XLM and JSON. All data in IATI.cloud is filtered and output based on IATI activities. The exception is converting the data into CSV format, which also allows you to output it based on budgets and transactions. diff --git a/src/app/modules/documentation-module/common/DocDetail/common/ApiCallFragment/index.tsx b/src/app/modules/documentation-module/common/DocDetail/common/ApiCallFragment/index.tsx index 7d3c9791..d22b9c01 100644 --- a/src/app/modules/documentation-module/common/DocDetail/common/ApiCallFragment/index.tsx +++ b/src/app/modules/documentation-module/common/DocDetail/common/ApiCallFragment/index.tsx @@ -28,7 +28,7 @@ export const ApiCallFragment = (data) => { const clipboard = useClipboard({ copiedTimeout: 600 }); const parsed = data.data; const { request } = parsed; - const targetURL = 'https://iatidatastore.iatistandard.org'; + const targetURL = 'https://iati.cloud' const showRequest = useStoreActions((actions) => actions.request.showRequest); diff --git a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/code.ts b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/code.ts index e532a634..df21d278 100644 --- a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/code.ts +++ b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/code.ts @@ -2,7 +2,7 @@ export const codes = { code: `var https = require('https'); var options = { 'method': 'GET', - 'hostname': 'iatidatastore.iatistandard.org', + 'hostname': 'iati.cloud', 'path': '/api/activities/?has_other_identifier=True&fields=title%2Cother_identifier&format=json', 'headers': { } diff --git a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/index.tsx b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/index.tsx index 8ba524bf..d3c76f13 100644 --- a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/index.tsx +++ b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestExample/index.tsx @@ -61,7 +61,7 @@ export const RequestExample = () => { url.raw.replace( '{{url}}', '' - // 'https://iatidatastore.iatistandard.org' + // 'https://iati.cloud"' )} diff --git a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestResponse/index.tsx b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestResponse/index.tsx index da1966a5..34ddad33 100644 --- a/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestResponse/index.tsx +++ b/src/app/modules/documentation-module/common/DocDetail/common/DocCallPreview/common/RequestResponse/index.tsx @@ -37,7 +37,7 @@ export const RequestResponse = () => { const moddedURL = url.raw.replace( '{{url}}', - 'https://iatidatastore.iatistandard.org' + 'https://iati.cloud' ); const [request, response] = useFetch(moddedURL); diff --git a/src/app/state/api/index.ts b/src/app/state/api/index.ts index bc9b373c..ee9454d6 100755 --- a/src/app/state/api/index.ts +++ b/src/app/state/api/index.ts @@ -4,7 +4,7 @@ import { Action, action, computed, Computed, Thunk, thunk } from 'easy-peasy'; import { Endpoint } from 'app/state/interfaces/Endpoint'; export const baseURL = - 'https://iatidatastore.iatistandard.org/search/activity?'; + 'https://iati.cloud/search/activity?'; // export const baseURL = // 'https://test-datastore.iatistandard.org/search/activity?'; @@ -18,7 +18,7 @@ const NODE_ENV = 'production'; export const HOSTNAME = // @ts-ignore - NODE_ENV === 'development' ? '/' : 'https://iatidatastore.iatistandard.org/'; // 'https://iatidatastore.iatistandard.org/'; + NODE_ENV === 'development' ? '/' : 'https://iati.cloud/'; // 'https://iatidatastore.iatistandard.org/'; // datastore.iati.cloud From ba248c52371b93d9547ac584ef188b98cfdc9011 Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 12:48:32 +0200 Subject: [PATCH 06/22] chore: updates for footer, linking to correct github and support mail --- src/app/components/surfaces/Footer/FooterLG.tsx | 6 +++--- src/app/components/surfaces/Footer/FooterMD.tsx | 6 +++--- src/app/components/surfaces/Footer/FooterSM.tsx | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/surfaces/Footer/FooterLG.tsx b/src/app/components/surfaces/Footer/FooterLG.tsx index daad67f9..27c8ec46 100644 --- a/src/app/components/surfaces/Footer/FooterLG.tsx +++ b/src/app/components/surfaces/Footer/FooterLG.tsx @@ -60,11 +60,11 @@ export const FooterLG = () => { - support@iatistandard.org + github@zimmerman.team @@ -72,7 +72,7 @@ export const FooterLG = () => { diff --git a/src/app/components/surfaces/Footer/FooterMD.tsx b/src/app/components/surfaces/Footer/FooterMD.tsx index 4881ee23..6d279459 100644 --- a/src/app/components/surfaces/Footer/FooterMD.tsx +++ b/src/app/components/surfaces/Footer/FooterMD.tsx @@ -59,11 +59,11 @@ export const FooterMD = () => { - support@iatistandard.org + github@zimmerman.team @@ -71,7 +71,7 @@ export const FooterMD = () => { diff --git a/src/app/components/surfaces/Footer/FooterSM.tsx b/src/app/components/surfaces/Footer/FooterSM.tsx index c216a375..a848ac8f 100644 --- a/src/app/components/surfaces/Footer/FooterSM.tsx +++ b/src/app/components/surfaces/Footer/FooterSM.tsx @@ -32,11 +32,11 @@ export const FooterSM = () => { - support@iatistandard.org + github@zimmerman.team @@ -44,7 +44,7 @@ export const FooterSM = () => { From 3421d5a4d8ecb09778837cbd89de67a889432f26 Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 13:13:16 +0200 Subject: [PATCH 07/22] chore: changing some names chore: changing some names --- src/app/modules/landing-module/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/modules/landing-module/layout.tsx b/src/app/modules/landing-module/layout.tsx index a167e10d..83e1bd68 100644 --- a/src/app/modules/landing-module/layout.tsx +++ b/src/app/modules/landing-module/layout.tsx @@ -21,7 +21,7 @@ export const LandingLayout = () => { - IATI Datastore + IATI.cloud @@ -39,7 +39,7 @@ export const LandingLayout = () => { - Access data through using the Datastore’s API or Query Builder. + Access data through using IATI.cloud's API or Query Builder. From ceefb147c8e7f0a2529ec2e8f59217ea6142021b Mon Sep 17 00:00:00 2001 From: Sylvan Ridderinkhof Date: Thu, 1 Jul 2021 13:31:13 +0200 Subject: [PATCH 08/22] chore: fix up any updated files --- .circleci/config.yml | 4 +- README.md | 9 +-- public/index.html | 81 +++++++++---------- .../common/LandingMidSection.tsx | 2 +- 4 files changed, 45 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a8c9653..120530fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,9 +102,9 @@ workflows: # if [ "${CIRCLE_BRANCH}" == "master" ]; then # echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV # elif [ "${CIRCLE_BRANCH}" == "develop" ]; then - # echo 'export CYPRESS_BASE_URL="https://iati.cloud""' >> $BASH_ENV + # echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV # else - # echo 'export CYPRESS_BASE_URL="https://iati.cloud""' >> $BASH_ENV + # echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV # fi # source $BASH_ENV # yarn: true diff --git a/README.md b/README.md index d36f808c..22ffd360 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ IATI is a global aid transparency standard and it makes information about aid sp ## About the project * Website: www.iati.cloud * Authors: Zimmerman -* License: AGPLv3 (see included LICENSE file for full license) -* Github Repo: github.com/zimmerman-zimmerman/query-builder-iati.cloud -* Bug Tracker: github.com/zimmerman-zimmerman/query-builder-iati.cloud/issues +* License: AGPLv3 (see included LICENSE file for full license) +* Github Repo: github.com/zimmerman-zimmerman/iati.cloud.frontend +* Bug Tracker: github.com/zimmerman-zimmerman/iati.cloud.frontend/issues ## Installing @@ -30,8 +30,7 @@ IATI is a global aid transparency standard and it makes information about aid sp - NODE_PATH=src/ - REACT_APP_CLIENT_NAME=IATI Datastore - -6. Run yarn start +6. Run yarn start ## Documentation For a birds eye view on the different facets of the query builder please take the following steps: diff --git a/public/index.html b/public/index.html index 10bb95b4..a898da74 100644 --- a/public/index.html +++ b/public/index.html @@ -1,46 +1,41 @@ - - - - - - - - - - - - - - - - - IATI.cloud - - - -
- - + + + + + + + + + + + + IATI.cloud + + + +
+ + diff --git a/src/app/modules/landing-module/common/LandingMidSection.tsx b/src/app/modules/landing-module/common/LandingMidSection.tsx index 4971dce2..a5f40900 100644 --- a/src/app/modules/landing-module/common/LandingMidSection.tsx +++ b/src/app/modules/landing-module/common/LandingMidSection.tsx @@ -12,7 +12,7 @@ export const LandingMidSection = () => { Date: Thu, 1 Jul 2021 13:34:32 +0200 Subject: [PATCH 09/22] chore: footer changes footer changes --- src/app/components/surfaces/Footer/FooterLG.tsx | 2 +- src/app/components/surfaces/Footer/FooterMD.tsx | 2 +- src/app/components/surfaces/Footer/FooterSM.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/surfaces/Footer/FooterLG.tsx b/src/app/components/surfaces/Footer/FooterLG.tsx index 27c8ec46..81645942 100644 --- a/src/app/components/surfaces/Footer/FooterLG.tsx +++ b/src/app/components/surfaces/Footer/FooterLG.tsx @@ -76,7 +76,7 @@ export const FooterLG = () => { target="_blank" style={{ color: 'white', textDecoration: 'underline' }} > - @iati + @zimmerman diff --git a/src/app/components/surfaces/Footer/FooterMD.tsx b/src/app/components/surfaces/Footer/FooterMD.tsx index 6d279459..79511ffb 100644 --- a/src/app/components/surfaces/Footer/FooterMD.tsx +++ b/src/app/components/surfaces/Footer/FooterMD.tsx @@ -75,7 +75,7 @@ export const FooterMD = () => { target="_blank" style={{ color: 'white', textDecoration: 'underline' }} > - @iati + @zimmerman diff --git a/src/app/components/surfaces/Footer/FooterSM.tsx b/src/app/components/surfaces/Footer/FooterSM.tsx index a848ac8f..92a513ec 100644 --- a/src/app/components/surfaces/Footer/FooterSM.tsx +++ b/src/app/components/surfaces/Footer/FooterSM.tsx @@ -48,7 +48,7 @@ export const FooterSM = () => { target="_blank" style={{ color: 'white', textDecoration: 'underline' }} > - @iati + @zimmerman From 9d51d54cfdf9a39a6fbe627ce142f666212d95b4 Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 13:37:18 +0200 Subject: [PATCH 10/22] chore: header update chore: header update --- src/app/components/feedback/Banners/CovidBanner/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/feedback/Banners/CovidBanner/index.tsx b/src/app/components/feedback/Banners/CovidBanner/index.tsx index 6b0fe5e3..035c44c5 100644 --- a/src/app/components/feedback/Banners/CovidBanner/index.tsx +++ b/src/app/components/feedback/Banners/CovidBanner/index.tsx @@ -153,7 +153,7 @@ export const CovidBanner = (props: CookieNoticeParams) => {

Important notice:
- Please note that the{' '} + Please note that {' '} { IATI.cloud {' '} does not contain data that is published in version 1 of the - Standard, or is published within a dataset which does not conform + Standard. IATI.cloud does contain datasets which does not fully conform with the{' '} { target="_blank" rel="noreferrer" > - IATI Standard Schema + IATI Standard Schema for sake of making as much IATI data available as possible.

From a336c55b7d2e9d592cf9685becc473749fd37ab7 Mon Sep 17 00:00:00 2001 From: Siem Vaessen Date: Thu, 1 Jul 2021 14:04:37 +0200 Subject: [PATCH 11/22] chore: copy changes copy changes --- .../feedback/Banners/CovidBanner/index.tsx | 25 +++---------------- src/app/modules/about-module/layout.tsx | 8 ------ 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/app/components/feedback/Banners/CovidBanner/index.tsx b/src/app/components/feedback/Banners/CovidBanner/index.tsx index 035c44c5..4ca5d5ac 100644 --- a/src/app/components/feedback/Banners/CovidBanner/index.tsx +++ b/src/app/components/feedback/Banners/CovidBanner/index.tsx @@ -151,28 +151,11 @@ export const CovidBanner = (props: CookieNoticeParams) => {

- Important notice: + Notice:
- Please note that {' '} - - IATI.cloud - {' '} - does not contain data that is published in version 1 of the - Standard. IATI.cloud does contain datasets which does not fully conform - with the{' '} - - IATI Standard Schema for sake of making as much IATI data available as possible. - + Please note that IATI.cloud does not contain data that is published in version 1 of the + Standard. IATI.cloud does contain datasets which do not fully conform + with the IATI Standard to make as much data available as possible.

{ > IATI.cloud API documentation - . For information on how to map queries from the ‘classic’ Datastore - to the new one, please see the{' '} - - mapping document - . From fe20cd2437bf0e6496664a029d27f850c3233ebb Mon Sep 17 00:00:00 2001 From: Sylvan Ridderinkhof Date: Thu, 1 Jul 2021 13:44:05 +0200 Subject: [PATCH 12/22] chore: readme update react name The react name is not used within the codebase regardless of the content. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22ffd360..6c07cf1b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ IATI is a global aid transparency standard and it makes information about aid sp 4. Run ```yarn install```
5. Create an .env file and specify the following variables: - NODE_PATH=src/ -- REACT_APP_CLIENT_NAME=IATI Datastore +- REACT_APP_CLIENT_NAME=IATI.cloud 6. Run yarn start From 3eb4f84a9c5d85cb342052f0515af5526a1f0f86 Mon Sep 17 00:00:00 2001 From: Sylvan Ridderinkhof Date: Thu, 1 Jul 2021 13:44:55 +0200 Subject: [PATCH 13/22] chore: layout.tsx ESLint update --- src/app/modules/about-module/layout.tsx | 72 ++++++++++++------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/src/app/modules/about-module/layout.tsx b/src/app/modules/about-module/layout.tsx index c383e221..64eaedbd 100644 --- a/src/app/modules/about-module/layout.tsx +++ b/src/app/modules/about-module/layout.tsx @@ -21,7 +21,7 @@ export const AboutLayout = () => { - {/* Appbar component needs a refactor, therefore not in this PR.*/} + {/* Appbar component needs a refactor, therefore not in this PR. */} {/* INTRODUCTION */} @@ -29,15 +29,11 @@ export const AboutLayout = () => { - IATI.cloud offers a robust online data service, - providing timely and standardised access to data published - according to the IATI Standard. Data users can gain data on - development and humanitarian resources and results through using - the{' '} - + IATI.cloud offers a robust online data service, providing timely + and standardised access to data published according to the IATI + Standard. Data users can gain data on development and + humanitarian resources and results through using the{' '} + IATI.cloud API . Users will also be able to download data from a new @@ -53,10 +49,7 @@ export const AboutLayout = () => { The new{' '} - + IATI.cloud API {' '} provides data published by organisations who have used version 2 @@ -74,8 +67,8 @@ export const AboutLayout = () => { - To help users access good quality data, IATI.cloud will not - hold any data that does not adhere to the IATI Schema. The IATI + To help users access good quality data, IATI.cloud will not hold + any data that does not adhere to the IATI Schema. The IATI Schema provides the exact order and format that publishers should provide their XML files in. More information about the Schema can be found on{' '} @@ -112,11 +105,16 @@ export const AboutLayout = () => { For detailed documentation on how to use the API, please refer to the{' '} + + IATI.cloud API documentation + + . For information on how to map queries from the ‘classic’ + Datastore to the new one, please see the{' '} - IATI.cloud API documentation + mapping document . @@ -157,12 +155,12 @@ export const AboutLayout = () => { - The benefit of IATI.cloud is that you can convert the - original IATI data, provided in XML format, into three - formats - CSV, XLM and JSON. All data in IATI.cloud is filtered - and output based on IATI activities. The exception is converting - the data into CSV format, which also allows you to output it - based on budgets and transactions. + The benefit of IATI.cloud is that you can convert the original + IATI data, provided in XML format, into three formats - CSV, XLM + and JSON. All data in IATI.cloud is filtered and output based on + IATI activities. The exception is converting the data into CSV + format, which also allows you to output it based on budgets and + transactions. @@ -172,19 +170,19 @@ export const AboutLayout = () => { - XML - returns the original activity XML as - published. This is enhanced with metadata, specifying the - version of the IATI standard that individual activities were - published at, as well as details of the query result. + XML - returns the original activity XML as published. This is + enhanced with metadata, specifying the version of the IATI + standard that individual activities were published at, as well + as details of the query result. - CSV - will convert the published XML data into CSV - format. Only a subset of published data is present. This format - can be used to analyse information using spreadsheet software - such as Microsoft Excel or Libreoffice Calc. + CSV - will convert the published XML data into CSV format. Only + a subset of published data is present. This format can be used + to analyse information using spreadsheet software such as + Microsoft Excel or Libreoffice Calc. @@ -201,10 +199,10 @@ export const AboutLayout = () => { - JSON - IATI.cloud will convert the published XML to JSON - format. All the original published information is present in - this alternative format. The same metadata that is given in the - XML output is available in the JSON output. + JSON - IATI.cloud will convert the published XML to JSON format. + All the original published information is present in this + alternative format. The same metadata that is given in the XML + output is available in the JSON output. @@ -212,7 +210,7 @@ export const AboutLayout = () => { - + ); From e383c13941ef407c2359816a11c7cda8484b4e9e Mon Sep 17 00:00:00 2001 From: Sylvan Ridderinkhof Date: Thu, 1 Jul 2021 13:48:05 +0200 Subject: [PATCH 14/22] fix: change postman documentation url --- src/app/modules/documentation-module/state/model.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/modules/documentation-module/state/model.ts b/src/app/modules/documentation-module/state/model.ts index 6c773099..12267648 100644 --- a/src/app/modules/documentation-module/state/model.ts +++ b/src/app/modules/documentation-module/state/model.ts @@ -1,11 +1,11 @@ -//cc:api documentation module#; state - model +// cc:api documentation module#; state - model import { action, Action } from 'easy-peasy'; import { Endpoint } from 'app/state/interfaces/Endpoint'; import { ApiModel } from 'app/state/api'; export const fetchPostmanDatas: Endpoint = (params: RequestInit = {}) => fetch( - `https://iatidatastore.iatistandard.org/static/postman/${process.env.REACT_APP_DOC_FILENAME}`, + `https://iati.cloud/static/postman/${process.env.REACT_APP_DOC_FILENAME}`, { method: 'GET', ...params, @@ -125,5 +125,3 @@ export interface SubCategory3Model { request: RequestModel; description?: string; } - -////////////////////////////////// From f2e7ee28269f8850a0297c9f6b1bae8078cd75bc Mon Sep 17 00:00:00 2001 From: Sylvan Ridderinkhof Date: Thu, 1 Jul 2021 14:19:33 +0200 Subject: [PATCH 15/22] chore: fix up query builder output file --- src/app/modules/documentation-module/state/service.ts | 9 +++------ .../querybuilder-module/fragments/results/layout.tsx | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/modules/documentation-module/state/service.ts b/src/app/modules/documentation-module/state/service.ts index dce24ee3..2d783f56 100644 --- a/src/app/modules/documentation-module/state/service.ts +++ b/src/app/modules/documentation-module/state/service.ts @@ -1,9 +1,6 @@ import { Endpoint } from 'app/state/interfaces/Endpoint'; export const getPostmanData: Endpoint = (params: RequestInit = {}) => - fetch( - 'https://iatidatastore.iatistandard.org/static/postman/postman_json.json', - { - method: 'GET', - } - ).then((res) => res.json()); + fetch('https://iati.cloud/static/postman/postman_json_iati_cloud.json', { + method: 'GET', + }).then((res) => res.json()); diff --git a/src/app/modules/querybuilder-module/fragments/results/layout.tsx b/src/app/modules/querybuilder-module/fragments/results/layout.tsx index e399ddb1..79635f54 100644 --- a/src/app/modules/querybuilder-module/fragments/results/layout.tsx +++ b/src/app/modules/querybuilder-module/fragments/results/layout.tsx @@ -168,7 +168,7 @@ export const DownloadFragment = () => { @@ -197,7 +197,7 @@ export const DownloadFragment = () => { @@ -237,7 +237,7 @@ export const DownloadFragment = () => { ? queryState.replace('json', `xslt&tr=${rowFormat}-xml.xsl`) : queryState.replace('json', 'xml') } - fileName={`iatidatastore-iatistandard-${filename()}.xml`} + fileName={`IATIcloud-${filename()}.xml`} /> From bcd1cbc6e1a6b73cd9e84414cde0c8faebce4a6f Mon Sep 17 00:00:00 2001 From: juanalb Date: Thu, 1 Jul 2021 14:29:11 +0200 Subject: [PATCH 16/22] chore: copy correction --- src/app/modules/about-module/layout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modules/about-module/layout.tsx b/src/app/modules/about-module/layout.tsx index 64eaedbd..1e5cefd3 100644 --- a/src/app/modules/about-module/layout.tsx +++ b/src/app/modules/about-module/layout.tsx @@ -156,7 +156,7 @@ export const AboutLayout = () => { The benefit of IATI.cloud is that you can convert the original - IATI data, provided in XML format, into three formats - CSV, XLM + IATI data, provided in XML format, into three formats - CSV, XML and JSON. All data in IATI.cloud is filtered and output based on IATI activities. The exception is converting the data into CSV format, which also allows you to output it based on budgets and From e976db3f0dee1146cc7dd25b631d09eb91b74974 Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 15:04:09 +0200 Subject: [PATCH 17/22] ci: disable e2e test step --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 120530fe..a1428ab6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,8 +89,8 @@ workflows: group: "all tests" - deploy: - requires: - - "local e2e tests" +# requires: +# - "local e2e tests" # - cypress/run: # name: "deployed e2e tests" From ce75a6c0c66b9b3db8ee598063b1ccf50f798c05 Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 15:05:53 +0200 Subject: [PATCH 18/22] ci: removal of unwanted colon --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1428ab6..1e2b84f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ workflows: parallelism: 5 group: "all tests" - - deploy: + - deploy # requires: # - "local e2e tests" From 606ae9d243d0c0f283ddcceafd1f979bc5590a48 Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 15:22:39 +0200 Subject: [PATCH 19/22] ci: precede deploy step with checkout step --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e2b84f1..b6be8369 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,6 +89,8 @@ workflows: group: "all tests" - deploy + requires: + - "checkout" # requires: # - "local e2e tests" From 94aa46d8e09bc6366f846d720fb94eeb6d12fa56 Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 15:23:33 +0200 Subject: [PATCH 20/22] ci: add colon --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6be8369..3519cc97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ workflows: parallelism: 5 group: "all tests" - - deploy + - deploy: requires: - "checkout" # requires: From 11717756f6ed930b9f7536a9cec3ff630e08b56f Mon Sep 17 00:00:00 2001 From: juanalb <585607@student.inholland.nl> Date: Thu, 1 Jul 2021 16:09:35 +0200 Subject: [PATCH 21/22] ci: filter on master branche when deployin --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3519cc97..d04937d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,8 +89,12 @@ workflows: group: "all tests" - deploy: - requires: - - "checkout" + filters: + branches: + only: + - master + requires: + - "checkout" # requires: # - "local e2e tests" From 4e143aa4bafd826bcf161208a71ab6870a19d455 Mon Sep 17 00:00:00 2001 From: Stefanos Date: Thu, 1 Jul 2021 17:37:37 +0300 Subject: [PATCH 22/22] fix: banner close icon --- .../feedback/Banners/CovidBanner/index.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/app/components/feedback/Banners/CovidBanner/index.tsx b/src/app/components/feedback/Banners/CovidBanner/index.tsx index 4ca5d5ac..6cfc5cfc 100644 --- a/src/app/components/feedback/Banners/CovidBanner/index.tsx +++ b/src/app/components/feedback/Banners/CovidBanner/index.tsx @@ -5,6 +5,7 @@ import React, { SyntheticEvent, useState, useRef } from 'react'; import { css } from 'styled-components/macro'; import useCookie from '@devhammed/use-cookie'; import { useClickAway } from 'react-use'; +import { IconChipDelete } from 'app/assets/icons/IconChipDelete'; const FontSize = '16px'; @@ -50,10 +51,12 @@ const NoticeButtonStyle = css` top: 24px; width: 24px; height: 24px; - background-size: contain; - background-position: 50%; - background-repeat: no-repeat; - background-image: url('https://iatistandard.org/assets/svg/source/icon-cross-alert.1c4f6d9acbd3.svg'); + + > svg { + path:nth-of-type(2) { + fill: #2e2e2e; + } + } `; const ParagraphStyle = css` @@ -153,9 +156,10 @@ export const CovidBanner = (props: CookieNoticeParams) => {

Notice:
- Please note that IATI.cloud does not contain data that is published in version 1 of the - Standard. IATI.cloud does contain datasets which do not fully conform - with the IATI Standard to make as much data available as possible. + Please note that IATI.cloud does not contain data that is + published in version 1 of the Standard. IATI.cloud does contain + datasets which do not fully conform with the IATI Standard to make + as much data available as possible.

{ css={NoticeButtonStyle} data-cy="covid-banner-close-btn" aria-label="Button to close the COVID-19 banner" - /> + > + +
)