Skip to content

Comments

UHF-12474: Hakuvahti action page changes#888

Merged
teroelonen merged 1 commit intodevfrom
UHF-12474
Jan 23, 2026
Merged

UHF-12474: Hakuvahti action page changes#888
teroelonen merged 1 commit intodevfrom
UHF-12474

Conversation

@teroelonen
Copy link
Contributor

@teroelonen teroelonen commented Jan 22, 2026

UHF-12474

What was done

  • Move hakuvahti actions related templates and styles to hdbt.
  • Adjust the layout a bit at the same time.

How to install

  • Make sure your instance is up and running latest version of dev-branch
    • git checkout dev && git pull origin dev
    • make fresh
  • Switch to feature branch
    • git fetch && git checkout UHF-12474
  • Update the HDBT theme and helfi_hakuvahti module
    • composer require drupal/hdbt:dev-UHF-12474 && composer require drupal/helfi_hakuvahti:dev-UHF-12474
  • Run code updates
    • composer install
    • make drush-locale-update drush-cr
  • Now on your Hakuvahti (helfi-hakuvahti) repository run
    • make fresh
    • Now on the project root run
curl -X POST https://hakuvahti.docker.so/subscription \
  -H "Content-Type: application/json" \
  -H "Authorization: api-key 123" \
  -H "token: test" \
  -d '{
    "elastic_query": "eyJhZ2dzIjp7ImZpZWxkX2pvYnMiOnsic3VtIjp7ImZpZWxkIjoiZmllbGRfam9icyIsIm1pc3NpbmciOjF9fSwidG90YWxfY291bnQiOnsiY2FyZGluYWxpdHkiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIn19fSwiY29sbGFwc2UiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIiwiaW5uZXJfaGl0cyI6eyJuYW1lIjoidHJhbnNsYXRpb25zIiwic2l6ZSI6M319LCJmcm9tIjowLCJxdWVyeSI6eyJib29sIjp7ImZpbHRlciI6W3sidGVybSI6eyJlbnRpdHlfdHlwZSI6Im5vZGUifX0seyJ0ZXJtIjp7Il9sYW5ndWFnZSI6ImZpIn19LHsidGVybXMiOnsiZmllbGRfcG9zdGFsX2NvZGUiOlsiMDA4ODAiLCIwMDg5MCIsIjAwOTAwIiwiMDA5MTAiLCIwMDkyMCIsIjAwOTMwIiwiMDA5NDAiLCIwMDk1MCIsIjAwOTYwIiwiMDA5NzAiLCIwMDk4MCIsIjAwOTkwIl19fV0sIm11c3QiOlt7ImJvb2wiOnsibXVzdF9ub3QiOnsidGVybSI6eyJmaWVsZF9wcm9tb3RlZCI6dHJ1ZX19fX0seyJ0ZXJtcyI6eyJ0YXNrX2FyZWFfZXh0ZXJuYWxfaWQiOlsyNThdfX0seyJib29sIjp7InNob3VsZCI6W3sidGVybXMiOnsiZW1wbG95bWVudF9pZCI6WyI5MCIsIjkxIl19fSx7InRlcm1zIjp7ImVtcGxveW1lbnRfdHlwZV9pZCI6WyI5MCIsIjkxIl19fV0sIm1pbmltdW1fc2hvdWxkX21hdGNoIjoxfX1dfX0sInNvcnQiOlt7ImZpZWxkX3B1YmxpY2F0aW9uX3N0YXJ0cyI6eyJvcmRlciI6ImRlc2MifX0sIl9zY29yZSJdLCJzaXplIjozMH0=",
    "query": "/fi/avoimet-tyopaikat/etsi-avoimia-tyopaikkoja?area_filter=eastern&employment=90&employment=91&language=fi&task_areas=258&page=1",
    "email": "testi@mailhog.local",
    "sms": "+358501234567",
    "search_description": "Esimerkkihaku",
    "site_id": "rekry",
    "lang": "fi"
}' && docker compose exec app npm run hav:send-emails-in-queue

> helfi-hav@1.0.0 hav:send-emails-in-queue
> node dist/bin/hav-send-emails-in-queue.js
  • Then run this
