Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Indicate review status
Browse files Browse the repository at this point in the history
  • Loading branch information
chadwhitacre committed Jun 14, 2017
1 parent 7b95d45 commit 2d0132e
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 4 deletions.
14 changes: 11 additions & 3 deletions tests/ttw/test_package_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,32 @@ def test_pasting_a_package_json_works(self):
self.make_package(name='amperize', description='Amperize!')
glob = self.make_package(name='glob', description='Glob!', emails=['[email protected]'])
self.make_package(name='netjet', description='Netjet!', emails=['[email protected]'])
scape = self.make_package(name='scape', description='Reject!', emails=['[email protected]'])
self.claim_package(self.make_participant('alice'), 'amperize')
self.claim_package(self.make_participant('bob'), 'glob')
self.claim_package(self.make_participant('goat'), 'scape')

admin = self.make_admin()
glob.team.update(name='Glub')
glob.team.update_review_status('approved', admin)
scape.team.update_review_status('rejected', admin)

self.sign_in('alice')
self.visit('/on/npm/')
self.css('textarea').fill('''\
{ "dependencies": { "glob": "..." , "amperize": "..."}
{ "dependencies": { "glob": "..." , "amperize": "...", "scape": "..."}
, "optionalDependencies": {"netjet": "...", "falafel": "..."}
}
''')
self.css('form button').click()

names = [x.text for x in self.css('.listing-name')]
assert names == ['glob \u2192 Glub', 'amperize', 'netjet', 'falafel']
assert names == ['glob \u2192 Glub', 'amperize', 'scape', 'netjet', 'falafel']

statuses = [x.text[3:] for x in self.css('.listing-details .status')]
assert statuses == ['Approved', 'Unreviewed', 'Rejected', 'Unclaimed']

enabled = [not x.has_class('disabled') for x in self.css('td.item')]
assert enabled == [True, True, True, False]
assert enabled == [True, True, True, True, False]
24 changes: 23 additions & 1 deletion www/on/npm/index.html.spt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ if user.participant:
packages_for_claiming = user.participant.get_packages_for_claiming(manager)
any_claimable = any([rec.claimed_by is None for rec in packages_for_claiming])

# Can't factor this out because of translations?
i18ned_statuses = { "approved": _("Approved")
, "unreviewed" : _("Unreviewed")
, "rejected": _("Rejected")
, "featured": _("Featured")
}

flow = request.qs.get('flow')
i18ned_flows = {'pay': _('Pay'), 'receive' : _('Receive')}
tab_html = lambda key, tab: '{}'.format(i18ned_flows[key])
Expand Down Expand Up @@ -130,8 +137,23 @@ if request.method == 'POST':
<div class="listing-details">
<span class="i">{{ i }}</span>
<span>&middot; <code>{{ group }}</code></span>
{% if project %}
<span class="status">&middot;
<a href="{{ project.review_url }}"><span
class="status-icon {{ icons.REVIEW_MAP[project.status] }}"
>{{ icons.STATUS_ICONS[icons.REVIEW_MAP[project.status]]|safe }}</span
>{{ i18ned_statuses[project.status] }}</a>
</span>
{% elif package %}
<span class="status">&middot;
<span class="status-icon {{ icons.REVIEW_MAP['rejected'] }}"
>{{ icons.STATUS_ICONS[icons.REVIEW_MAP['rejected']]|safe }}</span
>{{ _("Unclaimed") }}
</span>
{% endif %}

<span class="description">&middot;
{{ package.description or _('unknown package') }}
{{ package.description or _("Unknown package") }}
</span>
</div>
</td>
Expand Down

0 comments on commit 2d0132e

Please sign in to comment.