#12815

pending completion

Build # #12815

Build Type

push

circleci

Committed by

web-flow

Commit Message

Merge pull request #2912 from mozilla/MNTOR-1350/fix-broken-ellipses

fix broken company ellipses and fallback icon

Run Details

282 of 1435 branches covered (19.65%)

Branch coverage included in aggregate %.

959 of 3916 relevant lines covered (24.49%)

2.04 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/views/partials/breaches.js

/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

import { getMessage, getLocale } from '../../utils/fluent.js'
import AppConstants from '../../app-constants.js'

function createEmailOptions (data, selectedEmailIndex) {
  const emails = data.verifiedEmails.map(obj => obj.email)
  const optionElements = emails.map((email, index) => `<option ${selectedEmailIndex === index ? 'selected' : ''}>${email}</option>`)

  return optionElements.join('')
}

function createBreachRows (data, logos) {
  const locale = getLocale()
  const shortDate = new Intl.DateTimeFormat(locale, { year: 'numeric', month: '2-digit', day: '2-digit', timeZone: 'UTC' })
  const shortList = new Intl.ListFormat(locale, { style: 'narrow' })
  const longDate = new Intl.DateTimeFormat(locale, { dateStyle: 'long', timeZone: 'UTC' })
  const longList = new Intl.ListFormat(locale, { style: 'long' })
  const breachRowsHTML = data.verifiedEmails.flatMap(account => {
    return account.breaches.map(breach => {
      const isHidden = !account.primary || breach.IsResolved // initial breach hidden state
      const status = breach.IsResolved ? 'resolved' : 'unresolved'
      const breachDate = Date.parse(breach.BreachDate)
      const addedDate = Date.parse(breach.AddedDate)
      const dataClassesTranslated = breach.DataClasses.map(item => getMessage(item))
      const description = getMessage('breach-description', {
        companyName: breach.Title,
        breachDate: longDate.format(breachDate),
        addedDate: longDate.format(addedDate),
        dataClasses: longList.format(dataClassesTranslated)
      })

      const logo = logos.has(breach.Domain)
        ? `<img src='${logos.get(breach.Domain)}' alt='' class='breach-logo' height='32' />`
        : `<span role="img" aria-hidden='true' class='breach-logo' style='background-color: var(${getColorForName(breach.Name)});'>${breach.Name.substring(0, 1)}</span>`

      return `
      <details class='breach-row' data-status=${status} data-email=${account.email} data-classes='${dataClassesTranslated}' ${isHidden ? 'hidden' : ''}>
        <summary>
          <span class='breach-company'>${logo} ${breach.Title}</span>
          <span>${shortList.format(dataClassesTranslated)}</span>
          <span>
            <span class='resolution-badge is-resolved'>${getMessage('column-status-badge-resolved')}</span>
            <span class='resolution-badge is-active'>${getMessage('column-status-badge-active')}</span>
          </span>
          <span>${shortDate.format(addedDate)}</span>
        </summary>
        <article>
          <p>${description}</p>
          <p><strong>${getMessage('breaches-resolve-heading')}</strong></p>
          <ol class='resolve-list'>${createResolveSteps(breach)}</ol>
        </article>
      </details>
      `
    })
  })

  return breachRowsHTML.join('')
}

function createResolveSteps (breach) {
  const checkedArr = breach.ResolutionsChecked || []
  const resolveStepsHTML = Object.entries(breach.breachChecklist).map(([key, value]) => `
  <li class='resolve-list-item'>
    <input name='${breach.Id}' value='${key}' type='checkbox' ${checkedArr.includes(key) ? 'checked' : ''}>
    <p>${value.header}<br><i>${value.body}</i></p>
  </li>
  `)

  return resolveStepsHTML.join('')
}

export const breaches = data => `
<section>
  <header class='breaches-header'>
    <h1>${getMessage('breach-heading-email', { 'email-select': `<custom-select name='email-account'>${createEmailOptions(data.breachesData, data.selectedEmailIndex)}</custom-select>` })}</h1>
    <circle-chart 
      class='breach-chart' 
      title='${getMessage('breach-chart-title')}' 
      data-txt-other='${getMessage('other-data-class')}' 
      data-txt-none='${getMessage('none-data-class')}'>
    </circle-chart>
    <figure class='email-stats' data-count=${data.emailTotalCount} data-total=${AppConstants.MAX_NUM_ADDRESSES}>
      <img src='/images/icon-email.svg' width='55' height='30'>
      <figcaption>
        <strong>${getMessage('emails-monitored', { count: data.emailVerifiedCount, total: AppConstants.MAX_NUM_ADDRESSES })}</strong>
        <a href='/user/settings'>${getMessage('manage-emails-link')}</a>
      </figcaption>
    </figure>
  </header>
</section>
<fieldset class='breaches-filter'>
  <input id='breaches-unresolved' type='radio' name='breaches-status' value='unresolved' autocomplete='off' checked>
  <label for='breaches-unresolved'><output>&nbsp;</output>${getMessage('filter-label-unresolved')}</label>
  <input id='breaches-resolved' type='radio' name='breaches-status' value='resolved' autocomplete='off'>
  <label for='breaches-resolved'><output>&nbsp;</output>${getMessage('filter-label-resolved')}</label>
</fieldset>
<section class='breaches-table' data-token=${data.csrfToken}>
  <header>
    <span>${getMessage('column-company')}</span>
    <span>${getMessage('column-breached-data')}</span>
    ${
      /*
       * The active/resolved badge does not have a column header, but by
       * including an empty <span>, we can re-use the `nth-child`-based
       * selectors for the content columns.
       */
      '<span></span>'
    }
    <span>${getMessage('column-detected')}</span>
  </header>
  ${createBreachRows(data.breachesData, data.breachLogos)}
  <template class='no-breaches'>
    <div class="zero-state no-breaches-message">
      <img src='/images/breaches-none.svg' alt='' width="136" height="102" />
      <h2>${getMessage('breaches-none-headline')}</h2>
      <p>${getMessage('breaches-none-copy', { email: '<b class="current-email"></b>' })}</p>
      <p class='add-email-cta'>
        <span>${getMessage('breaches-none-cta-blurb')}</span>
        <button class='primary' data-dialog='add-email'>${getMessage('breaches-none-cta-button')}</button>
      </p>
    </div>
  </template>
  <template class='all-breaches-resolved'>
    <div class="zero-state all-breaches-resolved-message">
      <img src='/images/breaches-all-resolved.svg' alt='' width="136" height="102" />
      <h2>${getMessage('breaches-all-resolved-headline')}</h2>
      <p>${getMessage('breaches-all-resolved-copy', { email: '<b class="current-email"></b>' })}</p>
      <p class='add-email-cta'>
        <span>${getMessage('breaches-all-resolved-cta-blurb')}</span>
        <button class='primary' data-dialog='add-email'>${getMessage('breaches-all-resolved-cta-button')}</button>
      </p>
    </div>
  </template>
</section>
`

/**
 * @param {string} name
 * @returns string CSS variable for a string-specific color
 */
function getColorForName (name) {
  const logoColors = [
    '--blue-5',
    '--purple-5',
    '--green-05',
    '--violet-5',
    '--orange-5',
    '--yellow-5',
    '--red-5',
    '--pink-5'
  ]

  const charValue = name
    .split('')
    .map(letter => letter.codePointAt(0))
    .reduce((sum, codePoint) => sum + codePoint)

  return logoColors[charValue % logoColors.length]
}