curl -X POST https://hakuvahti.docker.so/subscription \
  -H "Content-Type: application/json" \
  -H "Authorization: api-key 123" \
  -H "token: test" \
  -d '{
    "elastic_query": "eyJhZ2dzIjp7ImZpZWxkX2pvYnMiOnsic3VtIjp7ImZpZWxkIjoiZmllbGRfam9icyIsIm1pc3NpbmciOjF9fSwidG90YWxfY291bnQiOnsiY2FyZGluYWxpdHkiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIn19fSwiY29sbGFwc2UiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIiwiaW5uZXJfaGl0cyI6eyJuYW1lIjoidHJhbnNsYXRpb25zIiwic2l6ZSI6M319LCJmcm9tIjowLCJxdWVyeSI6eyJib29sIjp7ImZpbHRlciI6W3sidGVybSI6eyJlbnRpdHlfdHlwZSI6Im5vZGUifX0seyJ0ZXJtIjp7Il9sYW5ndWFnZSI6ImZpIn19LHsidGVybXMiOnsiZmllbGRfcG9zdGFsX2NvZGUiOlsiMDA4ODAiLCIwMDg5MCIsIjAwOTAwIiwiMDA5MTAiLCIwMDkyMCIsIjAwOTMwIiwiMDA5NDAiLCIwMDk1MCIsIjAwOTYwIiwiMDA5NzAiLCIwMDk4MCIsIjAwOTkwIl19fV0sIm11c3QiOlt7ImJvb2wiOnsibXVzdF9ub3QiOnsidGVybSI6eyJmaWVsZF9wcm9tb3RlZCI6dHJ1ZX19fX0seyJ0ZXJtcyI6eyJ0YXNrX2FyZWFfZXh0ZXJuYWxfaWQiOlsyNThdfX0seyJib29sIjp7InNob3VsZCI6W3sidGVybXMiOnsiZW1wbG95bWVudF9pZCI6WyI5MCIsIjkxIl19fSx7InRlcm1zIjp7ImVtcGxveW1lbnRfdHlwZV9pZCI6WyI5MCIsIjkxIl19fV0sIm1pbmltdW1fc2hvdWxkX21hdGNoIjoxfX1dfX0sInNvcnQiOlt7ImZpZWxkX3B1YmxpY2F0aW9uX3N0YXJ0cyI6eyJvcmRlciI6ImRlc2MifX0sIl9zY29yZSJdLCJzaXplIjozMH0=",
    "query": "/fi/avoimet-tyopaikat/etsi-avoimia-tyopaikkoja?area_filter=eastern&employment=90&employment=91&language=fi&task_areas=258&page=1",
    "email": "testi@mailhog.local",
    "sms": "+358501234567",
    "search_description": "Esimerkkihaku",
    "site_id": "rekry",
    "lang": "en"
}' && docker compose exec app npm run hav:send-emails-in-queue

> helfi-hav@1.0.0 hav:send-emails-in-queue
> node dist/bin/hav-send-emails-in-queue.js
  • and then this
