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

feat: fix multiple api requests and datatable #422

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Conversation

katrinan029
Copy link
Contributor

@katrinan029 katrinan029 commented Sep 17, 2024

Description

  • Refactors to remove duplicate calls to enterprise susbsidy and license manager api
  • Updates user datatable to display in zero state
  • Adds keys to customer integration cards

https://2u-internal.atlassian.net/browse/ENT-9477

Test plan

  1. checkout branch knguyen2/ent-9477
  2. at the root directory, add file webpack.dev.config.js with the following content:
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('webpack-dev', {
  devServer: {
    allowedHosts: 'all',
    https: true,
  },
});
  1. replace the content in .env.development with this info:
NODE_ENV='development'
PORT=18450
FEATURE_CUSTOMER_SUPPORT_VIEW='true'
ADMIN_PORTAL_BASE_URL='https://portal.stage.edx.org'
ACCESS_TOKEN_COOKIE_NAME='stage-edx-jwt-cookie-header-payload'
BASE_URL='https://localhost.stage.edx.org:18450'
FEATURE_CONFIGURATION_MANAGEMENT='true'
FEATURE_CONFIGURATION_ENTERPRISE_PROVISION='true'
FEATURE_CONFIGURATION_EDIT_ENTERPRISE_PROVISION='true'
CREDENTIALS_BASE_URL='https://credentials.stage.edx.org'
CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
ECOMMERCE_BASE_URL='https://ecommerce.stage.edx.org'
ENTERPRISE_ACCESS_BASE_URL='https://enterprise-access.stage.edx.org'
LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
LMS_BASE_URL='https://courses.stage.edx.org'
LICENSE_MANAGER_URL='https://license-manager.stage.edx.org'
LICENSE_MANAGER_DJANGO_URL='https://license-manager-internal.stage.edx.org'
SUPPORT_CONFLUENCE='https://support-tools.edx.org'
SUPPORT_CUSTOMER_REQUEST='https://support-tools.edx.org'
DISCOVERY_API_BASE_URL='https://discovery.stage.edx.org'
LOGIN_URL='https://courses.stage.edx.org/login'
LOGOUT_URL='https://courses.stage.edx.org/logout'
LOGO_URL=https://edx-cdn.org/v3/default/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
MARKETING_SITE_BASE_URL='https://stage.edx.org'
ORDER_HISTORY_URL='https://orders.stage.edx.org/orders'
REFRESH_ACCESS_TOKEN_ENDPOINT='https://courses.stage.edx.org/login_refresh'
SEGMENT_KEY=null
SITE_NAME='edX'
SUBSIDY_BASE_URL='https://enterprise-subsidy.stage.edx.org'
SUBSIDY_BASE_DJANGO_URL='https://enterprise-subsidy-internal.stage.edx.org'
USER_INFO_COOKIE_NAME='edx-user-info'
PUBLISHER_BASE_URL='https://publisher.stage.edx.org/'
APP_ID='support-tools'
MFE_CONFIG_API_URL='https://courses.stage.edx.org/api/mfe_config/v1'
  1. run npm run start
  2. go to link https://localhost.stage.edx.org:18450/enterprise-configuration/customers/02982884-1f1f-4103-b6d7-3a602c1afcbd/view open your network tab and verify that there is only one request made to the license-manager api and subsidy api.
  3. go to link https://localhost.stage.edx.org:18450/enterprise-configuration/customers/1847b3ae-5013-4b49-9d78-0b12f660e4e1/view and verify you see an "Associated users" datatable.
  4. go to link https://localhost.stage.edx.org:18450/enterprise-configuration/customers/02982884-1f1f-4103-b6d7-3a602c1afcbd/view open your dev console and verify that you do not see an error message for missing key prop in CustomerIntegrations.

@katrinan029 katrinan029 marked this pull request as ready for review September 18, 2024 18:36
Copy link

codecov bot commented Sep 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.40%. Comparing base (df46942) to head (1f465ae).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #422      +/-   ##
==========================================
- Coverage   84.73%   84.40%   -0.34%     
==========================================
  Files         185      185              
  Lines        3852     3840      -12     
  Branches      938      943       +5     
==========================================
- Hits         3264     3241      -23     
- Misses        566      576      +10     
- Partials       22       23       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@katrinan029 katrinan029 changed the title fix: fix multiple api requests fix: fix multiple api requests and datatable Sep 18, 2024
@katrinan029 katrinan029 changed the title fix: fix multiple api requests and datatable feat: fix multiple api requests and datatable Sep 18, 2024
@katrinan029 katrinan029 merged commit 046a4b1 into master Sep 18, 2024
6 of 7 checks passed
@katrinan029 katrinan029 deleted the knguyen2/ent-9477 branch September 18, 2024 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants