Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add archived: false to queries for users and orgs #790

Merged
merged 67 commits into from
Oct 3, 2024

Conversation

richford
Copy link
Contributor

Proposed changes

This PR modifies the users and orgs queries to include a condition that archived === false.

Types of changes

What types of changes does this pull request introduce?

  • 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
  • Other (please describe below)

Checklist

  • I have read the guidelines for contributing.
  • The changes in this PR are as small as they can be. They represent one and only one fix or enhancement.
  • Linting checks pass with my changes.
  • Any existing unit tests pass with my changes.
  • 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.
  • I have shared this PR on the roar-pr-reviews channel (if I have access)
  • I have linked relevant issues (if any)

Justification of missing checklist items

Further comments

Copy link

github-actions bot commented Sep 10, 2024

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 0.97% 73 / 7454
🔵 Statements 0.9% 74 / 8187
🔵 Functions 0.77% 14 / 1807
🔵 Branches 0.44% 20 / 4505
File Coverage
File Stmts % Branch % Funcs % Lines Uncovered Lines
Changed Files
src/App.vue 0% 0% 0% 0% 32, 32, 38-39, 41-42, 44-48, 45-47, 50, 50, 52, 54-80, 82-84, 83, 86-100, 87-98, 90-93, 91-92, 94-97, 95-96, 99
src/components/CardAdministration.vue 0% 0% 0% 0% 165, 167-168, 170, 182-183, 185-218, 190-208, 195-203, 196-202, 206, 215, 220-224, 221-223, 222, 226-230, 227, 229, 232, 232-233, 233, 235-237, 236, 236, 239-241, 240, 244, 244, 247-248, 250-251, 253-258, 254-256, 255, 257, 260-265, 261-263, 262, 264, 267-270, 268-269, 272-274, 273, 276-282, 285-469, 286-289, 288, 288, 291-295, 293, 293, 297-300, 302, 304-335, 306-308, 307, 309-331, 323-331, 324-330, 332, 337, 337, 337, 339-341, 340, 343-346, 345, 348, 350-352, 351, 354-356, 355, 358, 358-361, 360, 363-366, 368, 370-387, 372, 374, 374, 376-384, 392, 392-393, 393, 395, 395-396, 398-415, 399-400, 400-414, 402-411, 403-408, 410, 413, 417-451, 418-419, 419-450, 421-447, 437, 439-441, 440, 442-446, 443, 445, 449, 453-454, 454-455, 455, 457-466, 459-465, 460-464, 461, 461-462, 462-463, 468, 471-477, 473, 479-481, 480, 483-486, 485, 488-490, 489, 489, 492-580, 494-579, 495, 497, 497-498, 498, 500, 502, 506-512, 514-530, 516, 518, 518, 520-527, 532, 536-557, 538-554, 539-549, 544-546, 545, 547, 550, 552-554, 553, 556, 565-575, 566-574, 567-573, 568-572, 569, 569-570, 570-571, 577-578, 582-583, 585-596, 585-596, 598-619, 599-600, 602-603, 605-618, 621-626, 622-625, 623-624, 2, 7-9, 26, 28, 32, 1, 41
src/components/ListUsers.vue 0% 0% 0% 0% 140, 142-144, 146-147, 149, 168-174, 170, 176-238, 240-241, 246, 248-252, 249-251, 254, 256-271, 257, 257-258, 260-270, 263-265, 268-269, 273-276, 274-275, 278-284, 279-282, 279-283, 289-291, 291-307, 310-326, 312-325, 316-321, 324, 330-333, 331, 331-332, 335-337, 336, 336, 339-342, 340, 340-341, 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% 82-88, 91-94, 92, 92-93, 96-98, 97, 97, 100-102, 101, 104-107, 105, 105-106, 109-111, 110, 115-121, 117, 123-125, 124, 127-150, 128-148, 131-141, 132, 134-140, 138, 142-147, 143-146, 149, 152-166, 153-165, 154, 156-159, 158, 160-164, 168-172, 169, 169-170, 170-171, 174, 174, 176-178, 177, 180-186, 181-185, 188-203, 193, 200, 205-231, 206-230, 213, 220, 227, 233-235, 234, 3, 5, 9, 24, 1, 56
src/helpers/query/administrations.js 0% 0% 0% 0% 11-16, 12, 15, 19-44, 20-41, 23-25, 27-38, 29-34, 30-33, 32, 35, 40, 43, 46-96, 48-75, 49, 51-60, 59, 61-74, 78-82, 80, 82, 84-85, 87-93, 88, 88-92, 95, 98-142, 99-101, 103-105, 105, 107, 109-123, 111-119, 112-118, 116, 120, 125-129, 131-139, 134, 136, 136-137, 137-138, 141
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, 981-993, 982-992, 989-990, 990-991, 995-1006, 996-1005
src/helpers/query/orgs.js 0% 0% 0% 0% 5-146, 28-32, 34-43, 35-38, 36-37, 40-42, 41, 45-50, 52-65, 67-129, 68-129, 76-101, 77-92, 94-100, 102-129, 103-128, 104-119, 121-127, 131-143, 132-142, 145, 148-222, 149-221, 150-163, 162, 165-168, 167, 170, 172-220, 174-176, 175, 178-180, 179, 182-183, 185, 185-186, 186-220, 189-208, 190-205, 191-205, 193-205, 196-198, 197, 200-204, 203, 207, 209-220, 210-218, 211-217, 212-215, 214, 216, 219, 224-237, 225-234, 236, 236, 239-325, 246-324, 247-254, 256-260, 257-260, 259, 262, 262, 264-323, 265-267, 266, 268-323, 271-273, 272, 276-278, 277, 280-282, 281, 284-286, 286-287, 287, 289-291, 290, 293-323, 295-320, 297-299, 298, 300-320, 302-305, 304, 306-320, 308-310, 309, 311-315, 314, 316-318, 317, 319, 322, 327-375, 337-347, 349, 351-374, 352, 352, 354-362, 355, 355-362, 361, 361, 364-365, 365-372, 369, 369-370, 370-371, 373, 377-412, 386-395, 397-411, 398, 398, 400-410
src/helpers/query/users.js 0% 0% 0% 0% 3-100, 15-17, 19-21, 20, 23-32, 24-27, 25-26, 29-31, 30, 33-38, 40-45, 47-55, 48-54, 57-83, 58-72, 66, 73-83, 74-80, 82, 85-97, 86-96, 99, 102-118, 103-114, 116-117, 117, 120-134, 121-129, 131-133, 132
src/helpers/query/utils.js 0% 0% 0% 0% 15-37, 16-36, 27-35, 28-35, 30-35, 32, 32-35, 34, 34, 39-58, 40-56, 42-52, 43-50, 49, 51, 53, 57, 57, 57, 60-65, 67-71, 68-70, 73-92, 74-76, 79, 81-86, 82-85, 88-90, 89, 91, 94-108, 95-99, 101-107, 110-145, 118-123, 119-122, 124-126, 126-144, 131-135, 134, 138-140, 139, 141-143, 147-169, 148-151, 149-150, 152-167, 155-156, 156-166, 160-164, 163, 168, 171-207, 172-174, 173, 176-178, 178-204, 187-203, 189-199, 190-198, 196, 200, 206, 206, 206, 206, 209-212, 214-240, 215, 217-218, 218-219, 221-239, 225-232, 227-230, 229, 235-238
src/pages/HomeAdministrator.vue 0% 0% 0% 0% 134-136, 138-139, 141, 144-147, 145, 145-146, 149-151, 150, 150, 153-155, 154, 154, 157-159, 161, 161-162, 162-165, 164, 167, 174-193, 175, 177, 179-189, 180-187, 183, 188, 191-192, 195-202, 197, 204-224, 206, 212-214, 213, 216-222, 217, 219-221, 220, 226-228, 227, 230, 232-236, 233, 235, 238-320, 322-326, 323-325, 328-336, 329-335, 330, 332-334, 333, 338-342, 339-341, 340, 344-363, 345-348, 350-355, 352, 354, 356-360, 357, 359, 362, 2-3, 5-6, 1, 14-15, 17, 20-22, 41-42, 85, 118, 1-18, 1-25, 1-44, 49
src/pages/HomeParticipant.vue 0% 0% 0% 0% 108-112, 114, 116-120, 118, 118-119, 122, 124, 133, 135-137, 136, 136, 139-141, 140, 140, 143-144, 150-156, 152, 162-170, 164, 172-174, 173, 173, 177-182, 184-192, 186-190, 187-189, 191, 194-196, 198-201, 203, 205-207, 209-247, 210-213, 215-231, 216-217, 219-227, 220-226, 222-226, 224-225, 228-230, 229, 234-242, 235-242, 237-241, 238-240, 243-247, 244-246, 251-263, 257-260, 258-259, 262, 266, 266, 266, 272-286, 275-281, 276-279, 288-294, 290, 296-298, 297, 300-302, 301, 304-307, 305, 305-306, 309-312, 310-311, 316-358, 317-356, 318-342, 321-323, 328, 328-339, 344-353, 346-352, 347-351, 348-350, 349, 355, 357, 360-362, 361, 361, 364-366, 365, 365, 369-378, 370-377, 373, 381-383, 382, 386-388, 387, 387, 391-398, 392-394, 393, 395-397, 400-420, 403-405, 404, 406-407, 407, 410-417, 412, 416, 416, 1, 12, 30-31, 50, 55, 70, 72, 1-18, 33, 1-34, 1-43
src/pages/HomeSelector.vue 0% 0% 0% 0% 38-40, 42-43, 45-51, 46-51, 49-50, 53-54, 56, 58-61, 59, 59-60, 63-65, 64, 64, 67-73, 69, 75-81, 77, 83, 83, 85-89, 86, 86-87, 87-88, 91-97, 92-96, 93, 95, 98-100, 103-106, 104-105, 110, 114-117, 116, 120-138, 121-128, 125-127, 130-132, 132, 134-137, 135-136, 142-144, 148-156, 151-153, 152, 158-167, 159-162, 160-161, 163, 163-166, 165, 1, 3, 5
src/pages/ScoreReport.vue 0% 0% 0% 0% 368, 326, 328, 330, 345, 347-352, 348-350, 349, 351, 354-358, 360-362, 361, 364, 366, 369, 369, 371-420, 372-374, 377-380, 379, 383, 385-404, 386-387, 387, 390-391, 393-396, 395, 398-400, 399, 401-403, 402, 407-410, 409, 411-417, 419, 422-424, 427-433, 429, 434, 434-435, 435-436, 436, 438-444, 440, 446-452, 448, 455-461, 457, 463-472, 464-471, 465-468, 466-467, 470, 474-483, 475-482, 476-479, 477-478, 481, 485, 485, 492-498, 494, 502-533, 503-532, 504-532, 506-532, 508-532, 510-532, 515-521, 520, 522-532, 524-529, 526, 528, 530-532, 531, 534, 537-581, 549-552, 554-568, 559-565, 560-561, 563-564, 567, 570, 570-571, 571, 573-580, 586-837, 587-836, 588, 591, 593, 595-801, 597, 599-603, 602, 605-607, 609, 611-631, 633-794, 637-644, 641, 643, 645-649, 646, 648, 651-658, 652-658, 655, 657, 660-662, 661, 665, 668-677, 679-685, 680-685, 682-685, 684, 687, 690-701, 703-737, 704-737, 713-714, 716-737, 725, 727-736, 738-756, 739-749, 747, 750, 752-755, 757-770, 758-762, 762-763, 763-764, 764-769, 773-787, 789-793, 790, 792, 797-798, 800, 804-829, 805-808, 807, 810-813, 812, 815-825, 817-822, 821, 823-825, 824, 827-828, 831-833, 832, 835, 839, 842, 844-847, 846, 849-875, 851-853, 852, 854-874, 855, 857, 859-863, 860-862, 861, 864-868, 865-867, 866, 869, 871, 873, 877-883, 878, 880-882, 884, 886-891, 893-963, 894-955, 895-903, 902, 904-906, 905, 907-953, 908-929, 910-929, 914-929, 919-929, 922, 924-925, 927-928, 930-952, 931-949, 933-946, 934-936, 935, 937-942, 938, 940, 940-941, 944, 944-945, 948, 951, 954, 956-962, 965-1037, 966-1029, 967-976, 975, 977-979, 978, 980-1027, 981-1002, 983-1002, 987-1002, 992-1002, 995, 997-998, 1000-1001, 1004-1026, 1005-1023, 1007-1020, 1008-1010, 1009, 1011-1016, 1012, 1014, 1014-1015, 1018, 1018-1019, 1022, 1025, 1028, 1030-1036, 1040-1041, 1044, 1046-1084, 1047-1053, 1055-1061, 1057-1060, 1058-1059, 1063, 1063, 1065-1066, 1068-1069, 1069, 1071-1082, 1072-1082, 1079-1082, 1081, 1083, 1088-1277, 1089, 1089-1114, 1104-1113, 1115-1124, 1115-1123, 1125-1138, 1125-1137, 1127-1134, 1136, 1139-1141, 1139-1140, 1143, 1145-1156, 1146-1155, 1158-1166, 1159-1165, 1168-1174, 1169-1173, 1170, 1172, 1176-1182, 1185-1191, 1186-1190, 1187-1189, 1188, 1194-1199, 1202-1206, 1203-1205, 1204, 1208-1275, 1210, 1213-1241, 1214-1241, 1221-1241, 1228, 1230-1240, 1231-1240, 1233-1240, 1235-1240, 1237, 1239, 1243, 1245-1255, 1252, 1254, 1257-1274, 1269-1271, 1270, 1272, 1276, 1279-1283, 1280-1282, 1281, 1281-1282, 1285-1296, 1286-1287, 1287-1288, 1288, 1290-1292, 1291, 1294-1295, 1298-1302, 1299-1301, 1300, 1305-1311, 1306-1307, 1307, 1309-1310, 1313-1315, 1314, 1314, 1317-1322, 1318-1321, 1321, 2-3, 5, 8, 11-12, 14-15, 20-21, 26, 28, 1, 55, 58-59, 61, 70-71, 74, 88-89, 95, 101, 108, 116, 134, 136, 148, 151-152, 164, 170, 183, 189, 195, 201, 217, 268-269, 1-30, 1-139, 1-155, 1-173
src/pages/SignIn.vue 0% 0% 0% 0% 150-153, 155-156, 158-180, 159-179, 160-168, 161-167, 165-166, 170-178, 171-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 #561 for commit f16ff3c by the Vitest Coverage Report Action

