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

Remove links to plans from dashboard #299

Merged
merged 1 commit into from Nov 7, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -16,11 +16,6 @@ nav.DashboardNavigation
pending_buyers,
admin_buyers_accounts_path(search: {state: 'pending'}),
'Pending'
// Account Plans
- elsif show_account_plans_on_dashboard?
== dashboard_secondary_collection_link 'Plan',
account_plans.not_custom,
admin_buyers_account_plans_path

- if can? :manage, :partners
li.DashboardNavigation-list-item
Expand All @@ -30,7 +25,7 @@ nav.DashboardNavigation
'Applications',
'cubes'

- if can?(:manage, :monitoring) && alerts.any?
- if can?(:manage, :monitoring) && alerts.any?
== dashboard_secondary_collection_link 'Alert',
alerts,
admin_alerts_path,
Expand Down
12 changes: 0 additions & 12 deletions app/views/provider/admin/dashboards/_service_navigation.html.slim
Expand Up @@ -25,12 +25,6 @@ nav.DashboardNavigation
'Applications',
'cubes'

// Application Plans
- if can?(:manage, :plans) && !master_on_premises?
== dashboard_secondary_collection_link 'Plan',
service.application_plans.not_custom,
admin_service_application_plans_path(service)

- unread_alerts = current_account.buyer_alerts.by_service(service).unread
- if can?(:manage, :monitoring) && unread_alerts.any?
li.DashboardNavigation-list-item
Expand All @@ -48,12 +42,6 @@ nav.DashboardNavigation
service.service_contracts,
admin_buyers_service_contracts_path(search: {service_id: service.id})

// Service Plans
- if show_service_plans_on_dashboard?(service)
== dashboard_secondary_collection_link 'Plan',
service.service_plans.not_custom,
admin_service_service_plans_path(service)

// Active docs
- if can?(:manage, :plans)
li.DashboardNavigation-list-item
Expand Down
7 changes: 0 additions & 7 deletions features/old/menu/dashboard.feature
Expand Up @@ -29,12 +29,6 @@ Feature: Dashboard
And I should see the link "Integrate this API" in the first api dashboard widget
And I should see the link "0 ActiveDocs" in the first api dashboard widget

Scenario: Audience widget with "account_plans" switch allowed and more than 1 account plan
Given provider "foo.example.com" has "account_plans" switch allowed
And an account plan "second" of provider "foo.example.com"
When I go to the provider dashboard
Then I should see the link "2 Plans" in the audience dashboard widget

Scenario: Audience widget with Finance enabled
Given provider "foo.example.com" is charging
And provider "foo.example.com" has "finance" switch allowed
Expand All @@ -47,4 +41,3 @@ Feature: Dashboard
And a service plan "second" of provider "foo.example.com"
When I go to the provider dashboard
Then I should see the link "0 Subscriptions" in the first api dashboard widget
Then I should see the link "2 Plans" in the first api dashboard widget