diff --git a/app/static/src/app/components/SessionInitialiseModal.vue b/app/static/src/app/components/SessionInitialiseModal.vue new file mode 100644 index 000000000..343c59d73 --- /dev/null +++ b/app/static/src/app/components/SessionInitialiseModal.vue @@ -0,0 +1,41 @@ + + \ No newline at end of file diff --git a/app/static/src/app/components/WodinSession.vue b/app/static/src/app/components/WodinSession.vue index 8a23795b4..1412c635c 100644 --- a/app/static/src/app/components/WodinSession.vue +++ b/app/static/src/app/components/WodinSession.vue @@ -1,11 +1,18 @@ diff --git a/app/static/src/app/store/appState/actions.ts b/app/static/src/app/store/appState/actions.ts index 94bdec93e..71b347c9e 100644 --- a/app/static/src/app/store/appState/actions.ts +++ b/app/static/src/app/store/appState/actions.ts @@ -35,6 +35,7 @@ async function immediateUploadState(context: ActionContext) export const appStateActions: ActionTree = { async [AppStateAction.Initialise](context, payload: InitialisePayload) { + // TODO: just accept loadSessionId here, everything else should already be set in the state const { commit, state, dispatch, getters } = context; @@ -46,13 +47,13 @@ export const appStateActions: ActionTree = { enableI18n, defaultLanguage } = payload; - commit(AppStateMutation.SetApp, { + /*commit(AppStateMutation.SetApp, { appName, baseUrl, appsPath, enableI18n, defaultLanguage - }); + });*/ localStorageManager.addSessionId(appName, getters[AppStateGetter.baseUrlPath], state.sessionId); const response = await api(context) diff --git a/app/static/src/app/store/appState/mutations.ts b/app/static/src/app/store/appState/mutations.ts index 67128a618..93de9390e 100644 --- a/app/static/src/app/store/appState/mutations.ts +++ b/app/static/src/app/store/appState/mutations.ts @@ -21,7 +21,8 @@ export enum AppStateMutation { export const StateUploadMutations = [ AppStateMutation.ClearQueuedStateUpload, AppStateMutation.SetQueuedStateUpload, - AppStateMutation.SetStateUploadInProgress + AppStateMutation.SetStateUploadInProgress, + AppStateMutation.SetPersisted ] as string[]; export const appStateMutations: MutationTree = { diff --git a/app/static/src/app/userMessages.ts b/app/static/src/app/userMessages.ts index d6c9968c9..0eedcc695 100644 --- a/app/static/src/app/userMessages.ts +++ b/app/static/src/app/userMessages.ts @@ -110,6 +110,7 @@ export default { loadApplication: { link: "Load the application", suffix: " to create a new session." - } + }, + initialise: "Would you like to reload the most recent session or start a new session?" } };