fix #349: add custom controller to retrieve core apps
This commit is contained in:
@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
:data-app-id="app.id"
|
||||
class="app-menu-entry"
|
||||
:class="{
|
||||
'app-menu-entry__active': app.active,
|
||||
'app-menu-entry__active': app.id === activeApp,
|
||||
'app-menu-entry__hidden-label': hiddenLabels === 1,
|
||||
'app-menu-main__show-hovered': hiddenLabels === 2,
|
||||
}"
|
||||
@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
:class="{ 'has-unread': app.unread > 0 }"
|
||||
:aria-label="app.name"
|
||||
:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
|
||||
:aria-current="app.active ? 'page' : false"
|
||||
:aria-current="app.id === activeApp ? 'page' : false"
|
||||
>
|
||||
<img
|
||||
:src="app.icon"
|
||||
@@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
v-for="app in popoverAppList"
|
||||
:key="app.id"
|
||||
:aria-label="app.name"
|
||||
:aria-current="app.active ? 'page' : false"
|
||||
:aria-current="app.id === activeApp ? 'page' : false"
|
||||
:href="app.href"
|
||||
:style="makeStyle(app)"
|
||||
class="cm-standardmenu-app-menu-popover-entry app-menu-popover-entry"
|
||||
@@ -101,6 +101,7 @@ import { ref, onMounted } from 'vue'
|
||||
import { useConfigStore } from '../store/config.js'
|
||||
import { useNavStore } from '../store/nav.js'
|
||||
import { NcActions, NcActionLink } from '@nextcloud/vue'
|
||||
import { getActiveAppId } from '../lib/app.js'
|
||||
|
||||
const navStore = useNavStore()
|
||||
const configStore = useConfigStore()
|
||||
@@ -112,6 +113,7 @@ const topMenuApps = ref([])
|
||||
const appsOrder = ref([])
|
||||
const mainAppList = ref([])
|
||||
const popoverAppList = ref([])
|
||||
const activeApp = ref(null)
|
||||
let resizeTimeout = null
|
||||
|
||||
const setApps = (value) => {
|
||||
@@ -170,6 +172,7 @@ onMounted(async () => {
|
||||
hiddenLabels.value = config['top-menu-mouse-over-hidden-label']
|
||||
topMenuApps.value = config['top-menu-apps']
|
||||
appsOrder.value = config['apps-order']
|
||||
activeApp.value = getActiveAppId()
|
||||
ready.value = true
|
||||
|
||||
setApps(await navStore.getCoreApps())
|
||||
|
||||
+1
-4
@@ -41,10 +41,7 @@ export const useNavStore = defineStore('nav', () => {
|
||||
|
||||
async function getCoreApps() {
|
||||
if (coreApps == null) {
|
||||
coreApps = await axios
|
||||
.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
|
||||
.then((response) => response.data)
|
||||
.then((value) => value.ocs.data)
|
||||
coreApps = await await axios.get(generateUrl('/apps/side_menu/core/apps')).then((response) => response.data.items)
|
||||
}
|
||||
|
||||
return coreApps
|
||||
|
||||
Reference in New Issue
Block a user