Merge branch 'master' into mashal-m/paragon-modal-deprecation

.env.development

@@ -12,9 +12,11 @@ LICENSE_MANAGER_BASE_URL='http://localhost:18170'
 DISCOVERY_BASE_URL='http://localhost:18381'
 ENTERPRISE_CATALOG_BASE_URL='http://localhost:18160'
 ENTERPRISE_ACCESS_BASE_URL='http://localhost:18270'
+ENTERPRISE_SUBSIDY_BASE_URL='http://localhost:18280'
 ENTERPRISE_LEARNER_PORTAL_URL='http://localhost:8734'
 ENTERPRISE_SUPPORT_URL='https://edx.org'
 ENTERPRISE_SUPPORT_REVOKE_LICENSE_URL='https://edx.org'
+ENTERPRISE_SUPPORT_PROGRAM_OPTIMIZATION_URL='https://edx.org'
 SEGMENT_KEY=''
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 USER_INFO_COOKIE_NAME='edx-user-info'
@@ -38,13 +40,13 @@ FEATURE_SETTINGS_PAGE_LMS_TAB='true'
 FEATURE_SETTINGS_PAGE_APPEARANCE_TAB='true'
 FEATURE_LEARNER_CREDIT_MANAGEMENT='true'
 FEATURE_CONTENT_HIGHLIGHTS='true'
-FEATURE_TABLEAU_ANALYTICS='true'
 HOTJAR_APP_ID=''
 HOTJAR_VERSION='6'
 HOTJAR_DEBUG=''
 FEATURE_FILE_ATTACHMENT='true'
 IS_MAINTENANCE_ALERT_ENABLED=''
 MAINTENANCE_ALERT_MESSAGE=''
 MAINTENANCE_ALERT_START_TIMESTAMP=''
-TABLEAU_URL='https://enterprise-tableau.edx.org'
 USE_API_CACHE='true'
+SUBSCRIPTION_LPR='true'
+PLOTLY_SERVER_URL='http://localhost:8050'

.env.test

@@ -6,11 +6,12 @@ ENTERPRISE_LEARNER_PORTAL_URL='http://localhost:8734'
 DISCOVERY_BASE_URL='http://localhost:18381'
 ENTERPRISE_CATALOG_BASE_URL='http://localhost:18160'
 ENTERPRISE_ACCESS_BASE_URL='http://localhost:18270'
+ENTERPRISE_SUBSIDY_BASE_URL='http://localhost:18280'
 LOGO_URL='https://edx-cdn.org/v3/prod/logo.svg'
 LOGO_TRADEMARK_URL='https://edx-cdn.org/v3/default/logo-trademark.svg'
 LOGO_WHITE_URL='https://edx-cdn.org/v3/default/logo-white.svg'
 FAVICON_URL='https://edx-cdn.org/v3/default/favicon.ico'
 FEATURE_FILE_ATTACHMENT='true'
 ENTERPRISE_SUPPORT_URL = ''
 ENTERPRISE_SUPPORT_REVOKE_LICENSE_URL = ''
-TABLEAU_URL='https://enterprise-tableau.edx.org'
+PLOTLY_SERVER_URL='http://localhost:8050'

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -16,4 +16,4 @@ jobs:
     secrets:
       GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
       GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/commitlint.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   commitlint:
-    uses: edx/.github/.github/workflows/commitlint.yml@master
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

.github/workflows/update-browserslist-db.yml

@@ -0,0 +1,12 @@
+name: Update Browserslist DB
+on:
+  schedule:
+    - cron:  '0 0 * * 1'
+  workflow_dispatch:
+
+jobs:
+  update-browserslist:
+    uses: openedx/.github/.github/workflows/update-browserslist-db.yml@master
+
+    secrets:
+        requirements_bot_github_token: ${{ secrets.requirements_bot_github_token }}

__mocks__/react-instantsearch-dom.jsx

@@ -15,8 +15,8 @@ const advertised_course_run = {
 
 /* eslint-disable camelcase */
 const fakeHits = [
-  { objectID: '1', title: 'bla', advertised_course_run, key: 'Bees101' },
-  { objectID: '2', title: 'blp', advertised_course_run, key: 'Wasps200' },
+  { objectID: '1', aggregation_key: 'course:Bees101', title: 'bla', advertised_course_run, key: 'Bees101' },
+  { objectID: '2', aggregation_key: 'course:Wasps200', title: 'blp', advertised_course_run, key: 'Wasps200' },
 ];
 /* eslint-enable camelcase */
 
@@ -74,10 +74,12 @@ MockReactInstantSearch.connectPagination = Component => function connectPaginati
 };
 
 MockReactInstantSearch.InstantSearch = function InstantSearch({ children }) {
-  return children;
+  return (
+    <div data-testid="algolia__InstantSearch">{children}</div>
+  );
 };
 MockReactInstantSearch.Configure = function Configure() {
-  return <div>CONFIGURED</div>;
+  return <div data-testid="algolia__Configure">CONFIGURED</div>;
 };
 
 module.exports = MockReactInstantSearch;