Skip to content

CMM-828 taxonomies data view second iteration create, update, delete support #22268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Oct 9, 2025
Merged

CMM-828 taxonomies data view second iteration create, update, delete support #22268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
33bd205
Using edit texts instead of labels for term details
adalpari Oct 8, 2025
f336284
Using a MVVM approach
adalpari Oct 8, 2025
bb3c22b
Fixing fields visibility
adalpari Oct 8, 2025
5f8ce42
Fixing showed parents
adalpari Oct 8, 2025
4ef2cd4
Saving term changes
adalpari Oct 8, 2025
896605e
Saving changes
adalpari Oct 8, 2025
be8cd6b
Saving term
adalpari Oct 8, 2025
8912911
Adding create screen
adalpari Oct 8, 2025
ce8a3ab
Moving navigation to the VM
adalpari Oct 8, 2025
55ae0a0
Adding delete term button
adalpari Oct 8, 2025
be1bcf8
Showing possible error using a toast
adalpari Oct 8, 2025
0ee22e0
Fixing the creation button bug
adalpari Oct 8, 2025
f6c9887
detekt and style
adalpari Oct 8, 2025
8cb91f8
Fixing parent and UIEvent issue
adalpari Oct 8, 2025
b1cba50
Title fix
adalpari Oct 8, 2025
8da8a88
Adding tess
adalpari Oct 8, 2025
d12bbac
Merge branch 'trunk' into feature/CMM-828-TaxonomiesDataView-second-i…
adalpari Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing fields visibility
  • Loading branch information
@adalpari
adalpari committed Oct 8, 2025
commit bb3c22b7800a3b4aea25faa498acda9b5a17b392
19 changes: 8 additions & 11 deletions WordPress/src/main/java/org/wordpress/android/ui/taxonomies/TermsDataViewActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,14 @@ class TermsDataViewActivity : BaseAppCompatActivity() {
singleLine = false
)

DetailRow(
label = stringResource(R.string.term_count_label),
value = state.count.toString()
)

ParentDropdownField(
label = stringResource(R.string.term_parent_label),
availableParents = state.availableParents,
selectedParentId = state.parentId,
onParentIdChange = { viewModel.updateTermParent(it) }
)
if (!state.availableParents.isNullOrEmpty() && state.parentId != null) {
ParentDropdownField(
label = stringResource(R.string.term_parent_label),
availableParents = state.availableParents,
selectedParentId = state.parentId,
onParentIdChange = { viewModel.updateTermParent(it) }
)
}
}
}
}
Expand Down
18 changes: 10 additions & 8 deletions WordPress/src/main/java/org/wordpress/android/ui/taxonomies/TermsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ data class TermDetailUiState(
val slug: String = "",
val description: String = "",
val count: Long = 0L,
val parentId: Long = 0L,
val availableParents: List<ParentOption> = emptyList(),
val isLoading: Boolean = false
val parentId: Long? = null,
val availableParents: List<ParentOption>? = null,
)

data class ParentOption(
Expand Down Expand Up @@ -90,19 +89,22 @@ class TermsViewModel @Inject constructor(
fun navigateToTermDetail(termId: Long) {
val term = currentTerms.firstOrNull { it.id == termId } ?: return

val availableParents = currentTerms
.filter { it.id != termId }
.map { ParentOption(id = it.id, name = it.name) }
val availableParents = if (isHierarchical) {
currentTerms
.filter { it.id != termId }
.map { ParentOption(id = it.id, name = it.name) }
} else {
null
}

_termDetailState.value = TermDetailUiState(
termId = term.id,
name = term.name,
slug = term.slug,
description = term.description,
count = term.count,
parentId = term.parent ?: 0L,
parentId = term.parent,
availableParents = availableParents,
isLoading = false
)
}

Expand Down