fix:JobsLoadingModelListener

dsoftwareinc · Apr 10, 2024 · 90ac9b1 · 90ac9b1
1 parent 5d600e5
commit 90ac9b1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 36 deletions.
diff --git a/src/main/kotlin/com/dsoftware/ghmanager/actions/PostWorkflowActions.kt b/src/main/kotlin/com/dsoftware/ghmanager/actions/PostWorkflowActions.kt
@@ -33,7 +33,7 @@ abstract class PostUrlAction(
         getUrl(e.dataContext)?.let {
             val request = GithubApi.postUrl(text, it, getData(e.dataContext))
             val context = e.getRequiredData(ActionKeys.ACTION_DATA_CONTEXT)
-            val future = context.createDataProvider(request).request
+            val future = context.createDataProvider(request).processValue
             future.thenApply {
                 afterPostUrl()
             }

diff --git a/src/main/kotlin/com/dsoftware/ghmanager/api/GithubApi.kt b/src/main/kotlin/com/dsoftware/ghmanager/api/GithubApi.kt
@@ -64,10 +64,7 @@ object GithubApi : GithubApiRequests.Entity("/repos") {
     }
 
 
-    fun getJobsForWorkFlowRun(url: String): GithubApiRequest<WorkflowRunJobs>
-//  {      throw GithubStatusCodeException("Not found", 404)
-//    }
-        = get<WorkflowRunJobs>(
+    fun getJobsForWorkFlowRun(url: String): GithubApiRequest<WorkflowRunJobs> = get<WorkflowRunJobs>(
         url, "Get workflow-run jobs", pagination = GithubRequestPagination(1)
     )
 

diff --git a/src/main/kotlin/com/dsoftware/ghmanager/data/JobsLoadingModelListener.kt b/src/main/kotlin/com/dsoftware/ghmanager/data/JobsLoadingModelListener.kt
@@ -24,14 +24,14 @@ class JobsLoadingModelListener(
             listenerDisposable = null
 
             provider?.let {
-                jobsLoadingModel.future = it.request
+                jobsLoadingModel.future = it.processValue
                 val disposable = Disposer.newDisposable().apply {
                     Disposer.register(jobsLoadingModel, this)
                 }
                 it.addRunChangesListener(disposable,
                     object : DataProvider.DataProviderChangeListener {
                         override fun changed() {
-                            jobsLoadingModel.future = it.request
+                            jobsLoadingModel.future = it.processValue
                         }
                     })
                 listenerDisposable = disposable

diff --git a/src/main/kotlin/com/dsoftware/ghmanager/data/LogLoadingModelListener.kt b/src/main/kotlin/com/dsoftware/ghmanager/data/LogLoadingModelListener.kt
@@ -35,7 +35,7 @@ class LogLoadingModelListener(
         var listenerDisposable: Disposable? = null
         logDataProvider.addAndInvokeListener { provider ->
             logsLoadingModel.future = null
-            logsLoadingModel.future = provider?.request
+            logsLoadingModel.future = provider?.processValue
             listenerDisposable = listenerDisposable?.let {
                 Disposer.dispose(it)
                 null
@@ -47,7 +47,7 @@ class LogLoadingModelListener(
                 it.addRunChangesListener(newDisposable,
                     object : DataProvider.DataProviderChangeListener {
                         override fun changed() {
-                            logsLoadingModel.future = it.request
+                            logsLoadingModel.future = it.processValue
                         }
                     })
                 listenerDisposable = newDisposable

diff --git a/src/main/kotlin/com/dsoftware/ghmanager/data/providers/DataProvider.kt b/src/main/kotlin/com/dsoftware/ghmanager/data/providers/DataProvider.kt
@@ -1,6 +1,9 @@
 package com.dsoftware.ghmanager.data.providers
 
 import com.dsoftware.ghmanager.api.GhApiRequestExecutor
+import com.dsoftware.ghmanager.api.GithubApi
+import com.dsoftware.ghmanager.api.model.Job
+import com.dsoftware.ghmanager.api.model.WorkflowRunJobs
 import com.intellij.collaboration.async.CompletableFutureUtil.submitIOTask
 import com.intellij.collaboration.util.ProgressIndicatorsProvider
 import com.intellij.openapi.Disposable
@@ -20,7 +23,7 @@ open class DataProvider<T>(
     private val progressManager = ProgressManager.getInstance()
     private val indicatorsProvider: ProgressIndicatorsProvider = ProgressIndicatorsProvider()
 
-    private val processValue = progressManager.submitIOTask(indicatorsProvider, true) {
+    val processValue = progressManager.submitIOTask(indicatorsProvider, true) {
         try {
             LOG.info("Executing ${githubApiRequest.url}")
             val request = githubApiRequest
@@ -35,9 +38,6 @@ open class DataProvider<T>(
         }
     }
 
-    val request
-        get() = processValue
-
     fun url(): String = githubApiRequest.url
 
     fun reload() {
@@ -55,4 +55,14 @@ open class DataProvider<T>(
     companion object {
         private val LOG = thisLogger()
     }
-}
+}
+
+
+class JobsDataProvider(requestExecutor: GhApiRequestExecutor, jobsUrl: String) : DataProvider<WorkflowRunJobs>(
+    requestExecutor, GithubApi.getJobsForWorkFlowRun(jobsUrl)
+)
+
+
+class LogDataProvider(requestExecutor: GhApiRequestExecutor, job: Job) : DataProvider<String>(
+    requestExecutor, GithubApi.getLogForSingleJob(job)
+)
diff --git a/src/main/kotlin/com/dsoftware/ghmanager/data/providers/JobsDataProvider.kt b/src/main/kotlin/com/dsoftware/ghmanager/data/providers/JobsDataProvider.kt
diff --git a/src/main/kotlin/com/dsoftware/ghmanager/data/providers/LogDataProvider.kt b/src/main/kotlin/com/dsoftware/ghmanager/data/providers/LogDataProvider.kt