foreman_remote_execution 7.2.0 → 7.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/job_invocation.rb +4 -2
- data/lib/foreman_remote_execution/version.rb +1 -1
- data/webpack/react_app/components/HostKebab/KebabItems.js +1 -0
- data/webpack/react_app/components/RecentJobsCard/RecentJobsCard.js +5 -0
- data/webpack/react_app/components/RecentJobsCard/RecentJobsTable.js +51 -59
- data/webpack/react_app/extend/Fills.js +3 -3
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 893050d86f8ab746da3173f25cc9a062454bf9262316f0a6fbb5f89a6282c15f
|
4
|
+
data.tar.gz: 02e623b7202ec926f0d744cbfadbbe5f86a7950cd3665c91a3b7ec74a2b02cd2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c488b0d6edc98ce77e66edefc2c0f298c323bfd0aa6f0d46a3dbbc4b4642bbe9ac8f2112c237460095f47c5494d5ad7112482475fc886d596e9698fe0cac128f
|
7
|
+
data.tar.gz: eb73a3df7acbfa047699d349fcb03393850b5ddded2ed31b3cd30e38b15d3a516e608a17e33f29237271e012c9de69bb7929801de4f8605d8a4b3b59590b73e8
|
@@ -62,14 +62,16 @@ class JobInvocation < ApplicationRecord
|
|
62
62
|
|
63
63
|
has_many :targeted_hosts, :through => :targeting, :source => :hosts
|
64
64
|
scoped_search :on => 'targeted_host_id', :rename => 'targeted_host_id', :operators => ['= '],
|
65
|
-
:complete_value => false, :only_explicit => true, :ext_method => :search_by_targeted_host
|
65
|
+
:complete_value => false, :only_explicit => true, :ext_method => :search_by_targeted_host,
|
66
|
+
:validator => ScopedSearch::Validators::INTEGER
|
66
67
|
|
67
68
|
scoped_search :on => 'pattern_template_name', :rename => 'pattern_template_name', :operators => ['= '],
|
68
69
|
:complete_value => false, :only_explicit => true, :ext_method => :search_by_pattern_template
|
69
70
|
|
70
71
|
scoped_search :relation => :recurring_logic, :on => 'purpose', :rename => 'recurring_logic.purpose'
|
71
72
|
|
72
|
-
scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring_logic.id'
|
73
|
+
scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring_logic.id',
|
74
|
+
:validator => ScopedSearch::Validators::INTEGER
|
73
75
|
|
74
76
|
scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring',
|
75
77
|
:ext_method => :search_by_recurring_logic, :only_explicit => true,
|
@@ -27,6 +27,7 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
|
|
27
27
|
<DropdownItem
|
28
28
|
href={foremanUrl(`${JOB_BASE_URL}${name}`)}
|
29
29
|
key="link-to-all"
|
30
|
+
ouiaId="link-to-all-dropdown-item"
|
30
31
|
>
|
31
32
|
{__('View all jobs')}
|
32
33
|
</DropdownItem>,
|
@@ -35,24 +36,28 @@ const RecentJobsCard = ({ hostDetails: { name, id } }) => {
|
|
35
36
|
`${JOB_BASE_URL}${name}+and+status+%3D+failed+or+status%3D+succeeded`
|
36
37
|
)}
|
37
38
|
key="link-to-finished"
|
39
|
+
ouiaId="link-to-finished-dropdown-item"
|
38
40
|
>
|
39
41
|
{__('View finished jobs')}
|
40
42
|
</DropdownItem>,
|
41
43
|
<DropdownItem
|
42
44
|
href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+running`)}
|
43
45
|
key="link-to-running"
|
46
|
+
ouiaId="link-to-running-dropdown-item"
|
44
47
|
>
|
45
48
|
{__('View running jobs')}
|
46
49
|
</DropdownItem>,
|
47
50
|
<DropdownItem
|
48
51
|
href={foremanUrl(`${JOB_BASE_URL}${name}+and+status+%3D+queued`)}
|
49
52
|
key="link-to-scheduled"
|
53
|
+
ouiaId="link-to-scheduled-dropdown-item"
|
50
54
|
>
|
51
55
|
{__('View scheduled jobs')}
|
52
56
|
</DropdownItem>,
|
53
57
|
]}
|
54
58
|
>
|
55
59
|
<Tabs
|
60
|
+
ouiaId="tabs"
|
56
61
|
mountOnEnter
|
57
62
|
unmountOnExit
|
58
63
|
activeKey={activeTab}
|
@@ -1,15 +1,7 @@
|
|
1
1
|
import PropTypes from 'prop-types';
|
2
2
|
import React from 'react';
|
3
|
-
import {
|
4
|
-
|
5
|
-
DataListItem,
|
6
|
-
DataListItemRow,
|
7
|
-
DataListItemCells,
|
8
|
-
DataListCell,
|
9
|
-
DataListWrapModifier,
|
10
|
-
Text,
|
11
|
-
Bullseye,
|
12
|
-
} from '@patternfly/react-core';
|
3
|
+
import { Text, Bullseye } from '@patternfly/react-core';
|
4
|
+
import { TableComposable, Tr, Tbody, Td } from '@patternfly/react-table';
|
13
5
|
import { STATUS } from 'foremanReact/constants';
|
14
6
|
|
15
7
|
import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
|
@@ -33,55 +25,55 @@ const RecentJobsTable = ({ status, hostId }) => {
|
|
33
25
|
} = useAPI('get', jobsUrl, RECENT_JOBS_KEY);
|
34
26
|
|
35
27
|
return (
|
36
|
-
<
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
<
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
</
|
28
|
+
<SkeletonLoader
|
29
|
+
skeletonProps={{ count: 3 }}
|
30
|
+
status={responseStatus || STATUS.PENDING}
|
31
|
+
emptyState={
|
32
|
+
<Bullseye>
|
33
|
+
<Text
|
34
|
+
ouiaId="no-results-text"
|
35
|
+
style={{ marginTop: '20px' }}
|
36
|
+
component="p"
|
37
|
+
>
|
38
|
+
{__('No results found')}
|
39
|
+
</Text>
|
40
|
+
</Bullseye>
|
41
|
+
}
|
42
|
+
>
|
43
|
+
{!!jobs?.length && (
|
44
|
+
<TableComposable
|
45
|
+
aria-label="recent-jobs-table"
|
46
|
+
variant="compact"
|
47
|
+
borders="compactBorderless"
|
48
|
+
>
|
49
|
+
<Tbody>
|
50
|
+
{jobs.map(
|
51
|
+
({
|
52
|
+
status: jobStatus,
|
53
|
+
status_label: label,
|
54
|
+
id,
|
55
|
+
start_at: startAt,
|
56
|
+
description,
|
57
|
+
}) => (
|
58
|
+
<Tr key={id}>
|
59
|
+
<Td modifier="truncate" key={`name-${id}`}>
|
60
|
+
<a href={foremanUrl(`/job_invocations/${id}`)}>
|
61
|
+
{description}
|
62
|
+
</a>
|
63
|
+
</Td>
|
64
|
+
<Td modifier="truncate" key={`date-${id}`}>
|
65
|
+
<RelativeDateTime date={startAt} />
|
66
|
+
</Td>
|
67
|
+
<Td modifier="truncate" key={`status-${id}`}>
|
68
|
+
<JobStatusIcon status={jobStatus}>{label}</JobStatusIcon>
|
69
|
+
</Td>
|
70
|
+
</Tr>
|
71
|
+
)
|
72
|
+
)}
|
73
|
+
</Tbody>
|
74
|
+
</TableComposable>
|
75
|
+
)}
|
76
|
+
</SkeletonLoader>
|
85
77
|
);
|
86
78
|
};
|
87
79
|
|
@@ -41,11 +41,11 @@ const fills = [
|
|
41
41
|
];
|
42
42
|
|
43
43
|
const registerFills = () => {
|
44
|
-
fills.forEach(({ slot,
|
44
|
+
fills.forEach(({ slot, name, component: Component, weight, metadata }) =>
|
45
45
|
addGlobalFill(
|
46
46
|
slot,
|
47
|
-
|
48
|
-
<Component key={`rex
|
47
|
+
`rex-${name}`,
|
48
|
+
<Component key={`rex-${name}`} />,
|
49
49
|
weight,
|
50
50
|
metadata
|
51
51
|
)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_remote_execution
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.2.
|
4
|
+
version: 7.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Foreman Remote Execution team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-09-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: deface
|
@@ -546,7 +546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
546
546
|
- !ruby/object:Gem::Version
|
547
547
|
version: '0'
|
548
548
|
requirements: []
|
549
|
-
rubygems_version: 3.
|
549
|
+
rubygems_version: 3.3.20
|
550
550
|
signing_key:
|
551
551
|
specification_version: 4
|
552
552
|
summary: A plugin bringing remote execution to the Foreman, completing the config
|