Display WF always nodes in conjunction with success and failure #2373

marshmalien · 2018-10-05T03:28:18Z

SUMMARY

Remove edge conflict logic and styles
Remove sibling connection types logic
Show all edge type options (always, success, fail) when node is not a root node
Audit dropdown label strings

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

UI

* Edge type of root node is always "always" * If node is not a root node, show all options: always, success, fail * Remove edge conflict logic

chrismeyersfsu

Make sure test_node_triggers_should_be_mutually_exclusive in tower-qa is updated appropriately.

chrismeyersfsu · 2018-10-09T15:30:35Z

awx/api/views/__init__.py

@@ -3438,10 +3438,6 @@ def get_queryset(self):
        return getattr(parent, self.relationship).all()

    def is_valid_relation(self, parent, sub, created=False):
-        mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',)


Can confirm, this test is currently failing on the always_nodes_ui branch:

py.test -c config/docker.cfg --base-url='http://localhost:8013' -k 'test_node_triggers_should_be_mutually_exclusive' --disable-pytest-warnings

softwarefactory-project-zuul · 2018-10-09T16:16:25Z

Build failed.

tox-awx-api-lint : SUCCESS in 1m 50s
tox-awx-ui-lint : FAILURE in 2m 52s
tox-awx-api : SUCCESS in 5m 57s
tox-awx-ui : SUCCESS in 3m 59s

softwarefactory-project-zuul · 2018-10-09T19:01:43Z

Build succeeded.

tox-awx-api-lint : SUCCESS in 1m 59s
tox-awx-ui-lint : SUCCESS in 2m 42s
tox-awx-api : SUCCESS in 6m 00s
tox-awx-ui : SUCCESS in 4m 08s

jakemcdermott · 2018-10-11T14:27:37Z

awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js

