Merge pull request #1154 from Aalto-LeTech/4.1.0

4.1.0

Author: jaakkonakaza

CHANGELOG.md

@@ -2,12 +2,43 @@
 
 # A+ Courses Changelog
 
+## [4.1.0] - 2024-10-30
+
+### Added
+
+- Module exporting: Students can now export modules for submission.
+- Module importing: Users can import multiple module zip files simultaneously. This feature helps assistants in grading
+  and allows students to test their zips.
+
+### Changed
+
+- Hid point counter from feedback assignments.
+- Removed submission IDs from the assignment tree.
+
+### Fixed
+
+- Improved enrollment detection.
+- Added token invalidation detection: The plugin now prompts users to re-enter their token if it is invalid (i.e., a new
+  one was generated, or it got revoked).
+
 ## [4.0.3] - 2024-09-04
 
 ### Fixed
 
 - Increased network timeout to prevent module downloads from stopping on slower connections
 
+## [4.0.2] - 2024-08-28
+
+### Fixed
+
+- Resolved issues for external users and importing IDE settings.
+
+## [4.0.1] - 2024-08-26
+
+### Changed
+
+- Minor UI improvements.
+
 ## [4.0.0] - 2024-08-23
 
 ### Changed

gradle.properties

@@ -5,11 +5,11 @@ pluginName = A+ Courses
 pluginRepositoryUrl = https://github.com/Aalto-LeTech/aplus-courses
 
 # SemVer format -> https://semver.org
-pluginVersion=4.0.3
+pluginVersion=4.1.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 242
-pluginUntilBuild = 242.*
+pluginUntilBuild=242.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC

src/main/kotlin/fi/aalto/cs/apluscourses/actions/ActionGroups.kt

@@ -7,6 +7,9 @@ object ActionGroups {
     val EXERCISE_ACTIONS: DefaultActionGroup
         get() = actionGroup("fi.aalto.cs.apluscourses.actions.ActionGroups.EXERCISE_ACTIONS")
 
+    val MODULE_ACTIONS: DefaultActionGroup
+        get() = actionGroup("fi.aalto.cs.apluscourses.actions.ActionGroups.MODULE_ACTIONS")
+
     val TOOL_WINDOW_ACTIONS: DefaultActionGroup
         get() = actionGroup("fi.aalto.cs.apluscourses.actions.ActionGroups.TOOL_WINDOW_ACTIONS")
 

src/main/kotlin/fi/aalto/cs/apluscourses/actions/ExportModuleAction.kt

@@ -0,0 +1,13 @@
+package fi.aalto.cs.apluscourses.actions
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+import fi.aalto.cs.apluscourses.services.ModuleImportExport
+
+class ExportModuleAction : AnAction() {
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        project.service<ModuleImportExport>().exportModule()
+    }
+} 

src/main/kotlin/fi/aalto/cs/apluscourses/actions/ImportModuleAction.kt

@@ -0,0 +1,13 @@
+package fi.aalto.cs.apluscourses.actions
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+import fi.aalto.cs.apluscourses.services.ModuleImportExport
+
+class ImportModuleAction : AnAction() {
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        project.service<ModuleImportExport>().importModules()
+    }
+} 

src/main/kotlin/fi/aalto/cs/apluscourses/api/APlusApi.kt

@@ -11,10 +11,8 @@ import io.ktor.client.request.parameter
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.*
 import io.ktor.resources.*
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNamingStrategy
 import org.jsoup.Jsoup
 import java.time.ZonedDateTime
 import kotlin.collections.component1
@@ -43,12 +41,8 @@ object APlusApi {
         @Resource("exercises")
         class Exercises(val parent: Course) {
             suspend fun get(project: Project): List<CourseModule> {
-                // TODO remove after hasSubmittableFiles fixed
-//                    CoursesClient.getInstance(project).getBody<Exercises, CourseModuleResults>(this@Exercises).results
-                val res = CoursesClient.getInstance(project).get<Exercises>(this@Exercises)
-                return json.decodeFromString<CourseModuleResults>(
-                    res.bodyAsText().replace("\"has_submittable_files\":[]", "\"has_submittable_files\":false")
-                ).results
+                return CoursesClient.getInstance(project)
+                    .getBody<Exercises, CourseModuleResults>(this@Exercises).results
             }
 
             @Serializable
@@ -77,18 +71,8 @@ object APlusApi {
                 val maxSubmissions: Int,
                 val hierarchicalName: String,
                 val difficulty: String,
-//            val hasSubmittableFiles: Boolean // TODO should always be bool, currently boolean or null or array
-                val hasSubmittableFiles: Boolean?
+                val hasSubmittableFiles: Boolean
             )
-
-            companion object {
-                @OptIn(ExperimentalSerializationApi::class)
-                private val json = Json { // TODO remove after hasSubmittableFiles fixed
-                    ignoreUnknownKeys = true
-                    isLenient = true
-                    namingStrategy = JsonNamingStrategy.SnakeCase
-                }
-            }
         }
 
         @Resource("points/me")

src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/Exercise.kt

@@ -16,6 +16,7 @@ data class Exercise(
     val difficulty: String = "",
     val isOptional: Boolean,
     val isSubmittable: Boolean,
+    val isFeedback: Boolean
 ) {
 
     /**

src/main/kotlin/fi/aalto/cs/apluscourses/notifications/ModuleExportedNotification.kt

@@ -0,0 +1,25 @@
+package fi.aalto.cs.apluscourses.notifications
+
+import com.intellij.ide.actions.RevealFileAction
+import com.intellij.notification.Notification
+import com.intellij.notification.NotificationAction
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.module.Module
+import fi.aalto.cs.apluscourses.MyBundle.message
+import fi.aalto.cs.apluscourses.services.PluginSettings
+import java.io.File
+
+class ModuleExportedNotification(module: Module, exportedFile: File) : Notification(
+    PluginSettings.A_PLUS,
+    message("notification.ModuleExportedNotification.title"),
+    message("notification.ModuleExportedNotification.content", module.name, exportedFile.path),
+    NotificationType.INFORMATION
+) {
+    init {
+        addAction(NotificationAction.createSimple(
+            message("notification.ModuleExportedNotification.showInFiles")
+        ) {
+            RevealFileAction.openFile(exportedFile)
+        })
+    }
+}

src/main/kotlin/fi/aalto/cs/apluscourses/services/CoursesClient.kt

@@ -5,6 +5,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.platform.ide.progress.withBackgroundProgress
 import com.intellij.platform.util.progress.reportSequentialProgress
+import com.intellij.serialization.PropertyMapping
 import fi.aalto.cs.apluscourses.MyBundle.message
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -36,6 +37,10 @@ import kotlin.io.readBytes
 import kotlin.sequences.forEach
 import kotlin.text.contains
 
+class UnauthorizedException @PropertyMapping() constructor() : Exception() {
+    private val serialVersionUID: Long = 1L
+}
+
 @OptIn(ExperimentalSerializationApi::class)
 @Service(Service.Level.PROJECT)
 class CoursesClient(
@@ -141,6 +146,9 @@ class CoursesClient(
                 requestBuilder()
             }
         }
+        if (res.status == HttpStatusCode.Unauthorized) {
+            throw UnauthorizedException()
+        }
         if (res.status != HttpStatusCode.OK) {
             throw IOException("Failed to get body: ${res.status}")
         }