futher tsx fuckery

Hyperfoil · Sep 25, 2023 · 237d7a8 · 237d7a8
1 parent bbe02b6
commit 237d7a8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/webapp/src/domain/reports/TableReportConfigPage.tsx b/webapp/src/domain/reports/TableReportConfigPage.tsx
@@ -272,7 +272,7 @@ export default function TableReportConfigPage() {
                                             owner: "",
                                             access: 0,
                                             notificationsEnabled: false,
-                                            views: [],
+                                            //views: [],
                                         },
                                     })
                                 }}

diff --git a/webapp/src/domain/tests/General.tsx b/webapp/src/domain/tests/General.tsx
@@ -51,7 +51,7 @@ export default function General({ test, onTestIdChange, onModified, funcsRef }:
                 name,
                 folder,
                 description,
-                views: [], // automatically insert default view in backend
+                //views: [], // automatically insert default view in backend
                 compareUrl: compareUrl || undefined, // when empty set to undefined
                 notificationsEnabled,
                 fingerprintLabels: [],

diff --git a/webapp/src/domain/tests/Test.tsx b/webapp/src/domain/tests/Test.tsx
@@ -36,6 +36,7 @@ import Access from "./Access"
 import Subscriptions from "./Subscriptions"
 import Transformers from "./Transformers"
 import MissingDataNotifications from "./MissingDataNotifications"
+import Api from "../../api"
 
 type Params = {
     testId: string
@@ -147,7 +148,7 @@ export default function Test() {
                             >
                                 <Views
                                     testId={testId}
-                                    views={test?.views || []}
+                                    views={ actions.getViews(testId) || []}
                                     testOwner={test ? test.owner : undefined}
                                     onModified={setModified}
                                     funcsRef={viewFuncsRef}

diff --git a/webapp/src/domain/tests/actionTypes.ts b/webapp/src/domain/tests/actionTypes.ts
@@ -11,6 +11,7 @@ export const UPDATE_ACCESS = "tests/UPDATE_ACCESS"
 export const UPDATE_TEST_WATCH = "tests/UPDATE_TEST_WATCH"
 export const UPDATE_VIEW = "Tests/UPDATE_VIEW"
 export const DELETE_VIEW = "Tests/DELETE_VIEW"
+export const GET_VIEWS = "Tests/GET_VIEWS"
 export const UPDATE_ACTION = "Tests/UPDATE_ACTION"
 export const UPDATE_FOLDERS = "Tests/UPDATE_FOLDERS"
 export const UPDATE_FOLDER = "Tests/UPDATE_FOLDER"

diff --git a/webapp/src/domain/tests/reducers.ts b/webapp/src/domain/tests/reducers.ts
@@ -2,8 +2,9 @@ import * as actionTypes from "./actionTypes"
 import { Map } from "immutable"
 import { ThunkDispatch } from "redux-thunk"
 import { AddAlertAction } from "../../alerts"
-import { Access, Action, Run, Test, TestToken, Transformer, View } from "../../api"
+import Api, { Access, Action, Run, Test, TestToken, Transformer, View } from "../../api"
 import { AnyAction } from "redux"
+import { getViews } from "./actions"
 
 export type CompareFunction = (runs: Run[]) => string
 
@@ -54,6 +55,12 @@ export interface UpdateTestWatchAction {
     byId: Map<number, string[] | undefined>
 }
 
+export interface GetViewsAction {
+    type: typeof actionTypes.GET_VIEWS
+    testId: number
+    views: View[]
+}
+
 export interface UpdateViewAction {
     type: typeof actionTypes.UPDATE_VIEW
     testId: number
@@ -125,6 +132,7 @@ export type TestAction =
     | DeleteAction
     | UpdateAccessAction
     | UpdateTestWatchAction
+    | GetViewsAction
     | UpdateViewAction
     | DeleteViewAction
     | UpdateActionAction
@@ -182,9 +190,10 @@ export const reducer = (state = new TestsState(), action: TestAction) => {
             {
                 const test = state.byId?.get(action.testId)
                 if (test) {
+                    let loadedViews : View[] = getViews(test.id);
                     let views
-                    if (test.views.some(v => v.id === action.view.id)) {
-                        views = test.views.map(v => (v.id === action.view.id ? action.view : v))
+                    if (loadedViews.some(v => v.id === action.view.id)) {
+                        views = loadedViews.map(v => (v.id === action.view.id ? action.view : v))
                     } else {
                         views = [...test.views, action.view]
                     }