Skip to content

Commit 5566763

Browse files
jrafaniejrafanie
authored
Merge pull request #1965 from GilbertCherrie/fix_services_page
Fix services page
2 parents 70b615b + 8a95282 commit 5566763

File tree

6 files changed

+26
-25
lines changed

6 files changed

+26
-25
lines changed

‎client/app/components/dashboard/dashboard.component.service.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ export function DashboardComponentFactory (CollectionsApi) {
7171
const date1 = 'retires_on>' + currentDate.toISOString()
7272
const days30 = currentDate.setDate(currentDate.getDate() + 30)
7373
const date2 = 'retires_on<' + new Date(days30).toISOString()
74-
const options = {hide: 'resources', filter: ['retired=false', date1, date2]}
74+
const options = {hide: 'resources', filter: ['retired=false', date1, date2, 'visible=true']}
7575

7676
return CollectionsApi.query('services', options)
7777
}
7878

7979
function resolveRetiredServices () {
80-
const options = {hide: 'resources', filter: ['service_id=nil', 'retired=true']}
80+
const options = {hide: 'resources', filter: ['service_id=nil', 'retired=true', 'visible=true']}
8181

8282
return CollectionsApi.query('services', options)
8383
}
8484

8585
function resolveServicesWithDefinedServiceIds () {
8686
const options = {
8787
expand: 'resources',
88-
filter: ['service_id=nil'],
88+
filter: ['service_id=nil', 'visible=true'],
8989
attributes: ['chargeback_report']
9090
}
9191

‎client/app/components/dashboard/dashboard.component.service.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ describe('Service: DashboardService', () => {
2424
filter: [
2525
'retired=false',
2626
'retires_on>2016-01-01T00:00:00.000Z',
27-
'retires_on<2016-01-31T00:00:00.000Z'
27+
'retires_on<2016-01-31T00:00:00.000Z',
28+
'visible=true'
2829
]
2930
}]
3031
)