Copy link

cypress bot commented Sep 10, 2024

roar-dashboard-e2e    Run #7787

Run Properties:  status check no tests Notests #7787  •  git commit f16ff3cf1b: Component Tests for PR 790 "Add archived: false to queries for users and orgs" f...
Project roar-dashboard-e2e
Branch Review enh/archived-users-orgs
Run status status check no tests Notests #7787
Run duration 01m 45s
Commit git commit f16ff3cf1b: Component Tests for PR 790 "Add archived: false to queries for users and orgs" f...
Committer Adam Richie-Halford
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 0
Tests that did not run due to a failure in a mocha hook  Skipped 1
Tests that passed  Passing 0
View all changes introduced in this branch ↗︎

Copy link

github-actions bot commented Sep 10, 2024

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

https://roar-staging--pr790-enh-archived-users-o-mux9heop.web.app

(expires Thu, 10 Oct 2024 15:51:05 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: 2631e9c58fd0104ecbfddd72a62245ddac467460

@Emily-ejag Emily-ejag added the enhancement New feature or request label Sep 10, 2024
Emily-ejag
Emily-ejag previously approved these changes Sep 12, 2024
@Emily-ejag
Copy link
Contributor

Clever SignIn is failing tho, I think it is because on the popup change

@richford richford requested a review from a team as a code owner September 17, 2024 00:10
@richford richford changed the title WIP: Add archived: false to queries for users and orgs Add archived: false to queries for users and orgs Sep 30, 2024
Emily-ejag
Emily-ejag previously approved these changes Sep 30, 2024
kellyel
kellyel previously approved these changes Sep 30, 2024
@Emily-ejag Emily-ejag dismissed stale reviews from kellyel and themself via 457c47a September 30, 2024 22:44
Emily-ejag
Emily-ejag previously approved these changes Oct 2, 2024
@richford richford merged commit 56db418 into main Oct 3, 2024
24 checks passed
@richford richford deleted the enh/archived-users-orgs branch October 3, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants