Skip to content

Commit 6ab1930

Browse files
committed
Changes
1 parent 5fe3ef2 commit 6ab1930

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/javascript/components/request-workflow-status/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const workflowStatusData = (response) => {
5858
}
5959
const rows = response.context ? rowData(response.context) : [];
6060
const headers = headerData();
61-
const name = response.name || response.description || `ConfigurationScript#${response.id}`;
61+
const name = response.name || response.description;
6262
return {
6363
headers, rows, status: response.status, name, parentId: response.parent_id, id: response.id, type: response.type,
6464
};

app/javascript/components/request-workflow-status/request-workflow-status-item.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ const RequestWorkflowStatusItem = ({ recordId }) => {
4040
isLoading: false,
4141
parentName: response2.name,
4242
validType: true,
43-
message: responseData && responseData.status === workflowStateTypes.error.text ? __('Error message goes here') : undefined,
43+
message: responseData && responseData.status === workflowStateTypes.error.text
44+
? __('An error has occurred with this workflow') : undefined,
4445
});
4546
} else {
4647
setData({
@@ -64,7 +65,7 @@ const RequestWorkflowStatusItem = ({ recordId }) => {
6465
});
6566
};
6667

67-
/** Logic to reload the component every (RELOAD) 5 seconds. */
68+
/** Logic to reload the component every so often (RELOAD). */
6869
useEffect(() => {
6970
const omitStatus = [workflowStateTypes.success.text, workflowStateTypes.error.text];
7071
if (reloadCount.current <= reloadLimit && data.responseData && data.responseData.status && !omitStatus.includes(data.responseData.status)) {

app/views/miq_request/_request.html.haml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,3 @@
134134
- else
135135
= render :partial => "reconfigure_show"
136136
137-

app/views/miq_request/_st_prov_show.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
%hr
3333

3434
- record_ids = request_task_configuration_script_ids(@miq_request)
35-
- if record_ids.size > 0
35+
- if record_ids.any?
3636
%h3
3737
= _("Workflow States")
38-
= react('RequestWorkflowStatus', {:ids => record_ids, :recordId => @miq_request.miq_request_tasks.first.options[:configuration_script_id]})
38+
= react('RequestWorkflowStatus', {:ids => record_ids})

0 commit comments

Comments
 (0)