This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1451
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1451 by this push:
new c18ea06 [DLAB-1451]: Added Endpoint url validation
c18ea06 is described below
commit c18ea062545f52c4de29caa72e16a7ed107b3b34
Author: Dmytro Gnatyshyn <di1...@ukr.net>
AuthorDate: Mon Jan 20 09:20:58 2020 +0200
[DLAB-1451]: Added Endpoint url validation
---
.../management/endpoints/endpoints.component.html | 4 +-
.../management/endpoints/endpoints.component.scss | 112 +++++++++++----------
.../resources/webapp/src/app/core/util/patterns.ts | 2 +-
.../resources-grid/resources-grid.component.ts | 2 +-
4 files changed, 61 insertions(+), 59 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
index 58da8cd..fa9f85c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
@@ -53,7 +53,7 @@
<span class="error"
*ngIf="createEndpointForm?.controls['url'].hasError('isDuplicate')">This
endpoint url already exists.</span>
<span class="error"
*ngIf="!createEndpointForm?.controls.url.valid &&
createEndpointForm.controls.url.touched &&
!createEndpointForm?.controls['url'].hasError('isDuplicate')">
- Please provide a valid endpoint url with slash on the end
+ Please provide a valid endpoint url with slash in the end.
</span>
</div>
</div>
@@ -64,7 +64,7 @@
<span class="error"
*ngIf="!createEndpointForm?.controls.account.valid &&
createEndpointForm.controls.account.touched">
Endpoint account can only contain letters, numbers,
hyphens and '_' but can not end with special
- characters
+ characters.
</span>
</div>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
index 5714552..78665ea 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
@@ -16,79 +16,81 @@
* specific language governing permissions and limitations
* under the License.
*/
+.endpoints-dialog {
+ .content-box {
+ padding: 10px 30px 30px;
+ height: 400px;
-.content-box {
- padding: 10px 30px 30px;
- height: 400px;
+ .split {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 100%;
- .split {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- height: 100%;
+ form {
+ padding: 20px 10px;
- form {
- padding: 20px 10px;
-
- .control-group {
- .error {
- position: absolute;
- right: 0;
- bottom: 5px;
- font-family: 'Open Sans', sans-serif;
- font-weight: 300;
+ .control-group {
+ .error {
+ position: absolute;
+ right: 0;
+ bottom: 5px;
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 300;
+ top: 34px;
+ }
}
}
}
- }
- .action-group {
- display: flex;
- justify-content: space-between;
- padding: 0 10px;
- }
+ .action-group {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 10px;
+ }
- .endpoints {
- height: 265px;
+ .endpoints {
+ height: 265px;
- table.mat-table {
- width: 100%;
- thead{
- background: transparent;
- }
- tr {
- td {
- vertical-align: middle;
- max-width: 150px;
- overflow: hidden;
- text-overflow: ellipsis;
+ table.mat-table {
+ width: 100%;
+ thead{
+ background: transparent;
+ }
+ tr {
+ td {
+ vertical-align: middle;
+ max-width: 150px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
- }
- .actions {
- color: #607d8b;
- text-align: center;
- width: 14%;
+ .actions {
+ color: #607d8b;
+ text-align: center;
+ width: 14%;
- span {
- transition: all .5s ease-in-out;
- cursor: pointer;
+ span {
+ transition: all .5s ease-in-out;
+ cursor: pointer;
- .mat-icon {
- font-size: 18px;
- padding-top: 5px;
- }
+ .mat-icon {
+ font-size: 18px;
+ padding-top: 5px;
+ }
- &:hover {
- color: darken(#607d8b, 10%);
+ &:hover {
+ color: darken(#607d8b, 10%);
+ }
}
}
}
- }
- .content {
- p {
- margin-bottom: 30px;
+ .content {
+ p {
+ margin-bottom: 30px;
+ }
}
}
}
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 be14887..ac9137f 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
@@ -24,5 +24,5 @@ export const PATTERNS = {
url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]/+',
nodeCountPattern: '^[1-9]\\d*$',
integerRegex: '^[0-9]*$',
- fullUrl:
/^(http?|ftp|https):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/,
+ fullUrl:
/^(http?|ftp|https):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+([.:])(\d{4}|com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*\/$/
};
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index d5fd324..347483b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -127,7 +127,7 @@ export class ResourcesGridComponent implements OnInit {
}
public containsNotebook(notebook_name: string): boolean {
- if (notebook_name)
+ if (notebook_name && this.environments.length)
return this.environments
.filter(project => project.exploratory
.some(item => CheckUtils.delimitersFiltering(notebook_name) ===
CheckUtils.delimitersFiltering(item.name))).length > 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
