Skip to content

Commit

Permalink
chore(viewmodels): remove unused fields from MediaItem
Browse files Browse the repository at this point in the history
refactored into the Start page templates directly
  • Loading branch information
thekaveman committed Jul 7, 2023
1 parent 57f083e commit fdf8479
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 34 deletions.
1 change: 0 additions & 1 deletion benefits/core/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class Migration(migrations.Migration):
name="EligibilityVerifier",
fields=[
("id", models.AutoField(primary_key=True, serialize=False)),
("bullets", models.JSONField(null=True)),
("name", models.TextField()),
("api_url", models.TextField(null=True)),
("api_auth_header", models.TextField(null=True)),
Expand Down
16 changes: 0 additions & 16 deletions benefits/core/migrations/0002_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@ def load_data(app, *args, **kwargs):

mst_oauth_claims_verifier = EligibilityVerifier.objects.create(
name=os.environ.get("MST_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (MST)"),
bullets=[
"eligibility.pages.start.login_gov.required_items[0]",
"eligibility.pages.start.login_gov.required_items[1]",
"eligibility.pages.start.login_gov.required_items[2]",
],
eligibility_type=mst_senior_type,
auth_provider=senior_auth_provider,
selection_label=_("eligibility.pages.index.login_gov.label"),
Expand All @@ -172,12 +167,6 @@ def load_data(app, *args, **kwargs):

mst_veteran_verifier = EligibilityVerifier.objects.create(
name=os.environ.get("MST_VETERAN_VERIFIER_NAME", "VA.gov - Veteran (MST)"),
bullets=[
"eligibility.pages.start.veteran.required_items[0]",
"eligibility.pages.start.veteran.required_items[1]",
"eligibility.pages.start.veteran.required_items[2]",
"eligibility.pages.start.veteran.required_items[3]",
],
eligibility_type=mst_veteran_type,
auth_provider=veteran_auth_provider,
selection_label=_("eligibility.pages.index.veteran.label"),
Expand Down Expand Up @@ -228,11 +217,6 @@ def load_data(app, *args, **kwargs):

sacrt_oauth_claims_verifier = EligibilityVerifier.objects.create(
name=os.environ.get("SACRT_OAUTH_VERIFIER_NAME", "OAuth claims via Login.gov (SacRT)"),
bullets=[
"eligibility.pages.start.login_gov.required_items[0]",
"eligibility.pages.start.login_gov.required_items[1]",
"eligibility.pages.start.login_gov.required_items[2]",
],
eligibility_type=sacrt_senior_type,
auth_provider=senior_auth_provider,
selection_label=_("eligibility.pages.index.login_gov.label"),
Expand Down
1 change: 0 additions & 1 deletion benefits/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ class EligibilityVerifier(models.Model):
"""An entity that verifies eligibility."""

id = models.AutoField(primary_key=True)
bullets = models.JSONField(null=True)
name = models.TextField()
api_url = models.TextField(null=True)
api_auth_header = models.TextField(null=True)
Expand Down
8 changes: 0 additions & 8 deletions benefits/core/templates/core/includes/media-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,8 @@
{% if item.details|length %}
<div class="media-body--details">
{% for d in item.details %}<p>{{ d }}</p>{% endfor %}
{% if item.bullets|length %}
<div class="media-body--items">
<ul>
{% for l in item.bullets %}<li>{{ l }}</li>{% endfor %}
</ul>
</div>
{% endif %}
</div>
{% endif %}
{% if item.secondary_details %}<p class="pt-1">{{ item.secondary_details }}</p>{% endif %}
</div>
</li>
{% endfor %}
Expand Down
9 changes: 1 addition & 8 deletions benefits/core/viewmodels.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,10 @@ class MediaItem:
Represents a media item in a list of items:
* icon: core.viewmodels.Icon
* details: str, str[]
* secondary_details: str
* heading: str
* bullets: str, str[]
"""

def __init__(self, icon: Icon, details, secondary_details=None, heading=None, bullets=None):
def __init__(self, icon: Icon, details, heading=None):
self.icon = icon
if isinstance(details, str):
self.details = [details]
Expand All @@ -115,11 +113,6 @@ def __init__(self, icon: Icon, details, secondary_details=None, heading=None, bu
else:
self.details = [str(details)]
self.heading = heading
self.secondary_details = secondary_details
if isinstance(bullets, str):
self.bullets = [bullets]
elif isinstance(bullets, list):
self.bullets = bullets


class Modal:
Expand Down

0 comments on commit fdf8479

Please sign in to comment.