diff --git a/CHANGELOG.md b/CHANGELOG.md index d612139ad..9b996ca1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to - ✨(backend) search endpoint for ItemViewSet #312 - 🔧(cron) pgdump: fix restic repository #282 - 🔧(backend) support _FILE for secret environment variables #196 +- ✨(frontend) Make the footer visibility configurable #343 ### Changed diff --git a/env.d/development/common b/env.d/development/common index 01564defb..6fcf91df3 100644 --- a/env.d/development/common +++ b/env.d/development/common @@ -50,5 +50,6 @@ OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"} FRONTEND_THEME=default FRONTEND_MORE_LINK=https://docs.numerique.gouv.fr/docs/fa0aba15-e119-4185-b466-a4b37ad95950/ FRONTEND_FEEDBACK_BUTTON_SHOW=True +FRONTEND_SHOW_FOOTER=True FRONTEND_FEEDBACK_BUTTON_IDLE=False FRONTEND_FEEDBACK_ITEMS={"form":{"url": "https://tally.so/r/w2YaWL"}, "tchap":{"url": "https://tchap.gouv.fr/#/room/#fichiers:agent.dinum.tchap.gouv.fr"}, "visio":{"url": "https://cal.com/robin-lecomte-eyul9w/fichiers"}} \ No newline at end of file diff --git a/src/backend/core/api/viewsets.py b/src/backend/core/api/viewsets.py index 26f5aa183..19fd50946 100644 --- a/src/backend/core/api/viewsets.py +++ b/src/backend/core/api/viewsets.py @@ -1352,6 +1352,7 @@ def get(self, request): "FRONTEND_FEEDBACK_BUTTON_IDLE", "FRONTEND_FEEDBACK_ITEMS", "FRONTEND_HIDE_GAUFRE", + "FRONTEND_SHOW_FOOTER", "MEDIA_BASE_URL", "POSTHOG_KEY", "POSTHOG_HOST", diff --git a/src/backend/core/tests/test_api_config.py b/src/backend/core/tests/test_api_config.py index 9b900cb2c..4f0a70a73 100644 --- a/src/backend/core/tests/test_api_config.py +++ b/src/backend/core/tests/test_api_config.py @@ -25,6 +25,7 @@ FRONTEND_FEEDBACK_BUTTON_IDLE=False, FRONTEND_FEEDBACK_ITEMS={"form": {"url": "https://test.com"}}, FRONTEND_HIDE_GAUFRE=True, + FRONTEND_SHOW_FOOTER=False, MEDIA_BASE_URL="http://testserver/", POSTHOG_KEY="132456", POSTHOG_HOST="https://eu.i.posthog-test.com", @@ -51,6 +52,7 @@ def test_api_config(is_authenticated): "FRONTEND_FEEDBACK_BUTTON_IDLE": False, "FRONTEND_FEEDBACK_ITEMS": {"form": {"url": "https://test.com"}}, "FRONTEND_HIDE_GAUFRE": True, + "FRONTEND_SHOW_FOOTER": False, "LANGUAGES": [["en-us", "English"], ["fr-fr", "French"], ["de-de", "German"]], "LANGUAGE_CODE": "en-us", "MEDIA_BASE_URL": "http://testserver/", diff --git a/src/backend/drive/settings.py b/src/backend/drive/settings.py index c9441c676..9a5ffbfe6 100755 --- a/src/backend/drive/settings.py +++ b/src/backend/drive/settings.py @@ -479,6 +479,9 @@ class Base(Configuration): FRONTEND_HIDE_GAUFRE = values.BooleanValue( default=False, environ_name="FRONTEND_HIDE_GAUFRE", environ_prefix=None ) + FRONTEND_SHOW_FOOTER = values.BooleanValue( + default=True, environ_name="FRONTEND_SHOW_FOOTER", environ_prefix=None + ) THEME_CUSTOMIZATION_FILE_PATH = values.Value( os.path.join(BASE_DIR, "drive/configuration/theme/default.json"), environ_name="THEME_CUSTOMIZATION_FILE_PATH", diff --git a/src/frontend/apps/drive/src/features/drivers/types.ts b/src/frontend/apps/drive/src/features/drivers/types.ts index 299251157..02253d429 100644 --- a/src/frontend/apps/drive/src/features/drivers/types.ts +++ b/src/frontend/apps/drive/src/features/drivers/types.ts @@ -151,6 +151,7 @@ export type ApiConfig = { FRONTEND_FEEDBACK_ITEMS?: Record; FRONTEND_THEME?: string; FRONTEND_HIDE_GAUFRE?: boolean; + FRONTEND_SHOW_FOOTER?: boolean; theme_customization?: ThemeCustomization; }; diff --git a/src/frontend/apps/drive/src/pages/index.tsx b/src/frontend/apps/drive/src/pages/index.tsx index e98a81569..50f33a99b 100644 --- a/src/frontend/apps/drive/src/pages/index.tsx +++ b/src/frontend/apps/drive/src/pages/index.tsx @@ -109,7 +109,7 @@ export default function HomePage() { } /> -