Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): Fix editor. Fixes #5613 Fixes #5617 #5620

Merged
merged 7 commits into from
Apr 8, 2021
Merged

Conversation

alexec
Copy link
Contributor

@alexec alexec commented Apr 8, 2021

Fixes #5613
Fixes #5617

Signed-off-by: Alex Collins <alex_collins@intuit.com>
@codecov
Copy link

codecov bot commented Apr 8, 2021

Codecov Report

Merging #5620 (f269cfa) into master (13fa652) will increase coverage by 0.05%.
The diff coverage is 0.00%.

❗ Current head f269cfa differs from pull request most recent head 22a3c5d. Consider uploading reports for the commit 22a3c5d to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5620      +/-   ##
==========================================
+ Coverage   47.05%   47.10%   +0.05%     
==========================================
  Files         240      240              
  Lines       15030    15034       +4     
==========================================
+ Hits         7072     7082      +10     
+ Misses       7054     7052       -2     
+ Partials      904      900       -4     
Impacted Files Coverage Δ
cmd/argo/commands/client/conn.go 13.33% <0.00%> (-0.63%) ⬇️
cmd/argo/commands/server.go 33.91% <0.00%> (-0.61%) ⬇️
cmd/argoexec/commands/root.go 1.69% <0.00%> (ø)
workflow/controller/operator.go 71.17% <0.00%> (+0.32%) ⬆️
cmd/argo/commands/get.go 56.95% <0.00%> (+0.64%) ⬆️
cmd/argoexec/commands/emissary.go 50.00% <0.00%> (+1.56%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13fa652...22a3c5d. Read the comment docs.

alexec added 4 commits April 7, 2021 18:13
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
@alexec alexec changed the title fix(ui): Fix editor fix(ui): Fix editor. Fixes #5613 Fixes #5617 Apr 8, 2021
- - name: process-artifact
template: process-message
withParam: "{{steps.generate-artifact.outputs.result}}"
- - name: list-log-files
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@simster7 I wanted an example for CNCF webinar and could not use the example.

@@ -97,6 +97,7 @@ jobs:
echo "- name: fake_token_user" >> ~/.kube/config
echo " user:" >> ~/.kube/config
echo " token: xxxxxx" >> ~/.kube/config
until kubectl cluster-info ; do sleep 10s ; done
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hopefully fix some flakey builds

Signed-off-by: Alex Collins <alex_collins@intuit.com>
@alexec alexec requested a review from simster7 April 8, 2021 17:28
@alexec alexec marked this pull request as ready for review April 8, 2021 17:28
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Comment on lines +30 to +34
// we ONLY want to change the text, if the normalized version has changed, this prevents white-space changes
// from resulting in a significant change
if (text !== stringify(parse(editor.current.editor.getValue()), lang)) {
editor.current.editor.setValue(text);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@alexec alexec merged commit b76fac7 into argoproj:master Apr 8, 2021
@alexec alexec deleted the ui-fixes branch April 8, 2021 22:14
@simster7 simster7 mentioned this pull request Apr 19, 2021
50 tasks
simster7 pushed a commit that referenced this pull request Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

v3: "Upload file" does not work UI: Editor JSON/YAML toggle does not work anymore
2 participants