Skip to content

Commit

Permalink
Merge pull request #479 from osu-wams/dd1304-holds-link
Browse files Browse the repository at this point in the history
Dd1304 holds link
  • Loading branch information
mxcosu authored Jul 6, 2021
2 parents 7d6fa4f + 2d2595e commit 43045cd
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 17 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"@fortawesome/pro-solid-svg-icons": "^5.12.1",
"@fortawesome/react-fontawesome": "^0.1.11",
"@material-ui/core": "^4.9.9",
"@osu-wams/hooks": "1.0.123",
"@osu-wams/hooks": "1.0.124",
"@osu-wams/lib": "0.1.81",
"@osu-wams/theme": "0.1.2",
"@osu-wams/utils": "0.0.14",
"@osu-wams/theme": "0.1.3",
"@osu-wams/utils": "0.0.15",
"@reach/accordion": "^0.11.2",
"@reach/dialog": "^0.11.2",
"@reach/menu-button": "0.10.5",
Expand Down
7 changes: 7 additions & 0 deletions src/features/__tests__/StudentHolds.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ describe('<StudentHolds />', () => {
const more = await screen.findByText(/learn more about holds/i);
userEvent.click(more);
expect(mockGAEvent).toHaveBeenCalledTimes(1);
const view = await screen.findByText(/view your holds/i);
userEvent.click(view);
expect(mockGAEvent).toHaveBeenCalledTimes(2);
});

it('should render and have a multiple holds', async () => {
Expand All @@ -32,6 +35,8 @@ describe('<StudentHolds />', () => {
expect(await screen.findByText('Effective October 11, 2020')).toBeInTheDocument();
expect(await screen.findByText('2')).toBeInTheDocument();
expect(await screen.findByText('holds on your student account.')).toBeInTheDocument();
expect(await screen.findByText('View your holds')).toBeInTheDocument();
expect(await screen.findByText('Learn more about holds')).toBeInTheDocument();
});

it('should return appropriate text when data is empty', async () => {
Expand All @@ -40,5 +45,7 @@ describe('<StudentHolds />', () => {

expect(await screen.findByText('0')).toBeInTheDocument();
expect(await screen.findByText('holds on your student account.')).toBeInTheDocument();
expect(screen.queryByText('View your holds')).not.toBeInTheDocument();
expect(screen.queryByText('Learn more about holds')).not.toBeInTheDocument();
});
});
9 changes: 8 additions & 1 deletion src/features/academic-overview/StudentHolds.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,17 @@ export const StudentHolds: React.FC = () => {
<SimpleExternalLink
href={Url.registrar.holdsInfo}
onClick={() => Event('academic-overview', 'holds link')}
style={{ marginTop: '14px' }}
style={{ width: '100%', marginTop: '14px' }}
>
Learn more about holds
</SimpleExternalLink>
<SimpleExternalLink
href={Url.banner.viewHolds}
onClick={() => Event('academic-overview', 'view holds link')}
style={{ width: '100%' }}
>
View your holds
</SimpleExternalLink>
</HoldsList>
)}
</HighlightDescription>
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1687,13 +1687,13 @@
resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==

"@osu-wams/hooks@1.0.123":
version "1.0.123"
resolved "https://npm.pkg.github.com/download/@osu-wams/hooks/1.0.123/acaa4c8a95d17ce7189c45be5dd734fec715a6157de5799676e5c266c1a3772d#456a5dab6675e40e293a1598780e45105992f8ae"
integrity sha512-iT5/LHzpbJNUeT9EjsxKvuISu5i8ZT5/2d7ie2wETet/H2PnMuhPTDP5iYHva8rJvjtHNeiDDcIUY+GH91Ov5Q==
"@osu-wams/hooks@1.0.124":
version "1.0.124"
resolved "https://npm.pkg.github.com/download/@osu-wams/hooks/1.0.124/b987e2df45bf3607bf5d4d49ac5775a5bafeb14a4dcf102d51410c531b6498cf#c9cb556c03940fa40b054be3015af5af29f0ba70"
integrity sha512-5VOTdP5TbWsyW085TpB0q2srl3s4Y0CV4z0eFi8Aie5O195q9AUz78lYSMvbE8QuEvDMM9fx9a4a+FbIeIY4cw==
dependencies:
"@osu-wams/lib" "^0.1.81"
"@osu-wams/utils" "^0.0.14"
"@osu-wams/utils" "^0.0.15"
axios "^0.21.1"
fuse.js "^6.4.6"
nanoid "^3.1.22"
Expand All @@ -1706,17 +1706,17 @@
resolved "https://npm.pkg.github.com/download/@osu-wams/lib/0.1.81/a16b1afd21ee0dc8b473c0e7bcf77a61c0e34d510a7dfcb6c67a4ef8574e06c4#896dd199a689d1abf9a109e85bb1a2b0f4f4b8a9"
integrity sha512-KTAE4eyw0NhiIccALAsBDIOkROcuQkaUCa7jPEMIh19P2EUItVkQmATuJlZhlzqLt0Vg0/dyQqj+tKhHne3FQA==

"@osu-wams/theme@0.1.2":
version "0.1.2"
resolved "https://npm.pkg.github.com/download/@osu-wams/theme/0.1.2/c27e88495ce10b99c765d1dd286f1453f318ea2b9f7c7d7fdd9d9dc7ed3e2436#41a1244af783bd21dac61c97d4c8bd2c07635669"
integrity sha512-A8Y6IRWISsLJ3applBAcLgjvkJqojXlj/YskuoLWwhUYX+2nXJIZ6v/Pz/Ky4im65AFbC5UenII4Slr8GNZq4g==
"@osu-wams/theme@0.1.3":
version "0.1.3"
resolved "https://npm.pkg.github.com/download/@osu-wams/theme/0.1.3/50bede6b4c1387b3658eb4f1ac9a2ab6ea2487eca53e669deec50bdc24597e88#1765483aaa89dd6f2798883a6996e14971741644"
integrity sha512-g+BZGeesGSP3/pRby70UegDHDLZKbkacRE1dYXE3zkYDTIP62tteYhRJP38u+GgcMM6q0WufQlDotTtUXq1BUQ==
dependencies:
styled-components "^5.3.0"

"@osu-wams/utils@0.0.14", "@osu-wams/utils@^0.0.14":
version "0.0.14"
resolved "https://npm.pkg.github.com/download/@osu-wams/utils/0.0.14/10088a547264448a9885841b981eef730950bd1b86a4cef9e9d5314ab4831238#fd0255210652e15f68598ada42c86c5f46ddbab5"
integrity sha512-baEdvJNIhRhNHw5RsKx31IpRFCW39mRfrly7Gfayp6LuDSplDF1X913B4azKkIePj96+7ne3ZHzGxpULtRetTg==
"@osu-wams/utils@0.0.15", "@osu-wams/utils@^0.0.15":
version "0.0.15"
resolved "https://npm.pkg.github.com/download/@osu-wams/utils/0.0.15/9c6530e5dd28dafa5ee7082d390f818e81a7eed74a4d652dd3dc249959d2d80f#76665b6295773c8b02be4fb351256bf3af928c4a"
integrity sha512-HPFLYEvqsYbaMNoZE/FznHMa7Vqtk44/BPE6n0zA8GQzbCovMNbt3zoFANwXjXUU8C5DQM8DIPQnGKYgudMltQ==
dependencies:
"@osu-wams/lib" "^0.1.81"
date-fns "^2.21.1"
Expand Down

0 comments on commit 43045cd

Please sign in to comment.