change label of close button to Close from Submit and close the editor when close button in webview is clicked.

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/feedback/ProvideFeedbackAction.java

@@ -16,14 +16,16 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureFileType;
 import com.microsoft.azure.toolkit.intellij.common.IntelliJAzureIcons;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
-import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import java.util.Objects;
 
 public class ProvideFeedbackAction extends AnAction implements DumbAware {
     public static final Key<String> ID = new Key<>("ProvideFeedbackAction");
 
     @Override
-    public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
-        final FileEditorManager fileEditorManager = FileEditorManager.getInstance(anActionEvent.getProject());
+    public void actionPerformed(@Nonnull AnActionEvent anActionEvent) {
+        final FileEditorManager fileEditorManager = FileEditorManager.getInstance(Objects.requireNonNull(anActionEvent.getProject()));
         if (fileEditorManager == null) {
             return;
         }
@@ -39,10 +41,10 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
 
     private LightVirtualFile searchExistingFile(FileEditorManager fileEditorManager) {
         LightVirtualFile virtualFile = null;
-        for (VirtualFile editedFile : fileEditorManager.getOpenFiles()) {
-            String fileResourceId = editedFile.getUserData(ID);
+        for (final VirtualFile editedFile : fileEditorManager.getOpenFiles()) {
+            final String fileResourceId = editedFile.getUserData(ID);
             if (fileResourceId != null && fileResourceId.equals(ProvideFeedbackAction.class.getCanonicalName()) &&
-                    editedFile.getFileType().getName().equals(ProvideFeedbackEditorProvider.TYPE)) {
+                editedFile.getFileType().getName().equals(ProvideFeedbackEditorProvider.TYPE)) {
                 virtualFile = (LightVirtualFile) editedFile;
                 break;
             }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/feedback/ProvideFeedbackEditor.java

@@ -5,40 +5,79 @@
 
 package com.microsoft.azure.toolkit.intellij.common.feedback;
 
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.jcef.JBCefBrowser;
+import com.intellij.ui.jcef.JBCefBrowserBase;
+import com.intellij.ui.jcef.JBCefJSQuery;
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.microsoft.azure.toolkit.intellij.common.BaseEditor;
+import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
+import org.cef.browser.CefBrowser;
+import org.cef.browser.CefFrame;
+import org.cef.handler.CefLoadHandlerAdapter;
 import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.Nonnull;
 import javax.swing.*;
 
 public class ProvideFeedbackEditor extends BaseEditor implements DumbAware {
+    private final JBCefJSQuery myJSQueryOpenInBrowser;
     private JPanel pnlRoot;
 
     public ProvideFeedbackEditor(final Project project, VirtualFile virtualFile) {
         super(virtualFile);
+        final JBCefBrowser jbCefBrowser = new JBCefBrowser("https://www.surveymonkey.com/r/PNB5NBL?mode=simple");
+        final CefBrowser browser = jbCefBrowser.getCefBrowser();
+        pnlRoot.add(jbCefBrowser.getComponent(), new GridConstraints(0, 0, 1, 1, 0, GridConstraints.FILL_BOTH, 3, 3, null, null, null, 0));
+        // Create a JS query instance
+        this.myJSQueryOpenInBrowser = JBCefJSQuery.create((JBCefBrowserBase) jbCefBrowser);
+        myJSQueryOpenInBrowser.addHandler((e) -> {
+            AzureTaskManager.getInstance().runLater(() -> {
+                final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
+                fileEditorManager.closeFile(virtualFile);
+            });
+            return new JBCefJSQuery.Response("ok!");
+        });
 
-        final JBCefBrowser browser = new JBCefBrowser("https://www.surveymonkey.com/r/PNB5NBL?mode=simple");
-        pnlRoot.add(browser.getComponent(), new GridConstraints(0, 0, 1, 1, 0, GridConstraints.FILL_BOTH, 3, 3, null, null, null, 0));
-
+        jbCefBrowser.getJBCefClient().addLoadHandler(new CefLoadHandlerAdapter() {
+            @Override
+            public void onLoadEnd(CefBrowser browser, CefFrame frame, int httpStatusCode) {
+                if (!browser.getURL().contains("https://www.surveymonkey.com/r/PNB5NBL")) {
+                    return;
+                }
+                final String js = "window.JavaPanelBridge = {\n" +
+                    "    closeTab: function (e) {\n" +
+                    "       " + myJSQueryOpenInBrowser.inject("e") +
+                    "    }\n" +
+                    "};\n" +
+                    "var azToolkitCloseBtn = document.querySelector('.thank-you-page-container.survey-submit-actions a.survey-page-button.btn');\n" +
+                    "if (azToolkitCloseBtn) {\n" +
+                    "    azToolkitCloseBtn.innerHTML='Close';" +
+                    "    azToolkitCloseBtn.addEventListener('click', () => {\n" +
+                    "        window.JavaPanelBridge.closeTab();\n" +
+                    "    });\n" +
+                    "}";
+                browser.executeJavaScript(js, browser.getURL(), 0);
+            }
+        }, browser);
     }
 
     @Override
-    public @NotNull JComponent getComponent() {
+    public JComponent getComponent() {
         return pnlRoot;
     }
 
     @Override
-    public @Nls(capitalization = Nls.Capitalization.Title) @NotNull String getName() {
+    public @Nls(capitalization = Nls.Capitalization.Title) @Nonnull String getName() {
         return "Provide Feedback";
     }
 
     @Override
     public void dispose() {
-
+        Disposer.dispose(myJSQueryOpenInBrowser);
     }
 }