Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 4 additions & 1 deletion doc/release/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
* Updated the `Deploy to AWS` GitHub workflow to rely on the required `deploy-env` input instead of inferring the `environment` from the tag name. Previously, this approach was necessary because the `[Release] Deploy` workflow did not trigger `Deploy to AWS` via the API with the specified `environment` - it only created a tag that triggered the workflow automatically. With the latest changes, the `environment` is now explicitly passed in the `[Release] Deploy` workflow. It has also been confirmed that no branch or input combination can result in an undefined `environment`. As a result, the fallback to `None` for the `environment` value was removed from the `Deploy to AWS` workflow.

### What's new
* *Describe what's new here. The changes that can impact user experience should be listed in this section.*
* [OSDEV-1998](https://opensupplyhub.atlassian.net/browse/OSDEV-1998) - The following changes were made:
* Added an additional "Data Cleaning Service" subheader to the "How It Works" > "Premium Features" section.
* Updated the list of supported languages/countries under the "globe" icon (added support for Chinese and changed the order).
* Removed the Twitter icon from the social media icons/links in the footer.

### Release instructions:
* Ensure that the following commands are included in the `post_deployment` command:
Expand Down
5 changes: 1 addition & 4 deletions src/react/src/__tests__/components/Footer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,9 @@ test('Footer component', () => {
const linkedinLink = screen.getByText('LinkedIn');
expect(linkedinLink.parentElement).toHaveAttribute('href', 'https://www.linkedin.com/company/open-supply-hub/');

const twitterLink = screen.getByText('Twitter');
expect(twitterLink.parentElement).toHaveAttribute('href', 'https://twitter.com/OpenSupplyHub');

const youtubeLink = screen.getByText('YouTube');
expect(youtubeLink.parentElement).toHaveAttribute('href', 'https://www.youtube.com/channel/UCy-66mcBwX2wlUM6kvKUrGw');

const githubLink = screen.getByText('Github');
expect(githubLink.parentElement).toHaveAttribute('href', 'https://github.com/opensupplyhub/pyoshub');
expect(githubLink.parentElement).toHaveAttribute('href', 'https://github.com/opensupplyhub/open-supply-hub');
});
2 changes: 1 addition & 1 deletion src/react/src/components/AddLocationData.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function AddLocationData({ classes, userHasSignedIn, fetchingSessionSignIn }) {
className={classes.secondaryButton}
onClick={() =>
openInNewTab(
`${InfoLink}/${InfoPaths.contribute}`,
`${InfoLink}/${InfoPaths.dataCleaningService}`,
)
}
>
Expand Down
18 changes: 9 additions & 9 deletions src/react/src/components/Navbar/InternationalMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ function Submenu() {
>
<span>বাংলা</span>
</a>
<a
className="nav-submenu__link nav-submenu__link--lighter-font-weight"
href="https://info.opensupplyhub.org/facilities-chinese"
target=""
>
<span>简体中文</span>
</a>
<a
className="nav-submenu__link nav-submenu__link"
href="https://info.opensupplyhub.org/india"
Expand All @@ -60,21 +67,14 @@ function Submenu() {
href="https://info.opensupplyhub.org/brasil"
target=""
>
<span>Portuguese</span>
<span>Português</span>
</a>
<a
className="nav-submenu__link "
href="https://info.opensupplyhub.org/turkey"
target=""
>
<span>Türkiye</span>
</a>
<a
className="nav-submenu__link "
href="https://info.opensupplyhub.org/vietnam"
target=""
>
<span>Tiếng Việt</span>
<span>Türkçe</span>
</a>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions src/react/src/components/Navbar/MobileInternationalMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,37 +59,37 @@ export default function MobileInternationalMenu({
<div className="mobile-nav__item">
<a
className="mobile-nav-link mobile-nav-link--lighter-font-weight"
href="https://info.opensupplyhub.org/india"
href="https://info.opensupplyhub.org/facilities-chinese"
target=""
>
India
简体中文
</a>
</div>
<div className="mobile-nav__item">
<a
className="mobile-nav-link "
href="https://info.opensupplyhub.org/brasil"
className="mobile-nav-link mobile-nav-link--lighter-font-weight"
href="https://info.opensupplyhub.org/india"
target=""
>
Portuguese
India
</a>
</div>
<div className="mobile-nav__item">
<a
className="mobile-nav-link "
href="https://info.opensupplyhub.org/turkey"
href="https://info.opensupplyhub.org/brasil"
target=""
>
Türkiye
Português
</a>
</div>
<div className="mobile-nav__item">
<a
className="mobile-nav-link "
href="https://info.opensupplyhub.org/vietnam"
href="https://info.opensupplyhub.org/turkey"
target=""
>
Tiếng Việt
Türkçe
</a>
</div>
</div>
Expand Down
27 changes: 7 additions & 20 deletions src/react/src/util/constants.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const CSRF_TOKEN_KEY = 'csrfToken';
export const InfoPaths = {
storiesResources: 'stories-resources',
privacyPolicy: 'privacy-policy',
contribute: 'data-cleaning-service',
dataCleaningService: 'data-cleaning-service',
preparingData: 'resources/preparing-data',
dataQuality: 'resources/a-free-universal-id-matching-algorithm',
claimedFacilities: 'stories-resources/claim-a-facility',
Expand Down Expand Up @@ -822,6 +822,11 @@ export const NavbarItems = [
label: 'API',
href: `${InfoLink}/${InfoPaths.api}`,
},
{
type: 'link',
label: 'Data Cleaning Service',
href: `${InfoLink}/${InfoPaths.dataCleaningService}`,
},
{
type: 'link',
label: 'Embedded Map',
Expand Down Expand Up @@ -970,24 +975,6 @@ export const SocialMediaLinks = [
),
href: 'https://www.linkedin.com/company/open-supply-hub/',
},
{
label: 'Twitter',
Icon: () => (
<svg
xmlns="http://www.w3.org/2000/svg"
width="20"
height="17"
viewBox="0 0 20 17"
>
<path
d="M17.944 4.048c.013.178.013.356.013.533 0 5.419-4.124 11.663-11.663 11.663-2.322 0-4.48-.673-6.294-1.84.33.038.647.05.99.05a8.21 8.21 0 0 0 5.089-1.75A4.106 4.106 0 0 1 2.246 9.86c.254.038.508.064.774.064.368 0 .736-.05 1.079-.14A4.1 4.1 0 0 1 .812 5.761v-.05c.546.304 1.18.495 1.853.52A4.096 4.096 0 0 1 .838 2.817c0-.761.203-1.46.558-2.068a11.651 11.651 0 0 0 8.452 4.29 4.627 4.627 0 0 1-.102-.94A4.097 4.097 0 0 1 13.846 0a4.09 4.09 0 0 1 2.994 1.294 8.07 8.07 0 0 0 2.602-.99 4.088 4.088 0 0 1-1.802 2.26A8.217 8.217 0 0 0 20 1.928a8.811 8.811 0 0 1-2.056 2.12Z"
fill="#FFF"
fillRule="nonzero"
/>
</svg>
),
href: 'https://twitter.com/OpenSupplyHub',
},
{
label: 'YouTube',
Icon: () => (
Expand Down Expand Up @@ -1022,7 +1009,7 @@ export const SocialMediaLinks = [
/>
</svg>
),
href: 'https://github.com/opensupplyhub/pyoshub',
href: 'https://github.com/opensupplyhub/open-supply-hub',
},
];

Expand Down
Loading