provide support for multiple projects and check for .git folder

Author: burnerlee

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.dashwave"
-version = "2.3.0"
+version = "2.3.1"
 
 repositories {
     mavenCentral()

src/main/kotlin/com/dashwave/plugin/PluginStartup.kt

@@ -1,46 +1,60 @@
 package com.dashwave.plugin
 
+import com.dashwave.plugin.actions.BuildAction
 import com.dashwave.plugin.dialogbox.CreateProjectDialog
+import com.dashwave.plugin.dialogbox.GitNotConfiguredDialog
 import com.dashwave.plugin.dialogbox.ReadyForBuildDialog
 import com.dashwave.plugin.messages.Messages
+import com.dashwave.plugin.notif.BalloonNotif
 import com.dashwave.plugin.utils.DwCmds
 import com.dashwave.plugin.utils.Process
 import com.dashwave.plugin.windows.DashwaveWindow
 import com.intellij.execution.filters.HyperlinkInfo
 import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.notification.*
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
 import com.intellij.openapi.ui.DialogWrapper
 import kotlinx.serialization.json.*
+import com.intellij.openapi.wm.ToolWindowManager
 import java.awt.Color
 import java.io.File
 import java.io.IOException
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.Anchor
+import com.intellij.openapi.actionSystem.Constraints
+import com.intellij.openapi.actionSystem.DefaultActionGroup
+import io.ktor.util.*
 import java.awt.Font
 
 class PluginStartup: StartupActivity {
+    companion object {
+        var dwWindows:HashMap<String, DashwaveWindow> = HashMap()
+    }
 
     override fun runActivity(project: Project) {
-        DashwaveWindow.p = project
-        DashwaveWindow.show()
-        checkDW(project)
+        val dwWindow = DashwaveWindow(project)
+        dwWindow.show()
+        dwWindows[project.name] = dwWindow
+        checkDW(project, dwWindow)
     }
 }
 
-fun checkDW(project: Project) {
-    val dwCmd = DwCmds("check-update", "", true)
+fun checkDW(project: Project, dwWindow: DashwaveWindow) {
+    val dwCmd = DwCmds("check-update", project.basePath, true, dwWindow)
     val exitCode = dwCmd.executeWithExitCode()
     if (exitCode == 0) {
-        DashwaveWindow.displayInfo(Messages.DW_INSTALLED_ALREADY)
-        verifyLogin(project?.basePath)
+        dwWindow.displayInfo(Messages.DW_INSTALLED_ALREADY)
+        verifyLogin(project?.basePath, dwWindow)
     }else if(exitCode == 11){
     }else{
-        DashwaveWindow.displayInfo(Messages.DW_NOT_INSTALLED)
+        dwWindow.displayInfo(Messages.DW_NOT_INSTALLED)
         showInstallDW(project)
-        installDW(project?.basePath)
+        installDW(project?.basePath, dwWindow)
     }
 }
 
@@ -55,61 +69,76 @@ fun showInstallDW(project: Project){
     notification.notify(project)
 }
 
-fun installDW(pwd: String?){
-    DashwaveWindow.displayOutput("🔨 Setting up plugin...\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
+fun installDW(pwd: String?, dwWindow: DashwaveWindow){
+    dwWindow.displayOutput("🔨 Setting up plugin...\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
 
     // Execute the script
-    val process = Process("curl -sSL https://cli.dashwave.io | bash", pwd, true)
+    val process = Process("curl -sSL https://cli.dashwave.io | bash", pwd, true, dwWindow)
     process.start(false)
     Thread{
         val exitCode = process.wait()
         if (exitCode == 0) {
-            DashwaveWindow.displayInfo(Messages.DW_DEPS_INSTALL_SUCCESS)
-            DashwaveWindow.displayInfo(Messages.DW_DEPS_CONFIGURING)
-            val configCmd = DwCmds("config", pwd, true)
+            dwWindow.displayInfo(Messages.DW_DEPS_INSTALL_SUCCESS)
+            dwWindow.displayInfo(Messages.DW_DEPS_CONFIGURING)
+            val configCmd = DwCmds("config", pwd, true, dwWindow)
             val exitcode = configCmd.executeWithExitCode()
             if(exitcode == 0){
-                DashwaveWindow.displayInfo(Messages.DW_DEPS_CONFIGURE_SUCCESS)
-                verifyLogin(pwd)
+                dwWindow.displayInfo(Messages.DW_DEPS_CONFIGURE_SUCCESS)
+                verifyLogin(pwd, dwWindow)
             }else{
-                DashwaveWindow.displayError(Messages.DW_DEPS_CONFIGURE_FAILED)
+                dwWindow.displayError(Messages.DW_DEPS_CONFIGURE_FAILED)
             }
         } else {
-            DashwaveWindow.displayError(Messages.DW_DEPS_INSTALL_FAILED)
+            dwWindow.displayError(Messages.DW_DEPS_INSTALL_FAILED)
         }
     }.start()
 }
 
-fun verifyLogin(pwd:String?){
-    listUsers(pwd)
-    DashwaveWindow.addModulesAndVariants(HashMap<String,List<String>>(), "", "")
-    val currentUserLoginCmd = DwCmds("user", "", true)
+fun verifyLogin(pwd:String?, dwWindow: DashwaveWindow){
+    listUsers(pwd, dwWindow)
+    dwWindow.addModulesAndVariants(HashMap<String,List<String>>(), "", "")
+    val currentUserLoginCmd = DwCmds("user", pwd, true, dwWindow)
     val exitCode = currentUserLoginCmd.executeWithExitCode()
     if (exitCode == 0){
-        DashwaveWindow.enableRunButton()
-        checkProjectConnected(pwd)
+        dwWindow.enableRunButton()
+        checkProjectConnected(pwd, dwWindow)
     }else{
-        loginUser(pwd)
+        loginUser(pwd, dwWindow)
     }
 }
 
-fun checkProjectConnected(pwd:String?){
-    listUsers(pwd)
-    if (doesFileExist("$pwd/dashwave.yml")){
-        DashwaveWindow.enableRunButton()
+fun checkProjectConnected(pwd:String?, dwWindow: DashwaveWindow){
+    listUsers(pwd, dwWindow)
+    // check if .git folder exists
+    val gitConfigFilepath = "$pwd/.git"
+    if (!doesFileExist(gitConfigFilepath)){
+        dwWindow.displayOutput("❌ ${Messages.GIT_NOT_CONFIGURED}", ConsoleViewContentType.ERROR_OUTPUT)
+        val notif = BalloonNotif(
+            "Could not find .git folder",
+            "",
+            "This is not a git repository, initialise git and push codebase to proceed ",
+            NotificationType.ERROR,
+        ){}
+        notif.show(dwWindow.p)
 
-        listModulesAndVariants(pwd)
+        val dialog = GitNotConfiguredDialog()
+        dialog.show()
+        return
+    }
 
-        DashwaveWindow.displayOutput("✅ Project is successfully connected to dashwave. Run a cloud build using dashwave icon on toolbar\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
+    if (doesFileExist("$pwd/dashwave.yml")){
+        dwWindow.enableRunButton()
+        listModulesAndVariants(pwd, dwWindow)
+        dwWindow.displayOutput("✅ Project is successfully connected to dashwave. Run a cloud build using dashwave icon on toolbar\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
         val dd = ReadyForBuildDialog()
         dd.show()
     }else {
-        DashwaveWindow.displayOutput("⚠️ This project is not connected to dashwave, create a new project on dashwave\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
-        openCreateProjectDialog(pwd, true)
+        dwWindow.displayOutput("⚠️ This project is not connected to dashwave, create a new project on dashwave\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
+        openCreateProjectDialog(pwd, true, dwWindow){}
     }
 }
 
-fun loginUser(pwd:String?) {
+fun loginUser(pwd:String?, dwWindow: DashwaveWindow) {
     val loginDialog = LoginDialog()
     var accessCode: String = ""
 
@@ -123,14 +152,15 @@ fun loginUser(pwd:String?) {
     }
 
     val loginUserCmd = "login $accessCode"
-    val exitCode = DwCmds(loginUserCmd, "", true).executeWithExitCode()
+    val exitCode = DwCmds(loginUserCmd, pwd, true, dwWindow).executeWithExitCode()
     if (exitCode == 0) {
-        checkProjectConnected(pwd)
+        dwWindow.enableRunButton()
+        checkProjectConnected(pwd, dwWindow)
     }else{
         var hyperlink = HyperlinkInfo { p: Project ->
-            loginUser(pwd)
+            loginUser(pwd, dwWindow)
         }
-        DashwaveWindow.console.printHyperlink(Messages.DW_LOGIN_FAILED, hyperlink)
+        dwWindow.console.printHyperlink(Messages.DW_LOGIN_FAILED, hyperlink)
     }
 }
 
@@ -139,11 +169,11 @@ fun doesFileExist(path: String): Boolean {
     return file.exists()
 }
 
-fun listUsers(pwd: String?){
-    val usersCmd = DwCmds("user ls", pwd, false)
+fun listUsers(pwd: String?, dwWindow: DashwaveWindow){
+    val usersCmd = DwCmds("user ls", pwd, false, dwWindow)
     val cmdOutput = usersCmd.executeWithOutput()
     if(cmdOutput.first != 0){
-        DashwaveWindow.displayError("❌ Could not find logged in users\n"+cmdOutput.second)
+        dwWindow.displayError("❌ Could not find logged in users\n"+cmdOutput.second)
         return
     }
     val jsonText = cmdOutput.second.trim()
@@ -154,13 +184,13 @@ fun listUsers(pwd: String?){
     val users = jsonObject["users"]?.jsonArray?.mapNotNull { it.jsonPrimitive.contentOrNull }
     val activeUser = jsonObject["active_user"]?.toString()
 
-    DashwaveWindow.addUsers(users, activeUser?:"",pwd)
+    dwWindow.addUsers(users, activeUser?:"",pwd)
 }
-fun listModulesAndVariants(pwd:String?) {
-    val configsCmd = DwCmds("build configs", pwd, false)
+fun listModulesAndVariants(pwd:String?, dwWindow: DashwaveWindow) {
+    val configsCmd = DwCmds("build configs", pwd, false, dwWindow)
     var cmdOutput = configsCmd.executeWithOutput()
     if(cmdOutput.first != 0){
-        DashwaveWindow.displayError("❌ Could not find modules and in variants\n"+cmdOutput.second)
+        dwWindow.displayError("❌ Could not find modules and in variants\n"+cmdOutput.second)
         return
     }
     val jsonText = cmdOutput.second.trim()
@@ -191,34 +221,40 @@ fun listModulesAndVariants(pwd:String?) {
         }
     }
 
-    DashwaveWindow.addModulesAndVariants(map, defaultModule, defaultVariant)
+    dwWindow.addModulesAndVariants(map, defaultModule, defaultVariant)
 }
 
-fun openCreateProjectDialog(pwd:String?, openTip:Boolean):Boolean{
-    val createProjectDialog = CreateProjectDialog()
-    if (createProjectDialog.showAndGet()){
-        val projectName = createProjectDialog.getProjectName()
-        val rootDir = createProjectDialog.getRootDir()
-        val techStack = createProjectDialog.getSelectedTechStack()
-        val success = createProject(projectName, techStack, rootDir,pwd, openTip)
-        return success
-    }
-    DashwaveWindow.show()
-    val yellowOutput = ConsoleViewContentType("YellowOutput", TextAttributes(Color.YELLOW, null,null, null, Font.PLAIN))
-    DashwaveWindow.displayOutput("⚠️ You must create a new project to be able to run builds on dashwave\n\n", yellowOutput)
-    var hyperlink = HyperlinkInfo { p: Project ->
-        openCreateProjectDialog(pwd, openTip)
+fun openCreateProjectDialog(pwd:String?, openTip:Boolean, dwWindow: DashwaveWindow,buildAction:()->Unit){
+    ApplicationManager.getApplication().invokeLater{
+        val createProjectDialog = CreateProjectDialog(dwWindow.p)
+        if (createProjectDialog.showAndGet()){
+            val projectName = createProjectDialog.getProjectName()
+            val rootDir = createProjectDialog.getRootDir()
+            val techStack = createProjectDialog.getSelectedTechStack()
+            val success = createProject(projectName, techStack, rootDir,pwd, openTip, dwWindow)
+            if(success){
+                buildAction()
+            }
+        }else{
+//            dwWindow.show()
+            dwWindow.enableRunButton()
+            dwWindow.disableCancelButton()
+            val yellowOutput = ConsoleViewContentType("YellowOutput", TextAttributes(Color.YELLOW, null,null, null, Font.PLAIN))
+            dwWindow.displayOutput("⚠️ You must create a new project to be able to run builds on dashwave\n\n", yellowOutput)
+            var hyperlink = HyperlinkInfo { p: Project ->
+                openCreateProjectDialog(pwd, openTip, dwWindow,buildAction)
+            }
+            dwWindow.console.printHyperlink("Click here", hyperlink)
+            dwWindow.displayOutput(" to create a new dashwave project\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
+        }
     }
-    DashwaveWindow.console.printHyperlink("Click here", hyperlink)
-    DashwaveWindow.displayOutput(" to create a new dashwave project\n\n", ConsoleViewContentType.NORMAL_OUTPUT)
-    return false
 }
 
-fun createProject(projectName: String, devStack:String, rootDir:String,pwd:String?, openTip: Boolean) :Boolean{
+fun createProject(projectName: String, devStack:String, rootDir:String,pwd:String?, openTip: Boolean, dwWindow: DashwaveWindow) :Boolean{
     val createProjectCmd = "create-project --no-prompt --name=$projectName --dev-stack=$devStack --root-dir=$rootDir"
-    val exitCode = DwCmds(createProjectCmd, pwd, true).executeWithExitCode()
+    val exitCode = DwCmds(createProjectCmd, pwd, true, dwWindow).executeWithExitCode()
     if(exitCode == 0){
-        DashwaveWindow.enableRunButton()
+        dwWindow.enableRunButton()
         Notifications.Bus.notify(
             Notification(
                 "YourPluginNotificationGroup",
@@ -227,19 +263,26 @@ fun createProject(projectName: String, devStack:String, rootDir:String,pwd:Strin
                 NotificationType.INFORMATION
             )
         )
-        DashwaveWindow.show()
-        DashwaveWindow.displayInfo(Messages.PROJECT_CONNECTION_SUCCESS)
+//        dwWindow.show()
+        dwWindow.displayInfo(Messages.PROJECT_CONNECTION_SUCCESS)
 
         if(openTip) {
             val dd = ReadyForBuildDialog()
             dd.show()
         }
         return true
     }
-    DashwaveWindow.displayError(Messages.PROJECT_CONNECTION_FAILED)
+    dwWindow.displayError(Messages.PROJECT_CONNECTION_FAILED)
+    if(exitCode == 13){
+        var hyperlink = HyperlinkInfo { p: Project ->
+            loginUser(pwd, dwWindow)
+        }
+        dwWindow.console.printHyperlink("Login here\n\n", hyperlink)
+        return false
+    }
     var hyperlink = HyperlinkInfo { p: Project ->
-        openCreateProjectDialog(pwd, openTip)
+        openCreateProjectDialog(pwd, openTip, dwWindow){}
     }
-    DashwaveWindow.console.printHyperlink("Please try again\n\n", hyperlink)
+    dwWindow.console.printHyperlink("Please try again\n\n", hyperlink)
     return false
 }

src/main/kotlin/com/dashwave/plugin/actions/BuildAction.kt

@@ -1,29 +1,28 @@
 package com.dashwave.plugin.actions
 
+import com.dashwave.plugin.PluginStartup
 import com.dashwave.plugin.windows.DashwaveWindow
 import com.dashwave.plugin.utils.DwBuild
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.IconLoader
+import javax.swing.Icon
 
 class BuildAction: AnAction() {
 
-
     override fun update(e: AnActionEvent) {
         super.update(e)
         val presentation = e.presentation
 
         // Enable or disable the action based on your condition
-        presentation.isEnabled = DashwaveWindow.runEnabled
+
+        presentation.isEnabled = PluginStartup.dwWindows?.get(e.project?.name)?.runEnabled?:false
         presentation.text = "Run build on dashwave"
         presentation.description = "Run build on dashwave"
     }
 
     override fun actionPerformed(e: AnActionEvent) {
-        val project = e.project
-        if(project != null){
-            val buildConfigs = DashwaveWindow.getBuildConfigs(project)
-            val build = DwBuild(buildConfigs)
-            build.run(project)
-        }
+        PluginStartup.dwWindows?.get(e.project?.name)?.runButton?.doClick()
     }
 }