Skip to content

Commit d52531c

Browse files
dhasani23David Hasani
andauthored
fix(CodeTransformation): remove play button from bottom panel (#4194)
* fix(CodeTransformation): remove play/stop buttons from bottom panel * remove extra files * fix changelog * add stop button back * add jobId to metric --------- Co-authored-by: David Hasani <[email protected]>
1 parent 76cf030 commit d52531c

File tree

6 files changed

+35
-60
lines changed

6 files changed

+35
-60
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "removal",
3+
"description" : "CodeTransformation: remove play button from Transformation Hub, instead use /transform in chat"
4+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mockito = "5.10.0"
2121
mockitoKotlin = "5.2.1"
2222
mockk = "1.13.8"
2323
node-gradle = "7.0.1"
24-
telemetryGenerator = "1.0.196"
24+
telemetryGenerator = "1.0.197"
2525
testLogger = "3.1.0"
2626
testRetry = "1.5.2"
2727
# test-only; platform provides slf4j transitively at runtime. <233, 1.7.36; >=233, 2.0.9

plugins/toolkit/jetbrains-core/resources/META-INF/ext-java.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
</extensions>
4949
<actions>
5050
<group id="aws.toolkit.codemodernizer.toolbar">
51-
<action
52-
id="codemodernizer.toolbar.startmodernizer"
53-
class="software.aws.toolkits.jetbrains.services.codemodernizer.actions.CodeModernizerStartModernizerAction"/>
5451
<action
5552
id="codemodernizer.toolbar.stopmodernizer"
5653
class="software.aws.toolkits.jetbrains.services.codemodernizer.actions.CodeModernizerStopModernizerAction"/>

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
240240
// New projectDetails metric should always be fired whether the project was valid or invalid
241241
CodetransformTelemetry.projectDetails(
242242
codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
243-
result = if (!validationResult.valid) Result.Failed else Result.Unknown,
243+
result = if (!validationResult.valid) Result.Failed else Result.Succeeded,
244244
reason = if (!validationResult.valid) validationResult.invalidTelemetryReason.additonalInfo else null,
245245
codeTransformPreValidationError = validationResult.invalidTelemetryReason.category ?: CodeTransformPreValidationError.Unknown,
246246
codeTransformLocalJavaVersion = project.tryGetJdk().toString()
@@ -582,13 +582,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
582582
}
583583

584584
fun informUserOfCompletion(result: CodeModernizerJobCompletedResult) {
585-
CodetransformTelemetry.totalRunTime(
586-
codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
587-
codeTransformResultStatusMessage = result.toString(),
588-
codeTransformRunTimeLatency = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime(), Instant.now()),
589-
codeTransformLocalJavaVersion = getJavaVersionFromProjectSetting(project),
590-
codeTransformLocalMavenVersion = getMavenVersion(project),
591-
)
585+
var jobId: JobId? = null
592586
when (result) {
593587
is CodeModernizerJobCompletedResult.UnableToCreateJob -> notifyJobFailure(
594588
result.failureReason,
@@ -612,19 +606,25 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
612606
listOf(displayFeedbackNotificationAction())
613607
)
614608

615-
is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> notifyStickyInfo(
616-
message("codemodernizer.notification.info.modernize_partial_complete.title"),
617-
message("codemodernizer.notification.info.modernize_partial_complete.content", result.targetJavaVersion.description),
618-
project,
619-
listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()),
620-
)
609+
is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> {
610+
notifyStickyInfo(
611+
message("codemodernizer.notification.info.modernize_partial_complete.title"),
612+
message("codemodernizer.notification.info.modernize_partial_complete.content", result.targetJavaVersion.description),
613+
project,
614+
listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()),
615+
)
616+
jobId = result.jobId
617+
}
621618

622-
is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> notifyStickyInfo(
623-
message("codemodernizer.notification.info.modernize_complete.title"),
624-
message("codemodernizer.notification.info.modernize_complete.content"),
625-
project,
626-
listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId)),
627-
)
619+
is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> {
620+
notifyStickyInfo(
621+
message("codemodernizer.notification.info.modernize_complete.title"),
622+
message("codemodernizer.notification.info.modernize_complete.content"),
623+
project,
624+
listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId)),
625+
)
626+
jobId = result.jobId
627+
}
628628

629629
is CodeModernizerJobCompletedResult.ManagerDisposed -> LOG.warn { "Manager disposed" }
630630
is CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> LOG.warn { "Job was aborted" }
@@ -641,6 +641,14 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
641641
listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_PREREQUISITES), displayFeedbackNotificationAction()),
642642
)
643643
}
644+
CodetransformTelemetry.totalRunTime(
645+
codeTransformJobId = jobId?.toString(),
646+
codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
647+
codeTransformResultStatusMessage = result.toString(),
648+
codeTransformRunTimeLatency = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime(), Instant.now()),
649+
codeTransformLocalJavaVersion = getJavaVersionFromProjectSetting(project),
650+
codeTransformLocalMavenVersion = getMavenVersion(project),
651+
)
644652
}
645653

646654
fun createCodeModernizerSession(customerSelection: CustomerSelection, project: Project) = CodeModernizerSession(

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/actions/CodeModernizerStartModernizerAction.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

plugins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,9 @@ codemodernizer.customerselectiondialog.found_supported_jdk=We found Java version
536536
codemodernizer.customerselectiondialog.found_unsupported_jdk=We found an unsupported Java version ({0}).
537537
codemodernizer.customerselectiondialog.ok_button=Transform
538538
codemodernizer.customerselectiondialog.title=Transform your application
539-
codemodernizer.explorer.show_active_job_history=Code Transform show active job details
539+
codemodernizer.explorer.show_active_job_history=Show job details
540540
codemodernizer.explorer.show_active_job_history_description=View your Code Transform active job details in the ToolWindow
541-
codemodernizer.explorer.show_job_history=Show Code Transform job history
541+
codemodernizer.explorer.show_job_history=Show job history
542542
codemodernizer.explorer.show_job_history_description=View your code transform job history and job details
543543
codemodernizer.explorer.show_transformation_plan_title=View your code transformation plan
544544
codemodernizer.explorer.show_transformation_summary_title=View your code transformation summary

0 commit comments

Comments
 (0)