Resolve merge conflicts for TanStack composables - Githubissues

yeatmanlab / roar-dashboard

A dashboard to administer ROAR assessments

https://roar.education

Other

4 stars 4 forks source link

Resolve merge conflicts for TanStack composables #845

Closed maximilianoertel closed 1 week ago

maximilianoertel commented 1 week ago

Proposed changes

This PR updates the ref/318/query-composables branch from main and resolves the expected merge conflicts caused by the merge of PR #790

Types of changes

[ ] Bugfix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
[ ] Refactoring (non-breaking change that does not add functionality but makes code cleaner or more efficient)
[ ] Documentation Update
[ ] Tests (new or updated tests)
[ ] Style (changes to code styling)
[ ] CI (continuous integration changes)
[ ] Repository Maintenance
[x] Other

Checklist

[x] I have read the guidelines for contributing.
[x] The changes in this PR are as small as they can be. They represent one and only one fix or enhancement.
[x] Linting checks pass with my changes.
[x] Any existing unit tests pass with my changes.
[x] Any existing end-to-end tests pass with my changes.
[ ] I have added tests that prove my fix is effective or that my feature works.
[ ] If this PR fixes an existing issue, I have added a unit or end-to-end test that will detect if this issue reoccurs.
[ ] I have added JSDoc comments as appropriate.
[ ] I have added the necessary documentation to the roar-docs repository.
[x] I have shared this PR on the roar-pr-reviews channel (if I have access)
[x] I have linked relevant issues (if any)

Justification of missing checklist items

n/a

Further comments

n/a

github-actions[bot] commented 1 week ago

Coverage Report

Status	Category	Percentage	Covered / Total
🔵	Lines	5.12%	393 / 7667
🔵	Statements	5.01%	424 / 8451
🔵	Functions	6.18%	116 / 1874
🔵	Branches	2.46%	114 / 4621

File Coverage

