| @(varInfo.label) |
@(varInfo.valueType.self.label.getOrElse("")) |
@@ -402,7 +402,7 @@ Technical information
}
@instrumentDeploymentsPresent = @{
- varMetas.exists(_.exists(_.instrumentDeployments.isDefined))
+ varMetas.exists(_.instrumentDeployments.isDefined)
}
@moratoriumText = @{
diff --git a/src/test/scala/se/lu/nateko/cp/meta/upload/L3UpdateWorkbench.scala b/src/test/scala/se/lu/nateko/cp/meta/upload/L3UpdateWorkbench.scala
index 852aef671..6e80638c2 100644
--- a/src/test/scala/se/lu/nateko/cp/meta/upload/L3UpdateWorkbench.scala
+++ b/src/test/scala/se/lu/nateko/cp/meta/upload/L3UpdateWorkbench.scala
@@ -33,7 +33,7 @@ object L3UpdateWorkbench extends CpmetaJsonProtocol{
val l3 = dto.specificInfo.left.getOrElse(???)
val l3updated = l3.copy(
spatial = new URI("http://meta.icos-cp.eu/resources/latlonboxes/globalLatLonBox"),
- variables = Some(Seq("emission")),
+ variables = Seq("emission"),
)
dto.copy(
submitterId = "CP",
diff --git a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/Backend.scala b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/Backend.scala
index 523de560f..0742c2506 100644
--- a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/Backend.scala
+++ b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/Backend.scala
@@ -96,18 +96,18 @@ object Backend {
sparqlSelect(datasetVariableQuery(dataset)).map(_.map(toDatasetVar))
def tryIngestion(
- file: File, spec: ObjSpec, nRows: Option[Int], varnames: Option[Seq[String]]
+ file: File, spec: ObjSpec, nRows: Option[Int], varnames: Seq[String]
)(implicit envriConfig: EnvriConfig): Future[Unit] = {
- val hasVars: Boolean = varnames.flatMap(_.headOption).isDefined
+ val hasVars = varnames.nonEmpty
if (spec.dataset.isDefined && (spec.isStationTimeSer || hasVars)) || spec.isZip || spec.isNetCDF then
val nRowsQ = nRows.fold("")(nr => s"&nRows=$nr")
- val varsQ = varnames.fold(""){vns =>
- val varsJson = encodeURIComponent(Json.toJson(vns).toString)
+ val varsQ = if (varnames.nonEmpty) {
+ val varsJson = encodeURIComponent(Json.toJson(varnames).toString)
s"&varnames=$varsJson"
- }
+ } else { "" }
val url = s"https://${envriConfig.dataHost}/tryingest?specUri=${spec.uri}$nRowsQ$varsQ"
fetchOk("validate data object", url, new RequestInit{
diff --git a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/formcomponents/L3VarInfoForm.scala b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/formcomponents/L3VarInfoForm.scala
index f5a2a0626..5ef1f214d 100644
--- a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/formcomponents/L3VarInfoForm.scala
+++ b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/formcomponents/L3VarInfoForm.scala
@@ -10,19 +10,17 @@ class L3VarInfoForm(elemId: String, notifyUpdate: () => Unit) {
var list: IndexedSeq[DatasetVar] = IndexedSeq.empty
- def values: Try[Option[Seq[DatasetVar]]] = if(elems.isEmpty) Success(None) else Try{
- Some(elems.map(_.varInfo.get).toIndexedSeq)
+ def values: Try[Seq[DatasetVar]] = if(elems.isEmpty) Success(Nil) else Try{
+ elems.map(_.varInfo.get).toIndexedSeq
}
- def setValues(vars: Option[Seq[DatasetVar]]): Unit = {
+ def setValues(vars: Seq[DatasetVar]): Unit = {
elems.foreach(_.remove())
elems.clear()
- vars.foreach{vdtos =>
- vdtos.foreach{vdto =>
- val input = new L3VarInfoInput
- input.setValue(vdto)
- elems.append(input)
- }
+ vars.foreach{vdto =>
+ val input = new L3VarInfoInput
+ input.setValue(vdto)
+ elems.append(input)
}
}
diff --git a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/SpatioTemporalPanel.scala b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/SpatioTemporalPanel.scala
index 147de154b..25eb6787b 100644
--- a/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/SpatioTemporalPanel.scala
+++ b/uploadgui/src/main/scala/se/lu/nateko/cp/meta/upload/subforms/SpatioTemporalPanel.scala
@@ -38,10 +38,10 @@ class SpatioTemporalPanel(covs: IndexedSeq[SpatialCoverage])(implicit bus: PubSu
samplingHeight = height,
production = prod,
customLandingPage = customLanding,
- variables = varInfo.map(_.map(_.uri.toString.split('/').last))
+ variables = varInfo.map(_.uri.toString.split('/').last)
)
- def varnames: Try[Option[Seq[String]]] = varInfoForm.values.map(_.map(_.map(_.title)))
+ def varnames: Try[Seq[String]] = varInfoForm.values.map(_.map(_.title))
private val titleInput = new TextInput("l3title", notifyUpdate, "elaborated product title")
private val descriptionInput = new DescriptionInput("l3descr", notifyUpdate)
@@ -55,14 +55,14 @@ class SpatioTemporalPanel(covs: IndexedSeq[SpatialCoverage])(implicit bus: PubSu
private val varInfoForm = new L3VarInfoForm("l3varinfo-form", notifyUpdate)
private val externalPageInput = new UriOptInput("l3landingpage", notifyUpdate)
private var datasetSpec: Option[URI] = None
- private var selsectedVars: Option[Seq[String]] = None
+ private var selsectedVars: Seq[String] = Nil
def resetForm(): Unit = {
Iterable(
titleInput, descriptionInput, timeStartInput, timeStopInput,
temporalResInput, externalPageInput
).foreach(_.reset())
- varInfoForm.setValues(None)
+ varInfoForm.setValues(Nil)
spatialCovSelect.resetForm()
}
@@ -76,9 +76,8 @@ class SpatioTemporalPanel(covs: IndexedSeq[SpatialCoverage])(implicit bus: PubSu
case GotStationsList(stations) => stationSelect.setOptions(stations)
case GotVariableList(variables) =>
varInfoForm.list = variables
- selsectedVars.map { variables =>
- varInfoForm.setValues(Some(variables.flatMap(uri => varInfoForm.list.find(_.uri.toString.split('/').last == uri))))
- }
+ varInfoForm.setValues(selsectedVars.flatMap(uri =>
+ varInfoForm.list.find(_.uri.toString.split('/').last == uri)))
}
@@ -98,14 +97,19 @@ class SpatioTemporalPanel(covs: IndexedSeq[SpatialCoverage])(implicit bus: PubSu
samplingHeightInput.value = spatTemp.samplingHeight
externalPageInput.value = spatTemp.customLandingPage
selsectedVars = spatTemp.variables
- spatTemp.variables.map { varUris =>
- datasetSpec.map { dataset =>
- whenDone(getVariables(dataset)) { variables =>
- varInfoForm.list = variables
- varInfoForm.setValues(Some(varUris.flatMap(uri => varInfoForm.list.find(_.uri.toString.split('/').last == uri))))
+ if (selsectedVars.nonEmpty) {
+ datasetSpec match {
+ case None => ()
+ case Some(dataset) => {
+ whenDone(getVariables(dataset)) { variables =>
+ varInfoForm.list = variables
+ varInfoForm.setValues(selsectedVars.flatMap(uri =>
+ varInfoForm.list.find(_.uri.toString.split('/').last == uri)
+ ))
+ }
+ }
}
}
- }
spatialCovSelect.handleReceivedSpatialCoverage(Some(spatTemp.spatial))
show()
case _ =>