Skip to content

Commit aad65a7

Browse files
authored
Merge branch 'develop' into clairep/fix_deploy_to_production_trigger
2 parents 1f24415 + 28bd81e commit aad65a7

5 files changed

Lines changed: 43 additions & 1 deletion

File tree

‎client/modules/IDE/components/Header/MobileNav.jsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { availableLanguages, languageKeyToLabel } from '../../../../i18n';
3333
import { showToast } from '../../actions/toast';
3434
import { setLanguage } from '../../actions/preferences';
3535
import { Overlay } from '../../../App/components/Overlay';
36+
import packageData from '../../../../../package.json';
3637
import ProjectName from './ProjectName';
3738
import CollectionCreate from '../../../User/components/CollectionCreate';
3839

@@ -456,6 +457,11 @@ const MoreMenu = () => {
456457
{t('Nav.Help.Reference')}
457458
</MobileMenuItem>
458459
<MobileMenuItem href="/about">{t('About.Title')}</MobileMenuItem>
460+
<MobileMenuItem
461+
href={`https://github.com/processing/p5.js-web-editor/releases/tag/v${packageData.version}`}
462+
>
463+
{t('Nav.Help.WebEditorVersion', { version: packageData.version })}
464+
</MobileMenuItem>
459465
</ParentMenuContext.Provider>
460466
</ul>
461467
</div>

‎client/modules/IDE/components/Header/Nav.jsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
} from '../../actions/ide';
3030
import { logoutUser } from '../../../User/actions';
3131
import { CmControllerContext } from '../../pages/IDEView';
32+
import packageData from '../../../../../package.json';
3233
import MobileNav from './MobileNav';
3334
import useIsMobile from '../../hooks/useIsMobile';
3435

@@ -334,6 +335,12 @@ const ProjectMenu = () => {
334335
>
335336
{t('Nav.Help.PostOnTheForum')}
336337
</MenubarItem>
338+
<MenubarItem
339+
id="help-web-editor-version"
340+
href={`https://github.com/processing/p5.js-web-editor/releases/tag/v${packageData.version}`}
341+
>
342+
{t('Nav.Help.WebEditorVersion', { version: packageData.version })}
343+
</MenubarItem>
337344
</MenubarSubmenu>
338345
{getConfig('TRANSLATIONS_ENABLED') && <LanguageMenu />}
339346
</ul>

‎client/modules/IDE/components/Header/Nav.unit.test.jsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ import Nav from './Nav';
66

77
jest.mock('../../../../utils/generateRandomName');
88

9+
// Mock the editor version so the snapshot stays stable across releases.
10+
// The component reads the real version from package.json at runtime (it bumps
11+
// every release), which would otherwise break these snapshots each release day.
12+
jest.mock('../../../../../package.json', () => ({ version: '1.2.3' }));
13+
914
// mock Menubar
1015
jest.mock('../../../../components/Menubar/Menubar', () => ({
1116
Menubar: ({ children, className = 'nav__menubar' }) => (

‎client/modules/IDE/components/Header/__snapshots__/Nav.unit.test.jsx.snap‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,16 @@ exports[`Nav renders dashboard version for mobile 1`] = `
478478
About
479479
</a>
480480
</li>
481+
<li>
482+
<a
483+
aria-disabled="false"
484+
href="https://github.com/processing/p5.js-web-editor/releases/tag/v1.2.3"
485+
rel="noopener noreferrer"
486+
target="_blank"
487+
>
488+
Web Editor v1.2.3
489+
</a>
490+
</li>
481491
</ul>
482492
</div>
483493
</div>
@@ -659,6 +669,9 @@ exports[`Nav renders editor version for desktop 1`] = `
659669
<li>
660670
Post on the Forum
661671
</li>
672+
<li>
673+
Web Editor v1.2.3
674+
</li>
662675
</ul>
663676
</li>
664677
</ul>
@@ -1090,6 +1103,16 @@ exports[`Nav renders editor version for mobile 1`] = `
10901103
About
10911104
</a>
10921105
</li>
1106+
<li>
1107+
<a
1108+
aria-disabled="false"
1109+
href="https://github.com/processing/p5.js-web-editor/releases/tag/v1.2.3"
1110+
rel="noopener noreferrer"
1111+
target="_blank"
1112+
>
1113+
Web Editor v1.2.3
1114+
</a>
1115+
</li>
10931116
</ul>
10941117
</div>
10951118
</div>

‎translations/locales/en-US/translations.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"Reference": "Reference",
3636
"ReportBug": "Report a Bug",
3737
"ChatOnDiscord": "Chat On Discord",
38-
"PostOnTheForum": "Post on the Forum"
38+
"PostOnTheForum": "Post on the Forum",
39+
"WebEditorVersion": "Web Editor v{{version}}"
3940
},
4041
"Lang": "Language",
4142
"BackEditor": "Back to Editor",

0 commit comments

Comments
 (0)