Skip to content

Commit 3850b69

Browse files
committed
Merge remote-tracking branch 'origin/fix/file-new' into fix/file-new
2 parents f9b1268 + 531d4db commit 3850b69

34 files changed

+111
-55
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you have found a bug in the p5.js Web Editor, you can file it under the ["iss
2929

3030
### How Do I Know My Issue or Pull Request is Getting Reviewed?
3131

32-
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/9), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
32+
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/10), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
3333

3434
Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones will be prioritized since they are planned to be merged for the next release to Production. Please feel free to [comment on this pinned issue](https://github.com/processing/p5.js-web-editor/issues/2534) if you would like your issue to be considered for the next release!
3535

@@ -38,11 +38,9 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
3838

3939
We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards:
4040

41-
MINOR Release for [p5.js version 1.8.0](https://github.com/processing/p5.js/releases/tag/v1.8.0): By October 27, 2023
41+
2.9.3 PATCH Release: By November 17, 2023
4242

43-
PATCH Release: By November 2, 2023
44-
45-
MINOR Release: By November 30, 2023
43+
2.10.0 MINOR Release: By December 15, 2023
4644

4745
[You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/).
4846

client/modules/IDE/actions/project.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import objectID from 'bson-objectid';
22
import each from 'async/each';
3-
import isEqual from 'lodash/isEqual';
3+
import { isEqual } from 'lodash';
44
import browserHistory from '../../../browserHistory';
55
import apiClient from '../../../utils/apiClient';
66
import getConfig from '../../../utils/getConfig';

client/modules/IDE/components/AddToCollectionSketchList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet';
44
import { connect } from 'react-redux';
55
import { bindActionCreators } from 'redux';
66
import { withTranslation } from 'react-i18next';
7-
// import find from 'lodash/find';
7+
// import { find } from 'lodash';
88
import * as ProjectsActions from '../actions/projects';
99
import * as CollectionsActions from '../actions/collections';
1010
import * as ToastActions from '../actions/toast';

client/modules/IDE/components/AssetList.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,16 @@ class AssetListRowBase extends React.Component {
107107
</button>
108108
</li>
109109
<li>
110-
<Link
111-
to={asset.url}
110+
<a
111+
href={asset.url}
112112
target="_blank"
113+
rel="noreferrer"
113114
onBlur={this.onBlurComponent}
114115
onFocus={this.onFocusComponent}
115116
className="asset-table__action-option"
116117
>
117118
{t('AssetList.OpenNewTab')}
118-
</Link>
119+
</a>
119120
</li>
120121
</ul>
121122
)}

client/modules/IDE/components/CollectionList/CollectionList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
55
import { connect } from 'react-redux';
66
import { bindActionCreators } from 'redux';
77
import classNames from 'classnames';
8-
import find from 'lodash/find';
8+
import { find } from 'lodash';
99
import * as ProjectActions from '../../actions/project';
1010
import * as ProjectsActions from '../../actions/projects';
1111
import * as CollectionsActions from '../../actions/collections';

client/modules/IDE/components/Editor/index.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ Editor.propTypes = {
594594
linewrap: PropTypes.bool.isRequired,
595595
lintMessages: PropTypes.arrayOf(
596596
PropTypes.shape({
597-
severity: PropTypes.string.isRequired,
597+
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
598+
.isRequired,
598599
line: PropTypes.number.isRequired,
599600
message: PropTypes.string.isRequired,
600601
id: PropTypes.number.isRequired

client/modules/IDE/components/EditorAccessibility.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ const EditorAccessibility = ({ lintMessages = [] }) => {
3737
EditorAccessibility.propTypes = {
3838
lintMessages: PropTypes.arrayOf(
3939
PropTypes.shape({
40-
severity: PropTypes.string.isRequired,
40+
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
41+
.isRequired,
4142
line: PropTypes.number.isRequired,
4243
message: PropTypes.string.isRequired,
4344
id: PropTypes.number.isRequired
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import React from 'react';
2+
3+
import { render, screen } from '../../../test-utils';
4+
5+
import EditorAccessibility from './EditorAccessibility';
6+
7+
describe('<EditorAccessibility />', () => {
8+
it('renders empty message with no lines', () => {
9+
render(<EditorAccessibility lintMessages={[]} />);
10+
11+
expect(
12+
screen.getByRole('listitem', {
13+
description: 'There are no lint messages'
14+
})
15+
).toBeInTheDocument();
16+
});
17+
18+
it('renders lint message', () => {
19+
render(
20+
<EditorAccessibility
21+
lintMessages={[
22+
{
23+
severity: 'info',
24+
line: '1',
25+
message: 'foo',
26+
id: '1a2b3c'
27+
}
28+
]}
29+
/>
30+
);
31+
32+
expect(
33+
screen.queryByText('There are no lint messages')
34+
).not.toBeInTheDocument();
35+
36+
const listItem = screen.getByRole('listitem');
37+
expect(listItem).toBeInTheDocument();
38+
expect(listItem.textContent).toEqual('info in line1 :foo');
39+
});
40+
});

client/modules/IDE/hooks/useKeyDownHandlers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import mapKeys from 'lodash/mapKeys';
1+
import { mapKeys } from 'lodash';
22
import PropTypes from 'prop-types';
33
import { useCallback, useEffect, useRef } from 'react';
44

client/modules/IDE/selectors/collections.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { createSelector } from 'reselect';
22
import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
3-
import find from 'lodash/find';
4-
import orderBy from 'lodash/orderBy';
3+
import { find, orderBy } from 'lodash';
54
import { DIRECTION } from '../actions/sorting';
65

76
const getCollections = (state) => state.collections;

0 commit comments

Comments
 (0)