mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-17 06:53:03 +00:00
Compare commits
2663 Commits
dspace-8.0
...
dspace-9.1
Author | SHA1 | Date | |
---|---|---|---|
![]() |
2bf9e11a7c | ||
![]() |
f0cba80262 | ||
![]() |
ad51dc884d | ||
![]() |
28a914a335 | ||
![]() |
3cd4959d8f | ||
![]() |
5888277ca7 | ||
![]() |
e258fb7af7 | ||
![]() |
cbb01c514d | ||
![]() |
1bc47d06b7 | ||
![]() |
d0f61c1e50 | ||
![]() |
44c7e4b524 | ||
![]() |
598f5884e4 | ||
![]() |
e3b5405698 | ||
![]() |
b4d694e0c0 | ||
![]() |
36c19ef976 | ||
![]() |
8685e1398b | ||
![]() |
4956d26f69 | ||
![]() |
5c419bd975 | ||
![]() |
c253cff188 | ||
![]() |
9be1562083 | ||
![]() |
45934e31f2 | ||
![]() |
ff6d0ddc9f | ||
![]() |
e017f99125 | ||
![]() |
945f1bcec3 | ||
![]() |
cecb8f6c69 | ||
![]() |
b26b14b764 | ||
![]() |
2ed43035eb | ||
![]() |
d3b098b407 | ||
![]() |
f506be3dea | ||
![]() |
29e8c29ade | ||
![]() |
3acdb3124e | ||
![]() |
d0464c4886 | ||
![]() |
036dba942d | ||
![]() |
6c3bbf617c | ||
![]() |
c147354ee1 | ||
![]() |
343718d07b | ||
![]() |
f8c6a80fbe | ||
![]() |
a009f3549a | ||
![]() |
85128a4cfd | ||
![]() |
c9e6a65eec | ||
![]() |
790e7d580b | ||
![]() |
eb8f35f9f1 | ||
![]() |
f798b30c06 | ||
![]() |
8fb625ed73 | ||
![]() |
ba3c696c47 | ||
![]() |
d7d598e972 | ||
![]() |
0a6550986b | ||
![]() |
36878b119a | ||
![]() |
e7b85eee5b | ||
![]() |
c81ddf1520 | ||
![]() |
f626e0baf9 | ||
![]() |
fc2c32e1c6 | ||
![]() |
e359fb9169 | ||
![]() |
c947f49820 | ||
![]() |
6ac6ac8998 | ||
![]() |
b726688b47 | ||
![]() |
d87b83f9e9 | ||
![]() |
bcc437d029 | ||
![]() |
269404cb4f | ||
![]() |
120817f5f4 | ||
![]() |
c8a136f0d5 | ||
![]() |
bcd2081ee3 | ||
![]() |
e623b68d91 | ||
![]() |
814b411192 | ||
![]() |
f77dfa37da | ||
![]() |
04964787fa | ||
![]() |
20748d2f64 | ||
![]() |
b5a29fa400 | ||
![]() |
2fffda3a28 | ||
![]() |
537fb4bfda | ||
![]() |
4ab895f821 | ||
![]() |
880b9e4130 | ||
![]() |
d965968fc9 | ||
![]() |
3f02846fed | ||
![]() |
a36e085920 | ||
![]() |
443809f3b2 | ||
![]() |
e1f3cc09cb | ||
![]() |
f14cd51678 | ||
![]() |
f0a00aca95 | ||
![]() |
aed0460cfe | ||
![]() |
6017537107 | ||
![]() |
c6657b5f9b | ||
![]() |
2d8fada3c4 | ||
![]() |
eb0572640b | ||
![]() |
598471913e | ||
![]() |
8ff5a23c40 | ||
![]() |
01c8c60624 | ||
![]() |
4200357100 | ||
![]() |
39fec7ce64 | ||
![]() |
f10447b8d3 | ||
![]() |
abb03799e0 | ||
![]() |
d4aedbbb51 | ||
![]() |
d1beb28de0 | ||
![]() |
e3152c94e0 | ||
![]() |
e9b8b25da5 | ||
![]() |
5cdc72ddbf | ||
![]() |
be3dbd604b | ||
![]() |
f277832dc1 | ||
![]() |
ba3c43ac9a | ||
![]() |
520831bd33 | ||
![]() |
6703a07207 | ||
![]() |
056351ddfe | ||
![]() |
87e4a33621 | ||
![]() |
9be8a87a57 | ||
![]() |
15f96f3c82 | ||
![]() |
98da22047a | ||
![]() |
887bf0d266 | ||
![]() |
f1a1aebe33 | ||
![]() |
ebd69c04e8 | ||
![]() |
aba3a9439d | ||
![]() |
63c2ac0a96 | ||
![]() |
96d2b66068 | ||
![]() |
d32681bbe9 | ||
![]() |
dfc1ecef25 | ||
![]() |
cef7cae573 | ||
![]() |
be85947fb6 | ||
![]() |
830be1f15a | ||
![]() |
8ff943b084 | ||
![]() |
545b2ff8a7 | ||
![]() |
163cc75437 | ||
![]() |
e9940f4005 | ||
![]() |
8c8ff6189b | ||
![]() |
788f173066 | ||
![]() |
daaa8109d6 | ||
![]() |
7ec20edbc0 | ||
![]() |
80c38f0c3d | ||
![]() |
6a138eccc6 | ||
![]() |
1fe9065fca | ||
![]() |
c442d35505 | ||
![]() |
7da8f92b15 | ||
![]() |
de66aa294f | ||
![]() |
5f53a7c966 | ||
![]() |
6115e673cd | ||
![]() |
5b18304e1c | ||
![]() |
a51cc5485c | ||
![]() |
512d2e215f | ||
![]() |
3adb81e2c6 | ||
![]() |
0ae73c7131 | ||
![]() |
9926121912 | ||
![]() |
c1524c0713 | ||
![]() |
dd4aa5ac80 | ||
![]() |
a9dff09300 | ||
![]() |
37cef0fbae | ||
![]() |
e28d212789 | ||
![]() |
d5c9e694c3 | ||
![]() |
73bd0d67ea | ||
![]() |
c0a5420e8b | ||
![]() |
bec91c5b8d | ||
![]() |
484befafc3 | ||
![]() |
7a49802444 | ||
![]() |
12a3b4f846 | ||
![]() |
9e8c0dc262 | ||
![]() |
da6ace1882 | ||
![]() |
dec05e5cfe | ||
![]() |
4c9638150a | ||
![]() |
b1191117fc | ||
![]() |
fd23044005 | ||
![]() |
c2af23b3df | ||
![]() |
8757712905 | ||
![]() |
149feee93a | ||
![]() |
b15e9d74d6 | ||
![]() |
f5ce6301e0 | ||
![]() |
c222c446b5 | ||
![]() |
a84365996b | ||
![]() |
a7bcddf597 | ||
![]() |
81fb2e1cbf | ||
![]() |
3d32715d25 | ||
![]() |
25d6809e1c | ||
![]() |
bcd9bfd607 | ||
![]() |
3a419b733a | ||
![]() |
ea265075c8 | ||
![]() |
d423f82324 | ||
![]() |
79d03d0433 | ||
![]() |
bc3d3e4129 | ||
![]() |
9d3b298f1a | ||
![]() |
0180b633e2 | ||
![]() |
f1444b6edb | ||
![]() |
e9061a46b6 | ||
![]() |
052e1c39ab | ||
![]() |
19d438040b | ||
![]() |
4d74d2c6dc | ||
![]() |
e40a697dbd | ||
![]() |
c3ba7ef51a | ||
![]() |
6d7d3572a2 | ||
![]() |
e7359a3fd2 | ||
![]() |
46a89533f0 | ||
![]() |
f7b77a1c3f | ||
![]() |
2bdb996e1a | ||
![]() |
56e45a9f08 | ||
![]() |
62f15668b6 | ||
![]() |
6c1212de4e | ||
![]() |
b1c5460bbb | ||
![]() |
c68e5a181d | ||
![]() |
0574c8ed98 | ||
![]() |
70c6af3630 | ||
![]() |
4b0ab8161f | ||
![]() |
9a24fb2b64 | ||
![]() |
df9c950f1f | ||
![]() |
af3d68ff71 | ||
![]() |
8c1f50b4d2 | ||
![]() |
ca22bf327a | ||
![]() |
5eda4db743 | ||
![]() |
a41a2441df | ||
![]() |
f44599a3c9 | ||
![]() |
3370bda789 | ||
![]() |
19078a18fc | ||
![]() |
f9b58ecd06 | ||
![]() |
dc8b10593c | ||
![]() |
7b9cd73ee0 | ||
![]() |
41afcf9cf6 | ||
![]() |
d3b48f4ea4 | ||
![]() |
0aea4a7666 | ||
![]() |
4c26359e29 | ||
![]() |
5719f06dd1 | ||
![]() |
67e91e370a | ||
![]() |
aacedd2db6 | ||
![]() |
ea6f640820 | ||
![]() |
00143d29e7 | ||
![]() |
f16a03e226 | ||
![]() |
ad7aa36f88 | ||
![]() |
6232d4e9cf | ||
![]() |
a6c14e50c2 | ||
![]() |
c1bd65e8c6 | ||
![]() |
3c1d514807 | ||
![]() |
6cd88ec57b | ||
![]() |
28f865eb2e | ||
![]() |
f107573bc1 | ||
![]() |
557879941b | ||
![]() |
0dabc8ed8f | ||
![]() |
62822ade31 | ||
![]() |
a16f1e8248 | ||
![]() |
b123e86760 | ||
![]() |
d664f1f94a | ||
![]() |
0b02dbbb67 | ||
![]() |
16e4ae5583 | ||
![]() |
cace253d8b | ||
![]() |
97a4c3c0c0 | ||
![]() |
72a050c7ae | ||
![]() |
9dc96e7b33 | ||
![]() |
99e8c1044c | ||
![]() |
33d75cf217 | ||
![]() |
287d35cb26 | ||
![]() |
c5d203bbd6 | ||
![]() |
e4d53eddcc | ||
![]() |
25f474386b | ||
![]() |
3d8951db18 | ||
![]() |
d6875117b0 | ||
![]() |
b64f69105e | ||
![]() |
353d660f23 | ||
![]() |
80dd89da56 | ||
![]() |
fa96c8c5ab | ||
![]() |
ff3784ab5f | ||
![]() |
8d26b1509f | ||
![]() |
54ed550f4a | ||
![]() |
11f251755b | ||
![]() |
b00f489d09 | ||
![]() |
4e5b344ce8 | ||
![]() |
b1f0ed201a | ||
![]() |
f8cfb74555 | ||
![]() |
e3c6ad807b | ||
![]() |
818f60b4d7 | ||
![]() |
6f878e5c4a | ||
![]() |
3a347d83b5 | ||
![]() |
b89a626ffc | ||
![]() |
fef16bca14 | ||
![]() |
bb536192c2 | ||
![]() |
00d7e1f97c | ||
![]() |
4f48f39f7b | ||
![]() |
7998d2d8b9 | ||
![]() |
5fc83782b1 | ||
![]() |
7269f6c36a | ||
![]() |
583bed6164 | ||
![]() |
056e923ae8 | ||
![]() |
856d701b3e | ||
![]() |
7845d37b2e | ||
![]() |
1b112dd887 | ||
![]() |
e84af6ab91 | ||
![]() |
bde54ca6fa | ||
![]() |
4b6ef50611 | ||
![]() |
8140ed29e7 | ||
![]() |
d269d668e5 | ||
![]() |
b076738b53 | ||
![]() |
09e6452a48 | ||
![]() |
03bcdc37ce | ||
![]() |
8734a07592 | ||
![]() |
548fbf54cf | ||
![]() |
050c007e44 | ||
![]() |
5346679880 | ||
![]() |
fad41b2ddf | ||
![]() |
fcac66caab | ||
![]() |
11493914a7 | ||
![]() |
e14ed8804c | ||
![]() |
8abd71ab73 | ||
![]() |
41c4225c0f | ||
![]() |
d8896f78b8 | ||
![]() |
3d167acecb | ||
![]() |
9b5d008d66 | ||
![]() |
5ef0a57438 | ||
![]() |
f01ccbdae2 | ||
![]() |
6001652101 | ||
![]() |
6a49cdb54b | ||
![]() |
b9e2ec15ed | ||
![]() |
9896eab6ac | ||
![]() |
5e8571de80 | ||
![]() |
452493a828 | ||
![]() |
3a05733256 | ||
![]() |
71d7a7b659 | ||
![]() |
9f19b481cf | ||
![]() |
f95596ba02 | ||
![]() |
bd2b5d3bc0 | ||
![]() |
fd2e9a49ee | ||
![]() |
8f95d7b5b3 | ||
![]() |
67c2b33bb0 | ||
![]() |
237f183a18 | ||
![]() |
0d78cd57b3 | ||
![]() |
5bdf0974fc | ||
![]() |
7864909466 | ||
![]() |
d3130bd433 | ||
![]() |
fd9d899574 | ||
![]() |
42c52d619b | ||
![]() |
ef57754e6d | ||
![]() |
0989e28c38 | ||
![]() |
051828ca74 | ||
![]() |
119a5dc5aa | ||
![]() |
5e5c2ab6dd | ||
![]() |
46831cb9e8 | ||
![]() |
956ed427e6 | ||
![]() |
4d929dd3ac | ||
![]() |
201d8db167 | ||
![]() |
a31ef383d9 | ||
![]() |
7b88ac84a5 | ||
![]() |
4b3b660354 | ||
![]() |
0ff8ce9c25 | ||
![]() |
b7a130c8c2 | ||
![]() |
42b567fd65 | ||
![]() |
c90008e3c2 | ||
![]() |
3fb8ec8860 | ||
![]() |
d0b4dacf89 | ||
![]() |
6075317c88 | ||
![]() |
291db026c5 | ||
![]() |
b8fdf46340 | ||
![]() |
865e5216c1 | ||
![]() |
aa36e5f0e1 | ||
![]() |
45a3c11dfc | ||
![]() |
d814a4b6d7 | ||
![]() |
40a313f1a7 | ||
![]() |
7795d96d53 | ||
![]() |
318a2fe02a | ||
![]() |
b21e307af2 | ||
![]() |
f77c16ebee | ||
![]() |
19f78f5709 | ||
![]() |
e8a9770b6e | ||
![]() |
6b562f06ea | ||
![]() |
d6261e43ea | ||
![]() |
4887a2848d | ||
![]() |
b44f2a9c40 | ||
![]() |
57a62b0017 | ||
![]() |
c2b702427c | ||
![]() |
8f52250beb | ||
![]() |
c03bbb01a2 | ||
![]() |
832b5b1328 | ||
![]() |
bd4c6d6dfa | ||
![]() |
6212e3fbfc | ||
![]() |
9c9bff17be | ||
![]() |
ce35ca2dfd | ||
![]() |
5bcb9c43e1 | ||
![]() |
5a0e09a0eb | ||
![]() |
b7ebd0247f | ||
![]() |
27e9e61619 | ||
![]() |
507ecdb1dd | ||
![]() |
eb8a960ba6 | ||
![]() |
f4dbfc2f19 | ||
![]() |
de44252a56 | ||
![]() |
17d7912851 | ||
![]() |
502597aadc | ||
![]() |
57d5bb0359 | ||
![]() |
3d36cd2e48 | ||
![]() |
c9654b268e | ||
![]() |
826ff3050b | ||
![]() |
e0393babc9 | ||
![]() |
39bcaa0318 | ||
![]() |
bd0b75c315 | ||
![]() |
a2690eb628 | ||
![]() |
d804123b4e | ||
![]() |
ec6940afbe | ||
![]() |
b87380b07d | ||
![]() |
6f7f5450ca | ||
![]() |
9c23b4c9f9 | ||
![]() |
0bd93ae1d9 | ||
![]() |
6fd36bd2b7 | ||
![]() |
d5c3f4dbe9 | ||
![]() |
0c5c1e46b0 | ||
![]() |
6f6016a90d | ||
![]() |
1f760d882a | ||
![]() |
d4dee96823 | ||
![]() |
0be836ad80 | ||
![]() |
b6cdb7c6b1 | ||
![]() |
a16ea97b53 | ||
![]() |
8086c2242d | ||
![]() |
4ba9a4bf8f | ||
![]() |
1e4864f45a | ||
![]() |
bb18278b2f | ||
![]() |
2fc84783a5 | ||
![]() |
dda32dd81a | ||
![]() |
fa8ffaefd0 | ||
![]() |
69472b27c7 | ||
![]() |
87624c7699 | ||
![]() |
e9cf183bbf | ||
![]() |
f070dee931 | ||
![]() |
51127dc513 | ||
![]() |
11e02c9504 | ||
![]() |
ab9cbea7c3 | ||
![]() |
58cee5fb2e | ||
![]() |
7671595665 | ||
![]() |
d8fb9f1195 | ||
![]() |
a1e7d653f2 | ||
![]() |
1fff3b5b86 | ||
![]() |
57b618ce34 | ||
![]() |
16451807f9 | ||
![]() |
80fafbf2e1 | ||
![]() |
d1bcb9fb2e | ||
![]() |
58d0e7f513 | ||
![]() |
ce93b847d2 | ||
![]() |
c9c2a774ea | ||
![]() |
e928eab96b | ||
![]() |
bff5662116 | ||
![]() |
585347b1a2 | ||
![]() |
e736bbb9ec | ||
![]() |
0c58a5bf05 | ||
![]() |
60bbcf3420 | ||
![]() |
0de6481c24 | ||
![]() |
4281267cb6 | ||
![]() |
f3bb7327dc | ||
![]() |
aea41d74ec | ||
![]() |
5a53cc9738 | ||
![]() |
cadd1520ee | ||
![]() |
0976147d07 | ||
![]() |
fe3ae0e8b4 | ||
![]() |
2c6754a647 | ||
![]() |
96b596491e | ||
![]() |
de512610b4 | ||
![]() |
61576e94d0 | ||
![]() |
d72bc0d1bb | ||
![]() |
5f83139fcd | ||
![]() |
5b7d246f68 | ||
![]() |
93fff41b8d | ||
![]() |
fd59ca8053 | ||
![]() |
e4e5255a46 | ||
![]() |
6bd4f04174 | ||
![]() |
4039198a4a | ||
![]() |
1316540765 | ||
![]() |
c1b951b18c | ||
![]() |
d3c0ef501c | ||
![]() |
33062214da | ||
![]() |
99c5506d7d | ||
![]() |
94dd8e7206 | ||
![]() |
88d59a2152 | ||
![]() |
d6b674345f | ||
![]() |
02516f2251 | ||
![]() |
a18e03d754 | ||
![]() |
d9c68d41bf | ||
![]() |
41ac417543 | ||
![]() |
3468ef689d | ||
![]() |
da2c98aa32 | ||
![]() |
7929d8e419 | ||
![]() |
cfe16892ab | ||
![]() |
422a714935 | ||
![]() |
30b411285c | ||
![]() |
53562e5a3e | ||
![]() |
5d4006f753 | ||
![]() |
262f758699 | ||
![]() |
c212b3dccd | ||
![]() |
79c5d5a560 | ||
![]() |
cdcd886a3a | ||
![]() |
681efd9f52 | ||
![]() |
2df409ca63 | ||
![]() |
26f2b8c5b0 | ||
![]() |
b44b7a66c1 | ||
![]() |
d6776a8a1e | ||
![]() |
117514bace | ||
![]() |
9b7ccd9dfe | ||
![]() |
f2c5912dfa | ||
![]() |
34726614f0 | ||
![]() |
0e56427789 | ||
![]() |
b009e0b640 | ||
![]() |
fca8c6f418 | ||
![]() |
c53d7187c7 | ||
![]() |
ef8735e5a2 | ||
![]() |
20df163444 | ||
![]() |
639bb3e558 | ||
![]() |
a58456deab | ||
![]() |
6467b60e65 | ||
![]() |
a947e8cbf6 | ||
![]() |
4b921a641c | ||
![]() |
15f39ea93e | ||
![]() |
2eb34ee634 | ||
![]() |
601c6cd49d | ||
![]() |
923579e702 | ||
![]() |
308f0751cf | ||
![]() |
b6a507d2a2 | ||
![]() |
51c95de793 | ||
![]() |
1aa9faeb2f | ||
![]() |
b1eb4a8bf9 | ||
![]() |
dc70ec0ef0 | ||
![]() |
d1b9d4f692 | ||
![]() |
c4696c9ba8 | ||
![]() |
069fd02517 | ||
![]() |
b9e164de78 | ||
![]() |
432b6607c3 | ||
![]() |
c90b05650a | ||
![]() |
4d4fe529a5 | ||
![]() |
aca14117e7 | ||
![]() |
b6fc9b5444 | ||
![]() |
af3c78cc50 | ||
![]() |
6298724ea6 | ||
![]() |
7d04084642 | ||
![]() |
9065f4f606 | ||
![]() |
f56b6856dd | ||
![]() |
77b027a6c6 | ||
![]() |
0567ea7a2d | ||
![]() |
a2882b0644 | ||
![]() |
4cea196eb2 | ||
![]() |
082018d44d | ||
![]() |
122d31b11b | ||
![]() |
7ab598d571 | ||
![]() |
bd06eded8c | ||
![]() |
16eda4f186 | ||
![]() |
c2701c412c | ||
![]() |
e976ddb07c | ||
![]() |
987e146209 | ||
![]() |
e0e2e5affa | ||
![]() |
7fe155103a | ||
![]() |
13ae42f217 | ||
![]() |
2ea32752bc | ||
![]() |
a3a2f259b2 | ||
![]() |
c835b215af | ||
![]() |
c0bfc3a739 | ||
![]() |
a0c9b3da91 | ||
![]() |
10dc73498a | ||
![]() |
0f3a7ff902 | ||
![]() |
47d55ecd36 | ||
![]() |
1df73d6730 | ||
![]() |
540cb86b2d | ||
![]() |
8d02988da7 | ||
![]() |
2173f3956e | ||
![]() |
76e1a39208 | ||
![]() |
d87b375a35 | ||
![]() |
ae32581d20 | ||
![]() |
c52c4542ce | ||
![]() |
a0f6f4b0cc | ||
![]() |
1ab022ad6c | ||
![]() |
8150517f13 | ||
![]() |
99b3db365a | ||
![]() |
e259cf4c13 | ||
![]() |
8072d8f0f2 | ||
![]() |
54e6471fa5 | ||
![]() |
3a049da620 | ||
![]() |
bb55534f2c | ||
![]() |
5e7b066af1 | ||
![]() |
16eb620f4f | ||
![]() |
9db25ec2c8 | ||
![]() |
e0240259ec | ||
![]() |
4b3215412f | ||
![]() |
f28dc8bf72 | ||
![]() |
0251aaa3f8 | ||
![]() |
b480317599 | ||
![]() |
fd7a18bfc5 | ||
![]() |
261af2a2f5 | ||
![]() |
97312820d6 | ||
![]() |
47bd509e75 | ||
![]() |
8402aebde7 | ||
![]() |
0dbae112db | ||
![]() |
66d9c7079b | ||
![]() |
33ca20fbec | ||
![]() |
f7d34899a4 | ||
![]() |
649f64e6e6 | ||
![]() |
52d826eaf6 | ||
![]() |
ce30e58c67 | ||
![]() |
f456af7a51 | ||
![]() |
967a761ac1 | ||
![]() |
c9b2717344 | ||
![]() |
52392ab719 | ||
![]() |
958b3b8c05 | ||
![]() |
0437ec4c3f | ||
![]() |
cdbfcc7cc4 | ||
![]() |
0bab79bea4 | ||
![]() |
112eb7b3ce | ||
![]() |
08fe940e70 | ||
![]() |
43e4f9de49 | ||
![]() |
4a2158a178 | ||
![]() |
bb02acf13e | ||
![]() |
dcd32c48c3 | ||
![]() |
4235351d74 | ||
![]() |
cd825ac0da | ||
![]() |
ca80812d0a | ||
![]() |
eeec2b536d | ||
![]() |
b58dd32bff | ||
![]() |
4a74a3ac99 | ||
![]() |
62904747fc | ||
![]() |
4c30e2d0be | ||
![]() |
d05096c015 | ||
![]() |
caa5b1e29a | ||
![]() |
858ec87f2f | ||
![]() |
11f79a3e6b | ||
![]() |
174d185de3 | ||
![]() |
8b9af3b04c | ||
![]() |
b837f63b7c | ||
![]() |
e838873235 | ||
![]() |
ea53111aa1 | ||
![]() |
59481abd7f | ||
![]() |
81ec674f38 | ||
![]() |
ead548f499 | ||
![]() |
5e0ae8a26e | ||
![]() |
3437ee8420 | ||
![]() |
0fec5395ff | ||
![]() |
c19af67009 | ||
![]() |
4b3d7e8ef7 | ||
![]() |
276452e4b9 | ||
![]() |
2c49c04819 | ||
![]() |
f6263f86a4 | ||
![]() |
3197ec911e | ||
![]() |
41001f186b | ||
![]() |
961bb11b59 | ||
![]() |
f82426b1dc | ||
![]() |
8b90d999ac | ||
![]() |
51102e27a1 | ||
![]() |
a01966ac44 | ||
![]() |
a33afbef2b | ||
![]() |
80948d98f0 | ||
![]() |
446f681098 | ||
![]() |
d5ea6f563b | ||
![]() |
bf20787a24 | ||
![]() |
da05c05bb8 | ||
![]() |
8933df4184 | ||
![]() |
d7c156fce9 | ||
![]() |
7a4af88c0d | ||
![]() |
98d32bc7ad | ||
![]() |
5bf38231fa | ||
![]() |
1e73fa626d | ||
![]() |
fc5a3843a8 | ||
![]() |
4caa39bddb | ||
![]() |
b9ff51d51c | ||
![]() |
516dd99a26 | ||
![]() |
6eb5eec050 | ||
![]() |
3fecbc245b | ||
![]() |
fbffcca945 | ||
![]() |
3ea3327448 | ||
![]() |
2108219711 | ||
![]() |
f08823333f | ||
![]() |
1956e25a83 | ||
![]() |
87eee70b0a | ||
![]() |
59cb19ae80 | ||
![]() |
3f7c42c51e | ||
![]() |
2e28a51b02 | ||
![]() |
7fab9633ea | ||
![]() |
96c2310b26 | ||
![]() |
a37bb6ade1 | ||
![]() |
7584b9e1c3 | ||
![]() |
c6deb2271d | ||
![]() |
be6de64fcd | ||
![]() |
8184acc480 | ||
![]() |
7660dd8d95 | ||
![]() |
6f4c3860a3 | ||
![]() |
d73885137a | ||
![]() |
290c24b448 | ||
![]() |
21dac408ee | ||
![]() |
d118496075 | ||
![]() |
cb5deb644e | ||
![]() |
f9d8e4e0b7 | ||
![]() |
a3ffda3bf8 | ||
![]() |
8ca668159e | ||
![]() |
59e6c4abf5 | ||
![]() |
3d6af1f8c0 | ||
![]() |
173f1d4335 | ||
![]() |
f721028d81 | ||
![]() |
b504af6f19 | ||
![]() |
542e2db930 | ||
![]() |
4d85639f31 | ||
![]() |
fd2120904c | ||
![]() |
2225c2e428 | ||
![]() |
fddc4936e8 | ||
![]() |
677c77e9ee | ||
![]() |
402cb7e031 | ||
![]() |
0649342658 | ||
![]() |
4b61ba4d86 | ||
![]() |
e6dbfe4b1b | ||
![]() |
f3534537ea | ||
![]() |
d52a09406d | ||
![]() |
deb752c06e | ||
![]() |
9bf1fbd219 | ||
![]() |
1a3fe013bb | ||
![]() |
a78a910718 | ||
![]() |
31ed56936c | ||
![]() |
8562ddb14b | ||
![]() |
7acf79370b | ||
![]() |
051ee006f8 | ||
![]() |
95064122d0 | ||
![]() |
04695b2520 | ||
![]() |
d92424e2f4 | ||
![]() |
72919cd867 | ||
![]() |
073cd079e8 | ||
![]() |
8eaff78737 | ||
![]() |
daf2dc40d9 | ||
![]() |
e1b773c097 | ||
![]() |
21f4dc5fd9 | ||
![]() |
65834fc86e | ||
![]() |
83d24f8c21 | ||
![]() |
ac3e87db05 | ||
![]() |
636fba40f7 | ||
![]() |
f8123fbbfd | ||
![]() |
8313b9a929 | ||
![]() |
51aa5fb61c | ||
![]() |
a5378e0cf5 | ||
![]() |
0abbf80c1d | ||
![]() |
04e34145aa | ||
![]() |
33d2a43838 | ||
![]() |
d4536ffbf4 | ||
![]() |
7e69b448d6 | ||
![]() |
bf2d12a10b | ||
![]() |
04e5f59cdf | ||
![]() |
e1fad603f0 | ||
![]() |
6b73c75205 | ||
![]() |
f01e49f05f | ||
![]() |
64c6c19618 | ||
![]() |
0878eafaf3 | ||
![]() |
bdac58d7fc | ||
![]() |
c8aae069f8 | ||
![]() |
073b2b0acd | ||
![]() |
d155d778ee | ||
![]() |
50e440bcf5 | ||
![]() |
af39526d77 | ||
![]() |
f77ce869f8 | ||
![]() |
bc06839926 | ||
![]() |
a3ebfc0f36 | ||
![]() |
362364136d | ||
![]() |
b892b13529 | ||
![]() |
b220e20053 | ||
![]() |
eaff0b1397 | ||
![]() |
0108f525ba | ||
![]() |
3f5de295a7 | ||
![]() |
62924cc5e0 | ||
![]() |
8453b667cb | ||
![]() |
3922130434 | ||
![]() |
c3b265d213 | ||
![]() |
2b58377830 | ||
![]() |
4536d9c74d | ||
![]() |
a3b7125ef9 | ||
![]() |
6f9c55d250 | ||
![]() |
9c6fb1794f | ||
![]() |
0f27ae1125 | ||
![]() |
73285284ce | ||
![]() |
53186988f5 | ||
![]() |
4d41d5f834 | ||
![]() |
8f9236f06d | ||
![]() |
470ad80741 | ||
![]() |
5eee80c308 | ||
![]() |
c3f17b9754 | ||
![]() |
ea38669710 | ||
![]() |
e867993bb8 | ||
![]() |
e296295df5 | ||
![]() |
cafe88a3b8 | ||
![]() |
7de6aa0e24 | ||
![]() |
a984957af9 | ||
![]() |
daf2f50b00 | ||
![]() |
eb93041c5b | ||
![]() |
b9b1d3fd8d | ||
![]() |
17e03330d0 | ||
![]() |
ed27231769 | ||
![]() |
98832f2540 | ||
![]() |
6e7c0da68a | ||
![]() |
45ee56fe8f | ||
![]() |
cfba84ce31 | ||
![]() |
a7276b8a30 | ||
![]() |
587e1546dc | ||
![]() |
ec9a1e22f7 | ||
![]() |
bb977dcd49 | ||
![]() |
82ed3aadff | ||
![]() |
b27659d958 | ||
![]() |
f262299382 | ||
![]() |
795f300158 | ||
![]() |
df3e00f985 | ||
![]() |
69164837f0 | ||
![]() |
38d5f87d3e | ||
![]() |
5a5c1f18e3 | ||
![]() |
da9d848fe2 | ||
![]() |
090dda28ad | ||
![]() |
d1c8d362bd | ||
![]() |
83d86d7b68 | ||
![]() |
47159fe15b | ||
![]() |
bb3d2bb483 | ||
![]() |
8c92364d43 | ||
![]() |
1cc4756ee2 | ||
![]() |
05239743ac | ||
![]() |
d70fa8f569 | ||
![]() |
df377804bb | ||
![]() |
0efa4a6174 | ||
![]() |
17a868a2c4 | ||
![]() |
ac3fc1dc32 | ||
![]() |
84feea9b30 | ||
![]() |
baf3886115 | ||
![]() |
262723b0ca | ||
![]() |
196a8c21db | ||
![]() |
08bda53a2e | ||
![]() |
cd2f8abd2d | ||
![]() |
e9e3d86aab | ||
![]() |
920edef155 | ||
![]() |
8a4f24fc31 | ||
![]() |
7142e66910 | ||
![]() |
6cf62a6c61 | ||
![]() |
daaa642bfe | ||
![]() |
c7d8949c82 | ||
![]() |
b49e6fda9a | ||
![]() |
0c9c876e3d | ||
![]() |
7f1ae419af | ||
![]() |
1c786744ee | ||
![]() |
30d57174e6 | ||
![]() |
89b72b9dc1 | ||
![]() |
42aa95344a | ||
![]() |
c155a60a7e | ||
![]() |
b584d3fee0 | ||
![]() |
5d6bf0bb33 | ||
![]() |
65e1b8ed60 | ||
![]() |
2cebbd9b8f | ||
![]() |
7d59615b7e | ||
![]() |
147564b114 | ||
![]() |
c5603c7be2 | ||
![]() |
22b0f4805a | ||
![]() |
ecd2faea4a | ||
![]() |
990f00b129 | ||
![]() |
483b97d9c1 | ||
![]() |
171a971572 | ||
![]() |
8a4e8f6045 | ||
![]() |
32364e4f68 | ||
![]() |
311f648c3f | ||
![]() |
2c28f75263 | ||
![]() |
53335658e0 | ||
![]() |
9467838066 | ||
![]() |
99656f1357 | ||
![]() |
8ee05f4352 | ||
![]() |
6756a78ba0 | ||
![]() |
b482b58d53 | ||
![]() |
312a2a7f58 | ||
![]() |
d6f0f02c1a | ||
![]() |
61eb14783e | ||
![]() |
126f3c71f4 | ||
![]() |
6cd092671f | ||
![]() |
31411e9afa | ||
![]() |
39c5de6e18 | ||
![]() |
5868a3198f | ||
![]() |
c5fd4426cd | ||
![]() |
8cfc61c7f3 | ||
![]() |
2a39bd831b | ||
![]() |
b69b21af6c | ||
![]() |
ea715ba9f5 | ||
![]() |
6182e222d3 | ||
![]() |
7a948f1e2a | ||
![]() |
d653c011fe | ||
![]() |
f097652594 | ||
![]() |
905502d988 | ||
![]() |
8dec8e4315 | ||
![]() |
4a9ece0f82 | ||
![]() |
cecf87364e | ||
![]() |
f4bc87d327 | ||
![]() |
a950b9c9a2 | ||
![]() |
afa0a9017f | ||
![]() |
03b4ce3e60 | ||
![]() |
7638511762 | ||
![]() |
5b9b468079 | ||
![]() |
87f05f428f | ||
![]() |
2d7c0cc3dd | ||
![]() |
1b83f18960 | ||
![]() |
58ff240c05 | ||
![]() |
ff304f3314 | ||
![]() |
33a091d630 | ||
![]() |
63c98740ba | ||
![]() |
2e685b9e05 | ||
![]() |
31336efad2 | ||
![]() |
204062c779 | ||
![]() |
17ecc592f3 | ||
![]() |
6a1e1bfa8b | ||
![]() |
e24e72c3bb | ||
![]() |
bef9ff1ee0 | ||
![]() |
d23483d26c | ||
![]() |
cb8a7cd402 | ||
![]() |
888459cb56 | ||
![]() |
f0ff625b4b | ||
![]() |
d9269c7d28 | ||
![]() |
fc2d3f0a23 | ||
![]() |
6cb3e8bbfb | ||
![]() |
09d7a7f257 | ||
![]() |
c7ae1d63b5 | ||
![]() |
19db3faf65 | ||
![]() |
2d0d9bb9db | ||
![]() |
2904ca28a1 | ||
![]() |
0475c0b2d9 | ||
![]() |
00ff0cc7e4 | ||
![]() |
81fa0ba446 | ||
![]() |
2a5d779598 | ||
![]() |
a5fb2e6417 | ||
![]() |
f6269a95ee | ||
![]() |
5342653b99 | ||
![]() |
7f1a21b4ae | ||
![]() |
5c50faa319 | ||
![]() |
88fb275017 | ||
![]() |
b55a318676 | ||
![]() |
b839252ed7 | ||
![]() |
e3f13f8c54 | ||
![]() |
a6171bba41 | ||
![]() |
026703d170 | ||
![]() |
b08edf1ea4 | ||
![]() |
2bd53d822a | ||
![]() |
ad74ce6049 | ||
![]() |
b11543c3a5 | ||
![]() |
e9cd0f4c64 | ||
![]() |
351c4decef | ||
![]() |
6035d9e925 | ||
![]() |
0a5d20e236 | ||
![]() |
5d04e44ff3 | ||
![]() |
74d6dbb454 | ||
![]() |
d0b6571954 | ||
![]() |
0a7307a515 | ||
![]() |
44b900f5db | ||
![]() |
4f1013a20d | ||
![]() |
39ddc5cbcd | ||
![]() |
9bc65b99a6 | ||
![]() |
b65f1ee5e3 | ||
![]() |
6eabe425c4 | ||
![]() |
9741ce3e69 | ||
![]() |
7472be0098 | ||
![]() |
98fd9e7182 | ||
![]() |
9708c06372 | ||
![]() |
f02f8bab88 | ||
![]() |
bb412469c7 | ||
![]() |
9e2699cadd | ||
![]() |
f3df3cc96c | ||
![]() |
8ef53178db | ||
![]() |
c0ed0da8f3 | ||
![]() |
7009cf32cc | ||
![]() |
cd2959603b | ||
![]() |
6ca8ac51b2 | ||
![]() |
3c47acf9f1 | ||
![]() |
570d711e01 | ||
![]() |
395a5b2cb1 | ||
![]() |
f0ea13288a | ||
![]() |
b2a10e4ace | ||
![]() |
5b3b3bfb9c | ||
![]() |
89281d7c99 | ||
![]() |
c3e635bff1 | ||
![]() |
0570542b1e | ||
![]() |
32fae27c7a | ||
![]() |
ce5ab70fd4 | ||
![]() |
2abdf122b4 | ||
![]() |
9f9ca860e0 | ||
![]() |
31c9b854c6 | ||
![]() |
75e45d4c15 | ||
![]() |
64baa6ed7e | ||
![]() |
76ae286f2a | ||
![]() |
d88c8ef986 | ||
![]() |
fab441aacb | ||
![]() |
0e29c09b7a | ||
![]() |
f07a62b8b6 | ||
![]() |
a6a44fd0b7 | ||
![]() |
6cf05c1403 | ||
![]() |
2b96983f9d | ||
![]() |
7eabaa79b4 | ||
![]() |
09c11f8dbc | ||
![]() |
c8b2642f57 | ||
![]() |
de89bb20af | ||
![]() |
fd166fe79a | ||
![]() |
e4bb42bb30 | ||
![]() |
6446911441 | ||
![]() |
8a6fc090b8 | ||
![]() |
dde029df7f | ||
![]() |
b0924b5d98 | ||
![]() |
9e1ce916f6 | ||
![]() |
ecceaf9ee1 | ||
![]() |
c20bf58b4b | ||
![]() |
7feb9fc617 | ||
![]() |
5623cc9221 | ||
![]() |
fcf3370d66 | ||
![]() |
a01ca48c87 | ||
![]() |
6dd61ca25e | ||
![]() |
813e965938 | ||
![]() |
fa723c17a9 | ||
![]() |
ed660cb8f7 | ||
![]() |
fb3a10250d | ||
![]() |
f067eb9aae | ||
![]() |
d8a73c362c | ||
![]() |
e02326510f | ||
![]() |
096c5bdedd | ||
![]() |
ccdf5498d8 | ||
![]() |
3c16537fe4 | ||
![]() |
a57fd1a069 | ||
![]() |
1c4ffe58fd | ||
![]() |
6f5864d106 | ||
![]() |
99f2ecd86b | ||
![]() |
fbe4ce5829 | ||
![]() |
112bed787a | ||
![]() |
8712504376 | ||
![]() |
05d5a0816d | ||
![]() |
c5f07daab7 | ||
![]() |
eaa239c764 | ||
![]() |
f52aac879a | ||
![]() |
fcc148f546 | ||
![]() |
08257cb9f2 | ||
![]() |
496ce64505 | ||
![]() |
08800f4469 | ||
![]() |
80f6cd5b4e | ||
![]() |
76ca7717ac | ||
![]() |
952611a3d3 | ||
![]() |
eb51b7986d | ||
![]() |
1c48188200 | ||
![]() |
3ecdfe422d | ||
![]() |
050cde3735 | ||
![]() |
bfe927e65a | ||
![]() |
58e9a60812 | ||
![]() |
272cb656cd | ||
![]() |
76539dd8a1 | ||
![]() |
d0a8448de6 | ||
![]() |
e8f0c20beb | ||
![]() |
cf87b905b6 | ||
![]() |
b8509d8f74 | ||
![]() |
c1fb26fe26 | ||
![]() |
e07c2514fe | ||
![]() |
0120896135 | ||
![]() |
8a62deb90b | ||
![]() |
9fce33f514 | ||
![]() |
9284763fe2 | ||
![]() |
25de1e48f3 | ||
![]() |
05dce42f87 | ||
![]() |
2029156e49 | ||
![]() |
00a514b969 | ||
![]() |
1322d0ad69 | ||
![]() |
483214d8e2 | ||
![]() |
e41e8b2847 | ||
![]() |
43d4e97695 | ||
![]() |
5f32b643b3 | ||
![]() |
04123f92aa | ||
![]() |
7538f49a36 | ||
![]() |
60586f6c33 | ||
![]() |
86a6897861 | ||
![]() |
68372b2cb8 | ||
![]() |
cefeb6a1d6 | ||
![]() |
9c859b1fdc | ||
![]() |
fbaa5068af | ||
![]() |
8515de3d10 | ||
![]() |
f24e53f1ea | ||
![]() |
da3af31ac2 | ||
![]() |
34ee111133 | ||
![]() |
96cdab8d6a | ||
![]() |
b1c507807a | ||
![]() |
ebc7799404 | ||
![]() |
6fe351aa2c | ||
![]() |
d3d86f4f2d | ||
![]() |
c925424ced | ||
![]() |
202cfe427b | ||
![]() |
aa93989f4b | ||
![]() |
48f7e51695 | ||
![]() |
e4a464d44f | ||
![]() |
a078932857 | ||
![]() |
5bd8795262 | ||
![]() |
dda5ee1123 | ||
![]() |
53f46040d3 | ||
![]() |
2d58de86bd | ||
![]() |
da6447aefd | ||
![]() |
2c22517090 | ||
![]() |
7140e6e716 | ||
![]() |
d8246f4550 | ||
![]() |
0b6effe4aa | ||
![]() |
15e0fd4636 | ||
![]() |
a1b7c8d9c5 | ||
![]() |
cb4a7b31f0 | ||
![]() |
fda9330221 | ||
![]() |
894448e3dc | ||
![]() |
9d4542c2a4 | ||
![]() |
c1a1fe7443 | ||
![]() |
e04cdef429 | ||
![]() |
636c85ae59 | ||
![]() |
b25294c872 | ||
![]() |
01cb2c7429 | ||
![]() |
f993ced1b7 | ||
![]() |
d1d9f2f7f9 | ||
![]() |
2cde0d3f21 | ||
![]() |
323370ee04 | ||
![]() |
08f48d8204 | ||
![]() |
d61d223d56 | ||
![]() |
ecf3298345 | ||
![]() |
af7c095af0 | ||
![]() |
b8bb3ff815 | ||
![]() |
fea109117f | ||
![]() |
4ffde928d4 | ||
![]() |
4729ae950d | ||
![]() |
9406f7b085 | ||
![]() |
1c1bcc704a | ||
![]() |
d85d5fbd71 | ||
![]() |
33fdee554e | ||
![]() |
4dcc7c282d | ||
![]() |
d61cb33f9a | ||
![]() |
cee9d0422b | ||
![]() |
741cf66518 | ||
![]() |
b583e17880 | ||
![]() |
3f8ef9be9d | ||
![]() |
d4d36f0105 | ||
![]() |
c67861692a | ||
![]() |
4223abd601 | ||
![]() |
36701bcf20 | ||
![]() |
5c8eabddab | ||
![]() |
a18225aa4d | ||
![]() |
829d406808 | ||
![]() |
e06db4cbab | ||
![]() |
85a120da62 | ||
![]() |
587df79f3a | ||
![]() |
d578222f8f | ||
![]() |
6ce17e06c4 | ||
![]() |
bb608d919f | ||
![]() |
abc3c41c63 | ||
![]() |
6ac922971d | ||
![]() |
6bcac36c14 | ||
![]() |
a8e658a399 | ||
![]() |
76a02b296f | ||
![]() |
fa1ce5b7af | ||
![]() |
81522586dd | ||
![]() |
a8ff6a41e0 | ||
![]() |
75260b00d9 | ||
![]() |
14680b013e | ||
![]() |
b601405e56 | ||
![]() |
5d410b7c53 | ||
![]() |
8e25c178eb | ||
![]() |
e173153e7d | ||
![]() |
6425ec7d5e | ||
![]() |
225a2b6736 | ||
![]() |
c6ef2f1bd0 | ||
![]() |
2a1ef02d75 | ||
![]() |
25ab69ff21 | ||
![]() |
8a778f6c3d | ||
![]() |
f8431dbdd7 | ||
![]() |
5173b28b5a | ||
![]() |
aba988a6a4 | ||
![]() |
5b3da0236f | ||
![]() |
d13d8860f2 | ||
![]() |
60ff9a9c79 | ||
![]() |
a938a4f44c | ||
![]() |
0ade76a99c | ||
![]() |
a105bcd6f4 | ||
![]() |
5188e5d7fe | ||
![]() |
eb3db9ceb6 | ||
![]() |
b454e49553 | ||
![]() |
819e693cfc | ||
![]() |
84c0371aab | ||
![]() |
6380f132af | ||
![]() |
4bf4e18389 | ||
![]() |
beef2aca17 | ||
![]() |
f16015abc2 | ||
![]() |
3bd84a66f2 | ||
![]() |
253b2e84d1 | ||
![]() |
05c74123a5 | ||
![]() |
e842c06f94 | ||
![]() |
2ff5350302 | ||
![]() |
36dd4762ed | ||
![]() |
655558538c | ||
![]() |
df79a99b99 | ||
![]() |
f339d8bf37 | ||
![]() |
c1aabf6add | ||
![]() |
12fc5aff71 | ||
![]() |
57b96a378a | ||
![]() |
cd500007b6 | ||
![]() |
686b61915a | ||
![]() |
996c877412 | ||
![]() |
c9d6c95563 | ||
![]() |
c9800e7bff | ||
![]() |
ffda455d4f | ||
![]() |
a027bb2d5d | ||
![]() |
969eef9150 | ||
![]() |
5a7190203a | ||
![]() |
dab6b1c12e | ||
![]() |
bad57def74 | ||
![]() |
0d516bfe9c | ||
![]() |
4575c3d7af | ||
![]() |
494771c0da | ||
![]() |
44d2450543 | ||
![]() |
8572bfb1b1 | ||
![]() |
cc70eaa82e | ||
![]() |
d5221fbf2f | ||
![]() |
bee8bde87f | ||
![]() |
5a88cedc22 | ||
![]() |
ff7c9ba955 | ||
![]() |
c71c6667e0 | ||
![]() |
010b2f9693 | ||
![]() |
ac00f88fe0 | ||
![]() |
edfaee6aab | ||
![]() |
5ff475046f | ||
![]() |
d740b5df6b | ||
![]() |
5dcc90c1cd | ||
![]() |
f0e9948992 | ||
![]() |
c67dc4d8e4 | ||
![]() |
f2d6f774d3 | ||
![]() |
1a48a6c853 | ||
![]() |
838ffc5b6d | ||
![]() |
297fc01892 | ||
![]() |
7ca4d8f2b1 | ||
![]() |
e4b2ebe7aa | ||
![]() |
2fb746f6e6 | ||
![]() |
11626e22eb | ||
![]() |
dbd67f056e | ||
![]() |
f9e67dc513 | ||
![]() |
acb7c9bd33 | ||
![]() |
5ee721f2c4 | ||
![]() |
97b5e0cc92 | ||
![]() |
e9a28c6d3d | ||
![]() |
2e174cd9e6 | ||
![]() |
15d3f257b3 | ||
![]() |
8509096c32 | ||
![]() |
84878ede67 | ||
![]() |
394ecea118 | ||
![]() |
71de4b600b | ||
![]() |
830ada37f5 | ||
![]() |
b5a8b56473 | ||
![]() |
2a72fac646 | ||
![]() |
6988df519e | ||
![]() |
50885676d8 | ||
![]() |
ce17d23c08 | ||
![]() |
91acc957b1 | ||
![]() |
987ea5104a | ||
![]() |
970544c130 | ||
![]() |
c9ba47b9af | ||
![]() |
9c843b62d4 | ||
![]() |
dcea3baf46 | ||
![]() |
446280b59a | ||
![]() |
b86d0a083a | ||
![]() |
964c085ee2 | ||
![]() |
907a16ca09 | ||
![]() |
97cda8f752 | ||
![]() |
135c085024 | ||
![]() |
f47bf4665e | ||
![]() |
ed4e794d46 | ||
![]() |
0c81a79d0c | ||
![]() |
4fcae182b1 | ||
![]() |
80e938b1f2 | ||
![]() |
c9df52cba2 | ||
![]() |
37bd26ed1e | ||
![]() |
0b3cb7906c | ||
![]() |
e975585350 | ||
![]() |
30718cb810 | ||
![]() |
686f2848e9 | ||
![]() |
3ca56c3c28 | ||
![]() |
e4b25585b8 | ||
![]() |
9f74d45e16 | ||
![]() |
7eeeab4c26 | ||
![]() |
67c253bbbb | ||
![]() |
a53df4fed4 | ||
![]() |
cdec4880d2 | ||
![]() |
8849f140fb | ||
![]() |
4228362ff3 | ||
![]() |
c743387a26 | ||
![]() |
683109758b | ||
![]() |
05508b63ab | ||
![]() |
be2662fb92 | ||
![]() |
feceb21d9c | ||
![]() |
2011aee21e | ||
![]() |
70b855e785 | ||
![]() |
b2715501b0 | ||
![]() |
7cd13f692e | ||
![]() |
e4daf2b825 | ||
![]() |
c38352ed22 | ||
![]() |
deb4a63c88 | ||
![]() |
ec016e80fb | ||
![]() |
ced163a25f | ||
![]() |
5a28e66b2f | ||
![]() |
35a25b372d | ||
![]() |
10a4a2eec6 | ||
![]() |
62b31ea8c5 | ||
![]() |
7b9f1dcc69 | ||
![]() |
256d71cc1e | ||
![]() |
138c007f28 | ||
![]() |
9ac92e0196 | ||
![]() |
287d028331 | ||
![]() |
cae13942e2 | ||
![]() |
b16cec631d | ||
![]() |
dc8a699e94 | ||
![]() |
3a18805e93 | ||
![]() |
fbef294fb4 | ||
![]() |
1c9272107c | ||
![]() |
5c9f494f76 | ||
![]() |
decacec404 | ||
![]() |
0f4d71eb58 | ||
![]() |
12804f800b | ||
![]() |
21fa85c31d | ||
![]() |
757d23e74d | ||
![]() |
b54e54da30 | ||
![]() |
0c13fc883c | ||
![]() |
628ec2b6ba | ||
![]() |
fdfa6e2c06 | ||
![]() |
ecb00a95a0 | ||
![]() |
fe90d39943 | ||
![]() |
e2615a798e | ||
![]() |
ec6aff411a | ||
![]() |
01fcbd7063 | ||
![]() |
ff42b65fc9 | ||
![]() |
1e5eff918d | ||
![]() |
e55b78ba2d | ||
![]() |
e59674b5ac | ||
![]() |
f6e30b0b63 | ||
![]() |
5a1522deac | ||
![]() |
bfefc4139e | ||
![]() |
a105131b2b | ||
![]() |
2b104183f7 | ||
![]() |
23d8730d5b | ||
![]() |
a5dff6df87 | ||
![]() |
9e28099351 | ||
![]() |
790fa26953 | ||
![]() |
1c80697d29 | ||
![]() |
e345dfd637 | ||
![]() |
b2f9743f9f | ||
![]() |
aec402e77f | ||
![]() |
66dedc5b2e | ||
![]() |
844a605b5e | ||
![]() |
0417e1de59 | ||
![]() |
2c16162948 | ||
![]() |
07bbb003bb | ||
![]() |
aae373ef22 | ||
![]() |
e267244caa | ||
![]() |
c062d95354 | ||
![]() |
f6d8446c75 | ||
![]() |
bba9f9c980 | ||
![]() |
9e19e8d859 | ||
![]() |
898b5fa634 | ||
![]() |
3fda97f573 | ||
![]() |
60dfe056dd | ||
![]() |
20263073c6 | ||
![]() |
a6c2b2c026 | ||
![]() |
6330516630 | ||
![]() |
e7da6e42f7 | ||
![]() |
15afbc2dc9 | ||
![]() |
71627d8abf | ||
![]() |
5049b13d22 | ||
![]() |
301eb9017c | ||
![]() |
ca8981611a | ||
![]() |
c357ac93f3 | ||
![]() |
757574080c | ||
![]() |
bd638f0356 | ||
![]() |
b11efbbf0c | ||
![]() |
68b6cc9bd4 | ||
![]() |
d586a8450d | ||
![]() |
33bc8ba1a3 | ||
![]() |
865268e820 | ||
![]() |
e5ea435cbe | ||
![]() |
6b32d04aec | ||
![]() |
a0973090ee | ||
![]() |
4b6e4c60c2 | ||
![]() |
06783364c4 | ||
![]() |
d50af8afb6 | ||
![]() |
19da7bf453 | ||
![]() |
fb55a04f70 | ||
![]() |
a812e6ae27 | ||
![]() |
100dd467b9 | ||
![]() |
10ccf32435 | ||
![]() |
841caec3e6 | ||
![]() |
9715eaba36 | ||
![]() |
bc50efec5e | ||
![]() |
59ab2aa356 | ||
![]() |
25fd1a9d76 | ||
![]() |
bc7c086ca6 | ||
![]() |
783ff99163 | ||
![]() |
0f850f3327 | ||
![]() |
cdeb0473da | ||
![]() |
a81799fd07 | ||
![]() |
3e478a44b7 | ||
![]() |
89e458a9f6 | ||
![]() |
64628f7e0d | ||
![]() |
65a4099ac1 | ||
![]() |
4353c57cd0 | ||
![]() |
9add368161 | ||
![]() |
6076423907 | ||
![]() |
821b8ee3f0 | ||
![]() |
e4cdd73294 | ||
![]() |
ce010725ac | ||
![]() |
d819cf4396 | ||
![]() |
7b4d5f9aad | ||
![]() |
8a6db0dff0 | ||
![]() |
2c7e30ce21 | ||
![]() |
fb57b72eca | ||
![]() |
62a1443b75 | ||
![]() |
9f879d3850 | ||
![]() |
87f5b50201 | ||
![]() |
1ccdec290a | ||
![]() |
65d17e4784 | ||
![]() |
752951ce3b | ||
![]() |
33dddc697f | ||
![]() |
bb7f0cd3a5 | ||
![]() |
752eb4c57b | ||
![]() |
ded0079f24 | ||
![]() |
ed0fcd982c | ||
![]() |
04515591e2 | ||
![]() |
37455a8b6c | ||
![]() |
82fd9539b7 | ||
![]() |
52eabec70d | ||
![]() |
cad086c945 | ||
![]() |
6a49df59af | ||
![]() |
d224a2c47d | ||
![]() |
b72ce73931 | ||
![]() |
8f708d0e28 | ||
![]() |
67f9623cf4 | ||
![]() |
642816be04 | ||
![]() |
38c7988274 | ||
![]() |
fe8f79b750 | ||
![]() |
07e4e0cabb | ||
![]() |
73e0c1ffcf | ||
![]() |
9c3363d465 | ||
![]() |
33262795ba | ||
![]() |
2aaa32ae5f | ||
![]() |
25d8f6e323 | ||
![]() |
9ba00d6f20 | ||
![]() |
da2a9d3389 | ||
![]() |
1aef6ce1d6 | ||
![]() |
5bd99a1216 | ||
![]() |
1645acece4 | ||
![]() |
6b521e7505 | ||
![]() |
76b7340589 | ||
![]() |
1484464232 | ||
![]() |
64e65a6e8c | ||
![]() |
1b77530a31 | ||
![]() |
2eb120909b | ||
![]() |
26f4d1d329 | ||
![]() |
449c092bf9 | ||
![]() |
23dd7903ba | ||
![]() |
51c13b6fc8 | ||
![]() |
9d4eeb9c9f | ||
![]() |
fde2db85e7 | ||
![]() |
ebc7a7548e | ||
![]() |
45b6f251f3 | ||
![]() |
67cd8a989b | ||
![]() |
c71e7139ca | ||
![]() |
58612ce227 | ||
![]() |
b041601006 | ||
![]() |
1011468273 | ||
![]() |
1fad3cffc7 | ||
![]() |
c330e83095 | ||
![]() |
3b3fa4f643 | ||
![]() |
a6b45f777c | ||
![]() |
585bbec5d5 | ||
![]() |
4fd3df4f8a | ||
![]() |
33bdb69dca | ||
![]() |
28c8550ef5 | ||
![]() |
009da08177 | ||
![]() |
fa6e85d6db | ||
![]() |
ac720033dc | ||
![]() |
7b72a5f0c2 | ||
![]() |
e629d9edf0 | ||
![]() |
6257718377 | ||
![]() |
e516ae8653 | ||
![]() |
0ab4d903d9 | ||
![]() |
017e49aca0 | ||
![]() |
77b66a57b8 | ||
![]() |
2ba3f0b15e | ||
![]() |
f2c2fda9f2 | ||
![]() |
303d59e699 | ||
![]() |
3b8a075049 | ||
![]() |
e589e95083 | ||
![]() |
b52528d449 | ||
![]() |
7e827165e9 | ||
![]() |
fccfc93a10 | ||
![]() |
784f5c1808 | ||
![]() |
10f11a55ff | ||
![]() |
3104264cd4 | ||
![]() |
8dd132d7a7 | ||
![]() |
54e3eeb56d | ||
![]() |
9eaaab5dd0 | ||
![]() |
8d00d435c4 | ||
![]() |
0cb5b76159 | ||
![]() |
976ac7604b | ||
![]() |
d3de28d909 | ||
![]() |
59e5f71a73 | ||
![]() |
2581b66a18 | ||
![]() |
1cafe15d0d | ||
![]() |
6763df88bc | ||
![]() |
f7bb83013a | ||
![]() |
84df67c00b | ||
![]() |
2152bab717 | ||
![]() |
05232cdf2b | ||
![]() |
c08c2721ac | ||
![]() |
2547b1218f | ||
![]() |
0a005c2d95 | ||
![]() |
dda9c6ec09 | ||
![]() |
5b8cc3c9da | ||
![]() |
d9cd649aea | ||
![]() |
45fb5aa611 | ||
![]() |
13cbcd35ff | ||
![]() |
df08276440 | ||
![]() |
161fcb8e83 | ||
![]() |
fada1281a6 | ||
![]() |
6c7371e97f | ||
![]() |
96b60064db | ||
![]() |
6f360a6a2d | ||
![]() |
4a394a2a38 | ||
![]() |
da9e856369 | ||
![]() |
835aa2ef87 | ||
![]() |
3a5cf9c6c3 | ||
![]() |
efc8cad00f | ||
![]() |
993e109e1f | ||
![]() |
ed410d7e95 | ||
![]() |
40ee2af8ef | ||
![]() |
d3e9f87432 | ||
![]() |
18736d847f | ||
![]() |
eedaa2c120 | ||
![]() |
d4e6aa8660 | ||
![]() |
4d365936f2 | ||
![]() |
6655dec1ec | ||
![]() |
99d421caec | ||
![]() |
8d33d52174 | ||
![]() |
6a7c19ae4b | ||
![]() |
fc9eb1157b | ||
![]() |
31e2bd26ea | ||
![]() |
ec4ca74a97 | ||
![]() |
497f4fd8d4 | ||
![]() |
913c2cb44b | ||
![]() |
44889b1c6f | ||
![]() |
c83b6ff036 | ||
![]() |
e93e66d3e4 | ||
![]() |
19dcc1d47e | ||
![]() |
148cbce5d1 | ||
![]() |
a23c0ee237 | ||
![]() |
43630bb7b6 | ||
![]() |
234aae4d77 | ||
![]() |
453dee618b | ||
![]() |
7a1432a0a2 | ||
![]() |
3832851ef4 | ||
![]() |
3b00cc1080 | ||
![]() |
4c5b064cfb | ||
![]() |
426a0ac488 | ||
![]() |
fef5dd72b3 | ||
![]() |
217b72a332 | ||
![]() |
22e911cab2 | ||
![]() |
882d09ad8e | ||
![]() |
b4231dcf77 | ||
![]() |
9905693d73 | ||
![]() |
ef11340280 | ||
![]() |
660b87355a | ||
![]() |
1c8c5de570 | ||
![]() |
d4bb79ca18 | ||
![]() |
9c4e8a3e68 | ||
![]() |
8c70ee800b | ||
![]() |
40e805f90f | ||
![]() |
a719a2337a | ||
![]() |
26f6dc562b | ||
![]() |
0ed8c05e1c | ||
![]() |
693adc7cfc | ||
![]() |
3deef34f5b | ||
![]() |
425078dc4e | ||
![]() |
5c877f56e9 | ||
![]() |
e7ff564608 | ||
![]() |
04410485a5 | ||
![]() |
39c5c755d7 | ||
![]() |
c93ed03004 | ||
![]() |
bd43d959ab | ||
![]() |
930d8ef8e0 | ||
![]() |
bb84d86cf5 | ||
![]() |
9486ab5fa1 | ||
![]() |
abd0d696dc | ||
![]() |
74e85c79e7 | ||
![]() |
7c6ecf8e9e | ||
![]() |
ea8f24d410 | ||
![]() |
92ee89e8e5 | ||
![]() |
c7497cdf4e | ||
![]() |
6198314a37 | ||
![]() |
81fb382b9a | ||
![]() |
ae816815fc | ||
![]() |
87dc6be213 | ||
![]() |
ee36bab60b | ||
![]() |
89569d7989 | ||
![]() |
207e2ac9ae | ||
![]() |
09201b0d51 | ||
![]() |
1a816228e8 | ||
![]() |
ccf6f36ade | ||
![]() |
5cb22bb1d0 | ||
![]() |
b237c7f5cb | ||
![]() |
30c3e3db0c | ||
![]() |
39cdd1692a | ||
![]() |
93c6ab2684 | ||
![]() |
2ab1472f22 | ||
![]() |
a9febec691 | ||
![]() |
280d6d92ad | ||
![]() |
cddee3e1db | ||
![]() |
b7c4c737c1 | ||
![]() |
603e46283f | ||
![]() |
c17adef242 | ||
![]() |
bacd484832 | ||
![]() |
7eb0a47fca | ||
![]() |
cfa6d50583 | ||
![]() |
47db669191 | ||
![]() |
ab60ad2072 | ||
![]() |
f3eb5b8a86 | ||
![]() |
081c573653 | ||
![]() |
e22ed77527 | ||
![]() |
4eca7c062c | ||
![]() |
bef3d37802 | ||
![]() |
2ab52dad8e | ||
![]() |
6bd66910a9 | ||
![]() |
51e9acf9ff | ||
![]() |
cfecf0ff62 | ||
![]() |
1bea5f8e6c | ||
![]() |
c55ad832c7 | ||
![]() |
49809da1fb | ||
![]() |
d98ae341fd | ||
![]() |
d634903d0d | ||
![]() |
ddafda33b8 | ||
![]() |
7ee4fd5b06 | ||
![]() |
b90f8e1b49 | ||
![]() |
2a92215d82 | ||
![]() |
d03b3c3a48 | ||
![]() |
5ac126250e | ||
![]() |
a1919a7a1f | ||
![]() |
dfae913dea | ||
![]() |
627d8097ac | ||
![]() |
f758d6250c | ||
![]() |
f0b4a56ed5 | ||
![]() |
23bc4b286b | ||
![]() |
c5c9abebde | ||
![]() |
3cd5432034 | ||
![]() |
49b329edb1 | ||
![]() |
8dc777fc46 | ||
![]() |
beb05b26ce | ||
![]() |
2e55f4b47f | ||
![]() |
08fe8beaf9 | ||
![]() |
e7430b9c1a | ||
![]() |
d9080d1427 | ||
![]() |
a561879eb4 | ||
![]() |
3053e401b6 | ||
![]() |
264bc289aa | ||
![]() |
4543285a9d | ||
![]() |
88fd0b0094 | ||
![]() |
56321e6da8 | ||
![]() |
4b9ea2f084 | ||
![]() |
86ea2dc5cb | ||
![]() |
43d4122bc5 | ||
![]() |
65b8ba34e6 | ||
![]() |
57f8660ff1 | ||
![]() |
f646f0a350 | ||
![]() |
e87da70191 | ||
![]() |
4f24f2d12f | ||
![]() |
24b7d38fe9 | ||
![]() |
d32d12b3e9 | ||
![]() |
44fdc49e26 | ||
![]() |
bc5b969c4c | ||
![]() |
600474a092 | ||
![]() |
610bd32869 | ||
![]() |
059da40c64 | ||
![]() |
6f7c64e8ca | ||
![]() |
1b99ffbf58 | ||
![]() |
36195a9ed1 | ||
![]() |
03bf6a9fc3 | ||
![]() |
d784a28ddb | ||
![]() |
7e97dbbe81 | ||
![]() |
7f85a1eaa1 | ||
![]() |
b170333030 | ||
![]() |
ce1dc46857 | ||
![]() |
a145851330 | ||
![]() |
7cfbeb241b | ||
![]() |
74c0c3ad37 | ||
![]() |
2eaa6b8977 | ||
![]() |
95d0767137 | ||
![]() |
d0daf9cf49 | ||
![]() |
e1619e6a6b | ||
![]() |
a157f9f09f | ||
![]() |
c9996564c8 | ||
![]() |
e3be0cd794 | ||
![]() |
ac3bccc67d | ||
![]() |
b2d46190cb | ||
![]() |
b80aad1baa | ||
![]() |
16bda200c0 | ||
![]() |
2d44c988e4 | ||
![]() |
08e7bdebbc | ||
![]() |
532da9d21f | ||
![]() |
5abba52204 | ||
![]() |
dc73f85458 | ||
![]() |
e5748dd7a4 | ||
![]() |
ac1adefeec | ||
![]() |
6fd8d4eef4 | ||
![]() |
6eb407ff3b | ||
![]() |
43f7586564 | ||
![]() |
2c152e632b | ||
![]() |
98ad7a84d5 | ||
![]() |
9a686b36f1 | ||
![]() |
1592763f8a | ||
![]() |
f750259c50 | ||
![]() |
047b4629bf | ||
![]() |
1244f23522 | ||
![]() |
372444c50a | ||
![]() |
9e3c02e1f3 | ||
![]() |
20e67030a9 | ||
![]() |
9e79c42a9e | ||
![]() |
acd8cbed50 | ||
![]() |
5275f8d13f | ||
![]() |
c3eaf8bd6f | ||
![]() |
53c6e89486 | ||
![]() |
1bfd68bd34 | ||
![]() |
9410114be3 | ||
![]() |
5a7ebd4ba9 | ||
![]() |
3741c08230 | ||
![]() |
dc6dd9e056 | ||
![]() |
5a3b0c6d78 | ||
![]() |
1ffb0f94a2 | ||
![]() |
83dcc618e0 | ||
![]() |
9d6af0a538 | ||
![]() |
3459bf68cb | ||
![]() |
e713092c85 | ||
![]() |
ab7bded221 | ||
![]() |
14a6894540 | ||
![]() |
bcb70d54dd | ||
![]() |
92b695e6ba | ||
![]() |
299693dfc3 | ||
![]() |
5a02217b45 | ||
![]() |
946a3afde8 | ||
![]() |
68348a5fff | ||
![]() |
b29a12dce3 | ||
![]() |
34b9124bde | ||
![]() |
6181adccae | ||
![]() |
1babb96a1c | ||
![]() |
b0900d5aa9 | ||
![]() |
6644714bb7 | ||
![]() |
93f9341387 | ||
![]() |
5bb6f6d34c | ||
![]() |
8d93f22767 | ||
![]() |
2b1b9d83d7 | ||
![]() |
7fb4755aba | ||
![]() |
e8379db987 | ||
![]() |
0bdb5742e0 | ||
![]() |
1dcc5d1ec5 | ||
![]() |
b158c5c2a2 | ||
![]() |
0920a21876 | ||
![]() |
2e1b1489b6 | ||
![]() |
181ea6d7c9 | ||
![]() |
1f909dc6ea | ||
![]() |
d674bcc390 | ||
![]() |
e181e854cc | ||
![]() |
ad8dd8b648 | ||
![]() |
a74cd848fe | ||
![]() |
dfe2d4580e | ||
![]() |
12d67ec315 | ||
![]() |
7f1e267b2d | ||
![]() |
8c88f7052a | ||
![]() |
a8115b7201 | ||
![]() |
7e19686e8d | ||
![]() |
e9db8d821e | ||
![]() |
72246bdc60 | ||
![]() |
9c2b12ead8 | ||
![]() |
b1392ff009 | ||
![]() |
479e1be216 | ||
![]() |
696ce32ab4 | ||
![]() |
63a5217f6b | ||
![]() |
a1fcc2e3ba | ||
![]() |
77c245ae53 | ||
![]() |
9a2b794c8e | ||
![]() |
5e2809d14c | ||
![]() |
cacb1f9e44 | ||
![]() |
3ad1f6e69c | ||
![]() |
4bb1baf638 | ||
![]() |
9033e020ee | ||
![]() |
68d27e59bb | ||
![]() |
2044f7b2d5 | ||
![]() |
1321b7b8a9 | ||
![]() |
3352a966f3 | ||
![]() |
e6ce751279 | ||
![]() |
dac4d4a713 | ||
![]() |
47e89426d9 | ||
![]() |
f749ade52c | ||
![]() |
03147f5bdd | ||
![]() |
a759fc58de | ||
![]() |
26e02639d0 | ||
![]() |
533da6624f | ||
![]() |
db695d134f | ||
![]() |
aee7f0f899 | ||
![]() |
fa601fcbb4 | ||
![]() |
2cf3682473 | ||
![]() |
0d36bcec2e | ||
![]() |
f9fa586060 | ||
![]() |
0bf1521d56 | ||
![]() |
0657517915 | ||
![]() |
f7063d4eaf | ||
![]() |
3db6aba02b | ||
![]() |
4de3c58e06 | ||
![]() |
005936b18d | ||
![]() |
1975c63ad1 | ||
![]() |
b709ee0300 | ||
![]() |
680d6c9416 | ||
![]() |
ecb0de7374 | ||
![]() |
4af88997e8 | ||
![]() |
86ae3e4d47 | ||
![]() |
704cc06f16 | ||
![]() |
5619d6bc4c | ||
![]() |
e30bfffbf0 | ||
![]() |
db4ea14289 | ||
![]() |
e74dc22077 | ||
![]() |
673c758fc8 | ||
![]() |
7884de94e0 | ||
![]() |
9ddfa27d0c | ||
![]() |
8fee4e348c | ||
![]() |
169ae41d49 | ||
![]() |
7cd82e542b | ||
![]() |
6388613948 | ||
![]() |
34a4f5b597 | ||
![]() |
7cf7749367 | ||
![]() |
101a3d70ce | ||
![]() |
adcc6f564d | ||
![]() |
e9d6a6c35c | ||
![]() |
1443e5b3e1 | ||
![]() |
ba2570b83b | ||
![]() |
7ac14daf46 | ||
![]() |
caed26d191 | ||
![]() |
5c0c559685 | ||
![]() |
9079a968f0 | ||
![]() |
3df66e0257 | ||
![]() |
be36175bb8 | ||
![]() |
d0265eb3f6 | ||
![]() |
5479cc6274 | ||
![]() |
db891f2f16 | ||
![]() |
543cc42bf3 | ||
![]() |
2ad9a44b99 | ||
![]() |
ecd2275e1b | ||
![]() |
f904c0f67d | ||
![]() |
64855c9cf8 | ||
![]() |
9a7b242827 | ||
![]() |
cfc3269e5d | ||
![]() |
e46c801554 | ||
![]() |
ab7d6d44fc | ||
![]() |
7be3f1fada | ||
![]() |
46f1d3677d | ||
![]() |
e13b0e3e13 | ||
![]() |
144b455eae | ||
![]() |
c6a3794a76 | ||
![]() |
bd8659ac11 | ||
![]() |
5636db84a8 | ||
![]() |
5621b84284 | ||
![]() |
35cc7a8096 | ||
![]() |
a4e2c47c51 | ||
![]() |
7a60cd9aaf | ||
![]() |
2a98199471 | ||
![]() |
28fc092410 | ||
![]() |
976ed6bb0a | ||
![]() |
86f21de0a6 | ||
![]() |
b262a3d0f2 | ||
![]() |
d9167262dd | ||
![]() |
68608a1a8c | ||
![]() |
d7ff9c3ec0 | ||
![]() |
a7b822ffce | ||
![]() |
389e6bc28c | ||
![]() |
6671c776b3 | ||
![]() |
8e1736f608 | ||
![]() |
c1cc9ba2d6 | ||
![]() |
b4d932a91b | ||
![]() |
b0356c58fb | ||
![]() |
75655f1bb8 | ||
![]() |
c2d3d8b216 | ||
![]() |
b543b32a37 | ||
![]() |
a012e4cea2 | ||
![]() |
968c5bda71 | ||
![]() |
7aba69edd6 | ||
![]() |
f9911ce5ba | ||
![]() |
59ba031b1f | ||
![]() |
70a38ea0fb | ||
![]() |
6f6a4994ba | ||
![]() |
a1bbd32315 | ||
![]() |
7a03713783 | ||
![]() |
dfd698c914 | ||
![]() |
a80b324f1f | ||
![]() |
75981cf46e | ||
![]() |
48d74ee2cd | ||
![]() |
bae0442ede | ||
![]() |
5e9cca1399 | ||
![]() |
c3273c8d5e | ||
![]() |
cd6fda20be | ||
![]() |
7611635ad0 | ||
![]() |
9badd4a4b6 | ||
![]() |
5e5c627b8b | ||
![]() |
9e985cf2d4 | ||
![]() |
813d644b32 | ||
![]() |
2b466bb382 | ||
![]() |
55ab43f132 | ||
![]() |
0e5b924f42 | ||
![]() |
f131ae2f6b | ||
![]() |
2369b27178 | ||
![]() |
69f618e856 | ||
![]() |
4cd55d6669 | ||
![]() |
d12d0faf09 | ||
![]() |
85e486438a | ||
![]() |
a0e3c41be6 | ||
![]() |
e6a7fb852a | ||
![]() |
cf877f44d8 | ||
![]() |
2f94f49c06 | ||
![]() |
64596c306e | ||
![]() |
3306d0d699 | ||
![]() |
b9c712c72f | ||
![]() |
7f1ddcc41c | ||
![]() |
bf9590c1e6 | ||
![]() |
884238bc12 | ||
![]() |
e2a84b2145 | ||
![]() |
035ae803e2 | ||
![]() |
c5b395802c | ||
![]() |
3e01912eb2 | ||
![]() |
48f70f42ed | ||
![]() |
4bd6071071 | ||
![]() |
aa9d2490d1 | ||
![]() |
8cc999e81e | ||
![]() |
dadba96975 | ||
![]() |
57d3a3a769 | ||
![]() |
01d09810ba | ||
![]() |
bbc93291ea | ||
![]() |
2643a459b6 | ||
![]() |
eeaac8965b | ||
![]() |
62006c00ca | ||
![]() |
762bc8ce8c | ||
![]() |
4aed1b6056 | ||
![]() |
df24a63a46 | ||
![]() |
161daffcc0 | ||
![]() |
876d94e124 | ||
![]() |
fec4aa6df1 | ||
![]() |
f975e1da89 | ||
![]() |
5887d03504 | ||
![]() |
dd93a10007 | ||
![]() |
85f1ba2176 | ||
![]() |
3d057bb1b2 | ||
![]() |
8fb4772b6c | ||
![]() |
a207fb51e9 | ||
![]() |
8a16597b69 | ||
![]() |
6a2c7d09d6 | ||
![]() |
eadbcdbe14 | ||
![]() |
be99cc5c23 | ||
![]() |
a230eee76d | ||
![]() |
6a8095d456 | ||
![]() |
79f3a3116e | ||
![]() |
8481604b1e | ||
![]() |
cc5b841a65 | ||
![]() |
d8b426d745 | ||
![]() |
3f4bf7ce0f | ||
![]() |
374a9ae14e | ||
![]() |
d85124c121 | ||
![]() |
1773a75e98 | ||
![]() |
a11bfc80ad | ||
![]() |
cf54af2c22 | ||
![]() |
a8e5b26744 | ||
![]() |
6c0514ab48 | ||
![]() |
80c953fb81 | ||
![]() |
c4dfed0e02 | ||
![]() |
ad7bbb85cb | ||
![]() |
bc84bc867b | ||
![]() |
98c49231b4 | ||
![]() |
73d39abfe5 | ||
![]() |
3658ad1ec0 | ||
![]() |
e54b1ce274 | ||
![]() |
9565f9b9ee | ||
![]() |
052b6a9bdd | ||
![]() |
0f5a50a868 | ||
![]() |
dcf03fbe07 | ||
![]() |
a2193a186a | ||
![]() |
751d689ff6 | ||
![]() |
dfa74e0505 | ||
![]() |
cf5ac335ca | ||
![]() |
0cff856bf5 | ||
![]() |
fe7d2a8a7e | ||
![]() |
cbd681d440 | ||
![]() |
531968cf1a | ||
![]() |
5ffd405ba6 | ||
![]() |
c2e9d5453a | ||
![]() |
edc738ae39 | ||
![]() |
ff322e2ae1 | ||
![]() |
46b241eda5 | ||
![]() |
f244d388be | ||
![]() |
59fd32ac68 | ||
![]() |
2a145cdc4a | ||
![]() |
6b081ee470 | ||
![]() |
48ec0cdc34 | ||
![]() |
af7b14851c | ||
![]() |
aed97c9dcc | ||
![]() |
3664512e27 | ||
![]() |
26dcb6b8b0 | ||
![]() |
7a63ef2ea5 | ||
![]() |
27eeefae5f | ||
![]() |
1b17879d7a | ||
![]() |
8a5181a9a3 | ||
![]() |
bcaa73a161 | ||
![]() |
1565a1dc32 | ||
![]() |
83615a1c90 | ||
![]() |
214a77a65c | ||
![]() |
c1fa52ee64 | ||
![]() |
29c1b51073 | ||
![]() |
35946dcf7c | ||
![]() |
a0c4ff4509 | ||
![]() |
c933e87707 | ||
![]() |
f49bdcd8c8 | ||
![]() |
e45b6af26d | ||
![]() |
cd51baa5f1 | ||
![]() |
99100371b8 | ||
![]() |
e6a02bcbea | ||
![]() |
fca5700012 | ||
![]() |
ed5ac47f88 | ||
![]() |
ee83beae94 | ||
![]() |
2380d4e751 | ||
![]() |
debc2325cd | ||
![]() |
2249464abf | ||
![]() |
35d29c8425 | ||
![]() |
e987c35450 | ||
![]() |
83a44ba924 | ||
![]() |
e2dc89c737 | ||
![]() |
c249afdb3f | ||
![]() |
7ade453218 | ||
![]() |
c419dd608b | ||
![]() |
4a7ebeea16 | ||
![]() |
d3e87c68fd | ||
![]() |
1209b40ac9 | ||
![]() |
f65d6c5775 | ||
![]() |
685e6d83c5 | ||
![]() |
80e1daeb65 | ||
![]() |
eb5aadaf8a | ||
![]() |
aec970f9d1 | ||
![]() |
e7d050d3eb | ||
![]() |
0928dc1ca9 | ||
![]() |
5a609d5bb1 | ||
![]() |
9fd3c2d734 | ||
![]() |
58c5d742b7 | ||
![]() |
363356b47c | ||
![]() |
a9da80caae | ||
![]() |
7966efcaf2 | ||
![]() |
74c52bc5ab | ||
![]() |
593e67fe72 | ||
![]() |
f7706760cd | ||
![]() |
a0cd26ef54 | ||
![]() |
8cda55a92e | ||
![]() |
779ff47260 | ||
![]() |
d7869f408e | ||
![]() |
0ef2db146b | ||
![]() |
93659a1be3 | ||
![]() |
83dc069673 | ||
![]() |
45875f13c4 | ||
![]() |
16943fef16 | ||
![]() |
81675b7a3a | ||
![]() |
3626cdf699 | ||
![]() |
3e0404c817 | ||
![]() |
8f70d3da25 | ||
![]() |
1a9d68c260 | ||
![]() |
a737719468 | ||
![]() |
ba05b22fae | ||
![]() |
8144d1bb9e | ||
![]() |
202e765b43 | ||
![]() |
2def01b8c2 | ||
![]() |
4d5910981a | ||
![]() |
5e24ed1fb6 | ||
![]() |
286de02158 | ||
![]() |
d959a28d0b | ||
![]() |
350cbea6d5 | ||
![]() |
98d9f639f7 | ||
![]() |
9d98d1a9aa | ||
![]() |
b5c00dd7d9 | ||
![]() |
f03ed89687 | ||
![]() |
c74c178533 | ||
![]() |
36f07604ae | ||
![]() |
257850001d | ||
![]() |
f00eae6760 | ||
![]() |
576aece31d | ||
![]() |
d11e4170fd | ||
![]() |
3894c87ba2 | ||
![]() |
fbf2aee48f | ||
![]() |
10df0ac366 | ||
![]() |
f3619ff4d8 | ||
![]() |
e29a6a3c0a | ||
![]() |
da1789aece | ||
![]() |
c6f984b4cb | ||
![]() |
ee33b8f9cc | ||
![]() |
ce3285c1f2 | ||
![]() |
74ac315b58 | ||
![]() |
84c88a118f | ||
![]() |
7fc54ec6f7 | ||
![]() |
b55686e187 | ||
![]() |
680ed3bccf | ||
![]() |
4ee1c83073 | ||
![]() |
5ddfca71a1 | ||
![]() |
ab4d32a04e | ||
![]() |
9dec50ee1e | ||
![]() |
e73139d977 | ||
![]() |
91b8829ee4 | ||
![]() |
fa95f56be0 | ||
![]() |
d42d275b9e | ||
![]() |
8d459e7c9f | ||
![]() |
e561d1a469 | ||
![]() |
4e05a5c310 | ||
![]() |
ea3970cfb5 | ||
![]() |
88e145c0a9 | ||
![]() |
027a4e5d41 | ||
![]() |
d3019e4006 | ||
![]() |
8152d39ad0 | ||
![]() |
b17cc5d3c3 | ||
![]() |
70f0af6611 | ||
![]() |
5f922c06e0 | ||
![]() |
7dea5f7d98 | ||
![]() |
9aa63d063d | ||
![]() |
ef4496fd21 | ||
![]() |
dc3bf37521 | ||
![]() |
aca752a01e | ||
![]() |
81b89f5d0c | ||
![]() |
4c05c0ca64 | ||
![]() |
1c1497422b | ||
![]() |
c659061ff0 | ||
![]() |
843056d960 | ||
![]() |
5b20be26fd | ||
![]() |
078dcbb707 | ||
![]() |
3a5e309d38 | ||
![]() |
b00470aca0 | ||
![]() |
c9ecc560ee | ||
![]() |
a06c925b8a | ||
![]() |
5e4b78f4bb | ||
![]() |
d697d0f7a7 | ||
![]() |
27ee094310 | ||
![]() |
3b4e0d51cd | ||
![]() |
332be2bdb2 | ||
![]() |
b22ba6f3ef | ||
![]() |
297562249a | ||
![]() |
0eb2d5ce58 | ||
![]() |
0945021378 | ||
![]() |
b5d301e53c | ||
![]() |
a1f17dcf31 | ||
![]() |
bde12bab38 | ||
![]() |
b6df0c9a5c | ||
![]() |
b2a155386d | ||
![]() |
2d48cc0f69 | ||
![]() |
4527349dcf | ||
![]() |
0291942613 | ||
![]() |
c75f1f031a | ||
![]() |
43745d830b | ||
![]() |
63c76644c1 | ||
![]() |
04bbaf9cb9 | ||
![]() |
9c2909933c | ||
![]() |
d09f5297a1 | ||
![]() |
d9d39b0cb5 | ||
![]() |
a862d84738 | ||
![]() |
973fd339da | ||
![]() |
3351615140 | ||
![]() |
f61e8652d7 | ||
![]() |
54d99a84c9 | ||
![]() |
655813a8af | ||
![]() |
a0515c4121 | ||
![]() |
fd2bc90ae2 | ||
![]() |
0946958ebc | ||
![]() |
9d7aa07c1d | ||
![]() |
ee7e8358e7 | ||
![]() |
c4b1956a26 | ||
![]() |
288c75851e | ||
![]() |
52f80faf00 | ||
![]() |
174aa0e50f | ||
![]() |
690b934e18 | ||
![]() |
fd7fb5de37 | ||
![]() |
ad6a9438de | ||
![]() |
93d10aaf2f | ||
![]() |
8075734744 | ||
![]() |
06556df0a9 | ||
![]() |
85a3578458 | ||
![]() |
7a24bf2c7f | ||
![]() |
d5a375ee65 | ||
![]() |
19f688185d | ||
![]() |
5101677d9a | ||
![]() |
9135c6318d | ||
![]() |
e630f85f26 | ||
![]() |
2e53204820 | ||
![]() |
84b32b70a5 | ||
![]() |
69c4686e04 | ||
![]() |
d7270de2b9 | ||
![]() |
f719fde602 | ||
![]() |
92dcffcba1 | ||
![]() |
45c018f5f6 | ||
![]() |
cddceadea1 | ||
![]() |
56ba23fc3d | ||
![]() |
6c2d541b89 | ||
![]() |
bfd61b2f19 | ||
![]() |
1858671a21 | ||
![]() |
e7db991c7a | ||
![]() |
e7f235a90b | ||
![]() |
ce2abfe584 | ||
![]() |
8553c277ec | ||
![]() |
30584c8bee | ||
![]() |
54abc3d5d5 | ||
![]() |
a6e3bc3e41 | ||
![]() |
2c259f5ae9 | ||
![]() |
7e864d27b4 | ||
![]() |
b10563ea53 | ||
![]() |
7d5ae8e209 | ||
![]() |
d31e17894c | ||
![]() |
351abaa5c2 | ||
![]() |
d4239833d5 | ||
![]() |
3c665a736d | ||
![]() |
6657b46a6b | ||
![]() |
1a498f8104 | ||
![]() |
6cb4faa8d3 | ||
![]() |
fa0ec0bf0c | ||
![]() |
703945c804 | ||
![]() |
43071da3eb | ||
![]() |
2c20833410 | ||
![]() |
84069055f5 | ||
![]() |
11fad8d3ce | ||
![]() |
02e1e28ed2 | ||
![]() |
8c60a67e8e | ||
![]() |
d252108f85 | ||
![]() |
3ba8019872 | ||
![]() |
c7489d123e | ||
![]() |
f7f279c5ed | ||
![]() |
1efa88641b | ||
![]() |
35b83cc168 | ||
![]() |
4fca4de1e1 | ||
![]() |
65ce727157 | ||
![]() |
73279f43c2 | ||
![]() |
8af91b28ec | ||
![]() |
73b5d776da | ||
![]() |
b08b6cca8c | ||
![]() |
941dbe2871 | ||
![]() |
f4fe2b8632 | ||
![]() |
3800021ed3 | ||
![]() |
8eec2cdccb | ||
![]() |
f195484674 | ||
![]() |
5f4a049fdd | ||
![]() |
4ff15ec9bb | ||
![]() |
6c5b2c478a | ||
![]() |
4bb6012cc1 | ||
![]() |
ddbcfa0268 | ||
![]() |
e2c886c9a4 | ||
![]() |
c616c2b0ab | ||
![]() |
1bd8db517f | ||
![]() |
27ba5bf131 | ||
![]() |
c6ee4a477f | ||
![]() |
b00ce65e8b | ||
![]() |
b0431f3abe | ||
![]() |
bdea9a6d71 | ||
![]() |
5a62342251 | ||
![]() |
bb770ba65b | ||
![]() |
115cdd6090 | ||
![]() |
ef89e3a9e3 | ||
![]() |
1d8d3b3c27 | ||
![]() |
c5448fe252 | ||
![]() |
2af168bd54 | ||
![]() |
e26ab86dd3 | ||
![]() |
eec1071f06 | ||
![]() |
ecacd14410 | ||
![]() |
7e600bef57 | ||
![]() |
583dc1f368 | ||
![]() |
4de99ba19d | ||
![]() |
6306776f8b | ||
![]() |
531d328663 | ||
![]() |
6cecd0abbe | ||
![]() |
b49216c173 | ||
![]() |
b7f3711de1 | ||
![]() |
33764f4caa | ||
![]() |
961e15fe5f | ||
![]() |
a94cbe17c1 | ||
![]() |
ca6bde3048 | ||
![]() |
1baa5cec26 | ||
![]() |
c3a26ea89e | ||
![]() |
6610ccc8c1 | ||
![]() |
6695cf44fa | ||
![]() |
da8a73ba0b | ||
![]() |
5e3d0fbdef | ||
![]() |
e5e3d59b3e | ||
![]() |
c06cd98a2e | ||
![]() |
a705067aed | ||
![]() |
4e783e76d1 | ||
![]() |
28bd6a5fe6 | ||
![]() |
a3b6aef66a | ||
![]() |
5b2966cf48 | ||
![]() |
77081e80c3 | ||
![]() |
9277908f77 | ||
![]() |
9a5cbba888 | ||
![]() |
f7a2e76cad | ||
![]() |
a0e23bd5d9 | ||
![]() |
e95d5bd73e | ||
![]() |
5f6b6ef984 | ||
![]() |
e06b67fd73 | ||
![]() |
f5f40c3dc7 | ||
![]() |
105547598f | ||
![]() |
a5595015e6 | ||
![]() |
a23cdfbc2b | ||
![]() |
78e5f66144 | ||
![]() |
087c203f72 | ||
![]() |
a62397673e | ||
![]() |
735a3af254 | ||
![]() |
3036e72c4c | ||
![]() |
4eacdfb113 | ||
![]() |
fbb97167d6 | ||
![]() |
2d881c9621 | ||
![]() |
31508ed5eb | ||
![]() |
3895d26d0b | ||
![]() |
e9b39ff106 | ||
![]() |
8615c70ccc | ||
![]() |
93f1ae0b49 | ||
![]() |
8990a2d132 | ||
![]() |
f4eb8876c2 | ||
![]() |
eb7a93a12f | ||
![]() |
69eedf4015 | ||
![]() |
ff31c302e2 | ||
![]() |
7b554a48f9 | ||
![]() |
c088ccb32e | ||
![]() |
1990120fa0 | ||
![]() |
1444271e69 | ||
![]() |
09bf25a233 | ||
![]() |
9580b29491 | ||
![]() |
5fe6dfb949 | ||
![]() |
ebb846f2a9 | ||
![]() |
983e955398 | ||
![]() |
36266dffef | ||
![]() |
53fb9f85fc | ||
![]() |
2d9ad8e5cf | ||
![]() |
3cedeffec9 | ||
![]() |
cc975bb0b5 | ||
![]() |
a0e7e2c617 | ||
![]() |
16210365be | ||
![]() |
66e1a2488b | ||
![]() |
a0260f5267 | ||
![]() |
2d28dfc6e6 | ||
![]() |
31ab05f4fe | ||
![]() |
813db7cc9f | ||
![]() |
0d3db9f19d | ||
![]() |
1f4700cb91 | ||
![]() |
27c57d6f4e | ||
![]() |
3f7e273597 | ||
![]() |
6d1e6f90fc | ||
![]() |
8ee375016f | ||
![]() |
f1706e24c2 | ||
![]() |
33b59c739d | ||
![]() |
2d81a487d3 | ||
![]() |
df8f0db784 | ||
![]() |
950038e6df | ||
![]() |
769210bef2 | ||
![]() |
7d5e499f21 | ||
![]() |
cbee67cd4b | ||
![]() |
5580c81ff7 | ||
![]() |
73be8a972c | ||
![]() |
5f5f6da067 | ||
![]() |
be817b0ab6 | ||
![]() |
bedfe02f65 | ||
![]() |
227d47154c | ||
![]() |
4a70382072 | ||
![]() |
c687d3ff5d | ||
![]() |
491a61b8b1 | ||
![]() |
8c6df7ac8e | ||
![]() |
8c35ca86c8 | ||
![]() |
7993020463 | ||
![]() |
8b3010be0c | ||
![]() |
2843659416 | ||
![]() |
a77d80946b | ||
![]() |
a3a298f51e | ||
![]() |
c332600633 | ||
![]() |
f1b397fc11 | ||
![]() |
25e2e291cb | ||
![]() |
970b19bf01 | ||
![]() |
975e9fd356 | ||
![]() |
61e52cd2ab | ||
![]() |
89e4d3b9da | ||
![]() |
99384a7060 | ||
![]() |
6cab13a876 | ||
![]() |
da439000ac | ||
![]() |
f8a8b90556 | ||
![]() |
7b374f7a32 | ||
![]() |
14dbced218 | ||
![]() |
9053489ddd | ||
![]() |
f7c9058e50 | ||
![]() |
f65b96412a | ||
![]() |
088e56fb8a | ||
![]() |
1b38f2d25d | ||
![]() |
e0fb590b02 | ||
![]() |
8ea7a2572a | ||
![]() |
3edb663b21 | ||
![]() |
432692edc8 | ||
![]() |
dfc304f9aa | ||
![]() |
d1890e0253 | ||
![]() |
66832eeb28 | ||
![]() |
83b67149a6 | ||
![]() |
ba1eee27b3 | ||
![]() |
bb055e12fb | ||
![]() |
242043b3f8 | ||
![]() |
170c7ac6cc | ||
![]() |
c2ddaf286d | ||
![]() |
071fa370bf | ||
![]() |
eeb562dd14 | ||
![]() |
479adf6519 | ||
![]() |
96748b9bac | ||
![]() |
84e4cc01cc | ||
![]() |
d95574df6f | ||
![]() |
40b4df6354 | ||
![]() |
7a364fddeb | ||
![]() |
d9a5f324a5 | ||
![]() |
fdafa0f034 | ||
![]() |
d55b0c0dd3 | ||
![]() |
30c025c5c1 | ||
![]() |
75718bf3ec | ||
![]() |
36fa4d4cae | ||
![]() |
1aa6d358bb | ||
![]() |
5e59403779 | ||
![]() |
6ff9edaa8b | ||
![]() |
876ecb1d12 | ||
![]() |
9bd154792a | ||
![]() |
d43c44e911 | ||
![]() |
8467bb7c0a | ||
![]() |
01719822c1 | ||
![]() |
ffbe407d83 | ||
![]() |
202c84c484 | ||
![]() |
6ac2e9a95d | ||
![]() |
daff8a4594 | ||
![]() |
36c95db7bf | ||
![]() |
4a236906eb | ||
![]() |
ae8e0f9ae8 | ||
![]() |
0aadcdfdd9 | ||
![]() |
a658bf4531 | ||
![]() |
4541788a34 | ||
![]() |
c44fce9e0f | ||
![]() |
cb59c05baf | ||
![]() |
d75b158ee1 | ||
![]() |
1c50dbf4c6 | ||
![]() |
ce3eb76190 | ||
![]() |
6dac7ceec4 | ||
![]() |
3454ca99f3 | ||
![]() |
dd5a167d0d | ||
![]() |
9f3ee32858 | ||
![]() |
3ae9c8e9f8 | ||
![]() |
3c9cb4e3b6 | ||
![]() |
f80d1fdc68 | ||
![]() |
4bf8944c48 | ||
![]() |
2b0f0f627e | ||
![]() |
b7b1c3e582 | ||
![]() |
488958c251 | ||
![]() |
26c234e36c | ||
![]() |
55e742fbfb | ||
![]() |
0be17bb0ed | ||
![]() |
aa7496e41d | ||
![]() |
bc5262f5f7 | ||
![]() |
07a91222c4 | ||
![]() |
b06bece1cb | ||
![]() |
053844a7bc | ||
![]() |
7129d6b9c8 | ||
![]() |
ae35461516 | ||
![]() |
a250de49a0 | ||
![]() |
13775e53de | ||
![]() |
e9c5340f67 | ||
![]() |
861132d04d | ||
![]() |
a7517d6814 | ||
![]() |
971c07632a | ||
![]() |
45840c1c17 | ||
![]() |
91d72c19dd | ||
![]() |
5301a8fc51 | ||
![]() |
27d00d133a | ||
![]() |
6447c3769b | ||
![]() |
ebb99c813a | ||
![]() |
e1fe4031e5 | ||
![]() |
65860b81b1 | ||
![]() |
dabc0e9b4b | ||
![]() |
2530845b9b | ||
![]() |
f055ff6fbd | ||
![]() |
e4b098e64d | ||
![]() |
679702bb5a | ||
![]() |
f8e0cc6808 | ||
![]() |
45ab7231a0 | ||
![]() |
c794e1ebde | ||
![]() |
7d49666865 | ||
![]() |
7e6f736b2f | ||
![]() |
b43e99518d | ||
![]() |
7a5694347a | ||
![]() |
92f2a77dae | ||
![]() |
57c2b02277 | ||
![]() |
fde0ebf872 | ||
![]() |
4aa3158f33 | ||
![]() |
3768dc030e | ||
![]() |
27286998f7 | ||
![]() |
d8b6e86896 | ||
![]() |
47537a019c | ||
![]() |
8e59b7d0b0 | ||
![]() |
f72725ceed | ||
![]() |
e2c2174bf7 | ||
![]() |
de1a240140 | ||
![]() |
b12bdfdd22 | ||
![]() |
971c302378 | ||
![]() |
b758d0a5f9 | ||
![]() |
78f1d9f763 | ||
![]() |
90dc0e3f61 | ||
![]() |
fd10fbe2a8 | ||
![]() |
3b11ac517c | ||
![]() |
a1090fbb0d | ||
![]() |
4239d37a38 | ||
![]() |
a87a5f9b5e | ||
![]() |
777fc571b0 | ||
![]() |
dc92bbd80a | ||
![]() |
d503e4db07 | ||
![]() |
bba7fe2f74 | ||
![]() |
ed8e280aa4 | ||
![]() |
2dfa075423 | ||
![]() |
43137fe676 | ||
![]() |
d05438dc3e | ||
![]() |
25cb0455e2 | ||
![]() |
badf00258c | ||
![]() |
8166c2ebfa | ||
![]() |
4c693a1294 | ||
![]() |
85922433a5 | ||
![]() |
3caac21648 | ||
![]() |
f26b265e64 | ||
![]() |
89c88ca6e0 | ||
![]() |
e3f1fa39d5 | ||
![]() |
49efc4175d | ||
![]() |
48e9817245 | ||
![]() |
a9c3008cee | ||
![]() |
8efc401811 | ||
![]() |
9518f70b42 | ||
![]() |
2f5c3b1267 | ||
![]() |
bb16983029 | ||
![]() |
5b1438f09f | ||
![]() |
510968b0c6 | ||
![]() |
8718bd0df6 | ||
![]() |
7d2fdb7598 | ||
![]() |
6c6afbf148 | ||
![]() |
d95d5753b4 | ||
![]() |
2178e0e6a3 | ||
![]() |
77f3b97e46 | ||
![]() |
203b0bbbaf | ||
![]() |
781de6e998 | ||
![]() |
6fefbe129d | ||
![]() |
3add551bde | ||
![]() |
51f48b31dc | ||
![]() |
b2adc42aaf | ||
![]() |
f2dab663ca | ||
![]() |
0f09920cb1 | ||
![]() |
41faa5ee52 | ||
![]() |
d920567f8a | ||
![]() |
85694ec285 | ||
![]() |
3ce4603328 | ||
![]() |
9cff5e9c34 | ||
![]() |
0fdfecd973 | ||
![]() |
9dc0363337 | ||
![]() |
d96c048874 | ||
![]() |
865f4899b2 | ||
![]() |
b350916fe3 | ||
![]() |
381254a16e | ||
![]() |
8506d36dbf | ||
![]() |
0366e8b934 | ||
![]() |
eba7683f6b | ||
![]() |
5a0018d4fa | ||
![]() |
17dc120ca1 | ||
![]() |
8eb2e2ce80 | ||
![]() |
b2b9fb8bf9 | ||
![]() |
9d9d90ab9c | ||
![]() |
ccd7056a87 | ||
![]() |
c50dd1a3e9 | ||
![]() |
8b3bc90864 | ||
![]() |
9f99555c64 | ||
![]() |
eb4633557d | ||
![]() |
effa19f719 | ||
![]() |
835891fe59 | ||
![]() |
ff55646c62 | ||
![]() |
972c1098cb | ||
![]() |
59fc3e5635 | ||
![]() |
60b310e216 | ||
![]() |
b9cc5ba824 | ||
![]() |
f072ae74af | ||
![]() |
e2d014d0a6 | ||
![]() |
ab579da614 | ||
![]() |
05c978bc62 | ||
![]() |
95c635c451 | ||
![]() |
3e48e5903e | ||
![]() |
63fa8f39f5 | ||
![]() |
138e163fa8 | ||
![]() |
ac743c5138 | ||
![]() |
37803e9330 | ||
![]() |
8b5cd79bdc | ||
![]() |
949e55235a | ||
![]() |
5173ac3704 | ||
![]() |
9335c32334 | ||
![]() |
b0d3710454 | ||
![]() |
e0849af926 | ||
![]() |
b076b98996 | ||
![]() |
cc0501f340 | ||
![]() |
6b204b5b53 | ||
![]() |
3bf7d819de | ||
![]() |
67fc0054c1 | ||
![]() |
d4493cb534 | ||
![]() |
682ec2b678 | ||
![]() |
20f5f17aac | ||
![]() |
f1a7f36f17 | ||
![]() |
5d700d5563 | ||
![]() |
c11a3b1372 | ||
![]() |
be0512d74e | ||
![]() |
2d0d6ddc5d | ||
![]() |
b2cae3b48d | ||
![]() |
5f19b6a26a | ||
![]() |
d880b728ce | ||
![]() |
e7490340f8 | ||
![]() |
fed70c5e9b | ||
![]() |
f08d74b269 | ||
![]() |
f2f5156065 | ||
![]() |
0ed96d893d | ||
![]() |
2137720602 | ||
![]() |
12a19378f7 | ||
![]() |
75c81b712e | ||
![]() |
4e0a889fa1 | ||
![]() |
9a7277065f | ||
![]() |
16a10548b8 | ||
![]() |
4187847ad0 | ||
![]() |
77bb3ed952 | ||
![]() |
023f8a6900 | ||
![]() |
0be04c754a | ||
![]() |
07b95c2634 | ||
![]() |
e9efb50e02 | ||
![]() |
868229460f | ||
![]() |
9d593b657b | ||
![]() |
0b43109a29 | ||
![]() |
07a2f3bbbb | ||
![]() |
fc28693b12 | ||
![]() |
77d2086796 | ||
![]() |
8dd0db094e | ||
![]() |
33a5dd3e7f | ||
![]() |
9a9311e02a | ||
![]() |
2fec884072 | ||
![]() |
4a0bf8a7af | ||
![]() |
53f5ceabee | ||
![]() |
8f8a3acba7 | ||
![]() |
dbb7917058 | ||
![]() |
7ec57988b8 | ||
![]() |
3300f72621 | ||
![]() |
77f52df047 | ||
![]() |
79ce4e9ec2 | ||
![]() |
73cffe990a | ||
![]() |
b94f0a9b69 | ||
![]() |
5d5582e2d2 | ||
![]() |
5e52233cf3 | ||
![]() |
9ed13f31ff | ||
![]() |
bc1ed9a96f | ||
![]() |
57ebe88994 | ||
![]() |
96b3423ed1 | ||
![]() |
fc7aa27706 | ||
![]() |
1c4be7d1fe | ||
![]() |
9f468c2c11 | ||
![]() |
69100f0a24 | ||
![]() |
d32303bf47 | ||
![]() |
91789a698f | ||
![]() |
1d4a36e3b8 | ||
![]() |
790e717199 | ||
![]() |
c8ac260b78 | ||
![]() |
9f95eb452c | ||
![]() |
970c449b30 | ||
![]() |
3b568f7d32 | ||
![]() |
5de6cedf5e | ||
![]() |
9c69a77d43 | ||
![]() |
db29263eb1 | ||
![]() |
5b59d37e2f | ||
![]() |
38752d9d71 | ||
![]() |
92d25dd2a8 | ||
![]() |
65fff9361c | ||
![]() |
b83a8421a3 | ||
![]() |
714652ebb0 | ||
![]() |
c3f424dae4 | ||
![]() |
6758b4c4c7 | ||
![]() |
bd78acd559 | ||
![]() |
30aa34d1c0 | ||
![]() |
9c3e3d9c29 | ||
![]() |
62ccd18345 | ||
![]() |
5ab87ec6c3 | ||
![]() |
63e792990f | ||
![]() |
526da8cddf | ||
![]() |
02eb618c5f | ||
![]() |
5a839c2906 | ||
![]() |
ab23613b79 | ||
![]() |
c93a64db83 | ||
![]() |
038e31ccd1 | ||
![]() |
984c9bfc2a | ||
![]() |
be6dbdec66 |
@@ -25,4 +25,6 @@ npm-debug.log.*
|
||||
|
||||
# Webpack files
|
||||
webpack.records.json
|
||||
package-lock.json
|
||||
|
||||
# Yarn no longer used
|
||||
yarn.lock
|
||||
|
@@ -15,6 +15,10 @@ trim_trailing_whitespace = false
|
||||
|
||||
[*.ts]
|
||||
quote_type = single
|
||||
ij_typescript_enforce_trailing_comma = whenmultiline
|
||||
|
||||
[*.js]
|
||||
ij_javascript_enforce_trailing_comma = whenmultiline
|
||||
|
||||
[*.json5]
|
||||
ij_json_keep_blank_lines_in_code = 3
|
||||
|
@@ -12,7 +12,6 @@
|
||||
"eslint-plugin-rxjs",
|
||||
"eslint-plugin-simple-import-sort",
|
||||
"eslint-plugin-import-newlines",
|
||||
"eslint-plugin-jsonc",
|
||||
"dspace-angular-ts",
|
||||
"dspace-angular-html"
|
||||
],
|
||||
@@ -161,10 +160,14 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"@angular-eslint/prefer-standalone": [
|
||||
"error"
|
||||
],
|
||||
"@angular-eslint/no-attribute-decorator": "error",
|
||||
"@angular-eslint/no-output-native": "warn",
|
||||
"@angular-eslint/no-output-on-prefix": "warn",
|
||||
"@angular-eslint/no-conflicting-lifecycle": "warn",
|
||||
"@angular-eslint/use-lifecycle-interface": "error",
|
||||
|
||||
"@typescript-eslint/no-inferrable-types":[
|
||||
"error",
|
||||
@@ -260,9 +263,48 @@
|
||||
"rxjs/no-nested-subscribe": "off", // todo: go over _all_ cases
|
||||
|
||||
// Custom DSpace Angular rules
|
||||
"dspace-angular-ts/alias-imports": [
|
||||
"error",
|
||||
{
|
||||
"aliases": [
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "of",
|
||||
"local": "of"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"dspace-angular-ts/themed-component-classes": "error",
|
||||
"dspace-angular-ts/themed-component-selectors": "error",
|
||||
"dspace-angular-ts/themed-component-usages": "error"
|
||||
"dspace-angular-ts/themed-component-usages": "error",
|
||||
"dspace-angular-ts/themed-decorators": [
|
||||
"off",
|
||||
{
|
||||
"decorators": {
|
||||
"listableObjectComponent": 3,
|
||||
"rendersSectionForMenu": 2
|
||||
}
|
||||
}
|
||||
],
|
||||
"dspace-angular-ts/themed-wrapper-no-input-defaults": "error",
|
||||
"dspace-angular-ts/unique-decorators": [
|
||||
"off",
|
||||
{
|
||||
"decorators": [
|
||||
"listableObjectComponent"
|
||||
]
|
||||
}
|
||||
],
|
||||
"dspace-angular-ts/sort-standalone-imports": [
|
||||
"error",
|
||||
{
|
||||
"locale": "en-US",
|
||||
"maxItems": 0,
|
||||
"indent": 2,
|
||||
"trailingComma": true
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -292,7 +334,9 @@
|
||||
],
|
||||
"rules": {
|
||||
// Custom DSpace Angular rules
|
||||
"dspace-angular-html/themed-component-usages": "error"
|
||||
"dspace-angular-html/themed-component-usages": "error",
|
||||
"dspace-angular-html/no-disabled-attribute-on-button": "error",
|
||||
"@angular-eslint/template/prefer-control-flow": "error"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -300,10 +344,13 @@
|
||||
"*.json5"
|
||||
],
|
||||
"extends": [
|
||||
"plugin:jsonc/recommended-with-jsonc"
|
||||
"plugin:jsonc/recommended-with-json5"
|
||||
],
|
||||
"rules": {
|
||||
"no-irregular-whitespace": "error",
|
||||
// The ESLint core no-irregular-whitespace rule doesn't work well in JSON
|
||||
// See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html
|
||||
"no-irregular-whitespace": "off",
|
||||
"jsonc/no-irregular-whitespace": "error",
|
||||
"no-trailing-spaces": "error",
|
||||
"jsonc/comma-dangle": [
|
||||
"error",
|
||||
|
8
.github/ISSUE_TEMPLATE/bug_report.md
vendored
8
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -7,16 +7,16 @@ assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
## Describe the bug
|
||||
A clear and concise description of what the bug is. Include the version(s) of DSpace where you've seen this problem & what *web browser* you were using. Link to examples if they are public.
|
||||
|
||||
**To Reproduce**
|
||||
## To Reproduce
|
||||
Steps to reproduce the behavior:
|
||||
1. Do this
|
||||
2. Then this...
|
||||
|
||||
**Expected behavior**
|
||||
## Expected behavior
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Related work**
|
||||
## Related work
|
||||
Link to any related tickets or PRs here.
|
||||
|
12
.github/ISSUE_TEMPLATE/feature_request.md
vendored
12
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -7,14 +7,14 @@ assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
## Is your feature request related to a problem? Please describe.
|
||||
A clear and concise description of what the problem or use case is. For example, I'm always frustrated when [...]
|
||||
|
||||
**Describe the solution you'd like**
|
||||
## Describe the solution you'd like
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
**Describe alternatives or workarounds you've considered**
|
||||
## Describe alternatives or workarounds you've considered
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
**Additional context**
|
||||
Add any other context or screenshots about the feature request here.
|
||||
## Additional information
|
||||
Add any other information, related tickets or screenshots about the feature request here.
|
||||
|
298
.github/dependabot.yml
vendored
Normal file
298
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,298 @@
|
||||
#-------------------
|
||||
# DSpace's dependabot rules. Enables npm updates for all dependencies on a weekly basis
|
||||
# for main and any maintenance branches. Security updates only apply to main.
|
||||
#-------------------
|
||||
version: 2
|
||||
updates:
|
||||
###############
|
||||
## Main branch
|
||||
###############
|
||||
# NOTE: At this time, "security-updates" rules only apply if "target-branch" is unspecified
|
||||
# So, only this first section can include "applies-to: security-updates"
|
||||
- package-ecosystem: "npm"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
# Allow up to 10 open PRs for dependencies
|
||||
open-pull-requests-limit: 10
|
||||
# Group together Angular package upgrades
|
||||
groups:
|
||||
# Group together all minor/patch version updates for Angular in a single PR
|
||||
angular:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@angular*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all security updates for Angular. Only accept minor/patch types.
|
||||
angular-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "@angular*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all minor/patch version updates for NgRx in a single PR
|
||||
ngrx:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@ngrx*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all security updates for NgRx. Only accept minor/patch types.
|
||||
ngrx-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "@ngrx*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all patch version updates for eslint in a single PR
|
||||
eslint:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@typescript-eslint*"
|
||||
- "eslint*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all security updates for eslint.
|
||||
eslint-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "@typescript-eslint*"
|
||||
- "eslint*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any testing related version updates
|
||||
testing:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@cypress*"
|
||||
- "axe-*"
|
||||
- "cypress*"
|
||||
- "jasmine*"
|
||||
- "karma*"
|
||||
- "ng-mocks"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any testing related security updates
|
||||
testing-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "@cypress*"
|
||||
- "axe-*"
|
||||
- "cypress*"
|
||||
- "jasmine*"
|
||||
- "karma*"
|
||||
- "ng-mocks"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any postcss related version updates
|
||||
postcss:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "postcss*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any postcss related security updates
|
||||
postcss-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "postcss*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any sass related version updates
|
||||
sass:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "sass*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any sass related security updates
|
||||
sass-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "sass*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any webpack related version updates
|
||||
webpack:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "webpack*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any webpack related seurity updates
|
||||
webpack-security:
|
||||
applies-to: security-updates
|
||||
patterns:
|
||||
- "webpack*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
ignore:
|
||||
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
|
||||
- dependency-name: "*"
|
||||
update-types: ["version-update:semver-major"]
|
||||
#####################
|
||||
## dspace-8_x branch
|
||||
#####################
|
||||
- package-ecosystem: "npm"
|
||||
directory: "/"
|
||||
target-branch: dspace-8_x
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
# Allow up to 10 open PRs for dependencies
|
||||
open-pull-requests-limit: 10
|
||||
# Group together Angular package upgrades
|
||||
groups:
|
||||
# Group together all patch version updates for Angular in a single PR
|
||||
angular:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@angular*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all minor/patch version updates for NgRx in a single PR
|
||||
ngrx:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@ngrx*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all patch version updates for eslint in a single PR
|
||||
eslint:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@typescript-eslint*"
|
||||
- "eslint*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any testing related version updates
|
||||
testing:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@cypress*"
|
||||
- "axe-*"
|
||||
- "cypress*"
|
||||
- "jasmine*"
|
||||
- "karma*"
|
||||
- "ng-mocks"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any postcss related version updates
|
||||
postcss:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "postcss*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any sass related version updates
|
||||
sass:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "sass*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any webpack related version updates
|
||||
webpack:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "webpack*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
ignore:
|
||||
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
|
||||
- dependency-name: "*"
|
||||
update-types: ["version-update:semver-major"]
|
||||
#####################
|
||||
## dspace-7_x branch
|
||||
#####################
|
||||
- package-ecosystem: "npm"
|
||||
directory: "/"
|
||||
target-branch: dspace-7_x
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
# Allow up to 10 open PRs for dependencies
|
||||
open-pull-requests-limit: 10
|
||||
# Group together Angular package upgrades
|
||||
groups:
|
||||
# Group together all minor/patch version updates for Angular in a single PR
|
||||
angular:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@angular*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all minor/patch version updates for NgRx in a single PR
|
||||
ngrx:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@ngrx*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together all patch version updates for eslint in a single PR
|
||||
eslint:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@typescript-eslint*"
|
||||
- "eslint*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any testing related version updates
|
||||
testing:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "@cypress*"
|
||||
- "axe-*"
|
||||
- "cypress*"
|
||||
- "jasmine*"
|
||||
- "karma*"
|
||||
- "ng-mocks"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any postcss related version updates
|
||||
postcss:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "postcss*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
# Group together any sass related version updates
|
||||
sass:
|
||||
applies-to: version-updates
|
||||
patterns:
|
||||
- "sass*"
|
||||
update-types:
|
||||
- "minor"
|
||||
- "patch"
|
||||
ignore:
|
||||
# 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
|
||||
# See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
|
||||
- dependency-name: "webpack"
|
||||
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
|
||||
- dependency-name: "*"
|
||||
update-types: ["version-update:semver-major"]
|
21
.github/pull_request_template.md
vendored
21
.github/pull_request_template.md
vendored
@@ -1,7 +1,7 @@
|
||||
## References
|
||||
_Add references/links to any related issues or PRs. These may include:_
|
||||
* Fixes #`issue-number` (if this fixes an issue ticket)
|
||||
* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
|
||||
* Fixes #issue-number (if this fixes an issue ticket)
|
||||
* Requires DSpace/DSpace#pr-number (if a REST API PR is required to test this)
|
||||
|
||||
## Description
|
||||
Short summary of changes (1-2 sentences).
|
||||
@@ -16,13 +16,18 @@ List of changes in this PR:
|
||||
**Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes.
|
||||
|
||||
## Checklist
|
||||
_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
|
||||
_This checklist provides a reminder of what we are going to look for when reviewing your PR. You do not need to complete this checklist prior creating your PR (draft PRs are always welcome).
|
||||
However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
|
||||
|
||||
- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
|
||||
- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
|
||||
- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
|
||||
- [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
|
||||
- [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
|
||||
- [ ] My PR is **created against the `main` branch** of code (unless it is a backport or is fixing an issue specific to an older branch).
|
||||
- [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
|
||||
- [ ] My PR **passes [ESLint](https://eslint.org/)** validation using `npm run lint`
|
||||
- [ ] My PR **doesn't introduce circular dependencies** (verified via `npm run check-circ-deps`)
|
||||
- [ ] My PR **includes [TypeDoc](https://typedoc.org/) comments** for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
|
||||
- [ ] My PR **passes all specs/tests and includes new/updated specs or tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
|
||||
- [ ] My PR **aligns with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)** if it makes changes to the user interface.
|
||||
- [ ] My PR **uses i18n (internationalization) keys** instead of hardcoded English text, to allow for translations.
|
||||
- [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
|
||||
- [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
|
||||
- [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
|
||||
- [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
|
||||
|
159
.github/workflows/build.yml
vendored
159
.github/workflows/build.yml
vendored
@@ -8,6 +8,7 @@ on: [push, pull_request]
|
||||
|
||||
permissions:
|
||||
contents: read # to fetch code (actions/checkout)
|
||||
packages: read # to fetch private images from GitHub Container Registry (GHCR)
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
@@ -28,6 +29,8 @@ jobs:
|
||||
DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0
|
||||
# Tell Cypress to run e2e tests using the same UI URL
|
||||
CYPRESS_BASE_URL: http://127.0.0.1:4000
|
||||
# Disable the cookie consent banner in e2e tests to avoid errors because of elements hidden by it
|
||||
DSPACE_INFO_ENABLECOOKIECONSENTPOPUP: false
|
||||
# When Chrome version is specified, we pin to a specific version of Chrome
|
||||
# Comment this out to use the latest release
|
||||
#CHROME_VERSION: "90.0.4430.212-1"
|
||||
@@ -35,6 +38,9 @@ jobs:
|
||||
NODE_OPTIONS: '--max-old-space-size=4096'
|
||||
# Project name to use when running "docker compose" prior to e2e tests
|
||||
COMPOSE_PROJECT_NAME: 'ci'
|
||||
# Docker Registry to use for Docker compose scripts below.
|
||||
# We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
|
||||
DOCKER_REGISTRY: ghcr.io
|
||||
strategy:
|
||||
# Create a matrix of Node versions to test against (in parallel)
|
||||
matrix:
|
||||
@@ -69,39 +75,39 @@ jobs:
|
||||
fi
|
||||
google-chrome --version
|
||||
|
||||
# https://github.com/actions/cache/blob/main/examples.md#node---yarn
|
||||
- name: Get Yarn cache directory
|
||||
id: yarn-cache-dir-path
|
||||
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
||||
- name: Cache Yarn dependencies
|
||||
# https://github.com/actions/cache/blob/main/examples.md#node---npm
|
||||
- name: Get NPM cache directory
|
||||
id: npm-cache-dir
|
||||
run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
|
||||
- name: Cache NPM dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
# Cache entire Yarn cache directory (see previous step)
|
||||
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
|
||||
# Cache key is hash of yarn.lock. Therefore changes to yarn.lock will invalidate cache
|
||||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
||||
restore-keys: ${{ runner.os }}-yarn-
|
||||
# Cache entire NPM cache directory (see previous step)
|
||||
path: ${{ steps.npm-cache-dir.outputs.dir }}
|
||||
# Cache key is hash of package-lock.json. Therefore changes to package-lock.json will invalidate cache
|
||||
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: ${{ runner.os }}-npm-
|
||||
|
||||
- name: Install Yarn dependencies
|
||||
run: yarn install --frozen-lockfile
|
||||
- name: Install NPM dependencies
|
||||
run: npm clean-install
|
||||
|
||||
- name: Build lint plugins
|
||||
run: yarn run build:lint
|
||||
run: npm run build:lint
|
||||
|
||||
- name: Run lint plugin tests
|
||||
run: yarn run test:lint:nobuild
|
||||
run: npm run test:lint:nobuild
|
||||
|
||||
- name: Run lint
|
||||
run: yarn run lint:nobuild --quiet
|
||||
run: npm run lint:nobuild -- --quiet
|
||||
|
||||
- name: Check for circular dependencies
|
||||
run: yarn run check-circ-deps
|
||||
run: npm run check-circ-deps
|
||||
|
||||
- name: Run build
|
||||
run: yarn run build:prod
|
||||
run: npm run build:prod
|
||||
|
||||
- name: Run specs (unit tests)
|
||||
run: yarn run test:headless
|
||||
run: npm run test:headless
|
||||
|
||||
# Upload code coverage report to artifact (for one version of Node only),
|
||||
# so that it can be shared with the 'codecov' job (see below)
|
||||
@@ -114,6 +120,14 @@ jobs:
|
||||
path: 'coverage/dspace-angular/lcov.info'
|
||||
retention-days: 14
|
||||
|
||||
# Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
|
||||
- name: Login to ${{ env.DOCKER_REGISTRY }}
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.DOCKER_REGISTRY }}
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# Using "docker compose" start backend using CI configuration
|
||||
# and load assetstore from a cached copy
|
||||
- name: Start DSpace REST Backend via Docker (for e2e tests)
|
||||
@@ -131,7 +145,7 @@ jobs:
|
||||
# Run tests in Chrome, headless mode (default)
|
||||
browser: chrome
|
||||
# Start app before running tests (will be stopped automatically after tests finish)
|
||||
start: yarn run serve:ssr
|
||||
start: npm run serve:ssr
|
||||
# Wait for backend & frontend to be available
|
||||
# NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
|
||||
wait-on: http://127.0.0.1:8080/server/api/core/sites, http://127.0.0.1:4000
|
||||
@@ -167,7 +181,7 @@ jobs:
|
||||
# Start up the app with SSR enabled (run in background)
|
||||
- name: Start app in SSR (server-side rendering) mode
|
||||
run: |
|
||||
nohup yarn run serve:ssr &
|
||||
nohup npm run serve:ssr &
|
||||
printf 'Waiting for app to start'
|
||||
until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
|
||||
printf '.'
|
||||
@@ -178,12 +192,115 @@ jobs:
|
||||
# Get homepage and verify that the <meta name="title"> tag includes "DSpace".
|
||||
# If it does, then SSR is working, as this tag is created by our MetadataService.
|
||||
# This step also prints entire HTML of homepage for easier debugging if grep fails.
|
||||
- name: Verify SSR (server-side rendering)
|
||||
- name: Verify SSR (server-side rendering) on Homepage
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/home)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
|
||||
|
||||
# Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
|
||||
# If it does, then SSR is working.
|
||||
- name: Verify SSR on a Community page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
|
||||
|
||||
# Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (the collection name).
|
||||
# If it does, then SSR is working.
|
||||
- name: Verify SSR on a Collection page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
|
||||
|
||||
# Get a specific publication in our test data and verify that the <meta name="title"> tag includes
|
||||
# the title of this publication. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Publication page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
|
||||
|
||||
# Get a specific person in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the person. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Person page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
|
||||
|
||||
# Get a specific project in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the project. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Project page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
|
||||
|
||||
# Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the orgunit. If it does, then SSR is working.
|
||||
- name: Verify SSR on an OrgUnit page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
|
||||
|
||||
# Get a specific journal in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the journal. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Journal page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental & Architectural Phenomenology"
|
||||
|
||||
# Get a specific journal volume in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the volume. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Journal Volume page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental & Architectural Phenomenology Volume 28 (2017)"
|
||||
|
||||
# Get a specific journal issue in our test data and verify that the <meta name="title"> tag includes
|
||||
# the name of the issue. If it does, then SSR is working.
|
||||
- name: Verify SSR on a Journal Issue page
|
||||
run: |
|
||||
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b)
|
||||
echo "$result"
|
||||
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental & Architectural Phenomenology Vol. 28, No. 1"
|
||||
|
||||
# Verify 301 Handle redirect behavior
|
||||
# Note: /handle/123456789/260 is the same test Publication used by our e2e tests
|
||||
- name: Verify 301 redirect from '/handle' URLs
|
||||
run: |
|
||||
result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}')
|
||||
echo "$result"
|
||||
[[ "$result" -eq "301" ]]
|
||||
|
||||
# Verify 403 error code behavior
|
||||
- name: Verify 403 error code from '/403'
|
||||
run: |
|
||||
result=$(wget --server-response --quiet http://127.0.0.1:4000/403 2>&1 | head -1 | awk '{print $2}')
|
||||
echo "$result"
|
||||
[[ "$result" -eq "403" ]]
|
||||
|
||||
# Verify 404 error code behavior
|
||||
- name: Verify 404 error code from '/404' and on invalid pages
|
||||
run: |
|
||||
result=$(wget --server-response --quiet http://127.0.0.1:4000/404 2>&1 | head -1 | awk '{print $2}')
|
||||
echo "$result"
|
||||
result2=$(wget --server-response --quiet http://127.0.0.1:4000/invalidurl 2>&1 | head -1 | awk '{print $2}')
|
||||
echo "$result2"
|
||||
[[ "$result" -eq "404" && "$result2" -eq "404" ]]
|
||||
|
||||
# Verify 500 error code behavior
|
||||
- name: Verify 500 error code from '/500'
|
||||
run: |
|
||||
result=$(wget --server-response --quiet http://127.0.0.1:4000/500 2>&1 | head -1 | awk '{print $2}')
|
||||
echo "$result"
|
||||
[[ "$result" -eq "500" ]]
|
||||
|
||||
- name: Stop running app
|
||||
run: kill -9 $(lsof -t -i:4000)
|
||||
|
||||
|
1
.github/workflows/docker.yml
vendored
1
.github/workflows/docker.yml
vendored
@@ -17,6 +17,7 @@ on:
|
||||
|
||||
permissions:
|
||||
contents: read # to fetch code (actions/checkout)
|
||||
packages: write # to write images to GitHub Container Registry (GHCR)
|
||||
|
||||
jobs:
|
||||
#############################################################
|
||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@@ -28,12 +28,12 @@ webpack.records.json
|
||||
|
||||
morgan.log
|
||||
|
||||
# Yarn no longer used
|
||||
yarn.lock
|
||||
yarn-error.log
|
||||
|
||||
*.css
|
||||
|
||||
package-lock.json
|
||||
|
||||
.java-version
|
||||
|
||||
.env
|
||||
|
@@ -10,7 +10,7 @@ DSpace is a community built and supported project. We do not have a centralized
|
||||
## Contribute new code via a Pull Request
|
||||
|
||||
We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
|
||||
Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
|
||||
Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC8x/Release+Notes).
|
||||
|
||||
Code Contribution Checklist
|
||||
- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
|
||||
@@ -18,6 +18,9 @@ Code Contribution Checklist
|
||||
- [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
|
||||
- [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
|
||||
- [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
|
||||
- [ ] User interface changes **must** align with [Accessibility guidelines](https://wiki.lyrasis.org/display/DSDOC8x/Accessibility)
|
||||
- [ ] PRs **must** use i18n (internationalization) keys instead of hardcoded English text, to allow for translations.
|
||||
- [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
|
||||
- [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
|
||||
- [ ] Basic technical documentation _should_ be provided for any new features or configuration, either in the PR itself or in the DSpace Wiki documentation.
|
||||
- [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
|
||||
@@ -26,7 +29,7 @@ Additional details on the code contribution process can be found in our [Code Co
|
||||
|
||||
## Contribute documentation
|
||||
|
||||
DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x
|
||||
DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC
|
||||
|
||||
If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
|
||||
Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
|
||||
@@ -34,7 +37,7 @@ Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyra
|
||||
## Help others on mailing lists or Slack
|
||||
|
||||
DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
|
||||
Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
|
||||
Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via Lyrasis).
|
||||
|
||||
## Join a working or interest group
|
||||
|
||||
@@ -42,5 +45,5 @@ Most of the work in building/improving DSpace comes via [Working Groups](https:/
|
||||
|
||||
All working/interest groups are open to anyone to join and participate. A few key groups to be aware of include:
|
||||
|
||||
* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
|
||||
* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
|
||||
* [DSpace Developer Team](https://wiki.lyrasis.org/display/DSPACE/Developer+Meetings) - This is the primary, volunteer development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs. This is also were discussions of the next release or major issues occur. Anyone is welcome to attend.
|
||||
* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers. Anyone is welcome to attend.
|
||||
|
10
Dockerfile
10
Dockerfile
@@ -1,7 +1,7 @@
|
||||
# This image will be published as dspace/dspace-angular
|
||||
# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
|
||||
|
||||
FROM node:18-alpine
|
||||
FROM docker.io/node:18-alpine
|
||||
|
||||
# Ensure Python and other build tools are available
|
||||
# These are needed to install some node modules, especially on linux/arm64
|
||||
@@ -11,9 +11,7 @@ WORKDIR /app
|
||||
ADD . /app/
|
||||
EXPOSE 4000
|
||||
|
||||
# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
|
||||
# See, for example https://github.com/yarnpkg/yarn/issues/5540
|
||||
RUN yarn install --network-timeout 300000
|
||||
RUN npm install
|
||||
|
||||
# When running in dev mode, 4GB of memory is required to build & launch the app.
|
||||
# This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
|
||||
@@ -24,5 +22,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
|
||||
# Listen / accept connections from all IP addresses.
|
||||
# NOTE: At this time it is only possible to run Docker container in Production mode
|
||||
# if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
|
||||
ENV NODE_ENV development
|
||||
CMD yarn serve --host 0.0.0.0
|
||||
ENV NODE_ENV=development
|
||||
CMD npm run serve -- --host 0.0.0.0
|
||||
|
@@ -4,18 +4,18 @@
|
||||
# Test build:
|
||||
# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
|
||||
|
||||
FROM node:18-alpine as build
|
||||
FROM docker.io/node:18-alpine AS build
|
||||
|
||||
# Ensure Python and other build tools are available
|
||||
# These are needed to install some node modules, especially on linux/arm64
|
||||
RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
|
||||
|
||||
WORKDIR /app
|
||||
COPY package.json yarn.lock ./
|
||||
RUN yarn install --network-timeout 300000
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm install
|
||||
|
||||
ADD . /app/
|
||||
RUN yarn build:prod
|
||||
RUN npm run build:prod
|
||||
|
||||
FROM node:18-alpine
|
||||
RUN npm install --global pm2
|
||||
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
|
||||
|
||||
WORKDIR /app
|
||||
USER node
|
||||
ENV NODE_ENV production
|
||||
ENV NODE_ENV=production
|
||||
EXPOSE 4000
|
||||
CMD pm2-runtime start dspace-ui.json --json
|
||||
|
82
README.md
82
README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
|
||||
Quick start
|
||||
-----------
|
||||
|
||||
**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
|
||||
**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x`**
|
||||
|
||||
```bash
|
||||
# clone the repo
|
||||
@@ -45,10 +45,10 @@ git clone https://github.com/DSpace/dspace-angular.git
|
||||
cd dspace-angular
|
||||
|
||||
# install the local dependencies
|
||||
yarn install
|
||||
npm install
|
||||
|
||||
# start the server
|
||||
yarn start
|
||||
npm start
|
||||
```
|
||||
|
||||
Then go to [http://localhost:4000](http://localhost:4000) in your browser
|
||||
@@ -77,7 +77,7 @@ Table of Contents
|
||||
- [Recommended Editors/IDEs](#recommended-editorsides)
|
||||
- [Collaborating](#collaborating)
|
||||
- [File Structure](#file-structure)
|
||||
- [Managing Dependencies (via yarn)](#managing-dependencies-via-yarn)
|
||||
- [Managing Dependencies (via npm)](#managing-dependencies-via-npm)
|
||||
- [Frequently asked questions](#frequently-asked-questions)
|
||||
- [License](#license)
|
||||
|
||||
@@ -89,15 +89,15 @@ You can find more information on the technologies used in this project (Angular.
|
||||
Requirements
|
||||
------------
|
||||
|
||||
- [Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
|
||||
- Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.x`
|
||||
- [Node.js](https://nodejs.org)
|
||||
- Ensure you're running node `v18.x` or `v20.x`
|
||||
|
||||
If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
|
||||
|
||||
Installing
|
||||
----------
|
||||
|
||||
- `yarn install` to install the local dependencies
|
||||
- `npm install` to install the local dependencies
|
||||
|
||||
### Configuring
|
||||
|
||||
@@ -202,7 +202,7 @@ import { environment } from '../environment.ts';
|
||||
Running the app
|
||||
---------------
|
||||
|
||||
After you have installed all dependencies you can now run the app. Run `yarn run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
|
||||
After you have installed all dependencies you can now run the app. Run `npm run start:dev` to start a local server which will watch for changes, rebuild the code, and reload the server for you. You can visit it at `http://localhost:4000`.
|
||||
|
||||
### Running in production mode
|
||||
|
||||
@@ -211,20 +211,20 @@ When building for production we're using Ahead of Time (AoT) compilation. With A
|
||||
To build the app for production and start the server (in one command) run:
|
||||
|
||||
```bash
|
||||
yarn start
|
||||
npm start
|
||||
```
|
||||
This will run the application in an instance of the Express server, which is included.
|
||||
|
||||
If you only want to build for production, without starting, run:
|
||||
|
||||
```bash
|
||||
yarn run build:prod
|
||||
npm run build:prod
|
||||
```
|
||||
This will build the application and put the result in the `dist` folder. You can copy this folder to wherever you need it for your application server. If you will be using the built-in Express server, you'll also need a copy of the `node_modules` folder tucked inside your copy of `dist`.
|
||||
|
||||
After building the app for production, it can be started by running:
|
||||
```bash
|
||||
yarn run serve:ssr
|
||||
npm run serve:ssr
|
||||
```
|
||||
|
||||
### Running the application with Docker
|
||||
@@ -238,14 +238,14 @@ Cleaning
|
||||
--------
|
||||
|
||||
```bash
|
||||
# clean everything, including node_modules. You'll need to run yarn install again afterwards.
|
||||
yarn run clean
|
||||
# clean everything, including node_modules. You'll need to run npm install again afterwards.
|
||||
npm run clean
|
||||
|
||||
# clean files generated by the production build (.ngfactory files, css files, etc)
|
||||
yarn run clean:prod
|
||||
npm run clean:prod
|
||||
|
||||
# cleans the distribution directory
|
||||
yarn run clean:dist
|
||||
npm run clean:dist
|
||||
```
|
||||
|
||||
|
||||
@@ -259,9 +259,9 @@ If you would like to contribute by testing a Pull Request (PR), here's how to do
|
||||
1. Pull down the branch that the Pull Request was built from. Easy instructions for doing so can be found on the Pull Request itself.
|
||||
* Next to the "Merge" button, you'll see a link that says "command line instructions".
|
||||
* Click it, and follow "Step 1" of those instructions to checkout the pull down the PR branch.
|
||||
2. `yarn run clean` (This resets your local dependencies to ensure you are up-to-date with this PR)
|
||||
3. `yarn install` (Updates your local dependencies to those in the PR)
|
||||
4. `yarn start` (Rebuilds the project, and deploys to localhost:4000, by default)
|
||||
2. `npm run clean` (This resets your local dependencies to ensure you are up-to-date with this PR)
|
||||
3. `npm install` (Updates your local dependencies to those in the PR)
|
||||
4. `npm start` (Rebuilds the project, and deploys to localhost:4000, by default)
|
||||
5. At this point, the code from the PR will be deployed to http://localhost:4000. Test it out, and ensure that it does what is described in the PR (or fixes the bug described in the ticket linked to the PR).
|
||||
|
||||
Once you have tested the Pull Request, please add a comment and/or approval to the PR to let us know whether you found it to be successful (or not). Thanks!
|
||||
@@ -271,13 +271,13 @@ Once you have tested the Pull Request, please add a comment and/or approval to t
|
||||
|
||||
Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/).
|
||||
|
||||
You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`.
|
||||
You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `npm run coverage`.
|
||||
|
||||
The default browser is Google Chrome.
|
||||
|
||||
Place your tests in the same location of the application source code files that they test, e.g. ending with `*.component.spec.ts`
|
||||
|
||||
and run: `yarn test`
|
||||
and run: `npm test`
|
||||
|
||||
If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging
|
||||
|
||||
@@ -357,14 +357,14 @@ Some UI specific configuration documentation is also found in the [`./docs`](doc
|
||||
|
||||
To build the code documentation we use [TYPEDOC](http://typedoc.org). TYPEDOC is a documentation generator for TypeScript projects. It extracts information from properly formatted comments that can be written within the code files. Follow the instructions [here](http://typedoc.org/guides/doccomments/) to know how to make those comments.
|
||||
|
||||
Run:`yarn run docs` to produce the documentation that will be available in the 'doc' folder.
|
||||
Run:`npm run docs` to produce the documentation that will be available in the 'doc' folder.
|
||||
|
||||
Other commands
|
||||
--------------
|
||||
|
||||
There are many more commands in the `scripts` section of `package.json`. Most of these are executed by one of the commands mentioned above.
|
||||
|
||||
A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `yarn run start` the `prestart` script will run first, then the `start` script will trigger.
|
||||
A command with a name that starts with `pre` or `post` will be executed automatically before or after the script with the matching name. e.g. if you type `npm run start` the `prestart` script will run first, then the `start` script will trigger.
|
||||
|
||||
Recommended Editors/IDEs
|
||||
------------------------
|
||||
@@ -456,6 +456,7 @@ dspace-angular
|
||||
├── LICENSES_THIRD_PARTY *
|
||||
├── nodemon.json * Nodemon (https://nodemon.io/) configuration
|
||||
├── package.json * This file describes the npm package for this project, its dependencies, scripts, etc.
|
||||
├── package-lock.json * npm lockfile (https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json)
|
||||
├── postcss.config.js * PostCSS (http://postcss.org/) configuration
|
||||
├── README.md * This document
|
||||
├── SECURITY.md *
|
||||
@@ -466,30 +467,29 @@ dspace-angular
|
||||
├── tsconfig.spec.json * TypeScript config for tests
|
||||
├── tsconfig.ts-node.json * TypeScript config for using ts-node directly
|
||||
├── tslint.json * TSLint (https://palantir.github.io/tslint/) configuration
|
||||
├── typedoc.json * TYPEDOC configuration
|
||||
└── yarn.lock * Yarn lockfile (https://yarnpkg.com/en/docs/yarn-lock)
|
||||
└── typedoc.json * TYPEDOC configuration
|
||||
```
|
||||
|
||||
Managing Dependencies (via yarn)
|
||||
Managing Dependencies (via npm)
|
||||
-------------
|
||||
|
||||
This project makes use of [`yarn`](https://yarnpkg.com/en/) to ensure that the exact same dependency versions are used every time you install it.
|
||||
This project makes use of [`npm`](https://docs.npmjs.com/about-npm) to ensure that the exact same dependency versions are used every time you install it.
|
||||
|
||||
* `yarn` creates a [`yarn.lock`](https://yarnpkg.com/en/docs/yarn-lock) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via yarn.
|
||||
* **Adding new dependencies**: To install/add a new dependency (third party library), use [`yarn add`](https://yarnpkg.com/en/docs/cli/add). For example: `yarn add some-lib`.
|
||||
* If you are adding a new build tool dependency (to `devDependencies`), use `yarn add some-lib --dev`
|
||||
* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`yarn upgrade`](https://yarnpkg.com/en/docs/cli/upgrade). For example: `yarn upgrade some-lib` or `yarn upgrade some-lib@version`
|
||||
* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`yarn remove`](https://yarnpkg.com/en/docs/cli/remove) to remove it.
|
||||
* `npm` creates a [`package-lock.json`](https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json) to track those versions. That file is updated automatically by whenever dependencies are added/updated/removed via npm.
|
||||
* **Adding new dependencies**: To install/add a new dependency (third party library), use [`npm install`](https://docs.npmjs.com/cli/v10/commands/npm-install). For example: `npm install some-lib`.
|
||||
* If you are adding a new build tool dependency (to `devDependencies`), use `npm install some-lib --save--dev`
|
||||
* **Upgrading existing dependencies**: To upgrade existing dependencies, you can use [`npm update`](https://docs.npmjs.com/cli/v10/commands/npm-update). For example: `npm update some-lib` or `npm update some-lib@version`
|
||||
* **Removing dependencies**: If a dependency is no longer needed, or replaced, use [`npm uninstall`](https://docs.npmjs.com/cli/v10/commands/npm-uninstall) to remove it.
|
||||
|
||||
As you can see above, using `yarn` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `yarn` to keep dependencies updated / in sync.*
|
||||
As you can see above, using `npm` commandline tools means that you should never need to modify the `package.json` manually. *We recommend always using `npm` to keep dependencies updated / in sync.*
|
||||
|
||||
### Adding Typings for libraries
|
||||
|
||||
If the library does not include typings, you can install them using yarn:
|
||||
If the library does not include typings, you can install them using npm:
|
||||
|
||||
```bash
|
||||
yarn add d3
|
||||
yarn add @types/d3 --dev
|
||||
npm install d3
|
||||
npm install @types/d3 --save-dev
|
||||
```
|
||||
|
||||
If the library doesn't have typings available at `@types/`, you can still use it by manually adding typings for it:
|
||||
@@ -527,13 +527,13 @@ Frequently asked questions
|
||||
- What are the naming conventions for Angular?
|
||||
- See [the official angular style guide](https://angular.io/styleguide)
|
||||
- Why is the size of my app larger in development?
|
||||
- The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the intrest of build speed.
|
||||
- node-pre-gyp ERR in yarn install (Windows)
|
||||
- The production build uses a whole host of techniques (ahead-of-time compilation, rollup to remove unreachable code, minification, etc.) to reduce the size, that aren't used during development in the interest of build speed.
|
||||
- node-pre-gyp ERR in npm install (Windows)
|
||||
- install Python x86 version between 2.5 and 3.0 on windows. See [this issue](https://github.com/AngularClass/angular2-webpack-starter/issues/626)
|
||||
- How do I handle merge conflicts in yarn.lock?
|
||||
- first check out the yarn.lock file from the branch you're merging in to yours: e.g. `git checkout --theirs yarn.lock`
|
||||
- now run `yarn install` again. Yarn will create a new lockfile that contains both sets of changes.
|
||||
- then run `git add yarn.lock` to stage the lockfile for commit
|
||||
- How do I handle merge conflicts in package-lock.json?
|
||||
- first check out the package-lock.json file from the branch you're merging in to yours: e.g. `git checkout --theirs package-lock.json`
|
||||
- now run `npm install` again. NPM will create a new lockfile that contains both sets of changes.
|
||||
- then run `git add package-lock.json` to stage the lockfile for commit
|
||||
- and `git commit` to conclude the merge
|
||||
|
||||
Getting Help
|
||||
|
@@ -30,7 +30,6 @@
|
||||
"lodash",
|
||||
"jwt-decode",
|
||||
"uuid",
|
||||
"webfontloader",
|
||||
"zone.js"
|
||||
],
|
||||
"outputPath": "dist/browser",
|
||||
@@ -59,7 +58,10 @@
|
||||
"input": "src/themes/dspace/styles/theme.scss",
|
||||
"inject": false,
|
||||
"bundleName": "dspace-theme"
|
||||
}
|
||||
},
|
||||
"node_modules/leaflet/dist/leaflet.css",
|
||||
"node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css",
|
||||
"node_modules/leaflet.markercluster/dist/MarkerCluster.css"
|
||||
],
|
||||
"scripts": [],
|
||||
"baseHref": "/"
|
||||
|
@@ -1,7 +1,7 @@
|
||||
# NOTE: will log all redux actions and transfers in console
|
||||
debug: false
|
||||
|
||||
# Angular Universal server settings
|
||||
# Angular User Inteface settings
|
||||
# NOTE: these settings define where Node.js will start your UI application. Therefore, these
|
||||
# "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
|
||||
ui:
|
||||
@@ -17,12 +17,51 @@ ui:
|
||||
# Trust X-FORWARDED-* headers from proxies (default = true)
|
||||
useProxies: true
|
||||
|
||||
universal:
|
||||
# Whether to inline "critical" styles into the server-side rendered HTML.
|
||||
# Determining which styles are critical is a relatively expensive operation;
|
||||
# this option can be disabled to boost server performance at the expense of
|
||||
# loading smoothness.
|
||||
inlineCriticalCss: true
|
||||
# Angular Server Side Rendering (SSR) settings
|
||||
ssr:
|
||||
# Whether to tell Angular to inline "critical" styles into the server-side rendered HTML.
|
||||
# Determining which styles are critical is a relatively expensive operation; this option is
|
||||
# disabled (false) by default to boost server performance at the expense of loading smoothness.
|
||||
inlineCriticalCss: false
|
||||
# Patterns to be run as regexes against the path of the page to check if SSR is allowed.
|
||||
# If the path match any of the regexes it will be served directly in CSR.
|
||||
# By default, excludes community and collection browse, global browse, global search, community list, statistics and various administrative tools.
|
||||
excludePathPatterns:
|
||||
- pattern: "^/communities/[a-f0-9-]{36}/browse(/.*)?$"
|
||||
flag: "i"
|
||||
- pattern: "^/collections/[a-f0-9-]{36}/browse(/.*)?$"
|
||||
flag: "i"
|
||||
- pattern: "^/browse/"
|
||||
- pattern: "^/search$"
|
||||
- pattern: "^/community-list$"
|
||||
- pattern: "^/admin/"
|
||||
- pattern: "^/processes/?"
|
||||
- pattern: "^/notifications/"
|
||||
- pattern: "^/statistics/?"
|
||||
- pattern: "^/access-control/"
|
||||
- pattern: "^/health$"
|
||||
|
||||
# Whether to enable rendering of Search component on SSR.
|
||||
# If set to true the component will be included in the HTML returned from the server side rendering.
|
||||
# If set to false the component will not be included in the HTML returned from the server side rendering.
|
||||
enableSearchComponent: false
|
||||
# Whether to enable rendering of Browse component on SSR.
|
||||
# If set to true the component will be included in the HTML returned from the server side rendering.
|
||||
# If set to false the component will not be included in the HTML returned from the server side rendering.
|
||||
enableBrowseComponent: false
|
||||
# Enable state transfer from the server-side application to the client-side application.
|
||||
# Defaults to true.
|
||||
# Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
|
||||
# Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
|
||||
# ensure that users always use the most up-to-date state.
|
||||
transferState: true
|
||||
# When a different REST base URL is used for the server-side application, the generated state contains references to
|
||||
# REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
|
||||
# Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
|
||||
replaceRestUrl: true
|
||||
# Enable request performance profiling data collection and printing the results in the server console.
|
||||
# Defaults to false. Enabling in production is NOT recommended
|
||||
#enablePerformanceProfiler: false
|
||||
|
||||
# The REST API server settings
|
||||
# NOTE: these settings define which (publicly available) REST API to use. They are usually
|
||||
@@ -33,6 +72,9 @@ rest:
|
||||
port: 443
|
||||
# NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
|
||||
nameSpace: /server
|
||||
# Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
|
||||
# server namespace (uncomment to use it).
|
||||
#ssrBaseUrl: http://localhost:8080/server
|
||||
|
||||
# Caching settings
|
||||
cache:
|
||||
@@ -59,7 +101,7 @@ cache:
|
||||
# Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
|
||||
debug: false
|
||||
# When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
|
||||
# (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
|
||||
# (Keep in mind, bot detection cannot be guaranteed. It is possible some bots will bypass this cache.)
|
||||
botCache:
|
||||
# Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
|
||||
# Default is 1000, which means the 1000 most recently accessed public pages will be cached.
|
||||
@@ -232,6 +274,9 @@ languages:
|
||||
- code: gd
|
||||
label: Gàidhlig
|
||||
active: true
|
||||
- code: gu
|
||||
label: ગુજરાતી
|
||||
active: true
|
||||
- code: hi
|
||||
label: हिंदी
|
||||
active: true
|
||||
@@ -247,6 +292,9 @@ languages:
|
||||
- code: lv
|
||||
label: Latviešu
|
||||
active: true
|
||||
- code: mr
|
||||
label: मराठी
|
||||
active: true
|
||||
- code: nl
|
||||
label: Nederlands
|
||||
active: true
|
||||
@@ -259,6 +307,9 @@ languages:
|
||||
- code: pt-BR
|
||||
label: Português do Brasil
|
||||
active: true
|
||||
- code: ru
|
||||
label: Русский
|
||||
active: true
|
||||
- code: sr-lat
|
||||
label: Srpski (lat)
|
||||
active: true
|
||||
@@ -322,15 +373,25 @@ item:
|
||||
# Rounded to the nearest size in the list of selectable sizes on the
|
||||
# settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'.
|
||||
pageSize: 5
|
||||
# Show the bitstream access status label on the item page
|
||||
showAccessStatuses: false
|
||||
|
||||
# Community Page Config
|
||||
community:
|
||||
# Default tab to be shown when browsing a Community. Valid values are: comcols, search, or browse_<field>
|
||||
# <field> must be any of the configured "browse by" fields, e.g., dateissued, author, title, or subject
|
||||
# When the default tab is not the 'search' tab, the search tab is moved to the last position
|
||||
defaultBrowseTab: search
|
||||
# Search tab config
|
||||
searchSection:
|
||||
showSidebar: true
|
||||
|
||||
# Collection Page Config
|
||||
collection:
|
||||
# Default tab to be shown when browsing a Collection. Valid values are: search, or browse_<field>
|
||||
# <field> must be any of the configured "browse by" fields, e.g., dateissued, author, title, or subject
|
||||
# When the default tab is not the 'search' tab, the search tab is moved to the last position
|
||||
defaultBrowseTab: search
|
||||
# Search tab config
|
||||
searchSection:
|
||||
showSidebar: true
|
||||
@@ -415,6 +476,8 @@ info:
|
||||
enableEndUserAgreement: true
|
||||
enablePrivacyStatement: true
|
||||
enableCOARNotifySupport: true
|
||||
# Whether to show the cookie consent popup and the cookie settings footer link or not.
|
||||
enableCookieConsentPopup: true
|
||||
|
||||
# Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
|
||||
# display in supported metadata fields. By default, only dc.description.abstract is supported.
|
||||
@@ -448,6 +511,12 @@ search:
|
||||
enabled: false
|
||||
# List of filters to enable in "Advanced Search" dropdown
|
||||
filter: [ 'title', 'author', 'subject', 'entityType' ]
|
||||
#
|
||||
# Number used to render n UI elements called loading skeletons that act as placeholders.
|
||||
# These elements indicate that some content will be loaded in their stead.
|
||||
# Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
|
||||
# e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
|
||||
defaultFiltersCount: 5
|
||||
|
||||
|
||||
# Notify metrics
|
||||
@@ -502,7 +571,55 @@ notifyMetrics:
|
||||
config: 'NOTIFY.outgoing.delivered'
|
||||
description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
|
||||
|
||||
# Live Region configuration
|
||||
# Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms:
|
||||
# Live regions are perceivable regions of a web page that are typically updated as a
|
||||
# result of an external event when user focus may be elsewhere.
|
||||
#
|
||||
# The DSpace live region is a component present at the bottom of all pages that is invisible by default, but is useful
|
||||
# for screen readers. Any message pushed to the live region will be announced by the screen reader. These messages
|
||||
# usually contain information about changes on the page that might not be in focus.
|
||||
liveRegion:
|
||||
# The duration after which messages disappear from the live region in milliseconds
|
||||
messageTimeOutDurationMs: 30000
|
||||
# The visibility of the live region. Setting this to true is only useful for debugging purposes.
|
||||
isVisible: false
|
||||
|
||||
# Geospatial Map display options
|
||||
geospatialMapViewer:
|
||||
# Which fields to use for parsing as geospatial points in search maps
|
||||
# (note, the item page field component allows any field(s) to be used
|
||||
# and is set as an input when declaring the component)
|
||||
spatialMetadataFields:
|
||||
- 'dcterms.spatial'
|
||||
# Which discovery configuration to use for 'geospatial search', used
|
||||
# in the browse map
|
||||
spatialFacetDiscoveryConfiguration: 'geospatial'
|
||||
# Which filter / facet name to use for faceted geospatial search
|
||||
# used in the browse map
|
||||
spatialPointFilterName: 'point'
|
||||
# Whether item page geospatial metadata should be displayed
|
||||
# (assumes they are wrapped in a test for this config in the template as
|
||||
# per the default templates supplied with DSpace for untyped-item and publication)
|
||||
enableItemPageFields: false
|
||||
# Whether the browse map should be enabled and included in the browse menu
|
||||
enableBrowseMap: false
|
||||
# Whether a 'map view' mode should be included alongside list and grid views
|
||||
# in search result pages
|
||||
enableSearchViewMode: false
|
||||
# The tile provider(s) to use for the map tiles drawn in the leaflet maps.
|
||||
# (see https://leaflet-extras.github.io/leaflet-providers/preview/) for a full list
|
||||
tileProviders:
|
||||
- 'OpenStreetMap.Mapnik'
|
||||
# Starting centre point for the map, as lat and lng coordinates. This is useful
|
||||
# to set the centre of the map when the map is first loaded and if there are no
|
||||
# points, shapes or markers to display.
|
||||
# Defaults to the centre of Istanbul
|
||||
defaultCentrePoint:
|
||||
lat: 41.015137
|
||||
lng: 28.979530
|
||||
|
||||
|
||||
|
||||
# Configuration for storing accessibility settings, used by the AccessibilitySettingsService
|
||||
accessibility:
|
||||
# The duration in days after which the accessibility settings cookie expires
|
||||
cookieExpirationDuration: 7
|
||||
|
@@ -1,6 +1,7 @@
|
||||
import { defineConfig } from 'cypress';
|
||||
|
||||
export default defineConfig({
|
||||
video: true,
|
||||
videosFolder: 'cypress/videos',
|
||||
screenshotsFolder: 'cypress/screenshots',
|
||||
fixturesFolder: 'cypress/fixtures',
|
||||
@@ -18,6 +19,7 @@ export default defineConfig({
|
||||
|
||||
// Admin account used for administrative tests
|
||||
DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
|
||||
DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
|
||||
DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
|
||||
// Community/collection/publication used for view/edit tests
|
||||
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
|
||||
@@ -32,7 +34,10 @@ export default defineConfig({
|
||||
DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
|
||||
// Account used to test basic submission process
|
||||
DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
|
||||
DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
|
||||
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
|
||||
// Administrator users group
|
||||
DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
|
||||
},
|
||||
e2e: {
|
||||
// Setup our plugins for e2e tests
|
||||
|
54
cypress/e2e/admin-add-new-modals.cy.ts
Normal file
54
cypress/e2e/admin-add-new-modals.cy.ts
Normal file
@@ -0,0 +1,54 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Add New Modals', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin for sidebar to appear
|
||||
cy.visit('/login');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('Add new Community modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.new_community"]').click();
|
||||
|
||||
// Analyze <ds-create-community-parent-selector> for accessibility
|
||||
testA11y('ds-create-community-parent-selector');
|
||||
});
|
||||
|
||||
it('Add new Collection modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.new_collection"]').click();
|
||||
|
||||
// Analyze <ds-create-collection-parent-selector> for accessibility
|
||||
testA11y('ds-create-collection-parent-selector');
|
||||
});
|
||||
|
||||
it('Add new Item modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-new-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.new_item"]').click();
|
||||
|
||||
// Analyze <ds-create-item-parent-selector> for accessibility
|
||||
testA11y('ds-create-item-parent-selector');
|
||||
});
|
||||
});
|
16
cypress/e2e/admin-curation-tasks.cy.ts
Normal file
16
cypress/e2e/admin-curation-tasks.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Curation Tasks', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/curation-tasks');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-admin-curation-task').should('be.visible');
|
||||
// Analyze <ds-admin-curation-task> for accessibility issues
|
||||
testA11y('ds-admin-curation-task');
|
||||
});
|
||||
});
|
54
cypress/e2e/admin-edit-modals.cy.ts
Normal file
54
cypress/e2e/admin-edit-modals.cy.ts
Normal file
@@ -0,0 +1,54 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Edit Modals', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin for sidebar to appear
|
||||
cy.visit('/login');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('Edit Community modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.edit_community"]').click();
|
||||
|
||||
// Analyze <ds-edit-community-selector> for accessibility
|
||||
testA11y('ds-edit-community-selector');
|
||||
});
|
||||
|
||||
it('Edit Collection modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.edit_collection"]').click();
|
||||
|
||||
// Analyze <ds-edit-collection-selector> for accessibility
|
||||
testA11y('ds-edit-collection-selector');
|
||||
});
|
||||
|
||||
it('Edit Item modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-edit-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.edit_item"]').click();
|
||||
|
||||
// Analyze <ds-edit-item-selector> for accessibility
|
||||
testA11y('ds-edit-item-selector');
|
||||
});
|
||||
});
|
39
cypress/e2e/admin-export-modals.cy.ts
Normal file
39
cypress/e2e/admin-export-modals.cy.ts
Normal file
@@ -0,0 +1,39 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Export Modals', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin for sidebar to appear
|
||||
cy.visit('/login');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('Export metadata modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-export-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.export_metadata"]').click();
|
||||
|
||||
// Analyze <ds-export-metadata-selector> for accessibility
|
||||
testA11y('ds-export-metadata-selector');
|
||||
});
|
||||
|
||||
it('Export batch modal should pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on entry of menu
|
||||
cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
|
||||
cy.get('[data-test="admin-menu-section-export-title"]').click();
|
||||
|
||||
cy.get('a[data-test="menu.section.export_batch"]').click();
|
||||
|
||||
// Analyze <ds-export-batch-selector> for accessibility
|
||||
testA11y('ds-export-batch-selector');
|
||||
});
|
||||
});
|
17
cypress/e2e/admin-notifications-publication-claim-page.cy.ts
Normal file
17
cypress/e2e/admin-notifications-publication-claim-page.cy.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Notifications Publication Claim Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/notifications/publication-claim');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
|
||||
//Page must first be visible
|
||||
cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
|
||||
// Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
|
||||
testA11y('ds-admin-notifications-publication-claim-page');
|
||||
});
|
||||
});
|
21
cypress/e2e/admin-search-page.cy.ts
Normal file
21
cypress/e2e/admin-search-page.cy.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Search Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/search');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
//Page must first be visible
|
||||
cy.get('ds-admin-search-page').should('be.visible');
|
||||
// At least one search result should be displayed
|
||||
cy.get('[data-test="list-object"]').should('be.visible');
|
||||
// Click each filter toggle to open *every* filter
|
||||
// (As we want to scan filter section for accessibility issues as well)
|
||||
cy.get('[data-test="filter-toggle"]').click({ multiple: true });
|
||||
// Analyze <ds-admin-search-page> for accessibility issues
|
||||
testA11y('ds-admin-search-page');
|
||||
});
|
||||
});
|
@@ -1,5 +1,4 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
import { Options } from 'cypress-axe';
|
||||
|
||||
describe('Admin Sidebar', () => {
|
||||
beforeEach(() => {
|
||||
@@ -10,19 +9,12 @@ describe('Admin Sidebar', () => {
|
||||
|
||||
it('should be pinnable and pass accessibility tests', () => {
|
||||
// Pin the sidebar open
|
||||
cy.get('#sidebar-collapse-toggle').click();
|
||||
cy.get('[data-test="sidebar-collapse-toggle"]').click();
|
||||
|
||||
// Click on every expandable section to open all menus
|
||||
cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
|
||||
|
||||
// Analyze <ds-admin-sidebar> for accessibility
|
||||
testA11y('ds-admin-sidebar',
|
||||
{
|
||||
rules: {
|
||||
// Currently all expandable sections have nested interactive elements
|
||||
// See https://github.com/DSpace/dspace-angular/issues/2178
|
||||
'nested-interactive': { enabled: false },
|
||||
},
|
||||
} as Options);
|
||||
testA11y('ds-admin-sidebar');
|
||||
});
|
||||
});
|
||||
|
21
cypress/e2e/admin-workflow-page.cy.ts
Normal file
21
cypress/e2e/admin-workflow-page.cy.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Admin Workflow Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/workflow');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-admin-workflow-page').should('be.visible');
|
||||
// At least one search result should be displayed
|
||||
cy.get('[data-test="list-object"]').should('be.visible');
|
||||
// Click each filter toggle to open *every* filter
|
||||
// (As we want to scan filter section for accessibility issues as well)
|
||||
cy.get('[data-test="filter-toggle"]').click({ multiple: true });
|
||||
// Analyze <ds-admin-workflow-page> for accessibility issues
|
||||
testA11y('ds-admin-workflow-page');
|
||||
});
|
||||
});
|
16
cypress/e2e/batch-import-page.cy.ts
Normal file
16
cypress/e2e/batch-import-page.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Batch Import Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see processes
|
||||
cy.visit('/admin/batch-import');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Batch import form must first be visible
|
||||
cy.get('ds-batch-import-page').should('be.visible');
|
||||
// Analyze <ds-batch-import-page> for accessibility issues
|
||||
testA11y('ds-batch-import-page');
|
||||
});
|
||||
});
|
16
cypress/e2e/bitstreams-format.cy.ts
Normal file
16
cypress/e2e/bitstreams-format.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Bitstreams Formats', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/registries/bitstream-formats');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-bitstream-formats').should('be.visible');
|
||||
// Analyze <ds-bitstream-formats> for accessibility issues
|
||||
testA11y('ds-bitstream-formats');
|
||||
});
|
||||
});
|
31
cypress/e2e/bulk-access.cy.ts
Normal file
31
cypress/e2e/bulk-access.cy.ts
Normal file
@@ -0,0 +1,31 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
import { Options } from 'cypress-axe';
|
||||
|
||||
describe('Bulk Access', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/bulk-access');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-bulk-access').should('be.visible');
|
||||
// At least one search result should be displayed
|
||||
cy.get('[data-test="list-object"]').should('be.visible');
|
||||
// Click each filter toggle to open *every* filter
|
||||
// (As we want to scan filter section for accessibility issues as well)
|
||||
cy.get('[data-test="filter-toggle"]').click({ multiple: true });
|
||||
// Analyze <ds-bulk-access> for accessibility issues
|
||||
testA11y('ds-bulk-access', {
|
||||
rules: {
|
||||
// All panels are accordians & fail "aria-required-children" and "nested-interactive".
|
||||
// Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
|
||||
'aria-required-children': { enabled: false },
|
||||
'nested-interactive': { enabled: false },
|
||||
// Card titles fail this test currently
|
||||
'heading-order': { enabled: false },
|
||||
},
|
||||
} as Options);
|
||||
});
|
||||
});
|
@@ -12,6 +12,13 @@ describe('Community List Page', () => {
|
||||
cy.get('[data-test="expand-button"]').click({ multiple: true });
|
||||
|
||||
// Analyze <ds-community-list-page> for accessibility issues
|
||||
testA11y('ds-community-list-page');
|
||||
testA11y('ds-community-list-page', {
|
||||
rules: {
|
||||
// When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
|
||||
// 0 is not a valid value for 'aria-posinset' so the test fails.
|
||||
// see https://github.com/DSpace/dspace-angular/issues/4068
|
||||
'aria-valid-attr-value': { enabled: false },
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
16
cypress/e2e/create-eperson.cy.ts
Normal file
16
cypress/e2e/create-eperson.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Create Eperson', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/epeople/create');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Form must first be visible
|
||||
cy.get('ds-eperson-form').should('be.visible');
|
||||
// Analyze <ds-eperson-form> for accessibility issues
|
||||
testA11y('ds-eperson-form');
|
||||
});
|
||||
});
|
16
cypress/e2e/create-group.cy.ts
Normal file
16
cypress/e2e/create-group.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Create Group', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/groups/create');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Form must first be visible
|
||||
cy.get('ds-group-form').should('be.visible');
|
||||
// Analyze <ds-group-form> for accessibility issues
|
||||
testA11y('ds-group-form');
|
||||
});
|
||||
});
|
16
cypress/e2e/edit-eperson.cy.ts
Normal file
16
cypress/e2e/edit-eperson.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Edit Eperson', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/epeople/'.concat(Cypress.env('DSPACE_TEST_ADMIN_USER_UUID')).concat('/edit'));
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Form must first be visible
|
||||
cy.get('ds-eperson-form').should('be.visible');
|
||||
// Analyze <ds-eperson-form> for accessibility issues
|
||||
testA11y('ds-eperson-form');
|
||||
});
|
||||
});
|
16
cypress/e2e/edit-group.cy.ts
Normal file
16
cypress/e2e/edit-group.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Edit Group', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/groups/'.concat(Cypress.env('DSPACE_ADMINISTRATOR_GROUP')).concat('/edit'));
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Form must first be visible
|
||||
cy.get('ds-group-form').should('be.visible');
|
||||
// Analyze <ds-group-form> for accessibility issues
|
||||
testA11y('ds-group-form');
|
||||
});
|
||||
});
|
13
cypress/e2e/end-user-agreement.cy.ts
Normal file
13
cypress/e2e/end-user-agreement.cy.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('End User Agreement', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.visit('/info/end-user-agreement');
|
||||
|
||||
// Page must first be visible
|
||||
cy.get('ds-end-user-agreement').should('be.visible');
|
||||
|
||||
// Analyze <ds-end-user-agreement> for accessibility
|
||||
testA11y('ds-end-user-agreement');
|
||||
});
|
||||
});
|
16
cypress/e2e/epeople-registry.cy.ts
Normal file
16
cypress/e2e/epeople-registry.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Epeople registry', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/epeople');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Epeople registry page must first be visible
|
||||
cy.get('ds-epeople-registry').should('be.visible');
|
||||
// Analyze <ds-epeople-registry> for accessibility issues
|
||||
testA11y('ds-epeople-registry');
|
||||
});
|
||||
});
|
13
cypress/e2e/feedback.cy.ts
Normal file
13
cypress/e2e/feedback.cy.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Feedback', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.visit('/info/feedback');
|
||||
|
||||
// Page must first be visible
|
||||
cy.get('ds-feedback').should('be.visible');
|
||||
|
||||
// Analyze <ds-feedback> for accessibility
|
||||
testA11y('ds-feedback');
|
||||
});
|
||||
});
|
16
cypress/e2e/groups-registry.cy.ts
Normal file
16
cypress/e2e/groups-registry.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Groups registry', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/access-control/groups');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Epeople registry page must first be visible
|
||||
cy.get('ds-groups-registry').should('be.visible');
|
||||
// Analyze <ds-groups-registry> for accessibility issues
|
||||
testA11y('ds-groups-registry');
|
||||
});
|
||||
});
|
@@ -10,4 +10,29 @@ describe('Header', () => {
|
||||
// Analyze <ds-header> for accessibility
|
||||
testA11y('ds-header');
|
||||
});
|
||||
|
||||
it('should allow for changing language to German (for example)', () => {
|
||||
cy.visit('/');
|
||||
|
||||
// Click the language switcher (globe) in header
|
||||
cy.get('button[data-test="lang-switch"]').click();
|
||||
// Click on the "Deusch" language in dropdown
|
||||
cy.get('#language-menu-list div[role="option"]').contains('Deutsch').click();
|
||||
|
||||
// HTML "lang" attribute should switch to "de"
|
||||
cy.get('html').invoke('attr', 'lang').should('eq', 'de');
|
||||
|
||||
// Login menu should now be in German
|
||||
cy.get('[data-test="login-menu"]').contains('Anmelden');
|
||||
|
||||
// Change back to English from language switcher
|
||||
cy.get('button[data-test="lang-switch"]').click();
|
||||
cy.get('#language-menu-list div[role="option"]').contains('English').click();
|
||||
|
||||
// HTML "lang" attribute should switch to "en"
|
||||
cy.get('html').invoke('attr', 'lang').should('eq', 'en');
|
||||
|
||||
// Login menu should now be in English
|
||||
cy.get('[data-test="login-menu"]').contains('Log In');
|
||||
});
|
||||
});
|
||||
|
62
cypress/e2e/health-page.cy.ts
Normal file
62
cypress/e2e/health-page.cy.ts
Normal file
@@ -0,0 +1,62 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
import { Options } from 'cypress-axe';
|
||||
|
||||
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.intercept('GET', '/server/actuator/health').as('status');
|
||||
cy.intercept('GET', '/server/actuator/info').as('info');
|
||||
cy.visit('/health');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
describe('Health Page > Status Tab', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.wait('@status');
|
||||
|
||||
cy.get('a[data-test="health-page.status-tab"]').click();
|
||||
// Page must first be visible
|
||||
cy.get('ds-health-page').should('be.visible');
|
||||
cy.get('ds-health-panel').should('be.visible');
|
||||
|
||||
// wait for all the ds-health-info-component components to be rendered
|
||||
cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
|
||||
cy.wrap($panel).find('ds-health-component').should('be.visible');
|
||||
});
|
||||
// Analyze <ds-health-page> for accessibility issues
|
||||
testA11y('ds-health-page', {
|
||||
rules: {
|
||||
// All panels are accordians & fail "aria-required-children" and "nested-interactive".
|
||||
// Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
|
||||
'aria-required-children': { enabled: false },
|
||||
'nested-interactive': { enabled: false },
|
||||
},
|
||||
} as Options);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Health Page > Info Tab', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.wait('@info');
|
||||
|
||||
cy.get('a[data-test="health-page.info-tab"]').click();
|
||||
// Page must first be visible
|
||||
cy.get('ds-health-page').should('be.visible');
|
||||
cy.get('ds-health-info').should('be.visible');
|
||||
|
||||
// wait for all the ds-health-info-component components to be rendered
|
||||
cy.get('div[role="tabpanel"]').each(($panel: HTMLDivElement) => {
|
||||
cy.wrap($panel).find('ds-health-info-component').should('be.visible');
|
||||
});
|
||||
|
||||
// Analyze <ds-health-info> for accessibility issues
|
||||
testA11y('ds-health-info', {
|
||||
rules: {
|
||||
// All panels are accordions & fail "aria-required-children" and "nested-interactive".
|
||||
// Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
|
||||
'aria-required-children': { enabled: false },
|
||||
'nested-interactive': { enabled: false },
|
||||
},
|
||||
} as Options);
|
||||
});
|
||||
});
|
@@ -17,7 +17,7 @@ describe('Site Statistics Page', () => {
|
||||
|
||||
cy.visit('/statistics');
|
||||
|
||||
// <ds-site-statistics-page> tag must be visable
|
||||
// <ds-site-statistics-page> tag must be visible
|
||||
cy.get('ds-site-statistics-page').should('be.visible');
|
||||
|
||||
// Verify / wait until "Total Visits" table's *last* label is non-empty
|
||||
|
@@ -26,6 +26,12 @@ describe('Homepage', () => {
|
||||
// Wait for homepage tag to appear
|
||||
cy.get('ds-home-page').should('be.visible');
|
||||
|
||||
// Wait for at least one loading component to show up
|
||||
cy.get('ds-loading').should('exist');
|
||||
|
||||
// Wait until all loading components have disappeared
|
||||
cy.get('ds-loading').should('not.exist');
|
||||
|
||||
// Analyze <ds-home-page> for accessibility issues
|
||||
testA11y('ds-home-page');
|
||||
});
|
||||
|
@@ -13,8 +13,13 @@ beforeEach(() => {
|
||||
|
||||
describe('Edit Item > Edit Metadata tab', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="metadata"]').should('be.visible');
|
||||
cy.get('a[data-test="metadata"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="metadata"]').should('be.visible');
|
||||
cy.get('a[data-test="metadata"]').should('have.class', 'active');
|
||||
|
||||
// <ds-edit-item-page> tag must be loaded
|
||||
cy.get('ds-edit-item-page').should('be.visible');
|
||||
|
||||
@@ -31,8 +36,13 @@ describe('Edit Item > Edit Metadata tab', () => {
|
||||
describe('Edit Item > Status tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="status"]').should('be.visible');
|
||||
cy.get('a[data-test="status"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="status"]').should('be.visible');
|
||||
cy.get('a[data-test="status"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-status> tag must be loaded
|
||||
cy.get('ds-item-status').should('be.visible');
|
||||
|
||||
@@ -44,8 +54,13 @@ describe('Edit Item > Status tab', () => {
|
||||
describe('Edit Item > Bitstreams tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="bitstreams"]').should('be.visible');
|
||||
cy.get('a[data-test="bitstreams"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="bitstreams"]').should('be.visible');
|
||||
cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-bitstreams> tag must be loaded
|
||||
cy.get('ds-item-bitstreams').should('be.visible');
|
||||
|
||||
@@ -68,8 +83,13 @@ describe('Edit Item > Bitstreams tab', () => {
|
||||
describe('Edit Item > Curate tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="curate"]').should('be.visible');
|
||||
cy.get('a[data-test="curate"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="curate"]').should('be.visible');
|
||||
cy.get('a[data-test="curate"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-curate> tag must be loaded
|
||||
cy.get('ds-item-curate').should('be.visible');
|
||||
|
||||
@@ -81,8 +101,13 @@ describe('Edit Item > Curate tab', () => {
|
||||
describe('Edit Item > Relationships tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="relationships"]').should('be.visible');
|
||||
cy.get('a[data-test="relationships"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="relationships"]').should('be.visible');
|
||||
cy.get('a[data-test="relationships"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-relationships> tag must be loaded
|
||||
cy.get('ds-item-relationships').should('be.visible');
|
||||
|
||||
@@ -94,8 +119,13 @@ describe('Edit Item > Relationships tab', () => {
|
||||
describe('Edit Item > Version History tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="versionhistory"]').should('be.visible');
|
||||
cy.get('a[data-test="versionhistory"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="versionhistory"]').should('be.visible');
|
||||
cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-version-history> tag must be loaded
|
||||
cy.get('ds-item-version-history').should('be.visible');
|
||||
|
||||
@@ -107,8 +137,13 @@ describe('Edit Item > Version History tab', () => {
|
||||
describe('Edit Item > Access Control tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="access-control"]').should('be.visible');
|
||||
cy.get('a[data-test="access-control"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="access-control"]').should('be.visible');
|
||||
cy.get('a[data-test="access-control"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-access-control> tag must be loaded
|
||||
cy.get('ds-item-access-control').should('be.visible');
|
||||
|
||||
@@ -120,8 +155,13 @@ describe('Edit Item > Access Control tab', () => {
|
||||
describe('Edit Item > Collection Mapper tab', () => {
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.get('a[data-test="mapper"]').should('be.visible');
|
||||
cy.get('a[data-test="mapper"]').click();
|
||||
|
||||
// Our selected tab should be both visible & active
|
||||
cy.get('a[data-test="mapper"]').should('be.visible');
|
||||
cy.get('a[data-test="mapper"]').should('have.class', 'active');
|
||||
|
||||
// <ds-item-collection-mapper> tag must be loaded
|
||||
cy.get('ds-item-collection-mapper').should('be.visible');
|
||||
|
||||
|
@@ -7,7 +7,7 @@ describe('Item Statistics Page', () => {
|
||||
it('should load if you click on "Statistics" from an Item/Entity page', () => {
|
||||
cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
|
||||
cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
|
||||
cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
|
||||
cy.location('pathname').should('eq', '/statistics/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
|
||||
});
|
||||
|
||||
it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {
|
||||
|
@@ -3,31 +3,31 @@ import { testA11y } from 'cypress/support/utils';
|
||||
const page = {
|
||||
openLoginMenu() {
|
||||
// Click the "Log In" dropdown menu in header
|
||||
cy.get('ds-header [data-test="login-menu"]').click();
|
||||
cy.get('[data-test="login-menu"]').click();
|
||||
},
|
||||
openUserMenu() {
|
||||
// Once logged in, click the User menu in header
|
||||
cy.get('ds-header [data-test="user-menu"]').click();
|
||||
cy.get('[data-test="user-menu"]').click();
|
||||
},
|
||||
submitLoginAndPasswordByPressingButton(email, password) {
|
||||
// Enter email
|
||||
cy.get('ds-header [data-test="email"]').type(email);
|
||||
cy.get('[data-test="email"]').type(email);
|
||||
// Enter password
|
||||
cy.get('ds-header [data-test="password"]').type(password);
|
||||
cy.get('[data-test="password"]').type(password);
|
||||
// Click login button
|
||||
cy.get('ds-header [data-test="login-button"]').click();
|
||||
cy.get('[data-test="login-button"]').click();
|
||||
},
|
||||
submitLoginAndPasswordByPressingEnter(email, password) {
|
||||
// In opened Login modal, fill out email & password, then click Enter
|
||||
cy.get('ds-header [data-test="email"]').type(email);
|
||||
cy.get('ds-header [data-test="password"]').type(password);
|
||||
cy.get('ds-header [data-test="password"]').type('{enter}');
|
||||
cy.get('[data-test="email"]').type(email);
|
||||
cy.get('[data-test="password"]').type(password);
|
||||
cy.get('[data-test="password"]').type('{enter}');
|
||||
},
|
||||
submitLogoutByPressingButton() {
|
||||
// This is the POST command that will actually log us out
|
||||
cy.intercept('POST', '/server/api/authn/logout').as('logout');
|
||||
// Click logout button
|
||||
cy.get('ds-header [data-test="logout-button"]').click();
|
||||
cy.get('[data-test="logout-button"]').click();
|
||||
// Wait until above POST command responds before continuing
|
||||
// (This ensures next action waits until logout completes)
|
||||
cy.wait('@logout');
|
||||
@@ -67,7 +67,7 @@ describe('Login Modal', () => {
|
||||
|
||||
// Login, and the <ds-log-in> tag should no longer exist
|
||||
page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
cy.get('.form-login').should('not.exist');
|
||||
cy.get('ds-log-in').should('not.exist');
|
||||
|
||||
// Verify we are still on homepage
|
||||
cy.url().should('include', '/home');
|
||||
@@ -142,7 +142,7 @@ describe('Login Modal', () => {
|
||||
page.submitLoginAndPasswordByPressingButton(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
cy.get('ds-log-in').should('not.exist');
|
||||
|
||||
// Open user menu, verify user menu accesibility
|
||||
// Open user menu, verify user menu accessibility
|
||||
page.openUserMenu();
|
||||
cy.get('ds-user-menu').should('be.visible');
|
||||
testA11y('ds-user-menu');
|
||||
|
16
cypress/e2e/metadata-import-page.cy.ts
Normal file
16
cypress/e2e/metadata-import-page.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Metadata Import Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/metadata-import');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Metadata import form must first be visible
|
||||
cy.get('ds-metadata-import-page').should('be.visible');
|
||||
// Analyze <ds-metadata-import-page> for accessibility issues
|
||||
testA11y('ds-metadata-import-page');
|
||||
});
|
||||
});
|
16
cypress/e2e/metadata-registry.cy.ts
Normal file
16
cypress/e2e/metadata-registry.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Metadata Registry', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/registries/metadata');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-metadata-registry').should('be.visible');
|
||||
// Analyze <ds-metadata-registry> for accessibility issues
|
||||
testA11y('ds-metadata-registry');
|
||||
});
|
||||
});
|
16
cypress/e2e/metadata-schema.cy.ts
Normal file
16
cypress/e2e/metadata-schema.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Metadata Schema', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/registries/metadata/dc');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-metadata-schema').should('be.visible');
|
||||
// Analyze <ds-metadata-schema> for accessibility issues
|
||||
testA11y('ds-metadata-schema');
|
||||
});
|
||||
});
|
@@ -84,7 +84,7 @@ describe('My DSpace page', () => {
|
||||
cy.url().should('include', '/mydspace');
|
||||
|
||||
// Close any open notifications, to make sure they don't get in the way of next steps
|
||||
cy.get('[data-dismiss="alert"]').click({ multiple: true });
|
||||
cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
|
||||
|
||||
// This is the GET command that will actually run the search
|
||||
cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
|
||||
|
16
cypress/e2e/new-process.cy.ts
Normal file
16
cypress/e2e/new-process.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('New Process', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/processes/new');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Process form must first be visible
|
||||
cy.get('ds-new-process').should('be.visible');
|
||||
// Analyze <ds-new-process> for accessibility issues
|
||||
testA11y('ds-new-process');
|
||||
});
|
||||
});
|
@@ -1,7 +1,7 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('PageNotFound', () => {
|
||||
it('should contain element ds-pagenotfound when navigating to page that doesnt exist', () => {
|
||||
it('should contain element ds-pagenotfound when navigating to page that does not exist', () => {
|
||||
// request an invalid page (UUIDs at root path aren't valid)
|
||||
cy.visit('/e9019a69-d4f1-4773-b6a3-bd362caa46f2', { failOnStatusCode: false });
|
||||
cy.get('ds-pagenotfound').should('be.visible');
|
||||
|
13
cypress/e2e/privacy.cy.ts
Normal file
13
cypress/e2e/privacy.cy.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Privacy', () => {
|
||||
it('should pass accessibility tests', () => {
|
||||
cy.visit('/info/privacy');
|
||||
|
||||
// Page must first be visible
|
||||
cy.get('ds-privacy').should('be.visible');
|
||||
|
||||
// Analyze <ds-privacy> for accessibility
|
||||
testA11y('ds-privacy');
|
||||
});
|
||||
});
|
17
cypress/e2e/processes-overview.cy.ts
Normal file
17
cypress/e2e/processes-overview.cy.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Processes Overview', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/processes');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
|
||||
// Process overview must first be visible
|
||||
cy.get('ds-process-overview').should('be.visible');
|
||||
// Analyze <ds-process-overview> for accessibility issues
|
||||
testA11y('ds-process-overview');
|
||||
});
|
||||
});
|
16
cypress/e2e/profile-page.cy.ts
Normal file
16
cypress/e2e/profile-page.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Profile page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/profile');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Process form must first be visible
|
||||
cy.get('ds-profile-page').should('be.visible');
|
||||
// Analyze <ds-profile-page> for accessibility issues
|
||||
testA11y('ds-profile-page');
|
||||
});
|
||||
});
|
16
cypress/e2e/quality-assurance-source-page.cy.ts
Normal file
16
cypress/e2e/quality-assurance-source-page.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('Quality Assurance Source Page', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/notifications/quality-assurance');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Source page must first be visible
|
||||
cy.get('ds-quality-assurance-source-page-component').should('be.visible');
|
||||
// Analyze <ds-quality-assurance-source-page-component> for accessibility issues
|
||||
testA11y('ds-quality-assurance-source-page-component');
|
||||
});
|
||||
});
|
@@ -34,7 +34,7 @@ describe('New Submission page', () => {
|
||||
// Author & Subject fields have invalid "aria-multiline" attrs.
|
||||
// See https://github.com/DSpace/dspace-angular/issues/1272
|
||||
'aria-allowed-attr': { enabled: false },
|
||||
// All panels are accordians & fail "aria-required-children" and "nested-interactive".
|
||||
// All panels are accordions & fail "aria-required-children" and "nested-interactive".
|
||||
// Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
|
||||
'aria-required-children': { enabled: false },
|
||||
'nested-interactive': { enabled: false },
|
||||
@@ -95,7 +95,7 @@ describe('New Submission page', () => {
|
||||
// A success alert should be visible
|
||||
cy.get('ds-notification div.alert-success').should('be.visible');
|
||||
// Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
|
||||
cy.get('[data-dismiss="alert"]').click({ multiple: true });
|
||||
cy.get('[data-bs-dismiss="alert"]').click({ multiple: true });
|
||||
|
||||
// This is the GET command that will actually run the search
|
||||
cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
|
||||
@@ -192,7 +192,7 @@ describe('New Submission page', () => {
|
||||
testA11y('ds-submission-edit',
|
||||
{
|
||||
rules: {
|
||||
// All panels are accordians & fail "aria-required-children" and "nested-interactive".
|
||||
// All panels are accordions & fail "aria-required-children" and "nested-interactive".
|
||||
// Seem to require updating ng-bootstrap and https://github.com/DSpace/dspace-angular/issues/2216
|
||||
'aria-required-children': { enabled: false },
|
||||
'nested-interactive': { enabled: false },
|
||||
@@ -217,7 +217,7 @@ describe('New Submission page', () => {
|
||||
});
|
||||
|
||||
// Close popup window
|
||||
cy.get('ds-dynamic-lookup-relation-modal button.close').click();
|
||||
cy.get('ds-dynamic-lookup-relation-modal button.btn-close').click();
|
||||
|
||||
// Back on the form, click the discard button to remove new submission
|
||||
// Clicking it will display a confirmation, which we will confirm with another click
|
||||
|
16
cypress/e2e/system-wide-alert.cy.ts
Normal file
16
cypress/e2e/system-wide-alert.cy.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { testA11y } from 'cypress/support/utils';
|
||||
|
||||
describe('System Wide Alert', () => {
|
||||
beforeEach(() => {
|
||||
// Must login as an Admin to see the page
|
||||
cy.visit('/admin/system-wide-alert');
|
||||
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
|
||||
});
|
||||
|
||||
it('should pass accessibility tests', () => {
|
||||
// Page must first be visible
|
||||
cy.get('ds-system-wide-alert-form').should('be.visible');
|
||||
// Analyze <ds-system-wide-alert-form> for accessibility issues
|
||||
testA11y('ds-system-wide-alert-form');
|
||||
});
|
||||
});
|
@@ -101,11 +101,11 @@ Cypress.Commands.add('login', login);
|
||||
*/
|
||||
function loginViaForm(email: string, password: string): void {
|
||||
// Enter email
|
||||
cy.get('ds-log-in [data-test="email"]').type(email);
|
||||
cy.get('[data-test="email"]').type(email);
|
||||
// Enter password
|
||||
cy.get('ds-log-in [data-test="password"]').type(password);
|
||||
cy.get('[data-test="password"]').type(password);
|
||||
// Click login button
|
||||
cy.get('ds-log-in [data-test="login-button"]').click();
|
||||
cy.get('[data-test="login-button"]').click();
|
||||
}
|
||||
// Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
|
||||
Cypress.Commands.add('loginViaForm', loginViaForm);
|
||||
|
@@ -54,9 +54,9 @@ before(() => {
|
||||
|
||||
// Runs once before the first test in each "block"
|
||||
beforeEach(() => {
|
||||
// Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
|
||||
// Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
|
||||
// This just ensures it doesn't get in the way of matching other objects in the page.
|
||||
cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
|
||||
cy.setCookie('orejime-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true,"correlation-id":true,"accessibility":true}');
|
||||
|
||||
// Remove any CSRF cookies saved from prior tests
|
||||
cy.clearCookie(DSPACE_XSRF_COOKIE);
|
||||
|
@@ -1,10 +1,16 @@
|
||||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"include": [
|
||||
"**/*.ts"
|
||||
"**/*.ts",
|
||||
"../cypress.config.ts"
|
||||
],
|
||||
"compilerOptions": {
|
||||
"sourceMap": false,
|
||||
"typeRoots": [
|
||||
"../node_modules",
|
||||
"../node_modules/@types",
|
||||
"../src/typings.d.ts"
|
||||
],
|
||||
"types": [
|
||||
"cypress",
|
||||
"cypress-axe",
|
||||
|
@@ -59,19 +59,19 @@ A default/demo version of this image is built *automatically*.
|
||||
|
||||
## To refresh / pull DSpace images from Dockerhub
|
||||
```
|
||||
docker-compose -f docker/docker-compose.yml pull
|
||||
docker compose -f docker/docker-compose.yml pull
|
||||
```
|
||||
|
||||
## To build DSpace images using code in your branch
|
||||
```
|
||||
docker-compose -f docker/docker-compose.yml build
|
||||
docker compose -f docker/docker-compose.yml build
|
||||
```
|
||||
|
||||
## To start DSpace (REST and Angular) from your branch
|
||||
|
||||
This command provides a quick way to start both the frontend & backend from this single codebase
|
||||
```
|
||||
docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
|
||||
docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
|
||||
```
|
||||
|
||||
Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
|
||||
@@ -86,14 +86,14 @@ _The system will be started in 2 steps. Each step shares the same docker network
|
||||
|
||||
From 'DSpace/DSpace' clone (build first as needed):
|
||||
```
|
||||
docker-compose -p d8 up -d
|
||||
docker compose -p d8 up -d
|
||||
```
|
||||
|
||||
NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
|
||||
|
||||
From 'DSpace/dspace-angular' clone (build first as needed)
|
||||
```
|
||||
docker-compose -p d8 -f docker/docker-compose.yml up -d
|
||||
docker compose -p d8 -f docker/docker-compose.yml up -d
|
||||
```
|
||||
|
||||
At this point, you should be able to access the UI from http://localhost:4000,
|
||||
@@ -105,21 +105,21 @@ This allows you to run the Angular UI in *production* mode, pointing it at the d
|
||||
(https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
|
||||
|
||||
```
|
||||
docker-compose -f docker/docker-compose-dist.yml pull
|
||||
docker-compose -f docker/docker-compose-dist.yml build
|
||||
docker-compose -p d8 -f docker/docker-compose-dist.yml up -d
|
||||
docker compose -f docker/docker-compose-dist.yml pull
|
||||
docker compose -f docker/docker-compose-dist.yml build
|
||||
docker compose -p d8 -f docker/docker-compose-dist.yml up -d
|
||||
```
|
||||
|
||||
## Ingest test data from AIPDIR
|
||||
|
||||
Create an administrator
|
||||
```
|
||||
docker-compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
|
||||
docker compose -p d8 -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
|
||||
```
|
||||
|
||||
Load content from AIP files
|
||||
```
|
||||
docker-compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
|
||||
docker compose -p d8 -f docker/cli.yml -f ./docker/cli.ingest.yml run --rm dspace-cli
|
||||
```
|
||||
|
||||
## Alternative Ingest - Use Entities dataset
|
||||
@@ -127,12 +127,12 @@ _Delete your docker volumes or use a unique project (-p) name_
|
||||
|
||||
Start DSpace with Database Content from a database dump
|
||||
```
|
||||
docker-compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
|
||||
docker compose -p d8 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml -f docker/db.entities.yml up -d
|
||||
```
|
||||
|
||||
Load assetstore content and trigger a re-index of the repository
|
||||
```
|
||||
docker-compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
|
||||
docker compose -p d8 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
|
||||
```
|
||||
|
||||
## End to end testing of the REST API (runs in GitHub Actions CI).
|
||||
@@ -140,5 +140,5 @@ _In this instance, only the REST api runs in Docker using the Entities dataset.
|
||||
|
||||
This command is only really useful for testing our Continuous Integration process.
|
||||
```
|
||||
docker-compose -p d8ci -f docker/docker-compose-ci.yml up -d
|
||||
docker compose -p d8ci -f docker/docker-compose-ci.yml up -d
|
||||
```
|
||||
|
@@ -21,7 +21,7 @@ networks:
|
||||
external: true
|
||||
services:
|
||||
dspace-cli:
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
|
||||
container_name: dspace-cli
|
||||
environment:
|
||||
# Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
|
||||
|
@@ -14,7 +14,7 @@
|
||||
# # Therefore, it should be kept in sync with that file
|
||||
services:
|
||||
dspacedb:
|
||||
image: dspace/dspace-postgres-pgcrypto::${DSPACE_VER:-latest}-loadsql
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
|
||||
environment:
|
||||
# This LOADSQL should be kept in sync with the URL in DSpace/DSpace
|
||||
# This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
|
||||
|
@@ -33,7 +33,7 @@ services:
|
||||
# This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
|
||||
solr__D__statistics__P__autoCommit: 'false'
|
||||
LOGGING_CONFIG: /dspace/config/log4j2-container.xml
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
|
||||
depends_on:
|
||||
- dspacedb
|
||||
networks:
|
||||
@@ -60,7 +60,7 @@ services:
|
||||
# NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
|
||||
dspacedb:
|
||||
container_name: dspacedb
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
|
||||
environment:
|
||||
# This LOADSQL should be kept in sync with the LOADSQL in
|
||||
# https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
|
||||
@@ -81,7 +81,7 @@ services:
|
||||
# DSpace Solr container
|
||||
dspacesolr:
|
||||
container_name: dspacesolr
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
|
||||
networks:
|
||||
- dspacenet
|
||||
ports:
|
||||
@@ -93,7 +93,10 @@ services:
|
||||
volumes:
|
||||
# Keep Solr data directory between reboots
|
||||
- solr_data:/var/solr/data
|
||||
# Initialize all DSpace Solr cores using the mounted configsets (see above), then start Solr
|
||||
# NOTE: We are not running Solr as "root", but we need root permissions to copy our cores to the mounted
|
||||
# /var/solr/data directory. Then we start Solr as the "solr" user.
|
||||
user: root
|
||||
# Initialize all DSpace Solr cores, then start Solr
|
||||
entrypoint:
|
||||
- /bin/bash
|
||||
- '-c'
|
||||
@@ -111,7 +114,8 @@ services:
|
||||
cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
|
||||
precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
|
||||
cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
|
||||
exec solr -f
|
||||
chown -R solr:solr /var/solr
|
||||
runuser -u solr -- solr-foreground
|
||||
volumes:
|
||||
assetstore:
|
||||
pgdata:
|
||||
|
@@ -26,7 +26,7 @@ services:
|
||||
DSPACE_REST_HOST: sandbox.dspace.org
|
||||
DSPACE_REST_PORT: 443
|
||||
DSPACE_REST_NAMESPACE: /server
|
||||
image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}-dist"
|
||||
build:
|
||||
context: ..
|
||||
dockerfile: Dockerfile.dist
|
||||
|
@@ -40,7 +40,7 @@ services:
|
||||
# from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
|
||||
proxies__P__trusted__P__ipranges: '172.23.0'
|
||||
LOGGING_CONFIG: /dspace/config/log4j2-container.xml
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
|
||||
depends_on:
|
||||
- dspacedb
|
||||
networks:
|
||||
@@ -68,7 +68,7 @@ services:
|
||||
dspacedb:
|
||||
container_name: dspacedb
|
||||
# Uses a custom Postgres image with pgcrypto installed
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
|
||||
environment:
|
||||
PGDATA: /pgdata
|
||||
POSTGRES_PASSWORD: dspace
|
||||
@@ -85,7 +85,7 @@ services:
|
||||
# DSpace Solr container
|
||||
dspacesolr:
|
||||
container_name: dspacesolr
|
||||
image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
|
||||
networks:
|
||||
- dspacenet
|
||||
ports:
|
||||
@@ -97,11 +97,16 @@ services:
|
||||
volumes:
|
||||
# Keep Solr data directory between reboots
|
||||
- solr_data:/var/solr/data
|
||||
# NOTE: We are not running Solr as "root", but we need root permissions to copy our cores to the mounted
|
||||
# /var/solr/data directory. Then we start Solr as the "solr" user.
|
||||
user: root
|
||||
# Initialize all DSpace Solr cores using the mounted local configsets (see above), then start Solr
|
||||
# * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
|
||||
# * Second, copy configsets to this core:
|
||||
# Updates to Solr configs require the container to be rebuilt/restarted:
|
||||
# `docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
|
||||
# `docker compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
|
||||
# * Third, ensure all new folders are owned by "solr" user
|
||||
# * Finally, start Solr as the "solr" user via the provided solr-foreground script
|
||||
entrypoint:
|
||||
- /bin/bash
|
||||
- '-c'
|
||||
@@ -119,7 +124,8 @@ services:
|
||||
cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
|
||||
precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
|
||||
cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
|
||||
exec solr -f
|
||||
chown -R solr:solr /var/solr
|
||||
runuser -u solr -- solr-foreground
|
||||
volumes:
|
||||
assetstore:
|
||||
pgdata:
|
||||
|
@@ -23,7 +23,7 @@ services:
|
||||
DSPACE_REST_HOST: localhost
|
||||
DSPACE_REST_PORT: 8080
|
||||
DSPACE_REST_NAMESPACE: /server
|
||||
image: dspace/dspace-angular:${DSPACE_VER:-latest}
|
||||
image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}"
|
||||
build:
|
||||
context: ..
|
||||
dockerfile: Dockerfile
|
||||
|
@@ -15,7 +15,7 @@ DSPACE_APP_CONFIG_PATH=/usr/local/dspace/config/config.yml
|
||||
Configuration options can be overridden by setting environment variables.
|
||||
|
||||
## Nodejs server
|
||||
When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itsself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
|
||||
When you start dspace-angular on node, it spins up an http server on which it listens for incoming connections. You can define the ip address and port the server should bind itself to, and if ssl should be enabled not. By default it listens on `localhost:4000`. If you want it to listen on all your network connections, configure it to bind itself to `0.0.0.0`.
|
||||
|
||||
To change this configuration, change the options `ui.host`, `ui.port` and `ui.ssl` in the appropriate configuration file (see above):
|
||||
|
||||
|
@@ -2,3 +2,4 @@
|
||||
_______
|
||||
|
||||
- [`dspace-angular-html/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via the selector of their `ThemedComponent` wrapper class
|
||||
- [`dspace-angular-html/no-disabled-attribute-on-button`](./rules/no-disabled-attribute-on-button.md): Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
|
||||
|
90
docs/lint/html/rules/no-disabled-attribute-on-button.md
Normal file
90
docs/lint/html/rules/no-disabled-attribute-on-button.md
Normal file
@@ -0,0 +1,90 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [HTML rules](../index.md) > `dspace-angular-html/no-disabled-attribute-on-button`
|
||||
_______
|
||||
|
||||
Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
|
||||
This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
|
||||
The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/html/no-disabled-attribute-on-button.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### should use [dsBtnDisabled] in HTML templates
|
||||
|
||||
```html
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
```
|
||||
|
||||
|
||||
##### disabled attribute is still valid on non-button elements
|
||||
|
||||
```html
|
||||
<input disabled>
|
||||
```
|
||||
|
||||
|
||||
##### [disabled] attribute is still valid on non-button elements
|
||||
|
||||
```html
|
||||
<input [disabled]="true">
|
||||
```
|
||||
|
||||
|
||||
##### angular dynamic attributes that use disabled are still valid
|
||||
|
||||
```html
|
||||
<button [class.disabled]="isDisabled">Submit</button>
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### should not use disabled attribute in HTML templates
|
||||
|
||||
```html
|
||||
<button disabled>Submit</button>
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```html
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
```
|
||||
|
||||
|
||||
##### should not use [disabled] attribute in HTML templates
|
||||
|
||||
```html
|
||||
<button [disabled]="true">Submit</button>
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```html
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
```
|
||||
|
||||
|
||||
|
@@ -11,6 +11,8 @@ _______
|
||||
|
||||
[Source code](../../../../lint/src/rules/html/themed-component-usages.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
@@ -24,6 +26,7 @@ _______
|
||||
<ds-test-themeable [test]="something"></ds-test-themeable>
|
||||
```
|
||||
|
||||
|
||||
##### use no-prefix selectors in TypeScript templates
|
||||
|
||||
```html
|
||||
@@ -34,6 +37,7 @@ class Test {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### use no-prefix selectors in TypeScript test templates
|
||||
|
||||
Filename: `lint/test/fixture/src/test.spec.ts`
|
||||
@@ -46,6 +50,7 @@ class Test {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### base selectors are also allowed in TypeScript test templates
|
||||
|
||||
Filename: `lint/test/fixture/src/test.spec.ts`
|
||||
@@ -61,6 +66,7 @@ class Test {
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### themed override selectors are not allowed in HTML templates
|
||||
@@ -69,6 +75,9 @@ class Test {
|
||||
<ds-themed-test-themeable/>
|
||||
<ds-themed-test-themeable></ds-themed-test-themeable>
|
||||
<ds-themed-test-themeable [test]="something"></ds-themed-test-themeable>
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -91,6 +100,9 @@ Result of `yarn lint --fix`:
|
||||
<ds-base-test-themeable/>
|
||||
<ds-base-test-themeable></ds-base-test-themeable>
|
||||
<ds-base-test-themeable [test]="something"></ds-base-test-themeable>
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
|
@@ -1,6 +1,11 @@
|
||||
[DSpace ESLint plugins](../../../lint/README.md) > TypeScript rules
|
||||
_______
|
||||
|
||||
- [`dspace-angular-ts/alias-imports`](./rules/alias-imports.md): Unclear imports should be aliased for clarity
|
||||
- [`dspace-angular-ts/sort-standalone-imports`](./rules/sort-standalone-imports.md): Sorts the standalone `@Component` imports alphabetically
|
||||
- [`dspace-angular-ts/themed-component-classes`](./rules/themed-component-classes.md): Formatting rules for themeable component classes
|
||||
- [`dspace-angular-ts/themed-component-selectors`](./rules/themed-component-selectors.md): Themeable component selectors should follow the DSpace convention
|
||||
- [`dspace-angular-ts/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via their `ThemedComponent` wrapper class
|
||||
- [`dspace-angular-ts/themed-decorators`](./rules/themed-decorators.md): Entry components with theme support should declare the correct theme
|
||||
- [`dspace-angular-ts/themed-wrapper-no-input-defaults`](./rules/themed-wrapper-no-input-defaults.md): ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))
|
||||
- [`dspace-angular-ts/unique-decorators`](./rules/unique-decorators.md): Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)
|
||||
|
148
docs/lint/ts/rules/alias-imports.md
Normal file
148
docs/lint/ts/rules/alias-imports.md
Normal file
@@ -0,0 +1,148 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/alias-imports`
|
||||
_______
|
||||
|
||||
Unclear imports should be aliased for clarity
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/alias-imports.ts)
|
||||
|
||||
|
||||
### Options
|
||||
|
||||
#### `aliases`
|
||||
|
||||
A list of all the imports that you want to alias for clarity. Every alias should be declared in the following format:
|
||||
```json
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "of",
|
||||
"local": "observableOf"
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### correctly aliased imports
|
||||
|
||||
```typescript
|
||||
import { of as observableOf } from 'rxjs';
|
||||
```
|
||||
|
||||
With options:
|
||||
|
||||
```json
|
||||
{
|
||||
"aliases": [
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "of",
|
||||
"local": "observableOf"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### enforce unaliased import
|
||||
|
||||
```typescript
|
||||
import { combineLatest } from 'rxjs';
|
||||
```
|
||||
|
||||
With options:
|
||||
|
||||
```json
|
||||
{
|
||||
"aliases": [
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "combineLatest",
|
||||
"local": "combineLatest"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### imports without alias
|
||||
|
||||
```typescript
|
||||
import { of } from 'rxjs';
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
This import must be aliased
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
import { of as observableOf } from 'rxjs';
|
||||
```
|
||||
|
||||
|
||||
##### imports under the wrong alias
|
||||
|
||||
```typescript
|
||||
import { of as ofSomething } from 'rxjs';
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
This import uses the wrong alias (should be {{ local }})
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
import { of as observableOf } from 'rxjs';
|
||||
```
|
||||
|
||||
|
||||
##### disallow aliasing import
|
||||
|
||||
```typescript
|
||||
import { combineLatest as observableCombineLatest } from 'rxjs';
|
||||
|
||||
|
||||
With options:
|
||||
|
||||
```json
|
||||
{
|
||||
"aliases": [
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "combineLatest",
|
||||
"local": "combineLatest"
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
This import should not use an alias
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
import { combineLatest } from 'rxjs';
|
||||
```
|
||||
|
||||
|
||||
|
245
docs/lint/ts/rules/sort-standalone-imports.md
Normal file
245
docs/lint/ts/rules/sort-standalone-imports.md
Normal file
@@ -0,0 +1,245 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/sort-standalone-imports`
|
||||
_______
|
||||
|
||||
Sorts the standalone `@Component` imports alphabetically
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/sort-standalone-imports.ts)
|
||||
|
||||
|
||||
### Options
|
||||
|
||||
#### `locale`
|
||||
|
||||
The locale used to sort the imports.,
|
||||
#### `maxItems`
|
||||
|
||||
The maximum number of imports that should be displayed before each import is separated onto its own line.,
|
||||
#### `indent`
|
||||
|
||||
The indent used for the project.,
|
||||
#### `trailingComma`
|
||||
|
||||
Whether the last import should have a trailing comma (only applicable for multiline imports).
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### should sort multiple imports on separate lines
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
##### should not inlines singular imports when maxItems is 0
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
##### should inline singular imports when maxItems is 1
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
With options:
|
||||
|
||||
```json
|
||||
{
|
||||
"maxItems": 1
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### should sort multiple imports alphabetically
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
AsyncPipe,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Standalone imports should be sorted alphabetically
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
##### should not put singular imports on one line when maxItems is 0
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Standalone imports should be sorted alphabetically
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
##### should not put singular imports on a separate line when maxItems is 1
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
|
||||
|
||||
With options:
|
||||
|
||||
```json
|
||||
{
|
||||
"maxItems": 1
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Standalone imports should be sorted alphabetically
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
##### should not display multiple imports on the same line
|
||||
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [AsyncPipe, RootComponent],
|
||||
})
|
||||
export class AppComponent {}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Standalone imports should be sorted alphabetically
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}
|
||||
```
|
||||
|
||||
|
||||
|
@@ -11,6 +11,8 @@ _______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/themed-component-classes.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
@@ -27,6 +29,7 @@ class Something {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Base component
|
||||
|
||||
```typescript
|
||||
@@ -34,10 +37,11 @@ class Something {
|
||||
selector: 'ds-base-test-themable',
|
||||
standalone: true,
|
||||
})
|
||||
class TestThemeableTomponent {
|
||||
class TestThemeableComponent {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Wrapper component
|
||||
|
||||
Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
|
||||
@@ -50,10 +54,11 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
|
||||
TestThemeableComponent,
|
||||
],
|
||||
})
|
||||
class ThemedTestThemeableTomponent extends ThemedComponent<TestThemeableComponent> {
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Override component
|
||||
|
||||
Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.ts`
|
||||
@@ -70,6 +75,7 @@ class Override extends BaseComponent {
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### Base component must be standalone
|
||||
@@ -80,6 +86,9 @@ class Override extends BaseComponent {
|
||||
})
|
||||
class TestThemeableComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -107,6 +116,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
|
||||
})
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -137,6 +149,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
|
||||
})
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -171,6 +186,9 @@ import { SomethingElse } from './somewhere-else';
|
||||
})
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -207,6 +225,9 @@ import { Something, SomethingElse } from './somewhere-else';
|
||||
})
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -237,6 +258,9 @@ Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.t
|
||||
})
|
||||
class Override extends BaseComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
|
@@ -17,6 +17,8 @@ _______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/themed-component-selectors.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
@@ -32,6 +34,7 @@ class Something {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Themeable component selector should replace the original version, unthemed version should be changed to ds-base-
|
||||
|
||||
```typescript
|
||||
@@ -54,6 +57,7 @@ class OverrideSomething extends Something {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Other themed component wrappers should not interfere
|
||||
|
||||
```typescript
|
||||
@@ -73,6 +77,7 @@ class ThemedSomethingElse extends ThemedComponent<SomethingElse> {
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### Wrong selector for base component
|
||||
@@ -85,6 +90,9 @@ Filename: `lint/test/fixture/src/app/test/test-themeable.component.ts`
|
||||
})
|
||||
class TestThemeableComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -111,6 +119,9 @@ Filename: `lint/test/fixture/src/app/test/themed-test-themeable.component.ts`
|
||||
})
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -137,6 +148,9 @@ Filename: `lint/test/fixture/src/themes/test/app/test/test-themeable.component.t
|
||||
})
|
||||
class TestThememeableComponent extends BaseComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
|
@@ -15,6 +15,8 @@ _______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/themed-component-usages.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
@@ -31,6 +33,7 @@ const config = {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### allow base class in class declaration
|
||||
|
||||
```typescript
|
||||
@@ -38,6 +41,7 @@ export class TestThemeableComponent {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### allow inheriting from base class
|
||||
|
||||
```typescript
|
||||
@@ -47,6 +51,7 @@ export class ThemedAdminSidebarComponent extends ThemedComponent<TestThemeableCo
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### allow base class in ViewChild
|
||||
|
||||
```typescript
|
||||
@@ -57,6 +62,7 @@ export class Something {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### allow wrapper selectors in test queries
|
||||
|
||||
Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
|
||||
@@ -66,6 +72,7 @@ By.css('ds-themeable');
|
||||
By.css('#test > ds-themeable > #nest');
|
||||
```
|
||||
|
||||
|
||||
##### allow wrapper selectors in cypress queries
|
||||
|
||||
Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
|
||||
@@ -78,6 +85,7 @@ By.css('#test > ds-themeable > #nest');
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### disallow direct usages of base class
|
||||
@@ -90,6 +98,9 @@ const config = {
|
||||
a: TestThemeableComponent,
|
||||
b: TestComponent,
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -120,6 +131,9 @@ const config = {
|
||||
b: TestComponent,
|
||||
c: Something,
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -150,6 +164,9 @@ const DECLARATIONS = [
|
||||
Something,
|
||||
ThemedTestThemeableComponent,
|
||||
];
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -173,6 +190,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
|
||||
```typescript
|
||||
By.css('ds-themed-themeable');
|
||||
By.css('#test > ds-themed-themeable > #nest');
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -194,6 +214,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.spec.ts`
|
||||
```typescript
|
||||
By.css('ds-base-themeable');
|
||||
By.css('#test > ds-base-themeable > #nest');
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -215,6 +238,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
|
||||
```typescript
|
||||
cy.get('ds-themed-themeable');
|
||||
cy.get('#test > ds-themed-themeable > #nest');
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -236,6 +262,9 @@ Filename: `lint/test/fixture/src/app/test/test.component.cy.ts`
|
||||
```typescript
|
||||
cy.get('ds-base-themeable');
|
||||
cy.get('#test > ds-base-themeable > #nest');
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -266,6 +295,9 @@ import { TestThemeableComponent } from '../../../../app/test/test-themeable.comp
|
||||
})
|
||||
export class UsageComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
@@ -306,6 +338,9 @@ import { ThemedTestThemeableComponent } from '../../../../app/test/themed-test-t
|
||||
})
|
||||
export class UsageComponent {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
|
183
docs/lint/ts/rules/themed-decorators.md
Normal file
183
docs/lint/ts/rules/themed-decorators.md
Normal file
@@ -0,0 +1,183 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/themed-decorators`
|
||||
_______
|
||||
|
||||
Entry components with theme support should declare the correct theme
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/themed-decorators.ts)
|
||||
|
||||
|
||||
### Options
|
||||
|
||||
#### `decorators`
|
||||
|
||||
A mapping for all the existing themeable decorators, with the decorator name as the key and the index of the `theme` argument as the value.
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### theme file declares the correct theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/themes/test/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### plain file declares no theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### plain file declares explicit undefined theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### test file declares theme outside of theme directory
|
||||
|
||||
Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.spec.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### only track configured decorators
|
||||
|
||||
Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@something('test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code & automatic fixes
|
||||
|
||||
##### theme file declares the wrong theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/themes/test/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Wrong theme declaration in decorator
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### plain file declares a theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
There is a theme declaration in decorator, but this file is not part of a theme
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### theme file declares no theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/themes/test-2/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
No theme declaration in decorator
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### theme file declares explicit undefined theme in @listableObjectComponent
|
||||
|
||||
Filename: `lint/test/fixture/src/themes/test-2/app/dynamic-component/dynamic-component.ts`
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
No theme declaration in decorator
|
||||
```
|
||||
|
||||
Result of `yarn lint --fix`:
|
||||
```typescript
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
92
docs/lint/ts/rules/themed-wrapper-no-input-defaults.md
Normal file
92
docs/lint/ts/rules/themed-wrapper-no-input-defaults.md
Normal file
@@ -0,0 +1,92 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/themed-wrapper-no-input-defaults`
|
||||
_______
|
||||
|
||||
ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/themed-wrapper-no-input-defaults.ts)
|
||||
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### ThemedComponent wrapper defines an input without a default value
|
||||
|
||||
```typescript
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test;
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### Regular class defines an input with a default value
|
||||
|
||||
```typescript
|
||||
export class Test {
|
||||
|
||||
@Input()
|
||||
test = 'test';
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code
|
||||
|
||||
##### ThemedComponent wrapper defines an input with a default value
|
||||
|
||||
```typescript
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test1 = 'test';
|
||||
|
||||
@Input()
|
||||
test2 = true;
|
||||
|
||||
@Input()
|
||||
test2: number = 123;
|
||||
|
||||
@Input()
|
||||
test3: number[] = [1,2,3];
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
ThemedComponent wrapper declares inputs with defaults
|
||||
ThemedComponent wrapper declares inputs with defaults
|
||||
ThemedComponent wrapper declares inputs with defaults
|
||||
ThemedComponent wrapper declares inputs with defaults
|
||||
```
|
||||
|
||||
|
||||
##### ThemedComponent wrapper defines an input with an undefined default value
|
||||
|
||||
```typescript
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test = undefined;
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
ThemedComponent wrapper declares inputs with defaults
|
||||
```
|
||||
|
||||
|
||||
|
86
docs/lint/ts/rules/unique-decorators.md
Normal file
86
docs/lint/ts/rules/unique-decorators.md
Normal file
@@ -0,0 +1,86 @@
|
||||
[DSpace ESLint plugins](../../../../lint/README.md) > [TypeScript rules](../index.md) > `dspace-angular-ts/unique-decorators`
|
||||
_______
|
||||
|
||||
Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)
|
||||
|
||||
_______
|
||||
|
||||
[Source code](../../../../lint/src/rules/ts/unique-decorators.ts)
|
||||
|
||||
|
||||
### Options
|
||||
|
||||
#### `decorators`
|
||||
|
||||
The list of all the decorators for which you want to enforce this behavior.
|
||||
|
||||
|
||||
### Examples
|
||||
|
||||
|
||||
#### Valid code
|
||||
|
||||
##### checked decorator, no repetitions
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b')
|
||||
export class B {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3)
|
||||
export class C {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3, Enum.TEST1)
|
||||
export class C {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3, Enum.TEST2)
|
||||
export class C {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
##### unchecked decorator, some repetitions
|
||||
|
||||
```typescript
|
||||
@something(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@something(a)
|
||||
export class B {
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#### Invalid code
|
||||
|
||||
##### checked decorator, some repetitions
|
||||
|
||||
```typescript
|
||||
@listableObjectComponent(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a)
|
||||
export class B {
|
||||
}
|
||||
|
||||
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
Duplicate decorator call
|
||||
```
|
||||
|
||||
|
||||
|
@@ -10,10 +10,13 @@ import {
|
||||
bundle,
|
||||
RuleExports,
|
||||
} from '../../util/structure';
|
||||
import * as noDisabledAttributeOnButton from './no-disabled-attribute-on-button';
|
||||
import * as themedComponentUsages from './themed-component-usages';
|
||||
|
||||
const index = [
|
||||
themedComponentUsages,
|
||||
noDisabledAttributeOnButton,
|
||||
|
||||
] as unknown as RuleExports[];
|
||||
|
||||
export = {
|
||||
|
148
lint/src/rules/html/no-disabled-attribute-on-button.ts
Normal file
148
lint/src/rules/html/no-disabled-attribute-on-button.ts
Normal file
@@ -0,0 +1,148 @@
|
||||
import {
|
||||
TmplAstBoundAttribute,
|
||||
TmplAstTextAttribute,
|
||||
} from '@angular-eslint/bundled-angular-compiler';
|
||||
import { TemplateParserServices } from '@angular-eslint/utils';
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
} from '@typescript-eslint/utils';
|
||||
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
} from '../../util/structure';
|
||||
import { getSourceCode } from '../../util/typescript';
|
||||
|
||||
export enum Message {
|
||||
USE_DSBTN_DISABLED = 'mustUseDsBtnDisabled',
|
||||
}
|
||||
|
||||
export const info = {
|
||||
name: 'no-disabled-attribute-on-button',
|
||||
meta: {
|
||||
docs: {
|
||||
description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute.
|
||||
This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
|
||||
The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.`,
|
||||
},
|
||||
type: 'problem',
|
||||
fixable: 'code',
|
||||
schema: [],
|
||||
messages: {
|
||||
[Message.USE_DSBTN_DISABLED]: 'Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.',
|
||||
},
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
} as DSpaceESLintRuleInfo;
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>) {
|
||||
const parserServices = getSourceCode(context).parserServices as TemplateParserServices;
|
||||
|
||||
/**
|
||||
* Some dynamic angular inputs will have disabled as name because of how Angular handles this internally (e.g [class.disabled]="isDisabled")
|
||||
* But these aren't actually the disabled attribute we're looking for, we can determine this by checking the details of the keySpan
|
||||
*/
|
||||
function isOtherAttributeDisabled(node: TmplAstBoundAttribute | TmplAstTextAttribute): boolean {
|
||||
// if the details are not null, and the details are not 'disabled', then it's not the disabled attribute we're looking for
|
||||
return node.keySpan?.details !== null && node.keySpan?.details !== 'disabled';
|
||||
}
|
||||
|
||||
/**
|
||||
* Replace the disabled text with [dsBtnDisabled] in the template
|
||||
*/
|
||||
function replaceDisabledText(text: string ): string {
|
||||
const hasBrackets = text.includes('[') && text.includes(']');
|
||||
const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]="true"';
|
||||
return text.replace('disabled', newDisabledText);
|
||||
}
|
||||
|
||||
function inputIsChildOfButton(node: any): boolean {
|
||||
return (node.parent?.tagName === 'button' || node.parent?.name === 'button');
|
||||
}
|
||||
|
||||
function reportAndFix(node: TmplAstBoundAttribute | TmplAstTextAttribute) {
|
||||
if (!inputIsChildOfButton(node) || isOtherAttributeDisabled(node)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const sourceSpan = node.sourceSpan;
|
||||
context.report({
|
||||
messageId: Message.USE_DSBTN_DISABLED,
|
||||
loc: parserServices.convertNodeSourceSpanToLoc(sourceSpan),
|
||||
fix(fixer) {
|
||||
const templateText = sourceSpan.start.file.content;
|
||||
const disabledText = templateText.slice(sourceSpan.start.offset, sourceSpan.end.offset);
|
||||
const newText = replaceDisabledText(disabledText);
|
||||
return fixer.replaceTextRange([sourceSpan.start.offset, sourceSpan.end.offset], newText);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
'BoundAttribute[name="disabled"]'(node: TmplAstBoundAttribute) {
|
||||
reportAndFix(node);
|
||||
},
|
||||
'TextAttribute[name="disabled"]'(node: TmplAstTextAttribute) {
|
||||
reportAndFix(node);
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const tests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'should use [dsBtnDisabled] in HTML templates',
|
||||
code: `
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'disabled attribute is still valid on non-button elements',
|
||||
code: `
|
||||
<input disabled>
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: '[disabled] attribute is still valid on non-button elements',
|
||||
code: `
|
||||
<input [disabled]="true">
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'angular dynamic attributes that use disabled are still valid',
|
||||
code: `
|
||||
<button [class.disabled]="isDisabled">Submit</button>
|
||||
`,
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'should not use disabled attribute in HTML templates',
|
||||
code: `
|
||||
<button disabled>Submit</button>
|
||||
`,
|
||||
errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
|
||||
output: `
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'should not use [disabled] attribute in HTML templates',
|
||||
code: `
|
||||
<button [disabled]="true">Submit</button>
|
||||
`,
|
||||
errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
|
||||
output: `
|
||||
<button [dsBtnDisabled]="true">Submit</button>
|
||||
`,
|
||||
},
|
||||
],
|
||||
} as NamedTests;
|
||||
|
||||
export default rule;
|
@@ -7,10 +7,8 @@
|
||||
*/
|
||||
import { TmplAstElement } from '@angular-eslint/bundled-angular-compiler';
|
||||
import { TemplateParserServices } from '@angular-eslint/utils';
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { ESLintUtils } from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import { fixture } from '../../../test/fixture';
|
||||
import {
|
||||
@@ -47,12 +45,13 @@ The only exception to this rule are unit tests, where we may want to use the bas
|
||||
[Message.WRONG_SELECTOR]: 'Themeable components should be used via their ThemedComponent wrapper\'s selector',
|
||||
},
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
} as DSpaceESLintRuleInfo;
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>) {
|
||||
create(context: RuleContext<Message, unknown[]>) {
|
||||
if (getFilename(context).includes('.spec.ts')) {
|
||||
// skip inline templates in unit tests
|
||||
return {};
|
||||
|
304
lint/src/rules/ts/alias-imports.ts
Normal file
304
lint/src/rules/ts/alias-imports.ts
Normal file
@@ -0,0 +1,304 @@
|
||||
import {
|
||||
AST_NODE_TYPES,
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { Scope } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
OptionDoc,
|
||||
} from '../../util/structure';
|
||||
|
||||
export enum Message {
|
||||
MISSING_ALIAS = 'missingAlias',
|
||||
WRONG_ALIAS = 'wrongAlias',
|
||||
MULTIPLE_ALIASES = 'multipleAliases',
|
||||
UNNECESSARY_ALIAS = 'unnecessaryAlias',
|
||||
}
|
||||
|
||||
interface AliasImportOptions {
|
||||
aliases: AliasImportOption[];
|
||||
}
|
||||
|
||||
interface AliasImportOption {
|
||||
package: string;
|
||||
imported: string;
|
||||
local: string;
|
||||
}
|
||||
|
||||
interface AliasImportDocOptions {
|
||||
aliases: OptionDoc;
|
||||
}
|
||||
|
||||
export const info: DSpaceESLintRuleInfo<[AliasImportOptions], [AliasImportDocOptions]> = {
|
||||
name: 'alias-imports',
|
||||
meta: {
|
||||
docs: {
|
||||
description: 'Unclear imports should be aliased for clarity',
|
||||
},
|
||||
messages: {
|
||||
[Message.MISSING_ALIAS]: 'This import must be aliased',
|
||||
[Message.WRONG_ALIAS]: 'This import uses the wrong alias (should be {{ local }})',
|
||||
[Message.MULTIPLE_ALIASES]: 'This import was used twice with a different alias (should be {{ local }})',
|
||||
[Message.UNNECESSARY_ALIAS]: 'This import should not use an alias',
|
||||
},
|
||||
fixable: 'code',
|
||||
type: 'problem',
|
||||
schema: {
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
package: { type: 'string' },
|
||||
imported: { type: 'string' },
|
||||
local: { type: 'string' },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
optionDocs: [
|
||||
{
|
||||
aliases: {
|
||||
title: '`aliases`',
|
||||
description: `A list of all the imports that you want to alias for clarity. Every alias should be declared in the following format:
|
||||
\`\`\`json
|
||||
{
|
||||
"package": "rxjs",
|
||||
"imported": "of",
|
||||
"local": "observableOf"
|
||||
}
|
||||
\`\`\``,
|
||||
},
|
||||
},
|
||||
],
|
||||
defaultOptions: [
|
||||
{
|
||||
aliases: [
|
||||
{
|
||||
package: 'rxjs',
|
||||
imported: 'of',
|
||||
local: 'observableOf',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
|
||||
return (options[0] as AliasImportOptions).aliases.reduce((selectors: any, option: AliasImportOption) => {
|
||||
selectors[`ImportDeclaration[source.value = "${option.package}"] > ImportSpecifier[imported.name = "${option.imported}"][local.name != "${option.local}"]`] = (node: TSESTree.ImportSpecifier) => handleUnaliasedImport(context, option, node);
|
||||
return selectors;
|
||||
}, {});
|
||||
},
|
||||
});
|
||||
|
||||
export const tests: NamedTests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'correctly aliased imports',
|
||||
code: `
|
||||
import { of as observableOf } from 'rxjs';
|
||||
`,
|
||||
options: [
|
||||
{
|
||||
aliases: [
|
||||
{
|
||||
package: 'rxjs',
|
||||
imported: 'of',
|
||||
local: 'observableOf',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
name: 'enforce unaliased import',
|
||||
code: `
|
||||
import { combineLatest } from 'rxjs';
|
||||
`,
|
||||
options: [
|
||||
{
|
||||
aliases: [
|
||||
{
|
||||
package: 'rxjs',
|
||||
imported: 'combineLatest',
|
||||
local: 'combineLatest',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'imports without alias',
|
||||
code: `
|
||||
import { of } from 'rxjs';
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'missingAlias',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
import { of as observableOf } from 'rxjs';
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'imports under the wrong alias',
|
||||
code: `
|
||||
import { of as ofSomething } from 'rxjs';
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'wrongAlias',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
import { of as observableOf } from 'rxjs';
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'disallow aliasing import',
|
||||
code: `
|
||||
import { combineLatest as observableCombineLatest } from 'rxjs';
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'unnecessaryAlias',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
import { combineLatest } from 'rxjs';
|
||||
`,
|
||||
options: [
|
||||
{
|
||||
aliases: [
|
||||
{
|
||||
package: 'rxjs',
|
||||
imported: 'combineLatest',
|
||||
local: 'combineLatest',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
/**
|
||||
* Replaces the incorrectly aliased imports with the ones defined in the defaultOptions
|
||||
*
|
||||
* @param context The current {@link TSESLint.RuleContext}
|
||||
* @param option The current {@link AliasImportOption} that needs to be handled
|
||||
* @param node The incorrect import node that should be fixed
|
||||
*/
|
||||
function handleUnaliasedImport(context: TSESLint.RuleContext<Message, unknown[]>, option: AliasImportOption, node: TSESTree.ImportSpecifier): void {
|
||||
const hasCorrectAliasedImport: boolean = (node.parent as TSESTree.ImportDeclaration).specifiers.find((specifier: TSESTree.ImportClause) => specifier.local.name === option.local && specifier.type === AST_NODE_TYPES.ImportSpecifier && (specifier as TSESTree.ImportSpecifier).imported.name === option.imported) !== undefined;
|
||||
if (option.imported === option.local) {
|
||||
if (hasCorrectAliasedImport) {
|
||||
context.report({
|
||||
messageId: Message.MULTIPLE_ALIASES,
|
||||
data: { local: option.local },
|
||||
node: node,
|
||||
fix(fixer: TSESLint.RuleFixer) {
|
||||
const fixes: TSESLint.RuleFix[] = [];
|
||||
|
||||
const commaAfter = context.sourceCode.getTokenAfter(node, {
|
||||
filter: (token: TSESTree.Token) => token.value === ',',
|
||||
});
|
||||
if (commaAfter) {
|
||||
fixes.push(fixer.removeRange([node.range[0], commaAfter.range[1]]));
|
||||
} else {
|
||||
fixes.push(fixer.remove(node));
|
||||
}
|
||||
fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
|
||||
|
||||
return fixes;
|
||||
},
|
||||
});
|
||||
} else {
|
||||
context.report({
|
||||
messageId: Message.UNNECESSARY_ALIAS,
|
||||
data: { local: option.local },
|
||||
node: node,
|
||||
fix(fixer: TSESLint.RuleFixer) {
|
||||
const fixes: TSESLint.RuleFix[] = [];
|
||||
|
||||
fixes.push(fixer.replaceText(node, option.imported));
|
||||
fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
|
||||
|
||||
return fixes;
|
||||
},
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (hasCorrectAliasedImport) {
|
||||
context.report({
|
||||
messageId: Message.MULTIPLE_ALIASES,
|
||||
data: { local: option.local },
|
||||
node: node,
|
||||
fix(fixer: TSESLint.RuleFixer) {
|
||||
const fixes: TSESLint.RuleFix[] = [];
|
||||
|
||||
const commaAfter = context.sourceCode.getTokenAfter(node, {
|
||||
filter: (token: TSESTree.Token) => token.value === ',',
|
||||
});
|
||||
if (commaAfter) {
|
||||
fixes.push(fixer.removeRange([node.range[0], commaAfter.range[1]]));
|
||||
} else {
|
||||
fixes.push(fixer.remove(node));
|
||||
}
|
||||
fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
|
||||
|
||||
return fixes;
|
||||
},
|
||||
});
|
||||
} else if (node.local.name === node.imported.name) {
|
||||
context.report({
|
||||
messageId: Message.MISSING_ALIAS,
|
||||
node: node,
|
||||
fix(fixer: TSESLint.RuleFixer) {
|
||||
const fixes: TSESLint.RuleFix[] = [];
|
||||
|
||||
fixes.push(fixer.replaceText(node.local, `${option.imported} as ${option.local}`));
|
||||
fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
|
||||
|
||||
return fixes;
|
||||
},
|
||||
});
|
||||
} else {
|
||||
context.report({
|
||||
messageId: Message.WRONG_ALIAS,
|
||||
data: { local: option.local },
|
||||
node: node,
|
||||
fix(fixer: TSESLint.RuleFixer) {
|
||||
const fixes: TSESLint.RuleFix[] = [];
|
||||
|
||||
fixes.push(fixer.replaceText(node.local, option.local));
|
||||
fixes.push(...retrieveUsageReplacementFixes(context, fixer, node, option.local));
|
||||
|
||||
return fixes;
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the {@link TSESLint.RuleFix}s for all the usages of the incorrect import.
|
||||
*
|
||||
* @param context The current {@link TSESLint.RuleContext}
|
||||
* @param fixer The instance {@link TSESLint.RuleFixer}
|
||||
* @param node The node which needs to be replaced
|
||||
* @param newAlias The new import name
|
||||
*/
|
||||
function retrieveUsageReplacementFixes(context: TSESLint.RuleContext<Message, unknown[]>, fixer: TSESLint.RuleFixer, node: TSESTree.ImportSpecifier, newAlias: string): TSESLint.RuleFix[] {
|
||||
return context.sourceCode.getDeclaredVariables(node)[0].references.map((reference: Scope.Reference) => fixer.replaceText(reference.identifier, newAlias));
|
||||
}
|
@@ -10,14 +10,24 @@ import {
|
||||
RuleExports,
|
||||
} from '../../util/structure';
|
||||
/* eslint-disable import/no-namespace */
|
||||
import * as aliasImports from './alias-imports';
|
||||
import * as sortStandaloneImports from './sort-standalone-imports';
|
||||
import * as themedComponentClasses from './themed-component-classes';
|
||||
import * as themedComponentSelectors from './themed-component-selectors';
|
||||
import * as themedComponentUsages from './themed-component-usages';
|
||||
import * as themedDecorators from './themed-decorators';
|
||||
import * as themedWrapperNoInputDefaults from './themed-wrapper-no-input-defaults';
|
||||
import * as uniqueDecorators from './unique-decorators';
|
||||
|
||||
const index = [
|
||||
aliasImports,
|
||||
sortStandaloneImports,
|
||||
themedComponentClasses,
|
||||
themedComponentSelectors,
|
||||
themedComponentUsages,
|
||||
themedDecorators,
|
||||
themedWrapperNoInputDefaults,
|
||||
uniqueDecorators,
|
||||
] as unknown as RuleExports[];
|
||||
|
||||
export = {
|
||||
|
306
lint/src/rules/ts/sort-standalone-imports.ts
Normal file
306
lint/src/rules/ts/sort-standalone-imports.ts
Normal file
@@ -0,0 +1,306 @@
|
||||
import {
|
||||
ASTUtils as TSESLintASTUtils,
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
OptionDoc,
|
||||
} from '../../util/structure';
|
||||
|
||||
const DEFAULT_LOCALE = 'en-US';
|
||||
const DEFAULT_MAX_SIZE = 0;
|
||||
const DEFAULT_SPACE_INDENT_AMOUNT = 2;
|
||||
const DEFAULT_TRAILING_COMMA = true;
|
||||
|
||||
export enum Message {
|
||||
SORT_STANDALONE_IMPORTS_ARRAYS = 'sortStandaloneImportsArrays',
|
||||
}
|
||||
|
||||
export interface UniqueDecoratorsOptions {
|
||||
locale: string;
|
||||
maxItems: number;
|
||||
indent: number;
|
||||
trailingComma: boolean;
|
||||
}
|
||||
|
||||
export interface UniqueDecoratorsDocOptions {
|
||||
locale: OptionDoc;
|
||||
maxItems: OptionDoc;
|
||||
indent: OptionDoc;
|
||||
trailingComma: OptionDoc;
|
||||
}
|
||||
|
||||
export const info: DSpaceESLintRuleInfo<[UniqueDecoratorsOptions], [UniqueDecoratorsDocOptions]> = {
|
||||
name: 'sort-standalone-imports',
|
||||
meta: {
|
||||
docs: {
|
||||
description: 'Sorts the standalone `@Component` imports alphabetically',
|
||||
},
|
||||
messages: {
|
||||
[Message.SORT_STANDALONE_IMPORTS_ARRAYS]: 'Standalone imports should be sorted alphabetically',
|
||||
},
|
||||
fixable: 'code',
|
||||
type: 'problem',
|
||||
schema: [
|
||||
{
|
||||
type: 'object',
|
||||
properties: {
|
||||
locale: {
|
||||
type: 'string',
|
||||
},
|
||||
maxItems: {
|
||||
type: 'number',
|
||||
},
|
||||
indent: {
|
||||
type: 'number',
|
||||
},
|
||||
trailingComma: {
|
||||
type: 'boolean',
|
||||
},
|
||||
},
|
||||
additionalProperties: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
optionDocs: [
|
||||
{
|
||||
locale: {
|
||||
title: '`locale`',
|
||||
description: 'The locale used to sort the imports.',
|
||||
},
|
||||
maxItems: {
|
||||
title: '`maxItems`',
|
||||
description: 'The maximum number of imports that should be displayed before each import is separated onto its own line.',
|
||||
},
|
||||
indent: {
|
||||
title: '`indent`',
|
||||
description: 'The indent used for the project.',
|
||||
},
|
||||
trailingComma: {
|
||||
title: '`trailingComma`',
|
||||
description: 'Whether the last import should have a trailing comma (only applicable for multiline imports).',
|
||||
},
|
||||
},
|
||||
],
|
||||
defaultOptions: [
|
||||
{
|
||||
locale: DEFAULT_LOCALE,
|
||||
maxItems: DEFAULT_MAX_SIZE,
|
||||
indent: DEFAULT_SPACE_INDENT_AMOUNT,
|
||||
trailingComma: DEFAULT_TRAILING_COMMA,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>, [{ locale, maxItems, indent, trailingComma }]: any) {
|
||||
return {
|
||||
['ClassDeclaration > Decorator > CallExpression[callee.name="Component"] > ObjectExpression > Property[key.name="imports"] > ArrayExpression']: (node: TSESTree.ArrayExpression) => {
|
||||
const elements = node.elements.filter((element) => element !== null && (TSESLintASTUtils.isIdentifier(element) || element?.type === TSESTree.AST_NODE_TYPES.CallExpression));
|
||||
const sortedNames: string[] = elements
|
||||
.map((element) => context.sourceCode.getText(element!))
|
||||
.sort((a: string, b: string) => a.localeCompare(b, locale));
|
||||
|
||||
const isSorted: boolean = elements.every((identifier, index) => context.sourceCode.getText(identifier!) === sortedNames[index]);
|
||||
|
||||
const requiresMultiline: boolean = maxItems < node.elements.length;
|
||||
const isMultiline: boolean = /\n/.test(context.sourceCode.getText(node));
|
||||
|
||||
const incorrectFormat: boolean = requiresMultiline !== isMultiline;
|
||||
|
||||
if (isSorted && !incorrectFormat) {
|
||||
return;
|
||||
}
|
||||
|
||||
context.report({
|
||||
node: node.parent,
|
||||
messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
|
||||
fix: (fixer: TSESLint.RuleFixer) => {
|
||||
if (requiresMultiline) {
|
||||
const multilineImports: string = sortedNames
|
||||
.map((name: string) => `${' '.repeat(2 * indent)}${name}${trailingComma ? ',' : ''}`)
|
||||
.join(trailingComma ? '\n' : ',\n');
|
||||
|
||||
return fixer.replaceText(node, `[\n${multilineImports}\n${' '.repeat(indent)}]`);
|
||||
} else {
|
||||
return fixer.replaceText(node, `[${sortedNames.join(', ')}]`);
|
||||
}
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const tests: NamedTests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'should sort multiple imports on separate lines',
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
{
|
||||
name: 'should not inlines singular imports when maxItems is 0',
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
{
|
||||
name: 'should inline singular imports when maxItems is 1',
|
||||
options: [{ maxItems: 1 }],
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'should sort multiple imports alphabetically',
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
AsyncPipe,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
errors: [
|
||||
{
|
||||
messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
{
|
||||
name: 'should not put singular imports on one line when maxItems is 0',
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
errors: [
|
||||
{
|
||||
messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
{
|
||||
name: 'should not put singular imports on a separate line when maxItems is 1',
|
||||
options: [{ maxItems: 1 }],
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
errors: [
|
||||
{
|
||||
messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [RootComponent],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
{
|
||||
name: 'should not display multiple imports on the same line',
|
||||
code: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [AsyncPipe, RootComponent],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
errors: [
|
||||
{
|
||||
messageId: Message.SORT_STANDALONE_IMPORTS_ARRAYS,
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
standalone: true,
|
||||
imports: [
|
||||
AsyncPipe,
|
||||
RootComponent,
|
||||
],
|
||||
})
|
||||
export class AppComponent {}`,
|
||||
},
|
||||
],
|
||||
};
|
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import { fixture } from '../../../test/fixture';
|
||||
import {
|
||||
@@ -52,12 +52,13 @@ export const info = {
|
||||
[Message.WRAPPER_IMPORTS_BASE]: 'Themed component wrapper classes must only import the base class',
|
||||
},
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
} as DSpaceESLintRuleInfo;
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>) {
|
||||
create(context: RuleContext<Message, unknown[]>) {
|
||||
const filename = getFilename(context);
|
||||
|
||||
if (filename.endsWith('.spec.ts')) {
|
||||
@@ -180,7 +181,7 @@ class Something {
|
||||
selector: 'ds-base-test-themable',
|
||||
standalone: true,
|
||||
})
|
||||
class TestThemeableTomponent {
|
||||
class TestThemeableComponent {
|
||||
}
|
||||
`,
|
||||
},
|
||||
@@ -195,7 +196,7 @@ class TestThemeableTomponent {
|
||||
TestThemeableComponent,
|
||||
],
|
||||
})
|
||||
class ThemedTestThemeableTomponent extends ThemedComponent<TestThemeableComponent> {
|
||||
class ThemedTestThemeableComponent extends ThemedComponent<TestThemeableComponent> {
|
||||
}
|
||||
`,
|
||||
},
|
||||
|
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import { fixture } from '../../../test/fixture';
|
||||
import { getComponentSelectorNode } from '../../util/angular';
|
||||
@@ -53,12 +53,13 @@ Unit tests are exempt from this rule, because they may redefine components using
|
||||
[Message.THEMED]: 'Theme override of themeable component should have a selector starting with \'ds-themed-\'',
|
||||
},
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
} as DSpaceESLintRuleInfo;
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>) {
|
||||
create(context: RuleContext<Message, unknown[]>) {
|
||||
const filename = getFilename(context);
|
||||
|
||||
if (filename.endsWith('.spec.ts')) {
|
||||
|
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import { fixture } from '../../../test/fixture';
|
||||
import {
|
||||
@@ -63,12 +63,13 @@ There are a few exceptions where the base class can still be used:
|
||||
[Message.BASE_IN_MODULE]: 'Base themeable components shouldn\'t be declared in modules',
|
||||
},
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
} as DSpaceESLintRuleInfo;
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>) {
|
||||
create(context: RuleContext<Message, unknown[]>) {
|
||||
const filename = getFilename(context);
|
||||
|
||||
function handleUnthemedUsagesInTypescript(node: TSESTree.Identifier) {
|
||||
|
280
lint/src/rules/ts/themed-decorators.ts
Normal file
280
lint/src/rules/ts/themed-decorators.ts
Normal file
@@ -0,0 +1,280 @@
|
||||
import {
|
||||
AST_NODE_TYPES,
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
|
||||
import { fixture } from '../../../test/fixture';
|
||||
import { isTestFile } from '../../util/filter';
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
OptionDoc,
|
||||
} from '../../util/structure';
|
||||
import { getFileTheme } from '../../util/theme-support';
|
||||
|
||||
export enum Message {
|
||||
NO_THEME_DECLARED_IN_THEME_FILE = 'noThemeDeclaredInThemeFile',
|
||||
THEME_DECLARED_IN_NON_THEME_FILE = 'themeDeclaredInNonThemeFile',
|
||||
WRONG_THEME_DECLARED_IN_THEME_FILE = 'wrongThemeDeclaredInThemeFile',
|
||||
}
|
||||
|
||||
interface ThemedDecoratorsOption {
|
||||
decorators: { [name: string]: number };
|
||||
}
|
||||
|
||||
interface ThemedDecoratorsDocsOption {
|
||||
decorators: OptionDoc;
|
||||
}
|
||||
|
||||
export const info: DSpaceESLintRuleInfo<[ThemedDecoratorsOption], [ThemedDecoratorsDocsOption]> = {
|
||||
name: 'themed-decorators',
|
||||
meta: {
|
||||
docs: {
|
||||
description: 'Entry components with theme support should declare the correct theme',
|
||||
},
|
||||
fixable: 'code',
|
||||
messages: {
|
||||
[Message.NO_THEME_DECLARED_IN_THEME_FILE]: 'No theme declaration in decorator',
|
||||
[Message.THEME_DECLARED_IN_NON_THEME_FILE]: 'There is a theme declaration in decorator, but this file is not part of a theme',
|
||||
[Message.WRONG_THEME_DECLARED_IN_THEME_FILE]: 'Wrong theme declaration in decorator',
|
||||
},
|
||||
type: 'problem',
|
||||
schema: [
|
||||
{
|
||||
type: 'object',
|
||||
properties: {
|
||||
decorators: {
|
||||
type: 'object',
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
optionDocs: [
|
||||
{
|
||||
decorators: {
|
||||
title: '`decorators`',
|
||||
description: 'A mapping for all the existing themeable decorators, with the decorator name as the key and the index of the `theme` argument as the value.',
|
||||
},
|
||||
},
|
||||
],
|
||||
defaultOptions: [
|
||||
{
|
||||
decorators: {
|
||||
listableObjectComponent: 3,
|
||||
rendersSectionForMenu: 2,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
|
||||
return {
|
||||
[`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${Object.keys(options[0].decorators).join('|')})$/]`]: (node: TSESTree.CallExpression) => {
|
||||
if (isTestFile(context)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (node.callee.type !== AST_NODE_TYPES.Identifier) {
|
||||
// We only support regular method identifiers
|
||||
return;
|
||||
}
|
||||
|
||||
const fileTheme = getFileTheme(context);
|
||||
const themeDeclaration = getDeclaredTheme(options, node as TSESTree.CallExpression);
|
||||
|
||||
if (themeDeclaration === undefined) {
|
||||
if (fileTheme !== undefined) {
|
||||
context.report({
|
||||
messageId: Message.NO_THEME_DECLARED_IN_THEME_FILE,
|
||||
node: node,
|
||||
fix(fixer) {
|
||||
return fixer.insertTextAfter(node.arguments[node.arguments.length - 1], `, '${fileTheme as string}'`);
|
||||
},
|
||||
});
|
||||
}
|
||||
} else if (themeDeclaration?.type === AST_NODE_TYPES.Literal) {
|
||||
if (fileTheme === undefined) {
|
||||
context.report({
|
||||
messageId: Message.THEME_DECLARED_IN_NON_THEME_FILE,
|
||||
node: themeDeclaration,
|
||||
fix(fixer) {
|
||||
const idx = node.arguments.findIndex((v) => v.range === themeDeclaration.range);
|
||||
|
||||
if (idx === 0) {
|
||||
return fixer.remove(themeDeclaration);
|
||||
} else {
|
||||
const previousArgument = node.arguments[idx - 1];
|
||||
return fixer.removeRange([previousArgument.range[1], themeDeclaration.range[1]]); // todo: comma?
|
||||
}
|
||||
},
|
||||
});
|
||||
} else if (fileTheme !== themeDeclaration?.value) {
|
||||
context.report({
|
||||
messageId: Message.WRONG_THEME_DECLARED_IN_THEME_FILE,
|
||||
node: themeDeclaration,
|
||||
fix(fixer) {
|
||||
return fixer.replaceText(themeDeclaration, `'${fileTheme as string}'`);
|
||||
},
|
||||
});
|
||||
}
|
||||
} else if (themeDeclaration?.type === AST_NODE_TYPES.Identifier && themeDeclaration.name === 'undefined') {
|
||||
if (fileTheme !== undefined) {
|
||||
context.report({
|
||||
messageId: Message.NO_THEME_DECLARED_IN_THEME_FILE,
|
||||
node: node,
|
||||
fix(fixer) {
|
||||
return fixer.replaceText(node.arguments[node.arguments.length - 1], `'${fileTheme as string}'`);
|
||||
},
|
||||
});
|
||||
}
|
||||
} else {
|
||||
throw new Error('Unexpected theme declaration');
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const tests: NamedTests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'theme file declares the correct theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/themes/test/app/dynamic-component/dynamic-component.ts'),
|
||||
},
|
||||
{
|
||||
name: 'plain file declares no theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
|
||||
},
|
||||
{
|
||||
name: 'plain file declares explicit undefined theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
|
||||
},
|
||||
{
|
||||
name: 'test file declares theme outside of theme directory',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/app/dynamic-component/dynamic-component.spec.ts'),
|
||||
},
|
||||
{
|
||||
name: 'only track configured decorators',
|
||||
code: `
|
||||
@something('test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'theme file declares the wrong theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/themes/test/app/dynamic-component/dynamic-component.ts'),
|
||||
errors: [
|
||||
{
|
||||
messageId: 'wrongThemeDeclaredInThemeFile',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'plain file declares a theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/app/dynamic-component/dynamic-component.ts'),
|
||||
errors: [
|
||||
{
|
||||
messageId: 'themeDeclaredInNonThemeFile',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'theme file declares no theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/themes/test-2/app/dynamic-component/dynamic-component.ts'),
|
||||
errors: [
|
||||
{
|
||||
messageId: 'noThemeDeclaredInThemeFile',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'theme file declares explicit undefined theme in @listableObjectComponent',
|
||||
code: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, undefined)
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
filename: fixture('src/themes/test-2/app/dynamic-component/dynamic-component.ts'),
|
||||
errors: [
|
||||
{
|
||||
messageId: 'noThemeDeclaredInThemeFile',
|
||||
},
|
||||
],
|
||||
output: `
|
||||
@listableObjectComponent(something, somethingElse, undefined, 'test-2')
|
||||
export class Something extends SomethingElse {
|
||||
}
|
||||
`,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
function getDeclaredTheme(options: [ThemedDecoratorsOption], decoratorCall: TSESTree.CallExpression): TSESTree.Node | undefined {
|
||||
const index: number = options[0].decorators[(decoratorCall.callee as TSESTree.Identifier).name];
|
||||
|
||||
if (decoratorCall.arguments.length >= index + 1) {
|
||||
return decoratorCall.arguments[index];
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
158
lint/src/rules/ts/themed-wrapper-no-input-defaults.ts
Normal file
158
lint/src/rules/ts/themed-wrapper-no-input-defaults.ts
Normal file
@@ -0,0 +1,158 @@
|
||||
import {
|
||||
ESLintUtils,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
} from '../../util/structure';
|
||||
import { isThemedComponentWrapper } from '../../util/theme-support';
|
||||
|
||||
export enum Message {
|
||||
WRAPPER_HAS_INPUT_DEFAULTS = 'wrapperHasInputDefaults',
|
||||
}
|
||||
|
||||
export const info: DSpaceESLintRuleInfo = {
|
||||
name: 'themed-wrapper-no-input-defaults',
|
||||
meta: {
|
||||
docs: {
|
||||
description: 'ThemedComponent wrappers should not declare input defaults (see [DSpace Angular #2164](https://github.com/DSpace/dspace-angular/pull/2164))',
|
||||
},
|
||||
messages: {
|
||||
[Message.WRAPPER_HAS_INPUT_DEFAULTS]: 'ThemedComponent wrapper declares inputs with defaults',
|
||||
},
|
||||
type: 'problem',
|
||||
schema: [],
|
||||
},
|
||||
optionDocs: [],
|
||||
defaultOptions: [],
|
||||
};
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: RuleContext<any, any>, options: any) {
|
||||
return {
|
||||
'ClassBody > PropertyDefinition > Decorator > CallExpression[callee.name=\'Input\']': (node: TSESTree.CallExpression) => {
|
||||
const classDeclaration = (node?.parent?.parent?.parent as TSESTree.Decorator); // todo: clean this up
|
||||
if (!isThemedComponentWrapper(classDeclaration)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const propertyDefinition: TSESTree.PropertyDefinition = (node.parent.parent as any); // todo: clean this up
|
||||
|
||||
if (propertyDefinition.value !== null) {
|
||||
context.report({
|
||||
messageId: Message.WRAPPER_HAS_INPUT_DEFAULTS,
|
||||
node: propertyDefinition.value,
|
||||
// fix(fixer) {
|
||||
// // todo: don't strip type annotations!
|
||||
// // todo: replace default with appropriate type annotation if not present!
|
||||
// return fixer.removeRange([propertyDefinition.key.range[1], (propertyDefinition.value as any).range[1]]);
|
||||
// }
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const tests: NamedTests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'ThemedComponent wrapper defines an input without a default value',
|
||||
code: `
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test;
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'Regular class defines an input with a default value',
|
||||
code: `
|
||||
export class Test {
|
||||
|
||||
@Input()
|
||||
test = 'test';
|
||||
}
|
||||
`,
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'ThemedComponent wrapper defines an input with a default value',
|
||||
code: `
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test1 = 'test';
|
||||
|
||||
@Input()
|
||||
test2 = true;
|
||||
|
||||
@Input()
|
||||
test2: number = 123;
|
||||
|
||||
@Input()
|
||||
test3: number[] = [1,2,3];
|
||||
}
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'wrapperHasInputDefaults',
|
||||
},
|
||||
{
|
||||
messageId: 'wrapperHasInputDefaults',
|
||||
},
|
||||
{
|
||||
messageId: 'wrapperHasInputDefaults',
|
||||
},
|
||||
{
|
||||
messageId: 'wrapperHasInputDefaults',
|
||||
},
|
||||
],
|
||||
// output: `
|
||||
// export class TTest extends ThemedComponent<Test> {
|
||||
//
|
||||
// @Input()
|
||||
// test1: string;
|
||||
//
|
||||
// @Input()
|
||||
// test2: boolean;
|
||||
//
|
||||
// @Input()
|
||||
// test2: number;
|
||||
//
|
||||
// @Input()
|
||||
// test3: number[];
|
||||
// }
|
||||
// `,
|
||||
},
|
||||
{
|
||||
name: 'ThemedComponent wrapper defines an input with an undefined default value',
|
||||
code: `
|
||||
export class TTest extends ThemedComponent<Test> {
|
||||
|
||||
@Input()
|
||||
test = undefined;
|
||||
}
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'wrapperHasInputDefaults',
|
||||
},
|
||||
],
|
||||
// output: `
|
||||
// export class TTest extends ThemedComponent<Test> {
|
||||
//
|
||||
// @Input()
|
||||
// test;
|
||||
// }
|
||||
// `,
|
||||
},
|
||||
],
|
||||
};
|
226
lint/src/rules/ts/unique-decorators.ts
Normal file
226
lint/src/rules/ts/unique-decorators.ts
Normal file
@@ -0,0 +1,226 @@
|
||||
import {
|
||||
AST_NODE_TYPES,
|
||||
ESLintUtils,
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
|
||||
import { isTestFile } from '../../util/filter';
|
||||
import {
|
||||
DSpaceESLintRuleInfo,
|
||||
NamedTests,
|
||||
OptionDoc,
|
||||
} from '../../util/structure';
|
||||
|
||||
export enum Message {
|
||||
DUPLICATE_DECORATOR_CALL = 'duplicateDecoratorCall',
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the decorators by decoratorName → file → Set<String>
|
||||
*/
|
||||
const decoratorCalls: Map<string, Map<string, Set<string>>> = new Map();
|
||||
|
||||
/**
|
||||
* Keep a list of the files wo contain a decorator. This is done in order to prevent the `Program` selector from being
|
||||
* run for every file.
|
||||
*/
|
||||
const fileWithDecorators: Set<string> = new Set();
|
||||
|
||||
export interface UniqueDecoratorsOptions {
|
||||
decorators: string[];
|
||||
}
|
||||
|
||||
export interface UniqueDecoratorsDocOptions {
|
||||
decorators: OptionDoc;
|
||||
}
|
||||
|
||||
export const info: DSpaceESLintRuleInfo<[UniqueDecoratorsOptions], [UniqueDecoratorsDocOptions]> = {
|
||||
name: 'unique-decorators',
|
||||
meta: {
|
||||
docs: {
|
||||
description: 'Some decorators must be called with unique arguments (e.g. when they construct a mapping based on the argument values)',
|
||||
},
|
||||
messages: {
|
||||
[Message.DUPLICATE_DECORATOR_CALL]: 'Duplicate decorator call',
|
||||
},
|
||||
type: 'problem',
|
||||
schema: [
|
||||
{
|
||||
type: 'object',
|
||||
properties: {
|
||||
decorators: {
|
||||
type: 'array',
|
||||
items: {
|
||||
type: 'string',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
optionDocs: [
|
||||
{
|
||||
decorators: {
|
||||
title: '`decorators`',
|
||||
description: 'The list of all the decorators for which you want to enforce this behavior.',
|
||||
},
|
||||
},
|
||||
],
|
||||
defaultOptions: [
|
||||
{
|
||||
decorators: [
|
||||
'listableObjectComponent', // todo: must take default arguments into account!
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const rule = ESLintUtils.RuleCreator.withoutDocs({
|
||||
...info,
|
||||
create(context: TSESLint.RuleContext<Message, unknown[]>, options: any) {
|
||||
|
||||
return {
|
||||
['Program']: () => {
|
||||
if (fileWithDecorators.has(context.physicalFilename)) {
|
||||
for (const decorator of options[0].decorators) {
|
||||
decoratorCalls.get(decorator)?.get(context.physicalFilename)?.clear();
|
||||
}
|
||||
}
|
||||
},
|
||||
[`ClassDeclaration > Decorator > CallExpression[callee.name=/^(${options[0].decorators.join('|')})$/]`]: (node: TSESTree.CallExpression) => {
|
||||
if (isTestFile(context)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (node.callee.type !== AST_NODE_TYPES.Identifier) {
|
||||
// We only support regular method identifiers
|
||||
return;
|
||||
}
|
||||
|
||||
fileWithDecorators.add(context.physicalFilename);
|
||||
|
||||
if (!isUnique(node, context.physicalFilename)) {
|
||||
context.report({
|
||||
messageId: Message.DUPLICATE_DECORATOR_CALL,
|
||||
node: node,
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
export const tests: NamedTests = {
|
||||
plugin: info.name,
|
||||
valid: [
|
||||
{
|
||||
name: 'checked decorator, no repetitions',
|
||||
code: `
|
||||
@listableObjectComponent(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b')
|
||||
export class B {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3)
|
||||
export class C {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3, Enum.TEST1)
|
||||
export class C {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a, 'b', 3, Enum.TEST2)
|
||||
export class C {
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: 'unchecked decorator, some repetitions',
|
||||
code: `
|
||||
@something(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@something(a)
|
||||
export class B {
|
||||
}
|
||||
`,
|
||||
},
|
||||
],
|
||||
invalid: [
|
||||
{
|
||||
name: 'checked decorator, some repetitions',
|
||||
code: `
|
||||
@listableObjectComponent(a)
|
||||
export class A {
|
||||
}
|
||||
|
||||
@listableObjectComponent(a)
|
||||
export class B {
|
||||
}
|
||||
`,
|
||||
errors: [
|
||||
{
|
||||
messageId: 'duplicateDecoratorCall',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
function callKey(node: TSESTree.CallExpression): string {
|
||||
let key = '';
|
||||
|
||||
for (const arg of node.arguments) {
|
||||
switch ((arg as TSESTree.Node).type) {
|
||||
// todo: can we make this more generic somehow?
|
||||
case AST_NODE_TYPES.Identifier:
|
||||
key += (arg as TSESTree.Identifier).name;
|
||||
break;
|
||||
case AST_NODE_TYPES.Literal:
|
||||
// eslint-disable-next-line @typescript-eslint/no-base-to-string
|
||||
key += (arg as TSESTree.Literal).value;
|
||||
break;
|
||||
case AST_NODE_TYPES.MemberExpression:
|
||||
key += (arg as any).object.name + '.' + (arg as any).property.name;
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Unrecognized decorator argument type: ${arg.type}`);
|
||||
}
|
||||
|
||||
key += ', ';
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
function isUnique(node: TSESTree.CallExpression, filePath: string): boolean {
|
||||
const decorator = (node.callee as TSESTree.Identifier).name;
|
||||
|
||||
if (!decoratorCalls.has(decorator)) {
|
||||
decoratorCalls.set(decorator, new Map());
|
||||
}
|
||||
|
||||
if (!decoratorCalls.get(decorator)!.has(filePath)) {
|
||||
decoratorCalls.get(decorator)!.set(filePath, new Set());
|
||||
}
|
||||
|
||||
const key = callKey(node);
|
||||
|
||||
let unique = true;
|
||||
|
||||
for (const decoratorCallsByFile of decoratorCalls.get(decorator)!.values()) {
|
||||
if (decoratorCallsByFile.has(key)) {
|
||||
unique = !unique;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
decoratorCalls.get(decorator)?.get(filePath)?.add(key);
|
||||
|
||||
return unique;
|
||||
}
|
10
lint/src/util/filter.ts
Normal file
10
lint/src/util/filter.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
/**
|
||||
* Determine whether the current file is a test file
|
||||
* @param context the current ESLint rule context
|
||||
*/
|
||||
export function isTestFile(context: RuleContext<any, any>): boolean {
|
||||
// note: shouldn't use plain .filename (doesn't work in DSpace Angular 7.4)
|
||||
return context.getFilename()?.endsWith('.spec.ts') ;
|
||||
}
|
@@ -5,18 +5,28 @@
|
||||
*
|
||||
* http://www.dspace.org/license/
|
||||
*/
|
||||
import { TSESLint } from '@typescript-eslint/utils';
|
||||
import { RuleTester } from 'eslint';
|
||||
import {
|
||||
InvalidTestCase,
|
||||
RuleMetaData,
|
||||
RuleModule,
|
||||
ValidTestCase,
|
||||
} from '@typescript-eslint/utils/ts-eslint';
|
||||
import { EnumType } from 'typescript';
|
||||
|
||||
export type Meta = TSESLint.RuleMetaData<string>;
|
||||
export type Valid = TSESLint.ValidTestCase<unknown[]> | RuleTester.ValidTestCase;
|
||||
export type Invalid = TSESLint.InvalidTestCase<string, unknown[]> | RuleTester.InvalidTestCase;
|
||||
export type Meta = RuleMetaData<string, unknown[]>;
|
||||
export type Valid = ValidTestCase<unknown[]>;
|
||||
export type Invalid = InvalidTestCase<string, unknown[]>;
|
||||
|
||||
export interface DSpaceESLintRuleInfo {
|
||||
export interface DSpaceESLintRuleInfo<T = unknown[], D = unknown[]> {
|
||||
name: string;
|
||||
meta: Meta,
|
||||
defaultOptions: unknown[],
|
||||
optionDocs: D,
|
||||
defaultOptions: T,
|
||||
}
|
||||
|
||||
export interface OptionDoc {
|
||||
title: string;
|
||||
description: string;
|
||||
}
|
||||
|
||||
export interface NamedTests {
|
||||
@@ -28,7 +38,7 @@ export interface NamedTests {
|
||||
export interface RuleExports {
|
||||
Message: EnumType,
|
||||
info: DSpaceESLintRuleInfo,
|
||||
rule: TSESLint.RuleModule<string>,
|
||||
rule: RuleModule<string>,
|
||||
tests: NamedTests,
|
||||
default: unknown,
|
||||
}
|
||||
|
@@ -7,6 +7,11 @@ _______
|
||||
|
||||
[Source code](../../../../lint/src/rules/<%- plugin.name.replace('dspace-angular-', '') %>/<%- rule.name %>.ts)
|
||||
|
||||
<% if (rule.optionDocs?.length > 0) { %>
|
||||
### Options
|
||||
<%- rule.optionDocs.map(optionDoc => Object.keys(optionDoc).map(option => '\n#### ' + optionDoc[option].title + '\n\n' + optionDoc[option].description)) %>
|
||||
<% } %>
|
||||
|
||||
### Examples
|
||||
|
||||
<% if (tests.valid) {%>
|
||||
@@ -19,6 +24,13 @@ Filename: `<%- test.filename %>`
|
||||
```<%- plugin.language.toLowerCase() %>
|
||||
<%- test.code.trim() %>
|
||||
```
|
||||
<% if (test?.options?.length > 0) { %>
|
||||
With options:
|
||||
|
||||
```json
|
||||
<%- JSON.stringify(test.options[0], null, 2) %>
|
||||
```
|
||||
<% }%>
|
||||
<% }) %>
|
||||
<% } %>
|
||||
|
||||
@@ -31,6 +43,15 @@ Filename: `<%- test.filename %>`
|
||||
<% } %>
|
||||
```<%- plugin.language.toLowerCase() %>
|
||||
<%- test.code.trim() %>
|
||||
|
||||
<% if (test?.options?.length > 0) { %>
|
||||
With options:
|
||||
|
||||
```json
|
||||
<%- JSON.stringify(test.options[0], null, 2) %>
|
||||
```
|
||||
<% }%>
|
||||
|
||||
```
|
||||
Will produce the following error(s):
|
||||
```
|
||||
|
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
import { TSESTree } from '@typescript-eslint/utils';
|
||||
import { RuleContext } from '@typescript-eslint/utils/ts-eslint';
|
||||
import { readFileSync } from 'fs';
|
||||
import { basename } from 'path';
|
||||
import ts, { Identifier } from 'typescript';
|
||||
@@ -263,3 +264,18 @@ export const DISALLOWED_THEME_SELECTORS = 'ds-(base|themed)-';
|
||||
export function fixSelectors(text: string): string {
|
||||
return text.replaceAll(/ds-(base|themed)-/g, 'ds-');
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine the theme of the current file based on its path in the project.
|
||||
* @param context the current ESLint rule context
|
||||
*/
|
||||
export function getFileTheme(context: RuleContext<any, any>): string | undefined {
|
||||
// note: shouldn't use plain .filename (doesn't work in DSpace Angular 7.4)
|
||||
const m = context.getFilename()?.match(/\/src\/themes\/([^/]+)\//);
|
||||
|
||||
if (m?.length === 2) {
|
||||
return m[1];
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
|
@@ -5,17 +5,18 @@
|
||||
*
|
||||
* http://www.dspace.org/license/
|
||||
*/
|
||||
import { TSESTree } from '@typescript-eslint/utils';
|
||||
import {
|
||||
TSESLint,
|
||||
TSESTree,
|
||||
} from '@typescript-eslint/utils';
|
||||
RuleContext,
|
||||
SourceCode,
|
||||
} from '@typescript-eslint/utils/ts-eslint';
|
||||
|
||||
import {
|
||||
match,
|
||||
toUnixStylePath,
|
||||
} from './misc';
|
||||
|
||||
export type AnyRuleContext = TSESLint.RuleContext<string, unknown[]>;
|
||||
export type AnyRuleContext = RuleContext<string, unknown[]>;
|
||||
|
||||
/**
|
||||
* Return the current filename based on the ESLint rule context as a Unix-style path.
|
||||
@@ -27,7 +28,7 @@ export function getFilename(context: AnyRuleContext): string {
|
||||
return toUnixStylePath(context.getFilename());
|
||||
}
|
||||
|
||||
export function getSourceCode(context: AnyRuleContext): TSESLint.SourceCode {
|
||||
export function getSourceCode(context: AnyRuleContext): SourceCode {
|
||||
// TSESLint claims this is deprecated, but the suggested alternative is undefined (could be a version mismatch between ESLint and TSESlint?)
|
||||
// eslint-disable-next-line deprecation/deprecation
|
||||
return context.getSourceCode();
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user