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

Display return versions in view licence setup tab #1054

Merged
merged 46 commits into from
Jun 13, 2024

Conversation

jonathangoulding
Copy link
Collaborator

@jonathangoulding jonathangoulding commented May 28, 2024

https://eaflood.atlassian.net/browse/WATER-4407

Part of the work to replace NALD for handling return requirements

This adds the Requirements for returns table (return versions) to the 'Licence set up' tab on our new view licence page.

It also adds the buttons to create new ones, though these are placed behind a feature flag as we are not yet ready for the switchover.

This builds on the work done in View Licence set up page.

This will add a Returns for requirements table and buttons to the view licence set up page.

This will be initially feature toggled false.

This change is part of the charge information page replacement seen in this previous work - #1034
@jonathangoulding jonathangoulding self-assigned this May 28, 2024
@jonathangoulding jonathangoulding marked this pull request as ready for review June 11, 2024 12:57
@jonathangoulding jonathangoulding added the enhancement New feature or request label Jun 11, 2024
@Cruikshanks Cruikshanks changed the title View licence set up returns for requirements Display return versions in view licence setup tab Jun 12, 2024
Copy link
Member

@Cruikshanks Cruikshanks left a comment

Choose a reason for hiding this comment

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

Love the changes to make working with the links easier. And some of the stuff I've highlighted isn't in the ticket and wouldn't be known by you.

But anything else feel free to ping me if you need to discuss them.

app/presenters/licences/set-up.presenter.js Outdated Show resolved Hide resolved
config/feature-flags.config.js Show resolved Hide resolved
app/presenters/licences/set-up.presenter.js Outdated Show resolved Hide resolved
app/presenters/licences/set-up.presenter.js Outdated Show resolved Hide resolved
test/presenters/licences/set-up.presenter.test.js Outdated Show resolved Hide resolved
app/views/licences/tabs/set-up.njk Outdated Show resolved Hide resolved
app/views/licences/tabs/set-up.njk Outdated Show resolved Hide resolved
app/views/licences/tabs/set-up.njk Outdated Show resolved Hide resolved
Copy link
Member

@Cruikshanks Cruikshanks left a comment

Choose a reason for hiding this comment

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

One NIT but also a suggested change to where we refer to the feature flag and use it which I think is worth making.

app/presenters/licences/set-up.presenter.js Outdated Show resolved Hide resolved
app/views/licences/tabs/set-up.njk Outdated Show resolved Hide resolved
app/presenters/licences/set-up.presenter.js Outdated Show resolved Hide resolved
app/services/licences/fetch-return-versions.service.js Outdated Show resolved Hide resolved
app/services/licences/view-licence-set-up.service.js Outdated Show resolved Hide resolved
app/views/licences/tabs/set-up.njk Outdated Show resolved Hide resolved
test/controllers/licences.controller.test.js Outdated Show resolved Hide resolved
Copy link
Member

@Cruikshanks Cruikshanks left a comment

Choose a reason for hiding this comment

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

@jonathangoulding jonathangoulding merged commit feb2658 into main Jun 13, 2024
6 checks passed
@jonathangoulding jonathangoulding deleted the feature-view-licence-returns-requirements branch June 13, 2024 09:42
jonathangoulding added a commit that referenced this pull request Jun 18, 2024
https://eaflood.atlassian.net/browse/WATER-4422

The requirements for return journey has been built and the check page has been finished. This showed a page with requirements for returns allowing users to make changes to requirements for returns.

This piece of work will replicate the requirements for returns check page but will not allow users to make changes (the card and information is identical, apart from the title and a return reference).

There will be a link "View" on the licence set up page that links to this page. That is added as part of this change. Work for this was done here - #1054
jonathangoulding added a commit that referenced this pull request Jun 18, 2024
https://eaflood.atlassian.net/browse/WATER-4422

The requirements for return journey has been built and the check page has been finished. This showed a page with requirements for returns allowing users to make changes to requirements for returns.

This piece of work will replicate the requirements for returns check page but will not allow users to make changes (the card and information is identical, apart from the title and a return reference).

There will be a link "View" on the licence set up page that links to this page. That is added as part of this change. Work for this was done here - #1054
jonathangoulding added a commit that referenced this pull request Jun 21, 2024
* Add requirements for returns view page

https://eaflood.atlassian.net/browse/WATER-4422

The requirements for return journey has been built and the check page has been finished. This showed a page with requirements for returns allowing users to make changes to requirements for returns.

This piece of work will replicate the requirements for returns check page but will not allow users to make changes (the card and information is identical, apart from the title and a return reference).

There will be a link "View" on the licence set up page that links to this page. That is added as part of this change. Work for this was done here - #1054
Cruikshanks added a commit that referenced this pull request Aug 30, 2024
https://eaflood.atlassian.net/browse/WATER-4407

> Part of the work to replace NALD for handling return requirements

When we [started displaying return versions](#1054) in the view licence set up tab we should have excluded those with a 'draft' status.

These have been imported from NALD, but found to have no return requirements which isn't valid in NALD.

A decision will be made on what to do with them once we return requirements has gone live in WRLS. Till then, we just need to ensure they don't appear in this table.
Cruikshanks added a commit that referenced this pull request Aug 30, 2024
https://eaflood.atlassian.net/browse/WATER-4407

> Part of the work to replace NALD for handling return requirements

When we [started displaying return versions](#1054) in the view licence set up tab, we should have excluded those with a 'draft' status.

These have been imported from NALD but found to have no return requirements, which isn't valid in NALD.

Once the return requirements have gone live in WRLS, a decision will be made on what to do with them. Until then, we need to ensure they don't appear in this table.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants