Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Feature/improved responses #36

Merged
merged 10 commits into from
Sep 21, 2023
Merged

Feature/improved responses #36

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9879d40
Shortcircuit if no id or email
EstebanDalelR Sep 15, 2023
459f604
Extract duplicated function
EstebanDalelR Sep 15, 2023
dd3d500
Code improvements
EstebanDalelR Sep 15, 2023
cf249c6
Add error handling to function
EstebanDalelR Sep 15, 2023
047d30b
Add login suggestion
EstebanDalelR Sep 15, 2023
2b47f90
Open link on click
EstebanDalelR Sep 15, 2023
06dbe75
Make title and body a textpane, with arrows
EstebanDalelR Sep 15, 2023
7d2c497
Breaklines
EstebanDalelR Sep 15, 2023
b21eadc
Fix panel opening
EstebanDalelR Sep 15, 2023
54dbb5c
Merge branch 'dev' into feature/improved-responses
Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 125 additions & 83 deletions src/main/kotlin/com/watermelon/context/toolWindow/MyToolWindowFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.watermelon.context.toolWindow

import MyProjectService
import com.intellij.credentialStore.CredentialAttributes
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.openapi.wm.ToolWindow
Expand All @@ -24,7 +25,7 @@ class MyToolWindowFactory : ToolWindowFactory {

data class ServiceData(val title: String, val body: String, val link: String? = null)

fun createToolWindowContent(project: Project, toolWindow: ToolWindow, startLine: Int, endLine: Int) {
private fun createContent(project: Project, toolWindow: ToolWindow, startLine: Int = 0, endLine: Int = 0) {
// this only runs once
val myToolWindow = MyToolWindow(toolWindow)
val content =
Expand All @@ -33,14 +34,12 @@ class MyToolWindowFactory : ToolWindowFactory {
toolWindow.contentManager.addContent(content)
}

override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
fun createToolWindowContent(project: Project, toolWindow: ToolWindow, startLine: Int, endLine: Int) {
createContent(project, toolWindow, startLine, endLine)
}

// this only runs once
val myToolWindow = MyToolWindow(toolWindow)
val content =
ContentFactory.getInstance().createContent(myToolWindow.getContent(), null, false)
toolWindow.contentManager.removeAllContents(true)
toolWindow.contentManager.addContent(content)
override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
createContent(project, toolWindow)
}

override fun shouldBeAvailable(project: Project) = true
Expand All @@ -50,57 +49,72 @@ class MyToolWindowFactory : ToolWindowFactory {

private val service = toolWindow.project.service<MyProjectService>()

class ExpandablePanel(title: String, body: String) : JPanel() {
class ExpandablePanel(title: String, body: String, val link: String? = null) : JPanel() {
private val cardLayout = CardLayout()
override fun getMaximumSize(): Dimension {
return Dimension(parent?.width ?: super.getMaximumSize().width, super.getMaximumSize().height)
}

init {
// Assuming the rest of your code remains the same...

val titleButton = JButton(title)

val bodyTextArea = JTextArea(body).apply {
wrapStyleWord = true
lineWrap = true
val titleTextPane = JTextPane().apply {
contentType = "text/html"
text = "<html><b>\u25B6 $title</b></html>"
isEditable = false
isOpaque = false
border = null
background = null
font = UIManager.getFont("Button.font")
cursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
}
val formattedBody = body.replace("\n", "<br>")

val bodyTextPane = JTextPane().apply {
contentType = "text/html"
text = "<html><b>\u25BC $title</b><br>$formattedBody</html>"
isEditable = false
isOpaque = true
background = null
font = UIManager.getFont("Button.font")
cursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
}

val scrollPane = JBScrollPane(bodyTextPane).apply {
verticalScrollBarPolicy = JScrollPane.VERTICAL_SCROLLBAR_NEVER
horizontalScrollBarPolicy = JScrollPane.HORIZONTAL_SCROLLBAR_NEVER
}
val titlePanel = JPanel().apply {
layout = BoxLayout(this, BoxLayout.Y_AXIS)
maximumSize = Dimension(10, 10)
}
val expandedPanel = JPanel().apply {
layout = BoxLayout(this, BoxLayout.Y_AXIS)

maximumSize = Dimension(10, 10)
}

titlePanel.add(titleButton)
expandedPanel.add(bodyTextArea)
titlePanel.add(titleTextPane)
expandedPanel.add(scrollPane)


// Use CardLayout for ExpandablePanel
layout = cardLayout
add(titlePanel, "TitleOnly")
add(expandedPanel, "Expanded")

val switchPanelListener = ActionListener {
remove(titlePanel)
add(expandedPanel)
revalidate()
repaint()
}

titleButton.addActionListener(switchPanelListener)
bodyTextArea.addMouseListener(object : MouseAdapter() {
titleTextPane.addMouseListener(object : MouseAdapter() {
override fun mouseClicked(e: MouseEvent?) {
remove(titlePanel)
add(expandedPanel)
revalidate()
repaint()
}
})
bodyTextPane.addMouseListener(object : MouseAdapter() {
override fun mouseClicked(e: MouseEvent?) {
if (!link.isNullOrEmpty()) {
println("Opening link: $link")
BrowserUtil.browse(link)
}
remove(expandedPanel)
add(titlePanel)
revalidate()
Expand All @@ -125,40 +139,46 @@ class MyToolWindowFactory : ToolWindowFactory {
add(titlePanel)

serviceDataArray.forEach { data ->
val expandablePanel = ExpandablePanel(data.title, data.body)
val expandablePanel = ExpandablePanel(data.title, data.body, data.link)
add(expandablePanel)
}
}
}


private fun makeApiCall(commitMessages: List<String>, email: String?, id: String?): JsonObject? {
private fun makeApiCall(commitMessages: List<String>, email: String?, id: String?): Result<JsonObject> {
val apiUrl = "$backendUrl/api/extension/getContext"
val url = URL(apiUrl)
val connection = url.openConnection() as HttpURLConnection
try {

return try {
connection.requestMethod = "POST"
connection.doOutput = true
connection.setRequestProperty("Content-Type", "application/json")
connection.setRequestProperty("Charset", "UTF-8")

val commitListJson = commitMessages.joinToString(prefix = "[\"", separator = "\",\"", postfix = "\"]")
val payload = """
{
"email": $email,
"id": $id,
"repo": "watermelon",
"owner": "watermelontools",
"commitList": $commitListJson
}
""".trimIndent()
{
"email": $email,
"id": $id,
"repo": "watermelon",
"owner": "watermelontools",
"commitList": $commitListJson
}
""".trimIndent()

connection.outputStream.write(payload.toByteArray())

val responseCode = connection.responseCode
return if (responseCode == HttpURLConnection.HTTP_OK) {
Json.parseToJsonElement(connection.inputStream.reader().readText()).jsonObject
if (responseCode == HttpURLConnection.HTTP_OK) {
val jsonResponse = Json.parseToJsonElement(connection.inputStream.reader().readText()).jsonObject
Result.success(jsonResponse)
} else {
null
Result.failure(Exception("Server responded with code: $responseCode"))
}
} catch (e: Exception) { // catch all exceptions related to I/O or JSON parsing
Result.failure(e)
} finally {
connection.disconnect()
}
Expand All @@ -179,8 +199,6 @@ class MyToolWindowFactory : ToolWindowFactory {
}

val commitMessages = commitHashes?.map { commitHash -> commitHash.message } ?: listOf<String>()
val apiResponse = makeApiCall(commitMessages, email, id)
val data = apiResponse?.get("data")?.jsonObject

val commitList = commitHashes?.map { commitHash ->
ServiceData(
Expand All @@ -190,57 +208,81 @@ class MyToolWindowFactory : ToolWindowFactory {
}!!
servicePanels = servicePanels + (setupServiceUI(commitList, "Commits"))

val serviceNames = data?.keys?.asSequence()?.map { key: String -> key }?.toList()
if (serviceNames != null) {
for (serviceName in serviceNames) {
when (val serviceData = data[serviceName]) {
is JsonObject -> {
// Handle JsonObject case
}
if (email.isNullOrEmpty() && !id.isNullOrEmpty()) {
servicePanels.forEach { servicePanel ->
mainPanel.add(servicePanel)
}

is JsonArray -> {
if (serviceData.isEmpty()) {
val commitPanel = setupServiceUI(emptyList(), serviceName)
servicePanels = servicePanels + (commitPanel)
add(commitPanel)
} else {

val returnArray = serviceData.map { serviceDataElement ->
val serviceDataValueJson = serviceDataElement.jsonObject
val title = serviceDataValueJson["title"]?.jsonPrimitive?.content
val body = serviceDataValueJson["body"]?.jsonPrimitive?.content
val link = serviceDataValueJson["link"]?.jsonPrimitive?.content
ServiceData(title ?: "", body ?: "", link)
}
servicePanels = servicePanels + (setupServiceUI(
returnArray,
"$serviceName (${serviceData.size})"
))
return JBScrollPane(mainPanel)
}

val apiResponse = makeApiCall(commitMessages, email, id)
val data = apiResponse.getOrThrow().get("data")?.jsonObject
if (apiResponse.isSuccess) {
val serviceNames = data?.keys?.asSequence()?.map { key: String -> key }?.toList()
if (serviceNames != null) {
for (serviceName in serviceNames) {
when (val serviceData = data[serviceName]) {
is JsonObject -> {
// Handle JsonObject case
}
}

is JsonPrimitive -> {
val message = serviceData.content
if (message.contains(Regex("no .* token"))) {
is JsonArray -> {
if (serviceData.isEmpty()) {
val servicePanel = setupServiceUI(emptyList(), serviceName)
servicePanels = servicePanels + (servicePanel)
} else {

val returnArray = serviceData.map { serviceDataElement ->
val serviceDataValueJson = serviceDataElement.jsonObject
val title = serviceDataValueJson["title"]?.jsonPrimitive?.content
val body = serviceDataValueJson["body"]?.jsonPrimitive?.content
val link = serviceDataValueJson["link"]?.jsonPrimitive?.content
ServiceData(title ?: "", body ?: "", link)
}
servicePanels = servicePanels + (setupServiceUI(
returnArray,
"$serviceName (${serviceData.size})"
))

servicePanels = servicePanels + (setupServiceUI(emptyList(), serviceName ?: ""))
}
}
}

else -> {
// Handle any other cases if needed
is JsonPrimitive -> {
val message = serviceData.content
if (message.contains(Regex("no .* token"))) {

val emptyTokenPane = ServiceData(
title = "Please login to $serviceName",
body = "Click here to login",
link = "$backendUrl/"
)

val list: List<ServiceData> = listOf(emptyTokenPane)

servicePanels = servicePanels + (setupServiceUI(list, serviceName))
}
}

else -> {
// Handle any other cases if needed
}
}
}
}
}
// add the servicePanels to the UI
servicePanels.forEach { servicePanel ->
mainPanel.add(servicePanel)
}
// add the servicePanels to the UI
servicePanels.forEach { servicePanel ->
mainPanel.add(servicePanel)
}

return JBScrollPane(mainPanel)

} else {
val error = apiResponse.exceptionOrNull()
// Optionally log or show a message to the user
val errorPanel = JBPanel<JBPanel<*>>()

return JBScrollPane(mainPanel)
}
}
}
}

Loading