Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ner-record into bilalqamar95/jest-v29-upgrade
  • Loading branch information
BilalQamar95 committed Apr 23, 2024
2 parents 23cabd4 + f7e7c44 commit fa972c3
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 63 deletions.
1 change: 1 addition & 0 deletions .github/workflows/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @openedx/2U-aperture
169 changes: 126 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"i18n_extract": "fedx-scripts formatjs extract",
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
"lint:fix": "fedx-scripts eslint --fix --ext .js --ext .jsx .",
"postinstall": "patch-package",
"serve": "fedx-scripts serve",
"snapshot": "fedx-scripts jest --updateSnapshot",
"start": "fedx-scripts webpack-dev-server --progress",
Expand All @@ -40,13 +39,13 @@
"@edx/frontend-component-header": "5.3.0",
"@edx/frontend-platform": "8.0.0",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-brands-svg-icons": "6.5.1",
"@fortawesome/free-regular-svg-icons": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-brands-svg-icons": "6.5.2",
"@fortawesome/free-regular-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.0",
"@openedx/frontend-plugin-framework": "^1.1.0",
"@openedx/paragon": "^21.11.3",
"@openedx/paragon": "^22.2.2",
"axios": "0.28.1",
"babel-polyfill": "6.26.0",
"core-js": "3.36.1",
Expand All @@ -58,8 +57,8 @@
"react-dom": "17.0.2",
"react-helmet-async": "^1.3.0",
"react-redux": "7.2.9",
"react-router": "6.22.2",
"react-router-dom": "6.22.2",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
"redux": "4.2.1",
"regenerator-runtime": "0.14.1"
},
Expand All @@ -74,7 +73,7 @@
"glob": "10.3.12",
"husky": "9.0.11",
"jest": "29.7.0",
"patch-package": "8.0.0",
"patch-package": "^8.0.0",
"resize-observer-polyfill": "^1.5.1",
"rosie": "2.1.1"
}
Expand Down
22 changes: 12 additions & 10 deletions src/components/ProgramRecord/ProgramRecordHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,18 @@ function ProgramRecordHeader({
</span>
</div>
<div className="learner-info my-3">
<FormattedMessage
id="learner.username"
defaultMessage="{username}"
description="Username of the learner"
values={{
username: learner.username,
}}
/>
|
{
learner.full_name && (
<FormattedMessage
id="learner.full_name"
defaultMessage="{full_name} | "
description="Full name of the learner"
values={{
full_name: learner.full_name,
}}
/>
)
}
<FormattedMessage
id="learner.email"
defaultMessage="{email}"
Expand All @@ -103,7 +106,6 @@ ProgramRecordHeader.propTypes = {
learner: PropTypes.shape({
email: PropTypes.string,
full_name: PropTypes.string,
username: PropTypes.string,
}).isRequired,
program: PropTypes.shape({
name: PropTypes.string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Factory } from 'rosie'; // eslint-disable-line import/no-extraneous-dep
export default Factory.define('program_record_details')
.attr('record', {
learner: {
full_name: '',
full_name: 'test',
username: 'edx',
email: '[email protected]',
},
Expand Down

0 comments on commit fa972c3

Please sign in to comment.