Skip to content

Commit 06342c8

Browse files
manodnyabkiiadi
andauthored
Schema is not applied for read-only view of the resource (#2880)
* initial changes * initial changes Co-authored-by: Kyle Thomson <[email protected]>
1 parent a4473b5 commit 06342c8

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourceFileActionProvider.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.intellij.openapi.util.Key
1111
import com.intellij.openapi.vfs.VirtualFile
1212
import com.intellij.ui.EditorNotificationPanel
1313
import com.intellij.ui.EditorNotifications
14+
import com.jetbrains.jsonSchema.ide.JsonSchemaService
1415
import software.aws.toolkits.jetbrains.core.experiments.isEnabled
1516
import software.aws.toolkits.resources.message
1617

@@ -28,21 +29,21 @@ class DynamicResourceFileActionProvider :
2829
file,
2930
message("dynamic_resources.create_resource_instruction"),
3031
"dynamic.resource.editor.submitResourceCreationRequest"
31-
)
32+
).also { DynamicResourceSchemaMapping.getInstance().addResourceSchemaMapping(project, file) }
3233
is ViewEditableDynamicResourceVirtualFile ->
3334
when (file.isWritable) {
3435
true -> DynamicResourceVirtualFilePanel(
3536
project,
3637
file,
3738
message("dynamic_resources.update_resource_instruction"),
3839
"dynamic.resource.editor.submitResourceUpdateRequest"
39-
)
40+
).also { DynamicResourceSchemaMapping.getInstance().addResourceSchemaMapping(project, file) }
4041
false -> DynamicResourceVirtualFilePanel(
4142
project,
4243
file,
4344
message("dynamic_resources.edit_resource_instruction"),
4445
"dynamic.resource.editor.enableEditingResource"
45-
)
46+
).also { JsonSchemaService.Impl.get(project).reset() }
4647
}
4748
else -> null
4849
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/ResourceSchemaProviderFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ResourceSchemaProviderFactory : JsonSchemaProviderFactory {
1717
DynamicResourceSchemaMapping.getInstance().getCurrentlyActiveResourceTypes().forEach {
1818
val schemaFile = object : JsonSchemaFileProvider {
1919
override fun isAvailable(file: VirtualFile): Boolean =
20-
file is DynamicResourceVirtualFile && file.dynamicResourceType == it
20+
file is DynamicResourceVirtualFile && file.dynamicResourceType == it && file.isWritable
2121

2222
override fun getName(): String = "$it schema"
2323

jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceServiceNode.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import software.aws.toolkits.jetbrains.core.getResourceNow
1818
import software.aws.toolkits.jetbrains.services.dynamic.CloudControlApiResources
1919
import software.aws.toolkits.jetbrains.services.dynamic.DynamicResource
2020
import software.aws.toolkits.jetbrains.services.dynamic.DynamicResourceIdentifier
21-
import software.aws.toolkits.jetbrains.services.dynamic.DynamicResourceSchemaMapping
2221
import software.aws.toolkits.jetbrains.services.dynamic.DynamicResourceUpdateManager
2322
import software.aws.toolkits.jetbrains.services.dynamic.DynamicResourceUpdateManager.Companion.isTerminal
2423
import software.aws.toolkits.jetbrains.services.dynamic.OpenViewEditableDynamicResourceVirtualFile
@@ -97,7 +96,6 @@ class DynamicResourceNode(project: Project, val resource: DynamicResource) :
9796
dynamicResourceIdentifier,
9897
model
9998
)
100-
DynamicResourceSchemaMapping.getInstance().addResourceSchemaMapping(nodeProject, file)
10199

102100
indicator.text = message("dynamic_resources.fetch.open")
103101
OpenViewEditableDynamicResourceVirtualFile.openFile(nodeProject, file, sourceAction, resource.type.fullName)

0 commit comments

Comments
 (0)