Coming back to select workspace when not selected (#517)

leandroBorgesFerreira · Leandro Ferreira · web-flow · commit e4f4525179a2 · 2025-11-06T20:42:51.000+01:00
Co-authored-by: Leandro Ferreira &lt;email@email.com&gt;
diff --git a/application/composeApp/src/commonMain/kotlin/io/writeopia/navigation/StartUp.kt b/application/composeApp/src/commonMain/kotlin/io/writeopia/navigation/StartUp.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
+import io.writeopia.auth.core.manager.LoginStatus
 import io.writeopia.auth.di.AuthInjection
 import io.writeopia.auth.menu.AuthMenuViewModel
 import io.writeopia.common.utils.Destinations
@@ -42,10 +43,10 @@ fun NavGraphBuilder.startScreen(
             authMenuViewModel.isLoggedIn().collect { loggedIn ->
                 delay(300)
                 navigationController.navigate(
-                    if (loggedIn) {
-                        Destinations.MAIN_APP.id
-                    } else {
-                        Destinations.AUTH_MENU_INNER_NAVIGATION.id
+                    when (loggedIn) {
+                        LoginStatus.OFFLINE -> Destinations.AUTH_MENU_INNER_NAVIGATION.id
+                        LoginStatus.CHOOSE_WORKSPACE -> Destinations.CHOOSE_WORKSPACE.id
+                        LoginStatus.ONLINE ->  Destinations.MAIN_APP.id
                     }
                 )
             }
diff --git a/application/core/auth_core/config/ktlint/baseline.xml b/application/core/auth_core/config/ktlint/baseline.xml
@@ -19,9 +19,6 @@
         <error line="24" column="79" source="standard:class-signature" />
         <error line="52" column="84" source="standard:function-expression-body" />
     </file>
-    <file name="src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt">
-        <error line="14" column="76" source="standard:curly-spacing" />
-    </file>
     <file name="src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt">
         <error line="16" column="51" source="standard:function-expression-body" />
     </file>
diff --git a/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt b/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/AuthRepository.kt
@@ -11,7 +11,8 @@ interface AuthRepository : UserRepository {
 
     override fun listenForUser(): Flow<WriteopiaUser> = flow { emit(getUser()) }
 
-    fun listenForWorkspace(): Flow<Workspace> = flow { emit(getWorkspace())}
+    fun listenForWorkspace(): Flow<Workspace> =
+        flow { emit(getWorkspace() ?: Workspace.disconnectedWorkspace()) }
 
     override suspend fun getUser(): WriteopiaUser
 
@@ -27,7 +28,7 @@ interface AuthRepository : UserRepository {
 
     suspend fun useOffline()
 
-    override suspend fun getWorkspace(): Workspace
+    override suspend fun getWorkspace(): Workspace?
 
     suspend fun saveWorkspace(workspace: Workspace)
 
diff --git a/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/LoginStatus.kt b/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/LoginStatus.kt
@@ -0,0 +1,7 @@
+package io.writeopia.auth.core.manager
+
+enum class LoginStatus {
+    OFFLINE,
+    CHOOSE_WORKSPACE,
+    ONLINE
+}
diff --git a/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt b/application/core/auth_core/src/commonMain/kotlin/io/writeopia/auth/core/manager/SqlDelightAuthRepository.kt
@@ -65,7 +65,7 @@ internal class SqlDelightAuthRepository(
         saveUser(user.copy(id = WriteopiaUser.DISCONNECTED), true)
     }
 
-    override suspend fun getWorkspace(): Workspace =
+    override suspend fun getWorkspace(): Workspace? =
         writeopiaDb?.workspaceEntityQueries
             ?.selectCurrentWorkspace()
             ?.executeAsOneOrNull()
@@ -78,7 +78,7 @@ internal class SqlDelightAuthRepository(
                     selected = entity.selected.toBoolean(),
                     role = ""
                 )
-            } ?: Workspace.disconnectedWorkspace()
+            }
 
     override suspend fun saveWorkspace(workspace: Workspace) {
         writeopiaDb?.workspaceEntityQueries
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/FolderSync.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/FolderSync.kt
@@ -22,7 +22,7 @@ class FolderSync(
      * This logic is atomic. If it fails, the whole process must be tried again in a future time.
      * The sync time of the folder will only be updated with everything works correctly.
      */
-    suspend fun syncFolder(folderId: String, workspaceId: String, userId: String) {
+    suspend fun syncFolder(folderId: String, workspaceId: String) {
         val authToken = authRepository.getAuthToken() ?: return
 
 //        println("folderId: $folderId")
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/WorkspaceSync.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/WorkspaceSync.kt
@@ -18,7 +18,7 @@ class WorkspaceSync(
     suspend fun syncWorkspace(workspaceId: String): ResultData<Unit> {
         try {
             val authToken = authRepository.getAuthToken() ?: return ResultData.Error(null)
-            val workspace = authRepository.getWorkspace()
+            val workspace = authRepository.getWorkspace() ?: return ResultData.Idle()
 
             val response = documentsApi.getWorkspaceNewData(
                 workspaceId,
diff --git a/application/core/persistence_sqldelight/src/commonMain/kotlin/io/writeopia/sqldelight/dao/WorkspaceSqlDelightDao.kt b/application/core/persistence_sqldelight/src/commonMain/kotlin/io/writeopia/sqldelight/dao/WorkspaceSqlDelightDao.kt
diff --git a/application/features/account/src/commonMain/kotlin/io/writeopia/account/viewmodel/AccountMenuKmpViewModel.kt b/application/features/account/src/commonMain/kotlin/io/writeopia/account/viewmodel/AccountMenuKmpViewModel.kt
@@ -23,6 +23,7 @@ internal class AccountMenuKmpViewModel(
 
     override fun logout(onLogOutSuccess: () -> Unit) {
         viewModelScope.launch {
+            authRepository.unselectAllWorkspaces()
             val result = authRepository.logout()
 
             if (result.toBoolean()) {
diff --git a/application/features/auth/src/commonMain/kotlin/io/writeopia/auth/menu/AuthMenuViewModel.kt b/application/features/auth/src/commonMain/kotlin/io/writeopia/auth/menu/AuthMenuViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import io.writeopia.auth.core.data.AuthApi
 import io.writeopia.auth.core.manager.AuthRepository
+import io.writeopia.auth.core.manager.LoginStatus
 import io.writeopia.sdk.models.user.Tier
 import io.writeopia.sdk.models.user.WriteopiaUser
 import io.writeopia.sdk.models.utils.ResultData
@@ -39,11 +40,21 @@ class AuthMenuViewModel(
         _password.value = name
     }
 
-    fun isLoggedIn(): Flow<Boolean> = flow {
+    fun isLoggedIn(): Flow<LoginStatus> = flow {
         val user = authRepository.getUser()
+        val workspace = authRepository.getWorkspace()
+
         val loggedId = authRepository.isLoggedIn() || user.id != WriteopiaUser.DISCONNECTED
 
-        emit(loggedId)
+        val status = when {
+            loggedId && workspace != null -> LoginStatus.ONLINE
+
+            loggedId && workspace == null -> LoginStatus.CHOOSE_WORKSPACE
+
+            else -> LoginStatus.OFFLINE
+        }
+
+        emit(status)
     }
 
     fun useOffline(sideEffect: () -> Unit) {
diff --git a/application/features/editor/config/ktlint/baseline.xml b/application/features/editor/config/ktlint/baseline.xml
@@ -5,12 +5,12 @@
         <error line="6" column="65" source="standard:class-signature" />
     </file>
     <file name="src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt">
-        <error line="87" column="5" source="standard:class-signature" />
-        <error line="144" column="17" source="standard:backing-property-naming" />
-        <error line="146" column="17" source="standard:backing-property-naming" />
+        <error line="88" column="5" source="standard:class-signature" />
+        <error line="145" column="17" source="standard:backing-property-naming" />
         <error line="147" column="17" source="standard:backing-property-naming" />
-        <error line="230" column="17" source="standard:backing-property-naming" />
-        <error line="259" column="17" source="standard:backing-property-naming" />
+        <error line="148" column="17" source="standard:backing-property-naming" />
+        <error line="231" column="17" source="standard:backing-property-naming" />
+        <error line="260" column="17" source="standard:backing-property-naming" />
     </file>
     <file name="src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorViewModel.kt">
         <error line="17" column="33" source="standard:class-signature" />
diff --git a/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt b/application/features/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/viewmodel/NoteEditorKmpViewModel.kt
@@ -33,6 +33,7 @@ import io.writeopia.sdk.models.span.SpanInfo
 import io.writeopia.sdk.models.story.StoryTypes
 import io.writeopia.sdk.models.story.Tag
 import io.writeopia.sdk.models.utils.ResultData
+import io.writeopia.sdk.models.workspace.Workspace
 import io.writeopia.sdk.persistence.core.tracker.OnUpdateDocumentTracker
 import io.writeopia.sdk.repository.DocumentRepository
 import io.writeopia.sdk.serialization.extensions.toApi
@@ -356,16 +357,15 @@ class NoteEditorKmpViewModel(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override val listenForFolders: StateFlow<List<MenuItemUi.FolderUi>> =
-        MutableStateFlow("root")
-            .flatMapLatest {
+        authRepository.listenForWorkspace()
+            .flatMapLatest { workspace ->
                 combine(
                     _expandedFolders,
                     folderRepository.listenForFoldersByParentId(
                         "root",
-                        authRepository.getWorkspace().id
+                        workspace.id
                     ),
-                    authRepository.listenForWorkspace(),
-                ) { expanded, map, workspace ->
+                ) { expanded, map ->
                     val folderUiMap = map.mapValues { (_, item) ->
                         item.map {
                             it.toFolderUi(expanded = expanded.contains(it.id))
@@ -431,8 +431,10 @@ class NoteEditorKmpViewModel(
         if (writeopiaManager.isInitialized()) return
 
         viewModelScope.launch(Dispatchers.Default) {
+            val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
+
             val document =
-                documentRepository.loadDocumentById(documentId, authRepository.getWorkspace().id)
+                documentRepository.loadDocumentById(documentId, workspace.id)
 
             if (document != null) {
                 writeopiaManager.loadDocument(document)
@@ -586,9 +588,10 @@ class NoteEditorKmpViewModel(
             }
         } else {
             viewModelScope.launch {
+                val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
                 folderRepository.listenForFoldersByParentId(
                     folderId,
-                    authRepository.getWorkspace().id
+                    workspace.id
                 )
                 _expandedFolders.value = expanded + folderId
             }
diff --git a/application/features/global_shell/src/commonMain/kotlin/io/writeopia/global/shell/viewmodel/GlobalShellKmpViewModel.kt b/application/features/global_shell/src/commonMain/kotlin/io/writeopia/global/shell/viewmodel/GlobalShellKmpViewModel.kt
@@ -304,7 +304,8 @@ class GlobalShellKmpViewModel(
 
         viewModelScope.launch(Dispatchers.Default) {
             val userId = getUserId()
-            val workspaceId = authRepository.getWorkspace().id
+            val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
+            val workspaceId = workspace.id
 
             if (!configRepository.hasFirstConfiguration(userId)) {
                 val now = Clock.System.now()
@@ -358,10 +359,12 @@ class GlobalShellKmpViewModel(
             }
         } else {
             viewModelScope.launch {
+                val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
+
                 notesUseCase.listenForMenuItemsByParentId(
                     id,
                     getUserId(),
-                    authRepository.getWorkspace().id
+                    workspace.id
                 )
 
                 _expandedFolders.value = expanded + id
@@ -413,6 +416,8 @@ class GlobalShellKmpViewModel(
 
     override fun changeIcons(menuItemId: String, icon: String, tint: Int, iconChange: IconChange) {
         viewModelScope.launch {
+            val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
+
             when (iconChange) {
                 IconChange.FOLDER -> notesUseCase.updateFolderById(menuItemId) { folder ->
                     folder.copy(
@@ -423,7 +428,7 @@ class GlobalShellKmpViewModel(
 
                 IconChange.DOCUMENT -> notesUseCase.updateDocumentById(
                     menuItemId,
-                    authRepository.getWorkspace().id
+                    workspace.id
                 ) { document ->
                     document.copy(
                         icon = MenuItem.Icon(icon, tint),
@@ -512,6 +517,7 @@ class GlobalShellKmpViewModel(
         viewModelScope.launch {
             val currentUserId = authRepository.getUser().id
 
+            authRepository.unselectAllWorkspaces()
             authRepository.logout()
             authRepository.saveToken(currentUserId, "")
 
@@ -531,6 +537,7 @@ class GlobalShellKmpViewModel(
                 }
 
                 if (result is ResultData.Complete && result.data) {
+                    authRepository.unselectAllWorkspaces()
                     authRepository.logout()
                     _loginStateTrigger.value = GenerateId.generate()
                     dismissDeleteConfirm()
@@ -550,8 +557,8 @@ class GlobalShellKmpViewModel(
 
     override fun syncWorkspace() {
         viewModelScope.launch {
-            val workspaceId = authRepository.getWorkspace().id
-            println("syncing workspace: $workspaceId")
+            val workspace = authRepository.getWorkspace() ?: Workspace.disconnectedWorkspace()
+            val workspaceId = workspace.id
             val result = workspaceSync.syncWorkspace(workspaceId)
 
             _lastWorkspaceSync.value = if (result is ResultData.Complete) {
diff --git a/application/features/note_menu/config/ktlint/baseline.xml b/application/features/note_menu/config/ktlint/baseline.xml
@@ -10,13 +10,13 @@
         <error line="23" column="1" source="standard:no-unused-imports" />
     </file>
     <file name="src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt">
-        <error line="74" column="26" source="standard:class-signature" />
-        <error line="74" column="26" source="standard:class-signature" />
-        <error line="74" column="39" source="standard:class-signature" />
-        <error line="116" column="17" source="standard:backing-property-naming" />
-        <error line="145" column="17" source="standard:backing-property-naming" />
-        <error line="157" column="17" source="standard:backing-property-naming" />
-        <error line="252" column="57" source="standard:function-expression-body" />
+        <error line="75" column="26" source="standard:class-signature" />
+        <error line="75" column="26" source="standard:class-signature" />
+        <error line="75" column="39" source="standard:class-signature" />
+        <error line="117" column="17" source="standard:backing-property-naming" />
+        <error line="146" column="17" source="standard:backing-property-naming" />
+        <error line="158" column="17" source="standard:backing-property-naming" />
+        <error line="253" column="57" source="standard:function-expression-body" />
     </file>
     <file name="src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteViewModel.kt">
         <error line="105" column="28" source="standard:class-signature" />
@@ -28,6 +28,7 @@
         <error line="131" column="72" source="standard:class-signature" />
     </file>
     <file name="src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/FolderStateController.kt">
-        <error line="30" column="17" source="standard:backing-property-naming" />
+        <error line="31" column="17" source="standard:backing-property-naming" />
+        <error line="75" column="1" source="standard:no-consecutive-blank-lines" />
     </file>
 </baseline>
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/ChooseNoteKmpViewModel.kt
@@ -33,6 +33,7 @@ import io.writeopia.sdk.models.story.StoryTypes
 import io.writeopia.sdk.models.user.Tier
 import io.writeopia.sdk.models.user.WriteopiaUser
 import io.writeopia.sdk.models.utils.ResultData
+import io.writeopia.sdk.models.workspace.Workspace
 import io.writeopia.sdk.preview.PreviewParser
 import io.writeopia.ui.keyboard.KeyboardEvent
 import kotlinx.coroutines.Dispatchers
@@ -448,11 +449,15 @@ internal class ChooseNoteKmpViewModel(
     override fun syncFolderWithCloud() {
         viewModelScope.launch(Dispatchers.Default) {
             // Refresh happens inside syncFolder
-            if (authRepository.isLoggedIn() && authRepository.getUser().tier == Tier.PREMIUM) {
+            val workspace = authRepository.getWorkspace()
+            if (
+                authRepository.isLoggedIn() &&
+                authRepository.getUser().tier == Tier.PREMIUM &&
+                workspace != null
+            ) {
                 folderSync.syncFolder(
                     notesNavigation.id,
-                    authRepository.getWorkspace().id,
-                    authRepository.getUser().id
+                    workspace.id
                 )
             }
         }
@@ -630,5 +635,6 @@ internal class ChooseNoteKmpViewModel(
 
     private suspend fun getUserId(): String = authRepository.getUser().id
 
-    private suspend fun getWorkspaceId(): String = authRepository.getWorkspace().id
+    private suspend fun getWorkspaceId(): String =
+        authRepository.getWorkspace()?.id ?: Workspace.disconnectedWorkspace().id
 }
diff --git a/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/FolderStateController.kt b/application/features/note_menu/src/commonMain/kotlin/io/writeopia/notemenu/viewmodel/FolderStateController.kt
diff --git a/plugins/writeopia_persistence_sqldelight/src/commonMain/kotlin/io/writeopia/sdk/persistence/sqldelight/dao/sql/SqlDelightDocumentRepository.kt b/plugins/writeopia_persistence_sqldelight/src/commonMain/kotlin/io/writeopia/sdk/persistence/sqldelight/dao/sql/SqlDelightDocumentRepository.kt
diff --git a/writeopia/src/commonMain/kotlin/io/writeopia/sdk/repository/UserRepository.kt b/writeopia/src/commonMain/kotlin/io/writeopia/sdk/repository/UserRepository.kt