1	/* This Source Code Form is subject to the terms of the Mozilla Public
2	* License, v. 2.0. If a copy of the MPL was not distributed with this
3	* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4
5	import { getMessage, getLocale } from '../../utils/fluent.js'
6	import AppConstants from '../../app-constants.js'
7
8	function createEmailOptions (data, selectedEmailIndex) {
9	const emails = data.verifiedEmails.map(obj => obj.email)	×
10	const optionElements = emails.map((email, index) => `<option ${selectedEmailIndex === index ? 'selected' : ''}>${email}</option>`)	×
11
12	return optionElements.join('')	×
13	}
14
15	function createBreachRows (data, logos) {
16	const locale = getLocale()	×
17	const shortDate = new Intl.DateTimeFormat(locale, { year: 'numeric', month: '2-digit', day: '2-digit', timeZone: 'UTC' })	×
18	const shortList = new Intl.ListFormat(locale, { style: 'narrow' })	×
19	const longDate = new Intl.DateTimeFormat(locale, { dateStyle: 'long', timeZone: 'UTC' })	×
20	const longList = new Intl.ListFormat(locale, { style: 'long' })	×
21	const breachRowsHTML = data.verifiedEmails.flatMap(account => {	×
22	return account.breaches.map(breach => {	×
23	const isHidden = !account.primary \|\| breach.IsResolved // initial breach hidden state	×
24	const status = breach.IsResolved ? 'resolved' : 'unresolved'	×
25	const breachDate = Date.parse(breach.BreachDate)	×
26	const addedDate = Date.parse(breach.AddedDate)	×
27	const dataClassesTranslated = breach.DataClasses.map(item => getMessage(item))	×
28	const description = getMessage('breach-description', {	×
29	companyName: breach.Title,
30	breachDate: longDate.format(breachDate),
31	addedDate: longDate.format(addedDate),
32	dataClasses: longList.format(dataClassesTranslated)
33	})
34
35	const logo = logos.has(breach.Domain)	×
36	? `<img src='${logos.get(breach.Domain)}' alt='' class='breach-logo' height='32' />`
37	: `<span role="img" aria-hidden='true' class='breach-logo' style='background-color: var(${getColorForName(breach.Name)});'>${breach.Name.substring(0, 1)}</span>`
38
39	return `	×
40	<details class='breach-row' data-status=${status} data-email=${account.email} data-classes='${dataClassesTranslated}' ${isHidden ? 'hidden' : ''}>	×
41	<summary>
42	<span class='breach-company'>${logo} ${breach.Title}</span>
43	<span>${shortList.format(dataClassesTranslated)}</span>
44	<span>
45	<span class='resolution-badge is-resolved'>${getMessage('column-status-badge-resolved')}</span>
46	<span class='resolution-badge is-active'>${getMessage('column-status-badge-active')}</span>
47	</span>
48	<span>${shortDate.format(addedDate)}</span>
49	</summary>
50	<article>
51	<p>${description}</p>
52	<p><strong>${getMessage('breaches-resolve-heading')}</strong></p>
53	<ol class='resolve-list'>${createResolveSteps(breach)}</ol>
54	</article>
55	</details>
56	`
57	})
58	})
59
60	return breachRowsHTML.join('')	×
61	}
62
63	function createResolveSteps (breach) {
64	const checkedArr = breach.ResolutionsChecked \|\| []	×
65	const resolveStepsHTML = Object.entries(breach.breachChecklist).map(([key, value]) => `	×
66	<li class='resolve-list-item'>
67	<input name='${breach.Id}' value='${key}' type='checkbox' ${checkedArr.includes(key) ? 'checked' : ''}>	×
68	<p>${value.header}<br><i>${value.body}</i></p>
69	</li>
70	`)
71
72	return resolveStepsHTML.join('')	×
73	}
74
75	export const breaches = data => `	×
76	<section>
77	<header class='breaches-header'>
78	<h1>${getMessage('breach-heading-email', { 'email-select': `<custom-select name='email-account'>${createEmailOptions(data.breachesData, data.selectedEmailIndex)}</custom-select>` })}</h1>
79	<circle-chart
80	class='breach-chart'
81	title='${getMessage('breach-chart-title')}'
82	data-txt-other='${getMessage('other-data-class')}'
83	data-txt-none='${getMessage('none-data-class')}'>
84	</circle-chart>
85	<figure class='email-stats' data-count=${data.emailTotalCount} data-total=${AppConstants.MAX_NUM_ADDRESSES}>
86	<img src='/images/icon-email.svg' width='55' height='30'>
87	<figcaption>
88	<strong>${getMessage('emails-monitored', { count: data.emailVerifiedCount, total: AppConstants.MAX_NUM_ADDRESSES })}</strong>
89	<a href='/user/settings'>${getMessage('manage-emails-link')}</a>
90	</figcaption>
91	</figure>
92	</header>
93	</section>
94	<fieldset class='breaches-filter'>
95	<input id='breaches-unresolved' type='radio' name='breaches-status' value='unresolved' autocomplete='off' checked>
96	<label for='breaches-unresolved'><output> </output>${getMessage('filter-label-unresolved')}</label>
97	<input id='breaches-resolved' type='radio' name='breaches-status' value='resolved' autocomplete='off'>
98	<label for='breaches-resolved'><output> </output>${getMessage('filter-label-resolved')}</label>
99	</fieldset>
100	<section class='breaches-table' data-token=${data.csrfToken}>
101	<header>
102	<span>${getMessage('column-company')}</span>
103	<span>${getMessage('column-breached-data')}</span>
104	${
105	/*
106	* The active/resolved badge does not have a column header, but by
107	* including an empty <span>, we can re-use the `nth-child`-based
108	* selectors for the content columns.
109	*/
110	'<span></span>'
111	}
112	<span>${getMessage('column-detected')}</span>
113	</header>
114	${createBreachRows(data.breachesData, data.breachLogos)}
115	<template class='no-breaches'>
116	<div class="zero-state no-breaches-message">
117	<img src='/images/breaches-none.svg' alt='' width="136" height="102" />
118	<h2>${getMessage('breaches-none-headline')}</h2>
119	<p>${getMessage('breaches-none-copy', { email: '<b class="current-email"></b>' })}</p>
120	<p class='add-email-cta'>
121	<span>${getMessage('breaches-none-cta-blurb')}</span>
122	<button class='primary' data-dialog='add-email'>${getMessage('breaches-none-cta-button')}</button>
123	</p>
124	</div>
125	</template>
126	<template class='all-breaches-resolved'>
127	<div class="zero-state all-breaches-resolved-message">
128	<img src='/images/breaches-all-resolved.svg' alt='' width="136" height="102" />
129	<h2>${getMessage('breaches-all-resolved-headline')}</h2>
130	<p>${getMessage('breaches-all-resolved-copy', { email: '<b class="current-email"></b>' })}</p>
131	<p class='add-email-cta'>
132	<span>${getMessage('breaches-all-resolved-cta-blurb')}</span>
133	<button class='primary' data-dialog='add-email'>${getMessage('breaches-all-resolved-cta-button')}</button>
134	</p>
135	</div>
136	</template>
137	</section>
138	`
139
140	/**
141	* @param {string} name
142	* @returns string CSS variable for a string-specific color
143	*/
144	function getColorForName (name) {
145	const logoColors = [	×
146	'--blue-5',
147	'--purple-5',
148	'--green-05',
149	'--violet-5',
150	'--orange-5',
151	'--yellow-5',
152	'--red-5',
153	'--pink-5'
154	]
155
156	const charValue = name	×
157	.split('')
158	.map(letter => letter.codePointAt(0))	×
159	.reduce((sum, codePoint) => sum + codePoint)	×
160
161	return logoColors[charValue % logoColors.length]	×
162	}

mozilla / blurts-server / #12815

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous