fix(tilecard): remove county name from header (#1621)

entur · Aug 22, 2024 · 9d10302 · 9d10302
1 parent 2f30350
commit 9d10302
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx b/tavla/app/(admin)/edit/[id]/components/TileCard/index.tsx
@@ -26,7 +26,6 @@ import {
     Paragraph,
     SubParagraph,
 } from '@entur/typography'
-import { isEmptyOrSpaces } from 'app/(admin)/edit/utils'
 import { ColumnModal } from 'app/(admin)/organizations/components/DefaultColumns/ColumnModal'
 import Goat from 'assets/illustrations/Goat.png'
 import { HiddenInput } from 'components/Form/HiddenInput'
@@ -150,7 +149,9 @@ function TileCard({
                     }`}
                 >
                     <div className="flex flex-row gap-4 items-center ">
-                        <Heading3 margin="none">{tile.name}</Heading3>
+                        <Heading3 margin="none">
+                            {tile.displayName ?? tile.name}
+                        </Heading3>
                         <div className="hidden sm:flex flex-row gap-4 h-8">
                             {transportModes.map((tm) => (
                                 <TransportIcon transportMode={tm} key={tm} />
@@ -226,12 +227,6 @@ function TileCard({
                             ) as string
                             data.delete('displayName')
 
-                            if (isEmptyOrSpaces(displayName))
-                                return addToast({
-                                    variant: 'info',
-                                    content: 'Navnet kan ikke være tomt.',
-                                })
-
                             let lines: string[] = []
                             for (const line of data.values()) {
                                 lines.push(line as string)
@@ -251,7 +246,7 @@ function TileCard({
                                     distance: tile.walkingDistance?.distance,
                                 },
                                 offset: Number(offset) || undefined,
-                                name: displayName,
+                                displayName: displayName || undefined,
                             } as TTile
 
                             bid === 'demo'
@@ -272,7 +267,7 @@ function TileCard({
                                 label="Navn på stoppested"
                                 className="!w-2/5"
                                 name="displayName"
-                                defaultValue={tile.name}
+                                defaultValue={tile.displayName}
                             />
                         </div>
                         <Heading4>Gåavstand</Heading4>

diff --git a/tavla/src/Board/scenarios/QuayTile/index.tsx b/tavla/src/Board/scenarios/QuayTile/index.tsx
@@ -15,7 +15,7 @@ export function QuayTile({
     columns,
     walkingDistance,
     offset,
-    name,
+    displayName,
 }: TQuayTile) {
     const { data } = useQuery(
         GetQuayQuery,
@@ -49,7 +49,7 @@ export function QuayTile({
     return (
         <Tile className="flex flex-col">
             <TableHeader
-                heading={name ?? heading}
+                heading={displayName ?? heading}
                 walkingDistance={walkingDistance}
             />
             <Table

diff --git a/tavla/src/Board/scenarios/StopPlaceTile/index.tsx b/tavla/src/Board/scenarios/StopPlaceTile/index.tsx
@@ -14,7 +14,7 @@ export function StopPlaceTile({
     columns,
     walkingDistance,
     offset,
-    name,
+    displayName,
 }: TStopPlaceTile) {
     const { data } = useQuery(
         StopPlaceQuery,
@@ -44,7 +44,7 @@ export function StopPlaceTile({
     return (
         <Tile className="flex flex-col">
             <TableHeader
-                heading={name ?? data.stopPlace.name}
+                heading={displayName ?? data.stopPlace.name}
                 walkingDistance={walkingDistance}
             />
             <Table

diff --git a/tavla/src/Shared/types/tile.ts b/tavla/src/Shared/types/tile.ts
@@ -9,6 +9,7 @@ export type TSharedTile = {
     whitelistedTransportModes?: TTransportMode[]
     walkingDistance?: TWalkingDistance
     offset?: number
+    displayName?: string
 }
 
 export type TColumnTile = {