Skip to content

Commit 7b869aa

Browse files
committed
DBC22-4971: fixed label consistency between route and details panel
1 parent 22e44e8 commit 7b869aa

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/backend/apps/authentication/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def get_queryset(self):
150150
def create(self, request, *args, **kwargs):
151151
# add validation for duplicate route name
152152
label = request.data.get('label', None)
153-
if label is not None:
153+
if label is not None and label != '':
154154
existing = self.request.user.routes.filter(label=label).first()
155155
if existing is not None:
156156
return Response({'code': 'duplicate_name'}, status=status.HTTP_400_BAD_REQUEST)

src/frontend/src/Components/routing/RouteDetails.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ export default function RouteDetails(props) {
422422
/* Rendering */
423423
// Subcomponents
424424
const getDefaultLabel = (isPanel) => {
425-
if (isPanel) {
425+
if (isPanel && !route.id) {
426426
return 'Route ' + (route.criteria === 'fastest' ? 'A' : 'B');
427427
}
428428

@@ -615,8 +615,8 @@ export default function RouteDetails(props) {
615615
<p className="route-distance">{Math.round(route.distance)} km</p>
616616
</div>
617617

618-
{route.label && route.label !== getDefaultLabel() &&
619-
<p className="route-alt-name">{getDefaultLabel()}</p>
618+
{route.label && route.label !== getDefaultLabel(isPanel) &&
619+
<p className="route-alt-name">{getDefaultLabel(isPanel)}</p>
620620
}
621621
</div>
622622

src/frontend/src/Components/routing/RouteObjectList.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ export default function RouteObjectList(props) {
203203

204204
/* Rendering */
205205
// Subcomponents
206-
const getDefaultLabel = () => {
206+
const getDefaultLabel = (isPanel) => {
207+
if (isPanel && !selectedRoute.id) {
208+
return 'Route ' + (selectedRoute.criteria === 'fastest' ? 'A' : 'B');
209+
}
210+
207211
if (selectedRoute.start && selectedRoute.end) {
208212
return selectedRoute.start + ' to ' + selectedRoute.end;
209213
}
@@ -443,12 +447,12 @@ export default function RouteObjectList(props) {
443447
<div className="route-name-and-distance">
444448
<h4
445449
className="route-name">
446-
{selectedRoute.label ? selectedRoute.label : `Route ${(selectedRoute.criteria === 'fastest') ? 'A' : 'B'}`}
450+
{selectedRoute.label ? selectedRoute.label : getDefaultLabel(true)}
447451
</h4>
448452
<p className="route-distance">{Math.round(selectedRoute.distance)} km</p>
449453
</div>
450-
{selectedRoute.label &&
451-
<p className="route-alt-name">{getDefaultLabel()}</p>
454+
{selectedRoute.label && selectedRoute.label !== getDefaultLabel(true) &&
455+
<p className="route-alt-name">{getDefaultLabel(true)}</p>
452456
}
453457
</div>
454458

0 commit comments

Comments
 (0)