You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/12 08:53:17 UTC
[incubator-dlab] branch feature/projects updated: [DLAB-866]:
replaced url validation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new e6287f2 [DLAB-866]: replaced url validation
new ec02c4b Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
e6287f2 is described below
commit e6287f240f4f07f39aeb9990a10877116ee458e4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Jul 12 11:52:43 2019 +0300
[DLAB-866]: replaced url validation
---
.../src/main/resources/webapp/src/app/core/util/patterns.ts | 2 +-
.../src/app/resources/resources-grid/resources-grid.component.scss | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
index f93dae6..7b8f4f2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
@@ -20,7 +20,7 @@
export const PATTERNS = {
namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+',
delimitersRegex: '/[-_]?/g',
- url: '(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?',
+ url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]+',
nodeCountPattern: '^[1-9]\\d*$',
integerRegex: '^[0-9]*$'
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
index 6d42169..c40c2cd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
@@ -75,7 +75,7 @@ tr.element-row:not(.expanded-row):hover {
}
tr.element-row:not(.expanded-row):active {
- background: #efefef;
+ // background: #efefef;
}
.element-row td {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org