azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: fix FUS collector for wizard

Browse Source
This commit is contained in:
Ilya Kirillov
2020-04-08 16:21:49 +03:00
parent e395844567
commit 7ad7d28d97
7 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt
+2 -2
View File
@@ -104,8 +104,8 @@ class NewProjectWizardModuleBuilder : EmptyModuleBuilder() {
}.isSuccess
if (success) {
val projectCreationStats = ProjectCreationStats(
wizard.projectTemplate!!.title,
wizard.buildSystemType!!.text
wizard.projectTemplate!!.id,
wizard.buildSystemType!!.id
)
WizardStatsService.logDataOnProjectGenerated(
projectCreationStats,
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt
+4 -5
View File
@@ -1,8 +1,6 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.secondStep
import com.intellij.ui.components.JBLabel
import com.intellij.ui.components.JBTextField
import com.intellij.ui.layout.panel
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.projectWizard.UiEditorUsageStats
@@ -24,14 +22,13 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardUIB
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.*
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.components.DropDownComponent
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.components.TextFieldComponent
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.label
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.TitledComponentsList
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.createSettingComponent
import javax.swing.JComponent
class ModuleSettingsComponent(
private val context: Context,
uiEditorUsagesStats: UiEditorUsageStats
private val uiEditorUsagesStats: UiEditorUsageStats
) : DynamicComponent(context) {
private val settingsList = TitledComponentsList(emptyList(), context).asSubComponent()
private val moduleDependenciesComponent = ModuleDependenciesComponent(context)
@@ -64,7 +61,7 @@ class ModuleSettingsComponent(
private fun createTemplatesListComponentForModule(module: Module) =
read { availableTemplatesFor(module) }.takeIf { it.isNotEmpty() }?.let { templates ->
ModuleTemplateComponent(context, module, templates) {
ModuleTemplateComponent(context, module, templates, uiEditorUsagesStats) {
updateModule(module)
component.updateUI()
}
@@ -114,6 +111,7 @@ private class ModuleTemplateComponent(
context: Context,
private val module: Module,
templates: List<Template>,
uiEditorUsagesStats: UiEditorUsageStats,
onTemplateChanged: () -> Unit
) : TitledComponent(context) {
@OptIn(ExperimentalStdlibApi::class)
@@ -127,6 +125,7 @@ private class ModuleTemplateComponent(
labelText = null,
) { value ->
module.template = value.takeIf { it != NoneTemplate }
uiEditorUsagesStats.moduleTemplateChanged++
changeTemplateDescription(module.template)
onTemplateChanged()
}.asSubComponent()
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/TargetsModel.kt
+2 -2
View File
@@ -63,7 +63,7 @@ class TargetsModel(
}
fun add(module: Module) {
uiEditorUsagesStats?.modulesCreated?.inc()
uiEditorUsagesStats?.let { it.modulesCreated++ }
addToTheTree(module, modifyValue = true, parent = tree.selectedNode ?: root)
context.writeSettings {
module.apply { initDefaultValuesForSettings() }
@@ -80,7 +80,7 @@ class TargetsModel(
fun removeSelected() {
val selectedNode = tree.selectedNode?.takeIf { it.userObject is Module } ?: return
uiEditorUsagesStats?.modulesRemoved?.inc()
uiEditorUsagesStats?.let { it.modulesRemoved++ }
when (val parent = selectedNode.parent.safeAs<DefaultMutableTreeNode>()?.userObject) {
ModulesEditorTree.PROJECT_USER_OBJECT -> {
val index = selectedNode.parent.getIndex(selectedNode)
idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
-4
View File
@@ -35,10 +35,6 @@ object ExperimentalFeatures {
val platformVersion = PlatformVersion.getCurrent() ?: return true
return platformVersion.platform != PlatformVersion.Platform.ANDROID_STUDIO
}
override fun onFeatureStatusChanged(enabled: Boolean) {
WizardStatsService.logWizardStatusChanged(isEnabled = enabled)
}
}
val allFeatures: List<ExperimentalFeature> = listOf(
idea/src/org/jetbrains/kotlin/idea/projectWizard/WizardStatsService.kt
+10 -18
View File
@@ -14,38 +14,35 @@ interface WizardStats {
}
data class ProjectCreationStats(
val projectTemplateName: String,
val projectTemplateId: String,
val buildSystemType: String
) : WizardStats {
override fun toMap(): Map<String, String> = mapOf(
::projectTemplateName.name to projectTemplateName,
::buildSystemType.name to buildSystemType
"project_template" to projectTemplateId,
"build_system" to buildSystemType
)
}
data class UiEditorUsageStats(
var modulesCreated: Int = 0,
var modulesRemoved: Int = 0,
var moduleTemplatesRemoved: Int = 0,
var moduleTemplatesSet: Int = 0
var moduleTemplateChanged: Int = 0
) : WizardStats {
override fun toMap(): Map<String, String> = mapOf(
::modulesCreated.name to modulesCreated.toString(),
::modulesRemoved.name to modulesRemoved.toString(),
::moduleTemplatesRemoved.name to moduleTemplatesRemoved.toString(),
::moduleTemplatesSet.name to moduleTemplatesSet.toString()
"modules_created" to modulesCreated.toString(),
"modules_removed" to modulesRemoved.toString(),
"module_template_changed" to moduleTemplateChanged.toString()
)
}
private enum class WizardStatsEvent(@NonNls val text: String) {
PROJECT_OPEN_BY_HYPERLINK("Wizard opened by hyperlink"),
PROJECT_CREATED("Project Created"),
WIZARD_STATE_CHANGE("New Wizard enabled or disable")
PROJECT_OPEN_BY_HYPERLINK("wizard_opened_by_hyperlink"),
PROJECT_CREATED("project_created")
}
object WizardStatsService {
fun logWizardOpenByHyperlink(templateId: String?) {
val data = mapOf("templateId" to (templateId ?: "None"))
val data = mapOf("template_id" to (templateId ?: "none"))
log(WizardStatsEvent.PROJECT_OPEN_BY_HYPERLINK, data)
}
@@ -54,11 +51,6 @@ object WizardStatsService {
log(WizardStatsEvent.PROJECT_CREATED, data)
}
fun logWizardStatusChanged(isEnabled: Boolean) {
val data = mapOf("enabled" to isEnabled.toString())
log(WizardStatsEvent.WIZARD_STATE_CHANGE, data)
}
private fun log(event: WizardStatsEvent, data: Map<String, String>) {
KotlinFUSLogger.log(FUSEventGroups.NewWizard, event.text, data)
}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/BuildSystemPlugin.kt
+21 -7
View File
@@ -122,14 +122,28 @@ data class BuildFileData(
@NonNls val buildFileName: String
)
enum class BuildSystemType(@Nls override val text: String, val fullText: String = text) : DisplayableSettingItem {
GradleKotlinDsl(KotlinNewProjectWizardBundle.message("buildsystem.type.gradle.kotlin")),
GradleGroovyDsl(KotlinNewProjectWizardBundle.message("buildsystem.type.gradle.groovy")),
Jps(
KotlinNewProjectWizardBundle.message("buildsystem.type.intellij"),
KotlinNewProjectWizardBundle.message("buildsystem.type.intellij.full")
enum class BuildSystemType(
@Nls override val text: String,
@NonNls val id: String, // used for FUS, should never be changed
val fullText: String = text
) : DisplayableSettingItem {
GradleKotlinDsl(
text = KotlinNewProjectWizardBundle.message("buildsystem.type.gradle.kotlin"),
id = "gradleKotlin"
),
Maven(KotlinNewProjectWizardBundle.message("buildsystem.type.maven"))
GradleGroovyDsl(
text = KotlinNewProjectWizardBundle.message("buildsystem.type.gradle.groovy"),
id = "gradleGroovy"
),
Jps(
text = KotlinNewProjectWizardBundle.message("buildsystem.type.intellij"),
id = "jps",
fullText = KotlinNewProjectWizardBundle.message("buildsystem.type.intellij.full")
),
Maven(
text = KotlinNewProjectWizardBundle.message("buildsystem.type.maven"),
id = "maven"
)
;
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt
+10 -2
View File
@@ -19,8 +19,7 @@ sealed class ProjectTemplate : DisplayableSettingItem {
abstract val description: String
abstract val suggestedProjectName: String
abstract val projectKind: ProjectKind
open val id: String
get() = this::class.simpleName.toString().removeSuffix("Template").removeSuffix("Project")
abstract val id: String
private val setsDefaultValues: List<SettingWithValue<*, *>>
get() = listOf(KotlinPlugin::projectKind.reference withValue projectKind)
@@ -137,6 +136,7 @@ private fun ModuleType.createDefaultTarget(
object BackendApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.empty.singleplatform.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.empty.singleplatform.description")
override val id = "backendApplication"
@NonNls
override val suggestedProjectName = "myKotlinJvmProject"
@@ -153,6 +153,7 @@ object BackendApplicationProjectTemplate : ProjectTemplate() {
object MultiplatformApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.empty.mpp.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.empty.mpp.description")
override val id = "multiplatformApplication"
@NonNls
override val suggestedProjectName = "myKotlinMultiplatformProject"
@@ -169,6 +170,7 @@ object MultiplatformApplicationProjectTemplate : ProjectTemplate() {
object ConsoleApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.empty.jvm.console.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.empty.jvm.console.description")
override val id = "consoleApplication"
@NonNls
override val suggestedProjectName = "myConsoleApplication"
@@ -190,6 +192,7 @@ object ConsoleApplicationProjectTemplate : ProjectTemplate() {
object MultiplatformLibraryProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.lib.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.lib.description")
override val id = "multiplatformLibrary"
@NonNls
override val suggestedProjectName = "myMultiplatformLibrary"
@@ -216,6 +219,7 @@ object MultiplatformLibraryProjectTemplate : ProjectTemplate() {
object FullStackWebApplicationProjectTemplate : ProjectTemplate() {
override val title: String = KotlinNewProjectWizardBundle.message("project.template.full.stack.title")
override val description: String = KotlinNewProjectWizardBundle.message("project.template.full.stack.description")
override val id = "fullStackWebApplication"
@NonNls
override val suggestedProjectName: String = "myFullStackApplication"
@@ -242,6 +246,7 @@ object FullStackWebApplicationProjectTemplate : ProjectTemplate() {
object NativeApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.native.console.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.native.console.description")
override val id = "nativeApplication"
@NonNls
override val suggestedProjectName = "myNativeConsoleApp"
@@ -268,6 +273,7 @@ object NativeApplicationProjectTemplate : ProjectTemplate() {
object FrontendApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.frontend.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.frontend.description")
override val id = "frontendApplication"
@NonNls
override val suggestedProjectName = "myKotlinJsApplication"
@@ -292,6 +298,7 @@ object FrontendApplicationProjectTemplate : ProjectTemplate() {
object MultiplatformMobileApplicationProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.description")
override val id = "multiplatformMobileApplication"
@NonNls
override val suggestedProjectName = "myIOSApplication"
@@ -343,6 +350,7 @@ object MultiplatformMobileApplicationProjectTemplate : ProjectTemplate() {
object MultiplatformMobileLibraryProjectTemplate : ProjectTemplate() {
override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.lib.title")
override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.lib.description")
override val id = "multiplatformMobileLibrary"
@NonNls
override val suggestedProjectName = "myMppMobileLibrary"