diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js index efe0e8cd4..a1256c53f 100644 --- a/frontend/src/components/Menu/Sidebar.spec.js +++ b/frontend/src/components/Menu/Sidebar.spec.js @@ -54,8 +54,8 @@ const createVuexStore = (state = {}) => }, }) -CONFIG.GMS_ACTIVE = 'true' -CONFIG.HUMHUB_ACTIVE = 'true' +CONFIG.GMS_ACTIVE = true +CONFIG.HUMHUB_ACTIVE = true describe('Sidebar', () => { let wrapper diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue index 465ff1270..50b61b8cb 100644 --- a/frontend/src/pages/Settings.vue +++ b/frontend/src/pages/Settings.vue @@ -238,17 +238,10 @@ const isHumhubActivated = computed(() => { return humhubAllowed.value === true }) -const isGMS = computed(() => { - return CONFIG.GMS_ACTIVE === 'true' -}) - -const isHumhub = computed(() => { - return CONFIG.HUMHUB_ACTIVE === 'true' -}) - -const isCommunityService = computed(() => { - return isGMS.value || isHumhub.value -}) +// setting if gms and/or humhub are enabled in frontend config .env +const isGMS = CONFIG.GMS_ACTIVE +const isHumhub = CONFIG.HUMHUB_ACTIVE +const isCommunityService = isGMS || isHumhub const { mutate: updateUserData } = useMutation(updateUserInfos)