diff --git a/spra-play-server/src/main/resources/application.conf b/spra-play-server/src/main/resources/application.conf index 87a1489..23bd391 100644 --- a/spra-play-server/src/main/resources/application.conf +++ b/spra-play-server/src/main/resources/application.conf @@ -2,27 +2,18 @@ dataExplorer { baseUrl = "http://localhost:9000" baseUrl = ${?DATA_EXPLORER_BASE_URL} - users { - tableName = "users" - primaryKeyField = "user_id" - hiddenColumns = ["password", "email"] - nonEditableColumns = ["user_id", "email", "created_at", "verified_on", "name", "last_name"] - canBeDeleted = false - filterableColumns = ["name", "last_name"] - } - - user_tokens { - tableName = "user_tokens" - primaryKeyField = "user_token_id" - nonEditableColumns = ["user_token_id", "user_id", "created_at", "expires_at"] - canBeDeleted = false - } - - user_logs { - tableName = "user_logs" - primaryKeyField = "user_log_id" - nonEditableColumns = ["user_log_id", "user_id", "created_at"] - canBeDeleted = false + tables { + # here you can define the tables that will be displayed in the data explorer with their + # respective configuration + + # users { + # tableName = "users" + # primaryKeyField = "user_id" + # hiddenColumns = ["password", "email"] + # nonEditableColumns = ["user_id", "email", "created_at", "verified_on", "name", "last_name"] + # canBeDeleted = false + # filterableColumns = ["name", "last_name"] + # } } } diff --git a/spra-play-server/src/main/scala/net/wiringbits/spra/admin/config/DataExplorerConfig.scala b/spra-play-server/src/main/scala/net/wiringbits/spra/admin/config/DataExplorerConfig.scala index 4b8048a..15777bd 100644 --- a/spra-play-server/src/main/scala/net/wiringbits/spra/admin/config/DataExplorerConfig.scala +++ b/spra-play-server/src/main/scala/net/wiringbits/spra/admin/config/DataExplorerConfig.scala @@ -13,8 +13,9 @@ case class DataExplorerConfig(baseUrl: String, tablesSettings: List[TableSetting object DataExplorerConfig { def apply(config: Configuration): DataExplorerConfig = { val baseUrl = config.get[String]("baseUrl") - val tableNames = config.subKeys.toList.filter(_ != "baseUrl") - val tablesSettings = tableNames.map(config.get[TableSettings](_)) + val tablesConfig = config.get[Configuration]("tables") + val tablesName = tablesConfig.subKeys.toList + val tablesSettings = tablesName.map(tablesConfig.get[TableSettings](_)) DataExplorerConfig(baseUrl, tablesSettings) } }