Skip to content

1.17.x #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minettiandrea merged 2 commits into from
Oct 30, 2026
Merged

1.17.x #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79abd8b
Fixed popup saving
minettiandrea Oct 30, 2026
46fe3e5
Sort columns
minettiandrea Oct 30, 2026
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
11 changes: 9 additions & 2 deletions client/src/main/scala/ch/wsl/box/client/services/Navigate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import io.udash.{State, Url}
import org.scalajs.dom.{BeforeUnloadEvent, window}
import scribe.Logging

import scala.concurrent.Future


object Navigate extends Logging {
private var enabled:Boolean = true
Expand All @@ -29,7 +31,7 @@ object Navigate extends Logging {
}
}

def toUrl(url:String, target:Target = Self):Unit = {
def toUrl(url:String, target:Target = Self):Future[Boolean] = {

logger.debug(s"navigate to $url")

Expand All @@ -44,8 +46,12 @@ object Navigate extends Logging {
} else {
Context.applicationInstance.goTo(state)
}

}
case NewWindow => {
window.open(url,"_blank")
Future.successful(true)
}
case NewWindow => window.open(url,"_blank")
case Popup => PopupFrame.open(url)
}

Expand All @@ -64,6 +70,7 @@ object Navigate extends Logging {
window.onbeforeunload = { (e:BeforeUnloadEvent) => } //is a new page i don't want to block the user anymore
action()
}
Future.successful(true)
}


