From f58eb9e0140a497245222a976fccbfac22ef62b5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 09:09:38 -0500 Subject: [PATCH 01/25] docs: update dependent-usage.json (#2028) --- dependent-usage.json | 365 ++++++++++++++++++++++++++----------------- 1 file changed, 225 insertions(+), 140 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index 15b876d2c6..b5d06b2a5f 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676470129254, + "lastModified": 1676556528840, "projectUsages": [ { "version": "19.19.1", @@ -21425,11 +21425,6 @@ "filePath": "src/profile/forms/PreferredLanguage.jsx", "line": 80, "column": 16 - }, - { - "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 47, - "column": 10 } ], "Hyperlink": [ @@ -21460,20 +21455,45 @@ "line": 59, "column": 8 }, + { + "filePath": "src/skills-builder/skills-builder-modal/SelectPreferences.jsx", + "line": 24, + "column": 8 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SelectPreferences.jsx", + "line": 33, + "column": 8 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SelectPreferences.jsx", + "line": 43, + "column": 8 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SelectPreferences.jsx", + "line": 52, + "column": 12 + }, { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 55, - "column": 10 + "line": 65, + "column": 12 }, { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 62, - "column": 10 + "line": 69, + "column": 12 }, { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 66, - "column": 10 + "line": 77, + "column": 12 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", + "line": 84, + "column": 12 } ], "StatefulButton": [ @@ -21537,59 +21557,69 @@ "column": 15 } ], - "ModalDialog": [ + "Stepper": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 28, + "line": 34, "column": 4 } ], - "ModalDialog.Hero": [ + "ModalDialog": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", "line": 35, "column": 6 } ], - "ModalDialog.Body": [ + "ModalDialog.Hero": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 43, - "column": 6 + "line": 42, + "column": 8 } ], - "Container": [ + "ModalDialog.Body": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 44, + "line": 51, "column": 8 } ], - "Form.Control": [ + "Container": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 48, - "column": 12 + "line": 52, + "column": 10 } ], - "ModalDialog.Footer": [ + "Stepper.Step": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 60, - "column": 6 + "line": 53, + "column": 12 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", + "line": 57, + "column": 12 } ], - "ActionRow": [ + "ModalDialog.Footer": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 61, + "line": 63, "column": 8 } ], - "ActionRow.Spacer": [ + "Stepper.ActionRow": [ { "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", - "line": 65, + "line": 64, + "column": 10 + }, + { + "filePath": "src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx", + "line": 76, "column": 10 } ] @@ -25338,6 +25368,28 @@ "column": 20 } ], + "Container": [ + { + "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/index.jsx", + "line": 31, + "column": 10 + }, + { + "filePath": "src/editors/containers/ProblemEditor/components/SelectTypeModal/content/Preview.jsx", + "line": 22, + "column": 4 + }, + { + "filePath": "src/editors/containers/ProblemEditor/components/SelectTypeModal/content/ProblemTypeSelect.jsx", + "line": 17, + "column": 4 + }, + { + "filePath": "src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx", + "line": 25, + "column": 6 + } + ], "Card.Section": [ { "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/CardSection.jsx", @@ -25573,23 +25625,6 @@ "column": 14 } ], - "Container": [ - { - "filePath": "src/editors/containers/ProblemEditor/components/SelectTypeModal/content/Preview.jsx", - "line": 22, - "column": 4 - }, - { - "filePath": "src/editors/containers/ProblemEditor/components/SelectTypeModal/content/ProblemTypeSelect.jsx", - "line": 17, - "column": 4 - }, - { - "filePath": "src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx", - "line": 25, - "column": 6 - } - ], "Image": [ { "filePath": "src/editors/containers/ProblemEditor/components/SelectTypeModal/content/Preview.jsx", @@ -26713,8 +26748,8 @@ }, { "filePath": "src/components/ContentfulModule/FeaturedProductsModule.jsx", - "line": 71, - "column": 14 + "line": 92, + "column": 12 }, { "filePath": "src/components/ContentfulModule/FootnoteModule.jsx", @@ -26778,23 +26813,23 @@ }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 270, - "column": 64 + "line": 278, + "column": 66 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 287, - "column": 64 + "line": 295, + "column": 66 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 328, - "column": 48 + "line": 336, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 337, - "column": 48 + "line": 345, + "column": 50 }, { "filePath": "src/components/Course/CourseSnapshot/index.jsx", @@ -26926,6 +26961,31 @@ "line": 158, "column": 14 }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 137, + "column": 29 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 142, + "column": 16 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 159, + "column": 18 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 181, + "column": 18 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 203, + "column": 16 + }, { "filePath": "src/components/Search/Refinements/FacetList.jsx", "line": 180, @@ -27040,8 +27100,8 @@ }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 367, - "column": 20 + "line": 375, + "column": 22 }, { "filePath": "src/components/Course/CourseRunSelector/index.jsx", @@ -27185,42 +27245,42 @@ }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 77, + "line": 79, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 91, + "line": 93, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 99, + "line": 101, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 110, + "line": 112, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 122, + "line": 124, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 134, + "line": 138, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 144, + "line": 148, "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 154, + "line": 158, "column": 6 }, { @@ -27252,8 +27312,8 @@ }, { "filePath": "src/components/ContentfulModule/FeaturedProductsModule.jsx", - "line": 71, - "column": 25 + "line": 92, + "column": 23 }, { "filePath": "src/components/ContentfulModule/MoreInfoCTAModule.jsx", @@ -27305,6 +27365,11 @@ "line": 158, "column": 25 }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 137, + "column": 40 + }, { "filePath": "src/templates/programDetailDegree.jsx", "line": 241, @@ -27346,33 +27411,33 @@ }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 309, - "column": 48 + "line": 317, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 310, - "column": 48 + "line": 318, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 318, - "column": 48 + "line": 326, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 319, - "column": 48 + "line": 327, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 327, - "column": 48 + "line": 335, + "column": 50 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 336, - "column": 48 + "line": 344, + "column": 50 }, { "filePath": "src/components/ProductDetail/ProductDetailHero.jsx", @@ -27614,14 +27679,9 @@ }, { "filePath": "src/components/ContentfulModule/FeaturedProductsModule.jsx", - "line": 47, + "line": 67, "column": 4 }, - { - "filePath": "src/components/ContentfulModule/FeaturedProductsModule.jsx", - "line": 60, - "column": 10 - }, { "filePath": "src/components/ContentfulModule/MoreInfoCTAModule.jsx", "line": 26, @@ -27689,12 +27749,12 @@ }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 187, - "column": 4 + "line": 195, + "column": 6 }, { "filePath": "src/components/Course/CoursePageMobile.jsx", - "line": 92, + "line": 94, "column": 8 }, { @@ -27757,6 +27817,11 @@ "line": 9, "column": 6 }, + { + "filePath": "src/components/Home/ExecEdPromo.jsx", + "line": 40, + "column": 4 + }, { "filePath": "src/components/Home/Hero.jsx", "line": 63, @@ -27792,11 +27857,6 @@ "line": 11, "column": 4 }, - { - "filePath": "src/components/Home/UniversalDesignOfLearning.jsx", - "line": 7, - "column": 4 - }, { "filePath": "src/components/Learn/DynamicProductList/DynamicProductList.jsx", "line": 223, @@ -27824,44 +27884,49 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 432, + "line": 266, "column": 8 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 433, + "line": 267, "column": 10 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 434, + "line": 268, "column": 12 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 660, + "line": 494, "column": 12 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 668, + "line": 502, "column": 12 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 687, + "line": 521, "column": 8 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 869, + "line": 703, "column": 10 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 870, + "line": 704, "column": 12 }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 115, + "column": 8 + }, { "filePath": "src/components/Quotation/index.jsx", "line": 13, @@ -28254,7 +28319,7 @@ }, { "filePath": "src/templates/homePage.jsx", - "line": 92, + "line": 93, "column": 15 } ], @@ -28368,7 +28433,7 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 711, + "line": 545, "column": 18 } ], @@ -28395,12 +28460,12 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 719, + "line": 553, "column": 22 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 720, + "line": 554, "column": 22 } ], @@ -28417,7 +28482,7 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 722, + "line": 556, "column": 20 } ], @@ -28453,13 +28518,13 @@ "OverlayTrigger": [ { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 262, - "column": 24 + "line": 270, + "column": 26 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 279, - "column": 24 + "line": 287, + "column": 26 }, { "filePath": "src/components/Overlays/SaveForLaterOverlay.jsx", @@ -28475,13 +28540,13 @@ "Tooltip": [ { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 265, - "column": 28 + "line": 273, + "column": 30 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 282, - "column": 28 + "line": 290, + "column": 30 }, { "filePath": "src/components/ProgramPathway/ProgramPathwayCourse.jsx", @@ -28492,13 +28557,13 @@ "IconButton": [ { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 270, - "column": 26 + "line": 278, + "column": 28 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 287, - "column": 26 + "line": 295, + "column": 28 }, { "filePath": "src/components/Header/SiteNavLink.jsx", @@ -28524,25 +28589,25 @@ "InfoOutline": [ { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 270, - "column": 43 + "line": 278, + "column": 45 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 287, - "column": 43 + "line": 295, + "column": 45 } ], "Remove": [ { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 328, - "column": 78 + "line": 336, + "column": 80 }, { "filePath": "src/components/Course/CourseModes/index.jsx", - "line": 337, - "column": 78 + "line": 345, + "column": 80 } ], "CardGrid": [ @@ -28580,13 +28645,23 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 507, + "line": 341, "column": 26 }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 531, + "line": 365, "column": 26 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 159, + "column": 29 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 181, + "column": 29 } ], "MoneyOutline": [ @@ -28601,6 +28676,11 @@ "filePath": "src/components/Course/CourseSnapshot/WeeksToComplete.jsx", "line": 27, "column": 17 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 203, + "column": 27 } ], "Avatar": [ @@ -28623,7 +28703,7 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 439, + "line": 273, "column": 20 } ], @@ -28635,7 +28715,7 @@ }, { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 440, + "line": 274, "column": 22 }, { @@ -28656,6 +28736,11 @@ "filePath": "src/components/DiscoveryCard/DiscoveryProgramCard.jsx", "line": 296, "column": 35 + }, + { + "filePath": "src/components/Program/ProgramUpsell.jsx", + "line": 142, + "column": 27 } ], "Input": [ @@ -28948,7 +29033,7 @@ "LibraryBooks": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 488, + "line": 322, "column": 24 }, { @@ -28960,7 +29045,7 @@ "AccessTime": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 555, + "line": 389, "column": 26 }, { @@ -28972,7 +29057,7 @@ "School": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 576, + "line": 410, "column": 26 }, { @@ -28984,35 +29069,35 @@ "CreditCard": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 601, + "line": 435, "column": 24 } ], "Collapsible.Trigger": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 715, + "line": 549, "column": 20 } ], "AddCircle": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 719, + "line": 553, "column": 54 } ], "RemoveCircle": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 720, + "line": 554, "column": 52 } ], "FormatQuote": [ { "filePath": "src/components/Program/ProgramMain.jsx", - "line": 768, + "line": 602, "column": 16 } ], From 313816939b035867e4d75761806022b9e00751cc Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 08:50:35 -0500 Subject: [PATCH 02/25] build: add GH workflow to sync alpha with master automatically (#2030) --- .github/workflows/analyze-dependents.yml | 4 ++-- .github/workflows/sync-alpha-master.yml | 30 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/sync-alpha-master.yml diff --git a/.github/workflows/analyze-dependents.yml b/.github/workflows/analyze-dependents.yml index 6839a0ec20..8072cbbd61 100644 --- a/.github/workflows/analyze-dependents.yml +++ b/.github/workflows/analyze-dependents.yml @@ -280,9 +280,9 @@ jobs: uses: hmarr/auto-approve-action@v2 with: pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - github-token: ${{ secrets.EDX_NETLIFY_PAT }} + github-token: ${{ secrets.requirements_bot_github_token }} - name: Auto-merge pull request for dependent project usages uses: pascalgn/automerge-action@v0.14.3 env: - GITHUB_TOKEN: ${{ secrets.EDX_NETLIFY_PAT }} + GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} MERGE_METHOD: squash diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml new file mode 100644 index 0000000000..4f0e83e34c --- /dev/null +++ b/.github/workflows/sync-alpha-master.yml @@ -0,0 +1,30 @@ +name: Sync alpha with master +on: + push: + branches: + - master + +jobs: + sync-branches: + runs-on: ubuntu-latest + name: Syncing branches + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up Node + uses: actions/setup-node@v1 + with: + node-version: 18 + - name: Create Pull Request + id: cpr + uses: tretuna/sync-branches@1.4.0 + with: + GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} + FROM_BRANCH: "master" + TO_BRANCH: "alpha" + - name: Enable Pull Request Auto Merge + uses: peter-evans/enable-pull-request-automerge@v2 + with: + token: ${{ secrets.requirements_bot_github_token }} + pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} + merge-method: squash From e388665de51dcf01a4b550a96710b638311d9945 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 09:09:46 -0500 Subject: [PATCH 03/25] docs: update dependent-usage.json (#2032) --- dependent-usage.json | 561 ++++++++++++++++++++++++------------------- 1 file changed, 314 insertions(+), 247 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index b5d06b2a5f..9e10a3073d 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676556528840, + "lastModified": 1676642939833, "projectUsages": [ { "version": "19.19.1", @@ -7726,9 +7726,19 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 156, + "line": 172, "column": 14 }, + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 25, + "column": 6 + }, + { + "filePath": "src/recommendations/RecommendationsPage.jsx", + "line": 106, + "column": 8 + }, { "filePath": "src/register/registrationFields/HonorCode.jsx", "line": 32, @@ -7780,6 +7790,11 @@ "filePath": "src/base-component/SmallLayout.jsx", "line": 16, "column": 8 + }, + { + "filePath": "src/recommendations/RecommendationsPage.jsx", + "line": 107, + "column": 10 } ], "breakpoints": [ @@ -7832,7 +7847,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 153, + "line": 169, "column": 10 }, { @@ -8243,7 +8258,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 148, + "line": 164, "column": 12 }, { @@ -8290,7 +8305,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 149, + "line": 165, "column": 14 }, { @@ -8373,14 +8388,19 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 168, + "line": 184, "column": 14 }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 180, + "line": 196, "column": 14 }, + { + "filePath": "src/recommendations/RecommendationsPage.jsx", + "line": 116, + "column": 10 + }, { "filePath": "src/register/RegistrationPage.jsx", "line": 547, @@ -8479,7 +8499,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 148, + "line": 164, "column": 79 }, { @@ -8498,6 +8518,48 @@ "column": 76 } ], + "Card": [ + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 26, + "column": 8 + } + ], + "Card.ImageCap": [ + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 27, + "column": 10 + } + ], + "Card.Header": [ + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 33, + "column": 10 + } + ], + "Card.Section": [ + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 37, + "column": 10 + } + ], + "Card.Footer": [ + { + "filePath": "src/recommendations/RecommendationCard.jsx", + "line": 38, + "column": 10 + } + ], + "Container": [ + { + "filePath": "src/recommendations/RecommendationsList.jsx", + "line": 13, + "column": 4 + } + ], "ExpandLess": [ { "filePath": "src/register/registrationFields/CountryField.jsx", @@ -10446,6 +10508,21 @@ "line": 21, "column": 6 }, + { + "filePath": "src/components/TopicStats.jsx", + "line": 40, + "column": 10 + }, + { + "filePath": "src/components/TopicStats.jsx", + "line": 56, + "column": 10 + }, + { + "filePath": "src/components/TopicStats.jsx", + "line": 80, + "column": 12 + }, { "filePath": "src/discussions/common/ActionsDropdown.jsx", "line": 52, @@ -10483,7 +10560,7 @@ }, { "filePath": "src/discussions/in-context-topics/components/BackButton.jsx", - "line": 20, + "line": 22, "column": 18 }, { @@ -10491,21 +10568,6 @@ "line": 50, "column": 10 }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 69, - "column": 18 - }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 85, - "column": 18 - }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 109, - "column": 20 - }, { "filePath": "src/discussions/learners/learner/LearnerFilterBar.jsx", "line": 31, @@ -10761,9 +10823,14 @@ "line": 152, "column": 18 }, + { + "filePath": "src/discussions/in-context-topics/components/BackButton.jsx", + "line": 29, + "column": 21 + }, { "filePath": "src/discussions/in-context-topics/TopicPostsView.jsx", - "line": 73, + "line": 87, "column": 12 }, { @@ -10885,7 +10952,7 @@ }, { "filePath": "src/discussions/in-context-topics/components/BackButton.jsx", - "line": 18, + "line": 20, "column": 8 }, { @@ -11122,180 +11189,27 @@ "column": 8 } ], - "useToggle": [ - { - "filePath": "src/discussions/common/ActionsDropdown.jsx", - "line": 29, - "column": 32 - }, - { - "filePath": "src/discussions/post-comments/comments/comment/Comment.jsx", - "line": 40, - "column": 71 - }, - { - "filePath": "src/discussions/post-comments/comments/comment/Comment.jsx", - "line": 41, - "column": 72 - }, - { - "filePath": "src/discussions/post-comments/comments/comment/Reply.jsx", - "line": 31, - "column": 71 - }, - { - "filePath": "src/discussions/post-comments/comments/comment/Reply.jsx", - "line": 32, - "column": 72 - }, - { - "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", - "line": 22, - "column": 32 - }, - { - "filePath": "src/discussions/posts/post/Post.jsx", - "line": 41, - "column": 71 - }, - { - "filePath": "src/discussions/posts/post/Post.jsx", - "line": 42, - "column": 72 - }, - { - "filePath": "src/discussions/posts/post/Post.jsx", - "line": 43, - "column": 62 - } - ], - "MoreHoriz": [ - { - "filePath": "src/discussions/common/ActionsDropdown.jsx", - "line": 51, - "column": 13 - } - ], - "ModalPopup": [ - { - "filePath": "src/discussions/common/ActionsDropdown.jsx", - "line": 59, - "column": 8 - }, - { - "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", - "line": 47, - "column": 8 - } - ], - "Dropdown.Divider": [ - { - "filePath": "src/discussions/common/ActionsDropdown.jsx", - "line": 72, - "column": 21 - } - ], - "Dropdown.Item": [ - { - "filePath": "src/discussions/common/ActionsDropdown.jsx", - "line": 74, - "column": 16 - }, + "OverlayTrigger": [ { - "filePath": "src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx", - "line": 27, + "filePath": "src/components/TopicStats.jsx", + "line": 28, "column": 6 }, { - "filePath": "src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx", - "line": 37, - "column": 8 - }, - { - "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", - "line": 56, - "column": 12 - }, - { - "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", - "line": 68, - "column": 12 - } - ], - "Alert": [ - { - "filePath": "src/discussions/common/AlertBanner.jsx", - "line": 36, - "column": 8 - }, - { - "filePath": "src/discussions/common/AlertBanner.jsx", - "line": 43, - "column": 12 - }, - { - "filePath": "src/discussions/common/AlertBanner.jsx", - "line": 60, - "column": 12 - }, - { - "filePath": "src/discussions/common/EndorsedAlertBanner.jsx", - "line": 28, + "filePath": "src/components/TopicStats.jsx", + "line": 44, "column": 6 - } - ], - "Report": [ - { - "filePath": "src/discussions/common/AlertBanner.jsx", - "line": 36, - "column": 21 }, { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 109, - "column": 31 + "filePath": "src/components/TopicStats.jsx", + "line": 61, + "column": 8 }, - { - "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", - "line": 110, - "column": 29 - } - ], - "Institution": [ - { - "filePath": "src/discussions/common/AuthorLabel.jsx", - "line": 37, - "column": 4 - } - ], - "School": [ - { - "filePath": "src/discussions/common/AuthorLabel.jsx", - "line": 41, - "column": 4 - } - ], - "OverlayTrigger": [ { "filePath": "src/discussions/common/AuthorLabel.jsx", "line": 68, "column": 6 }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 57, - "column": 14 - }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 73, - "column": 14 - }, - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 90, - "column": 16 - }, { "filePath": "src/discussions/learners/learner/LearnerFooter.jsx", "line": 26, @@ -11369,24 +11283,24 @@ ], "Tooltip": [ { - "filePath": "src/discussions/common/AuthorLabel.jsx", - "line": 70, + "filePath": "src/components/TopicStats.jsx", + "line": 30, "column": 10 }, { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 59, - "column": 18 + "filePath": "src/components/TopicStats.jsx", + "line": 46, + "column": 10 }, { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 75, - "column": 18 + "filePath": "src/components/TopicStats.jsx", + "line": 63, + "column": 12 }, { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 92, - "column": 20 + "filePath": "src/discussions/common/AuthorLabel.jsx", + "line": 70, + "column": 10 }, { "filePath": "src/discussions/learners/learner/LearnerFooter.jsx", @@ -11459,6 +11373,183 @@ "column": 18 } ], + "PostOutline": [ + { + "filePath": "src/components/TopicStats.jsx", + "line": 40, + "column": 21 + }, + { + "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", + "line": 70, + "column": 27 + } + ], + "HelpOutline": [ + { + "filePath": "src/components/TopicStats.jsx", + "line": 56, + "column": 21 + }, + { + "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", + "line": 86, + "column": 27 + } + ], + "Report": [ + { + "filePath": "src/components/TopicStats.jsx", + "line": 80, + "column": 23 + }, + { + "filePath": "src/discussions/common/AlertBanner.jsx", + "line": 36, + "column": 21 + }, + { + "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", + "line": 110, + "column": 29 + } + ], + "useToggle": [ + { + "filePath": "src/discussions/common/ActionsDropdown.jsx", + "line": 29, + "column": 32 + }, + { + "filePath": "src/discussions/post-comments/comments/comment/Comment.jsx", + "line": 40, + "column": 71 + }, + { + "filePath": "src/discussions/post-comments/comments/comment/Comment.jsx", + "line": 41, + "column": 72 + }, + { + "filePath": "src/discussions/post-comments/comments/comment/Reply.jsx", + "line": 31, + "column": 71 + }, + { + "filePath": "src/discussions/post-comments/comments/comment/Reply.jsx", + "line": 32, + "column": 72 + }, + { + "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", + "line": 22, + "column": 32 + }, + { + "filePath": "src/discussions/posts/post/Post.jsx", + "line": 41, + "column": 71 + }, + { + "filePath": "src/discussions/posts/post/Post.jsx", + "line": 42, + "column": 72 + }, + { + "filePath": "src/discussions/posts/post/Post.jsx", + "line": 43, + "column": 62 + } + ], + "MoreHoriz": [ + { + "filePath": "src/discussions/common/ActionsDropdown.jsx", + "line": 51, + "column": 13 + } + ], + "ModalPopup": [ + { + "filePath": "src/discussions/common/ActionsDropdown.jsx", + "line": 59, + "column": 8 + }, + { + "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", + "line": 47, + "column": 8 + } + ], + "Dropdown.Divider": [ + { + "filePath": "src/discussions/common/ActionsDropdown.jsx", + "line": 72, + "column": 21 + } + ], + "Dropdown.Item": [ + { + "filePath": "src/discussions/common/ActionsDropdown.jsx", + "line": 74, + "column": 16 + }, + { + "filePath": "src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx", + "line": 27, + "column": 6 + }, + { + "filePath": "src/discussions/navigation/breadcrumb-menu/BreadcrumbDropdown.jsx", + "line": 37, + "column": 8 + }, + { + "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", + "line": 56, + "column": 12 + }, + { + "filePath": "src/discussions/post-comments/comments/CommentsSort.jsx", + "line": 68, + "column": 12 + } + ], + "Alert": [ + { + "filePath": "src/discussions/common/AlertBanner.jsx", + "line": 36, + "column": 8 + }, + { + "filePath": "src/discussions/common/AlertBanner.jsx", + "line": 43, + "column": 12 + }, + { + "filePath": "src/discussions/common/AlertBanner.jsx", + "line": 60, + "column": 12 + }, + { + "filePath": "src/discussions/common/EndorsedAlertBanner.jsx", + "line": 28, + "column": 6 + } + ], + "Institution": [ + { + "filePath": "src/discussions/common/AuthorLabel.jsx", + "line": 37, + "column": 4 + } + ], + "School": [ + { + "filePath": "src/discussions/common/AuthorLabel.jsx", + "line": 41, + "column": 4 + } + ], "ModalDialog": [ { "filePath": "src/discussions/common/Confirmation.jsx", @@ -11575,7 +11666,7 @@ "ArrowBack": [ { "filePath": "src/discussions/in-context-topics/components/BackButton.jsx", - "line": 19, + "line": 21, "column": 15 }, { @@ -11606,30 +11697,6 @@ "column": 6 } ], - "PostOutline": [ - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 69, - "column": 29 - }, - { - "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", - "line": 70, - "column": 27 - } - ], - "HelpOutline": [ - { - "filePath": "src/discussions/in-context-topics/topic/Topic.jsx", - "line": 85, - "column": 29 - }, - { - "filePath": "src/discussions/topics/topic-group/topic/Topic.jsx", - "line": 86, - "column": 27 - } - ], "Avatar": [ { "filePath": "src/discussions/learners/learner/LearnerAvatar.jsx", @@ -26673,47 +26740,47 @@ "Icon": [ { "filePath": "src/components/2U/ProductCard.jsx", - "line": 122, + "line": 120, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 130, + "line": 128, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 138, + "line": 136, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 146, + "line": 144, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 154, + "line": 152, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 162, + "line": 160, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 170, + "line": 168, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 178, + "line": 176, "column": 10 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 186, + "line": 184, "column": 10 }, { @@ -27043,54 +27110,54 @@ }, { "filePath": "src/templates/programDetailDegree.jsx", - "line": 241, + "line": 243, "column": 16 } ], "Launch": [ { "filePath": "src/components/2U/ProductCard.jsx", - "line": 122, + "line": 120, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 130, + "line": 128, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 138, + "line": 136, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 146, + "line": 144, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 154, + "line": 152, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 162, + "line": 160, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 170, + "line": 168, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 178, + "line": 176, "column": 48 }, { "filePath": "src/components/2U/ProductCard.jsx", - "line": 186, + "line": 184, "column": 48 }, { @@ -27117,7 +27184,7 @@ "Card": [ { "filePath": "src/components/2U/ProductCard.jsx", - "line": 269, + "line": 266, "column": 8 }, { @@ -27139,7 +27206,7 @@ "Card.Body": [ { "filePath": "src/components/2U/ProductCard.jsx", - "line": 294, + "line": 291, "column": 10 }, { @@ -27156,7 +27223,7 @@ "Badge": [ { "filePath": "src/components/2U/ProductCard.jsx", - "line": 314, + "line": 311, "column": 14 }, { @@ -27372,7 +27439,7 @@ }, { "filePath": "src/templates/programDetailDegree.jsx", - "line": 241, + "line": 243, "column": 27 } ], @@ -27538,7 +27605,7 @@ }, { "filePath": "src/components/Search/ManagedAutoComplete.jsx", - "line": 269, + "line": 259, "column": 14 }, { From 93440f94165a7969a91e91fd3dda8788d95a7258 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:14:39 -0500 Subject: [PATCH 04/25] build: update sync workflow for alpha (#2033) --- .github/workflows/sync-alpha-master.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 4f0e83e34c..1bd5c26c27 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -15,16 +15,20 @@ jobs: uses: actions/setup-node@v1 with: node-version: 18 + - name: Sync changes + run: | + git switch alpha + git merge master - name: Create Pull Request id: cpr - uses: tretuna/sync-branches@1.4.0 + uses: peter-evans/create-pull-request@v4 with: - GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} - FROM_BRANCH: "master" - TO_BRANCH: "alpha" + token: ${{ secrets.requirements_bot_github_token }} + title: "chore(release): sync from master to alpha" + body: "Sync changes from `master` to `alpha`." - name: Enable Pull Request Auto Merge uses: peter-evans/enable-pull-request-automerge@v2 with: token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} merge-method: squash From 4c785154638f9d9b9fca8abc03fe998a28a51b60 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:17:41 -0500 Subject: [PATCH 05/25] build: include fetch-depth: 0 to checkout (#2034) --- .github/workflows/sync-alpha-master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 1bd5c26c27..1cd7642719 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Set up Node uses: actions/setup-node@v1 with: From edbc46ebcec72d59934174be850df2d73e3e7447 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:21:47 -0500 Subject: [PATCH 06/25] build: setup git user in sync branches workflow (#2035) --- .github/workflows/sync-alpha-master.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 1cd7642719..ef6e33841c 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -13,7 +13,9 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up Node + - name: Setup Git User + uses: fregante/setup-git-user@v1 + - name: Setup Node uses: actions/setup-node@v1 with: node-version: 18 From 698fa04654e5f3d76e32461d07681d70507a74e4 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:25:35 -0500 Subject: [PATCH 07/25] build: add a branch for generated workflow PR (#2037) --- .github/workflows/sync-alpha-master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index ef6e33841c..58361ee1c8 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -28,6 +28,7 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.requirements_bot_github_token }} + branch: automation/sync-alpha-master title: "chore(release): sync from master to alpha" body: "Sync changes from `master` to `alpha`." - name: Enable Pull Request Auto Merge From d99b1076656fbbbf98d373d8c77a5a340532ae90 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:31:38 -0500 Subject: [PATCH 08/25] build: skip CI for automation sync PR (#2039) * build: skip CI for automation sync PR * build: skip commitlint check for automated sync PRs --- .github/workflows/commitlint.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index fec11d6c25..368b16c670 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -3,7 +3,9 @@ name: Lint Commit Messages on: - - pull_request + pull_request: + branches-ignore: + - 'automation/sync-alpha-master' jobs: commitlint: From 3dfa469fcc7182212090b6f975b095683d23e00b Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 17 Feb 2023 10:42:46 -0500 Subject: [PATCH 09/25] chore: update browserslist DB (#1977) --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc16427b99..9b28917783 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5354,9 +5354,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001448", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001448.tgz", - "integrity": "sha512-tq2YI+MJnooG96XpbTRYkBxLxklZPOdLmNIOdIhvf7SNJan6u5vCKum8iT7ZfCt70m1GPkuC7P3TtX6UuhupuA==", + "version": "1.0.30001451", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001451.tgz", + "integrity": "sha512-XY7UbUpGRatZzoRft//5xOa69/1iGJRBlrieH6QYrkKLIFn3m7OVEJ81dSrKoy2BnKsdbX5cLrOispZNYo9v2w==", "dev": true, "funding": [ { @@ -22385,9 +22385,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001448", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001448.tgz", - "integrity": "sha512-tq2YI+MJnooG96XpbTRYkBxLxklZPOdLmNIOdIhvf7SNJan6u5vCKum8iT7ZfCt70m1GPkuC7P3TtX6UuhupuA==", + "version": "1.0.30001451", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001451.tgz", + "integrity": "sha512-XY7UbUpGRatZzoRft//5xOa69/1iGJRBlrieH6QYrkKLIFn3m7OVEJ81dSrKoy2BnKsdbX5cLrOispZNYo9v2w==", "dev": true }, "cardinal": { From 601b4ef1c32048d61b55bfe85c726b3c448b27b3 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 10:54:39 -0500 Subject: [PATCH 10/25] build: rebase instead of merge for syncing changes (#2042) --- .github/workflows/sync-alpha-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 58361ee1c8..8e8e73643d 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -22,7 +22,7 @@ jobs: - name: Sync changes run: | git switch alpha - git merge master + git rebase master - name: Create Pull Request id: cpr uses: peter-evans/create-pull-request@v4 From 5a2644bc78b8689c948776e0ab9f4639a440fc1b Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 13:39:44 -0500 Subject: [PATCH 11/25] build: another attempt to auto-sync changes from master to alpha (#2044) --- .github/workflows/sync-alpha-master.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 8e8e73643d..7da5ba6e42 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -19,21 +19,16 @@ jobs: uses: actions/setup-node@v1 with: node-version: 18 - - name: Sync changes - run: | - git switch alpha - git rebase master - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v4 + uses: tretuna/sync-branches@1 with: - token: ${{ secrets.requirements_bot_github_token }} - branch: automation/sync-alpha-master - title: "chore(release): sync from master to alpha" - body: "Sync changes from `master` to `alpha`." + GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} + FROM_BRANCH: "master" + TO_BRANCH: "alpha" - name: Enable Pull Request Auto Merge uses: peter-evans/enable-pull-request-automerge@v2 with: token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} merge-method: squash From d6a761d1ecf1b6f12067cf82c4e368a90f8a20b9 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 13:41:50 -0500 Subject: [PATCH 12/25] build: 1 to v1 in sync-branches workflow (#2045) --- .github/workflows/sync-alpha-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 7da5ba6e42..36e8fd88ca 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -21,7 +21,7 @@ jobs: node-version: 18 - name: Create Pull Request id: cpr - uses: tretuna/sync-branches@1 + uses: tretuna/sync-branches@v1 with: GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} FROM_BRANCH: "master" From ab68dc40a25d4a5e6059058dc6ed38a420b7f55a Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 13:46:58 -0500 Subject: [PATCH 13/25] build: switch base to trying a rebase (#2047) --- .github/workflows/sync-alpha-master.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 36e8fd88ca..8e8e73643d 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -19,16 +19,21 @@ jobs: uses: actions/setup-node@v1 with: node-version: 18 + - name: Sync changes + run: | + git switch alpha + git rebase master - name: Create Pull Request id: cpr - uses: tretuna/sync-branches@v1 + uses: peter-evans/create-pull-request@v4 with: - GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} - FROM_BRANCH: "master" - TO_BRANCH: "alpha" + token: ${{ secrets.requirements_bot_github_token }} + branch: automation/sync-alpha-master + title: "chore(release): sync from master to alpha" + body: "Sync changes from `master` to `alpha`." - name: Enable Pull Request Auto Merge uses: peter-evans/enable-pull-request-automerge@v2 with: token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} merge-method: squash From 5543854e44af94114c46d0347dae0830b6c355d2 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 13:52:54 -0500 Subject: [PATCH 14/25] build: pull from alpha before rebase master (#2049) --- .github/workflows/sync-alpha-master.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 8e8e73643d..712a2e7722 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -22,6 +22,7 @@ jobs: - name: Sync changes run: | git switch alpha + git pull origin alpha git rebase master - name: Create Pull Request id: cpr From 8f0e613c4f17fbb2dc64e752a1f1a4e206bf4b75 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 13:58:48 -0500 Subject: [PATCH 15/25] build: git checkout instead of git switch (#2051) --- .github/workflows/sync-alpha-master.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 712a2e7722..f268777ac7 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -21,8 +21,7 @@ jobs: node-version: 18 - name: Sync changes run: | - git switch alpha - git pull origin alpha + git checkout alpha git rebase master - name: Create Pull Request id: cpr From d45142efab354643c7c87cc48e8f4cc1c7970037 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 14:03:00 -0500 Subject: [PATCH 16/25] build: set base branch to alpha (#2053) --- .github/workflows/sync-alpha-master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index f268777ac7..9fcf5863a5 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -21,7 +21,7 @@ jobs: node-version: 18 - name: Sync changes run: | - git checkout alpha + git switch alpha git rebase master - name: Create Pull Request id: cpr @@ -29,6 +29,7 @@ jobs: with: token: ${{ secrets.requirements_bot_github_token }} branch: automation/sync-alpha-master + base: alpha title: "chore(release): sync from master to alpha" body: "Sync changes from `master` to `alpha`." - name: Enable Pull Request Auto Merge From 9b053dc0d347fd442824c7acf6ed6d5ad4f206d2 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 14:12:08 -0500 Subject: [PATCH 17/25] build: try using devmasx/merge-branch (#2055) --- .github/workflows/sync-alpha-master.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 9fcf5863a5..53334ce0f1 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -13,16 +13,17 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Setup Git User - uses: fregante/setup-git-user@v1 - name: Setup Node uses: actions/setup-node@v1 with: node-version: 18 - - name: Sync changes - run: | - git switch alpha - git rebase master + - name: Merge master -> alpha + uses: devmasx/merge-branch@v1 + with: + type: now + from_branch: master + target_branch: alpha + github_token: ${{ secrets.requirements_bot_github_token }} - name: Create Pull Request id: cpr uses: peter-evans/create-pull-request@v4 From 14119d4a9db69086a17d12d8b00036b1b39609c3 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 14:13:54 -0500 Subject: [PATCH 18/25] build: update merge-branch version number (#2056) --- .github/workflows/sync-alpha-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index 53334ce0f1..d70c094210 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -18,7 +18,7 @@ jobs: with: node-version: 18 - name: Merge master -> alpha - uses: devmasx/merge-branch@v1 + uses: devmasx/merge-branch@master with: type: now from_branch: master From b6bffffe8f49abb0c40d39855cc5e694d8d79cde Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 17 Feb 2023 14:23:28 -0500 Subject: [PATCH 19/25] build: try action-sync-branch (#2057) --- .github/workflows/sync-alpha-master.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml index d70c094210..3875fd8a02 100644 --- a/.github/workflows/sync-alpha-master.yml +++ b/.github/workflows/sync-alpha-master.yml @@ -17,25 +17,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 18 - - name: Merge master -> alpha - uses: devmasx/merge-branch@master - with: - type: now - from_branch: master - target_branch: alpha - github_token: ${{ secrets.requirements_bot_github_token }} - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.requirements_bot_github_token }} - branch: automation/sync-alpha-master - base: alpha - title: "chore(release): sync from master to alpha" - body: "Sync changes from `master` to `alpha`." - - name: Enable Pull Request Auto Merge - uses: peter-evans/enable-pull-request-automerge@v2 + - name: Sync alpha with master + uses: connor-baer/action-sync-branch@main with: + branch: alpha token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: squash + force: false From d8e09a1e44ec9805328e5e1d188f04b40892a46b Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sat, 18 Feb 2023 08:30:15 -0500 Subject: [PATCH 20/25] build: remove sync alpha master workflow temporarily (#2059) --- .github/workflows/commitlint.yml | 5 +---- .github/workflows/sync-alpha-master.yml | 25 ------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 .github/workflows/sync-alpha-master.yml diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index 368b16c670..dd2d8dd7a2 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -2,10 +2,7 @@ name: Lint Commit Messages -on: - pull_request: - branches-ignore: - - 'automation/sync-alpha-master' +on: pull_request jobs: commitlint: diff --git a/.github/workflows/sync-alpha-master.yml b/.github/workflows/sync-alpha-master.yml deleted file mode 100644 index 3875fd8a02..0000000000 --- a/.github/workflows/sync-alpha-master.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Sync alpha with master -on: - push: - branches: - - master - -jobs: - sync-branches: - runs-on: ubuntu-latest - name: Syncing branches - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Setup Node - uses: actions/setup-node@v1 - with: - node-version: 18 - - name: Sync alpha with master - uses: connor-baer/action-sync-branch@main - with: - branch: alpha - token: ${{ secrets.requirements_bot_github_token }} - force: false From 4cd12c15a931937f781168a6e68aaac812823595 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Feb 2023 09:09:10 -0500 Subject: [PATCH 21/25] docs: update dependent-usage.json (#2060) --- dependent-usage.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index 9e10a3073d..6cdcd0ca2a 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676642939833, + "lastModified": 1676729303714, "projectUsages": [ { "version": "19.19.1", @@ -12001,7 +12001,7 @@ } }, { - "version": "20.25.0", + "version": "20.28.4", "name": "@edx/frontend-app-enterprise-public-catalog", "repository": { "type": "git", @@ -24272,7 +24272,7 @@ }, { "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ResetCard.jsx", - "line": 29, + "line": 32, "column": 8 }, { @@ -24416,12 +24416,12 @@ }, { "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ResetCard.jsx", - "line": 34, + "line": 37, "column": 8 }, { "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ResetCard.jsx", - "line": 37, + "line": 40, "column": 8 }, { @@ -24851,7 +24851,7 @@ }, { "filePath": "src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ResetCard.jsx", - "line": 33, + "line": 36, "column": 6 } ], From d2fa3d557c5c3eb6fea873b4e288917522d0d922 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Feb 2023 09:09:15 -0500 Subject: [PATCH 22/25] docs: update dependent-usage.json (#2061) --- dependent-usage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependent-usage.json b/dependent-usage.json index 6cdcd0ca2a..977b7bf4c7 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676729303714, + "lastModified": 1676815707152, "projectUsages": [ { "version": "19.19.1", From 915754d3fee334111242818b939c71969d7bf002 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 09:09:16 -0500 Subject: [PATCH 23/25] docs: update dependent-usage.json (#2063) --- dependent-usage.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index 977b7bf4c7..da868e4304 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676815707152, + "lastModified": 1676902103894, "projectUsages": [ { "version": "19.19.1", @@ -10605,7 +10605,7 @@ }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 89, + "line": 90, "column": 20 }, { @@ -10855,7 +10855,7 @@ }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 61, + "line": 62, "column": 8 }, { @@ -10962,7 +10962,7 @@ }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 87, + "line": 88, "column": 10 }, { @@ -11086,7 +11086,7 @@ }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 72, + "line": 73, "column": 14 }, { @@ -11676,12 +11676,12 @@ }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 75, + "line": 76, "column": 28 }, { "filePath": "src/discussions/post-comments/PostCommentsView.jsx", - "line": 88, + "line": 89, "column": 17 } ], @@ -23654,7 +23654,7 @@ } }, { - "version": "20.27.0", + "version": "20.28.4", "name": "@edx/frontend-component-header", "repository": { "type": "git", @@ -26672,7 +26672,7 @@ } }, { - "version": "20.28.3", + "version": "20.28.4", "name": "@edx/frontend-platform", "repository": { "type": "git", From 66420028ba859e4c7500f5ce4afce4395a72170d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 09:09:15 -0500 Subject: [PATCH 24/25] docs: update dependent-usage.json (#2065) --- dependent-usage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index da868e4304..2e31802d47 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676902103894, + "lastModified": 1676988508111, "projectUsages": [ { "version": "19.19.1", @@ -10996,7 +10996,7 @@ "Button": [ { "filePath": "src/components/PostPreviewPane.jsx", - "line": 37, + "line": 43, "column": 10 }, { From 848183e2472392e57b5e1c2b57d58e71420f12f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 09:09:31 -0500 Subject: [PATCH 25/25] docs: update dependent-usage.json (#2073) --- dependent-usage.json | 57 ++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/dependent-usage.json b/dependent-usage.json index 2e31802d47..c7f7e862b0 100644 --- a/dependent-usage.json +++ b/dependent-usage.json @@ -1,5 +1,5 @@ { - "lastModified": 1676988508111, + "lastModified": 1677074926974, "projectUsages": [ { "version": "19.19.1", @@ -7726,7 +7726,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 172, + "line": 173, "column": 14 }, { @@ -7736,7 +7736,7 @@ }, { "filePath": "src/recommendations/RecommendationsPage.jsx", - "line": 106, + "line": 63, "column": 8 }, { @@ -7793,7 +7793,7 @@ }, { "filePath": "src/recommendations/RecommendationsPage.jsx", - "line": 107, + "line": 64, "column": 10 } ], @@ -7847,7 +7847,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 169, + "line": 170, "column": 10 }, { @@ -8258,7 +8258,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 164, + "line": 165, "column": 12 }, { @@ -8305,7 +8305,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 165, + "line": 166, "column": 14 }, { @@ -8388,18 +8388,18 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 184, + "line": 185, "column": 14 }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 196, + "line": 197, "column": 14 }, { "filePath": "src/recommendations/RecommendationsPage.jsx", - "line": 116, - "column": 10 + "line": 74, + "column": 12 }, { "filePath": "src/register/RegistrationPage.jsx", @@ -8499,7 +8499,7 @@ }, { "filePath": "src/progressive-profiling/ProgressiveProfiling.jsx", - "line": 164, + "line": 165, "column": 79 }, { @@ -8560,6 +8560,18 @@ "column": 4 } ], + "Spinner": [ + { + "filePath": "src/recommendations/RecommendationsPage.jsx", + "line": 87, + "column": 10 + }, + { + "filePath": "src/reset-password/ResetPasswordPage.jsx", + "line": 150, + "column": 13 + } + ], "ExpandLess": [ { "filePath": "src/register/registrationFields/CountryField.jsx", @@ -8583,13 +8595,6 @@ "line": 45, "column": 34 } - ], - "Spinner": [ - { - "filePath": "src/reset-password/ResetPasswordPage.jsx", - "line": 150, - "column": 13 - } ] } }, @@ -27025,7 +27030,7 @@ }, { "filePath": "src/components/ProductDetail/ProductDetailHero.jsx", - "line": 158, + "line": 164, "column": 14 }, { @@ -27429,7 +27434,7 @@ }, { "filePath": "src/components/ProductDetail/ProductDetailHero.jsx", - "line": 158, + "line": 164, "column": 25 }, { @@ -27533,16 +27538,6 @@ "line": 38, "column": 12 }, - { - "filePath": "src/components/ContentfulModule/PartnershipModule.jsx", - "line": 60, - "column": 16 - }, - { - "filePath": "src/components/ContentfulModule/UpcomingProgramModule.jsx", - "line": 68, - "column": 14 - }, { "filePath": "src/components/Course/2U/CourseHeader2U.jsx", "line": 202,