Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/release/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
* [OSDEV-1777](https://opensupplyhub.atlassian.net/browse/OSDEV-1777) - A consistent URL style was established across all pages of the SLC workflow. After the changes, the URL begins from `/contribute/single-location/`.
* [OSDEV-1678](https://opensupplyhub.atlassian.net/browse/OSDEV-1678) - Added asterisks next to each required form field (Name, Address, and Country) on the "Production Location Information" page. Highlighted an empty field and displayed an error message if it loses focus.
* [OSDEV-1778](https://opensupplyhub.atlassian.net/browse/OSDEV-1778) - Fixed the validation for number of workers field in POST, PATCH production locations API. The min field must be less than or equal to the max field.
* [OSDEV-1787](https://opensupplyhub.atlassian.net/browse/OSDEV-1787) - The tooltip messages for the Claim button have been removed for all statuses of moderation events on the `Contribution Record` page and changed according to the design on `Thanks for adding data for this production location` pop-up.

### What's new
* [OSDEV-1764](https://opensupplyhub.atlassian.net/browse/OSDEV-1764) - Added a new claiming email for the Moderation queue/SLC workflow, which is sent once a data moderator creates a new location based on the moderation event the customer submitted through the SLC workflow.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ describe('DashboardContributionRecord component', () => {
},
],
};

const { reduxStore } = renderComponent();
reduxStore.dispatch(completeFetchPotentialMatches(matches));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,8 @@ const getTooltipText = claimStatus => {
if (claimStatus === PRODUCTION_LOCATION_CLAIM_STATUSES_ENUM.CLAIMED) {
return 'Production location has been claimed already.';
}
if (claimStatus === PRODUCTION_LOCATION_CLAIM_STATUSES_ENUM.PENDING) {
return "You'll be able to claim the location after the moderation is done";
}
return 'Claim is not available.';

return "You'll be able to claim the location after the moderation is done.";
};

const ProductionLocationDialog = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,6 @@ const DashboardContributionRecord = ({
const isDisabled =
moderationEventStatus === MODERATION_STATUSES_ENUM.REJECTED ||
moderationEventStatus === MODERATION_STATUSES_ENUM.APPROVED;
let claimButtonTooltipText = '';

switch (moderationEventStatus) {
case MODERATION_STATUSES_ENUM.PENDING:
claimButtonTooltipText =
'A production location must be created before it can receive a claim request.';
break;
case MODERATION_STATUSES_ENUM.APPROVED:
claimButtonTooltipText =
"Production location hasn't received a claim yet.";
break;
case MODERATION_STATUSES_ENUM.REJECTED:
claimButtonTooltipText =
'Moderation event has been rejected, no claim request available.';
break;
default:
break;
}

return (
<>
Expand Down Expand Up @@ -433,11 +415,7 @@ const DashboardContributionRecord = ({
{claimButtonTitle}
</Button>
) : (
<DialogTooltip
text={claimButtonTooltipText}
aria-label="Claim button tooltip"
childComponent={claimButtonDisabled(classes)}
/>
claimButtonDisabled(classes)
)}
</Grid>
</Grid>
Expand Down