Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 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
20 changes: 19 additions & 1 deletion doc/release/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,32 @@ All notable changes to this project will be documented in this file.

This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). The format is based on the `RELEASE-NOTES-TEMPLATE.md` file.

## Release 1.32

## Release 1.32.0

## Introduction
* Product name: Open Supply Hub
* Release date: March 22, 2025

<<<<<<< HEAD
### Database changes
* *Describe high-level database changes.*

#### Migrations:
* *Describe migrations here.*

#### Schema changes
* *Describe schema changes here.*

### Code/API changes
* *Describe code/API changes here.*

### Architecture/Environment changes
* *Describe architecture/environment changes here.*

### Bugfix
* [OSDEV-1806](https://opensupplyhub.atlassian.net/browse/OSDEV-1806) - Refactored the Parent Company field validation. The field is now validated as a regular character 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.

### Release instructions:
* Ensure that the following commands are included in the `post_deployment` command:
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 @@ -76,9 +76,10 @@ const getTooltipText = claimStatus => {
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 'There is a pending claim for this production location.';
}
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
Loading