Skip to content

Commit 131c433

Browse files
jreynard-codejreynard-code
committed
Remove runTemplateFilter and defaultRunTemplateDataset from WorkspaceSolution
- Deleted unused fields from the `WorkspaceSolution` schema in OpenAPI spec, related documentation, and integration tests.
1 parent df228f6 commit 131c433

File tree

5 files changed

+0
-68
lines changed

5 files changed

+0
-68
lines changed

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,6 @@ class ControllerTestUtils {
276276
defaultParameterValues: MutableMap<String, String>? = null,
277277
description: String = "",
278278
version: String = "",
279-
runTemplateFilter: MutableList<String> = mutableListOf(),
280-
defaultRunTemplateDataset: MutableMap<String, Any> = mutableMapOf(),
281279
datasetCopy: Boolean? = null,
282280
security: WorkspaceSecurity? = null,
283281
additionalData: MutableMap<String, Any> = mutableMapOf(),
@@ -289,8 +287,6 @@ class ControllerTestUtils {
289287
solution =
290288
WorkspaceSolution(
291289
solutionId = solutionId,
292-
runTemplateFilter = runTemplateFilter,
293-
defaultRunTemplateDataset = defaultRunTemplateDataset,
294290
datasetId = datasetId,
295291
defaultParameterValues = defaultParameterValues),
296292
description = description,
@@ -309,8 +305,6 @@ class ControllerTestUtils {
309305
datasetId: String? = null,
310306
defaultParameterValues: MutableMap<String, String>? = null,
311307
description: String = "",
312-
runTemplateFilter: MutableList<String> = mutableListOf(),
313-
defaultRunTemplateDataset: MutableMap<String, Any> = mutableMapOf(),
314308
datasetCopy: Boolean? = null,
315309
additionalData: MutableMap<String, Any> = mutableMapOf(),
316310
tags: MutableList<String> = mutableListOf()
@@ -322,8 +316,6 @@ class ControllerTestUtils {
322316
solution =
323317
WorkspaceSolution(
324318
solutionId = solutionId,
325-
runTemplateFilter = runTemplateFilter,
326-
defaultRunTemplateDataset = defaultRunTemplateDataset,
327319
datasetId = datasetId,
328320
defaultParameterValues = defaultParameterValues),
329321
description = description,

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/workspace/WorkspaceControllerTests.kt‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ class WorkspaceControllerTests : ControllerTestBase() {
5959
val description = "here_is_workspace_description"
6060
val version = "1.0.0"
6161
val datasetCopy = false
62-
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
6362
val tags = mutableListOf("tag1,tag2")
64-
val defaultRunTemplateDataset =
65-
mutableMapOf<String, Any>(
66-
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
6763
val additionalData =
6864
mutableMapOf(
6965
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
@@ -91,8 +87,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
9187
"solution_parameter2" to "solution_parameter2_defaultValue"),
9288
description,
9389
version,
94-
runTemplateFilter,
95-
defaultRunTemplateDataset,
9690
datasetCopy,
9791
workspaceSecurity,
9892
additionalData,
@@ -107,9 +101,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
107101
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
108102
.andExpect(jsonPath("$.description").value(description))
109103
.andExpect(jsonPath("$.version").value(version))
110-
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
111-
.andExpect(
112-
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
113104
.andExpect(jsonPath("$.solution.datasetId").value(workspaceDatasetId))
114105
.andExpect(
115106
jsonPath("$.solution.defaultParameterValues.solution_parameter1")
@@ -140,11 +131,7 @@ class WorkspaceControllerTests : ControllerTestBase() {
140131

141132
val description = "here_is_workspace_description"
142133
val datasetCopy = false
143-
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
144134
val tags = mutableListOf("tag1,tag2")
145-
val defaultRunTemplateDataset =
146-
mutableMapOf<String, Any>(
147-
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
148135
val additionalData =
149136
mutableMapOf(
150137
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
@@ -164,8 +151,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
164151
"solution_parameter1" to "solution_parameter1_defaultValue",
165152
"solution_parameter2" to "solution_parameter2_defaultValue"),
166153
description,
167-
runTemplateFilter,
168-
defaultRunTemplateDataset,
169154
datasetCopy,
170155
additionalData,
171156
tags))
@@ -178,9 +163,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
178163
.andExpect(jsonPath("$.createInfo.userId").value(PLATFORM_ADMIN_EMAIL))
179164
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
180165
.andExpect(jsonPath("$.description").value(description))
181-
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
182-
.andExpect(
183-
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
184166
.andExpect(jsonPath("$.solution.datasetId").value(workspaceDatasetId))
185167
.andExpect(
186168
jsonPath("$.solution.defaultParameterValues.solution_parameter1")
@@ -266,11 +248,7 @@ class WorkspaceControllerTests : ControllerTestBase() {
266248
val description = "here_is_workspace_description"
267249
val version = "1.0.0"
268250
val datasetCopy = false
269-
val runTemplateFilter = mutableListOf("runtemplateId1,runtemplateId2")
270251
val tags = mutableListOf("tag1,tag2")
271-
val defaultRunTemplateDataset =
272-
mutableMapOf<String, Any>(
273-
"runtemplateId1" to "datasetId1", "runtemplateId2" to "datasetId2")
274252
val additionalData =
275253
mutableMapOf(
276254
"you_can_put" to "whatever_you_want_here", "even" to mapOf("object" to "if_you_want"))
@@ -297,8 +275,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
297275
"solution_parameter2" to "solution_parameter2_defaultValue"),
298276
description,
299277
version,
300-
runTemplateFilter,
301-
defaultRunTemplateDataset,
302278
datasetCopy,
303279
workspaceSecurity,
304280
additionalData,
@@ -314,9 +290,6 @@ class WorkspaceControllerTests : ControllerTestBase() {
314290
.andExpect(jsonPath("$.updateInfo.userId").value(PLATFORM_ADMIN_EMAIL))
315291
.andExpect(jsonPath("$.version").value(version))
316292
.andExpect(jsonPath("$.description").value(description))
317-
.andExpect(jsonPath("$.solution.runTemplateFilter").value(runTemplateFilter))
318-
.andExpect(
319-
jsonPath("$.solution.defaultRunTemplateDataset").value(defaultRunTemplateDataset))
320293
.andExpect(jsonPath("$.datasetCopy").value(datasetCopy))
321294
.andExpect(jsonPath("$.tags").value(tags))
322295
.andExpect(jsonPath("$.additionalData").value(additionalData))

‎doc/Models/WorkspaceSolution.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
| **solutionId** | **String** | The Solution Id attached to this workspace | [default to null] |
77
| **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] |
88
| **defaultParameterValues** | **Map** | A map of parameterId/value to set default values for Solution parameters with simple varType (int, string, ...) | [optional] [default to null] |
9-
| **runTemplateFilter** | **List** | The list of Solution Run Template Id to filter | [optional] [default to null] |
10-
| **defaultRunTemplateDataset** | [**Map**](AnyType.md) | A map of RunTemplateId/DatasetId to set a default dataset for a Run Template | [optional] [default to null] |
119

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

‎openapi/plantuml/schemas.plantuml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,6 @@ entity WorkspaceSolution {
580580
* solutionId: String
581581
datasetId: String
582582
defaultParameterValues: Map
583-
runTemplateFilter: List<String>
584-
defaultRunTemplateDataset: Map
585583
}
586584

587585
entity WorkspaceUpdateRequest {

‎workspace/src/main/openapi/workspace.yaml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -929,15 +929,6 @@ components:
929929
description: A map of parameterId/value to set default values for Solution parameters with simple varType (int, string, ...)
930930
additionalProperties:
931931
type: string
932-
runTemplateFilter:
933-
type: array
934-
description: The list of Solution Run Template Id to filter
935-
items:
936-
type: string
937-
defaultRunTemplateDataset:
938-
type: object
939-
description: A map of RunTemplateId/DatasetId to set a default dataset for a Run Template
940-
additionalProperties: true
941932
required:
942933
- solutionId
943934

@@ -988,10 +979,6 @@ components:
988979
- Brewery
989980
solution:
990981
solutionId: "sol-feo16eua48o"
991-
runTemplateFilter:
992-
- "run1"
993-
defaultRunTemplateDataset:
994-
run1: "data1"
995982
datasetCopy: true
996983
createInfo:
997984
timestamp: 123456789
@@ -1016,10 +1003,6 @@ components:
10161003
- Brewery
10171004
solution:
10181005
solutionId: "sol-feo16eua48o"
1019-
runTemplateFilter:
1020-
- "run1"
1021-
defaultRunTemplateDataset:
1022-
run1: "data1"
10231006
security:
10241007
default: "viewer"
10251008
accessControlList:
@@ -1037,10 +1020,6 @@ components:
10371020
- Brewery
10381021
solution:
10391022
solutionId: "sol-feo16eua48o"
1040-
runTemplateFilter:
1041-
- "run1"
1042-
defaultRunTemplateDataset:
1043-
run1: "data1"
10441023
datasetCopy: true
10451024
createInfo:
10461025
timestamp: 123456789
@@ -1061,10 +1040,6 @@ components:
10611040
- Brewery
10621041
solution:
10631042
solutionId: "sol-ojd96oz14pz"
1064-
runTemplateFilter:
1065-
- "runA"
1066-
defaultRunTemplateDataset:
1067-
runA: "data1"
10681043
datasetCopy: true
10691044
createInfo:
10701045
timestamp: 123456789
@@ -1094,10 +1069,6 @@ components:
10941069
- Brewery
10951070
solution:
10961071
solutionId: "sol-feo16eua48o"
1097-
runTemplateFilter:
1098-
- "run1"
1099-
defaultRunTemplateDataset:
1100-
run1: "data1"
11011072
datasetCopy: true
11021073
createInfo:
11031074
timestamp: 123456789

0 commit comments

Comments
 (0)