You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by hs...@apache.org on 2022/06/16 06:42:34 UTC
[incubator-datalab] branch fix/DATALAB-2854/keep-consistent-in-page-naming created (now d6d1ec5d3)
This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a change to branch fix/DATALAB-2854/keep-consistent-in-page-naming
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
at d6d1ec5d3 DATALAB-2854 fixed page naming
This branch includes the following new commits:
new d6d1ec5d3 DATALAB-2854 fixed page naming
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: DATALAB-2854 fixed page naming
Posted by hs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a commit to branch fix/DATALAB-2854/keep-consistent-in-page-naming
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit d6d1ec5d3fa8216529ee3327c5493f0533853857
Author: Hennadii_Shpak <bo...@gmail.com>
AuthorDate: Thu Jun 16 09:42:06 2022 +0300
DATALAB-2854 fixed page naming
---
.../src/main/resources/webapp/package-lock.json | 32 +++++++++++-----------
.../resources/webapp/src/app/app.routing.module.ts | 4 +--
.../src/app/shared/navbar/navbar.component.html | 4 +--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json b/services/self-service/src/main/resources/webapp/package-lock.json
index 2f5426228..305e75aaf 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -4450,9 +4450,9 @@
}
},
"node_modules/codelyzer": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz",
- "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.2.tgz",
+ "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==",
"dev": true,
"dependencies": {
"@angular/compiler": "9.0.0",
@@ -4471,8 +4471,8 @@
"zone.js": "~0.10.3"
},
"peerDependencies": {
- "@angular/compiler": ">=2.3.1 <12.0.0 || ^11.0.0-next || ^11.1.0-next || ^11.2.0-next",
- "@angular/core": ">=2.3.1 <12.0.0 || ^11.0.0-next || ^11.1.0-next || ^11.2.0-next",
+ "@angular/compiler": ">=2.3.1 <13.0.0 || ^12.0.0-next || ^12.1.0-next || ^12.2.0-next",
+ "@angular/core": ">=2.3.1 <13.0.0 || ^12.0.0-next || ^12.1.0-next || ^12.2.0-next",
"tslint": "^5.0.0 || ^6.0.0"
}
},
@@ -9197,9 +9197,9 @@
}
},
"node_modules/moment": {
- "version": "2.29.1",
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "version": "2.29.3",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
+ "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==",
"engines": {
"node": "*"
}
@@ -14251,7 +14251,7 @@
"node_modules/watchpack-chokidar2/node_modules/glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
- "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+ "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"dev": true,
"optional": true,
"dependencies": {
@@ -19069,9 +19069,9 @@
"dev": true
},
"codelyzer": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz",
- "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.2.tgz",
+ "integrity": "sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==",
"dev": true,
"requires": {
"@angular/compiler": "9.0.0",
@@ -22804,9 +22804,9 @@
}
},
"moment": {
- "version": "2.29.1",
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+ "version": "2.29.3",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
+ "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
},
"moment-timezone": {
"version": "0.5.31",
@@ -26691,7 +26691,7 @@
"glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
- "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+ "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"dev": true,
"optional": true,
"requires": {
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index 0239fc9e8..09c84932c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -65,7 +65,7 @@ const routes: Routes = [
canActivate: [AuthorizationGuard]
},
{
- path: 'billing_report',
+ path: 'billing',
component: ReportingComponent,
canActivate: [AuthorizationGuard, CloudProviderGuard]
},
@@ -84,7 +84,7 @@ const routes: Routes = [
canActivate: [AuthorizationGuard, AdminGuard],
},
{
- path: 'environment_management',
+ path: 'resources',
component: ManagementComponent,
canActivate: [AuthorizationGuard, AdminGuard]
},
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 60e635d99..d86ca1525 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -146,7 +146,7 @@
<a
*ngIf="healthStatus?.billingEnabled"
class="sub-nav-item"
- [routerLink]="['/billing_report']"
+ [routerLink]="['/billing']"
[routerLinkActive]="['active']"
[routerLinkActiveOptions]="{exact:true}"
[style.margin-left.px]="isExpanded ? '30' : '0'"
@@ -186,7 +186,7 @@
<a
class="sub-nav-item"
[style.margin-left.px]="isExpanded ? '30' : '0'"
- [routerLink]="['/environment_management']"
+ [routerLink]="['/resources']"
[routerLinkActive]="['active']"
[routerLinkActiveOptions]="{exact:true}"
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org