From 6bc5f3b6ffbddfe6a635d219e3bd9b0bfa2ff45f Mon Sep 17 00:00:00 2001
From: stianjsu <stianjsu@gmail.com>
Date: Mon, 26 Jun 2023 16:25:49 +0200
Subject: [PATCH 1/4] feat(settings): adds default column settings

---
 next-tavla/src/Admin/scenarios/AddTile/index.tsx | 6 +++---
 next-tavla/src/Shared/types/tile.ts              | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/next-tavla/src/Admin/scenarios/AddTile/index.tsx b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
index cd5555386..f01140586 100644
--- a/next-tavla/src/Admin/scenarios/AddTile/index.tsx
+++ b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
@@ -7,7 +7,7 @@ import { AddStopPlaceTile } from './components/AddStopPlaceTile'
 import { AddQuayTile } from './components/AddQuayTile'
 import { TAnonTiles } from 'Admin/types'
 import { useSettingsDispatch } from 'Admin/utils/contexts'
-import { AddMapTile } from './components/AddMapTile'
+import { DefaultColumns } from 'types/tile'
 
 const components: Record<
     TTileType,
@@ -15,7 +15,6 @@ const components: Record<
 > = {
     stop_place: AddStopPlaceTile,
     quay: AddQuayTile,
-    map: AddMapTile,
 }
 
 function AddTile() {
@@ -50,9 +49,10 @@ function AddTile() {
                 <Button
                     variant="primary"
                     onClick={() => {
+                        console.log(tile)
                         dispatch({
                             type: 'addTile',
-                            tile,
+                            tile: { ...tile, columns: DefaultColumns },
                         })
                     }}
                 >
diff --git a/next-tavla/src/Shared/types/tile.ts b/next-tavla/src/Shared/types/tile.ts
index f8915215e..186b314ac 100644
--- a/next-tavla/src/Shared/types/tile.ts
+++ b/next-tavla/src/Shared/types/tile.ts
@@ -12,6 +12,12 @@ export const Columns = {
 export type TColumn = keyof typeof Columns
 export type TColumnSetting = { type: TColumn; size?: number }
 
+export const DefaultColumns: TColumnSetting[] = [
+    { type: 'line' },
+    { type: 'destination', size: 2 },
+    { type: 'time' },
+]
+
 export type TTileType = TTile['type']
 
 type TBaseTile = {
@@ -38,4 +44,4 @@ export type TMapTile = {
     type: 'map'
 } & TBaseTile
 
-export type TTile = TStopPlaceTile | TMapTile | TQuayTile
+export type TTile = TStopPlaceTile | TQuayTile

From 813fc9abd2ff0abd891065775d2bdf8991f8304c Mon Sep 17 00:00:00 2001
From: stianjsu <stianjsu@gmail.com>
Date: Mon, 3 Jul 2023 10:55:37 +0200
Subject: [PATCH 2/4] chore(map tile): removes all map tile definitions and
 usage

---
 .../AddTile/components/AddMapTile.tsx         | 26 -------------------
 .../Admin/scenarios/TilesSettings/index.tsx   |  2 --
 next-tavla/src/Admin/types/index.tsx          |  7 ++---
 .../src/Board/scenarios/Board/index.tsx       |  3 ---
 .../src/Board/scenarios/MapTile/index.tsx     |  8 ------
 next-tavla/src/Shared/types/tile.ts           |  9 +++----
 next-tavla/src/Shared/utils/converters.ts     |  6 +----
 7 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 next-tavla/src/Admin/scenarios/AddTile/components/AddMapTile.tsx
 delete mode 100644 next-tavla/src/Board/scenarios/MapTile/index.tsx

diff --git a/next-tavla/src/Admin/scenarios/AddTile/components/AddMapTile.tsx b/next-tavla/src/Admin/scenarios/AddTile/components/AddMapTile.tsx
deleted file mode 100644
index af7189063..000000000
--- a/next-tavla/src/Admin/scenarios/AddTile/components/AddMapTile.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Dropdown } from '@entur/dropdown'
-import { TAnon } from 'Admin/types'
-import { TMapTile } from 'types/tile'
-import { fetchItems } from 'Admin/utils/index'
-
-function AddMapTile({ setTile }: { setTile: (tile: TAnon<TMapTile>) => void }) {
-    return (
-        <Dropdown
-            items={fetchItems}
-            debounceTimeout={1000}
-            label="Finn stoppested"
-            searchable
-            clearable
-            onChange={(e) => {
-                if (e?.value) {
-                    setTile({
-                        type: 'map',
-                        placeId: e.value,
-                    })
-                }
-            }}
-        />
-    )
-}
-
-export { AddMapTile }
diff --git a/next-tavla/src/Admin/scenarios/TilesSettings/index.tsx b/next-tavla/src/Admin/scenarios/TilesSettings/index.tsx
index 9ee3b1cdd..148685daf 100644
--- a/next-tavla/src/Admin/scenarios/TilesSettings/index.tsx
+++ b/next-tavla/src/Admin/scenarios/TilesSettings/index.tsx
@@ -59,8 +59,6 @@ function TilesSettings({ tiles }: { tiles: TTile[] }) {
                                 return (
                                     <QuaySettings key={tile.uuid} tile={tile} />
                                 )
-                            case 'map':
-                                return null
                         }
                     })}
                 </div>
diff --git a/next-tavla/src/Admin/types/index.tsx b/next-tavla/src/Admin/types/index.tsx
index 602425e6e..2973ee444 100644
--- a/next-tavla/src/Admin/types/index.tsx
+++ b/next-tavla/src/Admin/types/index.tsx
@@ -1,8 +1,5 @@
-import { TMapTile, TQuayTile, TStopPlaceTile, TTile } from 'types/tile'
+import { TQuayTile, TStopPlaceTile, TTile } from 'types/tile'
 
 export type TAnon<T extends TTile> = Omit<T, 'uuid'>
 
-export type TAnonTiles =
-    | TAnon<TQuayTile>
-    | TAnon<TStopPlaceTile>
-    | TAnon<TMapTile>
+export type TAnonTiles = TAnon<TQuayTile> | TAnon<TStopPlaceTile>
diff --git a/next-tavla/src/Board/scenarios/Board/index.tsx b/next-tavla/src/Board/scenarios/Board/index.tsx
index 4d5e69ed1..b12a9b1c4 100644
--- a/next-tavla/src/Board/scenarios/Board/index.tsx
+++ b/next-tavla/src/Board/scenarios/Board/index.tsx
@@ -1,7 +1,6 @@
 import { TSettings } from 'types/settings'
 import { TTile } from 'types/tile'
 import { StopPlaceTile } from '../StopPlaceTile'
-import { MapTile } from '../MapTile'
 import { QuayTile } from '../QuayTile'
 import classes from './styles.module.css'
 
@@ -11,8 +10,6 @@ function Tile({ tileSpec }: { tileSpec: TTile }) {
             return <StopPlaceTile {...tileSpec} />
         case 'quay':
             return <QuayTile {...tileSpec} />
-        case 'map':
-            return <MapTile {...tileSpec} />
     }
 }
 
