Skip to content

Commit

Permalink
Upgraded dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@viktor-podzigun
viktor-podzigun committed Jul 16, 2022
1 parent 8371c12 commit 490afe5
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 68 deletions.
3 changes: 1 addition & 2 deletions client/client.webpack.config.js
View file
Expand Up @@ -2,6 +2,5 @@ const merge = require("webpack-merge")

const generatedConfig = require('./scalajs.webpack.config')
const commonClientConfig = require("./scommons.webpack.config.js")
const commonBabelConfig = require("./sc-babel.webpack.config.js")

module.exports = merge(generatedConfig, commonClientConfig, commonBabelConfig)
module.exports = merge(generatedConfig, commonClientConfig)
6 changes: 2 additions & 4 deletions project/plugins.sbt
View file
@@ -1,11 +1,9 @@
//resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"

//addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0-SNAPSHOT").changing())
addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")
addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.9.0-SNAPSHOT").changing())
//addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % "0.20.0")

// play plugin version should be the same as in `common.Libs.playVer` !!!
Expand Down
10 changes: 5 additions & 5 deletions project/src/main/scala/common/Libs.scala
View file
Expand Up @@ -6,11 +6,11 @@ import scommons.sbtplugin.project.CommonLibs

object Libs extends CommonLibs {

val scommonsNodejsVersion = "0.8.2"
val scommonsApiVersion = "0.8.1"
val scommonsServiceVersion = "0.8.0"
val scommonsReactVersion = "0.8.0"
val scommonsClientVersion = "0.8.0"
val scommonsNodejsVersion = "1.0.0-SNAPSHOT"
val scommonsApiVersion = "1.0.0-SNAPSHOT"
val scommonsServiceVersion = "1.0.0-SNAPSHOT"
val scommonsReactVersion = "1.0.0-SNAPSHOT"
val scommonsClientVersion = "1.0.0-SNAPSHOT"

//////////////////////////////////////////////////////////////////////////////
// shared dependencies
Expand Down
1 change: 0 additions & 1 deletion project/src/main/scala/definitions/AdminClient.scala
View file
Expand Up @@ -15,7 +15,6 @@ object AdminClient extends AdminModule with CommonClientModule {
override def definition: Project = {
super.definition
.enablePlugins(ScalaJSWeb, SbtWeb)
.settings(ScalaJsModule.settings: _*)
.settings(
coverageExcludedPackages := coverageExcludedPackages.value +
";.*AdminMain" +
Expand Down
5 changes: 1 addition & 4 deletions project/src/main/scala/definitions/ScalaJsModule.scala
View file
Expand Up @@ -2,7 +2,6 @@ package definitions

import org.scalajs.jsenv.nodejs.NodeJSEnv
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import sbt.Keys._
import sbt._

object ScalaJsModule {
Expand All @@ -14,8 +13,6 @@ object ScalaJsModule {
Test / jsEnv := new NodeJSEnv(NodeJSEnv.Config().withArgs(List("--enable-source-maps"))),
Test / scalaJSLinkerConfig ~= {
_.withSourceMap(true)
},

scalaVersion := "2.13.5"
}
)
}
26 changes: 13 additions & 13 deletions server/src/main/resources/routes
View file
Expand Up @@ -17,37 +17,37 @@ GET /scommons-admin/swagger.html scommons.play.controllers.Co

GET /scommons-admin/ui/companies/:id scommons.admin.server.company.CompanyController.getById(id: Int)
GET /scommons-admin/ui/companies scommons.admin.server.company.CompanyController.list(offset: Option[Int], limit: Option[Int], symbols: Option[String])
POST /scommons-admin/ui/companies scommons.admin.server.company.CompanyController.create
PUT /scommons-admin/ui/companies scommons.admin.server.company.CompanyController.update
POST /scommons-admin/ui/companies scommons.admin.server.company.CompanyController.create()
PUT /scommons-admin/ui/companies scommons.admin.server.company.CompanyController.update()

GET /scommons-admin/ui/systems/groups/:id scommons.admin.server.system.group.SystemGroupController.getById(id: Int)
GET /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.list
POST /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.create
PUT /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.update
GET /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.list()
POST /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.create()
PUT /scommons-admin/ui/systems/groups scommons.admin.server.system.group.SystemGroupController.update()

GET /scommons-admin/ui/systems/:id scommons.admin.server.system.SystemController.getById(id: Int)
GET /scommons-admin/ui/systems scommons.admin.server.system.SystemController.list
POST /scommons-admin/ui/systems scommons.admin.server.system.SystemController.create
PUT /scommons-admin/ui/systems scommons.admin.server.system.SystemController.update
GET /scommons-admin/ui/systems scommons.admin.server.system.SystemController.list()
POST /scommons-admin/ui/systems scommons.admin.server.system.SystemController.create()
PUT /scommons-admin/ui/systems scommons.admin.server.system.SystemController.update()

GET /scommons-admin/ui/systems/:id/users scommons.admin.server.system.user.SystemUserController.listUsers(id: Int, offset: Option[Int], limit: Option[Int], symbols: Option[String])
GET /scommons-admin/ui/systems/:id/users/:uid/roles scommons.admin.server.system.user.SystemUserController.listRoles(id: Int, uid: Int)
POST /scommons-admin/ui/systems/:id/users/:uid/roles scommons.admin.server.system.user.SystemUserController.addRoles(id: Int, uid: Int)
PUT /scommons-admin/ui/systems/:id/users/:uid/roles scommons.admin.server.system.user.SystemUserController.removeRoles(id: Int, uid: Int)

GET /scommons-admin/ui/roles/:id scommons.admin.server.role.RoleController.getById(id: Int)
GET /scommons-admin/ui/roles scommons.admin.server.role.RoleController.list
POST /scommons-admin/ui/roles scommons.admin.server.role.RoleController.create
PUT /scommons-admin/ui/roles scommons.admin.server.role.RoleController.update
GET /scommons-admin/ui/roles scommons.admin.server.role.RoleController.list()
POST /scommons-admin/ui/roles scommons.admin.server.role.RoleController.create()
PUT /scommons-admin/ui/roles scommons.admin.server.role.RoleController.update()

GET /scommons-admin/ui/roles/:id/permissions scommons.admin.server.role.permission.RolePermissionController.list(id: Int)
POST /scommons-admin/ui/roles/:id/permissions scommons.admin.server.role.permission.RolePermissionController.add(id: Int)
PUT /scommons-admin/ui/roles/:id/permissions scommons.admin.server.role.permission.RolePermissionController.remove(id: Int)

GET /scommons-admin/ui/users/:id scommons.admin.server.user.UserController.getById(id: Int)
GET /scommons-admin/ui/users scommons.admin.server.user.UserController.list(offset: Option[Int], limit: Option[Int], symbols: Option[String])
POST /scommons-admin/ui/users scommons.admin.server.user.UserController.create
PUT /scommons-admin/ui/users scommons.admin.server.user.UserController.update
POST /scommons-admin/ui/users scommons.admin.server.user.UserController.create()
PUT /scommons-admin/ui/users scommons.admin.server.user.UserController.update()

GET /scommons-admin/ui/users/:id/systems scommons.admin.server.user.system.UserSystemController.list(id: Int)
POST /scommons-admin/ui/users/:id/systems scommons.admin.server.user.system.UserSystemController.add(id: Int)
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/scala/scommons/admin/server/LiquibaseModule.scala
View file
Expand Up @@ -206,7 +206,7 @@ class PlayLiquibase @Inject()(environment: Environment, config: Configuration, i
/** Get the db parameters from the configuration if only one is defined */
protected def singleJdbcDatabaseConfig: Option[DatabaseConfig] = {
Try(injector.instanceOf(classOf[DBApi])).toOption.flatMap { dbApi =>
val dbs = dbApi.databases
val dbs = dbApi.databases()
if (dbs.length == 1) {
dbs.head match {
case db: DefaultDatabase => Some(db.databaseConfig)
Expand Down
8 changes: 3 additions & 5 deletions server/src/main/scala/scommons/admin/server/company/CompanyApiImpl.scala
View file
Expand Up @@ -68,11 +68,9 @@ class CompanyApiImpl(service: CompanyService)(implicit ec: ExecutionContext)
getById(data).flatMap { current =>
if (current.isEmpty && update) Future.successful(CompanyResp(CompanyNotFound))
else {
Future.sequence(List(
getByName(current, entity)
)).flatMap {
case List(Some(_)) => Future.successful(CompanyResp(CompanyAlreadyExists))
case List(None) => onSuccess(entity)
getByName(current, entity).flatMap {
case Some(_) => Future.successful(CompanyResp(CompanyAlreadyExists))
case None => onSuccess(entity)
}
}
}
Expand Down
8 changes: 3 additions & 5 deletions server/src/main/scala/scommons/admin/server/role/RoleApiImpl.scala
View file
Expand Up @@ -65,11 +65,9 @@ class RoleApiImpl(service: RoleService)(implicit ec: ExecutionContext)
getById(data).flatMap { current =>
if (current.isEmpty && update) Future.successful(RoleResp(RoleNotFound))
else {
Future.sequence(List(
getByName(current, entity)
)).flatMap {
case List(Some(_)) => Future.successful(RoleResp(RoleAlreadyExists))
case List(None) => current match {
getByName(current, entity).flatMap {
case Some(_) => Future.successful(RoleResp(RoleAlreadyExists))
case None => current match {
case None => onSuccess(entity)
case Some(curr) => onSuccess(entity.copy(
//DON'T UPDATE READ-ONLY FIELDS !!!
Expand Down
8 changes: 3 additions & 5 deletions server/src/main/scala/scommons/admin/server/system/SystemApiImpl.scala
View file
Expand Up @@ -65,11 +65,9 @@ class SystemApiImpl(service: SystemService)(implicit ec: ExecutionContext)
getById(data).flatMap { current =>
if (current.isEmpty && update) Future.successful(SystemResp(SystemNotFound))
else {
Future.sequence(List(
getByName(current, entity)
)).flatMap {
case List(Some(_)) => Future.successful(SystemResp(SystemAlreadyExists))
case List(None) => current match {
getByName(current, entity).flatMap {
case Some(_) => Future.successful(SystemResp(SystemAlreadyExists))
case None => current match {
case None => onSuccess(entity)
case Some(curr) => onSuccess(entity.copy(
//DON'T UPDATE READ-ONLY FIELDS !!!
Expand Down
8 changes: 3 additions & 5 deletions server/src/main/scala/scommons/admin/server/system/group/SystemGroupApiImpl.scala
View file
Expand Up @@ -65,11 +65,9 @@ class SystemGroupApiImpl(service: SystemGroupService)(implicit ec: ExecutionCont
getById(data).flatMap { current =>
if (current.isEmpty && update) Future.successful(SystemGroupResp(SystemGroupNotFound))
else {
Future.sequence(List(
getByName(current, entity)
)).flatMap {
case List(Some(_)) => Future.successful(SystemGroupResp(SystemGroupAlreadyExists))
case List(None) => onSuccess(entity)
getByName(current, entity).flatMap {
case Some(_) => Future.successful(SystemGroupResp(SystemGroupAlreadyExists))
case None => onSuccess(entity)
}
}
}
Expand Down
25 changes: 15 additions & 10 deletions server/src/main/scala/scommons/admin/server/user/UserApiImpl.scala
View file
Expand Up @@ -18,7 +18,7 @@ class UserApiImpl(userService: UserService,
def getUserById(id: Int): Future[UserDetailsResp] = {
userService.getUserDetailsById(id).map {
case None => UserDetailsResp(UserNotFound)
case Some((details)) => UserDetailsResp(convertToUserDetailsData(details))
case Some(details) => UserDetailsResp(convertToUserDetailsData(details))
}
}

Expand Down Expand Up @@ -105,15 +105,20 @@ class UserApiImpl(userService: UserService,
getById(data).flatMap { current =>
if (current.isEmpty && update) Future.successful(UserDetailsResp(UserNotFound))
else {
Future.sequence(List(
getByLogin(current, entity),
getByEmail(current, entity),
checkCompanyExists(current, entity)
)).flatMap {
case List(Some(_), _, _) => Future.successful(UserDetailsResp(UserLoginAlreadyExists))
case List(_, Some(_), _) => Future.successful(UserDetailsResp(UserEmailAlreadyExists))
case List(_, _, false) => Future.successful(UserDetailsResp(CompanyNotFound))
case List(None, None, true) => current match {
val getByLoginF = getByLogin(current, entity)
val getByEmailF = getByEmail(current, entity)
val checkCompanyExistsF = checkCompanyExists(current, entity)
(for {
maybeUser <- getByLoginF
maybeProfile <- getByEmailF
companyExists <- checkCompanyExistsF
} yield {
(maybeUser, maybeProfile, companyExists)
}).flatMap {
case (Some(_), _, _) => Future.successful(UserDetailsResp(UserLoginAlreadyExists))
case (_, Some(_), _) => Future.successful(UserDetailsResp(UserEmailAlreadyExists))
case (_, _, false) => Future.successful(UserDetailsResp(CompanyNotFound))
case (None, None, true) => current match {
case None => onSuccess(current, entity)
case Some(curr) => onSuccess(current, entity.copy(
user = entity.user.copy(
Expand Down
10 changes: 5 additions & 5 deletions server/src/test/scala/scommons/admin/server/AdminControllerSpec.scala
View file
Expand Up @@ -12,7 +12,7 @@ class AdminControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$commonAssetsUrl/css/bootstrap.min.css")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -26,7 +26,7 @@ class AdminControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$commonAssetsUrl/css/custom.css")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -40,7 +40,7 @@ class AdminControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/assets/styles/scommons-admin-client-fastopt.css")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -54,7 +54,7 @@ class AdminControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/assets/scommons-admin-client-fastopt.js")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -66,7 +66,7 @@ class AdminControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/admin.html")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand Down
6 changes: 3 additions & 3 deletions server/src/test/scala/scommons/admin/server/SwaggerControllerSpec.scala
View file
Expand Up @@ -10,7 +10,7 @@ class SwaggerControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/api-docs")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -28,7 +28,7 @@ class SwaggerControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/swagger.html")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand All @@ -41,7 +41,7 @@ class SwaggerControllerSpec extends BaseControllersSpec {
val request = wsUrl(s"$baseUrl/assets/lib/swagger-ui/index.html")

//when
val response = request.get.futureValue
val response = request.get().futureValue

//then
response.status shouldBe 200
Expand Down

0 comments on commit 490afe5

Please sign in to comment.