Always open root directory in TreeView

THM-MoTE · Sep 27, 2019 · 7e6e787 · 7e6e787
1 parent 6b57236
commit 7e6e787
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ui/src/models/file.ts b/ui/src/models/file.ts
@@ -35,6 +35,9 @@ export function setId(root:FileNode): FileNode {
     ...root
   }
 }
+export function toggleRoot(root:FileNode): FileNode {
+  return { ...root, toggled: true }
+}
 
 export function renameFile(root: FileNode, oldFile: FilePath, newFile: FilePath): FileNode {
   if(root.file && root.file === oldFile)

diff --git a/ui/src/redux/reducers.ts b/ui/src/redux/reducers.ts
@@ -1,21 +1,23 @@
 import { initialState, AppState, Session, SimulationOption, SimulationData, ProjectPreviewState, Notification, BackgroundJobInfo } from '../models/state'
 import { Project } from '../models/project'
-import { File, FileNode, setId } from '../models/file'
+import { File, FileNode, setId, toggleRoot } from '../models/file'
 import { Action, ActionTypes } from './actions'
 import * as utils from '../utils'
 import * as R from 'ramda'
 import { CompilerError, AuthServiceToken, WebmodelicaToken } from '../models/index';
 import { oc } from 'ts-optchain';
 
+const setupNodes = R.compose(toggleRoot, setId)
+
 const reducerMap = {
   [ActionTypes.SetProjects.toString()]: (state: AppState, data: Project[]) => { return { ...state, projects: data } },
   [ActionTypes.SetProject.toString()]: (state: AppState, project: Project) => ({
     ...state,
     projects: R.reduce((acc: Project[], p) => R.append((p.id === project.id) ? project : p, acc), [], state.projects)
   }),
-  [ActionTypes.SetSessionFiles.toString()]: (state: AppState, files: FileNode) => ({ ...state, session: { ...state.session!, files: setId(files) } }),
+  [ActionTypes.SetSessionFiles.toString()]: (state: AppState, files: FileNode) => ({ ...state, session: { ...state.session!, files: setupNodes(files) } }),
   [ActionTypes.AddProject.toString()]: (state: AppState, data: Project) => ({ ...state, projects: R.prepend(data, state.projects) }),
-  [ActionTypes.SetProjectPreview.toString()]: (state: AppState, data: ProjectPreviewState) => ({ ...state, projectPreview: { ...data, files: setId(data.files) } }),
+  [ActionTypes.SetProjectPreview.toString()]: (state: AppState, data: ProjectPreviewState) => ({ ...state, projectPreview: { ...data, files: setupNodes(data.files) } }),
   [ActionTypes.SetOpenFile.toString()]: (state: AppState, file: File) => R.assocPath(['session', 'openedFile'], file, state),
   [ActionTypes.SetSession.toString()]: (state: AppState, session: Session) => ({ ...state, session: session }),
   [ActionTypes.UpdateWsToken.toString()]: (state: AppState, token: string) => {