Expand Down
2 changes: 1 addition & 1 deletion client/src/main/scala/ch/wsl/box/client/views/EntityTableView.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ case class EntityTableView(model:ModelProperty[EntityTableModel], presenter:Enti
headerFactory = Some(_ => div(Labels.table.column_selection).render),
bodyFactory = Some { nested =>
div(
metadata.nativeFields.filterNot(_.`type` == JSONFieldTypes.GEOMETRY).map{ c =>
metadata.nativeFields.sortBy(_.title).filterNot(_.`type` == JSONFieldTypes.GEOMETRY).map{ c =>
div(
Checkbox(localModel.bitransform(_.contains(c)){
case true => localModel.get ++ Seq(c)
Expand Down
85 changes: 2 additions & 83 deletions client/src/main/scala/ch/wsl/box/client/views/components/table/FilterBarDyn.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,87 +19,6 @@ class FilterBarDyn(val filters:Property[Seq[JSONQueryFilter]],sorts:Property[Seq
import scalacss.ScalatagsCss._
import scalatags.JsDom.all._

//val filterFields:Property[Seq[FieldQuery]] = fieldQueries.bitransform(_.filter(_.filterValue.nonEmpty))(s => fieldQueries.get.map(f => s.find(_.field.name == f.field.name).getOrElse(f)))
// val _filterFields:Property[Seq[JSONField]] = Property(Seq())
// val _filterFields:SeqProperty[JSONField] = SeqProperty(Seq())
//
// val _sortFields:SeqProperty[JSONField] = SeqProperty(Seq())

// fieldQueries.listen({x =>
// val newFilters:Seq[JSONField] = x.filter(y => y.filterValue.nonEmpty && !_filterFields.get.map(_.name).contains(y.field.name)).map(_.field)
// _filterFields.append(newFilters:_*)
//
// val newSorts:Seq[JSONField] = x.filter(y => y.sort.nonEmpty && !_sortFields.get.map(_.name).contains(y.field.name)).map(_.field)
// _sortFields.append(newSorts:_*)
// },initUpdate = true)

// def _render(columns: Seq[JSONField], metadata: JSONMetadata): HTMLElement = {
//
// div( ClientConf.style.filterDynBar,
// //div(pre(bind(fieldQueries.transform(_.map(x => s"Field: ${x.field.name}, ${x.filterValue} , Sort: ${x.sort} ${x.sortOrder}").mkString("\n"))))),
// div(ClientConf.style.filterBlockTitle,Icons.filter,"Filters"),
// repeat(_filterFields) { (fieldProp) =>
// div(ClientConf.style.filterBlock,
// Select(fieldProp,fieldQueries.transformToSeq(_.map(_.field)))(_.title),
// produce(fieldProp) { (field) =>
//
// val (filterValue,operator) = filterPropsField(field)
//
// div(
// display.flex,alignItems.center,
// filterOptions(metadata, field.name, operator)(),
// produceWithNested(operator) { (op, nested) =>
// div(filterField(filterValue, field, op, nested)()).render
// },
// button(Icons.x,ClientConf.style.boxButtonIconMini,onclick :+= ((e:Event) => {
// filterValue.set("")
// _filterFields.remove(field)
// }))
// ).render
// },
//
// ).render
// },
//
// button(Icons.plus,ClientConf.style.boxButton,onclick :+= ((e:Event) => {
// fieldQueries.get.find(_.filterValue.isEmpty).map(x => _filterFields.append(x.field))
// })),
// div(Icons.asc,"Sort",ClientConf.style.filterBlockTitle),
// repeatWithIndex(_sortFields) { case (fieldProp,i,nested) =>
// div(ClientConf.style.filterBlock,
// Select(fieldProp,fieldQueries.transformToSeq(_.map(_.field)))(_.title),
// produce(fieldProp.combine(i)((x,y) => (x,y))) { case (field, i) =>
//
// val sortProp = fieldQueries.bitransform(_.find(_.field == field).map(_.sort))(x => fieldQueries.get.map { fq => if (fq.field == field) {
// x match {
// case Some(value) => fq.copy(sort = value, sortOrder = Some(i+1))
// case None => fq.copy(sort = "", sortOrder = None)
// }
//
// } else fq })
// div(
// display.flex,alignItems.center,
// Select.optional(sortProp, SeqProperty(Seq(Sort.ASC,Sort.DESC)),"---")(x => x.toUpperCase),
// button(Icons.x,ClientConf.style.boxButtonIconMini,onclick :+= ((e:Event) => {
// sortProp.set(None)
// _sortFields.remove(field)
// fieldQueries.set(fieldQueries.get.map{fq =>
// if(fq.sortOrder.exists(_ > i+1)) {
// fq.copy(sortOrder = fq.sortOrder.map(_ - 1))
// } else fq
// })
//
// }))
// ).render
// }
//
// ).render
// },
// button(Icons.plus,ClientConf.style.boxButton,onclick :+= ((e:Event) => {
// fieldQueries.get.find(_.sort.isEmpty).map(x => _sortFields.append(x.field))
// })),
// ).render
// }

val modalId = UUID.randomUUID()

Expand All @@ -115,7 +34,7 @@ class FilterBarDyn(val filters:Property[Seq[JSONQueryFilter]],sorts:Property[Seq
bodyFactory = Some(n => {
div(
display.flex,alignItems.center,justifyContent.spaceAround,flexDirection.column,height := 200.px,
Select(sortField,columns.toSeqProperty)(_.title),
Select(sortField,columns.sortBy(_.title).toSeqProperty)(_.title),
Select(sortDirection, SeqProperty(Seq(Sort.ASC,Sort.DESC)))(x => x.toUpperCase),
).render
}),
Expand Down Expand Up @@ -163,7 +82,7 @@ class FilterBarDyn(val filters:Property[Seq[JSONQueryFilter]],sorts:Property[Seq
bodyFactory = Some(n => {
div(
display.flex,alignItems.center,justifyContent.spaceAround,flexDirection.column,height := 200.px,
Select(_filterField,columns.toSeqProperty)(_.title),
Select(_filterField,columns.sortBy(_.title).toSeqProperty)(_.title),
n(produce(_filterField){ f =>

val filterValue: Property[String] = filterProp.bitransform[String](_.value.getOrElse(""))(x => { if(x.isEmpty) filterProp.get.copy(value = None) else filterProp.get.copy(value = Some(x)) })
Expand Down
2 changes: 0 additions & 2 deletions ...c/main/scala/ch/wsl/box/client/views/components/widget/functions/FunctionLinkWidget.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ object FunctionLinkWidget extends ComponentWidgetFactory {

val clickHandler = { (e: Event) =>

logger.warn("HELLO")

val function = field.function.get

val functionParams = function.local_fields.zip(function.function_fields).map{ case (l,f) =>
Expand Down
7 changes: 5 additions & 2 deletions client/src/main/scala/ch/wsl/box/client/views/helpers/ActionRenderer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,18 @@ class ActionRenderer(
case SaveLocalAction => handler.beforeSave(action.html5check).flatMap(handler.saveLocally).map(afterSaveAction)
case SaveAndClosePopup => handler.beforeSave(action.html5check).flatMap(handler.saveToDb).map{ _ => ModalStack.mainStack.removeLast() }
case NoAction => Routes.getUrl(action,handler.data.get,metadata.kind,metadata.name,_id,intent.write).foreach{ url =>
executeFunction().map {
executeFunction().flatMap {
case Some(true) => {
if (Navigate.canGoAway)
reset()
Navigate.toUrl(url,action.target)
}
case None => Navigate.toUrl(url,action.target)
case Some(false) => ()
case Some(false) => Future.successful()

}.foreach{ _ =>
if(action.reload) handler.reload()
else services.clientSession.loading.set(false)
}
}
case CopyAction => handler.duplicate()
Expand Down
Loading