From 57ef738fe29558ebd19ea4b5bfd791f2ebd9bb86 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 25 Mar 2025 09:36:06 +0100 Subject: [PATCH 1/4] Delete frontend/public/img/svg/settings.svg not longer used --- frontend/public/img/svg/settings.svg | 32 ---------------------------- 1 file changed, 32 deletions(-) delete mode 100644 frontend/public/img/svg/settings.svg diff --git a/frontend/public/img/svg/settings.svg b/frontend/public/img/svg/settings.svg deleted file mode 100644 index f86976790..000000000 --- a/frontend/public/img/svg/settings.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file From 9d0d58679869db9f398fc5e508362bc28e3aadf3 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 25 Mar 2025 10:52:42 +0100 Subject: [PATCH 2/4] bugfix, with changing vite.config.js to correctly copy the boolean configs for humhub and gms active, the config value is now an boolena rather than a string in frontend --- frontend/src/components/Menu/Sidebar.spec.js | 4 ++-- frontend/src/pages/Settings.vue | 15 ++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) 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) From aad7f1c65c9b768cdf5c47ef4c51c3ea0564f488 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 25 Mar 2025 11:07:44 +0100 Subject: [PATCH 3/4] disable humhub and gms in e2e test --- backend/.env.test_e2e | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/.env.test_e2e b/backend/.env.test_e2e index 8b6559e97..b97c51a8b 100644 --- a/backend/.env.test_e2e +++ b/backend/.env.test_e2e @@ -2,6 +2,8 @@ JWT_EXPIRES_IN=2m GDT_ACTIVE=false +HUMHUB_ACTIVE=false +GMS_ACTIVE=false # Email EMAIL=true From cfb323e1d2f60e38cc1516e98ab068540b7f3ead Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:12:56 +0100 Subject: [PATCH 4/4] Update backend/src/graphql/model/User.ts Co-authored-by: einhornimmond --- backend/src/graphql/model/User.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index 043bc8abd..afcde6785 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -41,7 +41,6 @@ export class User { this.gmsPublishName = user.gmsPublishName this.humhubPublishName = user.humhubPublishName this.gmsPublishLocation = user.gmsPublishLocation - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument this.userLocation = user.location ? Point2Location(user.location as Point) : null } }