File	Stmts	% Branch	% Funcs	% Lines	Uncovered Lines
Changed Files
src/App.vue	0%	0%	0%	0%	33, 33-36, 35, 35, 42-44, 46-47, 49-53, 50-52, 55, 55, 57, 59-85, 87-106, 88-89, 91-103, 95-98, 96-97, 99-102, 100-101, 105, 108-119, 109-110, 112-118, 113-118, 115-117, 116
src/components/CardAdministration.vue	0%	0%	0%	0%	174, 176, 188-189, 191, 193-230, 198-220, 203, 205-210, 213-218, 227, 232-236, 233-235, 234, 238-242, 239, 241, 244, 244-245, 245, 247-249, 248, 248, 251-253, 252, 256, 256, 259-260, 262-263, 265-270, 266-268, 267, 269, 272-277, 273-275, 274, 276, 279-282, 280-281, 284-286, 285, 288, 290-292, 294-296, 295, 298-301, 300, 303-305, 304, 304, 307-395, 309-394, 310, 312, 312-313, 313, 315, 317, 321-327, 329-345, 331, 333, 333, 335-342, 347, 351-372, 353-369, 354-364, 359-361, 360, 362, 365, 367-369, 368, 371, 380-390, 381-389, 382-388, 383-387, 384, 384-385, 385-386, 392-393, 397-398, 400-411, 400-411, 413-434, 414-415, 417-418, 420-433, 436-441, 437-440, 438-439, 2, 7-9, 27, 29, 34, 1, 44
src/components/ListUsers.vue	0%	0%	0%	0%	139, 141-143, 145-146, 148, 167-169, 171-233, 235-236, 241, 243-247, 244-246, 249, 251-266, 252, 252-253, 255-265, 258-260, 263-264, 268-271, 269-270, 273-279, 274-277, 274-278, 284-286, 286-302, 305-321, 307-320, 311-316, 319, 325-328, 326, 326-327, 330-332, 331, 331, 334-337, 335, 335-336, 2-3, 1, 5-6, 11-13, 16, 20-22, 28, 58, 65, 74, 38-39, 47, 109, 53, 1-59, 1-67, 78
src/components/NavBar.vue	0%	0%	0%	0%	84-86, 88-90, 92, 94, 98-101, 99, 99-100, 103-105, 104, 104, 109-111, 110, 113-115, 114, 117-120, 118, 118-119, 122-124, 123, 126-128, 130-153, 131-151, 134-144, 135, 137-143, 141, 145-150, 146-149, 152, 155-169, 156-168, 157, 159-162, 161, 163-167, 172-176, 173, 173-174, 174-175, 178, 178, 180-182, 181, 184-190, 185-189, 192-205, 197, 203, 207-233, 208-232, 215, 222, 229, 235-237, 236, 3, 5, 9, 26, 58
src/composables/queries/useAdministrationsListQuery.js	0%	0%	0%	0%	18-47, 20-22, 25-26, 26, 29, 29-30, 30-31, 34-38, 35-37, 40-46, 43
src/constants/orgTypes.js	100%	100%	100%	100%
src/helpers/query/administrations.js	0%	0%	0%	0%	12-17, 13, 16, 20-45, 21-42, 24-26, 28-39, 30-35, 31-34, 33, 36, 41, 44, 47-97, 49-76, 50, 52-61, 60, 62-75, 79-83, 81, 83, 85-86, 88-94, 89, 89-93, 96, 99-143, 100-102, 104-106, 106, 108, 110-124, 112-120, 113-119, 117, 121, 126-130, 132-140, 135, 137, 137-138, 138-139, 142
src/helpers/query/assignments.js	0%	0%	0%	0%	14, 16-30, 32-178, 47-49, 51-62, 52-55, 53-54, 57-61, 58-60, 59, 64-69, 71-157, 72-85, 87-111, 88-102, 96, 104-110, 113-129, 114-128, 122, 131-147, 132-147, 140-146, 149-156, 159-161, 160, 163-175, 164-174, 177, 180-452, 193-204, 197-200, 198-199, 201-203, 202, 205-263, 240-254, 248, 256-262, 264-437, 265-419, 342-350, 352-419, 364-379, 381-419, 400-408, 410-418, 420-436, 421-435, 429, 438-450, 439-449, 451, 454-531, 464-466, 468-477, 469-472, 470-471, 474-476, 475, 479-484, 486-514, 498, 516-528, 517-527, 530, 533-603, 534-535, 538-553, 542-552, 543-552, 545-552, 547-551, 548, 550, 555-602, 556-560, 559, 561-563, 562, 564-575, 574, 577-582, 581, 583-585, 584, 586-588, 587, 589-601, 600, 605-979, 617-620, 623-638, 627-637, 628-637, 630-637, 632-636, 633, 635, 641-978, 642-646, 645, 647-649, 648, 650-830, 666, 669-680, 672-676, 673, 675, 683-702, 689-701, 691-697, 692-696, 695, 698, 705-707, 706, 710-729, 716-728, 718-724, 719-723, 722, 725, 732-760, 734-752, 736-743, 741-742, 744-749, 753-759, 763-781, 769-780, 771-776, 772-775, 774, 777, 784-808, 785-800, 786-799, 791-796, 798, 801-807, 811-829, 813-826, 814-823, 825, 832-841, 836-840, 837, 839, 842-844, 843, 845-847, 846, 848-977, 864, 867-878, 870-874, 871, 873, 881-903, 887-902, 889-898, 890-897, 894, 899, 907-914, 908, 908-913, 916-974, 918-930, 920-926, 924, 927, 927-928, 928, 932-950, 938-949, 940-945, 941-944, 943, 946, 954, 954, 956-973, 957-972, 959-963, 961, 964-967, 965, 968-971, 969, 976, 988-1003, 989-1002, 999-1000, 1000-1001, 1005-1016, 1006-1015
src/helpers/query/orgs.js	0%	0%	0%	0%	19-160, 42-46, 48-57, 49-52, 50-51, 54-56, 55, 59-64, 66-79, 81-143, 82-143, 90-115, 91-106, 108-114, 116-143, 117-142, 118-133, 135-141, 145-157, 146-156, 159, 162-236, 163-235, 164-177, 176, 179-182, 181, 184, 186-234, 188-190, 189, 192-194, 193, 196-197, 199, 199-200, 200-234, 203-222, 204-219, 205-219, 207-219, 210-212, 211, 214-218, 217, 221, 223-234, 224-232, 225-231, 226-229, 228, 230, 233, 238-251, 239-248, 250, 250, 253-341, 260, 262-340, 263-270, 272-276, 273-276, 275, 278, 278, 280-339, 281-283, 282, 284-339, 287-289, 288, 292-294, 293, 296-298, 297, 300-302, 302-303, 303, 305-307, 306, 309-339, 311-336, 313-315, 314, 316-336, 318-321, 320, 322-336, 324-326, 325, 327-331, 330, 332-334, 333, 335, 338, 343-392, 353-363, 365, 367-391, 368, 368, 370-378, 371, 371-378, 377, 377, 380, 382, 382-389, 386, 386-387, 387-388, 390, 394-429, 403-412, 414-428, 415, 415, 417-427, 438-626, 439, 441-443, 442, 442, 445-450, 448, 448, 452-455, 457, 459-490, 461-463, 462, 464-486, 478-486, 479-485, 487, 492-494, 493-494, 496-498, 497, 500-503, 502, 505, 507-509, 508, 511-513, 512, 515, 515-518, 517, 520-523, 525, 527-544, 529, 531, 531, 533-541, 549, 549-550, 550, 552, 552-553, 555-572, 556-557, 557-571, 559-568, 560-565, 567, 570, 574-608, 575-576, 576-607, 578-604, 594, 596-598, 597, 599-603, 600, 602, 606, 610-611, 611-612, 612, 614-623, 616-622, 617-621, 618, 618-619, 619-620, 625
src/helpers/query/users.js	0%	0%	0%	0%	20-117, 32-34, 36-38, 37, 40-49, 41-44, 42-43, 46-48, 47, 50-55, 57-62, 64-72, 65-71, 74-100, 75-89, 83, 90-100, 91-97, 99, 102-114, 103-113, 116, 130-146, 131-142, 144-145, 145, 157-171, 158-166, 168-170, 169
src/helpers/query/utils.js	9.02%	0%	0%	9.91%	18-38, 29-37, 30-37, 32-37, 34, 34-37, 36, 36, 42-58, 44-54, 45-52, 51, 53, 55, 59, 59, 59, 70-72, 76-78, 81, 83-88, 84-87, 90-92, 91, 100-102, 101, 104, 108-112, 114-120, 142-143, 145-150, 146-149, 151-153, 153-171, 158-162, 161, 165-167, 166, 168-170, 186-188, 188, 190-192, 194-196, 195, 198, 200-213, 201, 205-212, 211, 220-223, 221-222, 224-225, 227-240, 228-229, 229-239, 233-237, 236, 241, 245-247, 246, 249-251, 251-277, 260-276, 262-272, 263-271, 269, 273, 279, 279, 279, 279, 293, 295-296, 296-297, 299-317, 303-310, 305-308, 307, 313-316
src/pages/HomeAdministrator.vue	0%	0%	0%	0%	138-140, 142-146, 148-149, 151, 153, 155, 158-161, 159, 159-160, 163-165, 164, 164, 167-169, 168, 168, 171-173, 175, 186-196, 187, 187, 190-192, 191, 195, 202-204, 214-231, 215, 217, 217, 220, 223-229, 224, 226-228, 227, 234-311, 317-321, 318-320, 327-335, 328-334, 329, 331-333, 332, 341-345, 342-344, 343, 352-371, 353-356, 358-363, 360, 362, 364-368, 365, 367, 370, 2-3, 5-6, 1, 14-15, 17, 20-22, 41-42, 73, 93, 1-18, 1-25, 1-44, 49
src/pages/HomeParticipant.vue	0%	0%	0%	0%	119-123, 125, 127-128, 131-135, 133, 133-134, 137-138, 140-142, 141, 141, 144-146, 145, 145, 148-149, 155-157, 163-165, 167-169, 168, 168, 171, 171, 171-172, 172, 178-180, 182-184, 186-188, 187, 190-192, 191, 194-197, 195, 195-196, 200-204, 206-216, 210-214, 211-213, 215, 218-220, 222-225, 227, 229-231, 233-271, 234, 236-237, 239, 241-257, 242, 244-251, 245, 247-250, 248-249, 253-256, 254-255, 260-266, 261-265, 262-264, 267-271, 268-270, 275-279, 281-285, 288-291, 289-290, 295-337, 296-335, 297-321, 300-302, 307, 307-318, 323-332, 325-331, 326-330, 327-329, 328, 334, 336, 339-341, 340, 340, 343-345, 344, 344, 348-357, 349-356, 352, 360-362, 361, 365-367, 366, 366, 370-376, 371, 371, 373-375, 378-401, 381-383, 382, 385-386, 386, 389-398, 391, 395-397, 396, 1, 10, 12, 27, 45-46, 65, 70, 1-33, 48, 1-49, 1-58
src/pages/ScoreReport.vue	0%	0%	0%	0%	380, 337-339, 341, 356, 358-363, 359-361, 360, 362, 365-369, 371-374, 372-373, 376, 378, 381, 381, 383-432, 384-386, 389-392, 391, 395, 397-416, 398-399, 399, 402-403, 405-408, 407, 410-412, 411, 413-415, 414, 419-422, 421, 423-429, 431, 434-436, 438-440, 442-444, 446, 448-451, 450, 453-455, 457-460, 459, 466-468, 470-477, 471-476, 473-474, 479-486, 480-485, 482-483, 490-521, 491-520, 492-520, 494-520, 496-520, 498-520, 503-509, 508, 510-520, 512-517, 514, 516, 518-520, 519, 522, 525-569, 537-540, 542-556, 547-553, 548-549, 551-552, 555, 558, 558-559, 559, 561-568, 574-825, 575-824, 576, 579, 581, 583-789, 585, 587-591, 590, 593-595, 597, 599-619, 621-782, 625-632, 629, 631, 633-637, 634, 636, 639-646, 640-646, 643, 645, 648-650, 649, 653, 656-665, 667-673, 668-673, 670-673, 672, 675, 678-689, 691-725, 692-725, 701-702, 704-725, 713, 715-724, 726-744, 727-737, 735, 738, 740-743, 745-758, 746-750, 750-751, 751-752, 752-757, 761-775, 777-781, 778, 780, 785-786, 788, 792-817, 793-796, 795, 798-801, 800, 803-813, 805-810, 809, 811-813, 812, 815-816, 819-821, 820, 823, 827, 830, 832-835, 834, 837-863, 839-841, 840, 842-862, 843, 845, 847-851, 848-850, 849, 852-856, 853-855, 854, 857, 859, 861, 865-871, 866, 868-870, 872, 874-879, 881-951, 882-943, 883-891, 890, 892-894, 893, 895-941, 896-917, 898-917, 902-917, 907-917, 910, 912-913, 915-916, 918-940, 919-937, 921-934, 922-924, 923, 925-930, 926, 928, 928-929, 932, 932-933, 936, 939, 942, 944-950, 953-1025, 954-1017, 955-964, 963, 965-967, 966, 968-1015, 969-990, 971-990, 975-990, 980-990, 983, 985-986, 988-989, 992-1014, 993-1011, 995-1008, 996-998, 997, 999-1004, 1000, 1002, 1002-1003, 1006, 1006-1007, 1010, 1013, 1016, 1018-1024, 1028-1029, 1032, 1034-1072, 1035-1041, 1043-1049, 1045-1048, 1046-1047, 1051, 1051, 1053-1054, 1056-1057, 1057, 1059-1070, 1060-1070, 1067-1070, 1069, 1071, 1076-1265, 1077, 1077-1102, 1092-1101, 1103-1112, 1103-1111, 1113-1126, 1113-1125, 1115-1122, 1124, 1127-1129, 1127-1128, 1131, 1133-1144, 1134-1143, 1146-1154, 1147-1153, 1156-1162, 1157-1161, 1158, 1160, 1164-1170, 1173-1179, 1174-1178, 1175-1177, 1176, 1182-1187, 1190-1194, 1191-1193, 1192, 1196-1263, 1198, 1201-1229, 1202-1229, 1209-1229, 1216, 1218-1228, 1219-1228, 1221-1228, 1223-1228, 1225, 1227, 1231, 1233-1243, 1240, 1242, 1245-1262, 1257-1259, 1258, 1260, 1264, 1267-1271, 1268-1270, 1269, 1269-1270, 1273-1284, 1274-1275, 1275-1276, 1276, 1278-1280, 1279, 1282-1283, 1286-1290, 1287-1289, 1288, 1293-1299, 1294-1295, 1295, 1297-1298, 1301-1303, 1302, 1302, 1305-1310, 1306-1309, 1309, 2-3, 8, 12-13, 15-16, 21-22, 27, 29, 1, 56, 59-60, 62, 71-72, 75, 89-90, 96, 102, 109, 118, 136, 138, 150, 153-154, 166, 172, 185, 191, 197, 203, 220, 272-273, 1-31, 1-141, 1-157, 1-175
src/pages/SignIn.vue	0%	0%	0%	0%	152-155, 157-158, 160-180, 161-179, 162-170, 163-169, 167-168, 172-178, 173-178, 175, 177, 182-212, 183-211, 184, 186-208, 189-192, 190-191, 193-196, 194-195, 199-207, 202-203, 205-206, 210, 214, 216-224, 217-222, 219, 221, 223, 226-235, 227-234, 229-230, 232-233, 237-274, 240-273, 243-245, 244, 247-249, 248, 251-272, 254-257, 255-256, 258-261, 259-260, 263, 266-271, 268, 270, 276-279, 277-278, 281, 283, 285-288, 286-287, 290-297, 291-296, 292, 292-293, 293-294, 294-295, 295, 299-309, 300-304, 302-303, 305-308, 306-307, 311-313, 312, 5-6, 8, 1, 14-16, 22-23, 26, 34, 43, 52, 63, 65, 78, 81, 90, 101, 112, 20, 1-116, 120

Generated in workflow #568 for commit 3da09c1 by the Vitest Coverage Report Action

github-actions[bot] commented 1 week ago

Visit the preview URL for this PR (updated for commit 3da09c1):

https://roar-staging--pr845-ref-318-query-compos-uqdzcekx.web.app

_{(expires Thu, 10 Oct 2024 22:22:40 GMT)}

_{🔥 via Firebase Hosting GitHub Action 🌎}

_{Sign: 2631e9c58fd0104ecbfddd72a62245ddac467460}

ROAR

cypress[bot] commented 1 week ago

roar-dashboard-e2e Run #7817

Run Properties: Passed #7817 • 3da09c1bdc: E2E Tests for PR 845 "Resolve merge conflicts for TanStack composables" from com...

Project	`roar-dashboard-e2e`
Branch Review	`ref/318/query-composables-merge`
Run status	`Passed #7817`
Run duration	`04m 03s`
Commit	`3da09c1bdc: E2E Tests for PR 845 "Resolve merge conflicts for TanStack composables" from com...`
Committer	`Maximilian Oertel`
View all properties for this run ↗︎

Test results
Failures	`0`
Flaky	`0`
Pending	`0`
Skipped	`0`
Passing	`13`
View all changes introduced in this branch ↗︎