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

EREGCSC-2041 -- Adjust SSA.gov Title 16 links #910

Merged
merged 14 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions solution/ui/e2e/cypress/e2e/statutes.spec.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ describe("Statute Table", () => {
cy.intercept(`**/v3/statutes**`, {
fixture: "statutes.json",
}).as("statutes");

cy.intercept(`**/v3/acts`, {
fixture: "acts.json",
}).as("acts");
});

it("goes to statutes page from homepage and has SSA Title 19 selected by default", () => {
Expand Down
27 changes: 27 additions & 0 deletions solution/ui/e2e/cypress/fixtures/acts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[
{
"act": "Social Security Act",
"title": 11,
"title_roman": "XI"
},
{
"act": "Social Security Act",
"title": 16,
"title_roman": "XVI"
},
{
"act": "Social Security Act",
"title": 18,
"title_roman": "XVIII"
},
{
"act": "Social Security Act",
"title": 19,
"title_roman": "XIX"
},
{
"act": "Social Security Act",
"title": 21,
"title_roman": "XXI"
}
]
2 changes: 1 addition & 1 deletion solution/ui/regulations/alias.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
eregsComponentLib: r("../regulations/eregs-component-lib"),
legacy: r("../../regulations"),
sharedComponents: r(
"../eregs-component-lib/src/components/shared-components"
"../regulations/eregs-component-lib/src/components/shared-components"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update path to match other entries in this file

),
utilities: r("./utilities"),
vite: r("../regulations/eregs-vite/src"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,26 @@ import flushPromises from "flush-promises";
import { render, screen } from "@testing-library/vue";
import { describe, it, expect } from "vitest";

import actsFixture from "cypress/fixtures/acts.json";

import { ACT_TYPES } from "sharedComponents/Statutes/utils/enums.js";
import { shapeTitlesResponse } from "utilities/utils";

import StatuteSelector from "./StatuteSelector.vue";

const SHAPED_TITLES = shapeTitlesResponse({
actsResults: actsFixture,
actTypes: ACT_TYPES,
});

describe("Statute Table Selector", () => {
describe("SSA table type", () => {
it(`Creates a snapshot of the Statute Selector with default props`, async () => {
const wrapper = render(StatuteSelector, {
stubs: { "RouterLink": true },
props: {
titles: SHAPED_TITLES,
},
stubs: { RouterLink: true },
});

await flushPromises();
Expand All @@ -34,9 +47,10 @@ describe("Statute Table Selector", () => {

it(`Creates a snapshot of the Statute Selector with a loading prop`, async () => {
const wrapper = render(StatuteSelector, {
stubs: { "RouterLink": true },
stubs: { RouterLink: true },
props: {
loading: true,
titles: SHAPED_TITLES,
},
});

Expand All @@ -57,10 +71,11 @@ describe("Statute Table Selector", () => {

it(`Creates a snapshot of the Statute Selector when act and title props passed in to component`, async () => {
const wrapper = render(StatuteSelector, {
stubs: { "RouterLink": true },
stubs: { RouterLink: true },
props: {
selectedAct: "ssa",
selectedTitle: "21",
titles: SHAPED_TITLES,
},
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup>
import { titleSelectorList } from "./schemas/listSchemas";

const props = defineProps({
loading: {
type: Boolean,
Expand All @@ -17,6 +15,11 @@ const props = defineProps({
required: false,
default: "19",
},
titles: {
type: Object,
required: false,
default: () => {},
},
});

const isActActive = ({ act }) => act === props.selectedAct;
Expand All @@ -27,7 +30,7 @@ const isTitleActive = ({ act, title }) =>
<template>
<ul class="acts__list">
<li
v-for="(value, key, i) in titleSelectorList"
v-for="(value, key, i) in titles"
:key="`${key}-${i}`"
class="acts-list__item"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down Expand Up @@ -103,6 +116,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down Expand Up @@ -234,6 +260,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link titles-list__link--loading"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down Expand Up @@ -306,6 +345,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link titles-list__link--loading"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down Expand Up @@ -437,6 +489,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down Expand Up @@ -509,6 +574,19 @@ exports[`Statute Table Selector > SSA table type > Creates a snapshot of the Sta
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
<h4>
<routerlink-stub
class="titles-list__link"
data-testid="ssa-XVI-16"
to="[object Object]"
>
Title XVI
</routerlink-stub>
</h4>
</li>
<li
class="titles-list__item"
>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
// SSA
/* eslint-disable camelcase */
/* eslint-disable eqeqeq */

// SSA table URL methods

/**
* @param {number} title - CFR title (ex: 42)
* @param {string} usc - USC section
*
* @returns {string} url - url to the House.gov page for the USC section
*/
const houseGovUrl = ({ title, usc }) =>`https://uscode.house.gov/view.xhtml?hl=false&edition=prelim&req=granuleid%3AUSC-prelim-title${title}-section${usc}`;
const houseGovUrl = ({ title, usc }) =>
`https://uscode.house.gov/view.xhtml?hl=false&edition=prelim&req=granuleid%3AUSC-prelim-title${title}-section${usc}`;

/**
* @param {string} souce_url - URL containing COMPS number
Expand All @@ -28,14 +33,19 @@ const statuteCompilationUrl = ({ source_url }) => {
*
* @returns {string} url - url to the SSA.gov page for the SSA section
*/
const ssaGovUrl = ({ statute_title, section }) => `https://www.ssa.gov/OP_Home/ssact/title${statute_title}/${section}.htm`;
const ssaGovUrl = ({ statute_title, section }) => {
const title = statute_title == "16" ? "16b" : statute_title;

return `https://www.ssa.gov/OP_Home/ssact/title${title}/${section}.htm`;
};

/**
* @param {number} title - CFR title (ex: 42)
* @param {string} usc - USC section
*
* @returns {string} url - url to GovInfo.gov PDF page for USC Code
*/
const usCodeUrl = ({ title, usc }) => `https://www.govinfo.gov/link/uscode/${title}/${usc}`;
const usCodeUrl = ({ title, usc }) =>
`https://www.govinfo.gov/link/uscode/${title}/${usc}`;

export { houseGovUrl, usCodeUrl, statuteCompilationUrl, ssaGovUrl };
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { describe, it, expect } from "vitest";

import statutesFixture from "cypress/fixtures/statutes.json";

import {
houseGovUrl,
usCodeUrl,
statuteCompilationUrl,
ssaGovUrl,
} from "./urlMethods";

import statutesFixture from "cypress/fixtures/statutes.json";

import { describe, it, expect } from "vitest";

describe("Statute Table URL methods", () => {
describe("houseGovUrl", () => {
it("returns expected URL string", async () => {
Expand Down Expand Up @@ -44,6 +44,24 @@ describe("Statute Table URL methods", () => {
"https://www.ssa.gov/OP_Home/ssact/title11/1101.htm"
);
});

it("uses 16b for Title 16 URLs", async () => {
const section1601 = {
section: "1601",
title: 42,
usc: "1381",
act: "Social Security Act",
name: "Purpose; appropriations.",
statute_title: 16,
statute_title_roman: "XVI",
source_url:
"https://www.govinfo.gov/content/pkg/COMPS-8766/uslm/COMPS-8766.xml",
};
const computedUrl = ssaGovUrl(section1601);
expect(computedUrl).toEqual(
"https://www.ssa.gov/OP_Home/ssact/title16b/1601.htm"
);
});
});

describe("usCodeUrl", () => {
Expand Down
Loading
Loading