Make messages endpoint configurable via env variable

alephdata · Jul 29, 2022 · 02c07e1 · 02c07e1
1 parent 8862d4c
commit 02c07e1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/aleph/settings.py b/aleph/settings.py
@@ -37,6 +37,7 @@
 
 # Show a system-wide banner in the user interface.
 APP_BANNER = env.get("ALEPH_APP_BANNER")
+APP_MESSAGES_URL = env.get("ALEPH_APP_MESSAGES_URL", None)
 
 # Force HTTPS here:
 FORCE_HTTPS = True if APP_UI_URL.lower().startswith("https") else False

diff --git a/aleph/views/base_api.py b/aleph/views/base_api.py
@@ -51,6 +51,7 @@ def _metadata_locale(locale):
             "version": __version__,
             "banner": settings.APP_BANNER,
             "ui_uri": settings.APP_UI_URL,
+            "messages_url": settings.APP_MESSAGES_URL,
             "publish": archive.can_publish,
             "logo": app_logo,
             "favicon": settings.APP_FAVICON,

diff --git a/ui/src/actions/messagesActions.js b/ui/src/actions/messagesActions.js
@@ -1,12 +1,9 @@
 import axios from 'axios';
 import asyncActionCreator from 'actions/asyncActionCreator';
 
-const MESSAGES_ENDPOINT =
-  'https://tillprochaska.github.io/status-page-workflow/messages.json';
-
 export const fetchMessages = asyncActionCreator(
-  () => async () => {
-    const response = await axios.get(MESSAGES_ENDPOINT);
+  (endpoint) => async () => {
+    const response = await axios.get(endpoint);
     return { messages: response.data };
   },
   { name: 'FETCH_MESSAGES' }

diff --git a/ui/src/app/Router.jsx b/ui/src/app/Router.jsx
@@ -45,23 +45,15 @@ const MESSAGES_INTERVAL = 15 * 60 * 1000; // every 15 minutes
 class Router extends Component {
   componentDidMount() {
     this.fetchIfNeeded();
-
-    this.setState(() => ({
-      messagesInterval: setInterval(
-        () => this.props.fetchMessages(),
-        MESSAGES_INTERVAL
-      ),
-    }));
+    this.setMessagesInterval();
   }
 
   componentDidUpdate() {
     this.fetchIfNeeded();
   }
 
   componentWillUnmount() {
-    if (this.state?.messagesInterval) {
-      clearInterval(this.state.messagesInterval);
-    }
+    this.clearMessagesInterval();
   }
 
   fetchIfNeeded() {
@@ -72,7 +64,26 @@ class Router extends Component {
     }
 
     if (messages.shouldLoad) {
-      this.props.fetchMessages();
+      this.fetchMessages();
+    }
+  }
+
+  fetchMessages() {
+    const { metadata } = this.props;
+
+    if (metadata?.app?.messages_url) {
+      this.props.fetchMessages(metadata.app.messages_url);
+    }
+  }
+
+  setMessagesInterval() {
+    const id = setInterval(() => this.fetchMessages(), MESSAGES_INTERVAL);
+    this.setState(() => ({ messagesInterval: id }));
+  }
+
+  clearMessagesInterval() {
+    if (this.state?.messagesInterval) {
+      clearInterval(this.state.messagesInterval);
     }
   }