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.

Sign up for GitHub

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

Jump to bottom

Fix update dialog pops several times when click ok/cancel button issue #2013

Merged
merged 7 commits into from
Sep 18, 2018
Merged

Fix update dialog pops several times when click ok/cancel button issue #2013

merged 7 commits into from
Sep 18, 2018

Conversation

t-rufang
Copy link
Contributor

To fix #1920

@t-rufang t-rufang requested review from wezhang and djlan September 17, 2018 03:49
@t-rufang t-rufang force-pushed the issue_hotfix branch 2 times, most recently from 366b6f7 to d1c5d9e Compare September 17, 2018 06:54
@t-rufang t-rufang mentioned this pull request Sep 17, 2018
Closed
wezhang
wezhang reviewed Sep 17, 2018
View reviewed changes
Copy link
Member

@wezhang wezhang left a comment

Choose a reason for hiding this comment

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

Thanks Rui!

...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
@@ -67,7 +67,7 @@ public SparkServerlessClusterNode(@NotNull Node parent,
protected void refreshItems() throws AzureCmdException {
try {
cluster.get().toBlocking().singleOrDefault(cluster);
if (Optional.ofNullable(cluster.getMasterState()).orElse("")
if (getNodeActionByName("Update") == null && Optional.ofNullable(cluster.getMasterState()).orElse("")
Copy link
Member

@wezhang wezhang Sep 17, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

I suppose you may need to remove all actions before adding one. The method name is refreshItems #Resolved

...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
@@ -90,7 +90,7 @@ protected void loadActions() {
this, cluster, adlAccount, SparkServerlessClusterOps.getInstance().getDestroyAction()));
addAction("View Cluster Status", new SparkServerlessMonitorAction(
this, cluster, SparkServerlessClusterOps.getInstance().getMonitorAction()));
if (Optional.ofNullable(cluster.getMasterState()).orElse("")
if (getNodeActionByName("Update") == null && Optional.ofNullable(cluster.getMasterState()).orElse("")
.equals(SparkItemGroupState.STABLE.toString())) {
addAction("Update", new SparkServerlessUpdateAction(
Copy link
Member

@wezhang wezhang Sep 17, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

why the action needs to be added twice? #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After user provision a new cluster, the cluster state is not STABLE. So the actions for this new provisioned cluster node don't contain Update. Update action will be enabled when cluster is in STABLE state and user refreshes the node.

In reply to: 217964570 [](ancestors = 217964570)

wezhang
wezhang reviewed Sep 17, 2018
View reviewed changes
...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
this, cluster, SparkServerlessClusterOps.getInstance().getUpdateAction()));
}
Boolean isClusterStabled = Optional.ofNullable(cluster.getMasterState()).orElse("")
.equals(SparkItemGroupState.STABLE.toString());
Copy link
Member

@wezhang wezhang Sep 17, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

equalsIgnoreCase? #Resolved

...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
addAction("Update", new SparkServerlessUpdateAction(
this, cluster, SparkServerlessClusterOps.getInstance().getUpdateAction()));
}
Boolean isClusterStabled = Optional.ofNullable(cluster.getMasterState()).orElse("")
Copy link
Member

@wezhang wezhang Sep 17, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

This val can be private function #Resolved

...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
this, cluster, SparkServerlessClusterOps.getInstance().getUpdateAction()));
}

NodeAction updateAction = addAction("Update", new SparkServerlessUpdateAction(
Copy link
Member

@wezhang wezhang Sep 17, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

Can we assign Update to a const String value? #Resolved

@t-rufang t-rufang force-pushed the issue_hotfix branch 2 times, most recently from 6dc243b to 7af7782 Compare September 18, 2018 02:23
@t-rufang t-rufang mentioned this pull request Sep 18, 2018
Closed
wezhang
wezhang reviewed Sep 18, 2018
View reviewed changes
...soft/azure/sparkserverless/serverexplore/sparkserverlessnode/SparkServerlessClusterNode.java Outdated
@@ -115,6 +109,11 @@ protected void actionPerformed(NodeActionEvent e) throws AzureCmdException {
});
}

private Boolean isClusterStable() {
Copy link
Member

@wezhang wezhang Sep 18, 2018 •
edited by t-rufang
Loading

Choose a reason for hiding this comment

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

no boxing, boolean is enough #Resolved

wezhang
wezhang approved these changes Sep 18, 2018
View reviewed changes
Copy link
Member

@wezhang wezhang left a comment

Choose a reason for hiding this comment

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

Thanks Rui! You can find the Squash operation.

@t-rufang t-rufang merged commit edf3a9c into microsoft:develop Sep 18, 2018
wezhang added a commit that referenced this pull request Sep 18, 2018
@wezhang
Revert "Fix update dialog pops several times when click ok/cancel but…
43221e2 
…ton issue (#2013)"

This reverts commit edf3a9c.
t-rufang added a commit that referenced this pull request Sep 18, 2018
@t-rufang
Revert "Fix update dialog pops several times when click ok/cancel but…
f8ae3e1 
…ton issue (#2013)"

This reverts commit edf3a9c.
@SummerSun SummerSun mentioned this pull request Sep 27, 2018
Closed
4 tasks
@t-rufang t-rufang deleted the issue_hotfix branch January 8, 2020 07:14
andxu pushed a commit to andxu/azure-tools-for-java that referenced this pull request Mar 24, 2020
@t-rufang
Fix update dialog pops several times when click ok/cancel button issue (
85ae445 
microsoft#2013)

* Fix update dialog pops several times when click ok/cancel button issue

* Update based on review comments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wezhang wezhang wezhang approved these changes

@djlan djlan Awaiting requested review from djlan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[IntelliJ][Spark on ADL] Update dialog pops twice when click OK button
2 participants
@t-rufang @wezhang