diff --git a/.vscode/launch.json b/.vscode/launch.json index 244fe2b49..825c36d56 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "name": "Iniciar", "type": "node", "request": "launch", - "program": "${workspaceRoot}/app.js", + "program": "${workspaceRoot}/services/client/server/server.js", "stopOnEntry": false, "args": [], "cwd": "${workspaceRoot}", diff --git a/Jenkinsfile b/Jenkinsfile index aaced7ee8..db8dcd4bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,15 +7,16 @@ def branchName = "${env.BRANCH_NAME}"; def branchNameTest = "preprod"; def branchNameProd = "master"; def prefixDocker = "test"; -def dockerNginxName = ["nginx", "-p 80:80 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client --link test-mailer:mailer"] +def dockerNginxName = ["nginx", "-p 80:80 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client --link test-mailer:mailer --link test-production:production"] def dockerAuthName = ["auth", "-p 3000:3000"] def dockerSalixName = ["salix", "-p 3001:3001"] def dockerClientName = ["client", "-p 3002:3002"] def dockerMailerName = ["mailer", "-p 3003:3003"] +def dockerProductionName = ["production", "-p 3004:3004"] def buildNumber = "${env.BUILD_NUMBER}"; -def dockers = [dockerAuthName, dockerSalixName, dockerClientName, dockerMailerName, dockerNginxName] +def dockers = [dockerAuthName, dockerSalixName, dockerClientName, dockerMailerName, dockerNginxName, dockerProductionName] node { diff --git a/client/client/routes.json b/client/client/routes.json index ecfdc4ea7..488c6c104 100644 --- a/client/client/routes.json +++ b/client/client/routes.json @@ -2,6 +2,7 @@ "module": "client", "name": "Clients", "icon": "person", + "validations" : true, "routes": [ { "url": "/clients", diff --git a/client/core/src/drop-down/drop-down.js b/client/core/src/drop-down/drop-down.js index ddde9e9d5..ece781507 100644 --- a/client/core/src/drop-down/drop-down.js +++ b/client/core/src/drop-down/drop-down.js @@ -34,7 +34,9 @@ export default class DropDown { this.search = ''; this.showLoadMore = this.loadMore != null; if (this.filterAction) { - this.filterAction(); + this.filterAction({search: this.search}); + } else { + this.filterItems(); } } } diff --git a/client/core/src/icon-menu/icon-menu.html b/client/core/src/icon-menu/icon-menu.html index 422f8e0a7..f09652178 100644 --- a/client/core/src/icon-menu/icon-menu.html +++ b/client/core/src/icon-menu/icon-menu.html @@ -1,6 +1,6 @@