Merge pull request #1327 from userlocalhost/feature/new-ui/extendedGe…

…neralParameters Enable to pass external parameters to React-UI implementation via Django template
dmm-com · Nov 18, 2024 · e9362ae · e9362ae
2 parents 4410672 + 4657033
commit e9362ae
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## In development
 
 ### Added
+* Enable to pass general external parameters(`extendedGeneralParameters`) to React-UI
+  implementation via Django template.
+  Contributed by @userlocalhost, @hinashi
 
 ### Changed
 

diff --git a/airone/settings_common.py b/airone/settings_common.py
@@ -242,6 +242,13 @@ class Common(Configuration):
                 json.dumps([]),
             )
         ),
+        # This is the general parameter that would be passed to custom-views from external world
+        "EXTENDED_GENERAL_PARAMETERS": json.loads(
+            env.str(
+                "EXTENDED_GENERAL_PARAMETERS",
+                json.dumps({}),
+            )
+        ),
         # This is an example to set EXTENDED_HEADER_MENUS
         # "EXTENDED_HEADER_MENUS": json.loads(env.str(
         #    "EXTENDED_HEADER_MENUS",

diff --git a/frontend/src/services/ServerContext.ts b/frontend/src/services/ServerContext.ts
@@ -33,6 +33,7 @@ export class ServerContext {
   passwordResetDisabled?: boolean;
   checkTermService?: boolean;
   termsOfServiceUrl?: string;
+  extendedGeneralParameters: { [key: string]: any };
   extendedHeaderMenus: {
     name: string;
     children: { name: string; url: string }[];
@@ -55,6 +56,7 @@ export class ServerContext {
     this.passwordResetDisabled = context.password_reset_disabled;
     this.checkTermService = context.checkTermService;
     this.termsOfServiceUrl = context.termsOfServiceUrl;
+    this.extendedGeneralParameters = context.extendedGeneralParameters;
     this.extendedHeaderMenus = context.extendedHeaderMenus;
     this.headerColor = context.headerColor;
     this.flags = context.flags ?? { webhook: true };

diff --git a/templates/frontend/index.html b/templates/frontend/index.html
@@ -33,6 +33,7 @@
           },
           legacyUiDisabled: {{airone.LEGACY_UI_DISABLED|yesno:"true,false"}},
           checkTermService: {{airone.CHECK_TERM_SERVICE|yesno:"true,false"}},
+          extendedGeneralParameters: {{ airone.EXTENDED_GENERAL_PARAMETERS|safe }},
           extendedHeaderMenus: {{ airone.EXTENDED_HEADER_MENUS|safe }},
           headerColor: {% if airone.HEADER_COLOR %}"{{ airone.HEADER_COLOR|safe }}"{% else %}null{% endif %},
           flags: {