Skip to content

Commit d8c716d

Browse files
authored
Merge branch 'develop' into dependabot/npm_and_yarn/multi-339deb07ce
2 parents 3b6225c + ac9ec8b commit d8c716d

9 files changed

Lines changed: 18 additions & 15 deletions

File tree

client/modules/About/pages/About.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ export const About = () => {
167167
<a
168168
href="https://github.com/processing/p5.js-web-editor/releases"
169169
target="_blank"
170-
rel="noreferrer"
170+
rel="noopener noreferrer"
171171
>
172172
{t('About.WebEditor')}: <span>v{packageData?.version}</span>
173173
</a>
@@ -176,7 +176,7 @@ export const About = () => {
176176
<a
177177
href="https://github.com/processing/p5.js/releases"
178178
target="_blank"
179-
rel="noreferrer"
179+
rel="noopener noreferrer"
180180
>
181181
p5.js: <span>v{p5version}</span>
182182
</a>

client/modules/IDE/actions/assets.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ export function getAssets() {
3030
export function deleteAssetRequest(assetKey) {
3131
return async (dispatch) => {
3232
try {
33-
await apiClient.delete(`/S3/${assetKey}`);
33+
const path = assetKey.split('/').pop();
34+
await apiClient.delete(
35+
`/S3/delete?objectKey=${encodeURIComponent(path)}`
36+
);
3437
dispatch(deleteAsset(assetKey));
3538
} catch (error) {
3639
dispatch({

client/modules/IDE/components/AssetListRow.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const AssetMenu = ({ item: asset }) => {
2222
return (
2323
<TableDropdown aria-label={t('AssetList.ToggleOpenCloseARIA')}>
2424
<MenuItem onClick={handleAssetDelete}>{t('AssetList.Delete')}</MenuItem>
25-
<MenuItem href={asset.url} target="_blank">
25+
<MenuItem href={asset.url} target="_blank" rel="noopener noreferrer">
2626
{t('AssetList.OpenNewTab')}
2727
</MenuItem>
2828
</TableDropdown>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export default function Preferences() {
118118
const markdownComponents = useMemo(() => {
119119
// eslint-disable-next-line react/no-unstable-nested-components
120120
const ExternalLink = ({ children, ...props }) => (
121-
<a {...props} target="_blank">
121+
<a {...props} target="_blank" rel="noopener noreferrer">
122122
{children}
123123
</a>
124124
);
@@ -618,7 +618,7 @@ export default function Preferences() {
618618
<legend className="preference__warning">
619619
<a
620620
target="_blank"
621-
rel="noreferrer"
621+
rel="noopener noreferrer"
622622
href={`https://${
623623
versionInfo.isVersion2 ? 'beta.' : ''
624624
}p5js.org/reference/p5.sound`}

client/modules/IDE/components/QuickAddList/QuickAddList.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const Item = ({ isAdded, onSelect, name, url }) => {
3737
className="quick-add__item-view"
3838
to={url}
3939
target="_blank"
40+
rel="noopener noreferrer"
4041
onClick={(e) => e.stopPropagation()}
4142
>
4243
{t('QuickAddList.View')}

client/modules/IDE/components/show-hint.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,15 @@ import CodeMirror from 'codemirror';
323323
return `<div class="hint-container">${hintHTML}</div>`;
324324
}
325325
}
326-
326+
327+
327328
function getInlineHintSuggestion(cm, focus, token) {
328329
let tokenLength = token.string.length;
329330
if (token.string === '.') {
330331
tokenLength -= 1;
331332
}
332333
const name = focus.item?.text;
334+
333335
const suggestionItem = focus.item;
334336
// builds the remainder of the suggestion excluding what user already typed
335337
const baseCompletion = `<span class="inline-hinter-suggestion">${suggestionItem.text.slice(

server/controllers/aws.controller.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ export async function deleteObjectsFromS3(keyList) {
6565
}
6666

6767
export async function deleteObjectFromS3(req, res) {
68-
const { objectKey, userId } = req.params;
69-
const fullObjectKey = userId ? `${userId}/${objectKey}` : objectKey;
68+
const userId = req.user.id;
69+
const { objectKey } = req.query;
70+
const fullObjectKey = `${userId}/${objectKey}`;
7071

7172
try {
7273
await deleteObjectsFromS3([fullObjectKey]);

server/routes/aws.routes.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ router.post(
1010
isAuthenticated,
1111
AWSController.copyObjectInS3RequestHandler
1212
);
13-
router.delete(
14-
'/S3/:userId?/:objectKey',
15-
isAuthenticated,
16-
AWSController.deleteObjectFromS3
17-
);
13+
router.delete('/S3/delete', isAuthenticated, AWSController.deleteObjectFromS3);
1814
router.get('/S3/objects', AWSController.listObjectsInS3ForUserRequestHandler);
1915

2016
// eslint-disable-next-line import/no-default-export

translations/contributor_docs/ko/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ p5.js 웹 에디터에서 버그를 발견하셨다면, [“이슈” 탭](https
3434
본 프로젝트는 [프로세싱 재단](https://processingfoundation.org/), [뉴욕대 ITP](https://tisch.nyu.edu/itp), [뉴욕시 교육부의 CS4All](http://cs4all.nyc/)에서 후원해주셨습니다.
3535

3636
호스팅과 기술적 지원은 다음 단체들에서 해주셨습니다:<br />
37-
<a href="https://www.browserstack.com/" target="_blank"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976166-ab280a80-d096-11e8-983b-18dd38c8cc9b.png" /></a> <a href="https://mlab.com" target="_blank"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976572-dbbc7400-d097-11e8-89fe-c7bb08ed0775.png" /></a>
37+
<a href="https://www.browserstack.com/" target="_blank" rel="noopener noreferrer"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976166-ab280a80-d096-11e8-983b-18dd38c8cc9b.png" /></a> <a href="https://mlab.com" target="_blank" rel="noopener noreferrer"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976572-dbbc7400-d097-11e8-89fe-c7bb08ed0775.png" /></a>
3838

0 commit comments

Comments
 (0)