In-Reply-To: <2d783941379f41ea8cfbcb965eb37c78@git.apache.org> References: <2d783941379f41ea8cfbcb965eb37c78@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] ambari git commit: AMBARI-18691. Improve and Update Workflow designer to support coordinators and bundles. (Belliraj HB via dipayanb) archived-at: Thu, 27 Oct 2016 19:04:56 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/named-properties.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/named-properties.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/named-properties.hbs index 2fa78bc..5750422 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/named-properties.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/named-properties.hbs @@ -21,6 +21,6 @@

{{input type="text" class="form-control" value=property.value placeholder="value"}} - {{field-error error=errors.property.value}} + {{field-error model=this field='property.value' showErrorMessage=showErrorMessage}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action-info.hbs new file mode 100644 index 0000000..abc8cba --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action-info.hbs @@ -0,0 +1,47 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

{{info-header hoveredAction=hoveredAction hideNotification="hideNotification"}}
Name Node :
{{hoveredAction.nameNode}}
Resource Manager :
{{hoveredAction.jobTracker}}
Script :
{{hoveredAction.script}}
Job xml : + {{#property-value-config action=hoveredAction.jobXml}}{{/property-value-config}} +
Archives : + {{#property-value-config action=hoveredAction.archives}}{{/property-value-config}} +
Files : + {{#property-value-config action=hoveredAction.files}}{{/property-value-config}} +
Params : + {{#property-value-config action=hoveredAction.params}}{{/property-value-config}} +
Args : + {{#property-value-config action=hoveredAction.args}}{{/property-value-config}} +
Prepare : + {{#prepare-config-info action=hoveredAction}}{{/prepare-config-info}} +
Configuration : + {{#name-value-info action=hoveredAction}}{{/name-value-info}} +

\ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs index eb38432..d0fe490 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs @@ -26,7 +26,7 @@ - {{#field-error error=errors.actionModel.script}}{{/field-error}} + {{field-error model=this field='actionModel.script' showErrorMessage=showErrorMessage}} {{#jobxml-config jobXml=actionModel.jobXml openFileBrowser="openFileBrowser" register="register"}}{{/jobxml-config}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs index 9d712bf..c549a26 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs @@ -36,51 +36,7 @@ - {{#if (eq prep.type "mkdir")}} -

- Path -

- {{input type="text" class="form-control" value=prep.settings.path placeholder="path of the directory"}} - - - -

- {{#unless prep.settings.path}} -

- - - - Path is mandatory - -

- {{/unless}} - {{/if}} - {{#if (eq prep.type "delete")}} -

- Path -

- {{input type="text" class="form-control" value=prep.settings.path placeholder="path of the directory"}} - - - -

- {{#unless prep.settings.path}} -

- - - - Path is mandatory - -

- {{/unless}} - {{/if}} - {{#if (eq prep.type "touchz")}} + {{#if (or (eq prep.type "delete") (eq prep.type "mkdir") (eq prep.type "touchz"))}}

Path

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-info.hbs new file mode 100644 index 0000000..866e6b9 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-info.hbs @@ -0,0 +1,22 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +{{#each action.prepare as |obj|}} +

Type : {{obj.type}}, Path : {{obj.path}}

+{{/each}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/preview-dialog.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/preview-dialog.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/preview-dialog.hbs new file mode 100644 index 0000000..943c917 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/preview-dialog.hbs @@ -0,0 +1,33 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} + http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/property-value-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/property-value-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/property-value-config.hbs new file mode 100644 index 0000000..1cd5b69 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/property-value-config.hbs @@ -0,0 +1,22 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +{{#each action as |obj|}} +

{{obj.value}}

+{{/each}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs new file mode 100644 index 0000000..65bac42 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs @@ -0,0 +1,79 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} + +{{#if showingFileBrowser}} +{{hdfs-browser closeFileBrowser="closeFileBrowser" selectFileCallback=selectFileCallback filePath=filePath}} +{{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action-info.hbs new file mode 100644 index 0000000..332852c --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action-info.hbs @@ -0,0 +1,48 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

{{info-header hoveredAction=hoveredAction hideNotification="hideNotification"}}
Name Node :
{{hoveredAction.nameNode}}
Resource Manager :
{{hoveredAction.jobTracker}}
Exec :
{{hoveredAction.exec}}
Env Var : + {{#property-value-config action=hoveredAction.envVar}}{{/property-value-config}} +
Capture Output :
{{hoveredAction.captureOutput}}
Job xml : + {{#property-value-config action=hoveredAction.jobXml}}{{/property-value-config}} +
Archives : + {{#property-value-config action=hoveredAction.archives}}{{/property-value-config}} +
Files : + {{#property-value-config action=hoveredAction.files}}{{/property-value-config}} +
Args : + {{#property-value-config action=hoveredAction.args}}{{/property-value-config}} +
Prepare : + {{#prepare-config-info action=hoveredAction}}{{/prepare-config-info}} +
Configuration : + {{#name-value-info action=hoveredAction}}{{/name-value-info}} +

- {{#field-error error=errors.actionModel.exec}}{{/field-error}} + {{field-error model=this field='actionModel.exec' showErrorMessage=showErrorMessage}}

@@ -63,7 +63,7 @@

{{input type="text" class="form-control" name="job-tracker" value=actionModel.jobTracker placeholder="Resource Manager"}}

- {{field-error error=errors.actionModel.jobTracker}} + {{field-error model=this field='actionModel.jobTracker' showErrorMessage=showErrorMessage}}

Name node http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs index e304f80..28bdf15 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs @@ -16,11 +16,11 @@ * limitations under the License. }}

SLA ({{if slaEnabled "Enabled" "Disabled"}})

Enabled {{input type="checkbox" checked=slaEnabled}} @@ -28,14 +28,15 @@

Nominal Time *

- {{input type="text" id="nominalTime" title="Date in UTC Format" class="form-control" value=nominalTime placeholder="Nominal Time"}} + {{input type="text" name="nominalTime" title="Date in UTC Format" class="form-control" value=nominalTime placeholder="Nominal Time"}} + {{field-error model=this field='nominalTime' showErrorMessage=showErrorMessage}}

- {{field-error error=errors.nominalTime}}

Should Start

{{input class="form-control" type="text" value=slaInfo.shouldStart.time placeholder="Should Start"}} + {{field-error model=this field='slaInfo.shouldStart.time' showErrorMessage=showErrorMessage}}

- {{field-error error=errors.shouldStart.unit}} + {{field-error model=this field='slaInfo.shouldStart.unit' showErrorMessage=showErrorMessage}}

Should End *

{{input class="form-control" type="text" value=slaInfo.shouldEnd.time placeholder="Should End"}} - {{field-error error=errors.shouldEnd.time}} + {{field-error model=this field='slaInfo.shouldEnd.time' showErrorMessage=showErrorMessage}}

- {{field-error error=errors.shouldEnd.unit}} + {{field-error model=this field='slaInfo.shouldEnd.unit' showErrorMessage=showErrorMessage}}

@@ -72,7 +73,7 @@ {{/each}} - {{field-error error=errors.maxDuration.unit}} + {{field-error model=this field='slaInfo.maxDuration.unit' showErrorMessage=showErrorMessage}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action-info.hbs new file mode 100644 index 0000000..1b4274f --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action-info.hbs @@ -0,0 +1,46 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

{{info-header hoveredAction=hoveredAction hideNotification="hideNotification"}}
Name Node :
{{hoveredAction.nameNode}}
Resource Manager :
{{hoveredAction.jobTracker}}
Class :
{{hoveredAction.class}}
Jar :
{{hoveredAction.jar}}
Master :
{{hoveredAction.master}}
Args : + {{#property-value-config action=hoveredAction.args}}{{/property-value-config}} +
Job xml : + {{#property-value-config action=hoveredAction.jobXml}}{{/property-value-config}} +
Archives : + {{#property-value-config action=hoveredAction.archives}}{{/property-value-config}} +
Files : + {{#property-value-config action=hoveredAction.files}}{{/property-value-config}} +
Prepare : + {{#prepare-config-info action=hoveredAction}}{{/prepare-config-info}} +
Configuration : + {{#name-value-info action=hoveredAction}}{{/name-value-info}} +

{{input type="text" class="form-control" name="spark-name" value=actionModel.sparkName placeholder="Spark Name"}} - {{#field-error error=errors.actionModel.sparkName}}{{/field-error}} + {{field-error model=this field='actionModel.sparkName' showErrorMessage=showErrorMessage}}

@@ -35,7 +35,7 @@

- {{#field-error error=errors.actionModel.jar}}{{/field-error}} + {{field-error model=this field='actionModel.jar' showErrorMessage=showErrorMessage}}

{{#if isJar}} @@ -63,7 +63,7 @@

- {{#field-error error=errors.actionModel.master}}{{/field-error}} + {{field-error model=this field='actionModel.master' showErrorMessage=showErrorMessage}}

Spark Options http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action-info.hbs new file mode 100644 index 0000000..eb4c31c --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action-info.hbs @@ -0,0 +1,41 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

{{info-header hoveredAction=hoveredAction hideNotification="hideNotification"}}
Name Node :
{{hoveredAction.nameNode}}
Resource Manager :
{{hoveredAction.jobTracker}}
Command :
{{hoveredAction.command}}
Job xml : + {{#property-value-config action=hoveredAction.jobXml}}{{/property-value-config}} +
Archives : + {{#property-value-config action=hoveredAction.archives}}{{/property-value-config}} +
Files : + {{#property-value-config action=hoveredAction.files}}{{/property-value-config}} +
Prepare : + {{#prepare-config-info action=hoveredAction}}{{/prepare-config-info}} +
Configuration : + {{#name-value-info action=hoveredAction}}{{/name-value-info}} +

\ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action-info.hbs new file mode 100644 index 0000000..3e5c363 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action-info.hbs @@ -0,0 +1,32 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

{{info-header hoveredAction=hoveredAction hideNotification="hideNotification"}}
Host :
{{hoveredAction.host}}
Command :
{{hoveredAction.command}}
Capture Output :
{{hoveredAction.captureOutput}}
Arg :
{{hoveredAction.arg}}
Args : + {{#property-value-config action=hoveredAction.args}}{{/property-value-config}} +

+ + http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs index 065e270..ab2ebb2 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/ssh-action.hbs @@ -22,14 +22,14 @@ Host *

{{input type="text" class="form-control" name="host" value=actionModel.host placeholder="localhost"}} - {{field-error error=errors.actionModel.host}} + {{field-error model=this field='actionModel.host' showErrorMessage=showErrorMessage}}

Command *

{{input type="text" class="form-control" name="command" value=actionModel.command placeholder="command"}} - {{field-error error=errors.actionModel.command}} + {{field-error model=this field='actionModel.command' showErrorMessage=showErrorMessage}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow-action-info.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow-action-info.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow-action-info.hbs new file mode 100644 index 0000000..8b63c23 --- /dev/null +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow-action-info.hbs @@ -0,0 +1,29 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} +

+ +

The details are + X
App Path :
{{hoveredAction.appPath}}
Propagate Configuration :
{{hoveredAction.propagate-configuration}}
Configuration : + {{#name-value-info action=hoveredAction}}{{/name-value-info}} +

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs index 65902b3..fe46446 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs @@ -18,7 +18,7 @@

Error To *

- {{#each killNodes as |node index|}} @@ -28,13 +28,24 @@ {{/each}} - {{field-error error=errors.errorNode.name}} + {{#if (eq transition.errorNode.type 'kill')}} + {{transition.errorNode.killMessage}} + {{/if}}

- Ok To -

- {{okToNode.name}} +

+ Ok To * +

+ + {{#if showWarning}} + + Changing Ok To transition may result in deletion of intermediate nodes. Undo + + {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1b0bb9e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/version-settings.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/version-settings.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/version-settings.hbs index 337ad7d..145f81b 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/version-settings.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/version-settings.hbs @@ -25,7 +25,7 @@

- Workflow Verion + Workflow Version