‎client/app/core/navigation.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function NavigationFactory (RBAC, Polling, POLLING_INTERVAL, CollectionsA
5454
iconClass: 'pficon pficon-service',
5555
badgeQuery: {
5656
'field': 'services',
57-
'filter': 'ancestry=null'
57+
'filter': ['ancestry=null', 'visible=true']
5858
},
5959
badges: [
6060
{

‎client/app/services/service-explorer/service-explorer.component.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe('Component: serviceExplorer', () => {
8181
attributes: ['picture', 'picture.image_href', 'chargeback_report', 'evm_owner.userid', 'v_total_vms', 'power_state', 'all_service_children', 'tags'],
8282
auto_refresh: undefined,
8383
expand: 'resources',
84-
filter: ['ancestry=null', 'display=true'],
84+
filter: ['ancestry=null', 'visible=true'],
8585
limit: 20,
8686
offset: '0',
8787
sort_by: 'created_at',

‎client/app/services/services-state.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export function ServicesStateFactory (ListConfiguration, CollectionsApi, RBAC) {
297297

298298
// Private
299299
function getQueryFilters (filters = []) {
300-
const queryFilters = ['ancestry=null', 'display=true']
300+
const queryFilters = ['ancestry=null', 'visible=true']
301301

302302
filters.forEach((nextFilter) => {
303303
if (nextFilter.id === 'name') {

‎client/gettext/po/manageiq-ui-service.pot

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ msgstr ""
2121
msgid "%d new notifications"
2222
msgstr ""
2323

24-
#: ./client/app/core/navigation/navigation-controller.js:172
24+
#: ./client/app/core/navigation/navigation-controller.js:176
2525
msgid "%d unread notifications"
2626
msgstr ""
2727

@@ -99,7 +99,7 @@ msgstr ""
9999
msgid "Add to Shopping Cart"
100100
msgstr ""
101101

102-
#: ./client/app/core/navigation/navigation-controller.js:154
102+
#: ./client/app/core/navigation/navigation-controller.js:158
103103
msgid "Administration UI"
104104
msgstr ""
105105

@@ -505,7 +505,7 @@ msgstr ""
505505
msgid "GUID"
506506
msgstr ""
507507

508-
#: ./client/app/core/navigation/navigation-controller.js:248
508+
#: ./client/app/core/navigation/navigation-controller.js:252
509509
msgid "Group switching error:"
510510
msgstr ""
511511

@@ -604,7 +604,7 @@ msgstr ""
604604
msgid "Log In to Corporate System"
605605
msgstr ""
606606

607-
#: ./client/app/core/navigation/navigation-controller.js:155
607+
#: ./client/app/core/navigation/navigation-controller.js:159
608608
msgid "Log into the full administrative UI"
609609
msgstr ""
610610

@@ -654,14 +654,14 @@ msgstr ""
654654
msgid "Monthly Cost"
655655
msgstr ""
656656

657-
#: ./client/app/core/navigation.service.js:51
657+
#: ./client/app/core/navigation.service.js:68
658658
#: ./client/app/states/catalogs/details/details.state.js:58
659659
#: ./client/app/states/orders/details/details.html:5
660660
#: ./client/app/states/orders/explorer/explorer.state.js:11
661661
msgid "My Orders"
662662
msgstr ""
663663

664-
#: ./client/app/core/navigation.service.js:35
664+
#: ./client/app/core/navigation.service.js:52
665665
#: ./client/app/services/resource-details/resource-details.html:5
666666
#: ./client/app/services/service-details/service-details.html:5
667667
#: ./client/app/services/service-explorer/service-explorer.html:4
@@ -764,7 +764,7 @@ msgid "Order"
764764
msgstr ""
765765

766766
#: ./client/app/orders/order-explorer/order-explorer.html:33
767-
#: ./client/app/states/orders/details/details.html:24
767+
#: ./client/app/states/orders/details/details.html:27
768768
#: ./client/app/states/orders/details/details.html:7
769769
msgid "Order #"
770770
msgstr ""
@@ -866,7 +866,7 @@ msgstr ""
866866
msgid "Power State: Unknown"
867867
msgstr ""
868868

869-
#: ./client/app/core/navigation/navigation-controller.js:136
869+
#: ./client/app/core/navigation/navigation-controller.js:140
870870
msgid "Product logo"
871871
msgstr ""
872872

@@ -1066,7 +1066,7 @@ msgstr ""
10661066
msgid "Review the notification tray for results of this batch operation"
10671067
msgstr ""
10681068

1069-
#: ./client/app/core/navigation/navigation-controller.js:141
1069+
#: ./client/app/core/navigation/navigation-controller.js:145
10701070
msgid "SUI Version:"
10711071
msgstr ""
10721072

@@ -1107,7 +1107,7 @@ msgstr ""
11071107
msgid "Send CTRL+ALT+DEL"
11081108
msgstr ""
11091109

1110-
#: ./client/app/core/navigation/navigation-controller.js:142
1110+
#: ./client/app/core/navigation/navigation-controller.js:146
11111111
msgid "Server Name:"
11121112
msgstr ""
11131113

@@ -1116,7 +1116,7 @@ msgid "Service"
11161116
msgstr ""
11171117

11181118
#: ./client/app/catalogs/catalog-explorer.html:4
1119-
#: ./client/app/core/navigation.service.js:68
1119+
#: ./client/app/core/navigation.service.js:35
11201120
msgid "Service Catalog"
11211121
msgstr ""
11221122

@@ -1343,7 +1343,7 @@ msgstr ""
13431343
msgid "The page you requested cannot be found."
13441344
msgstr ""
13451345

1346-
#: ./client/app/core/navigation.service.js:79
1346+
#: ./client/app/core/navigation.service.js:46
13471347
msgid "The total number of available catalogs"
13481348
msgstr ""
13491349

@@ -1477,11 +1477,11 @@ msgstr ""
14771477
msgid "Total Snapshots"
14781478
msgstr ""
14791479

1480-
#: ./client/app/core/navigation.service.js:62
1480+
#: ./client/app/core/navigation.service.js:79
14811481
msgid "Total orders submitted"
14821482
msgstr ""
14831483

1484-
#: ./client/app/core/navigation.service.js:45
1484+
#: ./client/app/core/navigation.service.js:62
14851485
msgid "Total services ordered, both active and retired"
14861486
msgstr ""
14871487

@@ -1505,11 +1505,11 @@ msgstr ""
15051505
msgid "User Default"
15061506
msgstr ""
15071507

1508-
#: ./client/app/core/navigation/navigation-controller.js:143
1508+
#: ./client/app/core/navigation/navigation-controller.js:147
15091509
msgid "User Name:"
15101510
msgstr ""
15111511

1512-
#: ./client/app/core/navigation/navigation-controller.js:144
1512+
#: ./client/app/core/navigation/navigation-controller.js:148
15131513
msgid "User Role:"
15141514
msgstr ""
15151515

@@ -1541,7 +1541,7 @@ msgstr ""
15411541
msgid "Verbosity"
15421542
msgstr ""
15431543

1544-
#: ./client/app/core/navigation/navigation-controller.js:140
1544+
#: ./client/app/core/navigation/navigation-controller.js:144
15451545
msgid "Version:"
15461546
msgstr ""
15471547

@@ -1632,7 +1632,7 @@ msgstr ""
16321632
msgid "of"
16331633
msgstr ""
16341634

1635-
#: ./client/app/states/orders/details/details.html:25
1635+
#: ./client/app/states/orders/details/details.html:28
16361636
msgid "ordered on"
16371637
msgstr ""
16381638

0 commit comments

Comments
 (0)