Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EAR-2352 - Piping introduction page #3110

Merged
merged 12 commits into from
May 22, 2024

Conversation

sudeepkunhis
Copy link
Contributor

@sudeepkunhis sudeepkunhis commented Apr 29, 2024

What is the context of this PR?

https://jira.ons.gov.uk/browse/EAR-2352

How to review

- After switching to the 'EAR-2352-piping-introduction-page' branch, make the below changes in the local files in 'eq-author-app/eq-author-api' and then restart api using 'docker-compose up'

  • Go to this location - GCP staging - Add key -> Create new key - download the JSON file locally
  • copy and paste the above file in the same directory as the 'eq-author-api/docker-compose.yml'
  • In the file 'eq-author-api/docker-compose.yml' - copy and paste the below in lines 42 to 46, in line 46, replace the <file-name>.json with the file name from the above step.
      - SUPPLEMENTARY_DATA_GATEWAY_AUDIENCE=130934052361-5krqht0oc37t416idvqsf304jcefcmfn.apps.googleusercontent.com
      - SUPPLEMENTARY_DATA_GATEWAY=https://34.36.133.231.nip.io/v1/
      - CIR_PUBLISH_SCHEMA_GATEWAY=https://34.149.206.47.nip.io/v1/
      - CIR_PUBLISH_SCHEMA_GATEWAY_AUDIENCE=296224775119-kaq719dc6j5rn5mn51jqk47813mfrkm0.apps.googleusercontent.com
      - GOOGLE_APPLICATION_CREDENTIALS=/app/<file-name>.json  

- Make the below changes in the local eq-questionnaire-runner application and restart using 'docker-compose up --build'

  • Paste the above JSON file in the 'eq-questionnaire-runner' directory where the 'docker-compose.yml' is present

  • In the 'docker-compose.yml' file, replace the below line
    SDS_API_BASE_URL: https://34.36.133.231.nip.io

  • In the file '.development.env', replaces the lines from 30 onwards with the below, in the <file-name>.json, replace using the above JSON file name

    - SDS_API_BASE_URL=https://34.36.133.231.nip.io/v1
    - OIDC_TOKEN_BACKEND=gcp
    - SDS_OAUTH2_CLIENT_ID=130934052361-5krqht0oc37t416idvqsf304jcefcmfn.apps.googleusercontent.com
    - GOOGLE_APPLICATION_CREDENTIALS=./<file-name>.json
    - CIR_OAUTH2_CLIENT_ID=local
    
  • Switch the 'eq-publisher-v3' application to the 'EAR-2352-piping-introduction-page' branch and restart the application

  • Create a new questionnaire, in the Settings page, set the survey id as '221'.

  • In the 'Data' page, in the 'Sample file data' tab, add a new key called 'sds_dataset_id' with the value '6731a2aa-d754-4ed1-b5e3-4b76a540fb6c'

  • Set the 'ru_ref' key value as '34942807969'

  • In the 'Data' page, in the 'Supplementary data' tab, select the survey id '221 - BRES' in the dropdown and link the dataset.

  • In the Introduction page, go to Title field, click on 'Pipe metadata' and select 'Answer from supplementary data'

  • The fields starting with 'local-units' should now be available for piping, select any one, for example, 'local-units - name'.

Now launch the survey, the introduction page should display the title with the comma separated piped in values from the linked dataset.

sudeepkunhis and others added 6 commits April 15, 2024 10:49
Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
Signed-off-by: sudeep <sudeep.kunhikannan@ons.gov.uk>
farres1
farres1 previously approved these changes May 20, 2024
@sudeepkunhis sudeepkunhis merged commit 774b063 into master May 22, 2024
3 checks passed
@sudeepkunhis sudeepkunhis deleted the EAR-2352-piping-introduction-page branch May 22, 2024 14:04
@martyncolmer martyncolmer added this to the v3.0.44 milestone May 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants