katello 3.10.0.rc1 → 3.10.0.rc1.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/app/views/katello/layouts/react.html.erb +2 -2
- data/lib/katello/version.rb +1 -1
- data/webpack/move_to_foreman/components/common/EmptyState/index.js +68 -0
- data/webpack/move_to_foreman/components/common/table/components/Table.js +1 -2
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +1 -1
- data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap +1 -1
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js +1 -0
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap +1 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +21 -2
- metadata +4 -4
- data/webpack/__mocks__/foremanReact/components/common/EmptyState.js +0 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 1684a0dc74546bf1ae0268fec4e40a5359bb3e2b9852ecefb78b65d8d9e76ce2
|
4
|
+
data.tar.gz: ead5ba3429716c8fbf2fad95040a1a4542f7d5e2b8a6b75dcacbd557c4aaef13
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 26f6eb57a2d9dd32ca9be6e7065d7dcd224b44ea9c765384d8ab4860e066fae4aa7dbbc8c4c49e07a9fd11ae7f733fb101cae68213a0d031612d6a266eee5f0d
|
7
|
+
data.tar.gz: 31bb715ce69dd9fcb055d279fec29d1a0c3d0b327d0b0b5ea5b7501552fbd7f153247847ba794f640ad94fb2f2e720dc7bd221c7da9aec659dd3ecf79deca375
|
@@ -1,9 +1,9 @@
|
|
1
1
|
<% content_for(:stylesheets) do %>
|
2
|
-
<%=
|
2
|
+
<%= stylesheet_link_tag *webpack_asset_paths('katello', :extension => 'css'), "data-turbolinks-track" => true %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<% content_for(:javascripts) do %>
|
6
|
-
<%=
|
6
|
+
<%= javascript_include_tag *webpack_asset_paths('katello', :extension => 'js') %>
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<% content_for(:content) do %>
|
data/lib/katello/version.rb
CHANGED
@@ -0,0 +1,68 @@
|
|
1
|
+
/* eslint-disable */
|
2
|
+
import React from 'react';
|
3
|
+
import { EmptyState as PfEmptyState, Button } from 'patternfly-react';
|
4
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
5
|
+
import { LinkContainer } from 'react-router-bootstrap';
|
6
|
+
|
7
|
+
const EmptyState = (props) => {
|
8
|
+
const {
|
9
|
+
icon = 'add-circle-o',
|
10
|
+
header,
|
11
|
+
description,
|
12
|
+
customDocumentation,
|
13
|
+
documentationLabel = __('For more information please see'),
|
14
|
+
documentationButton = __('Documentation'),
|
15
|
+
docUrl,
|
16
|
+
action,
|
17
|
+
actionButton,
|
18
|
+
secondayActions,
|
19
|
+
} = props;
|
20
|
+
const defaultDocumantion = `${documentationLabel} <a href=${docUrl}>${documentationButton}</a>`;
|
21
|
+
const showDocsLink = !!(docUrl || customDocumentation);
|
22
|
+
|
23
|
+
return (
|
24
|
+
<PfEmptyState>
|
25
|
+
<PfEmptyState.Icon type="pf" name={icon} />
|
26
|
+
<PfEmptyState.Title>{header}</PfEmptyState.Title>
|
27
|
+
<PfEmptyState.Info>{description}</PfEmptyState.Info>
|
28
|
+
{showDocsLink && (
|
29
|
+
<PfEmptyState.Help>
|
30
|
+
{customDocumentation || <span dangerouslySetInnerHTML={{ __html: defaultDocumantion }} />}
|
31
|
+
</PfEmptyState.Help>
|
32
|
+
)}
|
33
|
+
{action && (
|
34
|
+
<PfEmptyState.Action>
|
35
|
+
{action.url && (
|
36
|
+
<LinkContainer to={action.url}>
|
37
|
+
<Button href={action.url} bsStyle="primary" bsSize="large">
|
38
|
+
{action.title}
|
39
|
+
</Button>
|
40
|
+
</LinkContainer>
|
41
|
+
)}
|
42
|
+
{action.onClick && (
|
43
|
+
<Button onClick={action.onClick} bsStyle="primary" bsSize="large">
|
44
|
+
{action.title}
|
45
|
+
</Button>
|
46
|
+
)}
|
47
|
+
</PfEmptyState.Action>
|
48
|
+
)}
|
49
|
+
{actionButton && (
|
50
|
+
<PfEmptyState.Action>
|
51
|
+
{actionButton}
|
52
|
+
</PfEmptyState.Action>
|
53
|
+
)}
|
54
|
+
{secondayActions && (
|
55
|
+
<PfEmptyState.Action secondary>
|
56
|
+
{secondayActions.map(item => (
|
57
|
+
<LinkContainer to={item.url}>
|
58
|
+
<Button href={item.url} title={item.title}>
|
59
|
+
{item.title}
|
60
|
+
</Button>
|
61
|
+
</LinkContainer>
|
62
|
+
))}
|
63
|
+
</PfEmptyState.Action>
|
64
|
+
)}
|
65
|
+
</PfEmptyState>
|
66
|
+
);
|
67
|
+
};
|
68
|
+
export default EmptyState;
|
@@ -2,8 +2,7 @@ import React from 'react';
|
|
2
2
|
import PropTypes from 'prop-types';
|
3
3
|
import { Table as PfTable } from 'patternfly-react';
|
4
4
|
import { noop } from 'foremanReact/common/helpers';
|
5
|
-
import EmptyState from '
|
6
|
-
|
5
|
+
import EmptyState from '../../EmptyState';
|
7
6
|
import PaginationRow from '../../../../../components/PaginationRow/index';
|
8
7
|
|
9
8
|
import TableBody from './TableBody';
|
@@ -112,7 +112,7 @@ class ManageManifestModal extends Component {
|
|
112
112
|
header: __('There is no Manifest History to display.'),
|
113
113
|
description: __('Import a Manifest using the manifest tab above.'),
|
114
114
|
documentation: {
|
115
|
-
|
115
|
+
title: __('Learn more about adding Subscription Manifests'),
|
116
116
|
url: 'http://redhat.com',
|
117
117
|
},
|
118
118
|
});
|
data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap
CHANGED
@@ -312,7 +312,7 @@ exports[`manage manifest modal should render 1`] = `
|
|
312
312
|
Object {
|
313
313
|
"description": "Import a Manifest using the manifest tab above.",
|
314
314
|
"documentation": Object {
|
315
|
-
"
|
315
|
+
"title": "Learn more about adding Subscription Manifests",
|
316
316
|
"url": "http://redhat.com",
|
317
317
|
},
|
318
318
|
"header": "There is no Manifest History to display.",
|
@@ -185,6 +185,7 @@ class UpstreamSubscriptionsPage extends Component {
|
|
185
185
|
header: __('There are no Subscription Allocations to display'),
|
186
186
|
description: __('Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to ' +
|
187
187
|
'an on-premise subscription management application such as Red Hat Satellite.'),
|
188
|
+
docUrl: 'http://redhat.com',
|
188
189
|
action: {
|
189
190
|
title: __('Import a Manifest to Begin'),
|
190
191
|
url: '/subscriptions',
|
@@ -146,6 +146,7 @@ exports[`upstream subscriptions page should render 1`] = `
|
|
146
146
|
"url": "/subscriptions",
|
147
147
|
},
|
148
148
|
"description": "Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to an on-premise subscription management application such as Red Hat Satellite.",
|
149
|
+
"docUrl": "http://redhat.com",
|
149
150
|
"header": "There are no Subscription Allocations to display",
|
150
151
|
}
|
151
152
|
}
|
@@ -414,7 +414,26 @@ exports[`subscriptions table should render a table 1`] = `
|
|
414
414
|
`;
|
415
415
|
|
416
416
|
exports[`subscriptions table should render an empty state 1`] = `
|
417
|
-
<div
|
418
|
-
|
417
|
+
<div
|
418
|
+
class="blank-slate-pf"
|
419
|
+
>
|
420
|
+
<div
|
421
|
+
class="blank-slate-pf-icon"
|
422
|
+
>
|
423
|
+
<span
|
424
|
+
aria-hidden="true"
|
425
|
+
class="pficon pficon-add-circle-o"
|
426
|
+
/>
|
427
|
+
</div>
|
428
|
+
<h4
|
429
|
+
class="h1 blank-slate-pf-title"
|
430
|
+
>
|
431
|
+
Yay empty state
|
432
|
+
</h4>
|
433
|
+
<p
|
434
|
+
class="blank-slate-pf-info"
|
435
|
+
>
|
436
|
+
There is nothing to see here
|
437
|
+
</p>
|
419
438
|
</div>
|
420
439
|
`;
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: katello
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.10.0.rc1
|
4
|
+
version: 3.10.0.rc1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-12-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -2328,7 +2328,6 @@ files:
|
|
2328
2328
|
- webpack/__mocks__/foremanReact/common/I18n.js
|
2329
2329
|
- webpack/__mocks__/foremanReact/common/helpers.js
|
2330
2330
|
- webpack/__mocks__/foremanReact/components/BreadcrumbBar.js
|
2331
|
-
- webpack/__mocks__/foremanReact/components/common/EmptyState.js
|
2332
2331
|
- webpack/__mocks__/foremanReact/components/common/table.js
|
2333
2332
|
- webpack/__mocks__/foremanReact/redux.js
|
2334
2333
|
- webpack/__mocks__/foremanReact/redux/actions/toasts.js
|
@@ -2371,6 +2370,7 @@ files:
|
|
2371
2370
|
- webpack/move_to_foreman/components/common/Dialog/__tests__/Dialog.test.js
|
2372
2371
|
- webpack/move_to_foreman/components/common/Dialog/__tests__/__snapshots__/Dialog.test.js.snap
|
2373
2372
|
- webpack/move_to_foreman/components/common/Dialog/index.js
|
2373
|
+
- webpack/move_to_foreman/components/common/EmptyState/index.js
|
2374
2374
|
- webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.js
|
2375
2375
|
- webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.scss
|
2376
2376
|
- webpack/move_to_foreman/components/common/ModalProgressBar/__tests__/ModalProgressBar.test.js
|
@@ -2660,7 +2660,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
2660
2660
|
version: 1.3.1
|
2661
2661
|
requirements: []
|
2662
2662
|
rubyforge_project:
|
2663
|
-
rubygems_version: 2.6
|
2663
|
+
rubygems_version: 2.7.6
|
2664
2664
|
signing_key:
|
2665
2665
|
specification_version: 4
|
2666
2666
|
summary: ''
|