feat(edit): implements V5 column structure in admin (#1115)

* feat(edit): adds new version and removes unused column operations * test(edit): updates tests for new column structure * chore(types): removed unused types, imports and component --------- Co-authored-by: asemwilhelmsen <[email protected]>
entur · Jul 11, 2023 · 5b19898 · 5b19898
1 parent 6005940
commit 5b19898
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 585 deletions.
diff --git a/next-tavla/src/Admin/scenarios/AddColumn/AddColumn.cy.tsx b/next-tavla/src/Admin/scenarios/AddColumn/AddColumn.cy.tsx
diff --git a/next-tavla/src/Admin/scenarios/AddColumn/index.tsx b/next-tavla/src/Admin/scenarios/AddColumn/index.tsx
diff --git a/next-tavla/src/Admin/scenarios/AddColumn/styles.module.css b/next-tavla/src/Admin/scenarios/AddColumn/styles.module.css
diff --git a/next-tavla/src/Admin/scenarios/ColumnSettings/index.tsx b/next-tavla/src/Admin/scenarios/ColumnSettings/index.tsx
diff --git a/next-tavla/src/Admin/scenarios/ColumnSettings/styles.module.css b/next-tavla/src/Admin/scenarios/ColumnSettings/styles.module.css
diff --git a/next-tavla/src/Admin/scenarios/Edit/reducer.tsx b/next-tavla/src/Admin/scenarios/Edit/reducer.tsx
@@ -3,34 +3,14 @@ import { TAnonTiles } from 'Admin/types'
 import { clone, xor } from 'lodash'
 import { nanoid } from 'nanoid'
 import { TSettings, TTheme } from 'types/settings'
-import {
-    DefaultColumns,
-    TColumnSetting,
-    TQuayTile,
-    TStopPlaceTile,
-    TTile,
-} from 'types/tile'
-import { TColumn } from 'types/column'
+import { TQuayTile, TStopPlaceTile, TTile } from 'types/tile'
 
 export type Action =
     | { type: 'changeTheme'; theme: TTheme }
     | { type: 'addTile'; tile: TAnonTiles }
     | { type: 'removeTile'; tileId: string }
     | { type: 'updateTile'; tileIndex: number; tile: TTile }
     | { type: 'swapTiles'; oldIndex: number; newIndex: number }
-    | { type: 'addColumn'; tileId: string; column: TColumn }
-    | { type: 'removeColumn'; tileId: string; column: TColumn }
-    | {
-          type: 'updateColumn'
-          tileId: string
-          columnSetting: TColumnSetting
-      }
-    | {
-          type: 'swapColumns'
-          tileId: string
-          oldIndex: number
-          newIndex: number
-      }
     | { type: 'toggleLine'; tileId: string; lineId: string }
 
 export function settingsReducer(
@@ -88,72 +68,12 @@ export function settingsReducer(
             return {
                 ...settings,
                 tiles: arrayMove(
-                    settings.tiles ?? [...DefaultColumns],
+                    settings.tiles,
                     action.oldIndex,
                     action.newIndex,
                 ),
             }
         }
-        // Column operations
-        case 'addColumn': {
-            return changeTile<TStopPlaceTile | TQuayTile>(
-                action.tileId,
-                (tile) => {
-                    return {
-                        ...tile,
-                        columns: [
-                            ...(tile.columns || [...DefaultColumns]),
-                            { type: action.column },
-                        ],
-                    }
-                },
-            )
-        }
-        case 'removeColumn': {
-            return changeTile<TStopPlaceTile | TQuayTile>(
-                action.tileId,
-                (tile) => {
-                    const cols = tile.columns ?? [...DefaultColumns]
-                    return {
-                        ...tile,
-                        columns: cols.filter(
-                            (col) => col.type !== action.column,
-                        ),
-                    }
-                },
-            )
-        }
-        case 'updateColumn': {
-            return changeTile<TStopPlaceTile | TQuayTile>(
-                action.tileId,
-                (tile) => {
-                    const cols = tile.columns ?? [...DefaultColumns]
-                    return {
-                        ...tile,
-                        columns: cols.map((col) =>
-                            col.type === action.columnSetting.type
-                                ? action.columnSetting
-                                : col,
-                        ),
-                    }
-                },
-            )
-        }
-        case 'swapColumns': {
-            return changeTile<TStopPlaceTile | TQuayTile>(
-                action.tileId,
-                (tile) => {
-                    return {
-                        ...tile,
-                        columns: arrayMove(
-                            tile.columns || [...DefaultColumns],
-                            action.oldIndex,
-                            action.newIndex,
-                        ),
-                    }
-                },
-            )
-        }
         // Line operations
         case 'toggleLine': {
             return changeTile<TStopPlaceTile | TQuayTile>(

diff --git a/next-tavla/src/Admin/scenarios/SelectLines/SelectLines.cy.tsx b/next-tavla/src/Admin/scenarios/SelectLines/SelectLines.cy.tsx
@@ -8,21 +8,14 @@ describe('<SelectLines />', () => {
         const [settings, dispatch] = useReducer(settingsReducer, {
             tiles: [
                 {
-                    columns: [
-                        {
-                            type: 'platform',
-                        },
-                        {
-                            type: 'line',
-                        },
-                        {
-                            size: 2,
-                            type: 'destination',
-                        },
-                        {
-                            type: 'time',
-                        },
-                    ],
+                    columns: {
+                        line: true,
+                        destination: true,
+                        platform: false,
+                        situations: true,
+                        time: true,
+                        via: true,
+                    },
                     placeId: 'NSR:StopPlace:60066',
                     type: 'stop_place',
                     uuid: '1683625543293',