curl -X POST https://hakuvahti.docker.so/subscription \
  -H "Content-Type: application/json" \
  -H "Authorization: api-key 123" \
  -H "token: test" \
  -d '{
    "elastic_query": "eyJhZ2dzIjp7ImZpZWxkX2pvYnMiOnsic3VtIjp7ImZpZWxkIjoiZmllbGRfam9icyIsIm1pc3NpbmciOjF9fSwidG90YWxfY291bnQiOnsiY2FyZGluYWxpdHkiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIn19fSwiY29sbGFwc2UiOnsiZmllbGQiOiJmaWVsZF9yZWNydWl0bWVudF9pZC5rZXl3b3JkIiwiaW5uZXJfaGl0cyI6eyJuYW1lIjoidHJhbnNsYXRpb25zIiwic2l6ZSI6M319LCJmcm9tIjowLCJxdWVyeSI6eyJib29sIjp7ImZpbHRlciI6W3sidGVybSI6eyJlbnRpdHlfdHlwZSI6Im5vZGUifX0seyJ0ZXJtIjp7Il9sYW5ndWFnZSI6ImZpIn19LHsidGVybXMiOnsiZmllbGRfcG9zdGFsX2NvZGUiOlsiMDA4ODAiLCIwMDg5MCIsIjAwOTAwIiwiMDA5MTAiLCIwMDkyMCIsIjAwOTMwIiwiMDA5NDAiLCIwMDk1MCIsIjAwOTYwIiwiMDA5NzAiLCIwMDk4MCIsIjAwOTkwIl19fV0sIm11c3QiOlt7ImJvb2wiOnsibXVzdF9ub3QiOnsidGVybSI6eyJmaWVsZF9wcm9tb3RlZCI6dHJ1ZX19fX0seyJ0ZXJtcyI6eyJ0YXNrX2FyZWFfZXh0ZXJuYWxfaWQiOlsyNThdfX0seyJib29sIjp7InNob3VsZCI6W3sidGVybXMiOnsiZW1wbG95bWVudF9pZCI6WyI5MCIsIjkxIl19fSx7InRlcm1zIjp7ImVtcGxveW1lbnRfdHlwZV9pZCI6WyI5MCIsIjkxIl19fV0sIm1pbmltdW1fc2hvdWxkX21hdGNoIjoxfX1dfX0sInNvcnQiOlt7ImZpZWxkX3B1YmxpY2F0aW9uX3N0YXJ0cyI6eyJvcmRlciI6ImRlc2MifX0sIl9zY29yZSJdLCJzaXplIjozMH0=",
    "query": "/fi/avoimet-tyopaikat/etsi-avoimia-tyopaikkoja?area_filter=eastern&employment=90&employment=91&language=fi&task_areas=258&page=1",
    "email": "testi@mailhog.local",
    "sms": "+358501234567",
    "search_description": "Esimerkkihaku",
    "site_id": "rekry",
    "lang": "sv"
}' && docker compose exec app npm run hav:send-emails-in-queue

> helfi-hav@1.0.0 hav:send-emails-in-queue
> node dist/bin/hav-send-emails-in-queue.js
  • After that go to https://mailpit.docker.so/ and you should have three emails there from hakuvahti. We can work with these to go to each of the confirmation pages.

How to test

  • Hakuvahdin vahvistus onnistui: Click on the confirm link on the emails and you should end up on confirmation page. Check that the breadcrumbs last item is Hakuvahdin vahvistaminen and that the layout matches with the layout here: https://www.figma.com/design/aAhVgtKjcKQtDwMbN4rJvq/Hakuvahti?node-id=1144-48625&t=IoQJtCRDpsiDtLcJ-0
  • Hakuvahdin vahvistus epäonnistui: Edit the url of the confirmation page and delete the last letter for example. Refresh the page and check that the breadcrumb is still correct and layout also matches.
  • Hakuvahti on jo vahvistettu: Add the last letter to the url OR go back to the emails and click the confirmation button again. Check that the breadcrumbs last item is still Hakuvahdin vahvistaminen.
  • Hakuvahdin poistaminen onnistui: Go and edit the confirmation links but change the /confirm/ to /unsubscribe/. Check that the breadcrumbs last item is Hakuvahdin poistaminen. The layout should also match with designs.
  • Hakuvahdin poistaminen epäonnistui: Edit the unsubscribe links and remove for example the last letter. Refresh the page and check that the breadcrumbs last item is Hakuvahdin poistaminen. The layout should also match with designs.
  • Jatka hakuvahdin tilausta: Go and edit the confirmation links but change the /confirm/ to /renew/. Check that the breadcrumbs last item is Jatka hakuvahdin tilausta. The layout should also match with designs.
  • The ticket asks to check the texts on all languages but if you check the breadcrumb I think it is enough because in my check the texts seemed to be correct already as written in the excel and in the ticket.
  • Check that the code follows our standards.

Links to related PRs

…t and adjust the layout a bit at the same time
@teroelonen teroelonen changed the title UHF-12474: Move hakuvahti actions related templates and styles to hdb… UHF-12474: Hakuvahti action page changes Jan 22, 2026
@sonarqubecloud
Copy link

@teroelonen teroelonen marked this pull request as ready for review January 22, 2026 13:28
Copy link
Contributor

@wktohesi wktohesi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 🙌

@teroelonen teroelonen merged commit 47568fc into dev Jan 23, 2026
3 checks passed
@teroelonen teroelonen deleted the UHF-12474 branch January 23, 2026 12:17
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.

2 participants