MOBILEAPPS-1734

.gitignore

@@ -74,4 +74,8 @@ lint/reports/
 /content/
 /gradle/libs.versions1.toml
 /process/
-/auth-alfresco/
+/auth-alfresco/
+/build_api.gradle
+/build_app.gradle
+/gradle/libs.versions_api.toml
+/gradle/libs.versions_app.toml

browse/src/main/kotlin/com/alfresco/content/browse/processes/details/ProcessDetailFragment.kt

@@ -83,7 +83,7 @@ class ProcessDetailFragment : BaseDetailFragment(), MavericksView {
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        binding.loading.isVisible = false
+        binding.loading.isVisible = state.listContents.isEmpty()
         setData(state)
         updateUI(state)
         epoxyAttachmentController.requestModelBuild()

browse/src/main/kotlin/com/alfresco/content/browse/processes/details/ProcessDetailViewModel.kt

@@ -1,6 +1,8 @@
 package com.alfresco.content.browse.processes.details
 
 import android.content.Context
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MavericksViewModel
 import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.Success
@@ -14,9 +16,13 @@ import com.alfresco.content.data.ProcessEntry
 import com.alfresco.content.data.TaskRepository
 import com.alfresco.content.data.UploadServerType
 import com.alfresco.content.data.UserGroupDetails
+import com.alfresco.content.data.payloads.LinkContentPayload
+import com.alfresco.coroutines.asFlow
 import com.alfresco.events.on
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.zip
+import kotlinx.coroutines.launch
 
 /**
  * Marked as ProcessDetailViewModel
@@ -30,10 +36,29 @@ class ProcessDetailViewModel(
     private var observeUploadsJob: Job? = null
 
     init {
+        state.parent?.let { processEntry ->
+            processEntry.defaultEntry?.let { entry ->
+                viewModelScope.launch {
+                    linkContentToProcess(entry).zip(singleProcessDefinition(processEntry.id)) { content, singleProcess ->
+                        Pair(content, singleProcess)
+                    }.execute {
+                        when (it) {
+                            is Success -> {
+                                val processData = ProcessEntry.with(it().second.listProcessDefinitions.first(), it().first)
+                                getStartForm(processData.id)
+                                updateContentAndProcessDefinition(it().first, processData)
+                            }
+                            else -> {
+                                this
+                            }
+                        }
+                    }
+                }
+            }
+        }
         viewModelScope.on<ActionUpdateNameDescription> {
             setState { copy(parent = it.entry as ProcessEntry) }
         }
-        updateDefaultEntry(state.parent?.defaultEntry)
         observeUploads(state)
     }
 
@@ -47,8 +72,6 @@ class ProcessDetailViewModel(
         }
     }
 
-    private fun updateDefaultEntry(entry: Entry?) = setState { copy(baseEntries = if (entry != null) listOf(entry) else emptyList()) }
-
     /**
      * update the formatted date in the existing ProcessEntry obj and update the UI.
      */
@@ -91,21 +114,41 @@ class ProcessDetailViewModel(
         observeUploadsJob = repo.observeUploads(state.parent.id, UploadServerType.UPLOAD_TO_PROCESS)
             .execute {
                 if (it is Success) {
-                    println("observer list ${it().size}")
                     updateUploads(it())
                 } else {
                     this
                 }
             }
     }
 
+    private fun getStartForm(processDefinitionId: String) = withState { state ->
+        viewModelScope.launch {
+            repository::startForm.asFlow(processDefinitionId).execute {
+                when (it) {
+                    is Loading -> copy(requestStartForm = Loading())
+                    is Fail -> copy(requestStartForm = Fail(it.error))
+                    is Success -> {
+                        updateFormFields(it()).copy(requestStartForm = Success(it()))
+                    }
+                    else -> {
+                        this
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * delete content locally
      */
     fun deleteAttachment(contentId: String) = stateFlow.execute {
         deleteUploads(contentId)
     }
 
+    private fun linkContentToProcess(entry: Entry) = repository::linkADWContentToProcess.asFlow(LinkContentPayload.with(entry))
+
+    private fun singleProcessDefinition(appDefinitionId: String) = repository::singleProcessDefinition.asFlow(appDefinitionId)
+
     companion object : MavericksViewModelFactory<ProcessDetailViewModel, ProcessDetailViewState> {
 
         override fun create(

browse/src/main/kotlin/com/alfresco/content/browse/processes/details/ProcessDetailViewState.kt

@@ -1,9 +1,13 @@
 package com.alfresco.content.browse.processes.details
 
+import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
 import com.alfresco.content.data.Entry
 import com.alfresco.content.data.OfflineStatus
 import com.alfresco.content.data.ProcessEntry
+import com.alfresco.content.data.ResponseListStartForm
+import com.alfresco.content.data.payloads.FieldsData
 
 /**
  * Marked as ProcessDetailViewState
@@ -12,11 +16,32 @@ data class ProcessDetailViewState(
     val parent: ProcessEntry?,
     val listContents: List<Entry> = emptyList(),
     val baseEntries: List<Entry> = emptyList(),
-    val uploads: List<Entry> = emptyList()
+    val uploads: List<Entry> = emptyList(),
+    val formFields: List<FieldsData> = emptyList(),
+    val requestStartForm: Async<ResponseListStartForm> = Uninitialized
 ) : MavericksState {
 
     constructor(target: ProcessEntry) : this(parent = target)
 
+    /**
+     * update ACS content and single definition data
+     */
+    fun updateContentAndProcessDefinition(entry: Entry?, processEntry: ProcessEntry): ProcessDetailViewState {
+        if (entry == null)
+            return this
+
+        return copyIncludingUploads(listOf(entry), emptyList()).copy(processEntry)
+    }
+
+    /**
+     * update form fields data
+     */
+    fun updateFormFields(response: ResponseListStartForm): ProcessDetailViewState {
+        requireNotNull(parent)
+        val formFields = response.fields.first().fields
+        return copy(formFields = formFields, parent = ProcessEntry.updateReviewerType(parent, formFields))
+    }
+
     /**
      * delete content locally and update UI
      */

browse/src/main/kotlin/com/alfresco/content/browse/processes/sheet/ProcessDefinitionsViewModel.kt

@@ -5,12 +5,9 @@ import com.airbnb.mvrx.MavericksViewModel
 import com.airbnb.mvrx.MavericksViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
-import com.alfresco.content.data.Entry
 import com.alfresco.content.data.TaskRepository
-import com.alfresco.content.data.payloads.LinkContentPayload
 import com.alfresco.coroutines.asFlow
 import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.zip
 import kotlinx.coroutines.launch
 
 internal class ProcessDefinitionsViewModel(
@@ -24,14 +21,12 @@ internal class ProcessDefinitionsViewModel(
 
     private fun buildModel() = withState { state ->
         viewModelScope.launch {
-            processDefinitions().zip(linkContentToProcess(state.entry)) { requestProcess, requestContent ->
-                Pair(requestProcess, requestContent)
-            }.execute {
+            processDefinitions().execute {
                 when (it) {
                     is Success -> {
                         ProcessDefinitionsState(
-                            entry = it().second,
-                            listProcessDefinitions = it().first.listRuntimeProcessDefinitions
+                            entry = state.entry,
+                            listProcessDefinitions = it().listRuntimeProcessDefinitions
                         )
                     }
                     else -> {
@@ -45,8 +40,6 @@ internal class ProcessDefinitionsViewModel(
         }
     }
 
-    private fun linkContentToProcess(entry: Entry) = TaskRepository()::linkADWContentToProcess.asFlow(LinkContentPayload.with(entry))
-
     private fun processDefinitions() = TaskRepository()::processDefinitions.asFlow()
 
     companion object : MavericksViewModelFactory<ProcessDefinitionsViewModel, ProcessDefinitionsState> {

component/src/main/java/com/alfresco/content/component/SearchUserGroupComponentBuilder.kt

@@ -12,7 +12,7 @@ internal typealias SearchUserComponentApplyCallback = (UserGroupDetails) -> Unit
 internal typealias SearchUserComponentCancelCallback = () -> Unit
 
 /**
- * Builder for build the search user component sheet
+ * Builder for build the search user and group component sheet
  */
 data class SearchUserGroupComponentBuilder(
     val context: Context,

component/src/main/java/com/alfresco/content/component/SearchUserGroupComponentSheet.kt

@@ -20,6 +20,8 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.alfresco.content.common.isValidEmail
 import com.alfresco.content.component.databinding.SheetComponentSearchUserBinding
+import com.alfresco.content.data.ProcessEntry
+import com.alfresco.content.data.ReviewerType
 import com.alfresco.content.hideSoftInput
 import com.alfresco.ui.BottomSheetDialogFragment
 import com.alfresco.ui.getDrawableForAttribute
@@ -149,9 +151,21 @@ class SearchUserGroupComponentSheet : BottomSheetDialogFragment(), MavericksView
         binding.loading.isVisible = state.requestUser is Loading
 
         if (viewModel.canSearchGroups) {
+            binding.rgSelector.visibility = View.GONE
+            binding.searchView.queryHint = when ((state.parent as ProcessEntry).reviewerType) {
+                ReviewerType.FUNCTIONAL_GROUP -> {
+                    viewModel.searchByNameOrIndividual = false
+                    getString(R.string.search_group)
+                }
+                else -> {
+                    viewModel.searchByNameOrIndividual = true
+                    getString(R.string.search_user)
+                }
+            }
             binding.searchByNameOrIndividual.text = getString(R.string.individual_title)
             binding.searchByEmailOrGroups.text = getString(R.string.group_title)
         } else {
+            binding.rgSelector.visibility = View.VISIBLE
             binding.searchByNameOrIndividual.text = getString(R.string.text_by_name)
             binding.searchByEmailOrGroups.text = getString(R.string.text_by_email)
         }

component/src/main/java/com/alfresco/content/component/SearchUserGroupComponentViewModel.kt

@@ -12,6 +12,7 @@ import com.alfresco.content.data.APIEvent
 import com.alfresco.content.data.AnalyticsManager
 import com.alfresco.content.data.ProcessEntry
 import com.alfresco.content.data.ResponseUserGroupList
+import com.alfresco.content.data.ReviewerType
 import com.alfresco.content.data.TaskRepository
 import com.alfresco.content.data.UserGroupDetails
 import java.util.concurrent.CancellationException
@@ -52,7 +53,11 @@ class SearchUserGroupComponentViewModel(
 
         setState {
             canSearchGroups = parent is ProcessEntry
-            copy(listUserGroup = listOf(getLoggedInUser()))
+            var listUserGroup: List<UserGroupDetails> = listOf()
+            if (parent is ProcessEntry && parent.reviewerType != ReviewerType.FUNCTIONAL_GROUP) {
+                listUserGroup = listOf(getLoggedInUser())
+            }
+            copy(listUserGroup = listUserGroup)
         }
 
         viewModelScope.launch {

component/src/main/res/values/strings.xml

@@ -27,4 +27,6 @@
     <string name="text_by_email">By E-mail</string>
     <string name="text_back_button">Back Button</string>
     <string name="filter.option.all">All</string>
+    <string name="search_user">Search User</string>
+    <string name="search_group">Search Group</string>
 </resources>

data/objectbox-models/default.json.bak

@@ -138,11 +138,6 @@
           "id": "27:4514687495334138822",
           "name": "uploadServer",
           "type": 9
-        },
-        {
-          "id": "28:949912739494302928",
-          "name": "isProcessService",
-          "type": 1
         }
       ],
       "relations": []
@@ -157,7 +152,8 @@
   "retiredEntityUids": [],
   "retiredIndexUids": [],
   "retiredPropertyUids": [
-    84855644780396979
+    84855644780396979,
+    949912739494302928
   ],
   "retiredRelationUids": [],
   "version": 1

data/src/main/kotlin/com/alfresco/content/data/ProcessDefinitionDataEntry.kt

@@ -0,0 +1,41 @@
+package com.alfresco.content.data
+
+import android.os.Parcelable
+import com.alfresco.process.models.ProcessDefinitionEntry
+import kotlinx.parcelize.Parcelize
+
+/**
+ * Marked as RuntimeProcessDefinitionDataEntry
+ */
+@Parcelize
+data class ProcessDefinitionDataEntry(
+    val id: String? = null,
+    val name: String? = null,
+    val description: String? = null,
+    val key: String? = null,
+    val category: String? = null,
+    val version: Int? = null,
+    val deploymentId: String? = null,
+    val tenantId: String? = null,
+    val hasStartForm: Boolean? = null
+) : ParentEntry(), Parcelable {
+    companion object {
+
+        /**
+         * return RuntimeProcessDefinitionDataEntry by using RuntimeProcessDefinitionEntry
+         */
+        fun with(raw: ProcessDefinitionEntry): ProcessDefinitionDataEntry {
+            return ProcessDefinitionDataEntry(
+                id = raw.id,
+                name = raw.name,
+                description = raw.description,
+                key = raw.key,
+                category = raw.category,
+                version = raw.version,
+                deploymentId = raw.deploymentId,
+                tenantId = raw.tenantId,
+                hasStartForm = raw.hasStartForm
+            )
+        }
+    }
+}