diff --git a/next-tavla/src/Board/scenarios/MapTile/index.tsx b/next-tavla/src/Board/scenarios/MapTile/index.tsx
deleted file mode 100644
index 5333517e9..000000000
--- a/next-tavla/src/Board/scenarios/MapTile/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Tile } from 'components/Tile'
-import { TMapTile } from 'types/tile'
-
-function MapTile({ placeId }: TMapTile) {
-    return <Tile>{placeId}</Tile>
-}
-
-export { MapTile }
diff --git a/next-tavla/src/Shared/types/tile.ts b/next-tavla/src/Shared/types/tile.ts
index 186b314ac..07d5c569b 100644
--- a/next-tavla/src/Shared/types/tile.ts
+++ b/next-tavla/src/Shared/types/tile.ts
@@ -12,11 +12,12 @@ export const Columns = {
 export type TColumn = keyof typeof Columns
 export type TColumnSetting = { type: TColumn; size?: number }
 
-export const DefaultColumns: TColumnSetting[] = [
+export const DefaultColumns = [
     { type: 'line' },
     { type: 'destination', size: 2 },
+    { type: 'situations', size: 2 },
     { type: 'time' },
-]
+] as const
 
 export type TTileType = TTile['type']
 
@@ -40,8 +41,4 @@ export type TStopPlaceTile = {
     whitelistedTransportModes?: TTransportMode[]
 } & TBaseTile
 
-export type TMapTile = {
-    type: 'map'
-} & TBaseTile
-
 export type TTile = TStopPlaceTile | TQuayTile
diff --git a/next-tavla/src/Shared/utils/converters.ts b/next-tavla/src/Shared/utils/converters.ts
index 0227bf64f..92f7aec07 100644
--- a/next-tavla/src/Shared/utils/converters.ts
+++ b/next-tavla/src/Shared/utils/converters.ts
@@ -104,11 +104,7 @@ type TBaseStopPlaceTile = {
     whitelistedTransportModes?: TBaseTransportMode[]
 } & TBaseTile
 
-type TBaseMapTile = {
-    type: 'map'
-} & TBaseTile
-
-type TBaseBaseTile = TBaseStopPlaceTile | TBaseMapTile | TBaseQuayTile
+type TBaseBaseTile = TBaseStopPlaceTile | TBaseQuayTile
 
 type TBaseSetting = {
     tiles: TBaseBaseTile[]

From 5de11fca04833442705c05ebdcd89a3be804e67f Mon Sep 17 00:00:00 2001
From: stianjsu <stianjsu@gmail.com>
Date: Tue, 4 Jul 2023 14:18:26 +0200
Subject: [PATCH 3/4] fix(ts): ts error when assigning const

---
 next-tavla/src/Admin/scenarios/AddTile/index.tsx | 3 +--
 next-tavla/src/Shared/types/tile.ts              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/next-tavla/src/Admin/scenarios/AddTile/index.tsx b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
index f01140586..33791afc2 100644
--- a/next-tavla/src/Admin/scenarios/AddTile/index.tsx
+++ b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
@@ -49,10 +49,9 @@ function AddTile() {
                 <Button
                     variant="primary"
                     onClick={() => {
-                        console.log(tile)
                         dispatch({
                             type: 'addTile',
-                            tile: { ...tile, columns: DefaultColumns },
+                            tile: { ...tile, columns: [...DefaultColumns] },
                         })
                     }}
                 >
diff --git a/next-tavla/src/Shared/types/tile.ts b/next-tavla/src/Shared/types/tile.ts
index 07d5c569b..2cd671dbd 100644
--- a/next-tavla/src/Shared/types/tile.ts
+++ b/next-tavla/src/Shared/types/tile.ts
@@ -12,7 +12,7 @@ export const Columns = {
 export type TColumn = keyof typeof Columns
 export type TColumnSetting = { type: TColumn; size?: number }
 
-export const DefaultColumns = [
+export const DefaultColumns: readonly TColumnSetting[] = [
     { type: 'line' },
     { type: 'destination', size: 2 },
     { type: 'situations', size: 2 },

From 759bbda2e9befdd89910cf3c698c2b54d189a910 Mon Sep 17 00:00:00 2001
From: stianjsu <stianjsu@gmail.com>
Date: Tue, 4 Jul 2023 16:53:25 +0200
Subject: [PATCH 4/4] feat(settings): refactor to implicit default columns
 implementation

---
 .../src/Admin/scenarios/AddTile/index.tsx     |  3 +--
 .../src/Admin/scenarios/Edit/reducer.tsx      | 20 +++++++++++++------
 .../Admin/scenarios/SortableColumns/index.tsx |  3 ++-
 .../src/Board/scenarios/Table/index.tsx       |  4 ++--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/next-tavla/src/Admin/scenarios/AddTile/index.tsx b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
index 33791afc2..d37092741 100644
--- a/next-tavla/src/Admin/scenarios/AddTile/index.tsx
+++ b/next-tavla/src/Admin/scenarios/AddTile/index.tsx
@@ -7,7 +7,6 @@ import { AddStopPlaceTile } from './components/AddStopPlaceTile'
 import { AddQuayTile } from './components/AddQuayTile'
 import { TAnonTiles } from 'Admin/types'
 import { useSettingsDispatch } from 'Admin/utils/contexts'
-import { DefaultColumns } from 'types/tile'
 
 const components: Record<
     TTileType,
@@ -51,7 +50,7 @@ function AddTile() {
                     onClick={() => {
                         dispatch({
                             type: 'addTile',
-                            tile: { ...tile, columns: [...DefaultColumns] },
+                            tile,
                         })
                     }}
                 >
diff --git a/next-tavla/src/Admin/scenarios/Edit/reducer.tsx b/next-tavla/src/Admin/scenarios/Edit/reducer.tsx
index c5bf60249..d841bb949 100644
--- a/next-tavla/src/Admin/scenarios/Edit/reducer.tsx
+++ b/next-tavla/src/Admin/scenarios/Edit/reducer.tsx
@@ -3,7 +3,13 @@ import { TAnonTiles } from 'Admin/types'
 import { clone, xor } from 'lodash'
 import { nanoid } from 'nanoid'
 import { TSettings, TTheme } from 'types/settings'
-import { TColumn, TQuayTile, TStopPlaceTile, TTile } from 'types/tile'
+import {
+    DefaultColumns,
+    TColumn,
+    TQuayTile,
+    TStopPlaceTile,
+    TTile,
+} from 'types/tile'
 import { TColumnSetting } from 'types/tile'
 
 export type Action =
@@ -82,7 +88,7 @@ export function settingsReducer(
             return {
                 ...settings,
                 tiles: arrayMove(
-                    settings.tiles,
+                    settings.tiles ?? [...DefaultColumns],
                     action.oldIndex,
                     action.newIndex,
                 ),
@@ -96,7 +102,7 @@ export function settingsReducer(
                     return {
                         ...tile,
                         columns: [
-                            ...(tile.columns || []),
+                            ...(tile.columns || [...DefaultColumns]),
                             { type: action.column },
                         ],
                     }
@@ -107,9 +113,10 @@ export function settingsReducer(
             return changeTile<TStopPlaceTile | TQuayTile>(
                 action.tileId,
                 (tile) => {
+                    const cols = tile.columns ?? [...DefaultColumns]
                     return {
                         ...tile,
-                        columns: tile.columns?.filter(
+                        columns: cols.filter(
                             (col) => col.type !== action.column,
                         ),
                     }
@@ -120,9 +127,10 @@ export function settingsReducer(
             return changeTile<TStopPlaceTile | TQuayTile>(
                 action.tileId,
                 (tile) => {
+                    const cols = tile.columns ?? [...DefaultColumns]
                     return {
                         ...tile,
-                        columns: tile.columns?.map((col) =>
+                        columns: cols.map((col) =>
                             col.type === action.columnSetting.type
                                 ? action.columnSetting
                                 : col,
@@ -138,7 +146,7 @@ export function settingsReducer(
                     return {
                         ...tile,
                         columns: arrayMove(
-                            tile.columns || [],
+                            tile.columns || [...DefaultColumns],
                             action.oldIndex,
                             action.newIndex,
                         ),
diff --git a/next-tavla/src/Admin/scenarios/SortableColumns/index.tsx b/next-tavla/src/Admin/scenarios/SortableColumns/index.tsx
index b6025bebc..885cb8877 100644
--- a/next-tavla/src/Admin/scenarios/SortableColumns/index.tsx
+++ b/next-tavla/src/Admin/scenarios/SortableColumns/index.tsx
@@ -17,6 +17,7 @@ import {
 } from '@dnd-kit/sortable'
 import {
     Columns,
+    DefaultColumns,
     TColumn,
     TColumnSetting,
     TQuayTile,
@@ -35,7 +36,7 @@ function SortableColumns<T extends TStopPlaceTile | TQuayTile>({
     tile: T
     defaultOpen?: boolean
 }) {
-    const columns: TColumnSetting[] = tile.columns ?? []
+    const columns: TColumnSetting[] = tile.columns ?? [...DefaultColumns]
 
     const sensors = useSensors(
         useSensor(PointerSensor),
diff --git a/next-tavla/src/Board/scenarios/Table/index.tsx b/next-tavla/src/Board/scenarios/Table/index.tsx
index 347e87d55..9f1f0838d 100644
--- a/next-tavla/src/Board/scenarios/Table/index.tsx
+++ b/next-tavla/src/Board/scenarios/Table/index.tsx
@@ -1,5 +1,5 @@
 import { TDepartureFragment } from 'graphql/index'
-import { Columns, TColumn, TColumnSetting } from 'types/tile'
+import { Columns, DefaultColumns, TColumn, TColumnSetting } from 'types/tile'
 import React from 'react'
 import classes from './styles.module.css'
 import { DepartureContext } from './contexts'
@@ -34,7 +34,7 @@ function flexToPercentage(columnSettings: TColumnSetting[]) {
 }
 
 function Table({
-    columns = [],
+    columns = [...DefaultColumns],
     departures,
 }: {
     columns?: TColumnSetting[]