Skip to content
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

Revert File Chooser to its previous behaviour #533

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Revert File Chooser to its previous behaviour #533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e9695
Revert File Chooser to its previous behaviour
techncl Jan 29, 2025
b6b62ec
Merge branch 'master' into revertFileSelectionBehaviour
techncl Feb 6, 2025
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
47 changes: 31 additions & 16 deletions ...validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,39 +301,46 @@ object CsvValidatorUi extends SimpleSwingApplication {
}

private def lastCsvPath: File =
loadSettings match {
case Some(settings) => settings.lastCsvPath.toFile
case None => userDir.toFile
}
loadSettings.flatMap { settings =>
List(settings.lastCsvPath.toFile, settings.lastCsvSchemaPath.toFile, settings.lastReportPath.toFile).find(_ != userDir.toFile)
}.getOrElse(userDir.toFile)

private val csvFileChooser = new FileChooser(lastCsvPath)
csvFileChooser.multiSelectionEnabled = false
csvFileChooser.title = "Select a .csv file"
csvFileChooser.fileFilter = new FileNameExtensionFilter("CSV file (*.csv)", "csv")
private val btnChooseCsvFile = new Button("...")

private def setPathToLastCsvPath(fileChooser: FileChooser): Unit = fileChooser.selectedFile = lastCsvPath

btnChooseCsvFile.reactions += onClick {
setPathToLastCsvPath(csvFileChooser)
csvFileChooser.selectedFile = lastCsvPath
chooseFileOrDir(csvFileChooser, txtCsvFile, btnChooseCsvFile)
updateLastPath(csvFileChooser, path => Settings(path, path, path))
updateLastPath(csvFileChooser, path => loadSettings match {
case Some(s) => s.copy(lastCsvPath = path)
case None => Settings(path, path, path)
})
}

private val lblCsvSchemaFile = new Label("CSV Schema file:")

txtCsvSchemaFile.setTransferHandler(fileHandler)
private val csvSchemaFileChooser = new FileChooser(lastCsvPath)
private def lastCsvSchemaPath: File =
loadSettings.flatMap { settings =>
List(settings.lastCsvSchemaPath.toFile, settings.lastCsvPath.toFile, settings.lastReportPath.toFile).find(_ != userDir.toFile)
}.getOrElse(userDir.toFile)
private val csvSchemaFileChooser = new FileChooser(lastCsvSchemaPath)
csvSchemaFileChooser.multiSelectionEnabled = false
csvSchemaFileChooser.title = "Select a .csvs file"
csvSchemaFileChooser.fileFilter = new FileNameExtensionFilter("CSV Schema file (*.csvs)", "csvs" +
"")

private val btnChooseCsvSchemaFile = new Button("...")
btnChooseCsvSchemaFile.reactions += onClick {
setPathToLastCsvPath(csvSchemaFileChooser)
csvSchemaFileChooser.selectedFile = lastCsvSchemaPath
chooseFileOrDir(csvSchemaFileChooser, txtCsvSchemaFile, btnChooseCsvSchemaFile)
updateLastPath(csvSchemaFileChooser, path => Settings(path, path, path))
updateLastPath(csvSchemaFileChooser, path => loadSettings match {
case Some(s) => s.copy(lastCsvSchemaPath = path)
case None => Settings(path, path, path)
})
}

private val separator1 = new Separator
Expand Down Expand Up @@ -422,18 +429,26 @@ object CsvValidatorUi extends SimpleSwingApplication {
private val btnClose = new Button("Close")
btnClose.reactions += onClick(quit())

private val reportFileChooser = new FileChooser(lastCsvPath)
private def lastReportPath: File =
loadSettings.flatMap { settings =>
List(settings.lastReportPath.toFile, settings.lastCsvSchemaPath.toFile, settings.lastCsvPath.toFile).find(_ != userDir.toFile)
}.getOrElse(userDir.toFile)

private val reportFileChooser = new FileChooser(lastReportPath)
reportFileChooser.multiSelectionEnabled = false
val dateFormat = new SimpleDateFormat("dd-mm-yy_HH-mm-ss")
reportFileChooser.selectedFile = new File(s"csv_validator_report_${dateFormat.format(new Date())}.txt")

val saveLabel = "Save Results"
reportFileChooser.title = saveLabel
private val btnSave = new Button(saveLabel)

val dateFormat = new SimpleDateFormat("dd-mm-yy_HH-mm-ss")
btnSave.reactions += onClick {
setPathToLastCsvPath(reportFileChooser)
reportFileChooser.selectedFile = Paths.get(lastReportPath.toString, s"csv_validator_report_${dateFormat.format(new Date())}.txt").toFile
saveFile(reportFileChooser, saveToFile(txtArReport.text, _), btnSave, btnSave.text)
updateLastPath(reportFileChooser, path => Settings(path, path, path))
updateLastPath(reportFileChooser, path => loadSettings match {
case Some(s) => s.copy(lastReportPath = path)
case None => Settings(path, path, path)
})
}

private val lblVersion = new Label(s"Version: ${getShortVersion}")
Expand Down