+                            // This finds the credentials that were selected in the prompt but don't occur
+                            // in the template defaults
+                            let credentialsToPost = params.node.promptData.prompts.credentials.value.filter(function (credFromPrompt) {
+                                let defaultCreds = params.node.promptData.launchConf.defaults.credentials ? params.node.promptData.launchConf.defaults.credentials : [];


can also do _.get(params, 'node.promptData.launchConf.defaults.credentials', []) for this kind of thing.

jakemcdermott · 2018-10-11T14:39:26Z

awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js

-                        .then(function() {
-                            $scope.closeDialog();
-                        }).catch(({data, status}) => {
+                            $q.all(associatePromises.concat(credentialPromises))


I think you can avoid having to duplicate the catch block in the inner promise by adding a return statement here.

jakemcdermott · 2018-10-11T14:42:26Z

awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js

+                    }, function (error) {
+                        ProcessErrors($scope, error.data, error.status, null, {
+                            hdr: 'Error!',
+                            msg: 'Failed to add workflow node. ' +


strings / i18n?

ryanpetrello · 2018-10-11T20:59:40Z

recheck

softwarefactory-project-zuul · 2018-10-11T21:05:55Z

Build succeeded.

tox-awx-api-lint : SUCCESS in 1m 51s
tox-awx-ui-lint : SUCCESS in 2m 48s
tox-awx-api : SUCCESS in 5m 53s
tox-awx-ui : SUCCESS in 4m 22s
tox-awx-swagger : SUCCESS in 5m 45s

Always nodes ui tests

softwarefactory-project-zuul · 2018-10-12T14:27:21Z

Build succeeded.

tox-awx-api-lint : SUCCESS in 1m 59s
tox-awx-ui-lint : SUCCESS in 2m 45s
tox-awx-api : SUCCESS in 5m 55s
tox-awx-ui : SUCCESS in 4m 46s
tox-awx-swagger : SUCCESS in 6m 34s

unlikelyzero

Approving, but let's talk about this

unlikelyzero · 2018-10-12T14:36:50Z

awx/ui/test/e2e/tests/test-workflow-visualizer.js

+        client
+            .login()
+            .waitForAngular()
+            .resizeWindow(1200, 1000)


let's avoid doing this midtest. We can launch chrome with a certain window size if it's necessary.

Noticed this happens across a ton of the UI tests ~15 times. I've made #2426 to track the issue to be handled en masse.

softwarefactory-project-zuul · 2018-10-12T22:43:31Z

Build succeeded (gate pipeline).

tox-awx-api-lint : SUCCESS in 1m 53s
tox-awx-ui-lint : SUCCESS in 2m 35s
tox-awx-api : SUCCESS in 12m 21s
tox-awx-ui : SUCCESS in 4m 26s
tox-awx-swagger : SUCCESS in 11m 37s

Display WF always nodes in conjunction with success and failure Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awxbot added state:needs_triage type:enhancement component:ui labels Oct 5, 2018

rooftopcellist changed the base branch from always_nodes to devel October 9, 2018 14:46

rooftopcellist and others added 3 commits October 9, 2018 11:30

lift always node mutex restriction

4d9523a

tests for always_nodes

ad566cc

Show all wf options when node is not a root node

a2f4e36

* Edge type of root node is always "always" * If node is not a root node, show all options: always, success, fail * Remove edge conflict logic

chrismeyersfsu approved these changes Oct 9, 2018

View reviewed changes

dsesami mentioned this pull request Oct 9, 2018

UI Tests for Workflow Always Nodes #2390

Closed

7 tasks

marshmalien force-pushed the always_nodes_ui branch from 50399e3 to a2f4e36 Compare October 9, 2018 15:42

Fix ui-lint error

1b25dd0

Initial commit for UI tests for always nodes

b02677a

jakemcdermott removed the state:needs_triage label Oct 10, 2018

jakemcdermott suggested changes Oct 11, 2018

View reviewed changes

dsesami and others added 3 commits October 11, 2018 12:14

Tests for UI workflow always nodes

8fceaf8

lint fixes

1e3c229

Address review comments

27da141

ryanpetrello closed this Oct 11, 2018

ryanpetrello reopened this Oct 11, 2018

jakemcdermott approved these changes Oct 12, 2018

View reviewed changes

rooftopcellist self-requested a review October 12, 2018 14:08

rooftopcellist approved these changes Oct 12, 2018

View reviewed changes

dsesami and others added 2 commits October 12, 2018 10:18

added browser close at end, waits for spinners

c25d208

Merge pull request #8 from dsesami/always_nodes_ui_tests

e7c52bc

Always nodes ui tests

unlikelyzero approved these changes Oct 12, 2018

View reviewed changes

marshmalien added the mergeit label Oct 12, 2018

softwarefactory-project-zuul bot merged commit 73f54b2 into ansible:devel Oct 12, 2018

marshmalien deleted the always_nodes_ui branch October 11, 2019 17:02

sganesh999 pushed a commit to sganesh999/awx that referenced this pull request Mar 4, 2020

Merge pull request ansible#2373 from marshmalien/always_nodes_ui

88bd25f

Display WF always nodes in conjunction with success and failure Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display WF always nodes in conjunction with success and failure #2373

Display WF always nodes in conjunction with success and failure #2373

marshmalien commented Oct 5, 2018

chrismeyersfsu left a comment

chrismeyersfsu Oct 9, 2018

rooftopcellist Oct 9, 2018 •

edited

softwarefactory-project-zuul bot commented Oct 9, 2018

softwarefactory-project-zuul bot commented Oct 9, 2018

jakemcdermott Oct 11, 2018

jakemcdermott Oct 11, 2018

jakemcdermott Oct 11, 2018

ryanpetrello commented Oct 11, 2018

softwarefactory-project-zuul bot commented Oct 11, 2018

softwarefactory-project-zuul bot commented Oct 12, 2018

unlikelyzero left a comment

unlikelyzero Oct 12, 2018

dsesami Oct 12, 2018

softwarefactory-project-zuul bot commented Oct 12, 2018

Display WF always nodes in conjunction with success and failure #2373

Display WF always nodes in conjunction with success and failure #2373

Conversation

marshmalien commented Oct 5, 2018

SUMMARY

ISSUE TYPE

COMPONENT NAME

chrismeyersfsu left a comment

Choose a reason for hiding this comment

chrismeyersfsu Oct 9, 2018

Choose a reason for hiding this comment

rooftopcellist Oct 9, 2018 • edited

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Oct 9, 2018

softwarefactory-project-zuul bot commented Oct 9, 2018

jakemcdermott Oct 11, 2018

Choose a reason for hiding this comment

jakemcdermott Oct 11, 2018

Choose a reason for hiding this comment

jakemcdermott Oct 11, 2018

Choose a reason for hiding this comment

ryanpetrello commented Oct 11, 2018

softwarefactory-project-zuul bot commented Oct 11, 2018

softwarefactory-project-zuul bot commented Oct 12, 2018

unlikelyzero left a comment

Choose a reason for hiding this comment

unlikelyzero Oct 12, 2018

Choose a reason for hiding this comment

dsesami Oct 12, 2018

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Oct 12, 2018

rooftopcellist Oct 9, 2018 •

edited