Skip to content

Commit 500704b

Browse files
kebab case urls (and matching view templates), add legacy redirects
1 parent bc68b3c commit 500704b

13 files changed

+28
-19
lines changed

app/scripts/app.js

+17-8
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ angular
9393
templateUrl: 'views/projects.html',
9494
controller: 'ProjectsController'
9595
})
96-
.when('/createProject', {
97-
templateUrl: 'views/createProject.html',
96+
.when('/create-project', {
97+
templateUrl: 'views/create-project.html',
9898
controller: 'CreateProjectController'
9999
})
100100
.when('/project/:project', {
@@ -216,12 +216,12 @@ angular
216216
templateUrl: 'views/browse/route.html',
217217
controller: 'RouteController'
218218
})
219-
.when('/project/:project/createRoute', {
220-
templateUrl: 'views/createRoute.html',
219+
.when('/project/:project/create-route', {
220+
templateUrl: 'views/create-route.html',
221221
controller: 'CreateRouteController'
222222
})
223-
.when('/project/:project/attachPVC', {
224-
templateUrl: 'views/attachPVC.html',
223+
.when('/project/:project/attach-pvc', {
224+
templateUrl: 'views/attach-pvc.html',
225225
controller: 'AttachPVCController'
226226
})
227227
.when('/project/:project/create', {
@@ -237,7 +237,7 @@ angular
237237
controller: 'CreateFromImageController'
238238
})
239239
.when('/project/:project/create/next', {
240-
templateUrl: 'views/create/nextSteps.html',
240+
templateUrl: 'views/create/next-steps.html',
241241
controller: 'NextStepsController'
242242
})
243243
.when('/project/:project/set-limits', {
@@ -260,7 +260,16 @@ angular
260260
templateUrl: 'views/util/logout.html',
261261
controller: 'LogoutController'
262262
})
263-
263+
// legacy redirects
264+
.when('/createProject', {
265+
redirectTo: '/create-project'
266+
})
267+
.when('/project/:project/createRoute', {
268+
redirectTo: '/project/:project/create-route'
269+
})
270+
.when('/project/:project/attachPVC', {
271+
redirectTo: '/project/:project/attach-pvc'
272+
})
264273
.otherwise({
265274
redirectTo: '/'
266275
});
File renamed without changes.

app/views/browse/_deployment-details.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@
6969
builds="builds"
7070
detailed="true"></pod-template>
7171
<h4 style="margin-top: 20px;">Volumes</h4>
72-
<a ng-href="project/{{project.metadata.name}}/attachPVC?deployment={{deployment.metadata.name}}">Attach storage</a>
72+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?deployment={{deployment.metadata.name}}">Attach storage</a>
7373
<volumes volumes="deployment.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
7474
</div>

app/views/browse/_pod-details.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ <h3>Template</h3>
4949
</pod-template>
5050
<div ng-if="pod.spec.volumes.length">
5151
<h4 style="margin-top: 20px;">Volumes</h4>
52-
<a ng-if="pod | annotation:'deploymentConfig'" ng-href="project/{{project.metadata.name}}/attachPVC?deploymentconfig={{pod | annotation:'deploymentConfig'}}">Attach storage and redeploy</a>
52+
<a ng-if="pod | annotation:'deploymentConfig'" ng-href="project/{{project.metadata.name}}/attach-pvc?deploymentconfig={{pod | annotation:'deploymentConfig'}}">Attach storage and redeploy</a>
5353
<volumes volumes="pod.spec.volumes" namespace="project.metadata.name"></volumes>
5454
</div>
5555
</div>
5656
</div>
5757
<annotations annotations="pod.metadata.annotations"></annotations>
58-
</div>
58+
</div>

app/views/browse/deployment-config.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h3>Template</h3>
109109
detailed="true"></pod-template>
110110
</dl>
111111
<h4 style="margin-top: 20px;">Volumes</h4>
112-
<a ng-href="project/{{project.metadata.name}}/attachPVC?deploymentconfig={{deploymentConfig.metadata.name}}">Attach storage</a>
112+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?deploymentconfig={{deploymentConfig.metadata.name}}">Attach storage</a>
113113
<volumes volumes="deploymentConfig.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
114114
</div>
115115
<div class="col-lg-6">

app/views/browse/routes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="container-fluid">
99
<div class="page-header page-header-bleed-right page-header-bleed-left">
1010
<div class="actions pull-right">
11-
<a ng-href="project/{{project.metadata.name}}/createRoute" class="btn btn-default">Create Route</a>
11+
<a ng-href="project/{{project.metadata.name}}/create-route" class="btn btn-default">Create Route</a>
1212
</div>
1313
<h1>Routes</h1>
1414
</div>

app/views/browse/service.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ <h1>
104104
</dd>
105105
</dl>
106106
<div class="gutter-bottom">
107-
<a ng-href="project/{{project.metadata.name}}/createRoute?service={{service.metadata.name}}">Create route</a>
107+
<a ng-href="project/{{project.metadata.name}}/create-route?service={{service.metadata.name}}">Create route</a>
108108
</div>
109109
<annotations annotations="service.metadata.annotations"></annotations>
110110
</div>
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/views/project.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ <h2 ng-if="!displayRouteByService[serviceId]">
138138
</span>
139139
</span>
140140
<div ng-if="!displayRouteByService[serviceId]" class="component-label add-route-link">
141-
<a ng-href="project/{{project.metadata.name}}/createRoute?service={{service.metadata.name}}">Create Route</a>
141+
<a ng-href="project/{{project.metadata.name}}/create-route?service={{service.metadata.name}}">Create Route</a>
142142
</div>
143143
</div>
144144
</div>

app/views/projects.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div ng-if="(projects | hashSize) === 0" class="text-muted" style="margin-top: 50px;">Loading...</div>
1414
<div ng-if="(projects | hashSize) !== 0" class="gutter-top">
1515
<h1 style="display: inline-block;">Projects</h1>
16-
<a ng-if="canCreate" href="createProject" style="margin-top: 10px;" class="btn btn-lg btn-primary pull-right">New Project</a>
16+
<a ng-if="canCreate" href="create-project" style="margin-top: 10px;" class="btn btn-lg btn-primary pull-right">New Project</a>
1717
<alerts alerts="alerts"></alerts>
1818
<div ng-repeat="project in projects | orderByDisplayName">
1919
<div row flex cross-axis="center" class="tile tile-project tile-click tile-flex">
@@ -59,7 +59,7 @@ <h1>Welcome to OpenShift.</h1>
5959
<span ng-if="canCreate">Create a project for your application.</span>
6060
</p>
6161

62-
<a ng-if="canCreate" href="createProject" class="btn btn-lg btn-primary">New Project</a>
62+
<a ng-if="canCreate" href="create-project" class="btn btn-lg btn-primary">New Project</a>
6363

6464
<p>To learn more, visit the OpenShift <a ng-href="{{'' | helpLink}}">documentation</a>.</p>
6565

test/integration/rest_api/project.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var goToAddToProjectPage = function(projectName) {
1414
};
1515

1616
var goToCreateProjectPage = function() {
17-
h.goToPage('/createProject');
17+
h.goToPage('/create-project');
1818
expect(element(by.cssContainingText('h1', "New Project")).isPresent()).toBe(true);
1919
expect(element(by.model('name')).isPresent()).toBe(true);
2020
expect(element(by.model('displayName')).isPresent()).toBe(true);
@@ -186,7 +186,7 @@ describe('', function() {
186186
element(by.model('name')).clear().sendKeys(project['name']);
187187
element(by.buttonText("Create")).click();
188188
expect(element(by.css("[ng-if=nameTaken]")).isDisplayed()).toBe(true);
189-
expect(browser.getCurrentUrl()).toMatch(/\/createProject$/);
189+
expect(browser.getCurrentUrl()).toMatch(/\/create-project$/);
190190
});
191191

192192
it('should delete a project', function() {

0 commit comments

Comments
 (0)