Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ class ControllerTestUtils {
defaultParameterValues: MutableMap<String, String>? = null,
description: String = "",
version: String = "",
runTemplateFilter: MutableList<String> = mutableListOf(),
defaultRunTemplateDataset: MutableMap<String, Any> = mutableMapOf(),
datasetCopy: Boolean? = null,
security: WorkspaceSecurity? = null,
additionalData: MutableMap<String, Any> = mutableMapOf(),
Expand All @@ -289,8 +287,6 @@ class ControllerTestUtils {
solution =
WorkspaceSolution(
solutionId = solutionId,
runTemplateFilter = runTemplateFilter,
defaultRunTemplateDataset = defaultRunTemplateDataset,
datasetId = datasetId,
defaultParameterValues = defaultParameterValues),
description = description,
Expand All @@ -309,8 +305,6 @@ class ControllerTestUtils {
datasetId: String? = null,
defaultParameterValues: MutableMap<String, String>? = null,
description: String = "",
runTemplateFilter: MutableList<String> = mutableListOf(),
defaultRunTemplateDataset: MutableMap<String, Any> = mutableMapOf(),
datasetCopy: Boolean? = null,
additionalData: MutableMap<String, Any> = mutableMapOf(),
tags: MutableList<String> = mutableListOf()
Expand All @@ -322,8 +316,6 @@ class ControllerTestUtils {
solution =
WorkspaceSolution(
solutionId = solutionId,
runTemplateFilter = runTemplateFilter,
defaultRunTemplateDataset = defaultRunTemplateDataset,
datasetId = datasetId,
defaultParameterValues = defaultParameterValues),
description = description,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ class WorkspaceControllerTests : ControllerTestBase() {
val description = "here_is_workspace_description"
val version = "1.0.0"
val datasetCopy = false
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
val tags = mutableListOf("tag1,tag2")
val defaultRunTemplateDataset =
mutableMapOf<String, Any>(
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
val additionalData =
mutableMapOf(
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
Expand Down Expand Up @@ -91,8 +87,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
"solution_parameter2" to "solution_parameter2_defaultValue"),
description,
version,
runTemplateFilter,
defaultRunTemplateDataset,
datasetCopy,
workspaceSecurity,
additionalData,
Expand All @@ -107,9 +101,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$.description").value(description))
.andExpect(jsonPath("$.version").value(version))
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
.andExpect(
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
.andExpect(jsonPath("$.solution.datasetId").value(workspaceDatasetId))
.andExpect(
jsonPath("$.solution.defaultParameterValues.solution_parameter1")
Expand Down Expand Up @@ -140,11 +131,7 @@ class WorkspaceControllerTests : ControllerTestBase() {

val description = "here_is_workspace_description"
val datasetCopy = false
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
val tags = mutableListOf("tag1,tag2")
val defaultRunTemplateDataset =
mutableMapOf<String, Any>(
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
val additionalData =
mutableMapOf(
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
Expand All @@ -164,8 +151,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
"solution_parameter1" to "solution_parameter1_defaultValue",
"solution_parameter2" to "solution_parameter2_defaultValue"),
description,
runTemplateFilter,
defaultRunTemplateDataset,
datasetCopy,
additionalData,
tags))
Expand All @@ -178,9 +163,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$.description").value(description))
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
.andExpect(
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
.andExpect(jsonPath("$.solution.datasetId").value(workspaceDatasetId))
.andExpect(
jsonPath("$.solution.defaultParameterValues.solution_parameter1")
Expand Down Expand Up @@ -266,11 +248,7 @@ class WorkspaceControllerTests : ControllerTestBase() {
val description = "here_is_workspace_description"
val version = "1.0.0"
val datasetCopy = false
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
val tags = mutableListOf("tag1,tag2")
val defaultRunTemplateDataset =
mutableMapOf<String, Any>(
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
val additionalData =
mutableMapOf(
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
Expand All @@ -297,8 +275,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
"solution_parameter2" to "solution_parameter2_defaultValue"),
description,
version,
runTemplateFilter,
defaultRunTemplateDataset,
datasetCopy,
workspaceSecurity,
additionalData,
Expand All @@ -314,9 +290,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$.version").value(version))
.andExpect(jsonPath("$.description").value(description))
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
.andExpect(
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
.andExpect(jsonPath("$.datasetCopy").value(datasetCopy))
.andExpect(jsonPath("$.tags").value(tags))
.andExpect(jsonPath("$.additionalData").value(additionalData))
Expand Down
2 changes: 0 additions & 2 deletions doc/Models/WorkspaceSolution.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
| **solutionId** | **String** | The Solution Id attached to this workspace | [default to null] |
| **datasetId** | **String** | The Dataset Id attached to this workspace. This dataset will be used to store default values for Solution parameters with file&#39;s varType. | [optional] [default to null] |
| **defaultParameterValues** | **Map** | A map of parameterId/value to set default values for Solution parameters with simple varType (int, string, ...) | [optional] [default to null] |
| **runTemplateFilter** | **List** | The list of Solution Run Template Id to filter | [optional] [default to null] |
| **defaultRunTemplateDataset** | [**Map**](AnyType.md) | A map of RunTemplateId/DatasetId to set a default dataset for a Run Template | [optional] [default to null] |

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

2 changes: 0 additions & 2 deletions openapi/plantuml/schemas.plantuml
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,6 @@ entity WorkspaceSolution {
* solutionId: String
datasetId: String
defaultParameterValues: Map
runTemplateFilter: List<String>
defaultRunTemplateDataset: Map
}

entity WorkspaceUpdateRequest {
Expand Down
29 changes: 0 additions & 29 deletions workspace/src/main/openapi/workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -929,15 +929,6 @@ components:
description: A map of parameterId/value to set default values for Solution parameters with simple varType (int, string, ...)
additionalProperties:
type: string
runTemplateFilter:
type: array
description: The list of Solution Run Template Id to filter
items:
type: string
defaultRunTemplateDataset:
type: object
description: A map of RunTemplateId/DatasetId to set a default dataset for a Run Template
additionalProperties: true
required:
- solutionId

Expand Down Expand Up @@ -988,10 +979,6 @@ components:
- Brewery
solution:
solutionId: "sol-feo16eua48o"
runTemplateFilter:
- "run1"
defaultRunTemplateDataset:
run1: "data1"
datasetCopy: true
createInfo:
timestamp: 123456789
Expand All @@ -1016,10 +1003,6 @@ components:
- Brewery
solution:
solutionId: "sol-feo16eua48o"
runTemplateFilter:
- "run1"
defaultRunTemplateDataset:
run1: "data1"
security:
default: "viewer"
accessControlList:
Expand All @@ -1037,10 +1020,6 @@ components:
- Brewery
solution:
solutionId: "sol-feo16eua48o"
runTemplateFilter:
- "run1"
defaultRunTemplateDataset:
run1: "data1"
datasetCopy: true
createInfo:
timestamp: 123456789
Expand All @@ -1061,10 +1040,6 @@ components:
- Brewery
solution:
solutionId: "sol-ojd96oz14pz"
runTemplateFilter:
- "runA"
defaultRunTemplateDataset:
runA: "data1"
datasetCopy: true
createInfo:
timestamp: 123456789
Expand Down Expand Up @@ -1094,10 +1069,6 @@ components:
- Brewery
solution:
solutionId: "sol-feo16eua48o"
runTemplateFilter:
- "run1"
defaultRunTemplateDataset:
run1: "data1"
datasetCopy: true
createInfo:
timestamp: 123456789
Expand Down