Skip to content

[stable28] enh(settings): Set main page heading #42125

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
susnux merged 4 commits into from
Dec 14, 2023
Merged

[stable28] enh(settings): Set main page heading #42125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd20198
enh(settings): Set main heading for User management
Pytal Dec 8, 2023
291e56d
enh(settings): Set main heading for Apps
Pytal Dec 8, 2023
8d82cff
fix(settings): Expected string aria-label got boolean error
Pytal Dec 8, 2023
433ef6b
chore(assets): Recompile assets
nextcloud-command Dec 8, 2023
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
enh(settings): Set main heading for Apps 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal @backportbot-nextcloud
Pytal authored and backportbot-nextcloud[bot] committed Dec 8, 2023
commit 291e56d272edc961f4f295c7722efe4789a519e7
1 change: 1 addition & 0 deletions apps/settings/src/constants/AppsConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { translate as t } from '@nextcloud/l10n'

/** Enum of verification constants, according to Apps */
export const APPS_SECTION_ENUM = Object.freeze({
installed: t('settings', 'Your apps'),
enabled: t('settings', 'Active apps'),
disabled: t('settings', 'Disabled apps'),
updates: t('settings', 'Updates'),
Expand Down
13 changes: 11 additions & 2 deletions apps/settings/src/views/Apps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
:to="{ name: 'apps' }"
:exact="true"
icon="icon-category-installed"
:name="t('settings', 'Your apps')" />
:name="$options.APPS_SECTION_ENUM.installed" />
<NcAppNavigationItem id="app-category-enabled"
:to="{ name: 'apps-category', params: { category: 'enabled' } }"
icon="icon-category-enabled"
Expand Down Expand Up @@ -88,7 +88,9 @@
</NcAppNavigation>

<!-- Apps list -->
<NcAppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
<NcAppContent class="app-settings-content"
:class="{ 'icon-loading': loadingList }"
:page-heading="pageHeading">
<AppList :category="category" :app="app" :search="searchQuery" />
</NcAppContent>

Expand Down Expand Up @@ -206,6 +208,13 @@ export default {
},

computed: {
pageHeading() {
if (this.$options.APPS_SECTION_ENUM[this.category]) {
return this.$options.APPS_SECTION_ENUM[this.category]
}
const category = this.$store.getters.getCategoryById(this.category)
return category.displayName
},
loading() {
return this.$store.getters.loading('categories')
},
Expand Down