Skip to content

Commit 731b0fc

Browse files
Merge branch 'master' into dependabot/npm_and_yarn/baseline-browser-mapping-2.11.21
2 parents 5ab8eef + 346ef6e commit 731b0fc

2 files changed

Lines changed: 73 additions & 110 deletions

File tree

‎src/pages/Solution/Solution.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,22 +211,24 @@ class Solution extends Component {
211211
)
212212
}
213213
</ResourceRenderer>
214-
215-
<SubmitSolutionContainer
216-
userId={currentUser.id}
217-
id={assignment.id}
218-
onSubmit={submitSolution}
219-
presubmitValidation={presubmitSolution}
220-
afterEvaluationStarts={() => reloadAfterSubmit(currentUser.id)}
221-
onReset={initCanSubmit}
222-
isOpen={submitting}
223-
solutionFilesLimit={assignment.solutionFilesLimit}
224-
solutionSizeLimit={assignment.solutionSizeLimit}
225-
/>
226214
</>
227215
)}
228216
</TheButtonGroup>
229217

218+
{isStudent && (
219+
<SubmitSolutionContainer
220+
userId={currentUser.id}
221+
id={assignment.id}
222+
onSubmit={submitSolution}
223+
presubmitValidation={presubmitSolution}
224+
afterEvaluationStarts={() => reloadAfterSubmit(currentUser.id)}
225+
onReset={initCanSubmit}
226+
isOpen={submitting}
227+
solutionFilesLimit={assignment.solutionFilesLimit}
228+
solutionSizeLimit={assignment.solutionSizeLimit}
229+
/>
230+
)}
231+
230232
{hasPermissions(assignment, 'resubmitSubmissions') &&
231233
!assignmentHasRuntime(assignment, solution.runtimeEnvironmentId) && (
232234
<span>

‎yarn.lock‎

Lines changed: 59 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,20 +2320,30 @@ __metadata:
23202320
languageName: node
23212321
linkType: hard
23222322

2323-
"@humanfs/core@npm:^0.19.1":
2324-
version: 0.19.1
2325-
resolution: "@humanfs/core@npm:0.19.1"
2326-
checksum: 10/270d936be483ab5921702623bc74ce394bf12abbf57d9145a69e8a0d1c87eb1c768bd2d93af16c5705041e257e6d9cc7529311f63a1349f3678abc776fc28523
2323+
"@humanfs/core@npm:^0.19.2":
2324+
version: 0.19.2
2325+
resolution: "@humanfs/core@npm:0.19.2"
2326+
dependencies:
2327+
"@humanfs/types": "npm:^0.15.0"
2328+
checksum: 10/c6c0273721ec8df3d36a57c390a11a168d0a2f513d78bceb25165bded4fcb73609b1a317edc6c8f331cefd4b47285dde0b1e6679e08ef7f062232ec14fe05312
23272329
languageName: node
23282330
linkType: hard
23292331

23302332
"@humanfs/node@npm:^0.16.6":
2331-
version: 0.16.6
2332-
resolution: "@humanfs/node@npm:0.16.6"
2333+
version: 0.16.8
2334+
resolution: "@humanfs/node@npm:0.16.8"
23332335
dependencies:
2334-
"@humanfs/core": "npm:^0.19.1"
2335-
"@humanwhocodes/retry": "npm:^0.3.0"
2336-
checksum: 10/6d43c6727463772d05610aa05c83dab2bfbe78291022ee7a92cb50999910b8c720c76cc312822e2dea2b497aa1b3fef5fe9f68803fc45c9d4ed105874a65e339
2336+
"@humanfs/core": "npm:^0.19.2"
2337+
"@humanfs/types": "npm:^0.15.0"
2338+
"@humanwhocodes/retry": "npm:^0.4.0"
2339+
checksum: 10/ed01b3c066d9cec7526d139b9e71ca00ee4a30b3b5f5f5c198eb069c3509a3e167e180ba7e1e5a83b9571e906c4908bd20402b47586887452311af7354995e95
2340+
languageName: node
2341+
linkType: hard
2342+
2343+
"@humanfs/types@npm:^0.15.0":
2344+
version: 0.15.0
2345+
resolution: "@humanfs/types@npm:0.15.0"
2346+
checksum: 10/dea3cc7fd8f8d4d088ed8d0a9921cf12bd8e1cdf40a6133106b03a6e2aebcc9a6f1771b3643b7ec71baae90d08245db34069dfcc861da8d678662741e6c3c986
23372347
languageName: node
23382348
linkType: hard
23392349

@@ -2344,10 +2354,10 @@ __metadata:
23442354
languageName: node
23452355
linkType: hard
23462356

2347-
"@humanwhocodes/retry@npm:^0.3.0":
2348-
version: 0.3.0
2349-
resolution: "@humanwhocodes/retry@npm:0.3.0"
2350-
checksum: 10/e574bab58680867414e225c9002e9a97eb396f85871c180fbb1a9bcdf9ded4b4de0b327f7d0c43b775873362b7c92956d4b322e8bc4b90be56077524341f04b2
2357+
"@humanwhocodes/retry@npm:^0.4.0":
2358+
version: 0.4.3
2359+
resolution: "@humanwhocodes/retry@npm:0.4.3"
2360+
checksum: 10/0b32cfd362bea7a30fbf80bb38dcaf77fee9c2cae477ee80b460871d03590110ac9c77d654f04ec5beaf71b6f6a89851bdf6c1e34ccdf2f686bd86fcd97d9e61
23512361
languageName: node
23522362
linkType: hard
23532363

@@ -4220,7 +4230,7 @@ __metadata:
42204230
languageName: node
42214231
linkType: hard
42224232

4223-
"baseline-browser-mapping@npm:^2.9.0":
4233+
"baseline-browser-mapping@npm:^2.11.20":
42244234
version: 2.11.21
42254235
resolution: "baseline-browser-mapping@npm:2.11.21"
42264236
bin:
@@ -4412,32 +4422,18 @@ __metadata:
44124422
languageName: node
44134423
linkType: hard
44144424

4415-
"browserslist@npm:^4.24.0":
4416-
version: 4.24.2
4417-
resolution: "browserslist@npm:4.24.2"
4418-
dependencies:
4419-
caniuse-lite: "npm:^1.0.30001669"
4420-
electron-to-chromium: "npm:^1.5.41"
4421-
node-releases: "npm:^2.0.18"
4422-
update-browserslist-db: "npm:^1.1.1"
4423-
bin:
4424-
browserslist: cli.js
4425-
checksum: 10/f8a9d78bbabe466c57ffd5c50a9e5582a5df9aa68f43078ca62a9f6d0d6c70ba72eca72d0a574dbf177cf55cdca85a46f7eb474917a47ae5398c66f8b76f7d1c
4426-
languageName: node
4427-
linkType: hard
4428-
4429-
"browserslist@npm:^4.28.1":
4430-
version: 4.28.1
4431-
resolution: "browserslist@npm:4.28.1"
4425+
"browserslist@npm:^4.24.0, browserslist@npm:^4.28.1":
4426+
version: 4.28.9
4427+
resolution: "browserslist@npm:4.28.9"
44324428
dependencies:
4433-
baseline-browser-mapping: "npm:^2.9.0"
4434-
caniuse-lite: "npm:^1.0.30001759"
4435-
electron-to-chromium: "npm:^1.5.263"
4436-
node-releases: "npm:^2.0.27"
4437-
update-browserslist-db: "npm:^1.2.0"
4429+
baseline-browser-mapping: "npm:^2.11.20"
4430+
caniuse-lite: "npm:^1.0.30001810"
4431+
electron-to-chromium: "npm:^1.5.420"
4432+
node-releases: "npm:^2.0.54"
4433+
update-browserslist-db: "npm:^1.3.2"
44384434
bin:
44394435
browserslist: cli.js
4440-
checksum: 10/64f2a97de4bce8473c0e5ae0af8d76d1ead07a5b05fc6bc87b848678bb9c3a91ae787b27aa98cdd33fc00779607e6c156000bed58fefb9cf8e4c5a183b994cdb
4436+
checksum: 10/493e5e3c11d4bdd34ce8cb7ed5edc98bc5948457e6a3cc1268b253d0ff9a616033b10980515e0e6faeddae745fb9c330cd4510189d681ad86f9ce0b2da3c840e
44414437
languageName: node
44424438
linkType: hard
44434439

@@ -4642,17 +4638,10 @@ __metadata:
46424638
languageName: node
46434639
linkType: hard
46444640

4645-
"caniuse-lite@npm:^1.0.30001669":
4646-
version: 1.0.30001680
4647-
resolution: "caniuse-lite@npm:1.0.30001680"
4648-
checksum: 10/38ec7e06e18ef1040740f93dff65dc4c9a7593376a783a96370f3845c586ed1d464e26b992d97919938fb07b68a4f2fb1609f66c586c3f1e7310e6511b81793f
4649-
languageName: node
4650-
linkType: hard
4651-
4652-
"caniuse-lite@npm:^1.0.30001759":
4653-
version: 1.0.30001761
4654-
resolution: "caniuse-lite@npm:1.0.30001761"
4655-
checksum: 10/9ebcef209a08d7c2f3d55b5105fafe48f657b3259a8cdd5842c5445aca9dcb0b6778cae524bde0cd73de508c680222edea594e64954503cbffd992407dbceda2
4641+
"caniuse-lite@npm:^1.0.30001810":
4642+
version: 1.0.30001810
4643+
resolution: "caniuse-lite@npm:1.0.30001810"
4644+
checksum: 10/47d7db627c3f3d1a10e06eef9efbb84295c6ef9d959b585b64032cc293637ca7b9b6af7e5d5752972b3e690d9561f14b9561db03890fbc6e38dc1aaa54e51d97
46564645
languageName: node
46574646
linkType: hard
46584647

@@ -5835,17 +5824,10 @@ __metadata:
58355824
languageName: node
58365825
linkType: hard
58375826

5838-
"electron-to-chromium@npm:^1.5.263":
5839-
version: 1.5.267
5840-
resolution: "electron-to-chromium@npm:1.5.267"
5841-
checksum: 10/05e55e810cb6a3cda8d29dfdeec7ac0e59727a77a796a157f1a1d65edac16d45eed69ed5c99e354872ab16c48967c2d0a0600653051ae380a3b7a4d6210b1e60
5842-
languageName: node
5843-
linkType: hard
5844-
5845-
"electron-to-chromium@npm:^1.5.41":
5846-
version: 1.5.56
5847-
resolution: "electron-to-chromium@npm:1.5.56"
5848-
checksum: 10/2015a712386e6f150296cecb3f0f7d43c05f8af5cd231c62d06a130e6e47e84d59998f633bcd25f915d4079180183aa77c4890442cc9b501ddfefcd13f751fc8
5827+
"electron-to-chromium@npm:^1.5.420":
5828+
version: 1.5.422
5829+
resolution: "electron-to-chromium@npm:1.5.422"
5830+
checksum: 10/a4cc1bd7204bdb3da063f1ad8103f9990e03da3d0dae0aaf75e1669f2c36a9ae807498c5b27eed61fa98d6b10baf7fe05ff6038a99a4a85a0285e623825253d6
58495831
languageName: node
58505832
linkType: hard
58515833

@@ -10217,11 +10199,11 @@ __metadata:
1021710199
linkType: hard
1021810200

1021910201
"nanoid@npm:^3.3.11":
10220-
version: 3.3.11
10221-
resolution: "nanoid@npm:3.3.11"
10202+
version: 3.3.18
10203+
resolution: "nanoid@npm:3.3.18"
1022210204
bin:
1022310205
nanoid: bin/nanoid.cjs
10224-
checksum: 10/73b5afe5975a307aaa3c95dfe3334c52cdf9ae71518176895229b8d65ab0d1c0417dd081426134eb7571c055720428ea5d57c645138161e7d10df80815527c48
10206+
checksum: 10/1b3b4fdac831b92b56d1dbe8b1e63a372432faf86ea383134e3b53141ef8108a60b7f84343b5cefecac9550bb74edf8164da93ea07d1c4f757039bc75d8a5d9e
1022510207
languageName: node
1022610208
linkType: hard
1022710209

@@ -10318,17 +10300,10 @@ __metadata:
1031810300
languageName: node
1031910301
linkType: hard
1032010302

10321-
"node-releases@npm:^2.0.18":
10322-
version: 2.0.18
10323-
resolution: "node-releases@npm:2.0.18"
10324-
checksum: 10/241e5fa9556f1c12bafb83c6c3e94f8cf3d8f2f8f904906ecef6e10bcaa1d59aa61212d4651bec70052015fc54bd3fdcdbe7fc0f638a17e6685aa586c076ec4e
10325-
languageName: node
10326-
linkType: hard
10327-
10328-
"node-releases@npm:^2.0.27":
10329-
version: 2.0.27
10330-
resolution: "node-releases@npm:2.0.27"
10331-
checksum: 10/f6c78ddb392ae500719644afcbe68a9ea533242c02312eb6a34e8478506eb7482a3fb709c70235b01c32fe65625b68dfa9665113f816d87f163bc3819b62b106
10303+
"node-releases@npm:^2.0.54":
10304+
version: 2.0.54
10305+
resolution: "node-releases@npm:2.0.54"
10306+
checksum: 10/36380abbe4ce6f5bfec7dab13fa8174e67d2c316a9cbedcd01196bd37dbec99ca7214caf7a91f05d27ae17657d5cb55f39c53db216a7992fd9a2e29966ebd2ba
1033210307
languageName: node
1033310308
linkType: hard
1033410309

@@ -10911,7 +10886,7 @@ __metadata:
1091110886
languageName: node
1091210887
linkType: hard
1091310888

10914-
"picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
10889+
"picocolors@npm:^1.1.1":
1091510890
version: 1.1.1
1091610891
resolution: "picocolors@npm:1.1.1"
1091710892
checksum: 10/e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045
@@ -11136,12 +11111,12 @@ __metadata:
1113611111
linkType: hard
1113711112

1113811113
"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
11139-
version: 6.1.0
11140-
resolution: "postcss-selector-parser@npm:6.1.0"
11114+
version: 6.1.4
11115+
resolution: "postcss-selector-parser@npm:6.1.4"
1114111116
dependencies:
1114211117
cssesc: "npm:^3.0.0"
1114311118
util-deprecate: "npm:^1.0.2"
11144-
checksum: 10/2f9e5045b8bbe674fed3b79dbcd3daf21f5188cd7baf179beac513710ec3d75a8fc8184a262c3aec1c628ad3fd8bdb29c5d8530f1c9c5a61a18e1980bb000945
11119+
checksum: 10/68d122d44ea248f570252a08f4967758168b110a7a5349b1d5605d2a10b2ca4bbb257e36b0925053abf35b406955e730febe5a4aa3cf6997ce222d46ec0ab840
1114511120
languageName: node
1114611121
linkType: hard
1114711122

@@ -11359,12 +11334,12 @@ __metadata:
1135911334
linkType: hard
1136011335

1136111336
"qs@npm:^6.1.0, qs@npm:^6.14.0, qs@npm:^6.15.2":
11362-
version: 6.15.3
11363-
resolution: "qs@npm:6.15.3"
11337+
version: 6.16.0
11338+
resolution: "qs@npm:6.16.0"
1136411339
dependencies:
1136511340
es-define-property: "npm:^1.0.1"
1136611341
side-channel: "npm:^1.1.1"
11367-
checksum: 10/1cbb4b050872a19ba8a311445be29babb8f66ea5d6462b3c48c6efb2c95187cd286b69734cd4caea1878cca3b9d1f0e9b49335336be9e999a7d8d7cf137ba60d
11342+
checksum: 10/7fbf9c2eb9c9bbd8997700caecc4b057ac259635873deefd5027fb26d06d79426cf468da55da87ffd147a24e93d3641352d8ac6664bd84688ad5b2f0b8d04828
1136811343
languageName: node
1136911344
linkType: hard
1137011345

@@ -14011,31 +13986,17 @@ __metadata:
1401113986
languageName: node
1401213987
linkType: hard
1401313988

14014-
"update-browserslist-db@npm:^1.1.1":
14015-
version: 1.1.1
14016-
resolution: "update-browserslist-db@npm:1.1.1"
14017-
dependencies:
14018-
escalade: "npm:^3.2.0"
14019-
picocolors: "npm:^1.1.0"
14020-
peerDependencies:
14021-
browserslist: ">= 4.21.0"
14022-
bin:
14023-
update-browserslist-db: cli.js
14024-
checksum: 10/7678dd8609750588d01aa7460e8eddf2ff9d16c2a52fb1811190e0d056390f1fdffd94db3cf8fb209cf634ab4fa9407886338711c71cc6ccade5eeb22b093734
14025-
languageName: node
14026-
linkType: hard
14027-
14028-
"update-browserslist-db@npm:^1.2.0":
14029-
version: 1.2.3
14030-
resolution: "update-browserslist-db@npm:1.2.3"
13989+
"update-browserslist-db@npm:^1.3.2":
13990+
version: 1.3.2
13991+
resolution: "update-browserslist-db@npm:1.3.2"
1403113992
dependencies:
1403213993
escalade: "npm:^3.2.0"
1403313994
picocolors: "npm:^1.1.1"
1403413995
peerDependencies:
1403513996
browserslist: ">= 4.21.0"
1403613997
bin:
1403713998
update-browserslist-db: cli.js
14038-
checksum: 10/059f774300efb4b084a49293143c511f3ae946d40397b5c30914e900cd5691a12b8e61b41dd54ed73d3b56c8204165a0333107dd784ccf8f8c81790bcc423175
13999+
checksum: 10/ca883e9d0fca1b5bfb9d5e7d9468c5ddd1d66ea827566f474875171381ad33b84aa555c138094fb2c6297c680e06482ad8b4c1ad931e8bfab9a4cf36ea9cf006
1403914000
languageName: node
1404014001
linkType: hard
1404114002

0 commit comments

Comments
 (0)